bdy 1.7.55-dev → 1.7.57-dev

package/package.json

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

package/src/command/agent/tunnel/{stop.js → remove.js}

@@ -1,6 +1,6 @@
 const Output = require('../../../output.js');
 const {
-  DESC_COMMAND_AGENT_TUNNEL_STOP,
+  DESC_COMMAND_AGENT_TUNNEL_REMOVE,
   ERR_AGENT_NOT_ENABLED,
   OPTION_ID,
   TXT_TUNNEL_STOPPED
@@ -9,9 +9,9 @@ const ApiAgent = require('../../../api/agent.js');
 const AgentManager = require('../../../agent/manager');
 const { newCommand } = require('../../../utils');
 
-const commandAgentTunnelStop = newCommand('stop', DESC_COMMAND_AGENT_TUNNEL_STOP);
-commandAgentTunnelStop.argument('<id>', OPTION_ID);
-commandAgentTunnelStop.action(async (id) => {
+const commandAgentTunnelRemove = newCommand('rm', DESC_COMMAND_AGENT_TUNNEL_REMOVE);
+commandAgentTunnelRemove.argument('<id>', OPTION_ID);
+commandAgentTunnelRemove.action(async (id) => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {
     Output.exitError(ERR_AGENT_NOT_ENABLED);
@@ -26,4 +26,4 @@ commandAgentTunnelStop.action(async (id) => {
   }
 });
 
-module.exports = commandAgentTunnelStop;
+module.exports = commandAgentTunnelRemove;

package/src/command/agent/tunnel.js

@@ -1,6 +1,6 @@
 const commandAgentTunnelTcp = require('./tunnel/tcp.js');
 const commandAgentTunnelList = require('./tunnel/list.js');
-const commandAgentTunnelStop = require('./tunnel/stop.js');
+const commandAgentTunnelRemove = require('./tunnel/remove.js');
 const commandAgentTunnelTls = require('./tunnel/tls.js');
 const commandAgentTunnelHttp = require('./tunnel/http.js');
 const commandAgentTunnelStart = require('./tunnel/start.js');
@@ -13,7 +13,7 @@ commandAgentTunnel.addCommand(commandAgentTunnelTcp);
 commandAgentTunnel.addCommand(commandAgentTunnelTls);
 commandAgentTunnel.addCommand(commandAgentTunnelHttp);
 commandAgentTunnel.addCommand(commandAgentTunnelStart);
-commandAgentTunnel.addCommand(commandAgentTunnelStop);
+commandAgentTunnel.addCommand(commandAgentTunnelRemove);
 commandAgentTunnel.addCommand(commandAgentTunnelList);
 commandAgentTunnel.addCommand(commandAgentTunnelStatus);
 

package/src/command/agent/uninstall.js

@@ -8,7 +8,7 @@ const ApiBuddy = require('../../api/buddy.js');
 const { ERR_AGENT_ADMIN_RIGHTS } = require('../../texts');
 const { newCommand } = require('../../utils');
 
-const commandAgentUninstall = newCommand('disable', DESC_COMMAND_AGENT_UNINSTALL);
+const commandAgentUninstall = newCommand('uninstall', DESC_COMMAND_AGENT_UNINSTALL);
 commandAgentUninstall.action(async () => {
   const hasAdminRights = await AgentManager.system.hasAdminRights();
   if (!hasAdminRights) {

package/src/command/config/set/token.js

@@ -3,7 +3,8 @@ const Output = require('../../../output.js');
 const {
   DESC_COMMAND_CONFIG_SET_TOKEN,
   OPTION_TOKEN,
-  TXT_TOKEN_SAVED
+  TXT_TOKEN_SAVED,
+  TXT_TOKEN_REMOVED
 } = require('../../../texts.js');
 const { newCommand } = require('../../../utils');
 
@@ -11,7 +12,7 @@ const commandConfigSetToken = newCommand('token', DESC_COMMAND_CONFIG_SET_TOKEN)
 commandConfigSetToken.argument('[token]', OPTION_TOKEN, '');
 commandConfigSetToken.action((token) => {
   Cfg.setToken(token);
-  Output.exitSuccess(TXT_TOKEN_SAVED);
+  Output.exitSuccess(!token ? TXT_TOKEN_REMOVED : TXT_TOKEN_SAVED);
 });
 
 module.exports = commandConfigSetToken;

package/src/output/noninteractive/config/tunnel.js

@@ -21,7 +21,6 @@ class OutputNoninteractiveConfigTunnel {
       data.push(['Target', Format.target(this.tunnel.type, this.tunnel.target)]);
     }
     data.push(['Region', Format.tunnelRegion(this.tunnel.region)]);
-    data.push(['Server ID', this.tunnel.sshId]);
     data.push(['Timeout', Format.tunnelTimeout(this.tunnel.timeout)]);
     data.push(['Whitelist', Format.tunnelWhitelist(this.tunnel.whitelist)]);
     data.push(['Domain', Format.tunnelDomain(this.tunnel.domain)]);

package/src/texts.js

@@ -25,13 +25,13 @@ const ERR_BA_IS_NOT_VALID = (auth) => `HTTP BA '${auth}' invalid`;
 const ERR_USER_AGENT_IS_NOT_VALID = (ua) => `Invalid User-Agent regex: '${ua}'`;
 const ERR_WHITELIST_IS_NOT_VALID = (wh) => `Invalid CIDR: '${wh}'`;
 const ERR_TUNNEL_NOT_FOUND = (name) => `Tunnel '${name}' not found`;
-const ERR_AGENT_NOT_ENABLED = 'Agent not enabled';
+const ERR_AGENT_NOT_ENABLED = 'Agent not installed';
 const ERR_AGENT_NOT_RUNNING = 'Agent not running';
 const ERR_AGENT_NOT_FOUND = 'Agent not found';
-const ERR_SWW_AGENT_ENABLING = 'Failed enabling agent';
-const ERR_SWW_AGENT_DISABLING = 'Failed disabling agent';
+const ERR_SWW_AGENT_ENABLING = 'Failed installing agent';
+const ERR_SWW_AGENT_DISABLING = 'Failed uninstalling agent';
 const ERR_SWW_AGENT_UPDATING = 'Failed updating agent';
-const ERR_AGENT_ENABLE = 'Agent disabled: enable first';
+const ERR_AGENT_ENABLE = 'Agent disabled: install first';
 const ERR_AGENT_ADMIN_RIGHTS = 'Command must be run with administrator rights';
 const ERR_AGENT_NOT_SUPPORTED = 'Starting agent is not supported';
 const ERR_TUNNEL_ALREADY_EXISTS = 'Tunnel name exists: change or use -f to overwrite';
@@ -58,20 +58,20 @@ const ERR_CONFIG_CORRUPTED = 'Config file is corrupted';
 const TXT_AGENT_STOPPED = 'Agent stopped';
 const TXT_AGENT_STARTED = 'Agent started';
 const TXT_AGENT_RESTARTED = 'Agent restarted';
-const TXT_AGENT_IS_ENABLED_AND_STARTED = 'Agent is enabled & started';
-const TXT_AGENT_IS_ENABLED_AND_STOPPED = 'Agent is enabled & stopped';
-const TXT_AGENT_IS_ENABLED_AND_INITIALIZING = 'Agent is enabled & initializing';
-const TXT_AGENT_IS_ENABLED_AND_HAVE_TROUBLES = 'Agent is enabled [connection issues detected]';
-const TXT_AGENT_IS_DISABLED = 'Agent is disabled';
-const TXT_AGENT_ENABLED = 'Agent enabled';
+const TXT_AGENT_IS_ENABLED_AND_STARTED = 'Agent is installed & started';
+const TXT_AGENT_IS_ENABLED_AND_STOPPED = 'Agent is installed & stopped';
+const TXT_AGENT_IS_ENABLED_AND_INITIALIZING = 'Agent is installed & initializing';
+const TXT_AGENT_IS_ENABLED_AND_HAVE_TROUBLES = 'Agent is installed [connection issues detected]';
+const TXT_AGENT_IS_DISABLED = 'Agent is not installed';
+const TXT_AGENT_ENABLED = 'Agent installed';
 const TXT_AGENT_UPDATED = 'Agent updated';
-const TXT_AGENT_ALREADY_ENABLED = 'Agent already enabled';
-const TXT_AGENT_DISABLED = 'Agent disabled';
-const TXT_AGENT_ALREADY_DISABLED = 'Agent already disabled';
+const TXT_AGENT_ALREADY_ENABLED = 'Agent already installed';
+const TXT_AGENT_DISABLED = 'Agent uninstalled';
 const TXT_TUNNEL_STARTED = (type) => `${type} tunnel started`;
 const TXT_TUNNEL_STOPPED = 'Tunnel stopped';
 const TXT_WHITELIST_SAVED = 'Whitelist saved';
 const TXT_TOKEN_SAVED = 'Token saved';
+const TXT_TOKEN_REMOVED = 'Token cleared';
 const TXT_TIMEOUT_SAVED = 'Timeout saved';
 const TXT_REGION_SAVED = 'Region saved';
 const TXT_TUNNEL_REMOVED = 'Tunnel removed';
@@ -102,7 +102,7 @@ const DESC_COMMAND_AGENT_TUNNEL_HTTP = 'Manage agent\'s tunnels';
 const DESC_COMMAND_AGENT_TUNNEL_LIST = 'Manage agent\'s tunnels';
 const DESC_COMMAND_AGENT_TUNNEL_START = 'Manage agent\'s tunnels';
 const DESC_COMMAND_AGENT_TUNNEL_STATUS = 'Manage agent\'s tunnels';
-const DESC_COMMAND_AGENT_TUNNEL_STOP = 'Manage agent\'s tunnels';
+const DESC_COMMAND_AGENT_TUNNEL_REMOVE = 'Manage agent\'s tunnels';
 const DESC_COMMAND_AGENT_TUNNEL_TCP = 'Manage agent\'s tunnels';
 const DESC_COMMAND_AGENT_TUNNEL_TLS = 'Manage agent\'s tunnels';
 const DESC_COMMAND_AGENT_UNINSTALL = 'Uninstall bdy service';
@@ -126,8 +126,8 @@ const TXT_NEW_CLI_DOCKER_VERSION = (version) => `New CLI Docker image: ${version
 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_DISABLING_AGENT = 'Disabling agent...';
-const TXT_ENABLING_AGENT = 'Enabling agent...';
+const TXT_DISABLING_AGENT = 'Uninstalling agent...';
+const TXT_ENABLING_AGENT = 'Installing agent...';
 const TXT_UPDATING_AGENT = 'Updating agent...';
 const TXT_OPENING_TUNNEL = 'Opening tunnel...';
 
@@ -177,10 +177,10 @@ const LOG_AGENT_SYSTEM_DIR = 'Creating agent system directory...';
 const LOG_AGENT_DOWNLOADING_ARCHIVE = 'Downloading agent archive...';
 const LOG_AGENT_EXTRACTING_ARCHIVE = 'Extracting agent archive...';
 const LOG_AGENT_SYSTEM_SERVICE_CONFIG = 'Saving agent system service config...';
-const LOG_AGENT_ENABLING_SYSTEM = 'Enabling agent in system...';
+const LOG_AGENT_ENABLING_SYSTEM = 'Installing agent in system...';
 const LOG_AGENT_STOPPING_SYSTEM = 'Stopping agent in system...';
 const LOG_AGENT_STARTING_SYSTEM = 'Starting agent in system...';
-const LOG_AGENT_ENABLED = 'Agent enabled in system';
+const LOG_AGENT_ENABLED = 'Agent installed in system';
 const LOG_AGENT_NSSM_DOWNLOADING = 'Agent nssm downloading...';
 const LOG_AGENT_NSSM_EXTRACTING = 'Agent nssm extracting...';
 const LOG_AGENT_NSSM_CLEARING = 'Agent nssm clearing...';
@@ -315,7 +315,7 @@ module.exports = {
   DESC_COMMAND_AGENT_UNINSTALL,
   DESC_COMMAND_AGENT_TUNNEL_TLS,
   DESC_COMMAND_AGENT_TUNNEL_TCP,
-  DESC_COMMAND_AGENT_TUNNEL_STOP,
+  DESC_COMMAND_AGENT_TUNNEL_REMOVE,
   DESC_COMMAND_AGENT_TUNNEL_STATUS,
   DESC_COMMAND_AGENT_TUNNEL_START,
   DESC_COMMAND_AGENT_TUNNEL_LIST,
@@ -363,6 +363,7 @@ module.exports = {
   TXT_TUNNEL_ADDED,
   TXT_TIMEOUT_SAVED,
   TXT_TOKEN_SAVED,
+  TXT_TOKEN_REMOVED,
   TXT_WHITELIST_SAVED,
   TXT_TUNNEL_STOPPED,
   TXT_TUNNEL_STARTED,
@@ -370,7 +371,6 @@ module.exports = {
   TXT_AGENT_UPDATED,
   TXT_AGENT_ALREADY_ENABLED,
   TXT_AGENT_DISABLED,
-  TXT_AGENT_ALREADY_DISABLED,
   TXT_AGENT_STARTED,
   TXT_AGENT_RESTARTED,
   TXT_AGENT_IS_DISABLED,