@agentunion/fastaun 0.5.17 → 0.5.18

package/dist/client.d.ts

@@ -140,6 +140,9 @@ export declare class AUNClient {
     private _pushProcessQueues;
     /** P2P pull 进行中到达的纯通知 push 上界；pull gate 释放后需要补拉一次。 */
     private _pendingP2pPullUpper;
+    /** P2P pending pull 的延迟重试定时器及次数，覆盖服务端异步落库窗口。 */
+    private _pendingP2pPullTimers;
+    private _pendingP2pPullRetries;
     /** 缺 sender IK 时暂存原始 V2 消息，后台补齐 IK 后重试解密。 */
     private _v2SenderIKPending;
     /** sender IK 后台补齐任务去重。 */

package/dist/client.js

@@ -120,6 +120,8 @@ const DEFAULT_SESSION_OPTIONS = {
 const RECONNECT_MIN_BASE_DELAY_MS = 1_000;
 const RECONNECT_MAX_BASE_DELAY_MS = 64_000;
 const TOKEN_REFRESH_CHECK_INTERVAL_MS = 30_000;
+const PENDING_P2P_PULL_DELAY_MS = 100;
+const PENDING_P2P_PULL_MAX_RETRIES = 20;
 const MAX_NOTIFY_PAYLOAD_SIZE = 64 * 1024;
 // P1-23: 非幂等方法使用更长超时（35s），避免 SDK 10s 超时 < gateway 30s 处理时间
 const NON_IDEMPOTENT_TIMEOUT_MS = 35_000;
@@ -494,6 +496,9 @@ export class AUNClient {
     _pushProcessQueues = new Map();
     /** P2P pull 进行中到达的纯通知 push 上界；pull gate 释放后需要补拉一次。 */
     _pendingP2pPullUpper = new Map();
+    /** P2P pending pull 的延迟重试定时器及次数，覆盖服务端异步落库窗口。 */
+    _pendingP2pPullTimers = new Map();
+    _pendingP2pPullRetries = new Map();
     /** 缺 sender IK 时暂存原始 V2 消息，后台补齐 IK 后重试解密。 */
     _v2SenderIKPending = new Map();
     /** sender IK 后台补齐任务去重。 */
@@ -1876,6 +1881,7 @@ export class AUNClient {
         const previous = this._pendingP2pPullUpper.get(ns) ?? 0;
         if (seq > previous) {
             this._pendingP2pPullUpper.set(ns, seq);
+            this._pendingP2pPullRetries.delete(ns);
         }
         this._clientLog.debug(`P2P pending pull upper recorded: ns=${ns}, seq=${seq}, previous=${previous}, contiguous=${this._seqTracker.getContiguousSeq(ns)}`);
     }
@@ -1890,6 +1896,7 @@ export class AUNClient {
         const contig = this._seqTracker.getContiguousSeq(ns);
         if (upperSeq <= contig) {
             this._pendingP2pPullUpper.delete(ns);
+            this._pendingP2pPullRetries.delete(ns);
             this._clientLog.debug(`P2P pending pull upper already covered: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, reason=${reason}`);
             return false;
         }
@@ -1897,11 +1904,49 @@ export class AUNClient {
             this._clientLog.debug(`P2P pending pull postponed: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, state=${this._state}, closing=${this._closing}, reason=${reason}`);
             return false;
         }
-        if (this._rpcPipeline?.hasPullActivity?.(ns, false))
+        if (this._sessionOptions.background_sync === false)
             return false;
-        this._pendingP2pPullUpper.delete(ns);
-        this._clientLog.info(`P2P pending push follow-up pull scheduled: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, reason=${reason}`);
-        this._safeAsync(this._onV2PushNotification({ seq: upperSeq }, 'v2'));
+        if (this._rpcPipeline?.hasPullActivity?.(ns, false) || this._pendingP2pPullTimers.has(ns))
+            return false;
+        const retries = (this._pendingP2pPullRetries.get(ns) ?? 0) + 1;
+        if (retries > PENDING_P2P_PULL_MAX_RETRIES) {
+            this._pendingP2pPullUpper.delete(ns);
+            this._pendingP2pPullRetries.delete(ns);
+            this._clientLog.warn(`P2P pending pull retries exhausted: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, reason=${reason}`);
+            return false;
+        }
+        this._pendingP2pPullRetries.set(ns, retries);
+        this._clientLog.info(`P2P pending push follow-up pull scheduled: ns=${ns}, upper_seq=${upperSeq}, contiguous=${contig}, retry=${retries}, reason=${reason}`);
+        const timer = setTimeout(() => {
+            this._pendingP2pPullTimers.delete(ns);
+            const currentUpper = this._pendingP2pPullUpper.get(ns) ?? 0;
+            if (currentUpper <= 0 || currentUpper <= this._seqTracker.getContiguousSeq(ns)) {
+                this._pendingP2pPullUpper.delete(ns);
+                this._pendingP2pPullRetries.delete(ns);
+                return;
+            }
+            // 暂时移除上界，避免 synthetic push 被 hasPullActivity 当成自身的 pending pull 拦截。
+            this._pendingP2pPullUpper.delete(ns);
+            const retry = this._onV2PushNotification({ seq: currentUpper }, 'v2')
+                .then(() => {
+                if (this._seqTracker.getContiguousSeq(ns) < currentUpper) {
+                    const pending = this._pendingP2pPullUpper.get(ns) ?? 0;
+                    if (currentUpper > pending)
+                        this._pendingP2pPullUpper.set(ns, currentUpper);
+                }
+            })
+                .catch((error) => {
+                const pending = this._pendingP2pPullUpper.get(ns) ?? 0;
+                if (currentUpper > pending)
+                    this._pendingP2pPullUpper.set(ns, currentUpper);
+                throw error;
+            })
+                .finally(() => {
+                this._schedulePendingP2pPullIfNeeded(ns, 'pending-pull-retry-complete');
+            });
+            this._safeAsync(retry);
+        }, PENDING_P2P_PULL_DELAY_MS);
+        this._pendingP2pPullTimers.set(ns, timer);
         return true;
     }
     _markPublishedSeq(ns, seq) {
@@ -2213,6 +2258,10 @@ export class AUNClient {
             }
             const paramsHash = String(cs.params_hash ?? '');
             const timestamp = String(cs.timestamp ?? '');
+            const signedAt = Number(timestamp) * 1000;
+            if (!/^\d+$/.test(timestamp) || !Number.isSafeInteger(Number(timestamp)) || signedAt < new Date(certObj.validFrom).getTime() || signedAt > new Date(certObj.validTo).getTime()) {
+                return false;
+            }
             const signData = Buffer.from(`${method}|${sigAid}|${timestamp}|${paramsHash}`, 'utf-8');
             const sigB64 = String(cs.signature ?? '');
             const pubKey = certObj.publicKey;
@@ -2441,6 +2490,10 @@ export class AUNClient {
         this._pushedSeqs.clear();
         this._pendingOrderedMsgs.clear();
         this._pendingP2pPullUpper.clear();
+        for (const timer of this._pendingP2pPullTimers.values())
+            clearTimeout(timer);
+        this._pendingP2pPullTimers.clear();
+        this._pendingP2pPullRetries.clear();
         this._v2SenderIKPending.clear();
         this._v2SenderIKFetching.clear();
         this._groupSynced.clear();
@@ -2457,6 +2510,10 @@ export class AUNClient {
         this._pushedSeqs.clear();
         this._pendingOrderedMsgs.clear();
         this._pendingP2pPullUpper.clear();
+        for (const timer of this._pendingP2pPullTimers.values())
+            clearTimeout(timer);
+        this._pendingP2pPullTimers.clear();
+        this._pendingP2pPullRetries.clear();
         this._v2SenderIKPending.clear();
         this._v2SenderIKFetching.clear();
         this._groupSynced.clear();
@@ -3279,7 +3336,10 @@ export class AUNClient {
         if (senderDeviceId)
             result.sender_device_id = senderDeviceId;
         const explicitDirection = String(msg.direction ?? '').trim();
-        result.direction = explicitDirection || (fromAid && fromAid === this._aid ? 'outbound_sync' : 'inbound');
+        if (explicitDirection)
+            result.direction = explicitDirection;
+        else if (fromAid && fromAid !== this._aid)
+            result.direction = 'inbound';
         if (msg.device_id !== undefined)
             result.device_id = msg.device_id;
         attachGatewayProximity(result, msg);
@@ -3478,8 +3538,8 @@ export class AUNClient {
         return this._delivery.onRawGroupV2MessageCreated(data, expectedVersion, inlineGeneration);
     }
     /** Push 通知带 payload 时的就地解密（复用 _decryptV2Message） */
-    async _decryptV2PushMessage(data) {
-        return await this._v2E2EE.decryptV2PushMessage(data);
+    async _decryptV2PushMessage(data, deferStatus) {
+        return await this._v2E2EE.decryptV2PushMessage(data, deferStatus);
     }
     /** 按当前 AID 发现 Gateway；用于 authenticate()/connect() 的新入口。 */
     async _resolveGatewayForAid(aid) {