bdy 1.16.2-stage → 1.16.5-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.16.2-stage",
+  "version": "1.16.5-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/agent/agent.js

@@ -152,6 +152,11 @@ class Agent extends events_1.default {
             this.socket.fetch(!this.disabled, '', this.disabled, true, this.getTunnelsUpdate(), true);
         }
     }
+    async markInactive() {
+        if (this.socket) {
+            this.socket.fetch(false, '', null, false, this.getTunnelsUpdate(true), true);
+        }
+    }
     async disable() {
         this.disabled = true;
         this.tunnels.forEach((t) => {
@@ -256,12 +261,12 @@ class Agent extends events_1.default {
             output_1.default.exitError(texts_1.ERR_TUNNEL_REMOVED);
         }
     }
-    getTunnelsUpdate() {
+    getTunnelsUpdate(forceInactive = false) {
         const update = [];
         this.tunnels.forEach((t) => {
             update.push({
                 id: t.id,
-                active: t.status === tunnel_2.TUNNEL_STATUS.OPEN,
+                active: t.status === tunnel_2.TUNNEL_STATUS.OPEN && !forceInactive,
                 regionLatency: t.regionLatency ? t.regionLatency.latency : -1,
                 targetLatency: t.targetLatency ? t.targetLatency.latency : -1,
                 totalConnections: t.totalConnections,

package/distTs/src/agent/linux.js

@@ -113,7 +113,7 @@ WantedBy=multi-user.target`;
     async start() {
         await this.systemctl('enable --now bdy');
     }
-    async disable() {
+    async uninstall() {
         await this.stop();
     }
     systemctl(cmd) {

package/distTs/src/agent/manager.js

@@ -297,6 +297,16 @@ class AgentManagerClass {
             success: true,
         });
     }
+    async processAgentMarkInactive(res) {
+        if (!this.agent) {
+            this.serverError(res, 'Agent not enabled');
+            return;
+        }
+        await this.agent.markInactive();
+        this.serverOutput(res, {
+            success: true,
+        });
+    }
     async processAgentDisable(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
@@ -358,6 +368,8 @@ class AgentManagerClass {
             return this.processAgentDebug(req, res);
         if (req.url === '/agent/disable')
             return this.processAgentDisable(res);
+        if (req.url === '/agent/mark-inactive')
+            return this.processAgentMarkInactive(res);
         if (req.url === '/agent/enable')
             return this.processAgentEnable(res);
         this.server404(res);

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

@@ -113,6 +113,12 @@ const installService = async (options) => {
         });
     }
     else {
+        try {
+            await buddy_1.default.markAgentAsInactive(id, host, token);
+        }
+        catch {
+            // do nothing
+        }
         output_1.default.exitSuccess(texts_1.TXT_AGENT_INSTALLED);
     }
 };
@@ -179,6 +185,12 @@ const installApp = async (options) => {
         manager_1.default.system.startStandaloneProc();
     }
     else {
+        try {
+            await buddy_1.default.markAgentAsInactive(id, host, token);
+        }
+        catch {
+            // do nothing
+        }
         output_1.default.exitSuccess(texts_1.TXT_AGENT_INSTALLED);
     }
 };

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

@@ -8,6 +8,7 @@ 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();
@@ -17,6 +18,13 @@ commandAgentStop.action(async () => {
     if (!commandAgentStop.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
+    try {
+        const api = new agent_1.default(commandAgentStop.agentPort || 0);
+        await api.markInactive();
+    }
+    catch {
+        // do nothing
+    }
     if (commandAgentStop.agentStandalone) {
         await manager_1.default.system.killStandaloneProc();
         output_1.default.exitSuccess(texts_1.TXT_AGENT_STOPPED);

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

@@ -8,12 +8,20 @@ const texts_1 = require("../../texts");
 const manager_1 = __importDefault(require("../../agent/manager"));
 const buddy_1 = __importDefault(require("../../tunnel/api/buddy"));
 const utils_1 = require("../../utils");
+const agent_1 = __importDefault(require("../../tunnel/api/agent"));
 const commandAgentUninstall = (0, utils_1.newCommand)('uninstall', texts_1.DESC_COMMAND_AGENT_UNINSTALL);
 commandAgentUninstall.action(async () => {
     const hasAdminRights = await manager_1.default.system.hasAdminRights();
     if (!hasAdminRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
+    try {
+        const api = new agent_1.default(commandAgentUninstall.agentPort || 0);
+        await api.markInactive();
+    }
+    catch {
+        // do nothing
+    }
     try {
         await manager_1.default.system.uninstall();
     }

package/distTs/src/tunnel/api/agent.js

@@ -83,6 +83,9 @@ class ApiAgent {
             id,
         });
     }
+    async markInactive() {
+        return makeRequest(this.port, '/agent/mark-inactive');
+    }
     async disableAgent() {
         return makeRequest(this.port, '/agent/disable');
     }

package/distTs/src/tunnel/api/buddy.js

@@ -114,6 +114,12 @@ class ApiBuddyClass {
             token,
         });
     }
+    async markAgentAsInactive(agentId, host, token) {
+        await makeRequest(host, '/tunnel/agent/target/mark-inactive', {
+            agentId,
+            token
+        });
+    }
     async addTunnel(agentId, host, token, prepared, sshHostKey) {
         logger_1.default.info(texts_1.LOG_REGISTERING_TUNNEL);
         const config = await makeRequest(host, '/tunnel/add', {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.16.2-stage",
+  "version": "1.16.5-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {