@agentunion/fastaun 0.5.31 → 0.5.32

package/dist/client/v2-e2ee.js

@@ -485,9 +485,6 @@ export class V2E2EECoordinator {
         catch (exc) {
             client._clientLog.warn(`V2 session init failed (non-fatal): ${formatE2EEError(exc)}`);
         }
-        if (opts.backgroundSync && client._v2Session && typeof client._v2AutoConfirmPendingProposals === 'function') {
-            client._safeAsync(client._v2AutoConfirmPendingProposals());
-        }
     }
     async initV2Session() {
         const client = this.client;
@@ -561,7 +558,7 @@ export class V2E2EECoordinator {
         inflight.add(gid);
         client._safeAsync((async () => {
             try {
-                await client._v2Session.ensureGroupRegistered?.(gid, client._v2CallFn());
+                await client._v2Session.ensureGroupRegistered?.(gid, (method, params) => client.call(method, { ...params, _rpc_background: true }));
                 client._clientLog.debug(`group SPK registered: group=${gid} reason=${opts.reason}`);
             }
             catch (exc) {
@@ -583,7 +580,7 @@ export class V2E2EECoordinator {
         inflight.add(gid);
         client._safeAsync((async () => {
             try {
-                await client._v2Session.rotateGroupSPK?.(gid, client._v2CallFn());
+                await client._v2Session.rotateGroupSPK?.(gid, (method, params) => client.call(method, { ...params, _rpc_background: true }));
                 client._clientLog.debug(`group SPK rotated: group=${gid} reason=${opts.reason}`);
             }
             catch (exc) {
@@ -642,15 +639,15 @@ export class V2E2EECoordinator {
     pendingSenderIKFetchKey(fromAid, senderDeviceId, groupId) {
         return `${fromAid}#${senderDeviceId}#${groupId || ''}`;
     }
-    async fetchSenderIKOnce(fromAid, senderDeviceId, groupId, certFingerprint = '') {
+    async fetchSenderIKOnce(fromAid, senderDeviceId, groupId, certFingerprint = '', rpcOptions) {
         const client = this.client;
         const peerAid = String(fromAid ?? '').trim();
         const deviceId = String(senderDeviceId ?? '').trim();
         const gid = String(groupId ?? '').trim();
         const fingerprint = String(certFingerprint ?? '').trim().toLowerCase();
-        if (!peerAid)
+        if (!peerAid || rpcOptions?.deadline !== undefined && rpcOptions.deadline <= Date.now())
             return null;
-        const fetchKey = [peerAid, deviceId, gid, fingerprint].join('#');
+        const fetchKey = [peerAid, deviceId, gid, fingerprint, ...(rpcOptions ? [rpcOptions.background, rpcOptions.deadline] : [])].join('#');
         const existing = this.senderIKSyncFetches.get(fetchKey);
         if (existing)
             return await existing;
@@ -658,12 +655,15 @@ export class V2E2EECoordinator {
             const started = Date.now();
             let timer;
             const timedOut = Symbol('sender-ik-timeout');
+            const expired = () => rpcOptions?.deadline !== undefined && rpcOptions.deadline <= Date.now();
             const fetch = async () => {
+                if (expired())
+                    return null;
                 try {
                     const bootstrap = await client.call('message.v2.bootstrap', {
                         peer_aid: peerAid,
                         e2ee_wrap_capabilities: v2WrapCapabilities(),
-                    });
+                    }, ...(rpcOptions ? [rpcOptions] : []));
                     const peers = (Array.isArray(bootstrap?.peer_devices) ? bootstrap.peer_devices : []);
                     for (const dev of peers)
                         client._cacheV2PeerIKFromDevice(dev, peerAid);
@@ -671,14 +671,18 @@ export class V2E2EECoordinator {
                 catch (exc) {
                     client._clientLog.warn(`V2 sender IK 同步 bootstrap 失败: peer=${peerAid} device=${deviceId || '-'} err=${formatE2EEError(exc)}`);
                 }
+                if (expired())
+                    return null;
                 let senderPubDer = await this.getV2SenderPubDer(peerAid, deviceId, fingerprint);
+                if (expired())
+                    return null;
                 if (senderPubDer || !gid)
                     return senderPubDer;
                 try {
                     const bootstrap = await client.call('group.v2.bootstrap', {
                         group_id: gid,
                         e2ee_wrap_capabilities: v2WrapCapabilities(),
-                    });
+                    }, ...(rpcOptions ? [rpcOptions] : []));
                     const devices = (Array.isArray(bootstrap?.devices) ? bootstrap.devices : []);
                     const audit = (Array.isArray(bootstrap?.audit_recipients) ? bootstrap.audit_recipients : []);
                     for (const dev of devices)
@@ -689,6 +693,8 @@ export class V2E2EECoordinator {
                 catch (exc) {
                     client._clientLog.warn(`V2 sender IK 同步 group bootstrap 失败: group=${gid} peer=${peerAid} err=${formatE2EEError(exc)}`);
                 }
+                if (expired())
+                    return null;
                 senderPubDer = await this.getV2SenderPubDer(peerAid, deviceId, fingerprint);
                 return senderPubDer;
             };
@@ -696,7 +702,7 @@ export class V2E2EECoordinator {
                 const result = await Promise.race([
                     fetch(),
                     new Promise((resolve) => {
-                        timer = setTimeout(() => resolve(timedOut), V2_SENDER_IK_SYNC_FETCH_TIMEOUT_MS);
+                        timer = setTimeout(() => resolve(timedOut), Math.max(0, Math.min(V2_SENDER_IK_SYNC_FETCH_TIMEOUT_MS, (rpcOptions?.deadline ?? Infinity) - Date.now())));
                     }),
                 ]);
                 if (result === timedOut) {
@@ -924,10 +930,11 @@ export class V2E2EECoordinator {
         }
         else {
             this.targetSetCache.delete(to);
-            const bs = await client.call('message.v2.bootstrap', {
+            const bootstrapParams = {
                 peer_aid: to,
                 e2ee_wrap_capabilities: v2WrapCapabilities(),
-            });
+            };
+            const bs = await (opts.background === undefined && opts.deadline === undefined ? client.call('message.v2.bootstrap', bootstrapParams) : client.call('message.v2.bootstrap', bootstrapParams, { background: opts.background, deadline: opts.deadline }));
             if (typeof client._primeBootstrapPeerCerts === 'function') {
                 await client._primeBootstrapPeerCerts(bs, to);
             }
@@ -995,10 +1002,11 @@ export class V2E2EECoordinator {
                     }
                     else {
                         this.targetSetCache.delete(client._aid);
-                        const selfBs = await client.call('message.v2.bootstrap', {
+                        const selfParams = {
                             peer_aid: client._aid,
                             e2ee_wrap_capabilities: v2WrapCapabilities(),
-                        });
+                        };
+                        const selfBs = await (opts.background === undefined && opts.deadline === undefined ? client.call('message.v2.bootstrap', selfParams) : client.call('message.v2.bootstrap', selfParams, { background: opts.background, deadline: opts.deadline }));
                         if (typeof client._primeBootstrapPeerCerts === 'function') {
                             await client._primeBootstrapPeerCerts(selfBs, client._aid);
                         }
@@ -1114,9 +1122,11 @@ export class V2E2EECoordinator {
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
                 needRender: opts?.needRender,
+                background: opts?.background,
+                deadline: opts?.deadline,
                 useCache,
             });
-            const result = await client.call('message.send', {
+            const request = {
                 to: toAid,
                 payload: envelope,
                 message_id: messageId,
@@ -1127,7 +1137,8 @@ export class V2E2EECoordinator {
                 encrypt: false,
                 need_render: opts?.needRender ?? true,
                 _skip_send_result_envelope: true,
-            });
+            };
+            const result = await (opts?.background === undefined && opts?.deadline === undefined ? client.call('message.send', request) : client.call('message.send', request, { background: opts?.background, deadline: opts?.deadline }));
             client._clientLog.debug(`message.v2.send ok: to=${toAid}, use_cache=${useCache}, seq=${String((isJsonObject(result) ? result.seq : '') ?? '')}`);
             return result;
         };
@@ -2503,6 +2514,8 @@ export class V2E2EECoordinator {
                 protectedHeaders: opts?.protectedHeaders,
                 context: opts?.context,
                 needRender: opts?.needRender,
+                background: opts?.background,
+                deadline: opts?.deadline,
                 useCache,
             });
             const result = await client.call('group.v2.send', withExplicitGroupAid({
@@ -2511,7 +2524,7 @@ export class V2E2EECoordinator {
                 ...(opts?.ttl !== undefined ? { ttl: opts.ttl } : {}),
                 ...(opts?.messageClass !== undefined ? { message_class: opts.messageClass } : {}),
                 ...(opts?.protectedHeaders ? { protected_headers: opts.protectedHeaders } : {}),
-            }, groupAid));
+            }, groupAid), ...(opts?.background !== undefined || opts?.deadline !== undefined ? [{ background: opts?.background, deadline: opts?.deadline }] : []));
             client._clientLog.debug(`group.v2.send ok: group=${gid}, use_cache=${useCache}, seq=${String((isJsonObject(result) ? result.seq : '') ?? '')}`);
             return result;
         };
@@ -2575,7 +2588,7 @@ export class V2E2EECoordinator {
             const bs = await client.call('group.v2.bootstrap', {
                 group_id: groupId,
                 e2ee_wrap_capabilities: v2WrapCapabilities(),
-            });
+            }, ...(opts.background !== undefined || opts.deadline !== undefined ? [{ background: opts.background, deadline: opts.deadline }] : []));
             allDevices = (Array.isArray(bs.devices) ? bs.devices : []);
             auditRecipientsRaw = (Array.isArray(bs.audit_recipients) ? bs.audit_recipients : []);
             epoch = Number(bs.epoch ?? 0) || 0;