bdy 1.15.6 → 1.16.0-dev

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

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

@@ -6,17 +6,17 @@ 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 commandAgentTunnelList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_AGENT_TUNNEL_LIST);
 commandAgentTunnelList.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTunnelList.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelList.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(commandAgentTunnelList.agentPort || 0);
         const data = await api.fetchTunnels();
         output_1.default.agentTunnels(data.tunnels);
     }

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

@@ -6,18 +6,18 @@ 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 commandAgentTunnelRemove = (0, utils_1.newCommand)('rm', texts_1.DESC_COMMAND_AGENT_TUNNEL_REMOVE);
 commandAgentTunnelRemove.argument('<id>', texts_1.OPTION_ID);
 commandAgentTunnelRemove.action(async (id) => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTunnelRemove.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelRemove.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(commandAgentTunnelRemove.agentPort || 0);
         await api.stopTunnel(id);
         output_1.default.exitSuccess(texts_1.TXT_TUNNEL_STOPPED);
     }

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

@@ -7,23 +7,23 @@ const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 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 commandAgentTunnelStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_START);
 commandAgentTunnelStart.argument('<name>', texts_1.OPTION_NAME);
 commandAgentTunnelStart.action(async (name) => {
+    if (!commandAgentTunnelStart.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelStart.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
+    }
     if (!cfg_1.default.hasTunnel(name)) {
         output_1.default.exitError((0, texts_1.ERR_TUNNEL_NOT_FOUND)(name));
     }
     const prepared = cfg_1.default.getTunnel(name);
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
-    }
     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(commandAgentTunnelStart.agentPort || 0);
         const data = await api.addTunnel(prepared);
         output_1.default.exitSuccess((0, texts_1.TXT_TUNNEL_STARTED)(data.type));
     }

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

@@ -7,18 +7,18 @@ const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
 const tunnel_1 = __importDefault(require("../../../agent/socket/tunnel"));
-const manager_1 = __importDefault(require("../../../agent/manager"));
 const utils_1 = require("../../../utils");
 const commandAgentTunnelStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TUNNEL_STATUS);
 commandAgentTunnelStatus.argument('<id>', texts_1.OPTION_ID);
 commandAgentTunnelStatus.action(async (id) => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentTunnelStatus.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelStatus.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(commandAgentTunnelStatus.agentPort || 0);
         const ws = await api.socketTunnel(id);
         const tunnel = new tunnel_1.default(ws, id);
         await tunnel.waitForReady();

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const output_1 = __importDefault(require("../../../output"));
 const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const texts_1 = require("../../../texts");
-const manager_1 = __importDefault(require("../../../agent/manager"));
 const tunnel_1 = __importDefault(require("../../../agent/socket/tunnel"));
 const agent_1 = __importDefault(require("../../../tunnel/api/agent"));
 const tunnel_2 = require("../../../types/tunnel");
@@ -16,15 +15,16 @@ commandAgentTunnelTcp.description(texts_1.DESC_COMMAND_TCP);
 commandAgentTunnelTcp.option('-f, --follow', texts_1.OPTION_FOLLOW);
 commandAgentTunnelTcp.argument('[host:port]', texts_1.OPTION_TARGET);
 commandAgentTunnelTcp.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 (!commandAgentTunnelTcp.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelTcp.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     const prepared = await cfg_1.default.prepareTunnel(tunnel_2.TUNNEL_TYPE.TCP, 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(commandAgentTunnelTcp.agentPort || 0);
         const data = await api.addTunnel(prepared);
         if (options.follow) {
             const ws = await api.socketTunnel(data.id);

package/distTs/src/command/agent/tunnel/tls.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 commandAgentTunnelTls = (0, utils_1.getBasicCommandTls)();
@@ -16,15 +15,16 @@ commandAgentTunnelTls.description(texts_1.DESC_COMMAND_TLS);
 commandAgentTunnelTls.option('-f, --follow', texts_1.OPTION_FOLLOW);
 commandAgentTunnelTls.argument('[host:port]', texts_1.OPTION_TARGET);
 commandAgentTunnelTls.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 (!commandAgentTunnelTls.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
+    }
+    if (!commandAgentTunnelTls.agentStatus) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     const prepared = await cfg_1.default.prepareTunnel(tunnel_2.TUNNEL_TYPE.TLS, 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(commandAgentTunnelTls.agentPort || 0);
         const data = await api.addTunnel(prepared);
         if (options.follow) {
             const ws = await api.socketTunnel(data.id);

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

@@ -15,13 +15,13 @@ commandAgentUninstall.action(async () => {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
     try {
-        await manager_1.default.system.disable();
+        await manager_1.default.system.uninstall();
     }
     catch {
         // do nothing
     }
     try {
-        manager_1.default.system.killStandaloneProc();
+        await manager_1.default.system.killStandaloneProc();
     }
     catch {
         // do nothing

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

@@ -16,26 +16,28 @@ commandAgentUpdate.action(async () => {
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
-    }
-    if (manager_1.default.system.isStandaloneProcRunning()) {
-        output_1.default.exitError(texts_1.ERR_AGENT_STANDALONE_UPDATE);
+    if (!commandAgentUpdate.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
     output_1.default.normal(texts_1.TXT_UPDATING_AGENT);
-    try {
-        await manager_1.default.system.update();
-        const json = manager_1.default.system.loadSystemConfig();
-        const api = new agent_1.default(json.port);
-        await (0, wait_1.default)(api, 15000, () => {
-            output_1.default.exitError(texts_1.ERR_SWW_AGENT_UPDATING);
-        }, () => {
-            output_1.default.exitSuccess(texts_1.TXT_AGENT_UPDATED);
-        });
+    if (commandAgentUpdate.agentStandalone) {
+        // app
+        await manager_1.default.system.killStandaloneProc();
+        manager_1.default.system.startStandaloneProc();
     }
-    catch {
-        output_1.default.exitError(texts_1.ERR_SWW_AGENT_UPDATING);
+    else {
+        try {
+            await manager_1.default.system.update();
+            const api = new agent_1.default(commandAgentUpdate.agentPort || 0);
+            await (0, wait_1.default)(api, 15000, () => {
+                output_1.default.exitError(texts_1.ERR_SWW_AGENT_UPDATING);
+            }, () => {
+                output_1.default.exitSuccess(texts_1.TXT_AGENT_UPDATED);
+            });
+        }
+        catch {
+            output_1.default.exitError(texts_1.ERR_SWW_AGENT_UPDATING);
+        }
     }
 });
 exports.default = commandAgentUpdate;

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

@@ -5,16 +5,14 @@ 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 commandAgentVersion = (0, utils_1.newCommand)('version', texts_1.DESC_COMMAND_AGENT_VERSION);
 commandAgentVersion.action(async () => {
-    const isEnabled = await manager_1.default.system.isEnabled();
-    if (!isEnabled) {
-        output_1.default.exitError(texts_1.ERR_AGENT_NOT_ENABLED);
+    if (!commandAgentVersion.agentInstalled) {
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
     if (!commandAgentVersion.agentStatus) {
-        output_1.default.exitError(texts_1.ERR_SWW);
+        output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     output_1.default.exitNormal(commandAgentVersion.agentStatus.version);
 });

package/distTs/src/command/agent.js

@@ -19,12 +19,8 @@ const target_1 = __importDefault(require("./agent/target"));
 const enable_1 = __importDefault(require("./agent/enable"));
 const disable_1 = __importDefault(require("./agent/disable"));
 const debug_1 = __importDefault(require("./agent/debug"));
-const up_1 = __importDefault(require("./agent/up"));
-const down_1 = __importDefault(require("./agent/down"));
 const commandAgent = (0, utils_1.newCommand)('agent', texts_1.DESC_COMMAND_AGENT);
 commandAgent.addCommand(install_1.default);
-commandAgent.addCommand(up_1.default);
-commandAgent.addCommand(down_1.default);
 commandAgent.addCommand(enable_1.default);
 commandAgent.addCommand(disable_1.default);
 commandAgent.addCommand(start_1.default);

package/distTs/src/command/pre.js

@@ -9,11 +9,19 @@ const manager_1 = __importDefault(require("../agent/manager"));
 const agent_1 = __importDefault(require("../tunnel/api/agent"));
 const commandPre = async (_, command) => {
     command.agentStatus = null;
+    command.agentStandalone = false;
+    command.agentInstalled = false;
+    command.agentPort = 0;
+    command.agentId = '';
     try {
         if (!(0, utils_1.isDocker)()) {
-            const isEnabled = await manager_1.default.system.isEnabled();
-            if (isEnabled) {
+            const hasConfig = manager_1.default.system.hasSystemConfig();
+            if (hasConfig) {
+                command.agentInstalled = true;
                 const json = manager_1.default.system.loadSystemConfig();
+                command.agentStandalone = !!json.standalone; // nie zawsze to jest bool
+                command.agentId = json.id;
+                command.agentPort = json.port;
                 const api = new agent_1.default(json.port);
                 command.agentStatus = await api.fetchStatus();
             }

package/distTs/src/output.js

@@ -35,11 +35,23 @@ class Output {
             msg += '\n';
         terminal(msg);
     }
-    static warning(txt) {
-        terminal.yellow(`${txt}\n`);
+    static warning(txt, newLine = true) {
+        let msg = txt;
+        if (newLine)
+            msg += '\n';
+        terminal.yellow(msg);
+    }
+    static error(txt, newLine = true) {
+        let msg = txt;
+        if (newLine)
+            msg += '\n';
+        terminal.red(msg);
     }
-    static error(txt) {
-        terminal.red(`${txt}\n`);
+    static green(txt, newLine = true) {
+        let msg = txt;
+        if (newLine)
+            msg += '\n';
+        terminal.green(msg);
     }
     static debug(txt) {
         if (context_1.debug) {