bdy 1.18.5-dev → 1.18.6-stage

package/distTs/package.json

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

package/distTs/src/agent/manager.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentManagerClass = void 0;
 const utils_1 = require("../utils");
-const ws_1 = require("ws");
 const logger_1 = __importDefault(require("../logger"));
 const http_1 = __importDefault(require("http"));
 const output_1 = __importDefault(require("../output"));
@@ -14,9 +13,8 @@ const windows_1 = __importDefault(require("./windows"));
 const linux_1 = __importDefault(require("./linux"));
 const system_1 = __importDefault(require("./system"));
 const osx_1 = __importDefault(require("./osx"));
-const buddy_1 = __importDefault(require("../tunnel/api/buddy"));
-const socket_1 = __importDefault(require("./socket"));
 const tunnel_1 = require("../types/tunnel");
+const getApiBuddy = () => require('../tunnel/api/buddy').default;
 class AgentManagerClass {
     status;
     id;
@@ -56,7 +54,7 @@ class AgentManagerClass {
     }
     async tryFetch() {
         try {
-            this.agent = await buddy_1.default.fetchAgent(this.id || '', this.host || '', this.token || '');
+            this.agent = await getApiBuddy().fetchAgent(this.id || '', this.host || '', this.token || '');
             this.agent.manager = this;
             this.agent.startRefreshingConfiguration((success) => {
                 if (success)
@@ -166,7 +164,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.enableTarget(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().enableTarget(this.id || '', this.host || '', this.token || '');
             this.agent.changeTarget(true);
         }
         catch (err) {
@@ -181,7 +179,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.enableTunneling(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().enableTunneling(this.id || '', this.host || '', this.token || '');
             this.agent.changeTunneling(true);
         }
         catch (err) {
@@ -196,7 +194,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.enableProxy(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().enableProxy(this.id || '', this.host || '', this.token || '');
             this.agent.changeProxy(true);
         }
         catch (err) {
@@ -211,7 +209,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.disableTarget(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().disableTarget(this.id || '', this.host || '', this.token || '');
             this.agent.changeTarget(false);
         }
         catch (err) {
@@ -226,7 +224,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.disableTunneling(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().disableTunneling(this.id || '', this.host || '', this.token || '');
             this.agent.changeTunneling(false);
         }
         catch (err) {
@@ -241,7 +239,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.disableProxy(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().disableProxy(this.id || '', this.host || '', this.token || '');
             this.agent.changeProxy(false);
         }
         catch (err) {
@@ -292,7 +290,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.updateTags(this.id || '', this.host || '', this.token || '', data.tags || []);
+            await getApiBuddy().updateTags(this.id || '', this.host || '', this.token || '', data.tags || []);
             this.serverOutput(res, {});
         }
         catch (err) {
@@ -338,7 +336,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.removeTunnel(this.id || '', tunnel.id, this.host || '', this.token || '');
+            await getApiBuddy().removeTunnel(this.id || '', tunnel.id, this.host || '', this.token || '');
         }
         catch (err) {
             this.serverError(res, err.message);
@@ -357,7 +355,7 @@ class AgentManagerClass {
             // do nothing
         }
         try {
-            await buddy_1.default.unregister(this.id || '', this.host || '', this.token || '');
+            await getApiBuddy().unregister(this.id || '', this.host || '', this.token || '');
         }
         catch {
             // do nothing
@@ -447,7 +445,7 @@ class AgentManagerClass {
         }
         let tunnel;
         try {
-            tunnel = await buddy_1.default.addTunnel(this.id || '', this.host || '', this.token || '', data, this.sshHostKey || '');
+            tunnel = await getApiBuddy().addTunnel(this.id || '', this.host || '', this.token || '', data, this.sshHostKey || '');
         }
         catch (err) {
             this.serverError(res, err.message);
@@ -524,11 +522,13 @@ class AgentManagerClass {
             con.close();
             return;
         }
-        new socket_1.default(con, tunnel);
+        const AgentSocket = require('./socket').default;
+        new AgentSocket(con, tunnel);
     }
     createServer() {
         this.server = http_1.default.createServer((req, res) => this.processRequest(req, res));
-        this.ws = new ws_1.WebSocketServer({ noServer: true });
+        const { WebSocketServer: WsServer } = require('ws');
+        this.ws = new WsServer({ noServer: true });
         this.ws.on('connection', (con, id) => this.processWebsocketConnection(con, id));
         this.server.on('upgrade', (req, socket, head) => this.processUpgrade(req, socket, head));
         this.server.on('error', async (err) => {
@@ -552,8 +552,10 @@ class AgentManagerClass {
         catch {
             // save from param
         }
-        if (!this.sshHostKey)
-            this.sshHostKey = (0, utils_1.createSshHostKey)();
+        if (!this.sshHostKey) {
+            const { createSshHostKey } = require('../sshKeygen');
+            this.sshHostKey = createSshHostKey();
+        }
         try {
             // resave config
             this.system.saveNewAgentConfig(this.sshHostKey || '');

package/distTs/src/autocomplete.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const tabtab_1 = __importDefault(require("tabtab"));
 const logger_1 = __importDefault(require("./logger"));
 class Autocomplete {
     getCommandsMap(command) {
@@ -37,7 +36,11 @@ class Autocomplete {
         return commands;
     }
     init(rootCommand) {
-        const env = tabtab_1.default.parseEnv(process.env);
+        // COMP_LINE is set by all shells (bash natively, zsh/fish via tabtab scripts) when invoking completion
+        if (!process.env.COMP_LINE)
+            return false;
+        const tabtab = require('tabtab');
+        const env = tabtab.parseEnv(process.env);
         if (!env.complete)
             return false;
         let map = {
@@ -67,17 +70,19 @@ class Autocomplete {
             if (arg)
                 map = map[arg];
         }
-        tabtab_1.default.log(Object.keys(map));
+        tabtab.log(Object.keys(map));
         return true;
     }
     async install() {
-        await tabtab_1.default.install({
+        const tabtab = require('tabtab');
+        await tabtab.install({
             name: process.title,
             completer: process.title
         });
     }
     async uninstall() {
-        await tabtab_1.default.uninstall({
+        const tabtab = require('tabtab');
+        await tabtab.uninstall({
             name: process.title
         });
     }

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

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const output_1 = __importDefault(require("../../output"));
-const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentDebug = (0, utils_1.newCommand)('debug', texts_1.DESC_COMMAND_AGENT_DEBUG);
 commandAgentDebug.argument('<on/off>');
 commandAgentDebug.action(async (debug) => {
-    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    const AgentManager = require('../../agent/manager').default;
+    const ApiAgent = require('../../tunnel/api/agent').default;
+    const hasAdminRights = await AgentManager.system.hasAdminRights();
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
@@ -23,10 +23,10 @@ commandAgentDebug.action(async (debug) => {
     }
     try {
         const debugOn = debug === 'on';
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const json = AgentManager.system.loadSystemConfig();
+        const api = new ApiAgent(json.port);
         await api.debugChange(debugOn);
-        manager_1.default.system.saveSystemConfig(json.id, json.host, json.token, json.port, !!json.standalone, debugOn);
+        AgentManager.system.saveSystemConfig(json.id, json.host, json.token, json.port, !!json.standalone, debugOn);
         output_1.default.exitSuccess(debugOn ? texts_1.TXT_AGENT_DEBUG_ON : texts_1.TXT_AGENT_DEBUG_OFF);
     }
     catch (err) {

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
-const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_DISABLE);
 commandAgentDisable.action(async () => {
+    const ApiAgent = require('../../tunnel/api/agent').default;
     if (!commandAgentDisable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -16,7 +16,7 @@ commandAgentDisable.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const api = new agent_1.default(commandAgentDisable.agentPort || 0);
+        const api = new ApiAgent(commandAgentDisable.agentPort || 0);
         await api.disableAgent();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
     }

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
-const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_ENABLE);
 commandAgentEnable.action(async () => {
+    const ApiAgent = require('../../tunnel/api/agent').default;
     if (!commandAgentEnable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -16,7 +16,7 @@ commandAgentEnable.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const api = new agent_1.default(commandAgentEnable.agentPort || 0);
+        const api = new ApiAgent(commandAgentEnable.agentPort || 0);
         await api.enableAgent();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STARTED);
     }

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

@@ -7,39 +7,37 @@ const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
 const texts_1 = require("../../texts");
 const cfg_1 = __importDefault(require("../../tunnel/cfg"));
-const manager_1 = __importDefault(require("../../agent/manager"));
-const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
-const agent_1 = __importDefault(require("../../tunnel/api/agent"));
-const wait_1 = __importDefault(require("../../agent/wait"));
 const utils_1 = require("../../utils");
 const logger_1 = __importDefault(require("../../logger"));
 const removeAllAndExit = async (txt, id, host, token) => {
+    const AgentManager = require('../../agent/manager').default;
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
     try {
-        await manager_1.default.system.uninstall();
+        await AgentManager.system.uninstall();
     }
     catch {
         // do nothing
     }
     try {
-        await buddy_1.default.unregister(id, host, token);
+        await ApiBuddy.unregister(id, host, token);
     }
     catch {
         // do nothing
     }
     try {
-        manager_1.default.system.clearSystemFiles();
+        AgentManager.system.clearSystemFiles();
     }
     catch {
         // do nothing
     }
     try {
-        manager_1.default.system.clearAgentFiles();
+        AgentManager.system.clearAgentFiles();
     }
     catch {
         // do nothing
     }
     try {
-        manager_1.default.system.clearNewAgentFiles();
+        AgentManager.system.clearNewAgentFiles();
     }
     catch {
         // do nothing
@@ -60,7 +58,11 @@ const prepareTags = (tags) => {
     return validTags;
 };
 const installService = async (options) => {
-    const isSupported = await manager_1.default.system.isSupported();
+    const AgentManager = require('../../agent/manager').default;
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
+    const ApiAgent = require('../../tunnel/api/agent').default;
+    const waitUntilAgentEnabled = require('../../agent/wait').default;
+    const isSupported = await AgentManager.system.isSupported();
     if (!isSupported) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_SUPPORTED);
     }
@@ -80,7 +82,7 @@ const installService = async (options) => {
     let agent;
     if (id) {
         try {
-            agent = await buddy_1.default.fetchAgent(id, host, agentToken);
+            agent = await ApiBuddy.fetchAgent(id, host, agentToken);
         }
         catch {
             output_1.default.exitError(texts_1.ERR_AGENT_NOT_FOUND);
@@ -88,7 +90,7 @@ const installService = async (options) => {
     }
     if (!agent) {
         const tags = prepareTags(options.tag);
-        agent = await buddy_1.default.register(true, target, tunneling, proxy, host, token, tags, (region) => {
+        agent = await ApiBuddy.register(true, target, tunneling, proxy, host, token, tags, (region) => {
             cfg_1.default.setRegionIfNotSet(region);
         });
         id = agent.id;
@@ -96,32 +98,32 @@ const installService = async (options) => {
         agent.destroy();
         agent = null;
     }
-    const saved = manager_1.default.system.saveSystemConfig(id, host, agentToken, port, false, !!options.debug);
+    const saved = AgentManager.system.saveSystemConfig(id, host, agentToken, port, false, !!options.debug);
     if (!saved) {
         await removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, agentToken);
     }
     try {
-        manager_1.default.system.clearAgentFiles();
+        AgentManager.system.clearAgentFiles();
     }
     catch {
         // do nothing
     }
     try {
-        manager_1.default.system.clearNewAgentFiles();
+        AgentManager.system.clearNewAgentFiles();
     }
     catch {
         // do nothing
     }
     await output_1.default.spinner(texts_1.TXT_ENABLING_AGENT);
     try {
-        await manager_1.default.system.install(id, host, agentToken, port, !!options.start, options.user, options.pass, !!options.debug);
+        await AgentManager.system.install(id, host, agentToken, port, !!options.start, options.user, options.pass, !!options.debug);
     }
     catch {
         await removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, agentToken);
     }
     if (options.start) {
-        const api = new agent_1.default(port);
-        await (0, wait_1.default)(api, 15000, () => {
+        const api = new ApiAgent(port);
+        await waitUntilAgentEnabled(api, 15000, () => {
             removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, agentToken);
         }, () => {
             output_1.default.exitSuccess(texts_1.TXT_AGENT_INSTALLED);
@@ -129,7 +131,7 @@ const installService = async (options) => {
     }
     else {
         try {
-            await buddy_1.default.markAgentAsInactive(id, host, agentToken);
+            await ApiBuddy.markAgentAsInactive(id, host, agentToken);
         }
         catch {
             // do nothing
@@ -138,6 +140,8 @@ const installService = async (options) => {
     }
 };
 const installApp = async (options) => {
+    const AgentManager = require('../../agent/manager').default;
+    const ApiBuddy = require('../../tunnel/api/buddy').default;
     if (options.debug) {
         logger_1.default.setDebug(true);
     }
@@ -155,7 +159,7 @@ const installApp = async (options) => {
         const tags = prepareTags(options.tag);
         try {
             output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERING, false);
-            const agent = await buddy_1.default.register(true, !!options.target, !!options.tunnels, !!options.proxy, host, token, tags, (region) => {
+            const agent = await ApiBuddy.register(true, !!options.target, !!options.tunnels, !!options.proxy, host, token, tags, (region) => {
                 cfg_1.default.setRegionIfNotSet(region);
             });
             logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);
@@ -175,7 +179,7 @@ const installApp = async (options) => {
         try {
             logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHING);
             output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHING, false);
-            const agent = await buddy_1.default.fetchAgent(id, host, agentToken);
+            const agent = await ApiBuddy.fetchAgent(id, host, agentToken);
             agent.destroy();
             logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHED);
             output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHED);
@@ -187,16 +191,16 @@ const installApp = async (options) => {
             output_1.default.exitError(err);
         }
     }
-    const saved = manager_1.default.system.saveSystemConfig(id, host, agentToken, port, true, !!options.debug);
+    const saved = AgentManager.system.saveSystemConfig(id, host, agentToken, port, true, !!options.debug);
     if (!saved) {
         output_1.default.exitError(texts_1.ERR_SWW_AGENT_ENABLING);
     }
     if (options.start) {
-        manager_1.default.system.startStandaloneProc();
+        AgentManager.system.startStandaloneProc();
     }
     else {
         try {
-            await buddy_1.default.markAgentAsInactive(id, host, agentToken);
+            await ApiBuddy.markAgentAsInactive(id, host, agentToken);
         }
         catch {
             // do nothing
@@ -218,12 +222,13 @@ commandAgentInstall.option('--no-tunnels', texts_1.OPTION_AGENT_TUNNELING);
 commandAgentInstall.option('--tag <tag...>', texts_1.OPTION_AGENT_TAG);
 commandAgentInstall.option('-d, --debug', texts_1.OPTION_AGENT_DEBUG);
 commandAgentInstall.action(async (options) => {
+    const AgentManager = require('../../agent/manager').default;
     options.start = options.start === 'true' || options.start === true;
-    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    const hasAdminRights = await AgentManager.system.hasAdminRights();
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
-    const hasSystemConfig = manager_1.default.system.hasSystemConfig();
+    const hasSystemConfig = AgentManager.system.hasSystemConfig();
     if (hasSystemConfig) {
         output_1.default.exitError(texts_1.TXT_AGENT_ALREADY_INSTALLED);
     }

package/distTs/src/command/agent/proxy/disable.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
 const commandAgentProxyDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_PROXY_DISABLE);
 commandAgentProxyDisable.action(async () => {
+    const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentProxyDisable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -16,7 +16,7 @@ commandAgentProxyDisable.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const api = new agent_1.default(commandAgentProxyDisable.agentPort || 0);
+        const api = new ApiAgent(commandAgentProxyDisable.agentPort || 0);
         await api.disableAgentProxy();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_PROXY_DISABLED);
     }

package/distTs/src/command/agent/proxy/enable.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
 const commandAgentProxyEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_PROXY_ENABLE);
 commandAgentProxyEnable.action(async () => {
+    const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentProxyEnable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -16,7 +16,7 @@ commandAgentProxyEnable.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const api = new agent_1.default(commandAgentProxyEnable.agentPort || 0);
+        const api = new ApiAgent(commandAgentProxyEnable.agentPort || 0);
         await api.enableAgentProxy();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_TARGET_ENABLED);
     }

package/distTs/src/command/agent/proxy/status.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
 const commandAgentProxyStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_PROXY_STATUS);
 commandAgentProxyStatus.action(async () => {
+    const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentProxyStatus.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -16,7 +16,7 @@ commandAgentProxyStatus.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const api = new agent_1.default(commandAgentProxyStatus.agentPort || 0);
+        const api = new ApiAgent(commandAgentProxyStatus.agentPort || 0);
         const data = await api.fetchAgentProxy();
         if (data.proxy) {
             output_1.default.exitSuccess(texts_1.TXT_AGENT_PROXY_ENABLED);

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

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const utils_1 = require("../../utils");
 const logger_1 = __importDefault(require("../../logger"));
 const commandAgentRestart = (0, utils_1.newCommand)('restart', texts_1.DESC_COMMAND_AGENT_RESTART);
 commandAgentRestart.action(async () => {
-    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    const AgentManager = require('../../agent/manager').default;
+    const hasAdminRights = await AgentManager.system.hasAdminRights();
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
@@ -18,14 +18,14 @@ commandAgentRestart.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
     if (commandAgentRestart.agentStandalone) {
-        await manager_1.default.system.killStandaloneProc();
-        manager_1.default.system.startStandaloneProc();
+        await AgentManager.system.killStandaloneProc();
+        AgentManager.system.startStandaloneProc();
     }
     else {
         try {
-            await manager_1.default.system.stop();
+            await AgentManager.system.stop();
             output_1.default.normal(texts_1.TXT_AGENT_STOPPED);
-            await manager_1.default.system.start();
+            await AgentManager.system.start();
             output_1.default.exitSuccess(texts_1.TXT_AGENT_RESTARTED);
         }
         catch (err) {

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

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const manager_1 = __importDefault(require("../../agent/manager"));
 const logger_1 = __importDefault(require("../../logger"));
 const utils_1 = require("../../utils");
 const commandAgentRun = (0, utils_1.newCommand)('run');
@@ -13,7 +12,8 @@ commandAgentRun.option('--token <token>');
 commandAgentRun.option('--port <port>');
 commandAgentRun.option('--start <start>');
 commandAgentRun.action(async (options) => {
-    logger_1.default.changeRootPath(manager_1.default.system.getNewAgentConfigDir());
-    manager_1.default.start(options.id, options.host, options.token, parseInt(options.port, 10));
+    const AgentManager = require('../../agent/manager').default;
+    logger_1.default.changeRootPath(AgentManager.system.getNewAgentConfigDir());
+    AgentManager.start(options.id, options.host, options.token, parseInt(options.port, 10));
 });
 exports.default = commandAgentRun;

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

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const utils_1 = require("../../utils");
-const logger_1 = __importDefault(require("../../logger"));
 const commandAgentStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_AGENT_START);
 commandAgentStart.action(async () => {
-    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    const AgentManager = require('../../agent/manager').default;
+    const logger = require('../../logger').default;
+    const hasAdminRights = await AgentManager.system.hasAdminRights();
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
@@ -18,16 +18,16 @@ commandAgentStart.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
     if (commandAgentStart.agentStandalone) {
-        await manager_1.default.system.killStandaloneProc();
-        manager_1.default.system.startStandaloneProc();
+        await AgentManager.system.killStandaloneProc();
+        AgentManager.system.startStandaloneProc();
     }
     else {
         try {
-            await manager_1.default.system.start();
+            await AgentManager.system.start();
             output_1.default.exitSuccess(texts_1.TXT_AGENT_STARTED);
         }
         catch (err) {
-            logger_1.default.error(err);
+            logger.error(err);
             output_1.default.exitError(err);
         }
     }

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

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const output_1 = __importDefault(require("../../output"));
 const logger_1 = __importDefault(require("../../logger"));
-const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentStop = (0, utils_1.newCommand)('stop', texts_1.DESC_COMMAND_AGENT_STOP);
 commandAgentStop.action(async () => {
-    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    const AgentManager = require('../../agent/manager').default;
+    const ApiAgent = require('../../tunnel/api/agent').default;
+    const hasAdminRights = await AgentManager.system.hasAdminRights();
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
@@ -19,19 +19,19 @@ commandAgentStop.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
     try {
-        const api = new agent_1.default(commandAgentStop.agentPort || 0);
+        const api = new ApiAgent(commandAgentStop.agentPort || 0);
         await api.markInactive();
     }
     catch {
         // do nothing
     }
     if (commandAgentStop.agentStandalone) {
-        await manager_1.default.system.killStandaloneProc();
+        await AgentManager.system.killStandaloneProc();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
     }
     else {
         try {
-            await manager_1.default.system.stop();
+            await AgentManager.system.stop();
             output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
         }
         catch (err) {