bdy 1.15.7-dev-package → 1.16.0-dev

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

@@ -12,9 +12,10 @@ 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) => {
     try {
-        await manager_1.default.system.disable();
+        await manager_1.default.system.uninstall();
     }
     catch {
         // do nothing
@@ -45,28 +46,11 @@ const removeAllAndExit = async (txt, id, host, token) => {
     }
     output_1.default.exitError(txt);
 };
-const commandAgentInstall = (0, utils_1.newCommand)('install', texts_1.DESC_COMMAND_AGENT_INSTALL);
-commandAgentInstall.option('-s, --start', texts_1.OPTION_AGENT_START);
-commandAgentInstall.option('-i, --id <id>', texts_1.OPTION_AGENT_ID);
-commandAgentInstall.option('-t, --token <token>', texts_1.OPTION_AGENT_TOKEN);
-commandAgentInstall.option('-p, --port <port>', texts_1.OPTION_AGENT_PORT, '7456');
-commandAgentInstall.option('-u, --user <user>', texts_1.OPTION_USER);
-commandAgentInstall.option('--pass <password>', texts_1.OPTION_PASS);
-commandAgentInstall.option('--target', texts_1.OPTION_AGENT_TARGET);
-commandAgentInstall.option('-d, --debug', texts_1.OPTION_AGENT_DEBUG);
-commandAgentInstall.action(async (options) => {
-    const hasAdminRights = await manager_1.default.system.hasAdminRights();
-    if (!hasAdminRights) {
-        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
-    }
+const installService = async (options) => {
     const isSupported = await manager_1.default.system.isSupported();
     if (!isSupported) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_SUPPORTED);
     }
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (isEnabled) {
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_ALREADY_ENABLED);
-    }
     let id = '';
     let token = '';
     let agent;
@@ -97,7 +81,7 @@ commandAgentInstall.action(async (options) => {
         agent.destroy();
         agent = null;
     }
-    const saved = manager_1.default.system.saveSystemConfig(id, host, token, port);
+    const saved = manager_1.default.system.saveSystemConfig(id, host, token, port, false, !!options.debug);
     if (!saved) {
         await removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, token);
     }
@@ -115,16 +99,111 @@ commandAgentInstall.action(async (options) => {
     }
     await output_1.default.spinner(texts_1.TXT_ENABLING_AGENT);
     try {
-        await manager_1.default.system.enable(id, host, token, port, !!options.start, options.user, options.pass, !!options.debug);
+        await manager_1.default.system.install(id, host, token, port, !!options.start, options.user, options.pass, !!options.debug);
     }
     catch {
         await removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, token);
     }
-    const api = new agent_1.default(port);
-    await (0, wait_1.default)(api, 15000, () => {
-        removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, token);
-    }, () => {
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_ENABLED);
-    });
+    if (options.start) {
+        const api = new agent_1.default(port);
+        await (0, wait_1.default)(api, 15000, () => {
+            removeAllAndExit(texts_1.ERR_SWW_AGENT_ENABLING, id, host, token);
+        }, () => {
+            output_1.default.exitSuccess(texts_1.TXT_AGENT_INSTALLED);
+        });
+    }
+};
+const installApp = async (options) => {
+    if (options.debug) {
+        logger_1.default.setDebug(true);
+    }
+    let id;
+    let host;
+    let token;
+    const port = input_1.default.port(options.port);
+    if (options.id) {
+        id = options.id;
+    }
+    if (!token) {
+        token = options.token;
+    }
+    if (!id) {
+        if (token)
+            cfg_1.default.setToken(token);
+        host = cfg_1.default.getTokenHost();
+        try {
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERING, false);
+            const agent = await buddy_1.default.register(true, !!options.target, host, cfg_1.default.getToken(), (region) => {
+                cfg_1.default.setRegionIfNotSet(region);
+            });
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);
+            id = agent.id;
+            token = agent.token;
+            agent.destroy();
+        }
+        catch (err) {
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTER_ERROR);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTER_ERROR);
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
+    }
+    else {
+        if (!host) {
+            host = cfg_1.default.getTokenHost();
+        }
+        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, token);
+            agent.destroy();
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHED);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHED);
+        }
+        catch (err) {
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCH_ERROR);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCH_ERROR);
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
+    }
+    const saved = manager_1.default.system.saveSystemConfig(id, host, token, port, true, !!options.debug);
+    if (!saved) {
+        output_1.default.exitError(texts_1.ERR_SWW_AGENT_ENABLING);
+    }
+    if (options.start) {
+        manager_1.default.system.startStandaloneProc();
+    }
+    else {
+        output_1.default.exitSuccess(texts_1.TXT_AGENT_INSTALLED);
+    }
+};
+const commandAgentInstall = (0, utils_1.newCommand)('install', texts_1.DESC_COMMAND_AGENT_INSTALL);
+commandAgentInstall.option('-s, --start [true|false]', texts_1.OPTION_AGENT_START, 'true');
+commandAgentInstall.option('-i, --id <id>', texts_1.OPTION_AGENT_ID);
+commandAgentInstall.option('-t, --token <token>', texts_1.OPTION_AGENT_TOKEN);
+commandAgentInstall.option('-p, --port <port>', texts_1.OPTION_AGENT_PORT, '7456');
+commandAgentInstall.option('-u, --user <user>', texts_1.OPTION_USER);
+commandAgentInstall.option('-a,--app', texts_1.OPTION_APP);
+commandAgentInstall.option('--pass <password>', texts_1.OPTION_PASS);
+commandAgentInstall.option('--target', texts_1.OPTION_AGENT_TARGET);
+commandAgentInstall.option('-d, --debug', texts_1.OPTION_AGENT_DEBUG);
+commandAgentInstall.action(async (options) => {
+    options.start = options.start === 'true';
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
+    }
+    const hasSystemConfig = manager_1.default.system.hasSystemConfig();
+    if (hasSystemConfig) {
+        output_1.default.exitError(texts_1.TXT_AGENT_ALREADY_INSTALLED);
+    }
+    if (options.app) {
+        await installApp(options);
+    }
+    else {
+        await installService(options);
+    }
 });
 exports.default = commandAgentInstall;

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

@@ -5,23 +5,33 @@ 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 agent_1 = __importDefault(require("../../tunnel/api/agent"));
 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 isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
-    try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
-        await api.restartAgent();
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_RESTARTED);
+    if (!commandAgentRestart.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
-    catch (err) {
-        output_1.default.exitError(err);
+    if (commandAgentRestart.agentStandalone) {
+        await manager_1.default.system.killStandaloneProc();
+        manager_1.default.system.startStandaloneProc();
+    }
+    else {
+        try {
+            await manager_1.default.system.stop();
+            output_1.default.normal(texts_1.TXT_AGENT_STOPPED);
+            await manager_1.default.system.start();
+            output_1.default.exitSuccess(texts_1.TXT_AGENT_RESTARTED);
+        }
+        catch (err) {
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
     }
 });
 exports.default = commandAgentRestart;

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

@@ -14,6 +14,6 @@ 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), String(options.start) === 'true');
+    manager_1.default.start(options.id, options.host, options.token, parseInt(options.port, 10));
 });
 exports.default = commandAgentRun;

package/distTs/src/command/agent/standalone/kill.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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 commandAgentStandaloneKill = (0, utils_1.newCommand)('kill', texts_1.DESC_COMMAND_AGENT_STANDALONE_KILL);
+commandAgentStandaloneKill.action(async () => {
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
+    }
+    if (!manager_1.default.system.isStandaloneProcRunning()) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
+    }
+    manager_1.default.system.killStandaloneProc();
+    output_1.default.exitSuccess(texts_1.TXT_AGENT_STANDALONE_STOPPED);
+});
+exports.default = commandAgentStandaloneKill;

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

@@ -0,0 +1,136 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": 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 buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
+const logger_1 = __importDefault(require("../../logger"));
+const cfg_1 = __importDefault(require("../../tunnel/cfg"));
+const input_1 = __importDefault(require("../../input"));
+const kill_1 = __importDefault(require("./standalone/kill"));
+const commandAgentStandalone = (0, utils_1.newCommand)('standalone', texts_1.DESC_COMMAND_AGENT_STANDALONE);
+commandAgentStandalone.option('-i, --id <id>', texts_1.OPTION_AGENT_ID);
+commandAgentStandalone.option('-t, --token <token>', texts_1.OPTION_AGENT_TOKEN);
+commandAgentStandalone.option('-p, --port <port>', texts_1.OPTION_AGENT_PORT, '7456');
+commandAgentStandalone.option('--target', texts_1.OPTION_AGENT_TARGET);
+commandAgentStandalone.addCommand(kill_1.default);
+commandAgentStandalone.action(async (options) => {
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
+    }
+    try {
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_PROC_CHECKING);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_PROC_CHECKING, false);
+        manager_1.default.system.killStandaloneProc();
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_PROC_CHECKED);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_PROC_CHECKED);
+    }
+    catch (err) {
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_PROC_ERROR);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_PROC_ERROR);
+        logger_1.default.error(err);
+        output_1.default.exitError(err);
+    }
+    const isEnabled = await manager_1.default.system.isEnabled();
+    if (isEnabled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_STANDALONE_SERVICE_INSTALLED);
+    }
+    let id;
+    let host;
+    let token;
+    let port;
+    try {
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_CONFIG_CHECKING);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_CONFIG_CHECKING, false);
+        const json = manager_1.default.system.loadSystemConfig();
+        id = json.id;
+        host = json.host;
+        token = json.token;
+        port = json.port;
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_CONFIG_FOUND);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_CONFIG_FOUND);
+    }
+    catch {
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_CONFIG_NOT_FOUND);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_CONFIG_NOT_FOUND);
+    }
+    if (!port) {
+        port = input_1.default.port(options.port);
+    }
+    if (!id && options.id) {
+        id = options.id;
+        logger_1.default.info((0, texts_1.TXT_AGENT_STANDALONE_USING_AGENT)(id));
+        output_1.default.normal((0, texts_1.TXT_AGENT_STANDALONE_USING_AGENT)(id));
+    }
+    if (!token) {
+        token = options.token;
+    }
+    if (!id) {
+        if (token)
+            cfg_1.default.setToken(token);
+        host = cfg_1.default.getTokenHost();
+        try {
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERING, false);
+            const agent = await buddy_1.default.register(true, !!options.target, host, cfg_1.default.getToken(), (region) => {
+                cfg_1.default.setRegionIfNotSet(region);
+            });
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);
+            id = agent.id;
+            token = agent.token;
+            agent.destroy();
+        }
+        catch (err) {
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTER_ERROR);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTER_ERROR);
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
+    }
+    else {
+        if (!host) {
+            host = cfg_1.default.getTokenHost();
+        }
+        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, token);
+            agent.destroy();
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHED);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCHED);
+        }
+        catch (err) {
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCH_ERROR);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_FETCH_ERROR);
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
+    }
+    let saved = manager_1.default.system.saveSystemConfig(id, host, token, port);
+    if (!saved) {
+        output_1.default.exitError(texts_1.ERR_SWW_AGENT_ENABLING);
+    }
+    saved = manager_1.default.system.saveStandaloneProcConfig();
+    if (!saved) {
+        output_1.default.exitError(texts_1.ERR_SWW_AGENT_ENABLING);
+    }
+    logger_1.default.changeRootPath(manager_1.default.system.getNewAgentConfigDir());
+    logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_STARTED);
+    output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_STARTED);
+    process.on('SIGINT', onExit);
+    process.on('SIGTERM', onExit);
+    process.on('SIGQUIT', onExit);
+    manager_1.default.start(id, host, token, port, true, true);
+});
+const onExit = () => {
+    logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_EXITING);
+    output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_EXITING);
+    manager_1.default.system.clearStandaloneProcConfig();
+    process.exit(0);
+};
+exports.default = commandAgentStandalone;

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

@@ -5,24 +5,31 @@ 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 agent_1 = __importDefault(require("../../tunnel/api/agent"));
-const texts_2 = 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 isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_2.ERR_AGENT_NOT_ENABLED);
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
-    try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
-        await api.startAgent();
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_STARTED);
+    if (!commandAgentStart.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
-    catch (err) {
-        output_1.default.exitError(err);
+    if (commandAgentStart.agentStandalone) {
+        await manager_1.default.system.killStandaloneProc();
+        manager_1.default.system.startStandaloneProc();
+    }
+    else {
+        try {
+            await manager_1.default.system.start();
+            output_1.default.exitSuccess(texts_1.TXT_AGENT_STARTED);
+        }
+        catch (err) {
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
     }
 });
 exports.default = commandAgentStart;

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

@@ -6,29 +6,56 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
-const manager_1 = __importDefault(require("../../agent/manager"));
 const tunnel_1 = require("../../types/tunnel");
 const commandAgentStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_STATUS);
-commandAgentStatus.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
-    }
-    if (!commandAgentStatus.agentStatus) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
+const outputStatus = (installed, standalone, version, id, running, enabled, target, status) => {
+    if (!installed) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
-    if (commandAgentStatus.agentStatus.status === tunnel_1.TUNNEL_AGENT_STATUS.INITIALIZING) {
-        output_1.default.exitError(texts_1.TXT_AGENT_IS_ENABLED_AND_INITIALIZING);
+    let txt = 'Installation: ';
+    if (standalone)
+        txt += 'App @ ';
+    else
+        txt += 'Service @ ';
+    if (version)
+        txt += `${version} / `;
+    txt += `${id}`;
+    output_1.default.normal(txt);
+    output_1.default.normal('Status: ', false);
+    if (running)
+        output_1.default.green('Running', false);
+    else
+        output_1.default.error('Stopped', false);
+    output_1.default.normal(', ', false);
+    if (enabled) {
+        output_1.default.green('enabled');
+        let msg = 'Enabled: Tunnels';
+        if (target)
+            msg += ', Target, Proxy for targets';
+        output_1.default.normal(msg);
     }
-    if (commandAgentStatus.agentStatus.status === tunnel_1.TUNNEL_AGENT_STATUS.FETCH_FAILED) {
-        output_1.default.exitError(texts_1.TXT_AGENT_IS_ENABLED_AND_HAVE_TROUBLES);
+    else {
+        output_1.default.error('disabled');
     }
-    if (commandAgentStatus.agentStatus.status !== tunnel_1.TUNNEL_AGENT_STATUS.ENABLED) {
-        output_1.default.exitError(texts_1.TXT_AGENT_IS_DISABLED);
+    if (status === tunnel_1.TUNNEL_AGENT_STATUS.FETCH_FAILED) {
+        output_1.default.normal('Problems: ');
+        output_1.default.error(status);
     }
-    if (commandAgentStatus.agentStatus.started) {
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_IS_ENABLED_AND_STARTED);
+    process.exit(0);
+};
+commandAgentStatus.action(async () => {
+    let version = '';
+    const id = commandAgentStatus.agentId;
+    const running = !!commandAgentStatus.agentStatus;
+    let enabled = true;
+    let target = false;
+    let status = tunnel_1.TUNNEL_AGENT_STATUS.DISABLED;
+    if (commandAgentStatus.agentStatus) {
+        version = commandAgentStatus.agentStatus.version;
+        enabled = commandAgentStatus.agentStatus.enabled;
+        status = commandAgentStatus.agentStatus.status;
+        target = commandAgentStatus.agentStatus.target;
     }
-    output_1.default.exitError(texts_1.TXT_AGENT_IS_ENABLED_AND_STOPPED);
+    outputStatus(!!commandAgentStatus.agentInstalled, !!commandAgentStatus.agentStandalone, version, id, running, enabled, target, status);
 });
 exports.default = commandAgentStatus;

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

@@ -6,23 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const manager_1 = __importDefault(require("../../agent/manager"));
-const agent_1 = __importDefault(require("../../tunnel/api/agent"));
-const texts_2 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
-const commandAgentStop = (0, utils_1.newCommand)('stop', texts_2.DESC_COMMAND_AGENT_STOP);
+const logger_1 = __importDefault(require("../../logger"));
+const commandAgentStop = (0, utils_1.newCommand)('stop', texts_1.DESC_COMMAND_AGENT_STOP);
 commandAgentStop.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    const hasAdminRights = await manager_1.default.system.hasAdminRights();
+    if (!hasAdminRights) {
+        output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
-    try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
-        await api.stopAgent();
-        output_1.default.exitSuccess(texts_2.TXT_AGENT_STOPPED);
+    if (!commandAgentStop.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
-    catch (err) {
-        output_1.default.exitError(err);
+    if (commandAgentStop.agentStandalone) {
+        await manager_1.default.system.killStandaloneProc();
+        output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
+    }
+    else {
+        try {
+            await manager_1.default.system.stop();
+            output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
+        }
+        catch (err) {
+            logger_1.default.error(err);
+            output_1.default.exitError(err);
+        }
     }
 });
 exports.default = commandAgentStop;

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

@@ -5,18 +5,18 @@ 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 commandAgentTargetDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_TARGET_DISABLE);
 commandAgentTargetDisable.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTargetDisable.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTargetDisable.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const api = new agent_1.default(commandAgentTargetDisable.agentPort || 0);
         await api.disableAgentTarget();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_TARGET_DISABLED);
     }

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

@@ -5,18 +5,18 @@ 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 commandAgentTargetEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_TARGET_ENABLE);
 commandAgentTargetEnable.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTargetEnable.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTargetEnable.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const api = new agent_1.default(commandAgentTargetEnable.agentPort || 0);
         await api.enableAgentTarget();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_TARGET_ENABLED);
     }

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

@@ -5,18 +5,18 @@ 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 commandAgentTargetStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TARGET_STATUS);
 commandAgentTargetStatus.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTargetStatus.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTargetStatus.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const api = new agent_1.default(commandAgentTargetStatus.agentPort || 0);
         const data = await api.fetchAgentTarget();
         if (data.target) {
             output_1.default.exitSuccess(texts_1.TXT_AGENT_TARGET_ENABLED);

package/distTs/src/command/agent/tunnel/http.js

@@ -8,7 +8,6 @@ const output_1 = __importDefault(require("../../../output"));
 const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const texts_1 = require("../../../texts");
 const tunnel_1 = __importDefault(require("../../../agent/socket/tunnel"));
-const manager_1 = __importDefault(require("../../../agent/manager"));
 const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
 const tunnel_2 = require("../../../types/tunnel");
 const commandAgentTunnelHttp = (0, utils_1.getBasicCommandHttp)();
@@ -16,15 +15,16 @@ commandAgentTunnelHttp.description(texts_1.DESC_COMMAND_HTTP);
 commandAgentTunnelHttp.option('-f, --follow', texts_1.OPTION_FOLLOW);
 commandAgentTunnelHttp.argument('[protocol://host:port]', texts_1.OPTION_TARGET);
 commandAgentTunnelHttp.action(async (target, options) => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTunnelHttp.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelHttp.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     const prepared = await cfg_1.default.prepareTunnel(tunnel_2.TUNNEL_TYPE.HTTP, target, options, true);
     try {
         await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
+        const api = new agent_1.default(commandAgentTunnelHttp.agentPort || 0);
         const data = await api.addTunnel(prepared);
         if (options.follow) {
             const ws = await api.socketTunnel(data.id);