bdy 1.7.54-dev → 1.7.56-dev

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.7.54-dev",
+  "version": "1.7.56-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

@@ -1,49 +1,48 @@
-const ERR_AGENT_NOT_REGISTERED = 'Agent not registered. Exiting...';
-const ERR_SAVING_AGENT_CONFIG = 'Error while saving agent config. Exiting...';
-const ERR_TARGET_IS_NOT_VALID = (target) => `Target '${target}' is not a valid value`;
-const ERR_TYPE_IS_NOT_VALID = (type) => `Type '${type}' is not a valid value`;
-const ERR_TIMEOUT_IS_NOT_VALID = (timeout) => `Timeout '${timeout}' is not a valid value`;
-const ERR_TERMINATE_IS_NOT_VALID = (terminate) => `Terminate '${terminate}' is not a valid value`;
-const ERR_SUBDOMAIN_IS_NOT_VALID = (subdomain) => `Subdomain '${subdomain}' is not a valid value`;
+const ERR_AGENT_NOT_REGISTERED = 'Agent not registered. Exiting.';
+const ERR_SAVING_AGENT_CONFIG = 'Failed saving agent config. Exiting.';
+const ERR_TARGET_IS_NOT_VALID = (target) => `Target '${target}' invalid`;
+const ERR_TYPE_IS_NOT_VALID = (type) => `Type '${type}' invalid`;
+const ERR_TIMEOUT_IS_NOT_VALID = (timeout) => `Timeout '${timeout}' invalid`;
+const ERR_TERMINATE_IS_NOT_VALID = (terminate) => `Terminate '${terminate}' invalid`;
+const ERR_SUBDOMAIN_IS_NOT_VALID = (subdomain) => `Subdomain '${subdomain}' invalid`;
 const ERR_SUBDOMAIN_IS_TOO_SHORT = (subdomain) => `Subdomain '${subdomain}' is too short`;
 const ERR_SUBDOMAIN_IS_TOO_LONG = (subdomain) => `Subdomain '${subdomain}' is too long`;
 const ERR_DIRECTORY_DOES_NOT_EXISTS = (dir) => `Directory '${dir}' does not exists`;
 const ERR_PATH_IS_NOT_DIRECTORY = (path) => `Path '${path}' is not a directory`;
-const ERR_REGION_IS_NOT_VALID = (region) => `Region '${region}' is not a valid value`;
-const ERR_PORT_IS_NOT_VALID = (port) => `Port '${port}' is not a valid value`;
-const ERR_NAME_WITHOUT_ASTERISK = 'Name cannot contain \'*\'';
-const ERR_WRONG_KEY_CERT = 'Wrong TLS key or certificate';
-const ERR_WRONG_CA = (path) => `TLS CA certificate '${path}' is not valid`;
-const ERR_CA_PATH_IS_NOT_VALID = (path) => `Path to TLS CA certificate '${path}' is not valid`;
-const ERR_KEY_PATH_IS_NOT_VALID = (path) => `Path to TLS key '${path}' is not valid`;
-const ERR_CERT_PATH_IS_NOT_VALID = (path) => `Path to TLS certificate '${path}' is not valid`;
-const ERR_DOMAIN_IS_NOT_VALID = (domain) => `Domain '${domain}' is not a valid value`;
-const ERR_CB_THRESHOLD_IS_NOT_VALID = (val) => `Circuit breaker threshold '${val}' is not a valid value`;
-const ERR_BA_PASSWORD_NOT_PROVIDED = 'Basic Auth password is not provided';
-const ERR_BA_LOGIN_NOT_PROVIDED = 'Basic Auth login is not provided';
-const ERR_BA_IS_NOT_VALID = (auth) => `Basic Auth '${auth}' is not a valid value`;
-const ERR_USER_AGENT_IS_NOT_VALID = (ua) => `User-Agent '${ua}' is not a valid regexp`;
-const ERR_WHITELIST_IS_NOT_VALID = (wh) => `Whitelist '${wh}' is not a valid CIDR address`;
+const ERR_REGION_IS_NOT_VALID = (region) => `Region '${region}' invalid`;
+const ERR_PORT_IS_NOT_VALID = (port) => `Port '${port}' invalid`;
+const ERR_NAME_WITHOUT_ASTERISK = 'Name: no \'*\' allowed';
+const ERR_WRONG_KEY_CERT = 'Invalid TLS key or cert';
+const ERR_WRONG_CA = (path) => `TLS CA certificate '${path}'invalid`;
+const ERR_CA_PATH_IS_NOT_VALID = (path) => `Invalid TLS CA cert path: '${path}'`;
+const ERR_KEY_PATH_IS_NOT_VALID = (path) => `Invalid TLS key path: '${path}'`;
+const ERR_CERT_PATH_IS_NOT_VALID = (path) => `Invalid TLS cert path: '${path}'`;
+const ERR_DOMAIN_IS_NOT_VALID = (domain) => `Domain '${domain}' invalid`;
+const ERR_CB_THRESHOLD_IS_NOT_VALID = (val) => `Circuit breaker threshold '${val}' invalid`;
+const ERR_BA_PASSWORD_NOT_PROVIDED = 'HTTP BA password not provided';
+const ERR_BA_LOGIN_NOT_PROVIDED = 'HTTP BA username not provided';
+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 is not enabled';
-const ERR_AGENT_NOT_RUNNING = 'Agent is not running';
-const ERR_AGENT_NOT_FOUND = 'Agent is not found';
-const ERR_AGENT_DOCKER_NOT_FOUND = 'Can\'t manage agent. First install Docker and enable it for current user';
-const ERR_SWW_AGENT_ENABLING = 'Something went wrong while enabling agent';
-const ERR_SWW_AGENT_DISABLING = 'Something went wrong while disabling agent';
-const ERR_SWW_AGENT_UPDATING = 'Something went wrong while updating agent';
-const ERR_AGENT_ENABLE = 'Can\'t start agent. Enable it first';
+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 installing agent';
+const ERR_SWW_AGENT_DISABLING = 'Failed uninstalling agent';
+const ERR_SWW_AGENT_UPDATING = 'Failed updating agent';
+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 with that name already exists. Change name or use -f flag to overwrite it';
+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 already reserved';
-const ERR_TUNNEL_LIMIT_REACHED = 'Limit of tunnels reached';
-const ERR_AGENT_LIMIT_REACHED = 'Limit of agents reached';
+const ERR_SUBDOMAIN_TAKEN = 'Subdomain name unavailable70342556';
+const ERR_TUNNEL_LIMIT_REACHED = 'Tunnels limit reached';
+const ERR_AGENT_LIMIT_REACHED = 'Agents limit reached';
 const ERR_TUNNELS_DISABLED = 'Tunnels disabled';
-const ERR_TUNNEL_REMOVED = 'Tunnel has been removed';
-const ERR_FAILED_TO_CONNECT_TO_AGENT = 'Failed to connect to agent';
+const ERR_TUNNEL_REMOVED = 'Tunnel removed';
+const ERR_FAILED_TO_CONNECT_TO_AGENT = 'Failed connecting to agent';
 const ERR_NOT_FOUND = 'Not found';
 const ERR_SWW = 'Something went wrong';
 const ERR_FETCH_VERSION = 'Failed to fetch version';
@@ -59,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 & have connection issues';
-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';
@@ -81,31 +80,31 @@ const TXT_TUNNEL_ADDED = 'Tunnel added';
 const NO_TUNNELS_STARTED = 'No tunnels started';
 const AGENT_FETCH_RETRY = 'Agent fetch failed. Retrying in 3s...';
 
-const DESC_COMMAND_CONFIG_ADD_HTTP = 'add HTTP tunnel to config';
-const DESC_COMMAND_CONFIG_ADD_TCP = 'add TCP tunnel to config';
-const DESC_COMMAND_CONFIG_ADD_TLS = 'add TLS tunnel to config';
-const DESC_COMMAND_CONFIG_GET_REGION = 'get default region';
-const DESC_COMMAND_CONFIG_GET_TIMEOUT = 'get default timeout';
-const DESC_COMMAND_CONFIG_GET_TOKEN = 'get authorization token';
-const DESC_COMMAND_CONFIG_GET_TUNNEL = 'get tunnel configuration';
-const DESC_COMMAND_CONFIG_GET_TUNNELS = 'get tunnels';
-const DESC_COMMAND_CONFIG_GET_WHITELIST = 'get default whitelist';
-const DESC_COMMAND_CONFIG_REMOVE_TUNNEL = 'remove tunnel';
-const DESC_COMMAND_CONFIG_SET_REGION = 'set default region';
-const DESC_COMMAND_CONFIG_SET_TIMEOUT = 'set default timeout';
-const DESC_COMMAND_CONFIG_SET_TOKEN = 'set default authorization token';
-const DESC_COMMAND_CONFIG_SET_WHITELIST = 'set default whitelist';
-const DESC_COMMAND_CONFIG_ADD = 'add configuration';
-const DESC_COMMAND_CONFIG_GET = 'get configuration';
-const DESC_COMMAND_CONFIG_REMOVE = 'remove configuration';
+const DESC_COMMAND_CONFIG_ADD_HTTP = 'Add a new HTTP tunnel';
+const DESC_COMMAND_CONFIG_ADD_TCP = 'Add a new TCP tunnel';
+const DESC_COMMAND_CONFIG_ADD_TLS = 'Add a new TLS tunnel';
+const DESC_COMMAND_CONFIG_GET_REGION = 'Get region configuration';
+const DESC_COMMAND_CONFIG_GET_TIMEOUT = 'Get timeout configuration';
+const DESC_COMMAND_CONFIG_GET_TOKEN = 'Get token configuration';
+const DESC_COMMAND_CONFIG_GET_TUNNEL = 'Get tunnel configuration';
+const DESC_COMMAND_CONFIG_GET_TUNNELS = 'Get tunnels configuration';
+const DESC_COMMAND_CONFIG_GET_WHITELIST = 'Get IP access restrictions';
+const DESC_COMMAND_CONFIG_REMOVE_TUNNEL = 'Remove tunnel configuration';
+const DESC_COMMAND_CONFIG_SET_REGION = 'Set region';
+const DESC_COMMAND_CONFIG_SET_TIMEOUT = 'Set timeout';
+const DESC_COMMAND_CONFIG_SET_TOKEN = 'Set token';
+const DESC_COMMAND_CONFIG_SET_WHITELIST = 'Set IP access restrictions';
+const DESC_COMMAND_CONFIG_ADD = 'Add a new HTTP/TCP/TLS tunnel';
+const DESC_COMMAND_CONFIG_GET = 'Get configuration tunnel/token/region/whitelist/timeout';
+const DESC_COMMAND_CONFIG_REMOVE = 'Remove tunnels configuration';
 const DESC_COMMAND_CONFIG_SET = 'Set configuration token/region/whitelist/timeout';
-const DESC_COMMAND_AGENT_TUNNEL_HTTP = 'start HTTP tunnel in agent';
-const DESC_COMMAND_AGENT_TUNNEL_LIST = 'list tunnels in agent';
-const DESC_COMMAND_AGENT_TUNNEL_START = 'start tunnel in agent from config';
-const DESC_COMMAND_AGENT_TUNNEL_STATUS = 'status of tunnel in agent';
-const DESC_COMMAND_AGENT_TUNNEL_STOP = 'stop tunnel in agent';
-const DESC_COMMAND_AGENT_TUNNEL_TCP = 'start TCP tunnel in agent';
-const DESC_COMMAND_AGENT_TUNNEL_TLS = 'start TLS tunnel in agent';
+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_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';
 const DESC_COMMAND_AGENT_INSTALL = 'Install bdy as operating system service on Windows, OS X and Linux systems';
 const DESC_COMMAND_AGENT_START = 'Starts agent and all tunnels from configuration file';
@@ -123,12 +122,12 @@ 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) => `There is a new CLI Docker image version (${version})\n\n`;
-const TXT_NEW_CLI_VERSION = (version) => `There is a new CLI version (${version})\n\n`;
-const TXT_NEW_AGENT_VERSION = (version) => `Agent needs update. To update it to version ${version} run:\n\`bdy agent update\`\n\n`;
-const TXT_NEW_CLI_AGENT_VERSION = (version) => `There is a new CLI version (${version}). After upgrading CLI update agent:\n\`bdy agent update\`\n\n`;
-const TXT_DISABLING_AGENT = 'Disabling agent...';
-const TXT_ENABLING_AGENT = 'Enabling agent...';
+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_DISABLING_AGENT = 'Uninstalling agent...';
+const TXT_ENABLING_AGENT = 'Installing agent...';
 const TXT_UPDATING_AGENT = 'Updating agent...';
 const TXT_OPENING_TUNNEL = 'Opening tunnel...';
 
@@ -145,9 +144,9 @@ const OPTION_DOMAIN = 'provide custom domain';
 const OPTION_TIMEOUT = 'enforce connection timeout in seconds';
 const OPTION_TOKEN = 'token to authorize agent';
 const OPTION_FORCE = 'overwrite tunnel if it already exist';
-const OPTION_HTTP_HOST = 'provide custom http host header';
-const OPTION_HTTP_AUTH = 'enforce http basic authorization';
-const OPTION_HTTP_LOG = 'log http requests';
+const OPTION_HTTP_HOST = 'provide custom HTTP host header';
+const OPTION_HTTP_AUTH = 'enforce HTTP basic authorization';
+const OPTION_HTTP_LOG = 'log HTTP requests';
 const OPTION_HTTP_VERIFY = 'enforce TLS verify';
 const OPTION_HTTP_2 = 'enforce HTTP/2';
 const OPTION_HTTP_COMPRESSION = 'turn on HTTP response compression';
@@ -162,9 +161,9 @@ const OPTION_ID = 'id of the tunnel';
 const OPTION_AGENT_ID = 'start existing agent';
 const OPTION_AGENT_START = 'start agent right away';
 const OPTION_AGENT_TOKEN = 'token to authorize existing agent agent or token to add a new agent';
-const OPTION_USER = 'name of the user in OS. By default agent is run as root (macOS/Linux) or LocalSystem account (Windows). Under Windows user must be passed as DOMAIN\\USER (to find out full name use `whoami` command)';
+const OPTION_USER = 'OS user name. Default: root (macOS/Linux), LocalSystem (Windows. Provide as DOMAIN\\USER (use `whoami` to get full username)';
 const OPTION_PASS = 'password of the user. Only set for Windows';
-const OPTION_AGENT_PORT = 'agent api port';
+const OPTION_AGENT_PORT = 'agent API port';
 const OPTION_AGENT_DEBUG = 'turns on debug mode';
 
 const LOG_REGISTERING_AGENT = 'Registering agent...';
@@ -178,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...';
@@ -198,32 +197,32 @@ const LOG_REMOVING_TUNNEL = 'Removing tunnel...';
 const LOG_STARTING_TUNNEL = (id) => `Starting tunnel '${id}'`;
 const LOG_STOPPING_TUNNEL = (id) => `Stopping tunnel '${id}'`;
 const LOG_ERROR = 'error';
-const LOG_HTTP1_CONNECTION = (ip) => `HTTP1 server will handle tunnel connection from ${ip}`;
-const LOG_HTTP1_REQUEST = (method, url) => `HTTP1 server new request ${method} ${url}`;
-const LOG_HTTP2_CONNECTION = (ip) => `HTTP2 server will handle tunnel connection from ${ip}`;
-const LOG_HTTP2_REQUEST = (method, url) => `HTTP2 server new request ${method} ${url}`;
+const LOG_HTTP1_CONNECTION = (ip) => `HTTP/1.1 server: New tunnel connection from ${ip}`;
+const LOG_HTTP1_REQUEST = (method, url) => `HTTP/1.1 server: New request ${method} ${url}`;
+const LOG_HTTP2_CONNECTION = (ip) => `HTTP/2 server: New tunnel connection from ${ip}`;
+const LOG_HTTP2_REQUEST = (method, url) => `HTTP/2 server: New request ${method} ${url}`;
 const LOG_DETECTED_STREAM = (type) => `Detected stream '${type}'`;
 const LOG_WRONG_STREAM = 'Wrong stream type';
-const LOG_SSH_CONNECTION = 'New SSH tcp connection';
+const LOG_SSH_CONNECTION = 'New SSH TCP connection';
 const LOG_REQUEST = (url) => `request: ${url}`;
-const LOG_ERROR_STARTING_AGENT_SERVER = 'Error while starting agent api server';
+const LOG_ERROR_STARTING_AGENT_SERVER = 'Error while starting agent API server';
 const LOG_AGENT_SERVER_STARTED = 'Agent server started';
 const LOG_AGENT_STARTED = 'Agent started';
 const LOG_TUNNEL_CONNECTED = (id, port) => `Tunnel '${id}' connected. Forwarding port '${port}'`;
 const LOG_TUNNEL_FAILED = (id) => `Tunnel '${id}' forwarding failed`;
 const LOG_TUNNEL_DISCONNECTED = (id) => `Tunnel '${id}' disconnected`;
 const LOG_TUNNEL_IDENTIFIED = (id, type) => `Tunnel ${id} identified as ${type}`;
-const LOG_TUNNEL_HTTP_WRON_AUTH = 'HTTP request wrong basic auth';
-const LOG_TUNNEL_HTTP_RATE_LIMIT = 'HTTP request rate limited';
+const LOG_TUNNEL_HTTP_WRON_AUTH = 'HTTP request: HTTP BA failed';
+const LOG_TUNNEL_HTTP_RATE_LIMIT = 'HTTP request: rate limited';
 const LOG_TUNNEL_HTTP_CIRCUIT_BREAKER_OPEN = 'HTTP request circuit breaker open';
 const LOG_TUNNEL_HTTP_WRONG_USER_AGENTS = 'HTTP request wrong user-agents';
-const LOG_TUNNEL_TCP_STREAM = (id) => `New TCP connection on tunnel '${id}'. Stream to target`;
-const LOG_TUNNEL_HTTP1_STREAM = (id) => `New HTTP1 connection on tunnel '${id}'. Handle HTTP1`;
-const LOG_TUNNEL_HTTP2_STREAM = (id) => `New HTTP2 connection on tunnel '${id}'. Handle HTTP2`;
-const LOG_TUNNEL_TLS_TARGET_STREAM = (id) => `New TLS connection on tunnel '${id}'. Terminated at target. Stream to target`;
-const LOG_TUNNEL_TLS_REGION_STREAM = (id) => `New TLS connection on tunnel '${id}'. Terminated at region. Stream to target`;
-const LOG_TUNNEL_TLS_AGENT_STREAM = (id) => `New TLS connection on tunnel '${id}'. Terminated at agent. Handle TLS`;
-const LOG_TUNNEL_SSH_STREAM = (id) => `New SSH connection on tunnel '${id}'. Stream to localhost`;
+const LOG_TUNNEL_TCP_STREAM = (id) => `New TCP connection on tunnel '${id}' [streamed to target]`;
+const LOG_TUNNEL_HTTP1_STREAM = (id) => `New HTTP/1.1 connection to '${id}'`;
+const LOG_TUNNEL_HTTP2_STREAM = (id) => `New HTTP/2 connection to '${id}'`;
+const LOG_TUNNEL_TLS_TARGET_STREAM = (id) => `New TLS connection to '${id}' [Terminated at target, streamed to target]`;
+const LOG_TUNNEL_TLS_REGION_STREAM = (id) => `New TLS connection to '${id}' [Terminated at region, streamed to target]`;
+const LOG_TUNNEL_TLS_AGENT_STREAM = (id) => `New TLS connection to '${id}' [Terminated at agent]`;
+const LOG_TUNNEL_SSH_STREAM = (id) => `New SSH connection to '${id}' [Streamed to localhost]`;
 
 module.exports = {
   LOG_ERROR_WHILE_REFRESHING_AGENT,
@@ -316,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,
@@ -364,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,
@@ -371,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,
@@ -405,7 +404,6 @@ module.exports = {
   ERR_NAME_WITHOUT_ASTERISK,
   ERR_BA_PASSWORD_NOT_PROVIDED,
   ERR_BA_LOGIN_NOT_PROVIDED,
-  ERR_AGENT_DOCKER_NOT_FOUND,
   ERR_FETCH_VERSION,
   ERR_TUNNEL_LIMIT_REACHED,
   ERR_AGENT_LIMIT_REACHED,