自动补充 MLS 一次性密钥包

This commit is contained in:
xhgit committed 2026-11-13 23:44:52 +08:00
1 parent 6b728a0996
commit cf8129f4aa
8 files changed
+69 -11

No files matched your search

+34 -11
View File
@@ -46,6 +46,7 @@ interface ChatState {
pinned: Record<string, string>
groups: Record<string, string>
package?: { lastPublished: number; item: Package }
packageChecked?: number
rejected: number
shareRead?: boolean
}
@@ -102,17 +103,7 @@ export async function enableChat(identity: ChatIdentity, call: Call) {
if (engine.device() !== identity.device.id) throw new Error('本机加密状态属于其他设备')
const key = engine.public_key()
await call('/mls-credential', 'POST', { publicKey: base64(key), signature: await signed(identity, 'credential', key) })
if (!state.package || Date.now() - state.package.lastPublished >= 6 * 3600_000) {
if (!state.package || state.package.lastPublished) {
const pack = engine.key_package()
state.package = { lastPublished: 0, item: { package: base64(pack), signature: await signed(identity, 'KeyPackage', pack) } }
state.engine = base64(engine.snapshot())
await save(state)
}
await call('/key-packages', 'POST', state.package.item)
state.package.lastPublished = Date.now()
await save(state)
}
await replenishPackages(identity, call, state, save, engine)
return fingerprint(decode(await localIdentityKey(identity, call)))
} finally {
engine.free()
@@ -120,6 +111,27 @@ export async function enableChat(identity: ChatIdentity, call: Call) {
})
}
async function replenishPackages(identity: ChatIdentity, call: Call, state: ChatState, save: (s: ChatState) => Promise<void>, engine: DeviceMls) {
// Persist generated private material before sending any public package.
if (state.package && state.package.lastPublished === 0) {
await call('/key-packages', 'POST', state.package.item)
delete state.package
await save(state)
}
const { available } = await call<{ available: number }>('/key-packages')
for (let count = available; count < 4; count++) {
const pack = engine.key_package()
state.package = { lastPublished: 0, item: { package: base64(pack), signature: await signed(identity, 'KeyPackage', pack) } }
state.engine = base64(engine.snapshot())
await save(state)
await call('/key-packages', 'POST', state.package.item)
delete state.package
await save(state)
}
state.packageChecked = Date.now()
await save(state)
}
async function localIdentityKey(identity: ChatIdentity, call: Call) {
const { publicKey } = await call<{ publicKey: string }>('/mls-local-key')
const credential = decode(publicKey)
@@ -343,6 +355,7 @@ export function synchronize(identity: ChatIdentity, user: string, call: Call) {
const wire = decode(item.ciphertext)
if (wire[3] === 3) {
const group = base64(engine.join(peer.id, key, wire))
state.packageChecked = 0
const previous = state.groups[peer.id]
if (!previous || group < previous) state.groups[peer.id] = group
} else {
@@ -378,6 +391,16 @@ export function synchronize(identity: ChatIdentity, user: string, call: Call) {
} catch (cause) {
deliveryError = cause instanceof APIError && cause.status === 404 ? '部分待发消息的设备已不可用' : '部分消息等待重试'
}
if (Date.now() - (state.packageChecked ?? 0) >= 60_000) {
const engine = factory.DeviceMls.restore(decode(state.engine))
try {
await replenishPackages(identity, call, state, save, engine)
} catch {
deliveryError ||= '密钥包补充失败,将自动重试'
} finally {
engine.free()
}
}
return { lines: state.lines, pinned: state.pinned, peers, rejected: state.rejected, deliveryError, shareRead: state.shareRead === true,
unsent: state.outbox.map((item) => item.mutationTarget ?? item.messageId) }
})