egos-transfer 0.0.9 → 0.1.0

package/dist/index.d.ts

@@ -53,7 +53,7 @@ export declare abstract class PeerTransfer {
     getDeviceStatus(peerId: string): Promise<IDeviceStatus | undefined>;
     connectToPeer(deviceId: string): Promise<DataConnection | undefined>;
     ping(peerId: string): Promise<boolean>;
-    onConnect(conn: DataConnection, positive?: boolean): Promise<DataConnection | undefined>;
+    onConnect(conn: DataConnection): Promise<DataConnection | undefined>;
     request(peerId: string, payload: PeerRequestPayload): Promise<PeerMessage>;
     reply(conn: DataConnection, oldMessage: PeerMessage, message: {
         body?: Record<string, any>;

package/dist/index.js

@@ -66,7 +66,7 @@ class PeerTransfer {
                     });
                 });
                 peer.on('connection', (conn) => {
-                    this.onConnect(conn, false);
+                    this.onConnect(conn);
                 });
                 peer.on('disconnected', () => {
                     if (!this.isPaused) {
@@ -83,9 +83,7 @@ class PeerTransfer {
                         return;
                     }
                     setTimeout(() => {
-                        if (!this.isPaused) {
-                            this.reconnect();
-                        }
+                        this.reconnect();
                     }, constant_1.CONNECTION_RETRY);
                 });
                 peer.on('error', (err) => {
@@ -119,6 +117,7 @@ class PeerTransfer {
                 socket.on('close', () => {
                     setTimeout(() => {
                         this.destroy();
+                        this.reconnect();
                     }, constant_1.CONNECTION_RETRY);
                 });
                 this.onHeartbeat({ type: 'HEARTBEAT' });
@@ -156,7 +155,7 @@ class PeerTransfer {
             return;
         }
         if (((_a = message.payload) === null || _a === void 0 ? void 0 : _a.msg) === constant_1.CONNECTION_PEER_CONFLICT) {
-            this.isPaused = true;
+            this.stop();
             this.getStore().dispatch({
                 type: 'global/updateNetworkState',
                 payload: {
@@ -189,8 +188,8 @@ class PeerTransfer {
             return;
         }
         const deviceId = message.payload.deviceId;
-        this.removeConnection(deviceId);
         this.offline(deviceId);
+        this.ping(deviceId);
     }
     removeConnection(peerId) {
         var _a, _b;
@@ -200,6 +199,7 @@ class PeerTransfer {
                 clearInterval((_b = conn.metadata) === null || _b === void 0 ? void 0 : _b.intervalId);
             }
             this.connectPool.delete(peerId);
+            this.offline(peerId);
         }
     }
     addConnection(conn) {
@@ -327,6 +327,9 @@ class PeerTransfer {
     }
     ping(peerId) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.deviceId === peerId) {
+                return;
+            }
             const conn = this.connectPool.get(peerId);
             if (!conn) {
                 return;
@@ -344,8 +347,8 @@ class PeerTransfer {
             return true;
         });
     }
-    onConnect(conn_1) {
-        return __awaiter(this, arguments, void 0, function* (conn, positive = true) {
+    onConnect(conn) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (!conn) {
                 return;
             }
@@ -470,8 +473,12 @@ class PeerTransfer {
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.isPaused) {
+                return;
+            }
+            console.log('peer reconnecting...');
             if (this.reconnectingPromise) {
-                return this.reconnectingPromise;
+                return yield this.reconnectingPromise;
             }
             this.reconnectingPromise = this.doReconnect();
             return this.reconnectingPromise.finally(() => {

package/package.json

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

package/src/index.ts

@@ -102,7 +102,7 @@ export abstract class PeerTransfer {
         });
       });
       peer.on('connection', (conn) => {
-        this.onConnect(conn, false);
+        this.onConnect(conn);
       });
       peer.on('disconnected', () => {
         if (!this.isPaused) {
@@ -119,9 +119,7 @@ export abstract class PeerTransfer {
           return;
         }
         setTimeout(() => {
-          if (!this.isPaused) {
-            this.reconnect();
-          }
+          this.reconnect();
         }, CONNECTION_RETRY);
       });
       peer.on('error', (err) => {
@@ -155,6 +153,7 @@ export abstract class PeerTransfer {
       socket.on('close', () => {
         setTimeout(() => {
           this.destroy();
+          this.reconnect();
         }, CONNECTION_RETRY);
       });
       this.onHeartbeat({ type: 'HEARTBEAT' } as IMessage);
@@ -193,7 +192,7 @@ export abstract class PeerTransfer {
       return;
     }
     if (message.payload?.msg === CONNECTION_PEER_CONFLICT) {
-      this.isPaused = true;
+      this.stop();
       this.getStore().dispatch({
         type: 'global/updateNetworkState',
         payload: {
@@ -227,8 +226,8 @@ export abstract class PeerTransfer {
       return;
     }
     const deviceId = message.payload.deviceId;
-    this.removeConnection(deviceId);
     this.offline(deviceId);
+    this.ping(deviceId);
   }
 
   removeConnection(peerId: string) {
@@ -238,6 +237,7 @@ export abstract class PeerTransfer {
         clearInterval(conn.metadata?.intervalId);
       }
       this.connectPool.delete(peerId);
+      this.offline(peerId);
     }
   }
 
@@ -361,6 +361,9 @@ export abstract class PeerTransfer {
   }
 
   async ping(peerId: string) {
+    if (this.deviceId === peerId) {
+      return;
+    }
     const conn = this.connectPool.get(peerId);
     if (!conn) {
       return;
@@ -378,7 +381,7 @@ export abstract class PeerTransfer {
     return true;
   }
 
-  async onConnect(conn: DataConnection, positive = true): Promise<DataConnection | undefined> {
+  async onConnect(conn: DataConnection): Promise<DataConnection | undefined> {
     if (!conn) {
       return;
     }
@@ -535,8 +538,12 @@ export abstract class PeerTransfer {
   }
 
   async reconnect(): Promise<Peer | undefined> {
+    if (this.isPaused) {
+      return;
+    }
+    console.log('peer reconnecting...');
     if (this.reconnectingPromise) {
-      return this.reconnectingPromise;
+      return await this.reconnectingPromise;
     }
 
     this.reconnectingPromise = this.doReconnect();