bdy 1.16.8-dev → 1.16.9-dev

package/distTs/package.json

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

package/distTs/src/agent/system.js

@@ -181,7 +181,7 @@ class AgentSystem {
     downloadBinaryArchive() {
         const archivePath = this.getBinaryArchivePath();
         const env = (0, utils_1.getVersionEnv)();
-        const version = (0, utils_1.getVersionWithoutEnv)();
+        const version = (0, utils_1.getCurrentVersionWithoutEnv)();
         const archive = this.getBinaryArchive();
         return this.downloadFile(`https://es.buddy.works/bdy/${env}/${version}/${archive}`, archivePath);
     }
@@ -304,7 +304,7 @@ class AgentSystem {
                 token,
                 port,
                 standalone,
-                debug
+                debug,
             }), 'utf-8');
             return true;
         }

package/distTs/src/command/pre.js

@@ -31,6 +31,7 @@ const commandPre = async (_, command) => {
         // do nothing
     }
     command.currentVersion = (0, utils_1.getVersion)();
+    command.env = (0, utils_1.getVersionEnv)();
     try {
         command.latestVersion = await (0, utils_1.getLatestVersion)();
     }

package/distTs/src/command/version.js

@@ -6,8 +6,103 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const output_1 = __importDefault(require("../output"));
 const utils_2 = require("../utils");
+const updateMessage = (currentVersion, latestVersion, instructions) => {
+    output_1.default.normal('Current version: ', false);
+    output_1.default.gray(currentVersion);
+    output_1.default.normal('Latest version: ', false);
+    output_1.default.gray(latestVersion);
+    output_1.default.normal('Update bdy CLI to newest version:');
+    output_1.default.gray(instructions);
+    output_1.default.exitNormal('');
+};
+const updateByBrew = (currentVersion, latestVersion, env) => {
+    let instructions = 'brew tap buddy/bdy\n';
+    if (env === 'prod')
+        instructions += 'brew install bdy';
+    else
+        instructions += `brew install bdy@${env}`;
+    updateMessage(currentVersion, latestVersion, instructions);
+};
+const updateByChoco = (currentVersion, latestVersion, env) => {
+    const latestWithoutEnv = (0, utils_1.getVersionWithoutEnv)(latestVersion);
+    const instructions = `choco install bdy --version=${latestWithoutEnv}-${env} --pre`;
+    updateMessage(currentVersion, latestVersion, instructions);
+};
+const updateByApt = (currentVersion, latestVersion) => {
+    const instructions = 'sudo apt-get update && sudo apt-get install -y bdy';
+    updateMessage(currentVersion, latestVersion, instructions);
+};
+const updateByNpm = (isWin, currentVersion, latestVersion, env) => {
+    let instructions = '';
+    if (!isWin)
+        instructions = 'sudo ';
+    instructions += 'npm i -g bdy';
+    if (env !== 'prod')
+        instructions += `@${env}`;
+    updateMessage(currentVersion, latestVersion, instructions);
+};
+const updateByDownload = (platform, currentVersion, latestVersion, env) => {
+    const isMac = platform === 'darwin';
+    const isWin = platform === 'win32';
+    const x64 = process.arch === 'x64';
+    const latestWithoutEnv = (0, utils_1.getVersionWithoutEnv)(latestVersion);
+    let packageName;
+    if (isWin)
+        packageName = 'win-x64.zip';
+    else if (isMac)
+        packageName = 'darwin-arm64.tar.gz';
+    else if (x64)
+        packageName = 'linux-x64.tar.gz';
+    else
+        packageName = 'linux-arm64.tar.gz';
+    let instructions = `curl https://es.buddy.works/bdy/${env}/${latestWithoutEnv}/${packageName}`;
+    if (isWin)
+        instructions += ' -o bdy.zip\ntar -xf bdy.zip';
+    else
+        instructions += ' -o bdy.tar.gz\nsudo tar -zxf bdy.tar.gz -C /usr/local/bin/';
+    updateMessage(currentVersion, latestVersion, instructions);
+};
 const commandVersion = (0, utils_2.newCommand)('version');
-commandVersion.action(() => {
-    output_1.default.exitNormal((0, utils_1.getVersion)());
+commandVersion.hideVersionUpdate = true;
+commandVersion.action(async () => {
+    const currVersion = commandVersion.currentVersion || '';
+    const lastVersion = commandVersion.latestVersion || '';
+    const env = commandVersion.env || '';
+    if (currVersion !== lastVersion) {
+        const platform = (0, utils_1.getPlatform)();
+        const isMac = platform === 'darwin';
+        const isWin = platform === 'win32';
+        if (isMac) {
+            const isInstalled = await (0, utils_1.isInstalledByBrew)();
+            if (isInstalled) {
+                updateByBrew(currVersion, lastVersion, env);
+                return;
+            }
+        }
+        else if (isWin) {
+            const isInstalled = await (0, utils_1.isInstalledByChoco)();
+            if (isInstalled) {
+                updateByChoco(currVersion, lastVersion, env);
+                return;
+            }
+        }
+        else {
+            const isInstalled = await (0, utils_1.isInstalledByApt)();
+            if (isInstalled) {
+                updateByApt(currVersion, lastVersion);
+                return;
+            }
+        }
+        const isInstalled = await (0, utils_1.isInstalledByNpm)();
+        if (isInstalled) {
+            updateByNpm(isWin, currVersion, lastVersion, env);
+            return;
+        }
+        else {
+            updateByDownload(platform, currVersion, lastVersion, env);
+            return;
+        }
+    }
+    output_1.default.exitNormal(currVersion);
 });
 exports.default = commandVersion;

package/distTs/src/output.js

@@ -35,6 +35,12 @@ class Output {
             msg += '\n';
         terminal(msg);
     }
+    static gray(txt, newLine = true) {
+        let msg = txt;
+        if (newLine)
+            msg += '\n';
+        terminal.gray(msg);
+    }
     static warning(txt, newLine = true) {
         let msg = txt;
         if (newLine)

package/distTs/src/texts.js

@@ -219,7 +219,7 @@ exports.OPTION_UPLOAD_REPORT_FORMAT = 'Format of the reports';
 exports.OPTION_UPLOAD_DRY_RUN = 'Run command without uploading reports';
 const TXT_NEW_CLI_DOCKER_VERSION = (version) => `A new version of bdy Docker image is available! (${version})\n\n`;
 exports.TXT_NEW_CLI_DOCKER_VERSION = TXT_NEW_CLI_DOCKER_VERSION;
-const TXT_NEW_CLI_VERSION = (version) => `A new version of bdy is available! (${version})\n\n`;
+const TXT_NEW_CLI_VERSION = (version) => `A new version of bdy is available! (${version}). Run bdy version for more info\n\n`;
 exports.TXT_NEW_CLI_VERSION = TXT_NEW_CLI_VERSION;
 exports.TXT_NEW_AGENT_VERSION = 'Agent upgrade required. Update the agent by running:\n`bdy agent update`\n\n';
 exports.TXT_ENABLING_AGENT = 'Installing agent...';

package/distTs/src/utils.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBasicCommandTls = exports.getBasicCommandHttp = exports.getBasicCommandTcp = exports.createSshHostKey = exports.getRealTargetHost = exports.isWindows = exports.isLinux = exports.isOsx = exports.isDocker = exports.sleep = exports.getLatestVersion = exports.getVersionEnv = exports.getVersionWithoutEnv = exports.getVersion = exports.getHomeDirectory = exports.newCommand = exports.formatHelp = exports.getPlatform = exports.getHostname = exports.isStringRegExp = 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.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.getBasicCommandTcp = exports.createSshHostKey = exports.getRealTargetHost = exports.isWindows = exports.isLinux = exports.isOsx = exports.isDocker = exports.sleep = exports.getLatestVersion = exports.getVersionEnv = exports.getCurrentVersionWithoutEnv = exports.getVersionWithoutEnv = exports.getVersion = exports.isInstalledByChoco = exports.isInstalledByApt = exports.isInstalledByBrew = exports.isInstalledByNpm = exports.execLocally = exports.getHomeDirectory = exports.newCommand = exports.formatHelp = exports.getPlatform = exports.getHostname = exports.isStringRegExp = 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.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.apiErrorCodeToClass = apiErrorCodeToClass;
 exports.isFile = isFile;
 exports.asyncWait = asyncWait;
@@ -48,6 +48,7 @@ const node_sea_1 = require("node:sea");
 const commander_1 = require("commander");
 const texts_2 = require("./texts");
 const node_os_1 = __importStar(require("node:os"));
+const node_child_process_1 = require("node:child_process");
 exports.TUNNEL_HTTP_RATE_LIMIT = 2000;
 exports.TUNNEL_HTTP_RATE_WINDOW = 60000;
 exports.TUNNEL_HTTP_LOG_MAX_BODY = 5242880; // 5MB
@@ -239,6 +240,57 @@ const getHomeDirectory = () => {
     return p;
 };
 exports.getHomeDirectory = getHomeDirectory;
+const execLocally = async (cmd) => {
+    return new Promise((resolve, reject) => {
+        (0, node_child_process_1.exec)(cmd, (err, stdout, stderr) => {
+            if (err)
+                reject(err);
+            else
+                resolve(`${stdout}\n${stderr}`);
+        });
+    });
+};
+exports.execLocally = execLocally;
+const isInstalledByNpm = async () => {
+    try {
+        const out = await (0, exports.execLocally)('npm -g list');
+        return (out || '').includes('bdy@');
+    }
+    catch {
+        return false;
+    }
+};
+exports.isInstalledByNpm = isInstalledByNpm;
+const isInstalledByBrew = async () => {
+    try {
+        const out = await (0, exports.execLocally)('brew list');
+        return (out || '').includes('bdy');
+    }
+    catch {
+        return false;
+    }
+};
+exports.isInstalledByBrew = isInstalledByBrew;
+const isInstalledByApt = async () => {
+    try {
+        const out = await (0, exports.execLocally)('apt list --installed');
+        return (out || '').includes('bdy/');
+    }
+    catch {
+        return false;
+    }
+};
+exports.isInstalledByApt = isInstalledByApt;
+const isInstalledByChoco = async () => {
+    try {
+        const out = await (0, exports.execLocally)('choco list');
+        return (out || '').includes('bdy');
+    }
+    catch {
+        return false;
+    }
+};
+exports.isInstalledByChoco = isInstalledByChoco;
 const getVersion = () => {
     if (!cachedVersion) {
         let packageJson;
@@ -254,14 +306,21 @@ const getVersion = () => {
     return cachedVersion;
 };
 exports.getVersion = getVersion;
-const getVersionWithoutEnv = () => {
+const getVersionWithoutEnv = (version) => {
+    const m = version.match(/^\d+\.\d+\.\d+/);
+    if (m)
+        return m[0];
+    return '0.0.0';
+};
+exports.getVersionWithoutEnv = getVersionWithoutEnv;
+const getCurrentVersionWithoutEnv = () => {
     const v = (0, exports.getVersion)();
     const m = v.match(/^\d+\.\d+\.\d+/);
     if (m)
         return m[0];
     return '0.0.0';
 };
-exports.getVersionWithoutEnv = getVersionWithoutEnv;
+exports.getCurrentVersionWithoutEnv = getCurrentVersionWithoutEnv;
 const getVersionEnv = () => {
     const v = (0, exports.getVersion)();
     if (/dev/.test(v))

package/package.json

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