egos-transfer 0.2.4 → 0.2.6

package/package.json

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

package/src/connection-manager.ts

@@ -0,0 +1,223 @@
+import { DataConnection, Peer } from 'peerjs';
+import { PeerAction, PeerRoutes, PeerScope } from './entity';
+
+import { PING_TIMEOUT } from './constant';
+
+type ResponseCb = (args: any) => void;
+
+const HEALTH_CHECK_INTERVAL = 15000;
+
+export interface ConnectionManagerDeps {
+  /** 获取当前 Peer 实例（PeerTransfer 可能异步重建） */
+  getPeer: () => Peer | undefined;
+  peerId: string;
+  ping: (peerId: string) => Promise<boolean>;
+  /** 连接关闭时回调，由 PeerTransfer 处理未完成的请求结算 */
+  onConnClosed: (conn: DataConnection) => void;
+}
+
+/**
+ * DataConnection 连接池管理器
+ * - 管理 DataConnection 的生命周期（注册/移除/有效性检查）
+ * - 15 秒定时健康检查：ping 每个连接，不通则丢弃
+ * - 监听 connectionstatechange，终态时自动清理
+ */
+export class ConnectionManager {
+  private pool = new Map<string, DataConnection>();
+  private healthCheckTimer: ReturnType<typeof setInterval> | null = null;
+  private pingRequests = new Map<string, ResponseCb>();
+  private destroyed = false;
+
+  private readonly deps: ConnectionManagerDeps;
+
+  constructor(deps: ConnectionManagerDeps) {
+    this.deps = deps;
+  }
+
+  // ── Pool access ──────────────────────────────────────────────────
+
+  get(peerId: string): DataConnection | undefined {
+    const conn = this.pool.get(peerId);
+    if (!conn) {
+      return;
+    }
+    if (this.isValid(conn)) {
+      return conn;
+    } else {
+      this.remove(peerId);
+      return;
+    }
+  }
+
+  has(peerId: string): boolean {
+    return this.pool.has(peerId);
+  }
+
+  get size(): number {
+    return this.pool.size;
+  }
+
+  getAllPeers(): string[] {
+    return Array.from(this.pool.keys());
+  }
+
+  clean(): void {
+    for (const peerId of this.getAllPeers()) {
+      this.remove(peerId);
+    }
+  }
+
+  // ── Connection lifecycle ─────────────────────────────────────────
+
+  /**
+   * 注册一个连接：入池、绑定 data/close/error/connectionstatechange 事件
+   * @param conn - 已打开的 DataConnection
+   * @param onData - 数据事件回调（由 PeerTransfer 提供，路由消息）
+   */
+  setup(conn: DataConnection, onData: (message: any) => void): DataConnection {
+    this.pool.set(conn.peer, conn);
+    conn.on('data', onData);
+    conn.on('close', () => this.handleConnClosed(conn));
+    conn.on('error', () => this.handleConnClosed(conn));
+
+    // 监听底层 RTCPeerConnection 的 connectionstatechange，终态时自动清理
+    const pc = conn.peerConnection as any;
+    if (pc) {
+      const onStateChange = () => {
+        if (pc.connectionState === 'failed' || pc.connectionState === 'closed') {
+          this.handleConnClosed(conn);
+        }
+      };
+      pc.addEventListener('connectionstatechange', onStateChange);
+      // 将清理函数挂到 conn 上，remove 时一并移除
+      (conn as any).__cm_stateChangeCleanup = () => {
+        pc.removeEventListener('connectionstatechange', onStateChange);
+      };
+    }
+
+    return conn;
+  }
+
+  remove(peerId: string, connectionId?: string): void {
+    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);
+    } else {
+      // 清理 Peer 内部残留的 connection 引用
+      const connections = this.deps.getPeer()?.connections || {};
+      for (const c of connections[peerId] || []) {
+        c.removeAllListeners();
+        c.close();
+        this.deps.getPeer()?._removeConnection(c);
+      }
+    }
+  }
+
+  isValid(conn?: DataConnection): boolean {
+    if (!conn?.open) return false;
+    if (!conn?.peerConnection) return false;
+    return ['connected', 'completed'].includes(conn.peerConnection.connectionState);
+  }
+
+  private handleConnClosed(conn: DataConnection): void {
+    this.pool.delete(conn.peer);
+    this.deps.onConnClosed(conn);
+  }
+
+  // ── Health check ─────────────────────────────────────────────────
+
+  startHealthCheck(): void {
+    if (this.destroyed) return;
+    this.stopHealthCheck();
+    this.healthCheckTimer = setInterval(() => {
+      this.checkAllConnections();
+    }, HEALTH_CHECK_INTERVAL);
+  }
+
+  stopHealthCheck(): void {
+    if (this.healthCheckTimer !== null) {
+      clearInterval(this.healthCheckTimer);
+      this.healthCheckTimer = null;
+    }
+  }
+
+  private async checkAllConnections(): Promise<void> {
+    const peers = this.getAllPeers();
+    for (const peerId of peers) {
+      const conn = this.pool.get(peerId);
+      if (!conn) continue;
+      const alive = await this.pingConnection(conn);
+      if (!alive) {
+        this.remove(peerId);
+      }
+    }
+  }
+
+  private async pingConnection(conn: DataConnection): Promise<boolean> {
+    try {
+      if (!this.isValid(conn)) {
+        return false;
+      }
+      return await this.deps.ping(conn.peer);
+      // const requestId = await this.deps.genRequestId();
+      // return new Promise<boolean>((resolve) => {
+      //   const timer = setTimeout(() => {
+      //     this.pingRequests.delete(requestId);
+      //     resolve(false);
+      //   }, PING_TIMEOUT);
+      //   this.pingRequests.set(requestId, () => {
+      //     clearTimeout(timer);
+      //     resolve(true);
+      //   });
+      //   conn.send({
+      //     route: PeerRoutes.HEARTBEAT,
+      //     method: 'get',
+      //     body: {},
+      //     requestId,
+      //     scope: PeerScope.REQUEST,
+      //     action: PeerAction.SEND,
+      //     src: this.deps.peerId,
+      //     dest: conn.peer,
+      //     headers: {},
+      //     createdAt: Date.now(),
+      //   });
+      // });
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * 由 PeerTransfer.onResponse 调用，优先处理 ping 回调
+   * @returns true 表示该 requestId 是 health check 并已处理
+   */
+  tryResolvePing(requestId: string): boolean {
+    const cb = this.pingRequests.get(requestId);
+    if (cb) {
+      cb({});
+      this.pingRequests.delete(requestId);
+      return true;
+    }
+    return false;
+  }
+
+  // ── Lifecycle ───────────────────────────────────────────────────
+
+  destroy(): void {
+    this.destroyed = true;
+    this.stopHealthCheck();
+
+    for (const peerId of this.getAllPeers()) {
+      this.remove(peerId);
+    }
+
+    this.pool.clear();
+    this.pingRequests.clear();
+  }
+}

package/src/file-transfer.ts

@@ -346,7 +346,6 @@ export class FileTransfer {
     }
     if (processed.length === totalChunk) {
       const checksum = await this.taskService.verifyFile(task.transId);
-      console.log('file verify', checksum);
       if (checksum) {
         await this.done(task);
         await this.updateTask(task.transId, {