bdy 1.7.57-dev → 1.7.58-dev

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.7.57-dev",
+  "version": "1.7.58-dev",
   "type": "commonjs",
   "license": "MIT",
   "dependencies": {

package/src/agent.js

@@ -62,14 +62,22 @@ class Agent extends EventEmitter {
       this.destroyTunnel(data.id);
       if (!this.service && this.tunnels.length <= 0) Output.exitError(ERR_TUNNEL_REMOVED);
     } else {
+      logger.debug('Socket fetch tunnel after sync push');
       this.socket.fetch(this.started, null, false, []);
     }
   }
 
-  _onSocketAgent(_, action) {
+  async _onSocketAgent(data, action) {
     if (action === 'DEL') {
       if (this.manager) return this.manager.disableAgentAndExit(ERR_AGENT_REMOVED);
       Output.exitError(ERR_AGENT_REMOVED);
+    } else if (data.action) {
+      try {
+        await this.makeAction(data.action);
+      } catch (err) {
+        logger.error('Agent sync error');
+        logger.error(err);
+      }
     }
   }
 
@@ -86,7 +94,7 @@ class Agent extends EventEmitter {
       if (data.agent.action) await this.makeAction(data.agent.action);
       this.refreshTunnels(data.tunnels || []);
     } catch (err) {
-      logger.error('fetch error');
+      logger.error('Fetch error');
       logger.error(err);
     }
   }

package/src/api/socket.js

@@ -130,9 +130,11 @@ class ApiSocketClass extends EventEmitter {
       this.emit(SOCKET_IO_EVENT_DISCONNECTED);
     });
     this.socket.on('fetchTunnelAgentSuccess', (data) => {
+      logger.debug('Socket fetch success');
       this.emit(SOCKET_IO_EVENT_FETCH_SUCCESS, data);
     });
     this.socket.on('fetchTunnelAgentFailed', (code) => {
+      logger.debug('Socket fetch failed');
       this.emit(SOCKET_IO_EVENT_FETCH_FAILED, apiErrorCodeToClass(code, host));
     });
     this.socket.on('sync', (data) => this.onSync(data));

package/src/command/pre.js

@@ -35,8 +35,6 @@ const commandPre = async (_, command) => {
   const newAgent = command.agentStatus && command.agentStatus.version !== command.latestVersion;
   if (isDocker() && newCli) {
     Output.newCliDockerVersion(command.latestVersion);
-  } else if (newCli && newAgent) {
-    Output.newCliAgentVersion(command.latestVersion);
   } else if (newCli) {
     Output.newCliVersion(command.latestVersion);
   } else if (newAgent) {

package/src/output.js

@@ -5,7 +5,6 @@ const OutputNoninteractiveConfigTunnel = require('./output/noninteractive/config
 const OutputNoninteractiveConfigTunnels = require('./output/noninteractive/config/tunnels.js');
 const {
   TXT_NEW_AGENT_VERSION,
-  TXT_NEW_CLI_AGENT_VERSION,
   TXT_NEW_CLI_VERSION
 } = require('./texts.js');
 const OutputNoninteractiveAgentTunnels = require('./output/noninteractive/agent/tunnels.js');
@@ -77,10 +76,6 @@ class Output {
     terminal.gray(TXT_NEW_CLI_DOCKER_VERSION(version));
   }
 
-  static newCliAgentVersion(version) {
-    terminal.gray(TXT_NEW_CLI_AGENT_VERSION(version));
-  }
-
   static newAgentVersion(version) {
     terminal.gray(TXT_NEW_AGENT_VERSION(version));
   }

package/src/texts.js

@@ -37,7 +37,7 @@ const ERR_AGENT_NOT_SUPPORTED = 'Starting agent is not supported';
 const ERR_TUNNEL_ALREADY_EXISTS = 'Tunnel name exists: change or use -f to overwrite';
 const ERR_FAILED_TO_CONNECT = (host) => `Failed to connect to '${host}'`;
 const ERR_AGENT_REMOVED = 'Agent has been removed';
-const ERR_SUBDOMAIN_TAKEN = 'Subdomain name unavailable70342556';
+const ERR_SUBDOMAIN_TAKEN = 'Subdomain name unavailable';
 const ERR_TUNNEL_LIMIT_REACHED = 'Tunnels limit reached';
 const ERR_AGENT_LIMIT_REACHED = 'Agents limit reached';
 const ERR_TUNNELS_DISABLED = 'Tunnels disabled';
@@ -122,10 +122,9 @@ const DESC_COMMAND_TCP = 'Starts a tunnel which forwards all TCP traffic on a pu
 const DESC_COMMAND_TLS = 'Starts a tunnel listening for TLS traffic on port 443 with a specific hostname.';
 const DESC_PROGRAM = 'Buddy exposes local networked services behinds NATs and firewalls to the public internet over a secure tunnel. Share local websites, build/test webhook consumers, and self-host personal services.';
 
-const TXT_NEW_CLI_DOCKER_VERSION = (version) => `New CLI Docker image: ${version}\n\n`;
-const TXT_NEW_CLI_VERSION = (version) => `New CLI version: ${version}\n\n`;
-const TXT_NEW_AGENT_VERSION = (version) => `Agent update required. Update to ${version}:\n\`bdy agent update\`\n\n`;
-const TXT_NEW_CLI_AGENT_VERSION = (version) => `New CLI version (${version}). Update:\n\`bdy agent update\`\n\n`;
+const TXT_NEW_CLI_DOCKER_VERSION = (version) => `A new version of bdy Docker image is available! (${version})\n\n`;
+const TXT_NEW_CLI_VERSION = (version) => `A new version of bdy is available! (${version})\n\n`;
+const TXT_NEW_AGENT_VERSION = () => 'Agent upgrade required. Update the agent by running:\n`bdy agent update`\n\n';
 const TXT_DISABLING_AGENT = 'Uninstalling agent...';
 const TXT_ENABLING_AGENT = 'Installing agent...';
 const TXT_UPDATING_AGENT = 'Updating agent...';
@@ -413,7 +412,6 @@ module.exports = {
   TXT_NEW_CLI_DOCKER_VERSION,
   TXT_NEW_CLI_VERSION,
   TXT_NEW_AGENT_VERSION,
-  TXT_NEW_CLI_AGENT_VERSION,
   ERR_WHITELIST_IS_NOT_VALID,
   ERR_USER_AGENT_IS_NOT_VALID,
   ERR_AGENT_ADMIN_RIGHTS,