bdy 1.20.5-stage → 1.21.0-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.20.5-stage",
+  "version": "1.21.0-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/agent/linux.js

@@ -77,6 +77,7 @@ WantedBy=multi-user.target`;
             await this.downloadBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
+            await this.fixBinaryRights();
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_SERVICE_CONFIG);
             await this.saveFile(this.getServicePath(), this.getServiceConfig(id, host, token, port, user, debug));
             logger_1.default.info(texts_1.LOG_AGENT_ENABLING_SYSTEM);
@@ -99,6 +100,7 @@ WantedBy=multi-user.target`;
             await this.downloadBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
+            await this.fixBinaryRights();
             logger_1.default.info(texts_1.LOG_AGENT_STARTING_SYSTEM);
             await this.start();
         }

package/distTs/src/agent/osx.js

@@ -94,6 +94,7 @@ class AgentOsx extends system_1.default {
             await this.downloadBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
+            await this.fixBinaryRights();
             logger_1.default.info(texts_1.LOG_AGENT_SYSTEM_SERVICE_CONFIG);
             await this.saveFile(this.getServicePath(), this.getServiceConfig(id, host, token, port, user, debug));
             logger_1.default.info(texts_1.LOG_AGENT_ENABLING_SYSTEM);
@@ -116,6 +117,7 @@ class AgentOsx extends system_1.default {
             await this.downloadBinaryArchive();
             logger_1.default.info(texts_1.LOG_AGENT_EXTRACTING_ARCHIVE);
             await this.extractBinaryArchive();
+            await this.fixBinaryRights();
             logger_1.default.info(texts_1.LOG_AGENT_STARTING_SYSTEM);
             await this.start();
             logger_1.default.info(texts_1.LOG_AGENT_ENABLED);

package/distTs/src/agent/system.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
+const node_fs_1 = require("node:fs");
 const https_1 = __importDefault(require("https"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("../utils");
@@ -73,11 +73,11 @@ class AgentSystem {
                 .then(({ default: decompress }) => {
                 decompress(source, dest)
                     .then(() => {
-                    (0, fs_1.rmSync)(source, { force: true });
+                    (0, node_fs_1.rmSync)(source, { force: true });
                     resolve();
                 })
                     .catch((err) => {
-                    (0, fs_1.rmSync)(source, { force: true });
+                    (0, node_fs_1.rmSync)(source, { force: true });
                     reject(err);
                 });
             })
@@ -87,57 +87,51 @@ class AgentSystem {
     extractBinaryArchive() {
         return this.extractArchive(this.getBinaryArchivePath(), this.getSystemConfigDir());
     }
+    fixBinaryRights() {
+        return new Promise((resolve, reject) => {
+            (0, node_fs_1.chmod)(this.getSystemBinaryPath(), 0o777, (err) => {
+                if (err)
+                    reject(err);
+                else
+                    resolve();
+            });
+        });
+    }
     loadSystemConfig() {
-        const str = (0, fs_1.readFileSync)(this.getSystemConfigPath(), 'utf-8');
+        const str = (0, node_fs_1.readFileSync)(this.getSystemConfigPath(), 'utf-8');
         return JSON.parse(str);
     }
     loadStandaloneProcConfig() {
-        return (0, fs_1.readFileSync)(this.getSystemStandalonePath(), 'utf-8');
-    }
-    isStandaloneProcRunning() {
-        let pid;
-        try {
-            const str = this.loadStandaloneProcConfig();
-            pid = Number.parseInt(str, 10);
-        }
-        catch {
-            return false;
-        }
-        try {
-            process.kill(pid, 0);
-            return true;
-        }
-        catch (err) {
-            return err.code === 'EPERM';
-        }
+        return (0, node_fs_1.readFileSync)(this.getSystemStandalonePath(), 'utf-8');
     }
     loadNewAgentConfig() {
-        const exists = (0, fs_1.existsSync)(this.getAgentConfigPath());
+        const exists = (0, node_fs_1.existsSync)(this.getAgentConfigPath());
         if (exists) {
-            (0, fs_1.cpSync)(this.getAgentConfigPath(), this.getNewAgentConfigPath(), {
+            (0, node_fs_1.cpSync)(this.getAgentConfigPath(), this.getNewAgentConfigPath(), {
                 force: true,
             });
+            (0, node_fs_1.chmodSync)(this.getNewAgentConfigPath(), 0o666);
             this.clearAgentFiles();
         }
-        const str = (0, fs_1.readFileSync)(this.getNewAgentConfigPath(), 'utf-8');
+        const str = (0, node_fs_1.readFileSync)(this.getNewAgentConfigPath(), 'utf-8');
         return JSON.parse(str);
     }
     clearSystemFiles() {
-        (0, fs_1.rmSync)(this.getSystemBinaryPath(), { force: true });
-        (0, fs_1.rmSync)(this.getSystemConfigPath(), { force: true });
+        (0, node_fs_1.rmSync)(this.getSystemBinaryPath(), { force: true });
+        (0, node_fs_1.rmSync)(this.getSystemConfigPath(), { force: true });
     }
     clearAgentFiles() {
-        (0, fs_1.rmSync)(this.getAgentConfigPath(), { force: true });
+        (0, node_fs_1.rmSync)(this.getAgentConfigPath(), { force: true });
     }
     clearNewAgentFiles() {
-        (0, fs_1.rmSync)(this.getNewAgentConfigPath(), { force: true });
+        (0, node_fs_1.rmSync)(this.getNewAgentConfigPath(), { force: true });
     }
     ensureSystemConfigDir() {
-        (0, fs_1.mkdirSync)(this.getSystemConfigDir(), { recursive: true });
+        (0, node_fs_1.mkdirSync)(this.getSystemConfigDir(), { recursive: true, mode: 0o777 });
     }
     saveFile(p, c) {
         return new Promise((resolve, reject) => {
-            (0, fs_1.writeFile)(p, c, 'utf-8', (err) => {
+            (0, node_fs_1.writeFile)(p, c, { encoding: 'utf-8', mode: 0o666 }, (err) => {
                 if (!err)
                     resolve();
                 else
@@ -153,11 +147,11 @@ class AgentSystem {
     }
     downloadFile(url, dest) {
         return new Promise((resolve, reject) => {
-            const file = (0, fs_1.createWriteStream)(dest);
+            const file = (0, node_fs_1.createWriteStream)(dest, { mode: 0o666 });
             const request = https_1.default.get(url, (response) => {
                 if (response.statusCode !== 200) {
                     file.close();
-                    (0, fs_1.rmSync)(dest);
+                    (0, node_fs_1.rmSync)(dest);
                     reject(new Error('File not found'));
                     return;
                 }
@@ -173,7 +167,7 @@ class AgentSystem {
             });
             request.once('error', (err) => {
                 file.close();
-                (0, fs_1.rmSync)(dest);
+                (0, node_fs_1.rmSync)(dest);
                 reject(err);
             });
         });
@@ -263,7 +257,7 @@ class AgentSystem {
         try {
             logger_1.default.info(texts_1.LOG_REMOVING_AGENT_PROC_ID);
             this.ensureSystemConfigDir();
-            (0, fs_1.rmSync)(this.getSystemStandalonePath(), {
+            (0, node_fs_1.rmSync)(this.getSystemStandalonePath(), {
                 force: true,
             });
             return true;
@@ -278,7 +272,10 @@ class AgentSystem {
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_PROC_ID);
             this.ensureSystemConfigDir();
-            (0, fs_1.writeFileSync)(this.getSystemStandalonePath(), String(process.pid), 'utf-8');
+            (0, node_fs_1.writeFileSync)(this.getSystemStandalonePath(), String(process.pid), {
+                encoding: 'utf-8',
+                mode: 0o666,
+            });
             return true;
         }
         catch (err) {
@@ -300,14 +297,17 @@ class AgentSystem {
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_SYSTEM_CONFIG);
             this.ensureSystemConfigDir();
-            (0, fs_1.writeFileSync)(this.getSystemConfigPath(), JSON.stringify({
+            (0, node_fs_1.writeFileSync)(this.getSystemConfigPath(), JSON.stringify({
                 id,
                 host,
                 token,
                 port,
                 standalone,
                 debug,
-            }), 'utf-8');
+            }), {
+                encoding: 'utf-8',
+                mode: 0o666,
+            });
             return true;
         }
         catch (err) {
@@ -325,9 +325,12 @@ class AgentSystem {
         }
         try {
             logger_1.default.info(texts_1.LOG_SAVING_AGENT_LOCAL_CONFIG);
-            (0, fs_1.writeFileSync)(this.getNewAgentConfigPath(), JSON.stringify({
+            (0, node_fs_1.writeFileSync)(this.getNewAgentConfigPath(), JSON.stringify({
                 sshHostKey,
-            }), 'utf-8');
+            }), {
+                encoding: 'utf-8',
+                mode: 0o666,
+            });
             return true;
         }
         catch (err) {

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

@@ -90,7 +90,7 @@ const installService = async (options) => {
     }
     if (!agent) {
         const tags = prepareTags(options.tag);
-        agent = await ApiBuddy.register(true, target, tunneling, proxy, host, token, tags, (region) => {
+        agent = await ApiBuddy.register(true, target, tunneling, proxy, host, token, tags, (0, utils_1.getServiceUser)(options.user, options.pass), (region) => {
             cfg_1.default.setRegionIfNotSet(region);
         });
         id = agent.id;
@@ -159,7 +159,7 @@ const installApp = async (options) => {
         const tags = prepareTags(options.tag);
         try {
             output_1.default.normal(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERING, false);
-            const agent = await ApiBuddy.register(true, !!options.target, !!options.tunnels, !!options.proxy, host, token, tags, (region) => {
+            const agent = await ApiBuddy.register(true, !!options.target, !!options.tunnels, !!options.proxy, host, token, tags, (0, utils_1.getCurrentUser)(), (region) => {
                 cfg_1.default.setRegionIfNotSet(region);
             });
             logger_1.default.info(texts_1.TXT_AGENT_STANDALONE_AGENT_REGISTERED);

package/distTs/src/command/tunnel/http.js

@@ -20,7 +20,7 @@ commandHttp.action(async (target, options) => {
     const { host, token } = await Input.tunnelToken(options.token);
     const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.HTTP, target, options, true);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (0, utils_1.getCurrentUser)(), (region) => {
         Cfg.setRegionIfNotSet(region);
     });
     await agent.start();

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

@@ -20,7 +20,7 @@ commandStart.action(async (name, options) => {
     const { token, host } = await Input.tunnelToken(options.token);
     const prepared = Cfg.getTunnel(name);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (0, utils_1.getCurrentUser)(), (region) => {
         Cfg.setRegionIfNotSet(region);
     });
     await agent.start();

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

@@ -19,7 +19,7 @@ commandTcp.action(async (target, options) => {
     const { host, token } = await Input.tunnelToken(options.token);
     const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.TCP, target, options, true);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (0, utils_1.getCurrentUser)(), (region) => {
         Cfg.setRegionIfNotSet(region);
     });
     await agent.start();

package/distTs/src/command/tunnel/tls.js

@@ -19,7 +19,7 @@ commandTls.action(async (target, options) => {
     const { token, host } = await Input.tunnelToken(options.token);
     const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.TLS, target, options, true);
     await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
-    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (region) => {
+    const agent = await ApiBuddy.register(false, false, true, false, host, token, [], (0, utils_1.getCurrentUser)(), (region) => {
         Cfg.setRegionIfNotSet(region);
     });
     await agent.start();

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

@@ -53,7 +53,7 @@ const makeRequest = async (host, path, body, method = 'POST', respAsJson = true,
     }
 };
 class ApiBuddyClass {
-    async register(service, target, tunneling, proxy, host, token, tags, onDefaultRegion) {
+    async register(service, target, tunneling, proxy, host, token, tags, user, onDefaultRegion) {
         const version = (0, utils_1.getVersion)();
         const hostname = (0, utils_1.getHostname)();
         const platform = (0, utils_1.getPlatform)();
@@ -65,6 +65,7 @@ class ApiBuddyClass {
             platform,
             service,
             tags,
+            user,
             target,
             tunneling,
             proxy

package/distTs/src/tunnel/server/sftp.js

@@ -6,9 +6,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const logger_1 = __importDefault(require("../../logger"));
 const ssh2_1 = __importDefault(require("ssh2"));
 const promises_1 = __importDefault(require("fs/promises"));
+const fs_1 = require("fs");
 const path_1 = require("path");
 const node_os_1 = require("node:os");
-const { flagsToString, STATUS_CODE } = ssh2_1.default.utils.sftp;
+const { STATUS_CODE } = ssh2_1.default.utils.sftp;
+var SftpOpenFlag;
+(function (SftpOpenFlag) {
+    SftpOpenFlag[SftpOpenFlag["READ"] = 1] = "READ";
+    SftpOpenFlag[SftpOpenFlag["WRITE"] = 2] = "WRITE";
+    SftpOpenFlag[SftpOpenFlag["APPEND"] = 4] = "APPEND";
+    SftpOpenFlag[SftpOpenFlag["CREAT"] = 8] = "CREAT";
+    SftpOpenFlag[SftpOpenFlag["TRUNC"] = 16] = "TRUNC";
+    SftpOpenFlag[SftpOpenFlag["EXCL"] = 32] = "EXCL";
+})(SftpOpenFlag || (SftpOpenFlag = {}));
+function sftpFlagsToPosix(flags) {
+    const read = !!(flags & SftpOpenFlag.READ);
+    const write = !!(flags & SftpOpenFlag.WRITE);
+    let f = read && write ? fs_1.constants.O_RDWR
+        : write ? fs_1.constants.O_WRONLY
+            : fs_1.constants.O_RDONLY;
+    if (flags & SftpOpenFlag.APPEND)
+        f |= fs_1.constants.O_APPEND;
+    if (flags & SftpOpenFlag.CREAT)
+        f |= fs_1.constants.O_CREAT;
+    if (flags & SftpOpenFlag.TRUNC)
+        f |= fs_1.constants.O_TRUNC;
+    if (flags & SftpOpenFlag.EXCL)
+        f |= fs_1.constants.O_EXCL;
+    return f;
+}
 class ServerSftp {
     openHandlers;
     count;
@@ -63,16 +89,10 @@ class ServerSftp {
         const p = this.fixPath(fileName);
         const s = this.debugStart(`SFTP want to open file ${p}`);
         try {
-            const flag = flagsToString(flags);
-            if (!flag) {
-                this.sftp.status(reqId, STATUS_CODE.FAILURE);
-                this.debugEnd('SFTP open file failed', s);
-                return;
-            }
             const id = ++this.count;
             const handle = Buffer.alloc(4);
             handle.writeUint32BE(id, 0);
-            const fd = await promises_1.default.open(p, flag);
+            const fd = await promises_1.default.open(p, sftpFlagsToPosix(flags), attrs?.mode ?? 0o666);
             this.openHandlers.set(id, fd);
             await this._fsetstat(fd, attrs);
             this.sftp.handle(reqId, handle);

package/distTs/src/utils.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurrentVersionWithoutEnv = exports.getVersionWithoutEnv = exports.getVersion = exports.isInstalledByChoco = exports.isInstalledByApt = exports.isInstalledByBrew = exports.isInstalledByNpm = exports.tryGetEmail = exports.execLocally = exports.getHomeDirectory = exports.newCommand = exports.formatBytes = exports.formatHelp = exports.getPlatform = exports.getHostname = exports.isStringRegExp = exports.getWorkingDir = exports.getRootDir = exports.TARGET_ONLY_PORT_REGEX = exports.TARGET_HTTP_REGEX = exports.TARGET_TCP_TLS_REGEX = exports.ApiErrorTunnelsDisabled = exports.ApiErrorWorkspaceFlagged = exports.ApiErrorTunnelLimitReached = exports.ApiErrorAgentLimitReached = exports.ApiErrorDomainRestricted = exports.ApiErrorTargetInvalid = exports.ApiErrorWrongToken = exports.ApiErrorFailedToConnect = exports.ApiErrorAgentNotFound = exports.ARTIFACT_AUTH_TYPE = exports.ARTIFACT_SCOPE = exports.ARTIFACT_TYPE = exports.SANDBOX_SNAPSHOT_STATUS = exports.SANDBOX_APP_STATUS = exports.SANDBOX_SETUP_STATUS = exports.SANDBOX_EXEC_STATUS = exports.SANDBOX_EXEC_RUNTIME = exports.SANDBOX_STATUS = exports.REST_API_ENDPOINT = exports.REST_API_REGION = exports.SUGGESTED_BROWSER_VERSION = exports.DEFAULT_TIMEOUT = exports.TUNNEL_HTTP_CB_MIN_REQUESTS = exports.TUNNEL_HTTP_CB_WINDOW = exports.TUNNEL_MAX_REQUEST_SIZE_TO_SYNC = exports.TUNNEL_HTTP_LOG_MAX_REQUESTS = exports.TUNNEL_HTTP_LOG_MAX_BODY = exports.TUNNEL_HTTP_RATE_WINDOW = exports.TUNNEL_HTTP_RATE_LIMIT = void 0;
-exports.getBasicCommandTls = exports.getBasicCommandHttp = exports.getBasicCommandSandboxEndpoint = exports.getBasicCommandTcp = exports.getRealTargetHost = exports.isWindows = exports.isLinux = exports.isOsx = exports.isDocker = exports.sleep = exports.getLatestVersion = exports.getVersionEnv = void 0;
+exports.getBasicCommandTls = exports.getBasicCommandHttp = exports.getBasicCommandSandboxEndpoint = exports.getBasicCommandTcp = exports.getCurrentUser = exports.getServiceUser = exports.getRealTargetHost = exports.isWindows = exports.isLinux = exports.isOsx = exports.isDocker = exports.sleep = exports.getLatestVersion = exports.getVersionEnv = void 0;
 exports.apiErrorCodeToClass = apiErrorCodeToClass;
 exports.isFile = isFile;
 exports.getAppWorkspaceUrl = getAppWorkspaceUrl;
@@ -506,6 +506,21 @@ const getRealTargetHost = (target) => {
     return target || '';
 };
 exports.getRealTargetHost = getRealTargetHost;
+const getServiceUser = (user, pass) => {
+    if ((0, exports.isWindows)()) {
+        if (user && pass)
+            return user;
+        return 'LocalSystem';
+    }
+    if (user)
+        return user;
+    return 'root';
+};
+exports.getServiceUser = getServiceUser;
+const getCurrentUser = () => {
+    return node_os_1.default.userInfo().username;
+};
+exports.getCurrentUser = getCurrentUser;
 const getBasicCommandTcp = () => {
     const commandTcp = (0, exports.newCommand)('tcp');
     commandTcp.alias('TCP');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.20.5-stage",
+  "version": "1.21.0-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {