egos-transfer 0.1.8 → 0.2.0

package/dist/index.d.ts

@@ -42,7 +42,7 @@ export declare abstract class PeerTransfer {
     abstract onConnectLimit(): void;
     abstract reloadConfig(config?: Record<string, any>): Promise<void>;
     createPeer(force?: boolean): Promise<Peer | undefined>;
-    initialize(peer: Peer): Promise<void>;
+    initialize(peer: Peer): Promise<Peer>;
     handleSocketMessage(message: IMessage): void;
     onHeartbeat(message: IMessage): void;
     onError(message: IMessage): void;

package/dist/index.js

@@ -32,6 +32,7 @@ const peerjs_1 = require("peerjs");
 const entity_1 = require("./entity");
 const router_1 = require("./router");
 const axios_1 = __importDefault(require("axios"));
+const delay_1 = __importDefault(require("delay"));
 class PeerTransfer {
     constructor(deviceId, config, isRadomPeerId = false) {
         this.retry = 0;
@@ -58,8 +59,9 @@ class PeerTransfer {
                 return this.peer;
             }
             this.destroy();
+            yield (0, delay_1.default)(1500);
             yield this.reloadConfig();
-            const peer = new peerjs_1.Peer(this.peerId, Object.assign(Object.assign({}, this.peerConfig), { pingInterval: 15000 }));
+            const peer = new peerjs_1.Peer(this.peerId, Object.assign(Object.assign({}, this.peerConfig), { pingInterval: 9000 }));
             this.peer = peer;
             yield this.initialize(this.peer);
             this.checkConnection();
@@ -72,6 +74,10 @@ class PeerTransfer {
                 if (this.checkerId) {
                     clearInterval(this.checkerId);
                 }
+                if (this.booted) {
+                    return this.booted;
+                }
+                console.log('create peer@@@', Date.now());
                 this.booted = new Promise((resolve) => {
                     const timer = setTimeout(() => {
                         resolve(null);
@@ -81,6 +87,7 @@ class PeerTransfer {
                         resolve(peer);
                     };
                     peer.on('open', (id) => {
+                        console.log('peer@open', Date.now());
                         clearTimeout(timer);
                         done(peer);
                     });
@@ -199,7 +206,8 @@ class PeerTransfer {
         this.ping(deviceId);
     }
     removeConnection(peerId, connectionId) {
-        var _a;
+        var _a, _b, _c;
+        // console.log('removeConnection@', peerId, connectionId);
         const conn = this.connectPool.get(peerId);
         if (conn) {
             if (connectionId && conn.connectionId !== connectionId) {
@@ -216,6 +224,17 @@ class PeerTransfer {
             conn.close();
             (_a = this.peer) === null || _a === void 0 ? void 0 : _a._removeConnection(conn);
         }
+        else {
+            const connections = ((_b = this.peer) === null || _b === void 0 ? void 0 : _b.connections) || {};
+            const conns = connections[peerId] || [];
+            if (conns.length > 0) {
+                for (const conn of conns) {
+                    conn.removeAllListeners();
+                    conn.close();
+                    (_c = this.peer) === null || _c === void 0 ? void 0 : _c._removeConnection(conn);
+                }
+            }
+        }
     }
     addConnection(conn) {
         // console.log('addConnection@', conn.label);
@@ -245,7 +264,7 @@ class PeerTransfer {
             for (const deviceId of deviceIds) {
                 const conn = this.connectPool.get(deviceId);
                 if (!this.isValidConnection(conn)) {
-                    this.removeConnection(conn.peer);
+                    this.removeConnection(conn.peer, conn.connectionId);
                 }
                 else {
                     this.ping(conn.peer);
@@ -282,13 +301,13 @@ class PeerTransfer {
             }
             const peerId = deviceId;
             const existingConn = this.connectPool.get(peerId);
-            // console.log('connectToPeer', peerId, existingConn, this.connectPool);
+            console.log('connectToPeer', existingConn === null || existingConn === void 0 ? void 0 : existingConn.open, this.connectPool.size);
             if (existingConn) {
                 if (this.isValidConnection(existingConn)) {
                     return existingConn;
                 }
                 else {
-                    this.removeConnection(peerId);
+                    this.removeConnection(existingConn.peer, existingConn.connectionId);
                 }
             }
             if (PeerTransfer.connecting.has(peerId)) {
@@ -303,49 +322,56 @@ class PeerTransfer {
     }
     createConnection(peerId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
             let resolve;
             let reject;
+            const q = PeerTransfer.connecting.get(peerId);
+            if (q) {
+                return q.promise;
+            }
             const connectionPromise = new Promise((res, rej) => {
                 resolve = res;
                 reject = rej;
             });
             PeerTransfer.connecting.set(peerId, { promise: connectionPromise, resolve, reject });
-            try {
-                for (let retry = 0; retry < 3; retry++) {
-                    if (!this.peer) {
-                        yield this.createPeer();
-                    }
-                    if (!((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open)) {
-                        yield this.reconnect();
-                    }
-                    const cur = this.connectPool.get(peerId);
-                    if (this.isValidConnection(cur)) {
-                        resolve(cur);
-                        return cur;
-                    }
-                    const conn = (_b = this.peer) === null || _b === void 0 ? void 0 : _b.connect(peerId, {
-                        label: 'outgoing',
-                        metadata: { time: Date.now() },
-                    });
-                    if (!conn) {
-                        continue;
-                    }
-                    const connection = yield this.onConnect(conn).catch(() => { });
-                    if (connection) {
-                        resolve(conn);
-                        return conn;
+            const doConnect = () => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                try {
+                    for (let retry = 0; retry < 3; retry++) {
+                        if (!this.peer) {
+                            yield this.createPeer();
+                        }
+                        if (!((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open)) {
+                            yield this.reconnect();
+                        }
+                        const cur = this.connectPool.get(peerId);
+                        if (this.isValidConnection(cur)) {
+                            return resolve(cur);
+                        }
+                        const conn = (_b = this.peer) === null || _b === void 0 ? void 0 : _b.connect(peerId, {
+                            label: 'outgoing',
+                            metadata: { time: Date.now() },
+                        });
+                        if (!conn) {
+                            continue;
+                        }
+                        const connection = yield this.onConnect(conn).catch(() => { });
+                        if (connection) {
+                            return resolve(connection);
+                        }
                     }
+                    resolve(undefined);
+                    return undefined;
                 }
-                resolve(undefined);
-                return undefined;
-            }
-            catch (err) {
-                reject(err);
-            }
-            finally {
-                PeerTransfer.connecting.delete(peerId);
-            }
+                catch (err) {
+                    reject(err);
+                }
+                finally {
+                    PeerTransfer.connecting.delete(peerId);
+                }
+            });
+            doConnect();
+            const conn = yield connectionPromise;
+            return conn;
         });
     }
     ping(peerId) {
@@ -355,7 +381,7 @@ class PeerTransfer {
             }
             const conn = this.connectPool.get(peerId);
             if (!this.isValidConnection(conn)) {
-                this.removeConnection(conn === null || conn === void 0 ? void 0 : conn.peer);
+                this.removeConnection(conn === null || conn === void 0 ? void 0 : conn.peer, conn === null || conn === void 0 ? void 0 : conn.connectionId);
                 return;
             }
             const res = yield this.request(conn.peer, {
@@ -365,7 +391,7 @@ class PeerTransfer {
                 timeout: constant_1.PING_TIMEOUT,
             });
             if (!res || res.error) {
-                this.removeConnection(conn.peer);
+                this.removeConnection(conn.peer, conn.connectionId);
                 return false;
             }
             return true;
@@ -380,13 +406,13 @@ class PeerTransfer {
             // console.log('onConnect', conn.label, exists);
             if (exists) {
                 if (exists.metadata.time > conn.metadata.time) {
-                    this.removeConnection(conn.peer);
+                    this.removeConnection(conn.peer, conn.connectionId);
                     if (this.isValidConnection(exists)) {
                         return exists;
                     }
                 }
                 else {
-                    this.removeConnection(exists.peer);
+                    this.removeConnection(exists.peer, exists.connectionId);
                 }
             }
             return new Promise((resolve) => {
@@ -403,8 +429,7 @@ class PeerTransfer {
                         done(conn);
                     }
                     else {
-                        conn.close();
-                        this.removeConnection(conn.peer);
+                        this.removeConnection(conn.peer, conn.connectionId);
                         done(undefined);
                     }
                 }), constant_1.CONNECTION_TIMEOUT);
@@ -426,6 +451,8 @@ class PeerTransfer {
                     done(null);
                 }));
                 conn.on('close', () => __awaiter(this, void 0, void 0, function* () {
+                    console.log('close------------>', conn.label);
+                    clearTimeout(timer);
                     this.removeConnection(conn.peer, conn.connectionId);
                     // if (!this.peer?.open) {
                     //   await this.reconnect();
@@ -455,7 +482,7 @@ class PeerTransfer {
                         body: {},
                         error: { message: 'request timeout' },
                     };
-                    this.removeConnection(conn.peer);
+                    this.removeConnection(conn.peer, conn.connectionId);
                     resolve(msg);
                 }, payload.timeout || entity_1.REQUEST_TIMEOUT);
                 this.inRequest.set(conn.connectionId, {
@@ -550,6 +577,8 @@ class PeerTransfer {
                 if (((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open) && this.peerConfig.token === ((_b = this.peer) === null || _b === void 0 ? void 0 : _b.options.token)) {
                     return this.peer;
                 }
+                yield this.reloadConfig();
+                return this.createPeer();
                 // return this.createPeer();
                 if (((_c = this.peer) === null || _c === void 0 ? void 0 : _c.disconnected) && ((_d = this.peer) === null || _d === void 0 ? void 0 : _d.options.token) === this.peerConfig.token) {
                     this.peer.reconnect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egos-transfer",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "description": "1234",
   "homepage": "https://github.com/superbogy/peer-transfer#readme",
   "bugs": {
@@ -23,6 +23,7 @@
     "await-lock": "^2.2.2",
     "axios": "^1.13.2",
     "bson-objectid": "^2.0.4",
+    "delay": "^7.0.0",
     "path-to-regexp": "^8.2.0",
     "peerjs": "^1.5.4",
     "uuid": "^11.1.0"

package/src/index.ts

@@ -22,6 +22,7 @@ import { InternalApi, PeerAction, PeerRoutes, PeerScope, REQUEST_TIMEOUT } from
 
 import { PeerRouter } from './router';
 import axios from 'axios';
+import delay from 'delay';
 
 export interface ContentPayload {
   file: string;
@@ -98,10 +99,11 @@ export abstract class PeerTransfer {
       return this.peer;
     }
     this.destroy();
+    await delay(1500);
     await this.reloadConfig();
     const peer = new Peer(this.peerId, {
       ...this.peerConfig,
-      pingInterval: 15000,
+      pingInterval: 9000,
     });
     this.peer = peer;
     await this.initialize(this.peer);
@@ -114,6 +116,10 @@ export abstract class PeerTransfer {
         clearInterval(this.checkerId);
       }
 
+      if (this.booted) {
+        return this.booted;
+      }
+      console.log('create peer@@@', Date.now());
       this.booted = new Promise((resolve) => {
         const timer = setTimeout(() => {
           resolve(null);
@@ -123,6 +129,7 @@ export abstract class PeerTransfer {
           resolve(peer);
         };
         peer.on('open', (id) => {
+          console.log('peer@open', Date.now());
           clearTimeout(timer);
           done(peer);
         });
@@ -242,6 +249,7 @@ export abstract class PeerTransfer {
   }
 
   removeConnection(peerId: string, connectionId?: string) {
+    // console.log('removeConnection@', peerId, connectionId);
     const conn = this.connectPool.get(peerId);
     if (conn) {
       if (connectionId && conn.connectionId !== connectionId) {
@@ -258,6 +266,16 @@ export abstract class PeerTransfer {
       conn.removeAllListeners();
       conn.close();
       this.peer?._removeConnection(conn);
+    } else {
+      const connections = this.peer?.connections || {};
+      const conns = connections[peerId] || [];
+      if (conns.length > 0) {
+        for (const conn of conns) {
+          conn.removeAllListeners();
+          conn.close();
+          this.peer?._removeConnection(conn);
+        }
+      }
     }
   }
 
@@ -289,7 +307,7 @@ export abstract class PeerTransfer {
       for (const deviceId of deviceIds) {
         const conn = this.connectPool.get(deviceId);
         if (!this.isValidConnection(conn)) {
-          this.removeConnection(conn.peer);
+          this.removeConnection(conn.peer, conn.connectionId);
         } else {
           this.ping(conn.peer);
         }
@@ -323,12 +341,12 @@ export abstract class PeerTransfer {
 
     const peerId = deviceId;
     const existingConn = this.connectPool.get(peerId);
-    // console.log('connectToPeer', peerId, existingConn, this.connectPool);
+    console.log('connectToPeer', existingConn?.open, this.connectPool.size);
     if (existingConn) {
       if (this.isValidConnection(existingConn)) {
         return existingConn;
       } else {
-        this.removeConnection(peerId);
+        this.removeConnection(existingConn.peer, existingConn.connectionId);
       }
     }
 
@@ -346,48 +364,54 @@ export abstract class PeerTransfer {
   private async createConnection(peerId: string): Promise<DataConnection | undefined> {
     let resolve!: (value: DataConnection | undefined) => void;
     let reject!: (reason?: any) => void;
-
+    const q = PeerTransfer.connecting.get(peerId);
+    if (q) {
+      return q.promise;
+    }
     const connectionPromise = new Promise<DataConnection | undefined>((res, rej) => {
       resolve = res;
       reject = rej;
     });
 
     PeerTransfer.connecting.set(peerId, { promise: connectionPromise, resolve, reject });
-    try {
-      for (let retry = 0; retry < 3; retry++) {
-        if (!this.peer) {
-          await this.createPeer();
-        }
-        if (!this.peer?.open) {
-          await this.reconnect();
-        }
+    const doConnect = async () => {
+      try {
+        for (let retry = 0; retry < 3; retry++) {
+          if (!this.peer) {
+            await this.createPeer();
+          }
+          if (!this.peer?.open) {
+            await this.reconnect();
+          }
 
-        const cur = this.connectPool.get(peerId);
-        if (this.isValidConnection(cur)) {
-          resolve(cur);
-          return cur;
-        }
+          const cur = this.connectPool.get(peerId);
+          if (this.isValidConnection(cur)) {
+            return resolve(cur);
+          }
 
-        const conn = this.peer?.connect(peerId, {
-          label: 'outgoing',
-          metadata: { time: Date.now() },
-        });
-        if (!conn) {
-          continue;
-        }
-        const connection = await this.onConnect(conn as DataConnection).catch(() => {});
-        if (connection) {
-          resolve(conn);
-          return conn;
+          const conn = this.peer?.connect(peerId, {
+            label: 'outgoing',
+            metadata: { time: Date.now() },
+          });
+          if (!conn) {
+            continue;
+          }
+          const connection = await this.onConnect(conn as DataConnection).catch(() => {});
+          if (connection) {
+            return resolve(connection);
+          }
         }
+        resolve(undefined);
+        return undefined;
+      } catch (err) {
+        reject(err);
+      } finally {
+        PeerTransfer.connecting.delete(peerId);
       }
-      resolve(undefined);
-      return undefined;
-    } catch (err) {
-      reject(err);
-    } finally {
-      PeerTransfer.connecting.delete(peerId);
-    }
+    };
+    doConnect();
+    const conn = await connectionPromise;
+    return conn;
   }
 
   async ping(peerId: string) {
@@ -396,7 +420,7 @@ export abstract class PeerTransfer {
     }
     const conn = this.connectPool.get(peerId);
     if (!this.isValidConnection(conn)) {
-      this.removeConnection(conn?.peer);
+      this.removeConnection(conn?.peer, conn?.connectionId);
       return;
     }
     const res = await this.request(conn.peer, {
@@ -406,7 +430,7 @@ export abstract class PeerTransfer {
       timeout: PING_TIMEOUT,
     });
     if (!res || res.error) {
-      this.removeConnection(conn.peer);
+      this.removeConnection(conn.peer, conn.connectionId);
       return false;
     }
     return true;
@@ -420,12 +444,12 @@ export abstract class PeerTransfer {
     // console.log('onConnect', conn.label, exists);
     if (exists) {
       if (exists.metadata.time > conn.metadata.time) {
-        this.removeConnection(conn.peer);
+        this.removeConnection(conn.peer, conn.connectionId);
         if (this.isValidConnection(exists)) {
           return exists;
         }
       } else {
-        this.removeConnection(exists.peer);
+        this.removeConnection(exists.peer, exists.connectionId);
       }
     }
     return new Promise((resolve) => {
@@ -441,8 +465,7 @@ export abstract class PeerTransfer {
           this.addConnection(conn);
           done(conn);
         } else {
-          conn.close();
-          this.removeConnection(conn.peer);
+          this.removeConnection(conn.peer, conn.connectionId);
           done(undefined);
         }
       }, CONNECTION_TIMEOUT);
@@ -464,6 +487,8 @@ export abstract class PeerTransfer {
         done(null);
       });
       conn.on('close', async () => {
+        console.log('close------------>', conn.label);
+        clearTimeout(timer);
         this.removeConnection(conn.peer, conn.connectionId);
         // if (!this.peer?.open) {
         //   await this.reconnect();
@@ -497,7 +522,7 @@ export abstract class PeerTransfer {
           body: {},
           error: { message: 'request timeout' },
         };
-        this.removeConnection(conn.peer);
+        this.removeConnection(conn.peer, conn.connectionId);
         resolve(msg);
       }, payload.timeout || REQUEST_TIMEOUT);
       this.inRequest.set(conn.connectionId, {
@@ -625,6 +650,9 @@ export abstract class PeerTransfer {
       if (this.peer?.open && this.peerConfig.token === this.peer?.options.token) {
         return this.peer;
       }
+
+      await this.reloadConfig();
+      return this.createPeer();
       // return this.createPeer();
       if (this.peer?.disconnected && this.peer?.options.token === this.peerConfig.token) {
         this.peer.reconnect();