im-rtc-call-engine 1.0.0 → 2.1.0

package/dist/signaling/reconnector.js

@@ -1,5 +1,8 @@
 import { logger } from '../logger.js';
 import { backoffDelayMs } from './backoff.js';
+import { OneShotTimer } from './oneShotTimer.js';
+/** 两次「立刻重连」之间至少隔这么久，网络来回跳时不刷出重连风暴。与 iOS / Android 同一个数。 */
+export const NUDGE_MIN_GAP_MS = 2_000;
 /**
  * 重连调度（RTC_PROTOCOL.md §1.4）。
  *
@@ -13,10 +16,14 @@ export class Reconnector {
     reconnect;
     onFailed;
     random;
-    timer = null;
+    timer = new OneShotTimer();
     attempt = 0;
     /** 已经彻底放弃。见 stop() —— 这是**闩**，不是一次性的取消。 */
     stopped = false;
+    /** 回前台 / 网络变化那一刻正在连、或探测判死要断：这一次失败**不走退避**，立刻再连。 */
+    nudgePending = false;
+    /** 上一次「立刻重连」的时刻（`Date.now()`），给 {@link NUDGE_MIN_GAP_MS} 防抖用。 */
+    lastNudgeAt = Number.NEGATIVE_INFINITY;
     constructor(reconnect, onFailed, random = Math.random) {
         this.reconnect = reconnect;
         this.onFailed = onFailed;
@@ -31,24 +38,53 @@ export class Reconnector {
      * 十几分钟后就退到了几十秒一次，看着像「不重连了」。
      */
     schedule() {
-        if (this.stopped || this.timer !== null)
+        if (this.stopped || this.timer.armed)
             return;
+        if (this.nudgePending) {
+            this.nudge('网络变化或回前台时正在连，失败后立即再连');
+            return;
+        }
         const delayMs = backoffDelayMs(this.attempt, this.random);
         this.attempt += 1;
         logger.info('计划重连', { attempt: this.attempt, delayMs });
-        this.timer = setTimeout(() => {
-            this.timer = null;
-            void this.reconnect().catch((err) => {
-                this.onFailed(err);
-                // 失败后继续退避——档位不重置，否则断网期间会退化成每秒重试。
-                this.schedule();
-            });
-        }, delayMs);
+        this.timer.start(delayMs, () => this.run());
+    }
+    /** waiting：正等着下一次重连（定时器排着）。 */
+    get waiting() {
+        return this.timer.armed;
+    }
+    /** markNudgePending：正在连的这一次若失败，不走退避、立刻再连。 */
+    markNudgePending() {
+        this.nudgePending = true;
+    }
+    /**
+     * nudge 回前台 / 网络变化：撤掉正等着的那次，退避归零，立刻连；
+     * 离上一次同样的动作不足 {@link NUDGE_MIN_GAP_MS} 就补足间隔。
+     */
+    nudge(rule) {
+        if (this.stopped)
+            return;
+        this.nudgePending = false;
+        this.attempt = 0;
+        const delayMs = Math.max(0, this.lastNudgeAt + NUDGE_MIN_GAP_MS - Date.now());
+        logger.info('计划重连', { attempt: 0, delayMs, rule });
+        this.timer.start(delayMs, () => {
+            this.lastNudgeAt = Date.now();
+            this.run();
+        });
+    }
+    run() {
+        void this.reconnect().catch((err) => {
+            this.onFailed(err);
+            // 失败后继续退避——档位不重置，否则断网期间会退化成每秒重试。
+            this.schedule();
+        });
     }
     /** succeeded 在一次连接成功后把退避档重置，并解掉 stop() 的闩。 */
     succeeded() {
         this.attempt = 0;
         this.stopped = false;
+        this.nudgePending = false;
     }
     /**
      * stop 彻底放弃重连，**并挡住之后的 schedule()**。
@@ -59,14 +95,12 @@ export class Reconnector {
      */
     stop() {
         this.stopped = true;
+        this.nudgePending = false;
         this.cancel();
     }
     /** cancel 取消未触发的重连。幂等。 */
     cancel() {
-        if (this.timer !== null) {
-            clearTimeout(this.timer);
-            this.timer = null;
-        }
+        this.timer.cancel();
     }
     /** attempts 供测试与诊断观察。 */
     get attempts() {

package/dist/signaling/reconnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"reconnector.js","sourceRoot":"","sources":["../../src/signaling/reconnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C;;;;;;;;GAQG;AACH,MAAM,OAAO,WAAW;IAOH;IACA;IACA;IARX,KAAK,GAAyC,IAAI,CAAC;IACnD,OAAO,GAAG,CAAC,CAAC;IACpB,2CAA2C;IACnC,OAAO,GAAG,KAAK,CAAC;IAExB,YACmB,SAA8B,EAC9B,QAAkC,EAClC,SAAuB,IAAI,CAAC,MAAM;QAFlC,cAAS,GAAT,SAAS,CAAqB;QAC9B,aAAQ,GAAR,QAAQ,CAA0B;QAClC,WAAM,GAAN,MAAM,CAA4B;IAClD,CAAC;IAEJ;;;;;;;OAOG;IACH,QAAQ;QACN,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;YAAE,OAAO;QAChD,MAAM,OAAO,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;QAClB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;gBAC3C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACnB,iCAAiC;gBACjC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;IAED,8CAA8C;IAC9C,SAAS;QACP,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;IAED;;;;;;OAMG;IACH,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,0BAA0B;IAC1B,MAAM;QACJ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,yBAAyB;IACzB,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}
+{"version":3,"file":"reconnector.js","sourceRoot":"","sources":["../../src/signaling/reconnector.ts"],"names":[],"mappings":"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"}

package/dist/signaling/resumeDeadline.d.ts

@@ -22,7 +22,7 @@ export declare function giveUpDelayMs(pingIntervalSec: number): number;
  */
 export declare class ResumeDeadline {
     private readonly onUnrecoverable;
-    private timer;
+    private readonly timer;
     private pingIntervalSec;
     constructor(onUnrecoverable: () => void);
     /**

package/dist/signaling/resumeDeadline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resumeDeadline.d.ts","sourceRoot":"","sources":["../../src/signaling/resumeDeadline.ts"],"names":[],"mappings":"AAEA,6DAA6D;AAC7D,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC,sCAAsC;AACtC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,kCAAkC;AAClC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAkBnC,wBAAgB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,cAAc;IAIb,OAAO,CAAC,QAAQ,CAAC,eAAe;IAH5C,OAAO,CAAC,KAAK,CAA8C;IAC3D,OAAO,CAAC,eAAe,CAAM;gBAEA,eAAe,EAAE,MAAM,IAAI;IAExD;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI;IAKxC;;;;;;OAMG;IACH,GAAG,IAAI,IAAI;IAWX,iCAAiC;IACjC,MAAM,IAAI,IAAI;IAOd,sBAAsB;IACtB,IAAI,KAAK,IAAI,OAAO,CAEnB;CACF"}
+{"version":3,"file":"resumeDeadline.d.ts","sourceRoot":"","sources":["../../src/signaling/resumeDeadline.ts"],"names":[],"mappings":"AAGA,6DAA6D;AAC7D,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAEpC,sCAAsC;AACtC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC,kCAAkC;AAClC,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAkBnC,wBAAgB,aAAa,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED;;;;;;;;;;;;;;GAcG;AACH,qBAAa,cAAc;IAIb,OAAO,CAAC,QAAQ,CAAC,eAAe;IAH5C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,OAAO,CAAC,eAAe,CAAM;gBAEA,eAAe,EAAE,MAAM,IAAI;IAExD;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI;IAKxC;;;;;;OAMG;IACH,GAAG,IAAI,IAAI;IAUX,iCAAiC;IACjC,MAAM,IAAI,IAAI;IAId,sBAAsB;IACtB,IAAI,KAAK,IAAI,OAAO,CAEnB;CACF"}

package/dist/signaling/resumeDeadline.js

@@ -1,4 +1,5 @@
 import { logger } from '../logger.js';
+import { OneShotTimer } from './oneShotTimer.js';
 /** 协议 §1.4 的恢复窗口：30 秒。**四端同一个值**，服务端的 `ResumeWindow` 也是它。 */
 export const RESUME_WINDOW_SEC = 30;
 /** 服务端判一条连接死掉要连续几个心跳周期收不到东西（§1.3）。 */
@@ -41,7 +42,7 @@ export function giveUpDelayMs(pingIntervalSec) {
  */
 export class ResumeDeadline {
     onUnrecoverable;
-    timer = null;
+    timer = new OneShotTimer();
     pingIntervalSec = 15;
     constructor(onUnrecoverable) {
         this.onUnrecoverable = onUnrecoverable;
@@ -64,26 +65,22 @@ export class ResumeDeadline {
      * 起点是第一次断开的那一刻，与服务端算的是同一笔账。
      */
     arm() {
-        if (this.timer !== null)
+        if (this.timer.armed)
             return;
         const delayMs = giveUpDelayMs(this.pingIntervalSec);
         logger.info('恢复窗口倒计时已起', { delayMs });
-        this.timer = setTimeout(() => {
-            this.timer = null;
+        this.timer.start(delayMs, () => {
             logger.warn('断开已超过恢复窗口，会话不可恢复', {});
             this.onUnrecoverable();
-        }, delayMs);
+        });
     }
     /** 撤销。连上了、或宿主 logout 了都要调。幂等。 */
     cancel() {
-        if (this.timer !== null) {
-            clearTimeout(this.timer);
-            this.timer = null;
-        }
+        this.timer.cancel();
     }
     /** armed 供测试与诊断观察。 */
     get armed() {
-        return this.timer !== null;
+        return this.timer.armed;
     }
 }
 //# sourceMappingURL=resumeDeadline.js.map

package/dist/signaling/resumeDeadline.js.map

@@ -1 +1 @@
-{"version":3,"file":"resumeDeadline.js","sourceRoot":"","sources":["../../src/signaling/resumeDeadline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,6DAA6D;AAC7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,sCAAsC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC,kCAAkC;AAClC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,aAAa,CAAC,eAAuB;IACnD,OAAO,CAAC,kBAAkB,GAAG,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,IAAI,CAAC;AAC/F,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,cAAc;IAII;IAHrB,KAAK,GAAyC,IAAI,CAAC;IACnD,eAAe,GAAG,EAAE,CAAC;IAE7B,YAA6B,eAA2B;QAA3B,oBAAe,GAAf,eAAe,CAAY;IAAG,CAAC;IAE5D;;;;;OAKG;IACH,SAAS,CAAC,eAAuB;QAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED;;;;;;OAMG;IACH,GAAG;QACD,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;YAAE,OAAO;QAChC,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC3B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YACpC,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;IAED,iCAAiC;IACjC,MAAM;QACJ,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;IACH,CAAC;IAED,sBAAsB;IACtB,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC;IAC7B,CAAC;CACF"}
+{"version":3,"file":"resumeDeadline.js","sourceRoot":"","sources":["../../src/signaling/resumeDeadline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,6DAA6D;AAC7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,sCAAsC;AACtC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC,kCAAkC;AAClC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAEnC;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,aAAa,CAAC,eAAuB;IACnD,OAAO,CAAC,kBAAkB,GAAG,eAAe,GAAG,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,IAAI,CAAC;AAC/F,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,cAAc;IAII;IAHZ,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;IACpC,eAAe,GAAG,EAAE,CAAC;IAE7B,YAA6B,eAA2B;QAA3B,oBAAe,GAAf,eAAe,CAAY;IAAG,CAAC;IAE5D;;;;;OAKG;IACH,SAAS,CAAC,eAAuB;QAC/B,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED;;;;;;OAMG;IACH,GAAG;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO;QAC7B,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;YACpC,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,iCAAiC;IACjC,MAAM;QACJ,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAED,sBAAsB;IACtB,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC1B,CAAC;CACF"}

package/dist/state/callMachine.d.ts

@@ -44,6 +44,13 @@ export interface CallContext {
      */
     readonly chatGroupId: string;
     readonly userData: string;
+    /**
+     * 发起人 uid：被叫来自 `call.incoming` / `call.connected`；主叫在自己那端不记（自己就是）。
+     * 只为 `callSummary` 记下，状态机不据它做决定。
+     */
+    readonly callerUid: string;
+    /** 1v1 的对端 uid（主叫 = 被叫，被叫 = 主叫）；群通话为空。同样只为 `callSummary` 记下。 */
+    readonly peerUid: string;
 }
 /** initialCallContext 是 idle 态的初值。 */
 export declare const initialCallContext: CallContext;

package/dist/state/callMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callMachine.d.ts","sourceRoot":"","sources":["../../src/state/callMachine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3F;;;;;;;;;;;;;GAaG;AAEH,yCAAyC;AACzC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,GAAG,WAAW,CAAC;AAEnG,6BAA6B;AAC7B,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,EAAE,CAAC;AAEhD,+BAA+B;AAC/B,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,uCAAuC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,sCAAsC;AACtC,eAAO,MAAM,kBAAkB,EAAE,WAYhC,CAAC;AAGF,uCAAuC;AACvC,wBAAgB,GAAG,CACjB,KAAK,EAAE,WAAW,EAClB,IAAI,GAAE,aAAa,EAAO,EAC1B,IAAI,GAAE,YAAY,EAAO,GACxB,aAAa,CAAC,WAAW,CAAC,CAE5B;AAED,8BAA8B;AAC9B,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,aAAa,CAAC,WAAW,CAAC,CAS5F;AA+ID,gDAAgD;AAChD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAehG"}
+{"version":3,"file":"callMachine.d.ts","sourceRoot":"","sources":["../../src/state/callMachine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3F;;;;;;;;;;;;;GAaG;AAEH,yCAAyC;AACzC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,YAAY,GAAG,WAAW,CAAC;AAEnG,6BAA6B;AAC7B,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,EAAE,CAAC;AAEhD,+BAA+B;AAC/B,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,uCAAuC;IACvC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,gEAAgE;IAChE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,sCAAsC;AACtC,eAAO,MAAM,kBAAkB,EAAE,WAchC,CAAC;AAGF,uCAAuC;AACvC,wBAAgB,GAAG,CACjB,KAAK,EAAE,WAAW,EAClB,IAAI,GAAE,aAAa,EAAO,EAC1B,IAAI,GAAE,YAAY,EAAO,GACxB,aAAa,CAAC,WAAW,CAAC,CAE5B;AAED,8BAA8B;AAC9B,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,aAAa,CAAC,WAAW,CAAC,CAS5F;AAsJD,gDAAgD;AAChD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,WAAW,CAAC,CAehG"}

package/dist/state/callMachine.js

@@ -16,6 +16,8 @@ export const initialCallContext = {
     cancelPending: false,
     chatGroupId: '',
     userData: '',
+    callerUid: '',
+    peerUid: '',
 };
 /** out 构造一次状态转移的产物。callRecv.ts 也用它。 */
 export function out(state, send = [], emit = []) {
@@ -114,7 +116,16 @@ function startCall(ctx, args) {
         data['user_data'] = userData;
     if (Object.hasOwn(args, 'timeout_sec'))
         data['timeout_sec'] = num(args, 'timeout_sec');
-    return out({ ...ctx, state: 'inviting', role: 'caller', mediaType, isGroup, chatGroupId, userData }, [{ type: FrameType.callInvite, data }]);
+    return out({
+        ...ctx,
+        state: 'inviting',
+        role: 'caller',
+        mediaType,
+        isGroup,
+        chatGroupId,
+        userData,
+        peerUid: isGroup ? '' : (calleeIds[0] ?? ''),
+    }, [{ type: FrameType.callInvite, data }]);
 }
 function acceptCall(ctx) {
     // 第二次 accept 必须**本地**拦下，不能发上去让服务端回 1405（不变量 R1 的同款理由）。
@@ -149,12 +160,10 @@ function joinOngoingCall(ctx, args) {
     ]);
 }
 function invalidState(ctx) {
-    return out(ctx, [], [
-        {
-            cb: 'onError',
-            args: { code: ErrorCode.invalidState, name: errorName(ErrorCode.invalidState) },
-        },
-    ]);
+    return {
+        ...out(ctx),
+        reject: { code: ErrorCode.invalidState, name: errorName(ErrorCode.invalidState) },
+    };
 }
 /** synthesizeNetworkEnd 是不变量 I8 的那个**唯一例外**。 */
 export function synthesizeNetworkEnd(ctx, nowMs) {

package/dist/state/callMachine.js.map

@@ -1 +1 @@
-{"version":3,"file":"callMachine.js","sourceRoot":"","sources":["../../src/state/callMachine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"callMachine.js","sourceRoot":"","sources":["../../src/state/callMachine.ts"],"names":[],"mappings":"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"}

package/dist/state/callRecv.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"callRecv.d.ts","sourceRoot":"","sources":["../../src/state/callRecv.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,YAAY,CAAC;AAa9D;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACtC,aAAa,CAAC,WAAW,CAAC,CA2C5B"}
+{"version":3,"file":"callRecv.d.ts","sourceRoot":"","sources":["../../src/state/callRecv.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAgB,aAAa,EAAE,MAAM,YAAY,CAAC;AAa9D;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACtC,aAAa,CAAC,WAAW,CAAC,CA8C5B"}

package/dist/state/callRecv.js

@@ -35,6 +35,9 @@ export function reduceRecv(ctx, type, data) {
             return handleInviteOk(ctx, data);
         case FrameType.callConnected:
             return handleConnected(ctx, data);
+        case FrameType.callRinging:
+            // 服务端发给通话里的所有人（协议 §4.2，2026-09-17 起），界面据此给正在响铃的人摆占位格。
+            return out(ctx, [], [{ cb: 'onUserRinging', args: { uid: str(data, 'uid') } }]);
         case FrameType.callAccepted:
             return out(ctx, [], [{ cb: 'onUserAccept', args: { uid: str(data, 'uid') } }]);
         case FrameType.callRejected:
@@ -58,7 +61,7 @@ export function reduceRecv(ctx, type, data) {
                 },
             ]);
         default:
-            // 其余（call.ringing、各种 .ok）不改状态也不抛回调。
+            // 其余（各种 .ok）不改状态也不抛回调。
             return out(ctx);
     }
 }
@@ -154,6 +157,8 @@ function handleIncoming(ctx, data) {
         // call.connected 自己带的值，这里存的是万一它为空时的回落。
         chatGroupId: str(data, 'chat_group_id'),
         userData: str(data, 'user_data'),
+        callerUid: caller,
+        peerUid: bool(data, 'is_group') ? '' : caller,
     };
     return out(next, [], [
         {
@@ -164,6 +169,8 @@ function handleIncoming(ctx, data) {
                 inviter,
                 // **原样带上**：群通话里被叫要靠它摆占位格（见 events.ts 的字段注释）。
                 callee_ids: strArray(data, 'callee_ids'),
+                // 此刻已在通话里的人；旧服务端不带 = 空，界面回落成「只有 caller 在通话里」。
+                joined_ids: strArray(data, 'joined_ids'),
                 media_type: mediaType,
                 is_group: next.isGroup,
                 chat_group_id: next.chatGroupId,
@@ -200,6 +207,7 @@ function handleConnected(ctx, data) {
         connectedAtMs: num(data, 'connected_at_ms'),
         chatGroupId,
         userData,
+        callerUid: str(data, 'caller') || ctx.callerUid,
     };
     return out(next, [{ type: FrameType.roomJoin, data: { room_id: roomId, room_token: roomToken } }], [
         {

package/dist/state/callRecv.js.map

@@ -1 +1 @@
-{"version":3,"file":"callRecv.js","sourceRoot":"","sources":["../../src/state/callRecv.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"callRecv.js","sourceRoot":"","sources":["../../src/state/callRecv.ts"],"names":[],"mappings":"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"}

package/dist/state/engineMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engineMachine.d.ts","sourceRoot":"","sources":["../../src/state/engineMachine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAgB,YAAY,EAAE,aAAa,EAAiB,MAAM,YAAY,CAAC;AAG3F;;;;;;;;;;;;;;;GAeG;AAEH,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,iCAAiC;AACjC,eAAO,MAAM,oBAAoB,EAAE,aAIlC,CAAC;AAiBF;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,YAAY,EACnB,KAAK,GAAE,MAAmB,GACzB,aAAa,CAAC,aAAa,CAAC,CAE9B"}
+{"version":3,"file":"engineMachine.d.ts","sourceRoot":"","sources":["../../src/state/engineMachine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,KAAK,EAAgB,YAAY,EAAE,aAAa,EAAiB,MAAM,YAAY,CAAC;AAG3F;;;;;;;;;;;;;;;GAeG;AAEH,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,iCAAiC;AACjC,eAAO,MAAM,oBAAoB,EAAE,aAIlC,CAAC;AAkCF;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,YAAY,EACnB,KAAK,GAAE,MAAmB,GACzB,aAAa,CAAC,aAAa,CAAC,CAE9B"}

package/dist/state/engineMachine.js

@@ -19,8 +19,25 @@ const ROOM_ACTS = new Set([
     'update_layer',
     'restart_pub_ice',
 ]);
-/** ROOM_FAILURES 是帧循环把「房间帧没送到」翻译成的内部事件，全归房间机。 */
-const ROOM_FAILURES = new Set(['join_failed', 'leave_failed', 'publish_failed', 'subscribe_failed']);
+/**
+ * ROOM_INTERNALS 是**只归房间机**的内部事件。
+ *
+ * 前五条是帧循环把「房间帧没送到」翻译过来的回滚；最后一条是会议房翻页退订的五秒
+ * 迟滞到点（`roomPaging.ts`）。**不显式路由的话它们会落到通话机去，被静默丢掉**——
+ * 症状分别是「房间永远停在 joining」和「翻走的人五秒后没退订，订阅位一直占着」。
+ *
+ * `publish_deferred`（发布没等到应答、挂起等重连）同样只归房间机——**iOS 那边最初漏了
+ * 把它加进同一张表，事件被静默路由到通话机丢掉，整个「挂起重放」功能从没生效过，
+ * 2026-09-18 才补上**。三端这张表要一起对：Android 的 `roomInternals` 同理。
+ */
+const ROOM_INTERNALS = new Set([
+    'join_failed',
+    'leave_failed',
+    'publish_failed',
+    'publish_deferred',
+    'subscribe_failed',
+    'unsubscribe_hysteresis_elapsed',
+]);
 /**
  * reduceEngine 是 engine 状态的唯一入口。
  *
@@ -144,8 +161,7 @@ function handleInternal(ctx, input) {
         // 交给通话机回 idle；它抛的 onCallEnd 会顺带把房间也清掉（见 liftCall）。
         return liftCall(ctx, reduceCall(ctx.call, { kind: 'internal', name }));
     }
-    // 房间那几条失败回滚都归房间机；不显式路由的话它们会落到通话机去，被静默丢掉。
-    if (ROOM_FAILURES.has(name)) {
+    if (ROOM_INTERNALS.has(name)) {
         const room = reduceRoom(ctx.room, input);
         return { state: { ...ctx, room: room.state }, send: [...room.send], emit: [...room.emit] };
     }
@@ -167,10 +183,14 @@ function routeAct(ctx, input) {
         return liftCall(ctx, reduceCall(ctx.call, input));
     if (ROOM_ACTS.has(input.op)) {
         const room = reduceRoom(ctx.room, input);
-        return { state: { ...ctx, room: room.state }, send: [...room.send], emit: [...room.emit] };
+        return withReject({ state: { ...ctx, room: room.state }, send: [...room.send], emit: [...room.emit] }, room);
     }
     return { state: ctx, send: [], emit: [] };
 }
+/** withReject 把子状态机的本地拒绝原样带到 engine 层——漏带的话调用方拿不到结果。 */
+function withReject(lifted, from) {
+    return from.reject === undefined ? lifted : { ...lifted, reject: from.reject };
+}
 /**
  * liftCall 把通话机的输出抬到 engine 层，并**把 room.join 转交给房间机**。
  *
@@ -205,6 +225,6 @@ function liftCall(ctx, result) {
     if (emit.some((event) => event.cb === 'onCallEnd')) {
         room = clearedRoom('idle');
     }
-    return { state: { ...ctx, room, call: result.state }, send, emit };
+    return withReject({ state: { ...ctx, room, call: result.state }, send, emit }, result);
 }
 //# sourceMappingURL=engineMachine.js.map

package/dist/state/engineMachine.js.map

@@ -1 +1 @@
-{"version":3,"file":"engineMachine.js","sourceRoot":"","sources":["../../src/state/engineMachine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"engineMachine.js","sourceRoot":"","sources":["../../src/state/engineMachine.ts"],"names":[],"mappings":"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"}

package/dist/state/roomMachine.d.ts

@@ -1,4 +1,4 @@
-import type { Layer, TrackKind } from '../signaling/enums.js';
+import type { AutoSubscribeMode, Layer, TrackKind } from '../signaling/enums.js';
 import type { EmittedEvent, MachineInput, MachineOutput, OutgoingFrame } from './types.js';
 /**
  * 房间状态机：RTC_PROTOCOL.md §5.3 的 TS 实现。
@@ -32,7 +32,8 @@ export interface RoomContext {
     readonly roomId: string;
     readonly roomToken: string;
     readonly participantId: string;
-    readonly autoSubscribe: boolean;
+    /** 进房时声明的自动订阅档位（协议 §3.1）。会议房是 'audio'，通话房是 'all'。 */
+    readonly autoSubscribe: AutoSubscribeMode;
     /** cid → 发布状态。用 cid 而不是 track_id：发布请求发出时还没有 track_id。 */
     readonly publish: Readonly<Record<string, PublishState>>;
     /** cid → 服务端分配的 track_id。 */
@@ -45,6 +46,13 @@ export interface RoomContext {
     readonly layers: Readonly<Record<string, Layer>>;
     /** joining / reconnecting 期间缓存的用户意图（不变量 R2）。 */
     readonly buffered: readonly BufferedIntent[];
+    /**
+     * 翻页翻走、等五秒迟滞到点才退订的 track_id，**最早翻走的排在前面**（`roomPaging.ts`）。
+     *
+     * 顺序有用：订满 16 路要提前腾位置时，退的就是最早翻走的那一个。
+     * **不进一致性向量**——向量只断言 room / publish / subscribe 三个键。
+     */
+    readonly pendingUnsubscribe: readonly string[];
     /**
      * 这个房间**真的收到过 `room.join.ok`** 吗。
      *

package/dist/state/roomMachine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"roomMachine.d.ts","sourceRoot":"","sources":["../../src/state/roomMachine.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAG3F;;;;;;;;;;;;;GAaG;AAEH,yBAAyB;AACzB,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,CAAC;AAEnF,sCAAsC;AACtC,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,WAAW,GAAG,cAAc,CAAC;AAEvE,wCAAwC;AACxC,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,YAAY,GAAG,eAAe,CAAC;AAE5E,mCAAmC;AACnC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;CAChC;AAED,iCAAiC;AACjC,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;IAChC,yDAAyD;IACzD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACzD,6BAA6B;IAC7B,QAAQ,CAAC,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3D,uBAAuB;IACvB,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAC7D,gEAAgE;IAChE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAC7D,+BAA+B;IAC/B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IACjD,gDAAgD;IAChD,QAAQ,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IAC7C;;;;;;;;;OASG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAClD;AAED,sCAAsC;AACtC,eAAO,MAAM,kBAAkB,EAAE,WAahC,CAAC;AAEF,2CAA2C;AAC3C,wBAAgB,OAAO,CACrB,KAAK,EAAE,WAAW,EAClB,IAAI,GAAE,aAAa,EAAO,EAC1B,IAAI,GAAE,YAAY,EAAO,GACxB,aAAa,CAAC,WAAW,CAAC,CAE5B;AAED,iDAAiD;AACjD,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,CAEzD;AAED,8BAA8B;AAC9B,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,aAAa,CAAC,WAAW,CAAC,CAS5F;AA8ED;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,WAAW,CAAC,CAKzF;AA+BD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,aAAa,CAAC,WAAW,CAAC,CAa3E"}
+{"version":3,"file":"roomMachine.d.ts","sourceRoot":"","sources":["../../src/state/roomMachine.ts"],"names":[],"mappings":"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"}