bdy 1.17.7-dev → 1.17.9-dev

package/distTs/package.json

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

package/distTs/src/agent/agent.js

@@ -68,7 +68,7 @@ class Agent extends events_1.default {
         else {
             logger_1.default.debug('Socket fetch tunnel after sync push');
             if (this.socket) {
-                this.socket.fetch(!this.disabled, null, null, false, []);
+                this.socket.fetch(!this.disabled, null, null, false, [], false, 1000);
             }
         }
     }
@@ -99,7 +99,7 @@ class Agent extends events_1.default {
                 }
             }
             if (shouldFetch && this.socket) {
-                this.socket.fetch(!this.disabled, null, null, false, []);
+                this.socket.fetch(!this.disabled, null, null, false, [], false, 1000);
             }
         }
     }
@@ -115,7 +115,8 @@ class Agent extends events_1.default {
         try {
             if (data.agent.action)
                 await this.makeAction(data.agent.action);
-            this.refreshTunnels(data.tunnels || []);
+            const filtered = (data.tunnels || []).filter((t) => !!t.domain);
+            this.refreshTunnels(filtered);
         }
         catch (err) {
             logger_1.default.error('Fetch error');
@@ -224,47 +225,39 @@ class Agent extends events_1.default {
         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_1.default({
-                            ...data,
-                            sshHostKey,
-                            agent: {
-                                id: this.id,
-                                host: this.host,
-                                token: this.token,
-                            },
-                        }));
-                    }
-                    else if (tunnel.hasChanged(data)) {
-                        tunnel.recreate(data);
-                    }
-                });
-            }
+            tt.forEach((tunnel) => {
+                if (!tunnels.find((t) => t.id === tunnel.id)) {
+                    this.destroyTunnel(tunnel.id);
+                }
+            });
+            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_1.default({
+                        ...data,
+                        sshHostKey,
+                        agent: {
+                            id: this.id,
+                            host: this.host,
+                            token: this.token,
+                        },
+                    }));
+                }
+                else if (tunnel.hasChanged(data)) {
+                    tunnel.recreate(data);
+                }
+            });
         }
         catch {
             // do nothing
         }
         this.tunnelsUpdating = false;
-        if (!this.service && hasTunnels && !haveTunnels) {
+        if (!this.service && !tunnels.length) {
             output_1.default.exitError(texts_1.ERR_TUNNEL_REMOVED);
         }
     }

package/distTs/src/agent/socket/client.js

@@ -29,19 +29,21 @@ class AgentSocketClient extends events_1.default {
         logger_1.default.debug(data);
         this.socket.emit(msg, data);
     }
-    fetch(activate = true, action = null, disabled = null, resetFirstHeard = false, tunnels, forceThrough = false) {
-        this.socketEmit('fetchTunnelAgent', {
-            id: this.id,
-            token: this.token,
-            hostname: this.hostname,
-            platform: this.platform,
-            version: this.version,
-            activate,
-            action,
-            disabled,
-            resetFirstHeard,
-            tunnels,
-        }, forceThrough);
+    fetch(activate = true, action = null, disabled = null, resetFirstHeard = false, tunnels, forceThrough = false, timeout = 0) {
+        setTimeout(() => {
+            this.socketEmit('fetchTunnelAgent', {
+                id: this.id,
+                token: this.token,
+                hostname: this.hostname,
+                platform: this.platform,
+                version: this.version,
+                activate,
+                action,
+                disabled,
+                resetFirstHeard,
+                tunnels,
+            }, forceThrough);
+        }, timeout);
     }
     update(activate, tunnels, force = false) {
         const now = Date.now();

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

@@ -64,16 +64,19 @@ const installService = async (options) => {
     if (!isSupported) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_SUPPORTED);
     }
-    const { token, host } = await input_1.default.tunnelToken(options.token);
     let id = '';
     let agentToken = '';
-    let agent;
+    let addToken = options.token;
+    if (options.id && addToken) {
+        id = options.id;
+        agentToken = addToken;
+        addToken = '';
+    }
+    const { token, host } = await input_1.default.tunnelToken(addToken);
     const port = input_1.default.port(options.port);
     const target = !!options.target;
-    if (options.id && options.agentToken) {
-        // if id & token passed set as it is
-        id = options.id;
-        agentToken = options.agentToken;
+    let agent;
+    if (id) {
         try {
             agent = await buddy_1.default.fetchAgent(id, host, agentToken);
         }
@@ -138,12 +141,14 @@ const installApp = async (options) => {
     }
     let id;
     let agentToken;
+    let addToken = options.token;
     const port = input_1.default.port(options.port);
-    if (options.id && options.agentToken) {
+    if (options.id && addToken) {
         id = options.id;
-        agentToken = options.agentToken;
+        agentToken = addToken;
+        addToken = '';
     }
-    const { token, host } = await input_1.default.tunnelToken(options.token);
+    const { token, host } = await input_1.default.tunnelToken(addToken);
     if (!id) {
         const tags = prepareTags(options.tag);
         try {
@@ -200,8 +205,7 @@ const installApp = async (options) => {
 const commandAgentInstall = (0, utils_1.newCommand)('install', texts_1.DESC_COMMAND_AGENT_INSTALL);
 commandAgentInstall.option('-s, --start [true|false]', texts_1.OPTION_AGENT_START, 'true');
 commandAgentInstall.option('-i, --id <id>', texts_1.OPTION_AGENT_ID);
-commandAgentInstall.option('--agent-token <agent-token>', texts_1.OPTION_AGENT_TOKEN);
-commandAgentInstall.option('-t, --token <token>', texts_1.OPTION_TOKEN);
+commandAgentInstall.option('-t, --token <token>', texts_1.OPTION_AGENT_TOKEN);
 commandAgentInstall.option('-p, --port <port>', texts_1.OPTION_AGENT_PORT, '7456');
 commandAgentInstall.option('-u, --user <user>', texts_1.OPTION_USER);
 commandAgentInstall.option('-a,--app', texts_1.OPTION_APP);

package/distTs/src/command/sandbox/list.js

@@ -21,7 +21,7 @@ commandSandboxList.action(async (options) => {
         output_1.default.exitNormal('No sandboxes found');
     }
     const data = [
-        ['NAME', 'STATUS', 'SETUP STATUS', 'ID', 'IDENTIFIER', 'URL'],
+        ['NAME', 'STATUS', 'SETUP_STATUS', 'ID', 'IDENTIFIER', 'URL'],
     ];
     for (const sandbox of sandboxes) {
         data.push([

package/distTs/src/texts.js

@@ -361,7 +361,7 @@ exports.OPTION_NAME = 'Name of the tunnel';
 exports.OPTION_ID = 'Id of the tunnel';
 exports.OPTION_AGENT_ID = 'Start existing agent';
 exports.OPTION_AGENT_START = 'Start agent right away';
-exports.OPTION_AGENT_TOKEN = 'Token to authorize existing agent';
+exports.OPTION_AGENT_TOKEN = 'token to authorize existing agent agent or token to add a new agent';
 exports.OPTION_USER = 'OS user name. Default: root (macOS/Linux), LocalSystem (Windows. Provide as DOMAIN\\USER (use `whoami` to get full username)';
 exports.OPTION_APP = 'Starts bdy agent as standalone process';
 exports.OPTION_PASS = 'Password of the user. Only set for Windows';

package/package.json

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