egos-transfer 0.2.12 → 0.2.14

package/dist/connection-manager.d.ts

@@ -15,8 +15,6 @@ export interface ConnectionManagerDeps {
  */
 export declare class ConnectionManager {
     private pool;
-    /** peerId → 连接入池时间戳 */
-    private createdAt;
     private healthCheckTimer;
     private pingRequests;
     private destroyed;
@@ -32,9 +30,13 @@ export declare class ConnectionManager {
      * @param conn - 已打开的 DataConnection
      * @param onData - 数据事件回调（由 PeerTransfer 提供，路由消息）
      */
-    setup(conn: DataConnection, onData: (message: any) => void): DataConnection;
+    setup(conn: DataConnection & {
+        timestamp?: number;
+    }, onData: (message: any) => void): DataConnection;
     remove(peerId: string, connectionId?: string): void;
-    isValid(conn?: DataConnection): boolean;
+    isValid(conn?: DataConnection & {
+        timestamp?: number;
+    }): boolean;
     private handleConnClosed;
     startHealthCheck(): void;
     stopHealthCheck(): void;

package/dist/connection-manager.js

@@ -22,8 +22,6 @@ const MAX_CONNECTION_AGE = 15 * 60 * 1000;
 class ConnectionManager {
     constructor(deps) {
         this.pool = new Map();
-        /** peerId → 连接入池时间戳 */
-        this.createdAt = new Map();
         this.healthCheckTimer = null;
         this.pingRequests = new Map();
         this.destroyed = false;
@@ -64,8 +62,8 @@ class ConnectionManager {
      * @param onData - 数据事件回调（由 PeerTransfer 提供，路由消息）
      */
     setup(conn, onData) {
+        conn.timestamp = Date.now();
         this.pool.set(conn.peer, conn);
-        this.createdAt.set(conn.peer, Date.now());
         conn.on('data', onData);
         conn.on('close', () => this.handleConnClosed(conn));
         conn.on('error', () => this.handleConnClosed(conn));
@@ -92,7 +90,6 @@ class ConnectionManager {
             if (connectionId && conn.connectionId !== connectionId)
                 return;
             this.pool.delete(peerId);
-            this.createdAt.delete(peerId);
             // 先 close 触发 close 事件（handleConnClosed 会结算 in-flight 请求），
             // 再清理监听器与 PeerJS 内部引用，避免僵尸连接堆积导致无法建立新连接
             conn.close();
@@ -111,10 +108,13 @@ class ConnectionManager {
         }
     }
     isValid(conn) {
-        if (!(conn === null || conn === void 0 ? void 0 : conn.open))
+        if (!(conn === null || conn === void 0 ? void 0 : conn.open) || !(conn === null || conn === void 0 ? void 0 : conn.peerConnection)) {
             return false;
-        if (!(conn === null || conn === void 0 ? void 0 : conn.peerConnection))
+        }
+        // 检查连接是否过期
+        if (conn.timestamp && Date.now() - conn.timestamp > MAX_CONNECTION_AGE) {
             return false;
+        }
         return ['connected', 'completed'].includes(conn.peerConnection.connectionState);
     }
     handleConnClosed(conn) {
@@ -210,7 +210,6 @@ class ConnectionManager {
             this.remove(peerId);
         }
         this.pool.clear();
-        this.createdAt.clear();
         this.pingRequests.clear();
     }
 }

package/dist/peer-transfer.js

@@ -511,7 +511,10 @@ class PeerTransfer {
     // ── Router integration ──────────────────────────────────────────
     onRequest(conn, message) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.info('onRequest===>', message.route);
+            var _a;
+            if (((_a = this.peerConfig) === null || _a === void 0 ? void 0 : _a.debug) >= 2) {
+                console.info('onRequest===>', message.route);
+            }
             // this.resetIdleTimer();
             try {
                 yield this.router.run(conn, message);
@@ -523,7 +526,10 @@ class PeerTransfer {
     }
     onResponse(_conn, message) {
         return __awaiter(this, void 0, void 0, function* () {
-            console.info('onResponse<====', message.route);
+            var _a;
+            if (((_a = this.peerConfig) === null || _a === void 0 ? void 0 : _a.debug) >= 2) {
+                console.info('onResponse<====', message.route);
+            }
             // this.resetIdleTimer();
             // 优先检查 health check ping 回调
             const cb = this.requests.get(message.requestId);
@@ -587,7 +593,6 @@ class PeerTransfer {
         this.abortCreate();
         this.clearIdleTimer();
         this.clearHeartbeatTimer();
-        this.connectionManager.destroy();
         this.requests.clear();
         this.connRequests.clear();
         this.destroyPeer();
@@ -619,9 +624,9 @@ class PeerTransfer {
         this.lastPeerCreatedAt = 0; // 重置节流，createPeer 可立即再次创建
     }
     destroyPeer() {
-        var _a, _b;
+        var _a;
+        // @todo 是否需要清流 peer?
         (_a = this.peer) === null || _a === void 0 ? void 0 : _a.destroy();
-        (_b = this.peer) === null || _b === void 0 ? void 0 : _b.removeAllListeners();
         this.peer = undefined;
     }
     askReload(peerId) {

package/package.json

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

package/src/peer-transfer.ts

@@ -605,7 +605,10 @@ export abstract class PeerTransfer {
   // ── Router integration ──────────────────────────────────────────
 
   async onRequest(conn: DataConnection, message: PeerMessage) {
-    console.info('onRequest===>', message.route);
+    if (this.peerConfig?.debug >= 2) {
+      console.info('onRequest===>', message.route);
+    }
+
     // this.resetIdleTimer();
     try {
       await this.router.run(conn, message);
@@ -615,7 +618,10 @@ export abstract class PeerTransfer {
   }
 
   async onResponse(_conn: DataConnection, message: PeerMessage) {
-    console.info('onResponse<====', message.route);
+    if (this.peerConfig?.debug >= 2) {
+      console.info('onResponse<====', message.route);
+    }
+
     // this.resetIdleTimer();
     // 优先检查 health check ping 回调
     const cb = this.requests.get(message.requestId);
@@ -688,9 +694,6 @@ export abstract class PeerTransfer {
     this.abortCreate();
     this.clearIdleTimer();
     this.clearHeartbeatTimer();
-
-    this.connectionManager.destroy();
-
     this.requests.clear();
     this.connRequests.clear();
     this.destroyPeer();
@@ -726,8 +729,8 @@ export abstract class PeerTransfer {
   }
 
   private destroyPeer() {
+    // @todo 是否需要清流 peer?
     this.peer?.destroy();
-    this.peer?.removeAllListeners();
     this.peer = undefined;
   }