egos-transfer 0.0.10 → 0.1.1

package/dist/constant.d.ts

@@ -1,5 +1,5 @@
 export declare const REQUEST_TIMEOUT = 18000;
-export declare const HEARTBEAT_INTERVAL = 15000;
+export declare const HEARTBEAT_INTERVAL = 12000;
 export declare const TRANSFER_TIMEOUT = 300000;
 export declare const PING_TIMEOUT = 5000;
 export declare const CONNECTION_TIMEOUT = 6000;

package/dist/constant.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNAUTHORIZED = exports.CONNECTION_DUPLICATED = exports.CONNECTION_LIMIT_EXCEED = exports.CONNECTION_PEER_CONFLICT = exports.CONNECTION_RETRY = exports.PEER_OPEN_TIMEOUT = exports.RECONNECT_TIMEOUT = exports.LOCKER_TIMEOUT = exports.CONNECTION_TIMEOUT = exports.PING_TIMEOUT = exports.TRANSFER_TIMEOUT = exports.HEARTBEAT_INTERVAL = exports.REQUEST_TIMEOUT = void 0;
 exports.REQUEST_TIMEOUT = 18000;
-exports.HEARTBEAT_INTERVAL = 15000;
+exports.HEARTBEAT_INTERVAL = 12000;
 exports.TRANSFER_TIMEOUT = 300000;
 exports.PING_TIMEOUT = 5000;
 exports.CONNECTION_TIMEOUT = 6000;

package/dist/index.d.ts

@@ -25,7 +25,6 @@ export declare abstract class PeerTransfer {
     protected router: PeerRouter;
     protected booted: Promise<string> | undefined;
     protected reconnectingPromise: Promise<Peer | undefined> | undefined;
-    protected timeoutId: ReturnType<typeof setTimeout>;
     protected checkerId: ReturnType<typeof setInterval>;
     isPaused: boolean;
     peerId: string;
@@ -37,7 +36,7 @@ export declare abstract class PeerTransfer {
     abstract getApi(deviceId: string): Promise<InternalApi | undefined>;
     abstract discoverDeviceById(deviceId: string): Promise<void>;
     abstract onDestroy(): void;
-    abstract requireAuth(): void;
+    abstract requireAuth(): Promise<void>;
     abstract onConnectLimit(): void;
     initialize(peer: Peer): Promise<string>;
     handleSocketMessage(message: IMessage): void;

package/dist/index.js

@@ -30,9 +30,9 @@ exports.PeerTransfer = void 0;
 const constant_1 = require("./constant");
 const peerjs_1 = require("peerjs");
 const entity_1 = require("./entity");
-const helper_1 = require("./helper");
 const router_1 = require("./router");
 const axios_1 = __importDefault(require("axios"));
+const helper_1 = require("./helper");
 class PeerTransfer {
     constructor(deviceId, config, isRadomPeerId = false) {
         this.peerIdMap = new Map();
@@ -54,7 +54,6 @@ class PeerTransfer {
                     const timer = setTimeout(() => {
                         var _a;
                         if (!((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open)) {
-                            this.destroy();
                             this.createPeer(true);
                         }
                         // reject('peer open timeout');
@@ -83,12 +82,10 @@ class PeerTransfer {
                         return;
                     }
                     setTimeout(() => {
-                        if (!this.isPaused) {
-                            this.reconnect();
-                        }
+                        this.reconnect();
                     }, constant_1.CONNECTION_RETRY);
                 });
-                peer.on('error', (err) => {
+                peer.on('error', (err) => __awaiter(this, void 0, void 0, function* () {
                     if (err.message === constant_1.CONNECTION_PEER_CONFLICT) {
                         this.stop();
                     }
@@ -97,28 +94,31 @@ class PeerTransfer {
                         this.onConnectLimit();
                     }
                     if (err.message == constant_1.UNAUTHORIZED) {
-                        this.stop();
-                        this.requireAuth();
+                        yield this.requireAuth();
                     }
                     if (err.type === 'network') {
-                        this.destroy();
                         this.reconnect();
                     }
                     if (err.type === 'server-error') {
                         if (err.message === constant_1.UNAUTHORIZED) {
-                            return this.requireAuth();
+                            yield this.requireAuth();
+                        }
+                        else {
+                            this.reconnect();
                         }
-                        this.destroy();
-                        this.reconnect();
                     }
-                });
+                }));
                 const socket = peer.socket;
                 socket === null || socket === void 0 ? void 0 : socket.on('message', (message) => {
                     this.handleSocketMessage(message);
                 });
+                socket === null || socket === void 0 ? void 0 : socket.on('error', (err) => {
+                    console.log('socket@error', err);
+                });
                 socket.on('close', () => {
+                    console.log('socket@close');
                     setTimeout(() => {
-                        this.destroy();
+                        this.reconnect();
                     }, constant_1.CONNECTION_RETRY);
                 });
                 this.onHeartbeat({ type: 'HEARTBEAT' });
@@ -146,9 +146,6 @@ class PeerTransfer {
         if (this.isPaused) {
             return;
         }
-        if (this.timeoutId) {
-            clearTimeout(this.timeoutId);
-        }
     }
     onError(message) {
         var _a;
@@ -156,7 +153,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: {
@@ -165,7 +162,6 @@ class PeerTransfer {
                     message: 'peer conflict',
                 },
             });
-            this.destroy();
             return;
         }
         this.reconnect();
@@ -211,7 +207,14 @@ class PeerTransfer {
         }
     }
     checkConnection() {
-        this.checkerId = setInterval(() => {
+        if (this.checkerId) {
+            return;
+        }
+        this.checkerId = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (!((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open)) {
+                yield this.reconnect();
+            }
             const deviceIds = this.connectPool.keys();
             for (const deviceId of deviceIds) {
                 const conn = this.connectPool.get(deviceId);
@@ -219,7 +222,7 @@ class PeerTransfer {
                     this.ping(conn.peer);
                 }
             }
-        }, constant_1.HEARTBEAT_INTERVAL);
+        }), constant_1.HEARTBEAT_INTERVAL);
     }
     getApiHost() {
         var _a, _b, _c;
@@ -426,7 +429,7 @@ class PeerTransfer {
                     clearTimeout(timeout);
                     const now = Date.now();
                     if (now - message.createdAt > 3000) {
-                        console.log('[egos] slow request', message.route, now - message.createdAt);
+                        console.warn('[egos] slow peer request:', message.route, now - message.createdAt);
                     }
                     resolve(message);
                 });
@@ -474,11 +477,14 @@ class PeerTransfer {
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.isPaused) {
+                return;
+            }
             if (this.reconnectingPromise) {
-                return this.reconnectingPromise;
+                return yield this.reconnectingPromise;
             }
             this.reconnectingPromise = this.doReconnect();
-            return this.reconnectingPromise.finally(() => {
+            return yield this.reconnectingPromise.finally(() => {
                 this.reconnectingPromise = undefined;
             });
         });
@@ -493,19 +499,21 @@ class PeerTransfer {
                 if ((_a = this.peer) === null || _a === void 0 ? void 0 : _a.open) {
                     return this.peer;
                 }
+                console.log('reconnecting~~', Date.now());
                 if ((_b = this.peer) === null || _b === void 0 ? void 0 : _b.disconnected) {
                     this.peer.reconnect();
                     return;
                 }
                 else {
-                    setTimeout(() => {
-                        this.createPeer();
-                    }, constant_1.RECONNECT_TIMEOUT);
-                    return;
+                    yield new Promise((resolve) => {
+                        setTimeout(() => {
+                            resolve(undefined);
+                        }, constant_1.RECONNECT_TIMEOUT);
+                    });
+                    return this.createPeer();
                 }
             }
             catch (err) {
-                this.destroy();
                 return this.createPeer();
             }
         });
@@ -547,7 +555,6 @@ class PeerTransfer {
         (_a = this.peer) === null || _a === void 0 ? void 0 : _a.destroy();
         (_b = this.peer) === null || _b === void 0 ? void 0 : _b.disconnect();
         this.peerPool.clear();
-        this.timeoutId = undefined;
         this.booted = undefined;
         this.peer = undefined;
         if (this.checkerId) {

package/package.json

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

package/src/constant.ts

@@ -1,5 +1,5 @@
 export const REQUEST_TIMEOUT = 18000;
-export const HEARTBEAT_INTERVAL = 15000;
+export const HEARTBEAT_INTERVAL = 12000;
 export const TRANSFER_TIMEOUT = 300000;
 export const PING_TIMEOUT = 5000;
 export const CONNECTION_TIMEOUT = 6000;

package/src/index.ts

@@ -19,10 +19,10 @@ import {
   RouteItem,
 } from './interfaces';
 import { InternalApi, PeerAction, PeerRoutes, PeerScope, REQUEST_TIMEOUT } from './entity';
-import { isRandomPeerId, purifyDeviceId } from './helper';
 
 import { PeerRouter } from './router';
 import axios from 'axios';
+import { purifyDeviceId } from './helper';
 
 export interface ContentPayload {
   file: string;
@@ -56,7 +56,6 @@ export abstract class PeerTransfer {
   protected router: PeerRouter;
   protected booted: Promise<string> | undefined;
   protected reconnectingPromise: Promise<Peer | undefined> | undefined;
-  protected timeoutId!: ReturnType<typeof setTimeout>;
   protected checkerId!: ReturnType<typeof setInterval>;
   public isPaused: boolean;
   peerId: string;
@@ -83,14 +82,13 @@ export abstract class PeerTransfer {
   abstract getApi(deviceId: string): Promise<InternalApi | undefined>;
   abstract discoverDeviceById(deviceId: string): Promise<void>;
   abstract onDestroy(): void;
-  abstract requireAuth(): void;
+  abstract requireAuth(): Promise<void>;
   abstract onConnectLimit(): void;
   async initialize(peer: Peer) {
     try {
       this.booted = new Promise((resolve) => {
         const timer = setTimeout(() => {
           if (!this.peer?.open) {
-            this.destroy();
             this.createPeer(true);
           }
           // reject('peer open timeout');
@@ -119,12 +117,10 @@ export abstract class PeerTransfer {
           return;
         }
         setTimeout(() => {
-          if (!this.isPaused) {
-            this.reconnect();
-          }
+          this.reconnect();
         }, CONNECTION_RETRY);
       });
-      peer.on('error', (err) => {
+      peer.on('error', async (err) => {
         if (err.message === CONNECTION_PEER_CONFLICT) {
           this.stop();
         }
@@ -133,28 +129,30 @@ export abstract class PeerTransfer {
           this.onConnectLimit();
         }
         if (err.message == UNAUTHORIZED) {
-          this.stop();
-          this.requireAuth();
+          await this.requireAuth();
         }
         if (err.type === 'network') {
-          this.destroy();
           this.reconnect();
         }
         if (err.type === 'server-error') {
           if (err.message === UNAUTHORIZED) {
-            return this.requireAuth();
+            await this.requireAuth();
+          } else {
+            this.reconnect();
           }
-          this.destroy();
-          this.reconnect();
         }
       });
       const socket = peer.socket;
       socket?.on('message', (message: IMessage) => {
         this.handleSocketMessage(message);
       });
+      socket?.on('error', (err) => {
+        console.log('socket@error', err);
+      });
       socket.on('close', () => {
+        console.log('socket@close');
         setTimeout(() => {
-          this.destroy();
+          this.reconnect();
         }, CONNECTION_RETRY);
       });
       this.onHeartbeat({ type: 'HEARTBEAT' } as IMessage);
@@ -183,9 +181,6 @@ export abstract class PeerTransfer {
     if (this.isPaused) {
       return;
     }
-    if (this.timeoutId) {
-      clearTimeout(this.timeoutId);
-    }
   }
 
   onError(message: IMessage) {
@@ -193,7 +188,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: {
@@ -202,7 +197,6 @@ export abstract class PeerTransfer {
           message: 'peer conflict',
         },
       });
-      this.destroy();
       return;
     }
     this.reconnect();
@@ -251,7 +245,13 @@ export abstract class PeerTransfer {
   }
 
   checkConnection() {
-    this.checkerId = setInterval(() => {
+    if (this.checkerId) {
+      return;
+    }
+    this.checkerId = setInterval(async () => {
+      if (!this.peer?.open) {
+        await this.reconnect();
+      }
       const deviceIds = this.connectPool.keys();
       for (const deviceId of deviceIds) {
         const conn = this.connectPool.get(deviceId);
@@ -459,7 +459,7 @@ export abstract class PeerTransfer {
         clearTimeout(timeout);
         const now = Date.now();
         if (now - message.createdAt > 3000) {
-          console.log('[egos] slow request', message.route, now - message.createdAt);
+          console.warn('[egos] slow peer request:', message.route, now - message.createdAt);
         }
         resolve(message);
       });
@@ -539,12 +539,15 @@ export abstract class PeerTransfer {
   }
 
   async reconnect(): Promise<Peer | undefined> {
+    if (this.isPaused) {
+      return;
+    }
     if (this.reconnectingPromise) {
-      return this.reconnectingPromise;
+      return await this.reconnectingPromise;
     }
 
     this.reconnectingPromise = this.doReconnect();
-    return this.reconnectingPromise.finally(() => {
+    return await this.reconnectingPromise.finally(() => {
       this.reconnectingPromise = undefined;
     });
   }
@@ -557,17 +560,20 @@ export abstract class PeerTransfer {
       if (this.peer?.open) {
         return this.peer;
       }
+      console.log('reconnecting~~', Date.now());
       if (this.peer?.disconnected) {
         this.peer.reconnect();
         return;
       } else {
-        setTimeout(() => {
-          this.createPeer();
-        }, RECONNECT_TIMEOUT);
-        return;
+        await new Promise((resolve) => {
+          setTimeout(() => {
+            resolve(undefined);
+          }, RECONNECT_TIMEOUT);
+        });
+
+        return this.createPeer();
       }
     } catch (err) {
-      this.destroy();
       return this.createPeer();
     }
   }
@@ -610,7 +616,6 @@ export abstract class PeerTransfer {
     this.peer?.destroy();
     this.peer?.disconnect();
     this.peerPool.clear();
-    this.timeoutId = undefined;
     this.booted = undefined;
     this.peer = undefined;
     if (this.checkerId) {