bdy 1.11.0-stage → 1.12.1-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.11.0-stage",
+  "version": "1.12.1-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -28,6 +28,7 @@
     "cross-spawn": "7.0.6",
     "eventsource": "4.0.0",
     "fastify": "4.28.1",
+    "fdir": "6.5.0",
     "isbinaryfile": "5.0.2",
     "jsonwebtoken": "9.0.2",
     "mime-db": "1.52.0",
@@ -36,10 +37,9 @@
     "node-fetch": "3.3.2",
     "node-forge": "1.3.1",
     "path-is-inside": "1.0.2",
-    "fdir": "6.5.0",
     "picomatch": "4.0.3",
     "pino": "8.20.0",
-    "punycode.js": "2.3.1",
+    "punycode": "2.3.1",
     "puppeteer-core": "23.6.0",
     "range-parser": "1.2.1",
     "socket.io-client": "4.7.5",
@@ -60,13 +60,24 @@
     "@rollup/plugin-replace": "6.0.1",
     "@stylistic/eslint-plugin-js": "2.9.0",
     "@types/cross-spawn": "6.0.6",
-    "@types/picomatch": "4.0.2",
     "@types/eslint__js": "8.42.3",
-    "@types/ssh2": "1.15.1",
+    "@types/picomatch": "4.0.2",
+    "@types/punycode": "2.1.4",
+    "@types/netmask": "2.0.5",
+    "@types/ssh2": "1.15.5",
     "@types/tar-stream": "3.1.3",
     "@types/terminal-kit": "2.5.6",
     "@types/uuid": "10.0.0",
     "@types/which": "3.0.4",
+    "@types/ws": "8.18.0",
+    "@types/jsonwebtoken": "9.0.2",
+    "@types/mime-db": "1.43.6",
+    "@types/basic-auth": "1.1.8",
+    "@types/path-is-inside": "1.0.2",
+    "@types/range-parser": "1.2.1",
+    "@types/content-disposition": "0.5.4",
+    "@types/mime-types": "2.1.4",
+    "@types/node-forge": "1.3.1",
     "eslint": "9.13.0",
     "eslint-config-prettier": "9.1.0",
     "globals": "15.11.0",

package/distTs/src/agent/agent.js

@@ -10,7 +10,21 @@ const utils_1 = require("../utils");
 const tunnel_1 = __importDefault(require("../tunnel/tunnel"));
 const output_1 = __importDefault(require("../output"));
 const client_1 = __importDefault(require("./socket/client"));
+const tunnel_2 = require("../types/tunnel");
 class Agent extends events_1.default {
+    id;
+    host;
+    token;
+    service;
+    target;
+    disabled;
+    tunnels;
+    tunnelsUpdating;
+    started;
+    api;
+    socket;
+    manager;
+    onRefresh;
     constructor(id, host, token, service, target, api, disabled) {
         super();
         this.id = id;
@@ -26,12 +40,12 @@ class Agent extends events_1.default {
         this.manager = null;
         this.onRefresh = null;
         this.socket = new client_1.default(host, id, token);
-        this.socket.on(utils_1.SOCKET_IO_EVENT_FETCH_SUCCESS, (data) => this._onSocketFetch(data));
-        this.socket.on(utils_1.SOCKET_IO_EVENT_FETCH_FAILED, (err) => this._onSocketFetchFailed(err));
-        this.socket.on(utils_1.SOCKET_IO_EVENT_CONNECTED, () => this._onSocketConnected());
-        this.socket.on(utils_1.SOCKET_IO_EVENT_DISCONNECTED, () => this._onSocketDisconnected());
-        this.socket.on(utils_1.SOCKET_IO_EVENT_TUNNEL, (tunnel, action) => this._onSocketTunnel(tunnel, action));
-        this.socket.on(utils_1.SOCKET_IO_EVENT_AGENT, (agent, action) => this._onSocketAgent(agent, action));
+        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.FETCH_SUCCESS, (data) => this._onSocketFetch(data));
+        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.FETCH_FAILED, (err) => this._onSocketFetchFailed(err));
+        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.CONNECTED, () => this._onSocketConnected());
+        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.DISCONNECTED, () => this._onSocketDisconnected());
+        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.TUNNEL, (tunnel, action) => this._onSocketTunnel(tunnel, action));
+        this.socket.on(tunnel_2.TUNNEL_SOCKET_EVENT.AGENT, (agent, action) => this._onSocketAgent(agent, action));
     }
     destroy() {
         if (this.socket) {
@@ -42,8 +56,8 @@ class Agent extends events_1.default {
         this.manager = null;
         this.onRefresh = null;
         this.api = null;
-        // musza byc manualnie wczesniej zniszczone to tylko czysci obiekt
-        this.tunnels = null;
+        // muszą byc manualnie wcześniej zniszczone to tylko czyści obiekt
+        this.tunnels = [];
     }
     _onSocketTunnel(data, action) {
         if (action === 'DEL') {
@@ -53,7 +67,8 @@ class Agent extends events_1.default {
         }
         else {
             logger_1.default.debug('Socket fetch tunnel after sync push');
-            this.socket.fetch(this.started, null, null, false, []);
+            if (this.socket)
+                this.socket.fetch(this.started, null, null, false, []);
         }
     }
     async _onSocketAgent(data, action) {
@@ -67,7 +82,7 @@ class Agent extends events_1.default {
             this.target = !!data.target;
             this.disabled = !!data.disabled;
             if (data.disabled === this.started) {
-                await this.makeAction(data.disabled ? utils_1.AGENT_ACTION_STOP : utils_1.AGENT_ACTION_START);
+                await this.makeAction(data.disabled ? tunnel_2.TUNNEL_AGENT_ACTION.STOP : tunnel_2.TUNNEL_AGENT_ACTION.START);
             }
             else if (data.action) {
                 try {
@@ -113,7 +128,7 @@ class Agent extends events_1.default {
     }
     startRefreshingConfiguration(onRefresh) {
         this.onRefresh = onRefresh;
-        if (this.onRefresh)
+        if (this.onRefresh && this.socket)
             this.onRefresh(this.socket.connected);
         this.refreshIn15();
     }
@@ -122,7 +137,8 @@ class Agent extends events_1.default {
         this.tunnels.forEach((t) => {
             t.start();
         });
-        this.socket.fetch(this.started, '', null, true, this.getTunnelsUpdate());
+        if (this.socket)
+            this.socket.fetch(this.started, '', null, true, this.getTunnelsUpdate());
     }
     async enable() {
         this.disabled = false;
@@ -130,13 +146,16 @@ class Agent extends events_1.default {
         this.tunnels.forEach((t) => {
             t.start();
         });
-        this.socket.fetch(this.started, '', false, true, this.getTunnelsUpdate());
+        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());
     }
     async disable() {
@@ -145,7 +164,8 @@ class Agent extends events_1.default {
         this.tunnels.forEach((t) => {
             t.stop();
         });
-        this.socket.fetch(this.started, '', true, false, this.getTunnelsUpdate());
+        if (this.socket)
+            this.socket.fetch(this.started, '', true, false, this.getTunnelsUpdate());
     }
     async restart() {
         await this.stop(false);
@@ -154,7 +174,9 @@ class Agent extends events_1.default {
     }
     async delete() {
         try {
-            await this.api.unregister(this.id, this.host, this.token);
+            if (this.api) {
+                await this.api.unregister(this.id, this.host, this.token);
+            }
         }
         catch {
             // do nothing
@@ -166,7 +188,9 @@ class Agent extends events_1.default {
             try {
                 if (fetch || counter >= 3) {
                     counter = 0;
-                    this.socket.fetch(this.started, null, null, false, this.getTunnelsUpdate());
+                    if (this.socket) {
+                        this.socket.fetch(this.started, null, null, false, this.getTunnelsUpdate());
+                    }
                 }
                 else {
                     this.update();
@@ -179,31 +203,33 @@ class Agent extends events_1.default {
         }, 15000);
     }
     httpRequest(tunnelId, logRequest) {
-        this.socket.request(tunnelId, logRequest);
+        if (this.socket)
+            this.socket.request(tunnelId, logRequest);
     }
     update(force = false) {
-        this.socket.update(this.started, this.getTunnelsUpdate(), force);
+        if (this.socket)
+            this.socket.update(this.started, this.getTunnelsUpdate(), force);
     }
     async makeAction(action) {
-        if (action === utils_1.AGENT_ACTION_STOP) {
+        if (action === tunnel_2.TUNNEL_AGENT_ACTION.STOP) {
             if (this.manager) {
                 return this.manager.agentStop();
             }
             return this.stop();
         }
-        if (action === utils_1.AGENT_ACTION_START) {
+        if (action === tunnel_2.TUNNEL_AGENT_ACTION.START) {
             if (this.manager) {
                 return this.manager.agentStart();
             }
             return this.start();
         }
-        if (action === utils_1.AGENT_ACTION_RESTART) {
+        if (action === tunnel_2.TUNNEL_AGENT_ACTION.RESTART) {
             if (this.manager) {
                 return this.manager.agentRestart();
             }
             return this.restart();
         }
-        if (action === utils_1.AGENT_ACTION_DELETE) {
+        if (action === tunnel_2.TUNNEL_AGENT_ACTION.DELETE) {
             if (this.manager) {
                 return this.manager.disableAgentAndExit(texts_1.ERR_AGENT_REMOVED);
             }
@@ -263,11 +289,11 @@ class Agent extends events_1.default {
         this.tunnels.forEach((t) => {
             update.push({
                 id: t.id,
-                active: t.status === utils_1.TUNNEL_OPEN,
+                active: t.status === tunnel_2.TUNNEL_STATUS.OPEN,
                 regionLatency: t.regionLatency ? t.regionLatency.latency : -1,
                 targetLatency: t.targetLatency ? t.targetLatency.latency : -1,
                 totalConnections: t.totalConnections,
-                currentConnections: Object.keys(t.connections).length,
+                currentConnections: Object.keys(t.connections || {}).length,
                 httpIdentified: t.identify ? t.identify.type : '',
             });
         });
@@ -277,20 +303,20 @@ class Agent extends events_1.default {
         this.tunnels.push(tunnel);
         if (this.started)
             tunnel.start();
-        tunnel.on(utils_1.TUNNEL_EVENT_OPEN, () => this.update(true));
-        tunnel.on(utils_1.TUNNEL_EVENT_CLOSED, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_TCP_OPEN, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_TCP_CLOSED, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_TLS_OPEN, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_TLS_CLOSED, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_HTTP_IDENTIFIED, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_HTTP_OPEN, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_HTTP_CLOSED, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_STOPPED, () => this.update());
-        tunnel.on(utils_1.TUNNEL_EVENT_HTTP_REQUEST, (t, logRequest) => this.httpRequest(t.id, logRequest));
+        tunnel.on(tunnel_2.TUNNEL_EVENT.OPEN, () => this.update(true));
+        tunnel.on(tunnel_2.TUNNEL_EVENT.CLOSED, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.TCP_OPEN, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.TCP_CLOSED, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.TLS_OPEN, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.TLS_CLOSED, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_IDENTIFIED, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_OPEN, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_CLOSED, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.STOPPED, () => this.update());
+        tunnel.on(tunnel_2.TUNNEL_EVENT.HTTP_REQUEST, (t, logRequest) => this.httpRequest(t.id, logRequest));
     }
     destroyTunnel(id) {
-        let tunnel = this.tunnels.find((t) => t.id === id);
+        const tunnel = this.tunnels.find((t) => t.id === id);
         if (!tunnel)
             return null;
         this.tunnels = this.tunnels.filter((t) => t.id !== tunnel.id);

package/distTs/src/agent/linux.js

@@ -11,7 +11,12 @@ const texts_1 = require("../texts");
 class AgentLinux extends system_1.default {
     hasAdminRights() {
         return new Promise((resolve) => {
-            resolve(process.getuid() === 0);
+            if (process.getuid) {
+                resolve(process.getuid() === 0);
+            }
+            else {
+                resolve(false);
+            }
         });
     }
     isSupported() {
@@ -107,11 +112,11 @@ WantedBy=multi-user.target`;
     }
     systemctl(cmd) {
         return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(`systemctl ${cmd}`, (err, stdout, stderr) => {
+            (0, child_process_1.exec)(`systemctl ${cmd}`, (err) => {
                 if (!err)
-                    resolve(stdout, stderr);
+                    resolve();
                 else
-                    reject(err, stderr);
+                    reject(err);
             });
         });
     }

package/distTs/src/agent/manager.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.AgentManagerClass = void 0;
 const utils_1 = require("../utils");
 const ws_1 = require("ws");
 const logger_1 = __importDefault(require("../logger"));
@@ -15,9 +16,21 @@ const system_1 = __importDefault(require("./system"));
 const osx_1 = __importDefault(require("./osx"));
 const buddy_1 = __importDefault(require("../tunnel/api/buddy"));
 const socket_1 = __importDefault(require("./socket"));
+const tunnel_1 = require("../types/tunnel");
 class AgentManagerClass {
+    status;
+    id;
+    host;
+    token;
+    port;
+    shouldStart;
+    sshHostKey;
+    agent;
+    ws;
+    server;
+    system;
     constructor() {
-        this.status = utils_1.AGENT_STATUS_DISABLED;
+        this.status = tunnel_1.TUNNEL_AGENT_STATUS.DISABLED;
         this.id = null;
         this.host = null;
         this.token = null;
@@ -41,21 +54,21 @@ class AgentManagerClass {
         }
     }
     start(id, host, token, port, start) {
-        this.load(id, host, token, parseInt(port, 10), !!start).then();
+        this.load(id, host, token, port, start).then();
     }
     async tryFetch() {
         try {
-            this.agent = await buddy_1.default.fetchAgent(this.id, this.host, this.token);
+            this.agent = await buddy_1.default.fetchAgent(this.id || '', this.host || '', this.token || '');
             this.agent.manager = this;
             this.agent.startRefreshingConfiguration((success) => {
                 if (success)
-                    this.status = utils_1.AGENT_STATUS_ENABLED;
+                    this.status = tunnel_1.TUNNEL_AGENT_STATUS.ENABLED;
                 else
-                    this.status = utils_1.AGENT_STATUS_FETCH_FAILED;
+                    this.status = tunnel_1.TUNNEL_AGENT_STATUS.FETCH_FAILED;
             });
             if (this.shouldStart)
                 await this.agent.start();
-            this.status = utils_1.AGENT_STATUS_ENABLED;
+            this.status = tunnel_1.TUNNEL_AGENT_STATUS.ENABLED;
         }
         catch (err) {
             if (err instanceof utils_1.ApiErrorAgentNotFound) {
@@ -63,7 +76,7 @@ class AgentManagerClass {
             }
             else {
                 output_1.default.normal(texts_1.AGENT_FETCH_RETRY);
-                this.status = utils_1.AGENT_STATUS_FETCH_FAILED;
+                this.status = tunnel_1.TUNNEL_AGENT_STATUS.FETCH_FAILED;
                 await (0, utils_1.sleep)(3000);
                 return this.tryFetch();
             }
@@ -88,14 +101,13 @@ class AgentManagerClass {
         const tunnels = [];
         if (this.agent) {
             this.agent.tunnels.forEach((tunnel) => {
-                if (tunnel.type === utils_1.TUNNEL_SSH)
+                if (tunnel.type === tunnel_1.TUNNEL_TYPE.SSH)
                     return;
                 tunnels.push({
                     id: tunnel.id,
                     type: tunnel.type,
                     target: tunnel.target,
                     domain: tunnel.domain,
-                    customDomain: tunnel.customDomain,
                     subdomain: tunnel.subdomain,
                     serve: tunnel.serve,
                     status: tunnel.status,
@@ -121,7 +133,7 @@ class AgentManagerClass {
             return;
         }
         this.serverOutput(res, {
-            target: this.agent.target
+            target: this.agent.target,
         });
     }
     async processAgentTargetEnable(res) {
@@ -130,7 +142,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.enableTarget(this.id, this.host, this.token);
+            await buddy_1.default.enableTarget(this.id || '', this.host || '', this.token || '');
             this.agent.target = true;
         }
         catch (err) {
@@ -145,7 +157,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.disableTarget(this.id, this.host, this.token);
+            await buddy_1.default.disableTarget(this.id || '', this.host || '', this.token || '');
             this.agent.target = false;
         }
         catch (err) {
@@ -160,7 +172,7 @@ class AgentManagerClass {
             status: this.status,
             version: (0, utils_1.getVersion)(),
             started: this.shouldStart,
-            enabled: this.status === utils_1.AGENT_STATUS_ENABLED,
+            enabled: this.status === tunnel_1.TUNNEL_AGENT_STATUS.ENABLED,
         });
     }
     processBody(req) {
@@ -199,7 +211,7 @@ class AgentManagerClass {
             return;
         }
         try {
-            await buddy_1.default.removeTunnel(this.id, tunnel.id, this.host, this.token);
+            await buddy_1.default.removeTunnel(this.id || '', tunnel.id, this.host || '', this.token || '');
         }
         catch (err) {
             this.serverError(res, err.message);
@@ -210,7 +222,7 @@ class AgentManagerClass {
         });
     }
     async agentRestart() {
-        let saved = await this.agentStop();
+        const saved = await this.agentStop();
         if (!saved)
             return false;
         await (0, utils_1.sleep)(100);
@@ -225,7 +237,7 @@ class AgentManagerClass {
             // do nothing
         }
         try {
-            await buddy_1.default.unregister(this.id, this.host, this.token);
+            await buddy_1.default.unregister(this.id || '', this.host || '', this.token || '');
         }
         catch {
             // do nothing
@@ -246,26 +258,26 @@ class AgentManagerClass {
     }
     async agentStop() {
         const saved = this.resaveAgentConfig(false, true);
-        if (!saved)
+        if (!saved || !this.agent)
             return false;
         await this.agent.stop();
         return true;
     }
     async agentDisable() {
         const saved = this.resaveAgentConfig(false, true);
-        if (!saved)
+        if (!saved || !this.agent)
             return false;
         await this.agent.disable();
         return true;
     }
     async agentEnable() {
         const saved = this.resaveAgentConfig(true, true);
-        if (!saved)
+        if (!saved || !this.agent)
             return false;
         await this.agent.enable();
         return true;
     }
-    async processAgentRestart(req, res) {
+    async processAgentRestart(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
             return;
@@ -283,7 +295,7 @@ class AgentManagerClass {
             success: true,
         });
     }
-    async processAgentEnable(req, res) {
+    async processAgentEnable(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
             return;
@@ -297,7 +309,7 @@ class AgentManagerClass {
             success: true,
         });
     }
-    async processAgentDisable(req, res) {
+    async processAgentDisable(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
             return;
@@ -311,7 +323,7 @@ class AgentManagerClass {
             success: true,
         });
     }
-    async processAgentStop(req, res) {
+    async processAgentStop(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
             return;
@@ -330,6 +342,8 @@ class AgentManagerClass {
         });
     }
     async agentStart() {
+        if (!this.agent)
+            return false;
         const saved = this.resaveAgentConfig(true, true);
         if (!saved) {
             return false;
@@ -337,7 +351,7 @@ class AgentManagerClass {
         await this.agent.start();
         return true;
     }
-    async processAgentStart(req, res) {
+    async processAgentStart(res) {
         if (!this.agent) {
             this.serverError(res, 'Agent not enabled');
             return;
@@ -370,7 +384,7 @@ class AgentManagerClass {
         }
         let tunnel;
         try {
-            tunnel = await buddy_1.default.addTunnel(this.id, this.host, this.token, data, this.sshHostKey);
+            tunnel = await buddy_1.default.addTunnel(this.id || '', this.host || '', this.token || '', data, this.sshHostKey || '');
         }
         catch (err) {
             this.serverError(res, err.message);
@@ -383,7 +397,7 @@ class AgentManagerClass {
         });
     }
     async processRequest(req, res) {
-        logger_1.default.info((0, texts_1.LOG_REQUEST)(req.url));
+        logger_1.default.info((0, texts_1.LOG_REQUEST)(req.url || ''));
         if (req.url === '/status')
             return this.processStatus(res);
         if (req.url === '/target')
@@ -399,24 +413,25 @@ class AgentManagerClass {
         if (req.url === '/tunnel/stop')
             return this.processTunnelStop(req, res);
         if (req.url === '/agent/start')
-            return this.processAgentStart(req, res);
+            return this.processAgentStart(res);
         if (req.url === '/agent/stop')
-            return this.processAgentStop(req, res);
+            return this.processAgentStop(res);
         if (req.url === '/agent/restart')
-            return this.processAgentRestart(req, res);
+            return this.processAgentRestart(res);
         if (req.url === '/agent/disable')
-            return this.processAgentDisable(req, res);
+            return this.processAgentDisable(res);
         if (req.url === '/agent/enable')
-            return this.processAgentEnable(req, res);
+            return this.processAgentEnable(res);
         this.server404(res);
     }
     processUpgrade(req, socket, head) {
-        logger_1.default.info((0, texts_1.LOG_REQUEST)(req.url));
-        const url = new URL(req.url, 'http://localhost');
+        logger_1.default.info((0, texts_1.LOG_REQUEST)(req.url || ''));
+        const url = new URL(req.url || '', 'http://localhost');
         const id = url.searchParams.get('id');
-        if (url.pathname === '/tunnel' && id) {
+        if (url.pathname === '/tunnel' && id && this.ws) {
             this.ws.handleUpgrade(req, socket, head, (con) => {
-                this.ws.emit('connection', con, id);
+                if (this.ws)
+                    this.ws.emit('connection', con, id);
             });
             return;
         }
@@ -428,7 +443,7 @@ class AgentManagerClass {
             return;
         }
         const tunnel = this.agent.tunnels.find((t) => t.id === id);
-        if (!tunnel || tunnel.type === utils_1.TUNNEL_SSH) {
+        if (!tunnel || tunnel.type === tunnel_1.TUNNEL_TYPE.SSH) {
             con.close();
             return;
         }
@@ -439,14 +454,17 @@ class AgentManagerClass {
         this.ws = new ws_1.WebSocketServer({ noServer: true });
         this.ws.on('connection', (con, id) => this.processWebsocketConnection(con, id));
         this.server.on('upgrade', (req, socket, head) => this.processUpgrade(req, socket, head));
-        this.server.listen(this.port, async (err) => {
-            if (err) {
+        this.server.on('error', async (err) => {
+            if (err.code === 'EADDRINUSE') {
                 await this.disableAgentAndExit(texts_1.LOG_ERROR_STARTING_AGENT_SERVER);
             }
             else {
-                logger_1.default.info(texts_1.LOG_AGENT_SERVER_STARTED);
+                logger_1.default.error(err);
             }
         });
+        this.server.listen(this.port, () => {
+            logger_1.default.info(texts_1.LOG_AGENT_SERVER_STARTED);
+        });
     }
     resaveAgentConfig(shouldStart, forceParam = false) {
         if (!forceParam) {
@@ -469,7 +487,7 @@ class AgentManagerClass {
         }
         try {
             // resave config
-            this.system.saveAgentConfig(this.shouldStart, this.sshHostKey);
+            this.system.saveAgentConfig(this.shouldStart, this.sshHostKey || '');
             return true;
         }
         catch {
@@ -477,11 +495,11 @@ class AgentManagerClass {
         }
     }
     async load(id, host, token, port, start) {
-        this.status = utils_1.AGENT_STATUS_INITIALIZING;
+        this.status = tunnel_1.TUNNEL_AGENT_STATUS.INITIALIZING;
         this.id = id;
         this.host = host;
         this.token = token;
-        this.port = parseInt(port, 10);
+        this.port = port;
         if (!this.id || !this.token || !this.host || !this.port) {
             await this.disableAgentAndExit(texts_1.ERR_AGENT_NOT_REGISTERED);
             return;
@@ -496,5 +514,6 @@ class AgentManagerClass {
         logger_1.default.info(texts_1.LOG_AGENT_STARTED);
     }
 }
+exports.AgentManagerClass = AgentManagerClass;
 const AgentManager = new AgentManagerClass();
 exports.default = AgentManager;

package/distTs/src/agent/osx.js

@@ -11,7 +11,12 @@ const system_1 = __importDefault(require("./system"));
 class AgentOsx extends system_1.default {
     hasAdminRights() {
         return new Promise((resolve) => {
-            resolve(process.getuid() === 0);
+            if (process.getuid) {
+                resolve(process.getuid() === 0);
+            }
+            else {
+                resolve(false);
+            }
         });
     }
     isSupported() {
@@ -123,15 +128,17 @@ class AgentOsx extends system_1.default {
         }
     }
     disable() {
-        return this.launchCtl('bootout system/bdy');
+        return new Promise((resolve, reject) => {
+            this.launchCtl('bootout system/bdy').then(() => resolve()).catch(reject);
+        });
     }
     launchCtl(cmd) {
         return new Promise((resolve, reject) => {
-            (0, child_process_1.exec)(`launchctl ${cmd}`, (err, stdout, stderr) => {
+            (0, child_process_1.exec)(`launchctl ${cmd}`, (err, stdout) => {
                 if (!err)
-                    resolve(stdout, stderr);
+                    resolve(stdout);
                 else
-                    reject(err, stderr);
+                    reject(err);
             });
         });
     }