bdy 1.18.24-dev-pipeline → 1.18.26-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.18.24-dev-pipeline",
+  "version": "1.18.26-dev",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -55,7 +55,6 @@
     "mime-db": "1.52.0",
     "mime-types": "2.1.35",
     "netmask": "2.0.2",
-    "node-fetch": "3.3.2",
     "node-forge": "1.3.3",
     "open": "11.0.0",
     "path-is-inside": "1.0.2",

package/distTs/src/api/client.js

@@ -216,13 +216,6 @@ class ApiClient {
             throw new Error(texts_1.ERR_REST_API_GENERAL_ERROR);
         }
     }
-    async getPipelineRunActionExecution(workspace, project, pipelineId, executionId, actionExecutionId) {
-        return await this.request({
-            method: 'GET',
-            path: `/workspaces/${encodeURIComponent(workspace)}/projects/${encodeURIComponent(project)}/pipelines/${encodeURIComponent(pipelineId)}/executions/${encodeURIComponent(executionId)}/action_executions/${encodeURIComponent(actionExecutionId)}`,
-            parseResponseBody: true,
-        });
-    }
     async getPipelineRun(workspace, project, pipelineId, executionId) {
         return await this.request({
             method: 'GET',
@@ -728,14 +721,14 @@ class ApiClient {
         return await this.request({
             method: 'POST',
             path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/${encodeURIComponent(sandboxId)}/apps/${encodeURIComponent(appId)}/stop`,
-            parseResponseBody: true,
+            parseResponseBody: true
         });
     }
     async startSandboxApp(workspace, sandboxId, appId) {
         return await this.request({
             method: 'POST',
             path: `/workspaces/${encodeURIComponent(workspace)}/sandboxes/${encodeURIComponent(sandboxId)}/apps/${encodeURIComponent(appId)}/start`,
-            parseResponseBody: true,
+            parseResponseBody: true
         });
     }
     async getSandboxAppLogs(workspace, sandboxId, appId, cursor) {

package/distTs/src/command/login.js

@@ -9,10 +9,9 @@ const node_http_1 = __importDefault(require("node:http"));
 const texts_1 = require("../texts");
 const utils_1 = require("../utils");
 const input_1 = __importDefault(require("../input"));
-const logger_1 = __importDefault(require("../logger"));
+const uuid_1 = require("uuid");
 const OAUTH_CLIENT_APP_PORT = 7596;
 const OAUTH_CLIENT_APP_HOST = 'localhost';
-const OAUTH_CLIENT_APP_REDIRECT_URL = `http://localhost:${OAUTH_CLIENT_APP_PORT}`;
 const OAUTH_CLIENT_APP_SCOPES = [
     'WORKSPACE',
     'MEMBER_EMAIL',
@@ -32,45 +31,84 @@ const OAUTH_CLIENT_APP_SCOPES = [
     'TUNNEL_MANAGE',
     'UNIT_TEST_MANAGE',
 ];
+function getRedirectUrl(api) {
+    return `https://${api}/oauth2/cli`;
+}
 async function oauthServer(api, clientId, clientSecret) {
     const ApiClient = require('../api/client').default;
     const open = require('open').default;
+    const redirectUrl = getRedirectUrl(api);
     return new Promise((resolve) => {
-        const s = node_http_1.default.createServer(async (req, res) => {
-            const url = new URL(req.url || '', `http://${OAUTH_CLIENT_APP_HOST}`);
-            const urlCode = url.searchParams.get('code');
-            if (!urlCode) {
-                res.end(texts_1.ERR_LOGIN_HTTP_FAILED);
-                return;
-            }
+        const state = (0, uuid_1.v4)();
+        const abortCode = new AbortController();
+        const exchange = async (urlCode, urlState, res) => {
             const client = new ApiClient(new URL(`https://${api}`));
             try {
-                const response = await client.exchangeAppToken(urlCode, clientId, clientSecret, OAUTH_CLIENT_APP_REDIRECT_URL);
-                res.end(texts_1.ERR_LOGIN_HTTP_SUCCESS);
+                const response = await client.exchangeAppToken(urlCode, clientId, clientSecret, redirectUrl);
+                if (res)
+                    res.end(urlState);
                 s.close();
+                abortCode.abort('OK');
                 resolve({
                     token: response.access_token,
                     refreshToken: response.refresh_token,
                 });
+                return true;
             }
             catch {
+                if (res)
+                    res.end(texts_1.ERR_LOGIN_HTTP_FAILED);
+                return false;
+            }
+        };
+        const s = node_http_1.default.createServer(async (req, res) => {
+            res.setHeader('access-control-allow-origin', '*');
+            const url = new URL(req.url || '', `http://${OAUTH_CLIENT_APP_HOST}`);
+            const urlCode = url.searchParams.get('code');
+            const urlState = url.searchParams.get('state');
+            if (!urlCode || urlState !== state) {
                 res.end(texts_1.ERR_LOGIN_HTTP_FAILED);
-                s.close();
-                output_1.default.exitError(texts_1.ERR_LOGIN_HTTP_FAILED);
+                return;
             }
+            await exchange(urlCode, urlState, res);
         });
         s.on('error', () => {
             s.close();
             output_1.default.exitError(texts_1.ERR_LOGIN_HTTP_SERVER_PORT_TAKEN);
         });
-        s.listen(OAUTH_CLIENT_APP_PORT, OAUTH_CLIENT_APP_HOST, () => {
-            const url = `https://${api}/oauth2/authorize?type=web_server&client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(OAUTH_CLIENT_APP_REDIRECT_URL)}&response_type=code&scope=${encodeURIComponent(OAUTH_CLIENT_APP_SCOPES.join(' '))}`;
-            open(url);
+        s.listen(OAUTH_CLIENT_APP_PORT, OAUTH_CLIENT_APP_HOST, async () => {
+            const url = `https://${api}/oauth2/authorize?type=web_server&client_id=${encodeURIComponent(clientId)}&redirect_uri=${encodeURIComponent(redirectUrl)}&response_type=code&scope=${encodeURIComponent(OAUTH_CLIENT_APP_SCOPES.join(' '))}&state=${encodeURIComponent(state)}`;
+            try {
+                await open(url);
+            }
+            catch {
+                // do nothing
+            }
+            output_1.default.normal(texts_1.TXT_LOGIN_OPEN_URL);
+            output_1.default.normal(url.replace(/%/g, '%%'));
+            output_1.default.normal('');
+            for (;;) {
+                try {
+                    const code = await output_1.default.inputString(texts_1.TXT_LOGIN_PROVIDE_CODE, undefined, false, abortCode.signal);
+                    const success = await exchange(code, state);
+                    if (success)
+                        break;
+                }
+                catch (err) {
+                    if (err.name === 'AbortPromptError') {
+                        break;
+                    }
+                    else if (err.name === 'ExitPromptError') {
+                        output_1.default.exitError(texts_1.ERR_LOGIN_HTTP_CANCEL);
+                    }
+                }
+            }
         });
     });
 }
 async function getOrCreateApp(api) {
     const ApiClient = require('../api/client').default;
+    const redirectUrl = getRedirectUrl(api);
     const client = new ApiClient(new URL(`https://${api}`));
     let clientId = cfg_1.default.getApiClientId();
     let clientSecret = cfg_1.default.getApiClientSecret();
@@ -81,7 +119,7 @@ async function getOrCreateApp(api) {
             const app = await client.getApp(clientId);
             if (!app ||
                 !app.redirect_uris ||
-                !app.redirect_uris.includes(OAUTH_CLIENT_APP_REDIRECT_URL)) {
+                !app.redirect_uris.includes(redirectUrl)) {
                 clear = true;
             }
         }
@@ -95,7 +133,7 @@ async function getOrCreateApp(api) {
         }
     }
     if (!clientId || !clientSecret || !clientToken) {
-        const app = await client.registerApp('Buddy CLI', OAUTH_CLIENT_APP_REDIRECT_URL);
+        const app = await client.registerApp('Buddy CLI', redirectUrl);
         clientId = app.client_id;
         clientSecret = app.client_secret;
         clientToken = app.registration_access_token;
@@ -139,7 +177,6 @@ commandLogin.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
 commandLogin.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandLogin.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandLogin.action(async (options) => {
-    logger_1.default.info(options);
     output_1.default.handleSignals();
     cfg_1.default.clearLogin();
     let api = options.api || process.env.BUDDY_API_ENDPOINT;

package/distTs/src/command/pipeline/run.js

@@ -5,12 +5,130 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
-const status_1 = __importDefault(require("./run/status"));
-const start_1 = __importDefault(require("./run/start"));
+const output_1 = __importDefault(require("../../output"));
+const input_1 = __importDefault(require("../../input"));
+const format_1 = __importDefault(require("../../format"));
 const commandPipelineRun = (0, utils_1.newCommand)('run', texts_1.DESC_COMMAND_PIPELINE_RUN);
-commandPipelineRun.addCommand(start_1.default);
-commandPipelineRun.addCommand(status_1.default);
-commandPipelineRun.addHelpText('after', `
-EXAMPLES:${texts_1.EXAMPLE_PIPELINE_RUN_START}
-${texts_1.EXAMPLE_PIPELINE_RUN_STATUS}`);
+commandPipelineRun.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandPipelineRun.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandPipelineRun.option('-b, --branch <branch>', texts_1.OPTION_PIPELINE_RUN_BRANCH);
+commandPipelineRun.option('-t, --tag <tag>', texts_1.OPTION_PIPELINE_RUN_TAG);
+commandPipelineRun.option('-pr, --pull-request <pull request>', texts_1.OPTION_PIPELINE_RUN_PULL_REQUEST);
+commandPipelineRun.option('-r, --revision <revision>', texts_1.OPTION_PIPELINE_RUN_REVISION);
+commandPipelineRun.option('--comment <comment>', texts_1.OPTION_PIPELINE_RUN_COMMENT);
+commandPipelineRun.option('-f, --refresh', texts_1.OPTION_PIPELINE_RUN_REFRESH);
+commandPipelineRun.option('-c, --clear-cache', texts_1.OPTION_PIPELINE_RUN_CLEAR_CACHE);
+commandPipelineRun.option('--priority <priority>', texts_1.OPTION_PIPELINE_RUN_PRIORITY);
+commandPipelineRun.option('-v, --variable <variables...>', texts_1.OPTION_PIPELINE_RUN_VAR);
+commandPipelineRun.option('-vm, --variable-masked <variables...>', texts_1.OPTION_PIPELINE_RUN_VAR);
+commandPipelineRun.option('--schedule <date>', texts_1.OPTION_PIPELINE_RUN_DELAY);
+commandPipelineRun.option('--action <actions...>', texts_1.OPTION_PIPELINE_RUN_ACTION);
+commandPipelineRun.option('--wait [minutes]', texts_1.OPTION_PIPELINE_RUN_WAIT);
+commandPipelineRun.argument('<identifier>', texts_1.OPTION_PIPELINE_RUN_ARGUMENT);
+commandPipelineRun.usage('<identifier> [options]');
+commandPipelineRun.addHelpText('after', texts_1.EXAMPLE_PIPELINE_RUN);
+commandPipelineRun.action(async (identifier, options) => {
+    const workspace = input_1.default.restApiWorkspace(options.workspace);
+    const project = input_1.default.restApiProject(options.project);
+    const client = input_1.default.restApiTokenClient();
+    const data = await client.getPipelineByIdentifier(workspace, project, identifier);
+    if (!data || !data.domain) {
+        output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);
+    }
+    if (!data.project_identifier) {
+        output_1.default.exitError(texts_1.ERR_PROJECT_NOT_FOUND);
+    }
+    if (!data.pipeline_id) {
+        output_1.default.exitError(texts_1.ERR_PIPELINE_NOT_FOUND);
+    }
+    const body = {};
+    if (options.branch) {
+        body.branch = {
+            name: options.branch,
+        };
+    }
+    if (options.tag) {
+        body.tag = {
+            name: options.tag,
+        };
+    }
+    if (options.pullRequest) {
+        body.pull_request = {
+            name: `pull/${options.pullRequest}`,
+        };
+    }
+    if (options.revision) {
+        body.to_revision = {
+            revision: options.revision,
+        };
+    }
+    if (options.comment) {
+        body.comment = options.comment;
+    }
+    if (options.refresh) {
+        body.refresh = true;
+    }
+    if (options.clearCache) {
+        body.clear_cache = true;
+    }
+    const priority = input_1.default.pipelineRunPriority(options.priority);
+    if (priority) {
+        body.priority = priority;
+    }
+    body.variables = [];
+    if (options.variable) {
+        body.variables = body.variables.concat(input_1.default.pipelineRunVariable(options.variable, false));
+    }
+    if (options.variableMasked) {
+        body.variables = body.variables.concat(input_1.default.pipelineRunVariable(options.variableMasked, true));
+    }
+    const delay = input_1.default.pipelineRunDelay(options.schedule);
+    if (delay) {
+        body.delay_until = delay;
+    }
+    const actions = input_1.default.pipelineRunAction(options.action);
+    if (actions) {
+        body.actions_to_run = actions;
+    }
+    const result = await client.pipelineRun(workspace, project, data.pipeline_id, body);
+    if (options.wait) {
+        const minutes = input_1.default.pipelineRunWaitTime(options.wait);
+        wait(minutes, workspace, project, data.pipeline_id, result.id, result.html_url, client);
+    }
+    else {
+        output_1.default.exitSuccess((0, texts_1.TXT_PIPELINE_RUN_SUCCESS)(result.html_url));
+    }
+});
+const wait = (minutes, workspace, project, pipelineId, runId, htmlUrl, client) => {
+    const start = Date.now();
+    output_1.default.normal((0, texts_1.TXT_PIPELINE_RUN_WAIT)(minutes));
+    let fetchCounter = 1;
+    const ts1 = setTimeout(() => {
+        output_1.default.exitError(texts_1.ERR_RUN_PIPELINE_WAIT_TIMEOUT);
+    }, minutes * 60 * 1000);
+    const ts2 = setInterval(async () => {
+        output_1.default.clearPreviousLine();
+        output_1.default.normal((0, texts_1.TXT_PIPELINE_RUN_STILL_WAITING)(formatWaitTime(start)));
+        if (fetchCounter >= 3) {
+            const run = await client.getPipelineRun(workspace, project, pipelineId, runId);
+            if (!['INPROGRESS', 'ENQUEUED', 'TERMINATING'].includes(run.status)) {
+                clearTimeout(ts1);
+                clearInterval(ts2);
+                output_1.default.clearPreviousLine();
+                if (run.status === 'SUCCESSFUL') {
+                    output_1.default.exitSuccess((0, texts_1.TXT_PIPELINE_RUN_FINISH_SUCCESSFULLY)(htmlUrl));
+                }
+                else {
+                    output_1.default.exitError((0, texts_1.TXT_PIPELINE_RUN_FINISH_FAILED)(run.status, htmlUrl));
+                }
+            }
+            fetchCounter = 0;
+        }
+        fetchCounter += 1;
+    }, 1000);
+};
+const formatWaitTime = (start) => {
+    const elapsed = Math.floor((Date.now() - start) / 1000);
+    return format_1.default.pipelineRunWaitTime(elapsed);
+};
 exports.default = commandPipelineRun;

package/distTs/src/command/project/get.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cfg_1 = __importDefault(require("../../tunnel/cfg"));
+const output_1 = __importDefault(require("../../output"));
+const texts_1 = require("../../texts");
+const utils_1 = require("../../utils");
+const commandProjectGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_PROJECT_GET);
+commandProjectGet.action(async () => {
+    const project = cfg_1.default.getProject();
+    if (!project) {
+        output_1.default.exitError(texts_1.TXT_PROJECT_NONE);
+    }
+    output_1.default.exitNormal(project);
+});
+exports.default = commandProjectGet;

package/distTs/src/command/project/link.js

@@ -23,7 +23,7 @@ commandProjectLink.action(async (dir, options) => {
     ProjectCfg.init(path, workspace, project);
     output_1.default.okSign();
     output_1.default.normal(texts_1.TXT_COMMAND_PROJECT_LINK_TO, false);
-    output_1.default.cyan(` ${url}`);
+    output_1.default.light(` ${url}`);
     await initRepo(workspace, project, path, git, options);
     tryNow();
     output_1.default.exitNormal();
@@ -54,13 +54,13 @@ const tryNow = () => {
     output_1.default.arrowSign();
     output_1.default.label(texts_1.OPT_COMMAND_PROJECT_LINK_TRY_NOW);
     output_1.default.dim('$ ', false);
-    output_1.default.cyan('bdy tunnel http 3000 ', false);
+    output_1.default.light('bdy tunnel http 3000 ', false);
     output_1.default.muted('                  Expose localhost:3000 to the internet');
     output_1.default.dim('$ ', false);
-    output_1.default.cyan('bdy package publish . ', false);
+    output_1.default.light('bdy package publish . ', false);
     output_1.default.muted('                 Publish a package from the current project');
     output_1.default.dim('$ ', false);
-    output_1.default.cyan('bdy sandbox create --run "npm start" ', false);
+    output_1.default.light('bdy sandbox create --run "npm start" ', false);
     output_1.default.muted('  Spin up a cloud sandbox and run your app');
 };
 const initRepo = async (workspace, project, path, git, options) => {
@@ -89,16 +89,16 @@ const initRepo = async (workspace, project, path, git, options) => {
         });
         output_1.default.okSign();
         output_1.default.normal('Remote ', false);
-        output_1.default.cyan('origin ', false);
+        output_1.default.light('origin ', false);
         output_1.default.normal('set to ', false);
-        output_1.default.cyan(remote);
+        output_1.default.light(remote);
     }
     else if (remotes.origin !== remote) {
         output_1.default.yellow(texts_1.OPT_COMMAND_PROJECT_LINK_HAS_REMOTE);
         output_1.default.normal('Current origin: ', false);
-        output_1.default.cyan(remotes.origin);
+        output_1.default.light(remotes.origin);
         output_1.default.normal('Buddy project: ', false);
-        output_1.default.cyan(remote);
+        output_1.default.light(remote);
         const opt = await output_1.default.inputMenuAdv(texts_1.OPT_COMMAND_PROJECT_LINK_SET_GIT_REMOTE, [
             {
                 name: 'Add buddy remote',
@@ -127,9 +127,9 @@ const initRepo = async (workspace, project, path, git, options) => {
             });
             output_1.default.okSign();
             output_1.default.normal('Remote ', false);
-            output_1.default.cyan('buddy ', false);
+            output_1.default.light('buddy ', false);
             output_1.default.normal('set to ', false);
-            output_1.default.cyan(remote);
+            output_1.default.light(remote);
         }
         else if (opt === 'origin') {
             await (0, utils_1.execLocally)(`git remote rm origin`, {
@@ -140,7 +140,7 @@ const initRepo = async (workspace, project, path, git, options) => {
             });
             output_1.default.okSign();
             output_1.default.normal('Origin replaced with ', false);
-            output_1.default.cyan(remote);
+            output_1.default.light(remote);
         }
         else {
             return;

package/distTs/src/command/project/set.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cfg_1 = __importDefault(require("../../tunnel/cfg"));
+const output_1 = __importDefault(require("../../output"));
+const texts_1 = require("../../texts");
+const utils_1 = require("../../utils");
+const input_1 = __importDefault(require("../../input"));
+const commandProjectSet = (0, utils_1.newCommand)('set', texts_1.DESC_COMMAND_PROJECT_SET);
+commandProjectSet.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandProjectSet.argument('[project]', texts_1.ARG_COMMAND_PROJECT_NAME);
+commandProjectSet.action(async (project, options) => {
+    output_1.default.handleSignals();
+    const workspace = input_1.default.restApiWorkspace(options.workspace);
+    const client = input_1.default.restApiTokenClient();
+    if (project) {
+        await client.getProject(workspace, project);
+    }
+    else {
+        const response = await client.getProjects(workspace);
+        project = await output_1.default.selectProject(response.projects);
+    }
+    cfg_1.default.setProject(project);
+    if (!project)
+        output_1.default.exitSuccess(texts_1.TXT_PROJECT_SET_CLEARED);
+    else
+        output_1.default.exitSuccess((0, texts_1.TXT_PROJECT_SET_SUCCESS)(project));
+});
+exports.default = commandProjectSet;

package/distTs/src/command/sandbox/create.js

@@ -139,9 +139,10 @@ commandSandboxCreate.action(async (options) => {
         }
     }
     output_1.default.green((0, texts_1.TXT_SANDBOX_CREATED)(result.identifier));
-    output_1.default.normal(result.html_url);
+    output_1.default.dim('SSH:          ', false);
     output_1.default.cyan(`ssh ${result.ssh_host} -p ${result.ssh_port}`);
-    //
+    output_1.default.dim('Web terminal: ', false);
+    output_1.default.cyan(result.html_url);
     output_1.default.exitNormal();
 });
 exports.default = commandSandboxCreate;

package/distTs/src/command/sandbox/get/yaml.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../utils");
+const texts_1 = require("../../../texts");
+const input_1 = __importDefault(require("../../../input"));
+const output_1 = __importDefault(require("../../../output"));
+const commandSandboxGetYaml = (0, utils_1.newCommand)('yaml', texts_1.DESC_COMMAND_SANDBOX_GET_YAML);
+commandSandboxGetYaml.hideVersionUpdate = true;
+commandSandboxGetYaml.alias('yml');
+commandSandboxGetYaml.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
+commandSandboxGetYaml.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
+commandSandboxGetYaml.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
+commandSandboxGetYaml.action(async (identifier, options) => {
+    const workspace = input_1.default.restApiWorkspace(options.workspace);
+    const project = input_1.default.restApiProject(options.project);
+    const client = input_1.default.restApiTokenClient();
+    let result = await client.listSandboxes(workspace, project);
+    const sandboxes = result.sandboxes || [];
+    const found = sandboxes.find((s) => s.identifier === identifier);
+    if (!found) {
+        output_1.default.exitError(texts_1.ERR_SANDBOX_NOT_FOUND);
+    }
+    const sandboxId = found.id;
+    result = await client.getSandboxYaml(workspace, sandboxId);
+    output_1.default.exitNormal(Buffer.from(result.yaml, 'base64').toString('utf8'));
+});
+exports.default = commandSandboxGetYaml;