bdy 1.7.52-dev → 1.7.54-dev

package/package.json

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

package/src/command/agent/install.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const Input = require('../../input.js');
 const {
@@ -25,6 +24,7 @@ const {
   TXT_AGENT_ENABLED,
   OPTION_AGENT_DEBUG
 } = require('../../texts');
+const { newCommand } = require('../../utils');
 
 const removeAllAndExit = async (txt, id, host, token) => {
   try {
@@ -45,8 +45,7 @@ const removeAllAndExit = async (txt, id, host, token) => {
   Output.exitError(txt);
 };
 
-const commandAgentInstall = new Command('install');
-commandAgentInstall.description(DESC_COMMAND_AGENT_INSTALL);
+const commandAgentInstall = newCommand('install', DESC_COMMAND_AGENT_INSTALL);
 commandAgentInstall.option('-s, --start', OPTION_AGENT_START);
 commandAgentInstall.option('-i, --id <id>', OPTION_AGENT_ID);
 commandAgentInstall.option('-t, --token <token>', OPTION_AGENT_TOKEN);

package/src/command/agent/restart.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const {
   DESC_COMMAND_AGENT_RESTART,
@@ -7,9 +6,9 @@ const {
 const ApiAgent = require('../../api/agent.js');
 const AgentManager = require('../../agent/manager');
 const { ERR_AGENT_NOT_ENABLED } = require('../../texts');
+const { newCommand } = require('../../utils');
 
-const commandAgentRestart = new Command('restart');
-commandAgentRestart.description(DESC_COMMAND_AGENT_RESTART);
+const commandAgentRestart = newCommand('restart', DESC_COMMAND_AGENT_RESTART);
 commandAgentRestart.action(async () => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {

package/src/command/agent/run.js

@@ -1,8 +1,8 @@
-const { Command } = require('commander');
 const AgentManager = require('../../agent/manager');
 const logger = require('../../logger');
+const { newCommand } = require('../../utils');
 
-const commandAgentRun = new Command('run');
+const commandAgentRun = newCommand('run');
 commandAgentRun.option('--id <id>');
 commandAgentRun.option('--host <host>');
 commandAgentRun.option('--token <token>');

package/src/command/agent/start.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const {
   DESC_COMMAND_AGENT_START,
@@ -7,9 +6,9 @@ const {
 const ApiAgent = require('../../api/agent.js');
 const AgentManager = require('../../agent/manager');
 const { ERR_AGENT_NOT_ENABLED } = require('../../texts');
+const { newCommand } = require('../../utils');
 
-const commandAgentStart = new Command('start');
-commandAgentStart.description(DESC_COMMAND_AGENT_START);
+const commandAgentStart = newCommand('start', DESC_COMMAND_AGENT_START);
 commandAgentStart.action(async () => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {

package/src/command/agent/status.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const {
   DESC_COMMAND_AGENT_STATUS,
@@ -16,9 +15,9 @@ const {
 } = require('../../utils.js');
 const AgentManager = require('../../agent/manager');
 const { ERR_AGENT_NOT_RUNNING } = require('../../texts');
+const { newCommand } = require('../../utils');
 
-const commandAgentStatus = new Command('status');
-commandAgentStatus.description(DESC_COMMAND_AGENT_STATUS);
+const commandAgentStatus = newCommand('status', DESC_COMMAND_AGENT_STATUS);
 commandAgentStatus.action(async () => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {

package/src/command/agent/stop.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const {
   DESC_COMMAND_AGENT_STOP,
@@ -7,9 +6,9 @@ const {
 const ApiAgent = require('../../api/agent.js');
 const AgentManager = require('../../agent/manager');
 const { ERR_AGENT_NOT_ENABLED } = require('../../texts');
+const { newCommand } = require('../../utils');
 
-const commandAgentStop = new Command('stop');
-commandAgentStop.description(DESC_COMMAND_AGENT_STOP);
+const commandAgentStop = newCommand('stop', DESC_COMMAND_AGENT_STOP);
 commandAgentStop.action(async () => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {

package/src/command/agent/tunnel/list.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../../output.js');
 const {
   DESC_COMMAND_AGENT_TUNNEL_LIST,
@@ -6,9 +5,9 @@ const {
 } = require('../../../texts.js');
 const ApiAgent = require('../../../api/agent');
 const AgentManager = require('../../../agent/manager');
+const { newCommand } = require('../../../utils');
 
-const commandAgentTunnelList = new Command('list');
-commandAgentTunnelList.description(DESC_COMMAND_AGENT_TUNNEL_LIST);
+const commandAgentTunnelList = newCommand('list', DESC_COMMAND_AGENT_TUNNEL_LIST);
 commandAgentTunnelList.action(async () => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {

package/src/command/agent/tunnel/start.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const {
@@ -11,9 +10,9 @@ const {
 } = require('../../../texts.js');
 const ApiAgent = require('../../../api/agent.js');
 const AgentManager = require('../../../agent/manager');
+const { newCommand } = require('../../../utils');
 
-const commandAgentTunnelStart = new Command('start');
-commandAgentTunnelStart.description(DESC_COMMAND_AGENT_TUNNEL_START);
+const commandAgentTunnelStart = newCommand('start', DESC_COMMAND_AGENT_TUNNEL_START);
 commandAgentTunnelStart.argument('<name>', OPTION_NAME);
 commandAgentTunnelStart.action(async (name) => {
   if (!Cfg.hasTunnel(name)) {

package/src/command/agent/tunnel/status.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const {
   DESC_COMMAND_AGENT_TUNNEL_STATUS,
   ERR_AGENT_NOT_ENABLED,
@@ -8,9 +7,9 @@ const Output = require('../../../output.js');
 const ApiAgent = require('../../../api/agent.js');
 const AgentSocketTunnel = require('../../../agent/socket/tunnel.js');
 const AgentManager = require('../../../agent/manager');
+const { newCommand } = require('../../../utils');
 
-const commandAgentTunnelStatus = new Command('status');
-commandAgentTunnelStatus.description(DESC_COMMAND_AGENT_TUNNEL_STATUS);
+const commandAgentTunnelStatus = newCommand('status', DESC_COMMAND_AGENT_TUNNEL_STATUS);
 commandAgentTunnelStatus.argument('<id>', OPTION_ID);
 commandAgentTunnelStatus.action(async (id) => {
   const isEnabled = await AgentManager.system.isEnabled();

package/src/command/agent/tunnel/stop.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../../output.js');
 const {
   DESC_COMMAND_AGENT_TUNNEL_STOP,
@@ -8,9 +7,9 @@ const {
 } = require('../../../texts.js');
 const ApiAgent = require('../../../api/agent.js');
 const AgentManager = require('../../../agent/manager');
+const { newCommand } = require('../../../utils');
 
-const commandAgentTunnelStop = new Command('stop');
-commandAgentTunnelStop.description(DESC_COMMAND_AGENT_TUNNEL_STOP);
+const commandAgentTunnelStop = newCommand('stop', DESC_COMMAND_AGENT_TUNNEL_STOP);
 commandAgentTunnelStop.argument('<id>', OPTION_ID);
 commandAgentTunnelStop.action(async (id) => {
   const isEnabled = await AgentManager.system.isEnabled();

package/src/command/agent/tunnel.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const commandAgentTunnelTcp = require('./tunnel/tcp.js');
 const commandAgentTunnelList = require('./tunnel/list.js');
 const commandAgentTunnelStop = require('./tunnel/stop.js');
@@ -7,9 +6,9 @@ const commandAgentTunnelHttp = require('./tunnel/http.js');
 const commandAgentTunnelStart = require('./tunnel/start.js');
 const { DESC_COMMAND_AGENT_TUNNEL } = require('../../texts.js');
 const commandAgentTunnelStatus = require('./tunnel/status.js');
+const { newCommand } = require('../../utils');
 
-const commandAgentTunnel = new Command('tunnel');
-commandAgentTunnel.description(DESC_COMMAND_AGENT_TUNNEL);
+const commandAgentTunnel = newCommand('tunnel', DESC_COMMAND_AGENT_TUNNEL);
 commandAgentTunnel.addCommand(commandAgentTunnelTcp);
 commandAgentTunnel.addCommand(commandAgentTunnelTls);
 commandAgentTunnel.addCommand(commandAgentTunnelHttp);

package/src/command/agent/uninstall.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const {
   DESC_COMMAND_AGENT_UNINSTALL,
@@ -7,9 +6,9 @@ const {
 const AgentManager = require('../../agent/manager.js');
 const ApiBuddy = require('../../api/buddy.js');
 const { ERR_AGENT_ADMIN_RIGHTS } = require('../../texts');
+const { newCommand } = require('../../utils');
 
-const commandAgentUninstall = new Command('disable');
-commandAgentUninstall.description(DESC_COMMAND_AGENT_UNINSTALL);
+const commandAgentUninstall = newCommand('disable', DESC_COMMAND_AGENT_UNINSTALL);
 commandAgentUninstall.action(async () => {
   const hasAdminRights = await AgentManager.system.hasAdminRights();
   if (!hasAdminRights) {

package/src/command/agent/update.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const {
   DESC_COMMAND_AGENT_UPDATE,
   ERR_AGENT_NOT_ENABLED,
@@ -12,9 +11,9 @@ const { ERR_AGENT_ADMIN_RIGHTS,
   TXT_UPDATING_AGENT
 } = require('../../texts');
 const ApiAgent = require('../../api/agent');
+const { newCommand } = require('../../utils');
 
-const commandAgentUpdate = new Command('update');
-commandAgentUpdate.description(DESC_COMMAND_AGENT_UPDATE);
+const commandAgentUpdate = newCommand('update', DESC_COMMAND_AGENT_UPDATE);
 commandAgentUpdate.hideVersionUpdate = true;
 commandAgentUpdate.action(async () => {
   const hasAdminRights = await AgentManager.system.hasAdminRights();

package/src/command/agent/version.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../output.js');
 const {
   DESC_COMMAND_AGENT_VERSION,
@@ -6,9 +5,9 @@ const {
   ERR_SWW
 } = require('../../texts.js');
 const AgentManager = require('../../agent/manager');
+const { newCommand } = require('../../utils');
 
-const commandAgentVersion = new Command('version');
-commandAgentVersion.description(DESC_COMMAND_AGENT_VERSION);
+const commandAgentVersion = newCommand('version', DESC_COMMAND_AGENT_VERSION);
 commandAgentVersion.action(async () => {
   const isEnabled = await AgentManager.system.isEnabled();
   if (!isEnabled) {

package/src/command/agent.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const commandAgentStart = require('./agent/start.js');
 const commandAgentStatus = require('./agent/status.js');
 const commandAgentRestart = require('./agent/restart.js');
@@ -10,9 +9,9 @@ const commandAgentUninstall = require('./agent/uninstall.js');
 const commandAgentVersion = require('./agent/version.js');
 const { DESC_COMMAND_AGENT } = require('../texts.js');
 const commandAgentRun = require('./agent/run');
+const { newCommand } = require('../utils');
 
-const commandAgent = new Command('agent');
-commandAgent.description(DESC_COMMAND_AGENT);
+const commandAgent = newCommand('agent', DESC_COMMAND_AGENT);
 commandAgent.addCommand(commandAgentInstall);
 commandAgent.addCommand(commandAgentStart);
 commandAgent.addCommand(commandAgentStop);

package/src/command/config/add.js

@@ -1,11 +1,10 @@
-const { Command } = require('commander');
 const commandConfigAddTcp = require('./add/tcp.js');
 const commandConfigAddHttp = require('./add/http.js');
 const commandConfigAddTls = require('./add/tls.js');
 const { DESC_COMMAND_CONFIG_ADD } = require('../../texts.js');
+const { newCommand } = require('../../utils');
 
-const commandConfigAdd = new Command('add');
-commandConfigAdd.description(DESC_COMMAND_CONFIG_ADD);
+const commandConfigAdd = newCommand('add', DESC_COMMAND_CONFIG_ADD);
 commandConfigAdd.addCommand(commandConfigAddTcp);
 commandConfigAdd.addCommand(commandConfigAddTls);
 commandConfigAdd.addCommand(commandConfigAddHttp);

package/src/command/config/get/region.js

@@ -1,11 +1,10 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const { DESC_COMMAND_CONFIG_GET_REGION } = require('../../../texts.js');
 const Format = require('../../../format');
+const { newCommand } = require('../../../utils');
 
-const commandConfigGetRegion = new Command('region');
-commandConfigGetRegion.description(DESC_COMMAND_CONFIG_GET_REGION);
+const commandConfigGetRegion = newCommand('region', DESC_COMMAND_CONFIG_GET_REGION);
 commandConfigGetRegion.action(() => {
   Output.exitNormal(Format.region(Cfg.getRegion()));
 });

package/src/command/config/get/timeout.js

@@ -1,11 +1,10 @@
-const { Command } = require('commander');
 const Output = require('../../../output.js');
 const Cfg = require('../../../cfg.js');
 const { DESC_COMMAND_CONFIG_GET_TIMEOUT } = require('../../../texts.js');
 const Format = require('../../../format');
+const { newCommand } = require('../../../utils');
 
-const commandConfigGetTimeout = new Command('timeout');
-commandConfigGetTimeout.description(DESC_COMMAND_CONFIG_GET_TIMEOUT);
+const commandConfigGetTimeout = newCommand('timeout', DESC_COMMAND_CONFIG_GET_TIMEOUT);
 commandConfigGetTimeout.action(() => {
   Output.exitNormal(Format.timeout(Cfg.getTimeout()));
 });

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

@@ -1,11 +1,10 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const { DESC_COMMAND_CONFIG_GET_TOKEN } = require('../../../texts.js');
 const Format = require('../../../format');
+const { newCommand } = require('../../../utils');
 
-const commandConfigGetToken = new Command('token');
-commandConfigGetToken.description(DESC_COMMAND_CONFIG_GET_TOKEN);
+const commandConfigGetToken = newCommand('token', DESC_COMMAND_CONFIG_GET_TOKEN);
 commandConfigGetToken.action(() => {
   Output.exitNormal(Format.token(Cfg.getToken()));
 });

package/src/command/config/get/tunnel.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const {
@@ -6,9 +5,9 @@ const {
   ERR_TUNNEL_NOT_FOUND,
   OPTION_NAME
 } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigGetTunnel = new Command('tunnel');
-commandConfigGetTunnel.description(DESC_COMMAND_CONFIG_GET_TUNNEL);
+const commandConfigGetTunnel = newCommand('tunnel', DESC_COMMAND_CONFIG_GET_TUNNEL);
 commandConfigGetTunnel.argument('<name>', OPTION_NAME);
 commandConfigGetTunnel.action((name) => {
   if (!Cfg.hasTunnel(name)) {

package/src/command/config/get/tunnels.js

@@ -1,10 +1,9 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const { DESC_COMMAND_CONFIG_GET_TUNNELS } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigGetTunnels = new Command('tunnels');
-commandConfigGetTunnels.description(DESC_COMMAND_CONFIG_GET_TUNNELS);
+const commandConfigGetTunnels = newCommand('tunnels', DESC_COMMAND_CONFIG_GET_TUNNELS);
 commandConfigGetTunnels.action(() => {
   Output.configTunnels(Cfg.getTunnels());
   Output.exitNormal();

package/src/command/config/get/whitelist.js

@@ -1,11 +1,10 @@
-const { Command } = require('commander');
 const Output = require('../../../output.js');
 const Cfg = require('../../../cfg.js');
 const { DESC_COMMAND_CONFIG_GET_WHITELIST } = require('../../../texts.js');
 const Format = require('../../../format');
+const { newCommand } = require('../../../utils');
 
-const commandConfigGetWhitelist = new Command('whitelist');
-commandConfigGetWhitelist.description(DESC_COMMAND_CONFIG_GET_WHITELIST);
+const commandConfigGetWhitelist = newCommand('whitelist', DESC_COMMAND_CONFIG_GET_WHITELIST);
 commandConfigGetWhitelist.action(() => {
   Output.exitNormal(Format.whitelist(Cfg.getWhitelist()));
 });

package/src/command/config/get.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const commandConfigGetRegion = require('./get/region.js');
 const commandConfigGetToken = require('./get/token.js');
 const commandConfigGetTunnel = require('./get/tunnel.js');
@@ -6,9 +5,9 @@ const commandConfigGetWhitelist = require('./get/whitelist.js');
 const commandConfigGetTimeout = require('./get/timeout.js');
 const commandConfigGetTunnels = require('./get/tunnels.js');
 const { DESC_COMMAND_CONFIG_GET } = require('../../texts.js');
+const { newCommand } = require('../../utils');
 
-const commandConfigGet = new Command('get');
-commandConfigGet.description(DESC_COMMAND_CONFIG_GET);
+const commandConfigGet = newCommand('get', DESC_COMMAND_CONFIG_GET);
 commandConfigGet.addCommand(commandConfigGetRegion);
 commandConfigGet.addCommand(commandConfigGetToken);
 commandConfigGet.addCommand(commandConfigGetWhitelist);

package/src/command/config/remove/tunnel.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const {
@@ -7,9 +6,9 @@ const {
   OPTION_NAME,
   TXT_TUNNEL_REMOVED
 } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigRemoveTunnel = new Command('tunnel');
-commandConfigRemoveTunnel.description(DESC_COMMAND_CONFIG_REMOVE_TUNNEL);
+const commandConfigRemoveTunnel = newCommand('tunnel', DESC_COMMAND_CONFIG_REMOVE_TUNNEL);
 commandConfigRemoveTunnel.argument('<name>', OPTION_NAME);
 commandConfigRemoveTunnel.action((name) => {
   if (!Cfg.hasTunnel(name)) {

package/src/command/config/remove.js

@@ -1,9 +1,8 @@
-const { Command } = require('commander');
 const commandConfigRemoveTunnel = require('./remove/tunnel.js');
 const { DESC_COMMAND_CONFIG_REMOVE } = require('../../texts.js');
+const { newCommand } = require('../../utils');
 
-const commandConfigRemove = new Command('rm');
-commandConfigRemove.description(DESC_COMMAND_CONFIG_REMOVE);
+const commandConfigRemove = newCommand('rm', DESC_COMMAND_CONFIG_REMOVE);
 commandConfigRemove.addCommand(commandConfigRemoveTunnel);
 
 module.exports = commandConfigRemove;

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

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const Input = require('../../../input.js');
@@ -7,9 +6,9 @@ const {
   OPTION_DEFAULT_REGION,
   TXT_REGION_SAVED
 } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigSetRegion = new Command('region');
-commandConfigSetRegion.description(DESC_COMMAND_CONFIG_SET_REGION);
+const commandConfigSetRegion = newCommand('region', DESC_COMMAND_CONFIG_SET_REGION);
 commandConfigSetRegion.argument('<region>', OPTION_DEFAULT_REGION);
 commandConfigSetRegion.action((region) => {
   Cfg.setRegion(Input.region(region));

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

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Output = require('../../../output.js');
 const Cfg = require('../../../cfg.js');
 const Input = require('../../../input.js');
@@ -10,9 +9,9 @@ const {
   OPTION_TIMEOUT,
   TXT_TIMEOUT_SAVED
 } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigSetTimeout = new Command('timeout');
-commandConfigSetTimeout.description(DESC_COMMAND_CONFIG_SET_TIMEOUT);
+const commandConfigSetTimeout = newCommand('timeout', DESC_COMMAND_CONFIG_SET_TIMEOUT);
 commandConfigSetTimeout.argument('[timeout]', OPTION_TIMEOUT, DEFAULT_TIMEOUT);
 commandConfigSetTimeout.action((timeout) => {
   Cfg.setTimeout(Input.timeout(timeout));

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

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const {
@@ -6,9 +5,9 @@ const {
   OPTION_TOKEN,
   TXT_TOKEN_SAVED
 } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigSetToken = new Command('token');
-commandConfigSetToken.description(DESC_COMMAND_CONFIG_SET_TOKEN);
+const commandConfigSetToken = newCommand('token', DESC_COMMAND_CONFIG_SET_TOKEN);
 commandConfigSetToken.argument('[token]', OPTION_TOKEN, '');
 commandConfigSetToken.action((token) => {
   Cfg.setToken(token);

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

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../../../cfg.js');
 const Output = require('../../../output.js');
 const Input = require('../../../input.js');
@@ -7,9 +6,9 @@ const {
   OPTION_WHITELIST,
   TXT_WHITELIST_SAVED
 } = require('../../../texts.js');
+const { newCommand } = require('../../../utils');
 
-const commandConfigSetWhitelist = new Command('whitelist');
-commandConfigSetWhitelist.description(DESC_COMMAND_CONFIG_SET_WHITELIST);
+const commandConfigSetWhitelist = newCommand('whitelist', DESC_COMMAND_CONFIG_SET_WHITELIST);
 commandConfigSetWhitelist.argument('[cidrs...]', OPTION_WHITELIST, []);
 commandConfigSetWhitelist.action((whitelist) => {
   Cfg.setWhitelist(Input.whitelist(whitelist));

package/src/command/config/set.js

@@ -1,12 +1,11 @@
-const { Command } = require('commander');
 const commandConfigSetToken = require('./set/token.js');
 const commandConfigSetRegion = require('./set/region.js');
 const commandConfigSetWhitelist = require('./set/whitelist.js');
 const commandConfigSetTimeout = require('./set/timeout.js');
 const { DESC_COMMAND_CONFIG_SET } = require('../../texts.js');
+const { newCommand } = require('../../utils');
 
-const commandConfigSet = new Command('set');
-commandConfigSet.description(DESC_COMMAND_CONFIG_SET);
+const commandConfigSet = newCommand('set', DESC_COMMAND_CONFIG_SET);
 commandConfigSet.addCommand(commandConfigSetToken);
 commandConfigSet.addCommand(commandConfigSetRegion);
 commandConfigSet.addCommand(commandConfigSetWhitelist);

package/src/command/config.js

@@ -1,12 +1,11 @@
-const { Command } = require('commander');
 const commandConfigSet = require('./config/set.js');
 const commandConfigGet = require('./config/get.js');
 const commandConfigAdd = require('./config/add.js');
 const commandConfigRemove = require('./config/remove.js');
 const { DESC_COMMAND_CONFIG } = require('../texts.js');
+const { newCommand } = require('../utils');
 
-const commandConfig = new Command('config');
-commandConfig.description(DESC_COMMAND_CONFIG);
+const commandConfig = newCommand('config', DESC_COMMAND_CONFIG);
 commandConfig.addCommand(commandConfigSet);
 commandConfig.addCommand(commandConfigAdd);
 commandConfig.addCommand(commandConfigGet);

package/src/command/start.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const Cfg = require('../cfg.js');
 const Output = require('../output.js');
 const {
@@ -8,9 +7,9 @@ const {
   TXT_OPENING_TUNNEL
 } = require('../texts.js');
 const ApiBuddy = require('../api/buddy.js');
+const { newCommand } = require('../utils');
 
-const commandStart = new Command('start');
-commandStart.description(DESC_COMMAND_START);
+const commandStart = newCommand('start', DESC_COMMAND_START);
 commandStart.argument('<name>', OPTION_NAME);
 commandStart.action(async (name) => {
   if (!Cfg.hasTunnel(name)) {

package/src/command/version.js

@@ -1,8 +1,8 @@
-const { Command } = require('commander');
 const { getVersion } = require('../utils.js');
 const Output = require('../output.js');
+const { newCommand } = require('../utils');
 
-const commandVersion = new Command('version');
+const commandVersion = newCommand('version');
 commandVersion.action(() => {
   Output.exitNormal(getVersion());
 });

package/src/index.js

@@ -1,4 +1,3 @@
-const { Command } = require('commander');
 const commandConfig = require('./command/config.js');
 const Output = require('./output.js');
 const commandTcp = require('./command/tcp.js');
@@ -10,7 +9,10 @@ const logger = require('./logger.js');
 const commandVersion = require('./command/version.js');
 const commandPre = require('./command/pre.js');
 const stream = require('stream');
-const { isDocker } = require('./utils');
+const { isDocker,
+  formatHelp,
+  newCommand
+} = require('./utils');
 const { DESC_PROGRAM } = require('./texts');
 
 stream.setDefaultHighWaterMark(false, 67108864);
@@ -20,9 +22,11 @@ process.on('uncaughtException', (err) => {
   Output.exitError(err);
 });
 
-const program = new Command();
-program.description(DESC_PROGRAM);
+const program = newCommand(null, DESC_PROGRAM);
 program.hook('preAction', commandPre);
+program.configureHelp({
+  formatHelp: formatHelp
+});
 program.addCommand(commandConfig);
 program.addCommand(commandTcp);
 program.addCommand(commandTls);

package/src/utils.js

@@ -41,7 +41,7 @@ const {
   ERR_SUBDOMAIN_TAKEN,
   ERR_TUNNELS_DISABLED,
   ERR_AGENT_LIMIT_REACHED,
-  ERR_TUNNEL_LIMIT_REACHED
+  ERR_TUNNEL_LIMIT_REACHED,
 } = require('./texts');
 
 const REGION_US = 'US';
@@ -243,6 +243,67 @@ const getPlatform = () => {
   return os.platform();
 };
 
+const formatHelp = (cmd, helper) => {
+  const termWidth = helper.padWidth(cmd, helper);
+  const helpWidth = helper.helpWidth || 80;
+  const itemIndentWidth = 2;
+  const itemSeparatorWidth = 2; // between term and description
+  function formatItem(term, description) {
+    if (description) {
+      const fullText = `${term.padEnd(termWidth + itemSeparatorWidth)}${description}`;
+      return helper.wrap(fullText, helpWidth - itemIndentWidth, termWidth + itemSeparatorWidth);
+    }
+    return term;
+  }
+  function formatList(textArray) {
+    return textArray.join('\n').replace(/^/gm, ' '.repeat(itemIndentWidth));
+  }
+
+  // Usage
+  let output = ['USAGE:', `  ${helper.commandUsage(cmd)}`, ''];
+
+  // Description
+  const commandDescription = helper.commandDescription(cmd);
+  if (commandDescription.length > 0) {
+    output = output.concat(['DESCRIPTION:', `  ${helper.wrap(commandDescription, helpWidth, itemIndentWidth)}`, '']);
+  }
+
+  // Arguments
+  const argumentList = helper.visibleArguments(cmd).map((argument) => {
+    return formatItem(helper.argumentTerm(argument), helper.argumentDescription(argument));
+  });
+  if (argumentList.length > 0) {
+    output = output.concat(['ARGUMENTS:', formatList(argumentList), '']);
+  }
+
+  // Options
+  const optionList = helper.visibleOptions(cmd).map((option) => {
+    return formatItem(helper.optionTerm(option), helper.optionDescription(option));
+  });
+  if (optionList.length > 0) {
+    output = output.concat(['OPTIONS:', formatList(optionList), '']);
+  }
+
+  // Commands
+  const commandList = helper.visibleCommands(cmd).map((cmd) => {
+    return formatItem(helper.subcommandTerm(cmd), helper.subcommandDescription(cmd));
+  });
+  if (commandList.length > 0) {
+    output = output.concat(['COMMANDS:', formatList(commandList), '']);
+  }
+
+  return output.join('\n');
+};
+
+const newCommand = (name, desc) => {
+  const cmd = new Command(name);
+  if (desc) cmd.description(desc);
+  cmd.configureHelp({
+    formatHelp: formatHelp
+  });
+  return cmd;
+};
+
 const getHomeDirectory = () => {
   if (isDocker()) return '/buddy';
   const r = homedir();
@@ -344,7 +405,7 @@ const createSshHostKey = () => {
 };
 
 const getBasicCommandTcp = () => {
-  const commandTcp = new Command('tcp');
+  const commandTcp = newCommand('tcp');
   commandTcp.alias('TCP');
   commandTcp.option('-r, --region <region>', OPTION_REGION);
   commandTcp.option('-w, --whitelist <cidrs...>', OPTION_WHITELIST);
@@ -355,7 +416,7 @@ const getBasicCommandTcp = () => {
 };
 
 const getBasicCommandHttp = () => {
-  const commandHttp = new Command('http');
+  const commandHttp = newCommand('http');
   commandHttp.alias('HTTP');
   commandHttp.option('-r, --region <region>', OPTION_REGION);
   commandHttp.option('-w, --whitelist <cidrs...>', OPTION_WHITELIST);
@@ -377,7 +438,7 @@ const getBasicCommandHttp = () => {
 };
 
 const getBasicCommandTls = () => {
-  const commandTls = new Command('tls');
+  const commandTls = newCommand('tls');
   commandTls.alias('TLS');
   commandTls.option('-r, --region <region>', OPTION_REGION);
   commandTls.option('-w, --whitelist <cidrs...>', OPTION_WHITELIST);
@@ -452,6 +513,8 @@ module.exports = {
   isLinux,
   isWindows,
   createSshHostKey,
+  formatHelp,
+  newCommand,
   AGENT_STATUS_INITIALIZING,
   AGENT_STATUS_FETCH_FAILED,
   AGENT_STATUS_DISABLED,