bdy 1.15.7-dev-package → 1.16.2-beta

package/distTs/package.json

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

package/distTs/src/agent/agent.js

@@ -20,7 +20,6 @@ class Agent extends events_1.default {
     disabled;
     tunnels;
     tunnelsUpdating;
-    started;
     api;
     socket;
     manager;
@@ -35,7 +34,6 @@ class Agent extends events_1.default {
         this.disabled = disabled;
         this.tunnels = [];
         this.tunnelsUpdating = false;
-        this.started = false;
         this.api = api;
         this.manager = null;
         this.onRefresh = null;
@@ -67,8 +65,9 @@ class Agent extends events_1.default {
         }
         else {
             logger_1.default.debug('Socket fetch tunnel after sync push');
-            if (this.socket)
-                this.socket.fetch(this.started, null, null, false, []);
+            if (this.socket) {
+                this.socket.fetch(!this.disabled, null, null, false, []);
+            }
         }
     }
     async _onSocketAgent(data, action) {
@@ -80,11 +79,13 @@ class Agent extends events_1.default {
         }
         else {
             this.target = !!data.target;
-            this.disabled = !!data.disabled;
-            if (data.disabled === this.started) {
-                await this.makeAction(data.disabled ? tunnel_2.TUNNEL_AGENT_ACTION.STOP : tunnel_2.TUNNEL_AGENT_ACTION.START);
+            if (!!data.disabled !== this.disabled) {
+                if (data.disabled)
+                    await this.disable();
+                else
+                    await this.enable();
             }
-            else if (data.action) {
+            if (data.action) {
                 try {
                     await this.makeAction(data.action);
                 }
@@ -133,44 +134,32 @@ class Agent extends events_1.default {
         this.refreshIn15();
     }
     async start() {
-        this.started = true;
-        this.tunnels.forEach((t) => {
-            t.start();
-        });
-        if (this.socket)
-            this.socket.fetch(this.started, '', null, true, this.getTunnelsUpdate());
+        if (!this.disabled) {
+            this.tunnels.forEach((t) => {
+                t.start();
+            });
+        }
+        if (this.socket) {
+            this.socket.fetch(!this.disabled, '', null, true, this.getTunnelsUpdate(), true);
+        }
     }
     async enable() {
         this.disabled = false;
-        this.started = true;
         this.tunnels.forEach((t) => {
             t.start();
         });
-        if (this.socket)
-            this.socket.fetch(this.started, '', false, true, this.getTunnelsUpdate());
-    }
-    async stop(clearAction = true) {
-        this.started = false;
-        this.tunnels.forEach((t) => {
-            t.stop();
-        });
-        if (!this.socket)
-            return;
-        this.socket.fetch(this.started, clearAction ? '' : null, null, false, this.getTunnelsUpdate());
+        if (this.socket) {
+            this.socket.fetch(!this.disabled, '', this.disabled, true, this.getTunnelsUpdate(), true);
+        }
     }
     async disable() {
         this.disabled = true;
-        this.started = false;
         this.tunnels.forEach((t) => {
             t.stop();
         });
-        if (this.socket)
-            this.socket.fetch(this.started, '', true, false, this.getTunnelsUpdate());
-    }
-    async restart() {
-        await this.stop(false);
-        await (0, utils_1.sleep)(100);
-        await this.start();
+        if (this.socket) {
+            this.socket.fetch(!this.disabled, '', this.disabled, false, this.getTunnelsUpdate(), true);
+        }
     }
     async delete() {
         try {
@@ -189,7 +178,7 @@ class Agent extends events_1.default {
                 if (fetch || counter >= 3) {
                     counter = 0;
                     if (this.socket) {
-                        this.socket.fetch(this.started, null, null, false, this.getTunnelsUpdate());
+                        this.socket.fetch(!this.disabled, null, null, false, this.getTunnelsUpdate());
                     }
                 }
                 else {
@@ -207,28 +196,11 @@ class Agent extends events_1.default {
             this.socket.request(tunnelId, logRequest);
     }
     update(force = false) {
-        if (this.socket)
-            this.socket.update(this.started, this.getTunnelsUpdate(), force);
+        if (this.socket) {
+            this.socket.update(!this.disabled, this.getTunnelsUpdate(), force);
+        }
     }
     async makeAction(action) {
-        if (action === tunnel_2.TUNNEL_AGENT_ACTION.STOP) {
-            if (this.manager) {
-                return this.manager.agentStop();
-            }
-            return this.stop();
-        }
-        if (action === tunnel_2.TUNNEL_AGENT_ACTION.START) {
-            if (this.manager) {
-                return this.manager.agentStart();
-            }
-            return this.start();
-        }
-        if (action === tunnel_2.TUNNEL_AGENT_ACTION.RESTART) {
-            if (this.manager) {
-                return this.manager.agentRestart();
-            }
-            return this.restart();
-        }
         if (action === tunnel_2.TUNNEL_AGENT_ACTION.DELETE) {
             if (this.manager) {
                 return this.manager.disableAgentAndExit(texts_1.ERR_AGENT_REMOVED);
@@ -301,7 +273,7 @@ class Agent extends events_1.default {
     }
     addTunnel(tunnel) {
         this.tunnels.push(tunnel);
-        if (this.started)
+        if (!this.disabled)
             tunnel.start();
         tunnel.on(tunnel_2.TUNNEL_EVENT.OPEN, () => this.update(true));
         tunnel.on(tunnel_2.TUNNEL_EVENT.CLOSED, () => this.update());

package/distTs/src/agent/linux.js

@@ -30,21 +30,6 @@ class AgentLinux extends system_1.default {
             });
         });
     }
-    isEnabled() {
-        return new Promise((resolve) => {
-            if (this.isStandaloneProcRunning()) {
-                resolve(true);
-                return;
-            }
-            this.systemctl('is-enabled bdy')
-                .then(() => {
-                resolve(true);
-            })
-                .catch(() => {
-                resolve(false);
-            });
-        });
-    }
     getBinaryArchive() {
         return `linux-${process.arch}.tar.gz`;
     }
@@ -60,7 +45,7 @@ class AgentLinux extends system_1.default {
     getServicePath() {
         return '/etc/systemd/system/bdy.service';
     }
-    getServiceConfig(id, host, token, port, start, user, debug) {
+    getServiceConfig(id, host, token, port, user, debug) {
         const cli = this.getSystemBinaryPath();
         return `[Unit]
 Description=Buddy Tunnel Agent
@@ -70,14 +55,21 @@ After=network.target
 Environment="DEBUG=${debug ? 1 : 0}"
 User=${user || 'root'}
 WorkingDirectory=/
-ExecStart=${cli} agent run --id="${id}" --host="${host}" --token="${token}" --port=${port} --start=${!!start}
+ExecStart=${cli} agent run --id="${id}" --host="${host}" --token="${token}" --port=${port}
 Restart=always
 RestartSec=3
 
 [Install]
 WantedBy=multi-user.target`;
     }
-    async enable(id, host, token, port, start, user, pass, debug) {
+    async install(id, host, token, port, start, user, pass, debug) {
+        try {
+            // ensure service clear
+            await this.uninstall();
+        }
+        catch {
+            // do nothing
+        }
         try {
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_DIR);
             await this.ensureSystemConfigDir();
@@ -86,9 +78,10 @@ WantedBy=multi-user.target`;
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_SERVICE_CONFIG);
-            await this.saveFile(this.getServicePath(), this.getServiceConfig(id, host, token, port, start, user, debug));
+            await this.saveFile(this.getServicePath(), this.getServiceConfig(id, host, token, port, user, debug));
             logger_1.default.info(texts_1.LOG_AGENT_ENABLING_SYSTEM);
-            await this.systemctl('enable --now bdy');
+            if (start)
+                await this.start();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLED);
         }
         catch (err) {
@@ -99,7 +92,7 @@ WantedBy=multi-user.target`;
     async update() {
         try {
             logger_1.default.info(texts_1.LOG_AGENT_STOPPING_SYSTEM);
-            await this.systemctl('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);
@@ -107,15 +100,21 @@ WantedBy=multi-user.target`;
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_STARTING_SYSTEM);
-            await this.systemctl('start bdy');
+            await this.start();
         }
         catch (err) {
             logger_1.default.error(err);
             throw err;
         }
     }
+    async stop() {
+        await this.systemctl('disable --now bdy');
+    }
+    async start() {
+        await this.systemctl('enable --now bdy');
+    }
     async disable() {
-        return this.systemctl('disable --now bdy');
+        await this.stop();
     }
     systemctl(cmd) {
         return new Promise((resolve, reject) => {

package/distTs/src/agent/manager.js

@@ -23,7 +23,6 @@ class AgentManagerClass {
     host;
     token;
     port;
-    shouldStart;
     sshHostKey;
     agent;
     ws;
@@ -35,7 +34,6 @@ class AgentManagerClass {
         this.host = null;
         this.token = null;
         this.port = null;
-        this.shouldStart = null;
         this.sshHostKey = null;
         this.agent = null;
         this.server = null;
@@ -53,8 +51,8 @@ class AgentManagerClass {
             this.system = new system_1.default();
         }
     }
-    start(id, host, token, port, start, force = false) {
-        this.load(id, host, token, port, start, force).then();
+    start(id, host, token, port) {
+        this.load(id, host, token, port).then();
     }
     async tryFetch() {
         try {
@@ -66,8 +64,7 @@ class AgentManagerClass {
                 else
                     this.status = tunnel_1.TUNNEL_AGENT_STATUS.FETCH_FAILED;
             });
-            if (this.shouldStart)
-                await this.agent.start();
+            await this.agent.start();
             this.status = tunnel_1.TUNNEL_AGENT_STATUS.ENABLED;
         }
         catch (err) {
@@ -171,8 +168,8 @@ class AgentManagerClass {
             id: this.id,
             status: this.status,
             version: (0, utils_1.getVersion)(),
-            started: this.shouldStart,
-            enabled: this.status === tunnel_1.TUNNEL_AGENT_STATUS.ENABLED,
+            enabled: !this.agent?.disabled,
+            target: !!this.agent?.target
         });
     }
     processBody(req) {
@@ -240,17 +237,10 @@ class AgentManagerClass {
             success: true,
         });
     }
-    async agentRestart() {
-        const saved = await this.agentStop();
-        if (!saved)
-            return false;
-        await (0, utils_1.sleep)(100);
-        return await this.agentStart();
-    }
     async disableAgentAndExit(txt) {
         logger_1.default.error(txt);
         try {
-            await this.system.disable();
+            await this.system.uninstall();
         }
         catch {
             // do nothing
@@ -281,45 +271,18 @@ class AgentManagerClass {
         }
         output_1.default.exitError(txt);
     }
-    async agentStop() {
-        const saved = this.resaveAgentConfig(false, true);
-        if (!saved || !this.agent)
-            return false;
-        await this.agent.stop();
-        return true;
-    }
     async agentDisable() {
-        const saved = this.resaveAgentConfig(false, true);
-        if (!saved || !this.agent)
+        if (!this.agent)
             return false;
         await this.agent.disable();
         return true;
     }
     async agentEnable() {
-        const saved = this.resaveAgentConfig(true, true);
-        if (!saved || !this.agent)
+        if (!this.agent)
             return false;
         await this.agent.enable();
         return true;
     }
-    async processAgentRestart(res) {
-        if (!this.agent) {
-            this.serverError(res, 'Agent not enabled');
-            return;
-        }
-        if (this.agent.disabled) {
-            this.serverError(res, 'Agent is disabled');
-            return;
-        }
-        const saved = await this.agentRestart();
-        if (!saved) {
-            this.serverError(res, 'Something went wrong');
-            return;
-        }
-        this.serverOutput(res, {
-            success: true,
-        });
-    }
     async processAgentEnable(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
@@ -348,52 +311,6 @@ class AgentManagerClass {
             success: true,
         });
     }
-    async processAgentStop(res) {
-        if (!this.agent) {
-            this.serverError(res, 'Agent not enabled');
-            return;
-        }
-        if (this.agent.disabled) {
-            this.serverError(res, 'Agent is disabled');
-            return;
-        }
-        const saved = await this.agentStop();
-        if (!saved) {
-            this.serverError(res, 'Something went wrong');
-            return;
-        }
-        this.serverOutput(res, {
-            success: true,
-        });
-    }
-    async agentStart() {
-        if (!this.agent)
-            return false;
-        const saved = this.resaveAgentConfig(true, true);
-        if (!saved) {
-            return false;
-        }
-        await this.agent.start();
-        return true;
-    }
-    async processAgentStart(res) {
-        if (!this.agent) {
-            this.serverError(res, 'Agent not enabled');
-            return;
-        }
-        if (this.agent.disabled) {
-            this.serverError(res, 'Agent is disabled');
-            return;
-        }
-        const saved = await this.agentStart();
-        if (!saved) {
-            this.serverError(res, 'Something went wrong');
-            return;
-        }
-        this.serverOutput(res, {
-            success: true,
-        });
-    }
     async processTunnelAdd(req, res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
@@ -437,12 +354,6 @@ class AgentManagerClass {
             return this.processTunnelAdd(req, res);
         if (req.url === '/tunnel/stop')
             return this.processTunnelStop(req, res);
-        if (req.url === '/agent/start')
-            return this.processAgentStart(res);
-        if (req.url === '/agent/stop')
-            return this.processAgentStop(res);
-        if (req.url === '/agent/restart')
-            return this.processAgentRestart(res);
         if (req.url === '/agent/debug')
             return this.processAgentDebug(req, res);
         if (req.url === '/agent/disable')
@@ -493,31 +404,27 @@ class AgentManagerClass {
             logger_1.default.info(texts_1.LOG_AGENT_SERVER_STARTED);
         });
     }
-    resaveAgentConfig(shouldStart, forceParam = false) {
+    resaveAgentConfig() {
         try {
             // load from config
             const json = this.system.loadNewAgentConfig();
-            this.shouldStart = !!json.shouldStart;
             this.sshHostKey = json.sshHostKey;
         }
         catch {
             // save from param
-            this.shouldStart = shouldStart;
         }
         if (!this.sshHostKey)
             this.sshHostKey = (0, utils_1.createSshHostKey)();
-        if (forceParam)
-            this.shouldStart = shouldStart;
         try {
             // resave config
-            this.system.saveNewAgentConfig(this.shouldStart, this.sshHostKey || '');
+            this.system.saveNewAgentConfig(this.sshHostKey || '');
             return true;
         }
         catch {
             return false;
         }
     }
-    async load(id, host, token, port, start, force = false) {
+    async load(id, host, token, port) {
         this.status = tunnel_1.TUNNEL_AGENT_STATUS.INITIALIZING;
         this.id = id;
         this.host = host;
@@ -527,7 +434,7 @@ class AgentManagerClass {
             await this.disableAgentAndExit(texts_1.ERR_AGENT_NOT_REGISTERED);
             return;
         }
-        const ok = this.resaveAgentConfig(start, force);
+        const ok = this.resaveAgentConfig();
         if (!ok) {
             await this.disableAgentAndExit(texts_1.ERR_SAVING_AGENT_CONFIG);
             return;

package/distTs/src/agent/osx.js

@@ -23,21 +23,6 @@ class AgentOsx extends system_1.default {
         // cant check for process.arch because of rosetta (process.arch returns x64 for m1)
         return Promise.resolve(true);
     }
-    isEnabled() {
-        return new Promise((resolve) => {
-            if (this.isStandaloneProcRunning()) {
-                resolve(true);
-                return;
-            }
-            this.launchCtl('print system/bdy | grep domain')
-                .then((str) => {
-                resolve(!!str && !!str.match(/domain\s=\ssystem/i));
-            })
-                .catch(() => {
-                resolve(false);
-            });
-        });
-    }
     getBinaryArchive() {
         return 'darwin-arm64.tar.gz';
     }
@@ -53,7 +38,7 @@ class AgentOsx extends system_1.default {
     getServicePath() {
         return '/Library/LaunchDaemons/bdy.plist';
     }
-    getServiceConfig(id, host, token, port, start, user, debug) {
+    getServiceConfig(id, host, token, port, user, debug) {
         const cli = this.getSystemBinaryPath();
         let cfg = `<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -74,8 +59,6 @@ class AgentOsx extends system_1.default {
       <string>${token}</string>
       <string>--port</string>
       <string>${port}</string>
-      <string>--start</string>
-      <string>${!!start}</string>
     </array>
     <key>EnvironmentVariables</key>
     <dict>
@@ -96,7 +79,14 @@ class AgentOsx extends system_1.default {
 </plist>`;
         return cfg;
     }
-    async enable(id, host, token, port, start, user, pass, debug) {
+    async install(id, host, token, port, start, user, pass, debug) {
+        try {
+            // ensure service clear
+            await this.uninstall();
+        }
+        catch {
+            // do nothing
+        }
         try {
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_DIR);
             await this.ensureSystemConfigDir();
@@ -105,9 +95,10 @@ class AgentOsx extends system_1.default {
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_SERVICE_CONFIG);
-            await this.saveFile(this.getServicePath(), this.getServiceConfig(id, host, token, port, start, user, debug));
+            await this.saveFile(this.getServicePath(), this.getServiceConfig(id, host, token, port, user, debug));
             logger_1.default.info(texts_1.LOG_AGENT_ENABLING_SYSTEM);
-            await this.launchCtl(`bootstrap system ${this.getServicePath()}`);
+            if (start)
+                await this.start();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLED);
         }
         catch (err) {
@@ -118,7 +109,7 @@ class AgentOsx extends system_1.default {
     async update() {
         try {
             logger_1.default.info(texts_1.LOG_AGENT_STOPPING_SYSTEM);
-            await this.launchCtl('bootout system/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);
@@ -126,7 +117,7 @@ class AgentOsx extends system_1.default {
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_STARTING_SYSTEM);
-            await this.launchCtl(`bootstrap system ${this.getServicePath()}`);
+            await this.start();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLED);
         }
         catch (err) {
@@ -134,10 +125,14 @@ class AgentOsx extends system_1.default {
             throw err;
         }
     }
-    disable() {
-        return new Promise((resolve, reject) => {
-            this.launchCtl('bootout system/bdy').then(() => resolve()).catch(reject);
-        });
+    async stop() {
+        await this.launchCtl('bootout system/bdy');
+    }
+    async start() {
+        await this.launchCtl(`bootstrap system ${this.getServicePath()}`);
+    }
+    async uninstall() {
+        await this.stop();
     }
     launchCtl(cmd) {
         return new Promise((resolve, reject) => {

package/distTs/src/agent/socket/client.js

@@ -22,14 +22,14 @@ class AgentSocketClient extends events_1.default {
     connected;
     lastUpdate;
     tunnelRequests;
-    socketEmit(msg, data) {
-        if (!this.socket || !this.connected)
+    socketEmit(msg, data, forceThrough = false) {
+        if (!this.socket || !forceThrough && !this.connected)
             return;
         logger_1.default.debug(`AGENT SOCKET CLIENT EMIT: ${msg}`);
         logger_1.default.debug(data);
         this.socket.emit(msg, data);
     }
-    fetch(activate = true, action = null, disabled = null, resetFirstHeard = false, tunnels) {
+    fetch(activate = true, action = null, disabled = null, resetFirstHeard = false, tunnels, forceThrough = false) {
         this.socketEmit('fetchTunnelAgent', {
             id: this.id,
             token: this.token,
@@ -41,7 +41,7 @@ class AgentSocketClient extends events_1.default {
             disabled,
             resetFirstHeard,
             tunnels,
-        });
+        }, forceThrough);
     }
     update(activate, tunnels, force = false) {
         const now = Date.now();