egos-transfer 0.1.9 → 0.2.1

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;
@@ -48,7 +49,7 @@ class PeerTransfer {
     createPeer() {
         return __awaiter(this, arguments, void 0, function* (force = false) {
             var _a;
-            if (this.isPaused) {
+            if (this.isPaused && !force) {
                 return;
             }
             if (this.booted) {
@@ -58,6 +59,7 @@ 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: 9000 }));
             this.peer = peer;
@@ -84,6 +86,7 @@ class PeerTransfer {
                         resolve(peer);
                     };
                     peer.on('open', (id) => {
+                        console.log('peer@open', Date.now());
                         clearTimeout(timer);
                         done(peer);
                     });
@@ -202,7 +205,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) {
@@ -219,6 +223,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);
@@ -248,10 +263,10 @@ 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);
+                    this.ping(conn.peer);
                 }
             }
         }), constant_1.HEARTBEAT_INTERVAL);
@@ -285,13 +300,13 @@ class PeerTransfer {
             }
             const peerId = deviceId;
             const existingConn = this.connectPool.get(peerId);
-            console.log('connectToPeer', existingConn === null || existingConn === void 0 ? void 0 : existingConn.open, this.connectPool.size);
+            console.log('connectToPeer', this.isPaused, 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)) {
@@ -365,7 +380,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, {
@@ -375,7 +390,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;
@@ -390,13 +405,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) => {
@@ -413,8 +428,7 @@ class PeerTransfer {
                         done(conn);
                     }
                     else {
-                        conn.close();
-                        this.removeConnection(conn.peer);
+                        this.removeConnection(conn.peer, conn.connectionId);
                         done(undefined);
                     }
                 }), constant_1.CONNECTION_TIMEOUT);
@@ -436,6 +450,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();
@@ -465,7 +481,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, {
@@ -560,6 +576,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();
@@ -598,6 +616,8 @@ class PeerTransfer {
     onRequest(conn, message) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                // @todo default folder
+                // console.log('onRequest-->', message.route);
                 // @todo default folder
                 yield this.router.run(conn, message);
             }
@@ -652,7 +672,7 @@ class PeerTransfer {
     }
     resume() {
         this.isPaused = false;
-        return this.createPeer();
+        return this.createPeer(true);
     }
 }
 exports.PeerTransfer = PeerTransfer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egos-transfer",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "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;
@@ -88,7 +89,7 @@ export abstract class PeerTransfer {
   abstract reloadConfig(config?: Record<string, any>): Promise<void>;
 
   async createPeer(force = false): Promise<Peer | undefined> {
-    if (this.isPaused) {
+    if (this.isPaused && !force) {
       return;
     }
     if (this.booted) {
@@ -98,6 +99,7 @@ export abstract class PeerTransfer {
       return this.peer;
     }
     this.destroy();
+    await delay(1500);
     await this.reloadConfig();
     const peer = new Peer(this.peerId, {
       ...this.peerConfig,
@@ -117,7 +119,6 @@ export abstract class PeerTransfer {
       if (this.booted) {
         return this.booted;
       }
-
       this.booted = new Promise((resolve) => {
         const timer = setTimeout(() => {
           resolve(null);
@@ -127,6 +128,7 @@ export abstract class PeerTransfer {
           resolve(peer);
         };
         peer.on('open', (id) => {
+          console.log('peer@open', Date.now());
           clearTimeout(timer);
           done(peer);
         });
@@ -246,6 +248,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) {
@@ -262,6 +265,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);
+        }
+      }
     }
   }
 
@@ -293,9 +306,9 @@ 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);
+          this.ping(conn.peer);
         }
       }
     }, HEARTBEAT_INTERVAL);
@@ -327,12 +340,12 @@ export abstract class PeerTransfer {
 
     const peerId = deviceId;
     const existingConn = this.connectPool.get(peerId);
-    console.log('connectToPeer', existingConn?.open, this.connectPool.size);
+    console.log('connectToPeer', this.isPaused, this.connectPool.size);
     if (existingConn) {
       if (this.isValidConnection(existingConn)) {
         return existingConn;
       } else {
-        this.removeConnection(peerId);
+        this.removeConnection(existingConn.peer, existingConn.connectionId);
       }
     }
 
@@ -406,7 +419,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, {
@@ -416,7 +429,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;
@@ -430,12 +443,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) => {
@@ -451,8 +464,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);
@@ -474,6 +486,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();
@@ -507,7 +521,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, {
@@ -635,6 +649,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();
@@ -671,6 +688,8 @@ export abstract class PeerTransfer {
 
   async onRequest(conn: DataConnection, message: PeerMessage) {
     try {
+      // @todo default folder
+      // console.log('onRequest-->', message.route);
       // @todo default folder
       await this.router.run(conn, message);
     } catch (err: any) {
@@ -729,7 +748,7 @@ export abstract class PeerTransfer {
 
   resume() {
     this.isPaused = false;
-    return this.createPeer();
+    return this.createPeer(true);
   }
 }