bdy 1.9.2-dev → 1.9.4-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.9.2-dev",
+  "version": "1.9.4-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/agent.js

@@ -19,6 +19,7 @@ class Agent extends events_1.default {
         this.service = service;
         this.target = target;
         this.tunnels = [];
+        this.tunnelsUpdating = false;
         this.started = false;
         this.api = api;
         this.manager = null;
@@ -31,6 +32,18 @@ class Agent extends events_1.default {
         this.socket.on(utils_js_1.SOCKET_IO_EVENT_TUNNEL, (tunnel, action) => this._onSocketTunnel(tunnel, action));
         this.socket.on(utils_js_1.SOCKET_IO_EVENT_AGENT, (agent, action) => this._onSocketAgent(agent, action));
     }
+    destroy() {
+        if (this.socket) {
+            this.socket.removeAllListeners();
+            this.socket.destroy();
+            this.socket = null;
+        }
+        this.manager = null;
+        this.onRefresh = null;
+        this.api = null;
+        // musza byc manualnie wczesniej zniszczone to tylko czysci obiekt
+        this.tunnels = null;
+    }
     _onSocketTunnel(data, action) {
         if (action === 'DEL') {
             this.destroyTunnel(data.id);
@@ -173,33 +186,44 @@ class Agent extends events_1.default {
         }
     }
     refreshTunnels(tunnels) {
-        const tt = this.tunnels;
-        const hasTunnels = tt.length > 0;
-        const haveTunnels = tunnels.length > 0;
-        if (hasTunnels) {
-            tt.forEach((tunnel) => {
-                if (!tunnels.find((t) => t.id === tunnel.id)) {
-                    this.destroyTunnel(tunnel.id);
-                }
-            });
+        if (this.tunnelsUpdating)
+            return;
+        this.tunnelsUpdating = true;
+        let hasTunnels = false;
+        let haveTunnels = false;
+        try {
+            const tt = [...this.tunnels];
+            hasTunnels = tt.length > 0;
+            haveTunnels = tunnels.length > 0;
+            if (hasTunnels) {
+                tt.forEach((tunnel) => {
+                    if (!tunnels.find((t) => t.id === tunnel.id)) {
+                        this.destroyTunnel(tunnel.id);
+                    }
+                });
+            }
+            if (haveTunnels) {
+                tunnels.forEach((data) => {
+                    let sshHostKey;
+                    if (this.manager)
+                        sshHostKey = this.manager.sshHostKey;
+                    const tunnel = tt.find((tunnel) => data.id === tunnel.id);
+                    if (!tunnel) {
+                        this.addTunnel(new tunnel_js_1.default({
+                            ...data,
+                            sshHostKey,
+                        }));
+                    }
+                    else if (tunnel.hasChanged(data)) {
+                        tunnel.recreate(data);
+                    }
+                });
+            }
         }
-        if (haveTunnels) {
-            tunnels.forEach((data) => {
-                let sshHostKey;
-                if (this.manager)
-                    sshHostKey = this.manager.sshHostKey;
-                const tunnel = tt.find((tunnel) => data.id === tunnel.id);
-                if (!tunnel) {
-                    this.addTunnel(new tunnel_js_1.default({
-                        ...data,
-                        sshHostKey,
-                    }));
-                }
-                else if (tunnel.hasChanged(data)) {
-                    tunnel.recreate(data);
-                }
-            });
+        catch {
+            // do nothing
         }
+        this.tunnelsUpdating = false;
         if (!this.service && hasTunnels && !haveTunnels) {
             output_js_1.default.exitError(texts_js_1.ERR_TUNNEL_REMOVED);
         }

package/distTs/src/api/socket.js

@@ -76,6 +76,25 @@ class ApiSocketClass extends events_1.default {
             // do nothing
         }
     }
+    connect(atOnce) {
+        logger_js_1.default.debug('socket connect');
+        if (atOnce && this.socket && !this.socket.connected) {
+            this.socket.connect();
+        }
+        else {
+            setTimeout(() => {
+                if (this.socket && !this.socket.connected)
+                    this.socket.connect();
+            }, 3000);
+        }
+    }
+    destroy() {
+        if (this.socket) {
+            this.socket.removeAllListeners();
+            this.socket.disconnect();
+            this.socket = null;
+        }
+    }
     constructor(host, id, token) {
         super();
         this.id = id;
@@ -91,11 +110,11 @@ class ApiSocketClass extends events_1.default {
         }, MAX_REQUESTS_SYNC_WINDOW);
         this.socket = (0, socket_io_client_1.io)(host, {
             forceNew: true,
-            autoConnect: true,
+            autoConnect: false,
             autoUnref: true,
             forceBase64: true,
             transports: ['websocket'],
-            reconnection: true,
+            reconnection: false,
             rejectUnauthorized: false,
             agent: new https_1.Agent({
                 rejectUnauthorized: false,
@@ -118,6 +137,11 @@ class ApiSocketClass extends events_1.default {
             this.connected = false;
             logger_js_1.default.info(texts_1.LOG_SOCKET_DISCONNECTED);
             this.emit(utils_1.SOCKET_IO_EVENT_DISCONNECTED);
+            this.connect();
+        });
+        this.socket.on('connect_error', () => {
+            logger_js_1.default.debug('socket error');
+            this.connect();
         });
         this.socket.on('fetchTunnelAgentSuccess', (data) => {
             logger_js_1.default.debug('Socket fetch success');
@@ -128,6 +152,7 @@ class ApiSocketClass extends events_1.default {
             this.emit(utils_1.SOCKET_IO_EVENT_FETCH_FAILED, (0, utils_1.apiErrorCodeToClass)(code, host));
         });
         this.socket.on('sync', (data) => this.onSync(data));
+        this.connect(true);
     }
 }
 exports.default = ApiSocketClass;

package/distTs/src/command/agent/install.js

@@ -82,6 +82,8 @@ commandAgentInstall.action(async (options) => {
         });
         id = agent.id;
         token = agent.token;
+        agent.destroy();
+        agent = null;
     }
     const saved = manager_js_1.default.system.saveSystemConfig(id, host, token, port);
     if (!saved) {

package/distTs/src/logger.js

@@ -66,6 +66,9 @@ class Logger {
     debug(...args) {
         this.getPino().debug(...args);
     }
+    trace() {
+        this.getPino().trace();
+    }
     fatal(...args) {
         this.getPino().fatal(...args);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.9.2-dev",
+  "version": "1.9.4-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {