npm - egos-transfer - Versions diffs - 0.2.1 → 0.2.3 - Mend

egos-transfer 0.2.1 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -108,7 +108,6 @@ class PeerTransfer {
                             return;
                         }
                         if (err.message === constant_1.CONNECTION_LIMIT_EXCEED) {
-                            this.stop();
                             this.onConnectLimit();
                             return done(null);
                         }
@@ -206,7 +205,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) {
@@ -414,15 +413,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);
@@ -431,6 +434,7 @@ class PeerTransfer {
                         this.removeConnection(conn.peer, conn.connectionId);
                         done(undefined);
                     }
+                    timer = null;
                 }), constant_1.CONNECTION_TIMEOUT);
                 conn.on('data', (message) => {
                     switch (message.scope) {
@@ -463,6 +467,10 @@ class PeerTransfer {
                     done(conn);
                 }));
                 if (this.isValidConnection(conn)) {
+                    if (timer) {
+                        clearTimeout(timer);
+                    }
+                    timer = null;
                     done(conn);
                 }
             });

package/package.json CHANGED Viewed

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

package/src/index.ts CHANGED Viewed

@@ -150,7 +150,6 @@ export abstract class PeerTransfer {
             return;
           }
           if (err.message === CONNECTION_LIMIT_EXCEED) {
-            this.stop();
             this.onConnectLimit();
             return done(null);
           }
@@ -248,7 +247,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) {
@@ -451,15 +450,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);
@@ -467,6 +470,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) {
@@ -499,6 +503,10 @@ export abstract class PeerTransfer {
         done(conn);
       });
       if (this.isValidConnection(conn)) {
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = null;
         done(conn);
       }
     });