egos-transfer 0.2.0 → 0.2.2

package/dist/index.js

@@ -49,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) {
@@ -77,7 +77,6 @@ class PeerTransfer {
                 if (this.booted) {
                     return this.booted;
                 }
-                console.log('create peer@@@', Date.now());
                 this.booted = new Promise((resolve) => {
                     const timer = setTimeout(() => {
                         resolve(null);
@@ -207,7 +206,7 @@ class PeerTransfer {
     }
     removeConnection(peerId, connectionId) {
         var _a, _b, _c;
-        // console.log('removeConnection@', peerId, connectionId);
+        // console.trace('removeConnection@', peerId, connectionId);
         const conn = this.connectPool.get(peerId);
         if (conn) {
             if (connectionId && conn.connectionId !== connectionId) {
@@ -301,7 +300,7 @@ 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;
@@ -415,15 +414,19 @@ class PeerTransfer {
                     this.removeConnection(exists.peer, exists.connectionId);
                 }
             }
+            let timer = null;
             return new Promise((resolve) => {
                 const done = (connection) => {
                     if (connection) {
                         this.addConnection(connection);
                     }
-                    clearTimeout(timer);
+                    if (timer) {
+                        clearTimeout(timer);
+                        timer = null;
+                    }
                     resolve(connection);
                 };
-                const timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                timer = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
                     if (this.isValidConnection(conn)) {
                         this.addConnection(conn);
                         done(conn);
@@ -432,6 +435,7 @@ class PeerTransfer {
                         this.removeConnection(conn.peer, conn.connectionId);
                         done(undefined);
                     }
+                    timer = null;
                 }), constant_1.CONNECTION_TIMEOUT);
                 conn.on('data', (message) => {
                     switch (message.scope) {
@@ -464,6 +468,10 @@ class PeerTransfer {
                     done(conn);
                 }));
                 if (this.isValidConnection(conn)) {
+                    if (timer) {
+                        clearTimeout(timer);
+                    }
+                    timer = null;
                     done(conn);
                 }
             });
@@ -617,6 +625,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);
             }
@@ -671,7 +681,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.2.0",
+  "version": "0.2.2",
   "description": "1234",
   "homepage": "https://github.com/superbogy/peer-transfer#readme",
   "bugs": {

package/src/index.ts

@@ -89,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) {
@@ -119,7 +119,6 @@ export abstract class PeerTransfer {
       if (this.booted) {
         return this.booted;
       }
-      console.log('create peer@@@', Date.now());
       this.booted = new Promise((resolve) => {
         const timer = setTimeout(() => {
           resolve(null);
@@ -249,7 +248,7 @@ export abstract class PeerTransfer {
   }
 
   removeConnection(peerId: string, connectionId?: string) {
-    // console.log('removeConnection@', peerId, connectionId);
+    // console.trace('removeConnection@', peerId, connectionId);
     const conn = this.connectPool.get(peerId);
     if (conn) {
       if (connectionId && conn.connectionId !== connectionId) {
@@ -341,7 +340,7 @@ 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;
@@ -452,15 +451,19 @@ export abstract class PeerTransfer {
         this.removeConnection(exists.peer, exists.connectionId);
       }
     }
+    let timer = null;
     return new Promise((resolve) => {
       const done = (connection?: DataConnection) => {
         if (connection) {
           this.addConnection(connection);
         }
-        clearTimeout(timer);
+        if (timer) {
+          clearTimeout(timer);
+          timer = null;
+        }
         resolve(connection);
       };
-      const timer = setTimeout(async () => {
+      timer = setTimeout(async () => {
         if (this.isValidConnection(conn)) {
           this.addConnection(conn);
           done(conn);
@@ -468,6 +471,7 @@ export abstract class PeerTransfer {
           this.removeConnection(conn.peer, conn.connectionId);
           done(undefined);
         }
+        timer = null;
       }, CONNECTION_TIMEOUT);
       conn.on('data', (message: any) => {
         switch (message.scope) {
@@ -500,6 +504,10 @@ export abstract class PeerTransfer {
         done(conn);
       });
       if (this.isValidConnection(conn)) {
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = null;
         done(conn);
       }
     });
@@ -689,6 +697,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) {
@@ -747,7 +757,7 @@ export abstract class PeerTransfer {
 
   resume() {
     this.isPaused = false;
-    return this.createPeer();
+    return this.createPeer(true);
   }
 }