egos-transfer 0.0.8 → 0.0.10

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) {
@@ -77,12 +77,8 @@ class PeerTransfer {
                         }, constant_1.CONNECTION_RETRY);
                     }
                 });
-                peer.on('call', (mConn) => {
-                    console.log('on call1');
-                    // @todo
-                });
+                peer.on('call', (mConn) => { });
                 peer.on('close', (...args) => {
-                    console.log('peer-transfer@onClose', this.isPaused);
                     if (this.isPaused) {
                         return;
                     }
@@ -93,7 +89,6 @@ class PeerTransfer {
                     }, constant_1.CONNECTION_RETRY);
                 });
                 peer.on('error', (err) => {
-                    console.log('peer-transfer@onError>>', err, err.type, err.message, 123123);
                     if (err.message === constant_1.CONNECTION_PEER_CONFLICT) {
                         this.stop();
                     }
@@ -122,7 +117,6 @@ class PeerTransfer {
                     this.handleSocketMessage(message);
                 });
                 socket.on('close', () => {
-                    console.log('peer-transfer@onSocketClose', 'socket close', this.isPaused);
                     setTimeout(() => {
                         this.destroy();
                     }, constant_1.CONNECTION_RETRY);
@@ -155,29 +149,12 @@ class PeerTransfer {
         if (this.timeoutId) {
             clearTimeout(this.timeoutId);
         }
-        // this.timeoutId = setTimeout(() => {
-        //   // two heartbeats
-        //   if (Date.now() - this.heartbeat > HEARTBEAT_INTERVAL) {
-        //     if (this.isPaused) {
-        //       clearTimeout(this.timeoutId);
-        //       return;
-        //     }
-        //     console.log(
-        //       'peer-transfer@onHeartbeatTimeout',
-        //       'heartbeat timeout',
-        //       Date.now() - this.heartbeat,
-        //     );
-        //     this.reconnect();
-        //   }
-        // }, HEARTBEAT_INTERVAL);
     }
     onError(message) {
         var _a;
         if (message.type !== 'ERROR') {
             return;
         }
-        console.log('onPeerError', message);
-        // this.destroy();
         if (((_a = message.payload) === null || _a === void 0 ? void 0 : _a.msg) === constant_1.CONNECTION_PEER_CONFLICT) {
             this.isPaused = true;
             this.getStore().dispatch({
@@ -212,8 +189,8 @@ class PeerTransfer {
             return;
         }
         const deviceId = message.payload.deviceId;
-        this.removeConnection(deviceId);
         this.offline(deviceId);
+        this.ping(deviceId);
     }
     removeConnection(peerId) {
         var _a, _b;
@@ -223,6 +200,7 @@ class PeerTransfer {
                 clearInterval((_b = conn.metadata) === null || _b === void 0 ? void 0 : _b.intervalId);
             }
             this.connectPool.delete(peerId);
+            this.offline(peerId);
         }
     }
     addConnection(conn) {
@@ -286,13 +264,11 @@ class PeerTransfer {
             if (this.connectPool.has(peerId)) {
                 const conn = this.connectPool.get(peerId);
                 if (conn === null || conn === void 0 ? void 0 : conn.open) {
-                    console.log('reused connection', conn.peer);
                     return conn;
                 }
             }
             // Check if there's already a connection attempt for this peerId
             if (PeerTransfer.connecting.has(peerId)) {
-                console.log('connectToPeer@connecting for existing connection', peerId);
                 // Wait for the existing connection attempt to complete
                 const { promise } = yield PeerTransfer.connecting.get(peerId);
                 return yield promise;
@@ -313,11 +289,8 @@ class PeerTransfer {
                         if (!this.peer) {
                             yield this.createPeer();
                         }
-                        if (!this.peer) {
-                            return;
-                        }
                         if (!((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open)) {
-                            this.reconnect();
+                            yield this.reconnect();
                         }
                         const cur = this.connectPool.get(peerId);
                         if (cur === null || cur === void 0 ? void 0 : cur.open) {
@@ -337,9 +310,9 @@ class PeerTransfer {
                         }
                         retry++;
                     }
+                    resolve(null);
                 }
                 catch (err) {
-                    console.log('connectToPeer@err', err);
                     reject(err);
                 }
                 finally {
@@ -355,6 +328,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;
@@ -372,8 +348,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;
             }
@@ -409,7 +385,6 @@ class PeerTransfer {
                 });
                 conn.on('error', (err) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    console.log('@!!!!!!connection error', err);
                     this.removeConnection(conn.peer);
                     if (!((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open)) {
                         yield this.reconnect();
@@ -483,7 +458,6 @@ class PeerTransfer {
                 connection = con;
             }
             const requestId = message.requestId || (yield this.genRequestId());
-            console.log('send@message', message.route);
             const sent = yield connection.send(Object.assign(Object.assign({}, message), { requestId, headers: Object.assign(Object.assign({}, message.headers), { ['x-device-token']: internalApi === null || internalApi === void 0 ? void 0 : internalApi.token }), scope: entity_1.PeerScope.REQUEST, action: entity_1.PeerAction.SEND, src: this.peerId, dest: conn.peer, createdAt: Date.now() }), false);
             return sent;
         });
@@ -511,16 +485,15 @@ class PeerTransfer {
     }
     doReconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b;
             try {
-                console.log('doReconnect@', this.isPaused, (_a = this.peer) === null || _a === void 0 ? void 0 : _a.open, (_b = this.peer) === null || _b === void 0 ? void 0 : _b.disconnected);
                 if (this.isPaused) {
                     return;
                 }
-                if ((_c = this.peer) === null || _c === void 0 ? void 0 : _c.open) {
+                if ((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open) {
                     return this.peer;
                 }
-                if ((_d = this.peer) === null || _d === void 0 ? void 0 : _d.disconnected) {
+                if ((_b = this.peer) === null || _b === void 0 ? void 0 : _b.disconnected) {
                     this.peer.reconnect();
                     return;
                 }
@@ -532,7 +505,6 @@ class PeerTransfer {
                 }
             }
             catch (err) {
-                console.log('###reconnect@error', err);
                 this.destroy();
                 return this.createPeer();
             }
@@ -591,11 +563,9 @@ class PeerTransfer {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // @todo default folder
-                console.log('onRequest@----++++message', message.route);
                 yield this.router.run(conn, message);
             }
             catch (err) {
-                console.log('onRequest@error', err);
                 this.responseFail(conn, message, { message: err.message, code: err.code });
             }
         });
@@ -603,15 +573,12 @@ class PeerTransfer {
     onResponse(conn, message) {
         return __awaiter(this, void 0, void 0, function* () {
             // @todo default folder
-            console.log('onResponse@----++++message', message.route);
             const cb = this.requests.get(message.requestId);
             if (cb) {
                 cb.apply(this, [message]);
                 this.requests.delete(message.requestId);
             }
-            if (message.error) {
-                console.log('response@error>>', message);
-            }
+            // @todo throw err;
         });
     }
     responseOk(conn, message) {

package/package.json

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

package/src/file-transfer.ts

@@ -143,7 +143,6 @@ export class FileTransfer {
         if (attempt === maxRetries) {
           throw lastError;
         }
-
         const delay = baseDelay * Math.pow(2, attempt);
         console.log(`Retry attempt ${attempt + 1}/${maxRetries} after ${delay}ms`);
       }

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) {
@@ -113,12 +113,8 @@ export abstract class PeerTransfer {
           }, CONNECTION_RETRY);
         }
       });
-      peer.on('call', (mConn: MediaConnection) => {
-        console.log('on call1');
-        // @todo
-      });
+      peer.on('call', (mConn: MediaConnection) => {});
       peer.on('close', (...args) => {
-        console.log('peer-transfer@onClose', this.isPaused);
         if (this.isPaused) {
           return;
         }
@@ -129,7 +125,6 @@ export abstract class PeerTransfer {
         }, CONNECTION_RETRY);
       });
       peer.on('error', (err) => {
-        console.log('peer-transfer@onError>>', err, err.type, err.message, 123123);
         if (err.message === CONNECTION_PEER_CONFLICT) {
           this.stop();
         }
@@ -158,7 +153,6 @@ export abstract class PeerTransfer {
         this.handleSocketMessage(message);
       });
       socket.on('close', () => {
-        console.log('peer-transfer@onSocketClose', 'socket close', this.isPaused);
         setTimeout(() => {
           this.destroy();
         }, CONNECTION_RETRY);
@@ -192,29 +186,12 @@ export abstract class PeerTransfer {
     if (this.timeoutId) {
       clearTimeout(this.timeoutId);
     }
-    // this.timeoutId = setTimeout(() => {
-    //   // two heartbeats
-    //   if (Date.now() - this.heartbeat > HEARTBEAT_INTERVAL) {
-    //     if (this.isPaused) {
-    //       clearTimeout(this.timeoutId);
-    //       return;
-    //     }
-    //     console.log(
-    //       'peer-transfer@onHeartbeatTimeout',
-    //       'heartbeat timeout',
-    //       Date.now() - this.heartbeat,
-    //     );
-    //     this.reconnect();
-    //   }
-    // }, HEARTBEAT_INTERVAL);
   }
 
   onError(message: IMessage) {
     if (message.type !== 'ERROR') {
       return;
     }
-    console.log('onPeerError', message);
-    // this.destroy();
     if (message.payload?.msg === CONNECTION_PEER_CONFLICT) {
       this.isPaused = true;
       this.getStore().dispatch({
@@ -250,8 +227,8 @@ export abstract class PeerTransfer {
       return;
     }
     const deviceId = message.payload.deviceId;
-    this.removeConnection(deviceId);
     this.offline(deviceId);
+    this.ping(deviceId);
   }
 
   removeConnection(peerId: string) {
@@ -261,6 +238,7 @@ export abstract class PeerTransfer {
         clearInterval(conn.metadata?.intervalId);
       }
       this.connectPool.delete(peerId);
+      this.offline(peerId);
     }
   }
 
@@ -322,13 +300,11 @@ export abstract class PeerTransfer {
     if (this.connectPool.has(peerId)) {
       const conn = this.connectPool.get(peerId);
       if (conn?.open) {
-        console.log('reused connection', conn.peer);
         return conn;
       }
     }
     // Check if there's already a connection attempt for this peerId
     if (PeerTransfer.connecting.has(peerId)) {
-      console.log('connectToPeer@connecting for existing connection', peerId);
       // Wait for the existing connection attempt to complete
       const { promise } = await PeerTransfer.connecting.get(peerId);
       return await promise;
@@ -349,11 +325,8 @@ export abstract class PeerTransfer {
           if (!this.peer) {
             await this.createPeer();
           }
-          if (!this.peer) {
-            return;
-          }
           if (!this.peer?.open) {
-            this.reconnect();
+            await this.reconnect();
           }
           const cur = this.connectPool.get(peerId);
           if (cur?.open) {
@@ -373,8 +346,8 @@ export abstract class PeerTransfer {
           }
           retry++;
         }
+        resolve(null);
       } catch (err) {
-        console.log('connectToPeer@err', err);
         reject(err);
       } finally {
         // Remove from connecting map regardless of success or failure
@@ -389,6 +362,9 @@ export abstract class PeerTransfer {
   }
 
   async ping(peerId: string) {
+    if (this.deviceId === peerId) {
+      return;
+    }
     const conn = this.connectPool.get(peerId);
     if (!conn) {
       return;
@@ -406,7 +382,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;
     }
@@ -440,7 +416,6 @@ export abstract class PeerTransfer {
         }
       });
       conn.on('error', async (err) => {
-        console.log('@!!!!!!connection error', err);
         this.removeConnection(conn.peer);
         if (!this.peer?.open) {
           await this.reconnect();
@@ -533,7 +508,6 @@ export abstract class PeerTransfer {
       connection = con;
     }
     const requestId = message.requestId || (await this.genRequestId());
-    console.log('send@message', message.route);
     const sent = await connection.send(
       {
         ...message,
@@ -577,7 +551,6 @@ export abstract class PeerTransfer {
 
   private async doReconnect(): Promise<Peer | undefined> {
     try {
-      console.log('doReconnect@', this.isPaused, this.peer?.open, this.peer?.disconnected);
       if (this.isPaused) {
         return;
       }
@@ -594,7 +567,6 @@ export abstract class PeerTransfer {
         return;
       }
     } catch (err) {
-      console.log('###reconnect@error', err);
       this.destroy();
       return this.createPeer();
     }
@@ -655,25 +627,20 @@ export abstract class PeerTransfer {
   async onRequest(conn: DataConnection, message: PeerMessage) {
     try {
       // @todo default folder
-      console.log('onRequest@----++++message', message.route);
       await this.router.run(conn, message);
     } catch (err: any) {
-      console.log('onRequest@error', err);
       this.responseFail(conn, message, { message: err.message, code: err.code });
     }
   }
 
   async onResponse(conn: DataConnection, message: PeerMessage) {
     // @todo default folder
-    console.log('onResponse@----++++message', message.route);
     const cb = this.requests.get(message.requestId);
     if (cb) {
       cb.apply(this, [message]);
       this.requests.delete(message.requestId);
     }
-    if (message.error) {
-      console.log('response@error>>', message);
-    }
+    // @todo throw err;
   }
 
   async responseOk(conn: DataConnection, message: PeerMessage) {