egos-transfer 0.2.7 → 0.2.8

package/dist/connection-manager.js

@@ -81,25 +81,26 @@ class ConnectionManager {
         return conn;
     }
     remove(peerId, connectionId) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const conn = this.pool.get(peerId);
         if (conn) {
             if (connectionId && conn.connectionId !== connectionId)
                 return;
             this.pool.delete(peerId);
-            // 清理 connectionstatechange listener
-            // (conn as any).__cm_stateChangeCleanup?.();
-            // conn.removeAllListeners();
-            // conn.close();
-            // this.deps.getPeer()?._removeConnection(conn);
+            // 先 close 触发 close 事件（handleConnClosed 会结算 in-flight 请求），
+            // 再清理监听器与 PeerJS 内部引用，避免僵尸连接堆积导致无法建立新连接
+            conn.close();
+            (_b = (_a = conn).__cm_stateChangeCleanup) === null || _b === void 0 ? void 0 : _b.call(_a);
+            conn.removeAllListeners();
+            (_c = this.deps.getPeer()) === null || _c === void 0 ? void 0 : _c._removeConnection(conn);
         }
         else {
             // 清理 Peer 内部残留的 connection 引用
-            const connections = ((_a = this.deps.getPeer()) === null || _a === void 0 ? void 0 : _a.connections) || {};
+            const connections = ((_d = this.deps.getPeer()) === null || _d === void 0 ? void 0 : _d.connections) || {};
             for (const c of connections[peerId] || []) {
                 c.removeAllListeners();
                 c.close();
-                (_b = this.deps.getPeer()) === null || _b === void 0 ? void 0 : _b._removeConnection(c);
+                (_e = this.deps.getPeer()) === null || _e === void 0 ? void 0 : _e._removeConnection(c);
             }
         }
     }
@@ -111,7 +112,10 @@ class ConnectionManager {
         return ['connected', 'completed'].includes(conn.peerConnection.connectionState);
     }
     handleConnClosed(conn) {
+        var _a;
         this.pool.delete(conn.peer);
+        // 同步移除 PeerJS 内部引用，避免僵尸连接堆积
+        (_a = this.deps.getPeer()) === null || _a === void 0 ? void 0 : _a._removeConnection(conn);
         this.deps.onConnClosed(conn);
     }
     // ── Health check ─────────────────────────────────────────────────

package/dist/peer-transfer.d.ts

@@ -90,5 +90,6 @@ export declare abstract class PeerTransfer {
      */
     stop(): void;
     private destroyPeer;
+    askReload(peerId: string): void;
 }
 export {};

package/dist/peer-transfer.js

@@ -55,10 +55,9 @@ class PeerTransfer {
     // ── Peer lifecycle ──────────────────────────────────────────────
     createPeer(force) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            console.info('createPeer##', (_a = this.peer) === null || _a === void 0 ? void 0 : _a.open, force);
+            var _a;
             this._exited = false;
-            if (((_b = this.peer) === null || _b === void 0 ? void 0 : _b.open) && !force) {
+            if (((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open) && !force) {
                 return this.peer;
             }
             this.destroyPeer();
@@ -68,7 +67,13 @@ class PeerTransfer {
             yield this.waitForOpen(peer);
             this.destroyed = false;
             peer.on('close', () => {
-                setTimeout(() => this.destroyed && this.reconnect(), exports.PEER_CLOSE_RECONNECT_TIMEOUT);
+                // 仅当 Peer 非主动销毁（stop/clearInstance/重建）时才重连
+                setTimeout(() => {
+                    if (this.destroyed || this._exited) {
+                        return;
+                    }
+                    this.reconnect();
+                }, exports.PEER_CLOSE_RECONNECT_TIMEOUT);
             });
             peer.on('error', (err) => {
                 // 覆盖所有与 signaling server 断连相关的错误类型
@@ -88,6 +93,10 @@ class PeerTransfer {
             socket === null || socket === void 0 ? void 0 : socket.on('message', (message) => {
                 this.handleSocketMessage(message);
             });
+            // signaling socket 断开时主动重连（兜底：部分场景不触发 peer error）
+            socket === null || socket === void 0 ? void 0 : socket.on('disconnected', () => {
+                this.reconnect();
+            });
             // 启动连接健康检查
             this.connectionManager.startHealthCheck();
             // 启动空闲重连定时器
@@ -144,6 +153,9 @@ class PeerTransfer {
             case 'HEARTBEAT':
                 this.resetHeartbeatTimer();
                 break;
+            case 'RELOAD':
+                this.reconnect(true);
+                break;
             case 'ERROR':
                 if (((_a = message.payload) === null || _a === void 0 ? void 0 : _a.msg) === constant_1.CONNECTION_PEER_CONFLICT) {
                     this.getStore().dispatch({
@@ -152,6 +164,9 @@ class PeerTransfer {
                     });
                 }
                 break;
+            default:
+                console.log('unknown socket message type', message);
+                break;
         }
     }
     // ── Connection management ───────────────────────────────────────
@@ -257,13 +272,6 @@ class PeerTransfer {
     onConnClosed(conn) {
         const reqIds = this.connRequests.get(conn.connectionId);
         if (reqIds) {
-            // for (const reqId of reqIds) {
-            //   const cb = this.requests.get(reqId);
-            //   if (cb) {
-            //     cb({ error: { message: 'connection closed', code: 'CONN_CLOSED' } } as any);
-            //     this.requests.delete(reqId);
-            //   }
-            // }
             this.connRequests.delete(conn.connectionId);
         }
     }
@@ -561,5 +569,16 @@ class PeerTransfer {
         (_b = this.peer) === null || _b === void 0 ? void 0 : _b.removeAllListeners();
         this.peer = undefined;
     }
+    askReload(peerId) {
+        var _a;
+        (_a = this.peer) === null || _a === void 0 ? void 0 : _a.socket.send({
+            type: 'RELOAD',
+            payload: {
+                type: 'RELOAD',
+                src: this.peerId,
+                dst: peerId,
+            },
+        });
+    }
 }
 exports.PeerTransfer = PeerTransfer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egos-transfer",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "1234",
   "homepage": "https://github.com/superbogy/peer-transfer#readme",
   "bugs": {

package/src/connection-manager.ts

@@ -103,11 +103,12 @@ export class ConnectionManager {
     if (conn) {
       if (connectionId && conn.connectionId !== connectionId) return;
       this.pool.delete(peerId);
-      // 清理 connectionstatechange listener
-      // (conn as any).__cm_stateChangeCleanup?.();
-      // conn.removeAllListeners();
-      // conn.close();
-      // this.deps.getPeer()?._removeConnection(conn);
+      // 先 close 触发 close 事件（handleConnClosed 会结算 in-flight 请求），
+      // 再清理监听器与 PeerJS 内部引用，避免僵尸连接堆积导致无法建立新连接
+      conn.close();
+      (conn as any).__cm_stateChangeCleanup?.();
+      conn.removeAllListeners();
+      this.deps.getPeer()?._removeConnection(conn);
     } else {
       // 清理 Peer 内部残留的 connection 引用
       const connections = this.deps.getPeer()?.connections || {};
@@ -127,6 +128,8 @@ export class ConnectionManager {
 
   private handleConnClosed(conn: DataConnection): void {
     this.pool.delete(conn.peer);
+    // 同步移除 PeerJS 内部引用，避免僵尸连接堆积
+    this.deps.getPeer()?._removeConnection(conn);
     this.deps.onConnClosed(conn);
   }
 

package/src/peer-transfer.ts

@@ -7,7 +7,7 @@ import {
   PING_TIMEOUT,
   UNAUTHORIZED,
 } from './constant';
-import { DataConnection, Peer, PeerOptions } from 'peerjs';
+import { DataConnection, Peer, PeerOptions, ServerMessageType } from 'peerjs';
 import {
   IDeviceStatus,
   IMessage,
@@ -89,11 +89,11 @@ export abstract class PeerTransfer {
   // ── Peer lifecycle ──────────────────────────────────────────────
 
   async createPeer(force?: boolean): Promise<Peer> {
-    console.info('createPeer##', this.peer?.open, force);
     this._exited = false;
     if (this.peer?.open && !force) {
       return this.peer;
     }
+    console.info('create peer', Date.now());
     this.destroyPeer();
     await this.reloadConfig();
 
@@ -103,7 +103,13 @@ export abstract class PeerTransfer {
     await this.waitForOpen(peer);
     this.destroyed = false;
     peer.on('close', () => {
-      setTimeout(() => this.destroyed && this.reconnect(), PEER_CLOSE_RECONNECT_TIMEOUT);
+      // 仅当 Peer 非主动销毁（stop/clearInstance/重建）时才重连
+      setTimeout(() => {
+        if (this.destroyed || this._exited) {
+          return;
+        }
+        this.reconnect();
+      }, PEER_CLOSE_RECONNECT_TIMEOUT);
     });
 
     peer.on('error', (err) => {
@@ -128,6 +134,10 @@ export abstract class PeerTransfer {
     socket?.on('message', (message: IMessage) => {
       this.handleSocketMessage(message);
     });
+    // signaling socket 断开时主动重连（兜底：部分场景不触发 peer error）
+    socket?.on('disconnected', () => {
+      this.reconnect();
+    });
 
     // 启动连接健康检查
     this.connectionManager.startHealthCheck();
@@ -190,6 +200,9 @@ export abstract class PeerTransfer {
       case 'HEARTBEAT':
         this.resetHeartbeatTimer();
         break;
+      case 'RELOAD':
+        this.reconnect(true);
+        break;
       case 'ERROR':
         if (message.payload?.msg === CONNECTION_PEER_CONFLICT) {
           this.getStore().dispatch({
@@ -198,6 +211,8 @@ export abstract class PeerTransfer {
           });
         }
         break;
+      default:
+        break;
     }
   }
 
@@ -309,13 +324,6 @@ export abstract class PeerTransfer {
   private onConnClosed(conn: DataConnection) {
     const reqIds = this.connRequests.get(conn.connectionId);
     if (reqIds) {
-      // for (const reqId of reqIds) {
-      //   const cb = this.requests.get(reqId);
-      //   if (cb) {
-      //     cb({ error: { message: 'connection closed', code: 'CONN_CLOSED' } } as any);
-      //     this.requests.delete(reqId);
-      //   }
-      // }
       this.connRequests.delete(conn.connectionId);
     }
   }
@@ -351,7 +359,6 @@ export abstract class PeerTransfer {
     if (this.destroyed) {
       return { ...payload, body: {}, error: { message: 'destroyed', code: 'CONN_CLOSED' } } as any;
     }
-
     const conn = await this.connectToPeer(peerId);
     if (!this.isValidConnection(conn)) {
       return {
@@ -554,6 +561,7 @@ export abstract class PeerTransfer {
   // ── Router integration ──────────────────────────────────────────
 
   async onRequest(conn: DataConnection, message: PeerMessage) {
+    console.info('onRequest===>', message.route);
     this.resetIdleTimer();
     try {
       await this.router.run(conn, message);
@@ -563,6 +571,7 @@ export abstract class PeerTransfer {
   }
 
   async onResponse(_conn: DataConnection, message: PeerMessage) {
+    console.info('onResponse<====', message.route);
     this.resetIdleTimer();
     // 优先检查 health check ping 回调
     const cb = this.requests.get(message.requestId);
@@ -618,7 +627,7 @@ export abstract class PeerTransfer {
     }
     this.heartbeatTimer = setTimeout(() => {
       if (!this.destroyed) {
-        this.reconnect(true);
+        this.reconnect();
       }
     }, HEARTBEAT_TIMEOUT);
   }
@@ -668,4 +677,12 @@ export abstract class PeerTransfer {
     this.peer?.removeAllListeners();
     this.peer = undefined;
   }
+
+  askReload(peerId: string) {
+    this.peer?.socket.send({
+      type: 'RELOAD',
+      payload: {},
+      dst: peerId,
+    });
+  }
 }