bdy 1.15.6 → 1.16.0-dev

package/distTs/src/agent/system.js

@@ -9,22 +9,26 @@ const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
 const texts_1 = require("../texts");
 const logger_1 = __importDefault(require("../logger"));
+const manager_1 = __importDefault(require("./manager"));
+const output_1 = __importDefault(require("../output"));
 class AgentSystem {
-    // extend
-    isEnabled() {
-        return Promise.resolve(false);
-    }
     // extend
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    enable(id, host, token, port, start, user, pass, debug) {
+    async install(id, host, token, port, start, user, pass, debug) {
         return Promise.reject();
     }
     // extend
-    update() {
+    async update() {
         return Promise.reject();
     }
     // extend
-    disable() {
+    async uninstall() {
+        return Promise.reject();
+    }
+    async stop() {
+        return Promise.reject();
+    }
+    async start() {
         return Promise.reject();
     }
     // extend
@@ -182,29 +186,83 @@ class AgentSystem {
         return this.downloadFile(`https://es.buddy.works/bdy/${env}/${version}/${archive}`, archivePath);
     }
     killStandaloneProc() {
-        try {
-            const str = this.loadStandaloneProcConfig();
-            const pid = Number.parseInt(str, 10);
-            if (pid) {
-                process.kill(pid);
+        return new Promise((resolve) => {
+            let pid = 0;
+            try {
+                const str = this.loadStandaloneProcConfig();
+                pid = Number.parseInt(str, 10);
+                if (pid) {
+                    process.kill(pid);
+                }
+            }
+            catch {
+                // do nothing
+            }
+            try {
+                this.clearStandaloneProcConfig();
+            }
+            catch {
+                // do nothing
             }
+            let tsInterval = null;
+            let tsTimeout = null;
+            const finish = () => {
+                if (tsInterval)
+                    clearInterval(tsInterval);
+                if (tsTimeout)
+                    clearTimeout(tsTimeout);
+                resolve();
+            };
+            if (!pid) {
+                finish();
+                return;
+            }
+            tsTimeout = setTimeout(finish, 30000);
+            tsInterval = setInterval(() => {
+                try {
+                    process.kill(pid, 0);
+                }
+                catch {
+                    finish();
+                }
+            }, 100);
+        });
+    }
+    startStandaloneProc() {
+        let json;
+        try {
+            json = this.loadSystemConfig();
         }
         catch {
-            // do nothing
+            output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
         }
-        try {
-            this.clearStandaloneProcConfig();
+        if (json.debug) {
+            logger_1.default.setDebug(true);
         }
-        catch {
-            // do nothing
+        const saved = this.saveStandaloneProcConfig();
+        if (!saved) {
+            output_1.default.exitError(texts_1.ERR_SWW_AGENT_ENABLING);
         }
+        logger_1.default.changeRootPath(this.getNewAgentConfigDir());
+        logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_STARTED);
+        output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_STARTED);
+        const onProcessExit = () => {
+            logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_EXITING);
+            output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_EXITING);
+            this.clearStandaloneProcConfig();
+            process.exit(0);
+        };
+        process.on('SIGINT', onProcessExit);
+        process.on('SIGTERM', onProcessExit);
+        process.on('SIGQUIT', onProcessExit);
+        manager_1.default.start(json.id, json.host, json.token, json.port);
     }
     clearStandaloneProcConfig() {
         try {
             logger_1.default.info(texts_1.LOG_REMOVING_AGENT_PROC_ID);
             this.ensureSystemConfigDir();
             (0, fs_1.rmSync)(this.getSystemStandalonePath(), {
-                force: true
+                force: true,
             });
             return true;
         }
@@ -227,7 +285,16 @@ class AgentSystem {
             return false;
         }
     }
-    saveSystemConfig(id, host, token, port) {
+    hasSystemConfig() {
+        try {
+            this.loadSystemConfig();
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    saveSystemConfig(id, host, token, port, standalone, debug) {
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_SYSTEM_CONFIG);
             this.ensureSystemConfigDir();
@@ -236,6 +303,8 @@ class AgentSystem {
                 host,
                 token,
                 port,
+                standalone,
+                debug
             }), 'utf-8');
             return true;
         }
@@ -245,7 +314,7 @@ class AgentSystem {
             return false;
         }
     }
-    saveNewAgentConfig(shouldStart, sshHostKey) {
+    saveNewAgentConfig(sshHostKey) {
         try {
             this.clearAgentFiles();
         }
@@ -255,7 +324,6 @@ class AgentSystem {
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_LOCAL_CONFIG);
             (0, fs_1.writeFileSync)(this.getNewAgentConfigPath(), JSON.stringify({
-                shouldStart,
                 sshHostKey,
             }), 'utf-8');
             return true;

package/distTs/src/agent/windows.js

@@ -20,21 +20,6 @@ class AgentWindows extends system_1.default {
     isSupported() {
         return Promise.resolve(process.arch === 'x64');
     }
-    isEnabled() {
-        return new Promise((resolve) => {
-            if (this.isStandaloneProcRunning()) {
-                resolve(true);
-                return;
-            }
-            this.sc('query bdy')
-                .then(() => {
-                resolve(true);
-            })
-                .catch(() => {
-                resolve(false);
-            });
-        });
-    }
     getBinaryArchive() {
         return 'win-x64.zip';
     }
@@ -79,7 +64,7 @@ class AgentWindows extends system_1.default {
     async update() {
         try {
             logger_1.default.info(texts_1.LOG_AGENT_STOPPING_SYSTEM);
-            await this.nssm('stop bdy');
+            await this.stop();
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_DIR);
             await this.ensureSystemConfigDir();
             logger_1.default.info(texts_1.LOG_AGENT_DOWNLOADING_ARCHIVE);
@@ -88,7 +73,7 @@ class AgentWindows extends system_1.default {
             await this.extractBinaryArchive();
             try {
                 logger_1.default.info(texts_1.LOG_AGENT_STARTING_SYSTEM);
-                await this.nssm('start bdy');
+                await this.start();
             }
             catch {
                 // do nothing, it will throw operation pending
@@ -99,7 +84,14 @@ class AgentWindows extends system_1.default {
             throw err;
         }
     }
-    async enable(id, host, token, port, start, user, pass, debug) {
+    async install(id, host, token, port, start, user, pass, debug) {
+        try {
+            // ensure srv was clear
+            await this.uninstall();
+        }
+        catch {
+            // do nothing
+        }
         try {
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_DIR);
             await this.ensureSystemConfigDir();
@@ -115,7 +107,7 @@ class AgentWindows extends system_1.default {
             await this.extractBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLING_SYSTEM);
             await this.nssm(`install bdy ${this.getSystemBinaryPath()}`);
-            await this.nssm(`set bdy AppParameters agent run --id="${id}" --host="${host}" --token="${token}" --port=${port} --start=${!!start}`);
+            await this.nssm(`set bdy AppParameters agent run --id="${id}" --host="${host}" --token="${token}" --port=${port}`);
             await this.nssm('set bdy DisplayName Buddy Tunnel Agent');
             await this.nssm('set bdy AppThrottle 5000');
             await this.nssm('set bdy AppRestartDelay 0');
@@ -125,7 +117,8 @@ class AgentWindows extends system_1.default {
             if (user && pass) {
                 await this.nssm(`set bdy ObjectName ${user} ${pass}`);
             }
-            this.nssm('start bdy').then().catch();
+            if (start)
+                await this.start();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLED);
         }
         catch (err) {
@@ -133,9 +126,15 @@ class AgentWindows extends system_1.default {
             throw err;
         }
     }
-    async disable() {
+    async stop() {
+        await this.nssm('stop bdy');
+    }
+    async start() {
+        await this.nssm('start bdy');
+    }
+    async uninstall() {
         try {
-            await this.nssm('stop bdy');
+            await this.stop();
         }
         catch {
             // do nothing
@@ -152,15 +151,5 @@ class AgentWindows extends system_1.default {
             });
         });
     }
-    sc(cmd) {
-        return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(`sc ${cmd}`, (err) => {
-                if (!err)
-                    resolve();
-                else
-                    reject(err);
-            });
-        });
-    }
 }
 exports.default = AgentWindows;

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

@@ -11,15 +11,22 @@ 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 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);
+    }
+    if (!commandAgentDebug.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentDebug.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     try {
         const debugOn = debug === 'on';
         const json = manager_1.default.system.loadSystemConfig();
         const api = new agent_1.default(json.port);
         await api.debugChange(debugOn);
+        manager_1.default.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

@@ -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 commandAgentDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_DISABLE);
 commandAgentDisable.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentDisable.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentDisable.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(commandAgentDisable.agentPort || 0);
         await api.disableAgent();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);
     }

package/distTs/src/command/agent/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 commandAgentEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_ENABLE);
 commandAgentEnable.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentEnable.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentEnable.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(commandAgentEnable.agentPort || 0);
         await api.enableAgent();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STARTED);
     }

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/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;