egos-transfer 0.2.6 → 0.2.8

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,
+    });
+  }
 }