egos-transfer 0.1.7 → 0.1.8

package/dist/index.js

@@ -119,7 +119,7 @@ class PeerTransfer {
                             return this.reconnect();
                         }
                         done(null);
-                        return this.reconnect();
+                        return this.createPeer(true);
                     }));
                 });
                 peer.on('connection', (conn) => {
@@ -227,7 +227,7 @@ class PeerTransfer {
     }
     checkConnection() {
         if (this.checkerId) {
-            return;
+            clearInterval(this.checkerId);
         }
         this.checkerId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -235,21 +235,22 @@ class PeerTransfer {
                 yield this.reconnect();
             }
             // turn credential expires
-            if (this.peerConfig.turnExpiredAt && Date.now() - 30000 > this.peerConfig.turnExpiredAt) {
+            if (this.peerConfig.turnExpiredAt && this.peerConfig.turnExpiredAt - 30000 < Date.now()) {
                 // this.connectPool.clear();
+                yield this.reloadConfig();
                 yield this.createPeer(true);
                 return;
             }
-            // const deviceIds = this.connectPool.keys();
-            // for (const deviceId of deviceIds) {
-            //   const conn = this.connectPool.get(deviceId);
-            //   if (!this.isValidConnection(conn)) {
-            //     this.removeConnection(conn.peer);
-            //     this.peer?._removeConnection(conn);
-            //   } else {
-            //     this.ping(conn.peer);
-            //   }
-            // }
+            const deviceIds = this.connectPool.keys();
+            for (const deviceId of deviceIds) {
+                const conn = this.connectPool.get(deviceId);
+                if (!this.isValidConnection(conn)) {
+                    this.removeConnection(conn.peer);
+                }
+                else {
+                    this.ping(conn.peer);
+                }
+            }
         }), constant_1.HEARTBEAT_INTERVAL);
     }
     getApiHost() {

package/package.json

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

package/src/index.ts

@@ -161,7 +161,7 @@ export abstract class PeerTransfer {
             return this.reconnect();
           }
           done(null);
-          return this.reconnect();
+          return this.createPeer(true);
         });
       });
       peer.on('connection', (conn: DataConnection) => {
@@ -272,28 +272,28 @@ export abstract class PeerTransfer {
 
   checkConnection() {
     if (this.checkerId) {
-      return;
+      clearInterval(this.checkerId);
     }
     this.checkerId = setInterval(async () => {
       if (!this.peer?.open) {
         await this.reconnect();
       }
       // turn credential expires
-      if (this.peerConfig.turnExpiredAt && Date.now() - 30000 > this.peerConfig.turnExpiredAt) {
+      if (this.peerConfig.turnExpiredAt && this.peerConfig.turnExpiredAt - 30000 < Date.now()) {
         // this.connectPool.clear();
+        await this.reloadConfig();
         await this.createPeer(true);
         return;
       }
-      // const deviceIds = this.connectPool.keys();
-      // for (const deviceId of deviceIds) {
-      //   const conn = this.connectPool.get(deviceId);
-      //   if (!this.isValidConnection(conn)) {
-      //     this.removeConnection(conn.peer);
-      //     this.peer?._removeConnection(conn);
-      //   } else {
-      //     this.ping(conn.peer);
-      //   }
-      // }
+      const deviceIds = this.connectPool.keys();
+      for (const deviceId of deviceIds) {
+        const conn = this.connectPool.get(deviceId);
+        if (!this.isValidConnection(conn)) {
+          this.removeConnection(conn.peer);
+        } else {
+          this.ping(conn.peer);
+        }
+      }
     }, HEARTBEAT_INTERVAL);
   }