bdy 1.25.3-dev → 1.25.5-dev

package/distTs/src/command/artifact/publish.js

@@ -25,8 +25,10 @@ commandArtifactPublish.option('--agent-note <note>', texts_1.OPTION_ARTIFACT_VER
 commandArtifactPublish.option('-f, --force', texts_1.OPTION_ARTIFACT_PUBLISH_OVERWRITE_VERSION);
 commandArtifactPublish.argument('<identifier>', texts_1.OPTION_ARTIFACT_ID);
 commandArtifactPublish.argument('<directory>', texts_1.OPTION_ARTIFACT_PUBLISH_PATH);
+commandArtifactPublish.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactPublish.action(async (id, path, options) => {
     const { v4 } = require('uuid');
+    const say = output_1.default.progress(options.format === 'json');
     let dirPath = input_1.default.resolvePath(path);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -66,20 +68,15 @@ commandArtifactPublish.action(async (id, path, options) => {
         }
     }
     let artifactVersionId = data.artifact_version_id;
-    let url;
     if (artifactVersionId && !options.force) {
         output_1.default.exitError(texts_1.ERR_ARTIFACT_VERSION_EXISTS);
     }
-    if (!artifactVersionId) {
-        const d = await client.createArtifactVersion(workspace, artifactId, version, options.note, options.agentNote);
-        url = d.version_url;
-        artifactVersionId = d.id;
-    }
-    else {
-        const d = await client.getArtifactVersion(workspace, artifactId, artifactVersionId);
-        url = d.version_url;
-    }
-    output_1.default.normal(texts_1.TXT_ARTIFACT_SCANNING_DIR, false);
+    const artifactVersion = !artifactVersionId
+        ? await client.createArtifactVersion(workspace, artifactId, version, options.note, options.agentNote)
+        : await client.getArtifactVersion(workspace, artifactId, artifactVersionId);
+    const url = artifactVersion.version_url;
+    artifactVersionId = artifactVersion.id;
+    say(texts_1.TXT_ARTIFACT_SCANNING_DIR, false);
     const stat = fs_1.default.statSync(dirPath);
     let entries;
     if (stat.isDirectory()) {
@@ -106,6 +103,10 @@ commandArtifactPublish.action(async (id, path, options) => {
         dirPath = parentPath;
     }
     const outputSuccess = () => {
+        if (options.format === 'json') {
+            output_1.default.json(artifactVersion);
+            output_1.default.exitNormal();
+        }
         output_1.default.object({
             Version: `${identifier}:${version}`,
             URL: url || '-',
@@ -114,16 +115,16 @@ commandArtifactPublish.action(async (id, path, options) => {
         output_1.default.exitNormal();
     };
     if (!entries.length) {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_NO_ENTRIES_FOUND);
+        say(texts_1.TXT_ARTIFACT_NO_ENTRIES_FOUND);
         outputSuccess();
     }
     else if (entries.length === 1) {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_ONE_ENTRY_FOUND);
+        say(texts_1.TXT_ARTIFACT_ONE_ENTRY_FOUND);
     }
     else {
-        output_1.default.normal((0, texts_1.TXT_ARTIFACT_ENTRIES_FOUND)(entries.length));
+        say((0, texts_1.TXT_ARTIFACT_ENTRIES_FOUND)(entries.length));
     }
-    output_1.default.normal((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(0));
+    say((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(0));
     const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${v4()}.zip`);
     const clearZip = () => {
         try {
@@ -138,11 +139,9 @@ commandArtifactPublish.action(async (id, path, options) => {
         let proc = 0;
         await (0, utils_1.createZip)(dirPath, zipPath, entries, () => {
             proc += 1;
-            output_1.default.clearPreviousLine();
-            output_1.default.normal((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(proc));
+            say((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(proc), true, true);
         });
-        output_1.default.clearPreviousLine();
-        output_1.default.normal(texts_1.TXT_ARTIFACT_ZIPPED);
+        say(texts_1.TXT_ARTIFACT_ZIPPED, true, true);
         blob = await fs_1.default.openAsBlob(zipPath);
     }
     catch (err) {
@@ -151,10 +150,9 @@ commandArtifactPublish.action(async (id, path, options) => {
         output_1.default.exitError(texts_1.ERR_SWW);
     }
     try {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_UPLOADING);
+        say(texts_1.TXT_ARTIFACT_UPLOADING);
         await client.createArtifactVersionZip(workspace, artifactId, artifactVersionId, blob);
-        output_1.default.clearPreviousLine();
-        output_1.default.normal(texts_1.TXT_ARTIFACT_UPLOADED);
+        say(texts_1.TXT_ARTIFACT_UPLOADED, true, true);
         clearZip();
         outputSuccess();
     }

package/distTs/src/command/artifact/version/create.js

@@ -21,6 +21,7 @@ commandArtifactVersionCreate.option('--note <note>', texts_1.OPTION_ARTIFACT_VER
 commandArtifactVersionCreate.option('--agent-note <note>', texts_1.OPTION_ARTIFACT_VERSION_AGENT_NOTE);
 commandArtifactVersionCreate.option('--from <version>', texts_1.OPTION_ARTIFACT_VERSION_FROM);
 commandArtifactVersionCreate.argument('<identifier>', texts_1.OPTION_ARTIFACT_ID);
+commandArtifactVersionCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactVersionCreate.action(async (id, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -64,6 +65,10 @@ commandArtifactVersionCreate.action(async (id, options) => {
         output_1.default.exitError(texts_1.ERR_ARTIFACT_VERSION_EXISTS_NO_FORCE);
     }
     const d = await client.createArtifactVersion(workspace, artifactId, version, options.note, options.agentNote, options.from);
+    if (options.format === 'json') {
+        output_1.default.json(d);
+        output_1.default.exitNormal();
+    }
     const url = d.version_url;
     output_1.default.object({
         Version: `${identifier}:${version}`,

package/distTs/src/command/config/get/tunnel.js

@@ -7,13 +7,18 @@ const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandConfigGetTunnel = (0, utils_1.newCommand)('tunnel', texts_1.DESC_COMMAND_CONFIG_GET_TUNNEL);
+const commandConfigGetTunnel = (0, utils_1.newCommand)('tunnel', texts_1.DESC_COMMAND_CONFIG_GET_TUNNEL, { examples: texts_1.EXAMPLE_CONFIG_GET_TUNNEL });
 commandConfigGetTunnel.argument('<name>', texts_1.OPTION_NAME);
-commandConfigGetTunnel.action((name) => {
+commandConfigGetTunnel.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandConfigGetTunnel.action((name, options) => {
     if (!cfg_1.default.hasTunnel(name)) {
         output_1.default.exitError((0, texts_1.ERR_TUNNEL_NOT_FOUND)(name));
     }
-    output_1.default.configTunnel(cfg_1.default.getTunnel(name));
+    if (options.format === 'json') {
+        output_1.default.json(cfg_1.default.getTunnel(name));
+    }
+    else
+        output_1.default.configTunnel(cfg_1.default.getTunnel(name));
     output_1.default.exitNormal();
 });
 exports.default = commandConfigGetTunnel;

package/distTs/src/command/config/get/tunnels.js

@@ -7,9 +7,14 @@ const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandConfigGetTunnels = (0, utils_1.newCommand)('tunnels', texts_1.DESC_COMMAND_CONFIG_GET_TUNNELS);
-commandConfigGetTunnels.action(() => {
-    output_1.default.configTunnels(cfg_1.default.getTunnels());
+const commandConfigGetTunnels = (0, utils_1.newCommand)('tunnels', texts_1.DESC_COMMAND_CONFIG_GET_TUNNELS, { examples: texts_1.EXAMPLE_CONFIG_GET_TUNNELS });
+commandConfigGetTunnels.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandConfigGetTunnels.action((options) => {
+    if (options.format === 'json') {
+        output_1.default.json(cfg_1.default.getTunnels());
+    }
+    else
+        output_1.default.configTunnels(cfg_1.default.getTunnels());
     output_1.default.exitNormal();
 });
 exports.default = commandConfigGetTunnels;

package/distTs/src/command/discover.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const discovery_1 = require("../discovery");
 const output_1 = __importDefault(require("../output"));
+const cliError_1 = __importDefault(require("../cliError"));
 const texts_1 = require("../texts");
 const utils_1 = require("../utils");
 const commandDiscover = (0, utils_1.newCommand)('discover', texts_1.DESC_COMMAND_DISCOVER, {
@@ -13,22 +14,19 @@ const commandDiscover = (0, utils_1.newCommand)('discover', texts_1.DESC_COMMAND
     helpText: texts_1.HELP_COMMAND_DISCOVER,
 });
 commandDiscover.skipPre = true;
+commandDiscover.defaultErrorFormat = 'json';
 commandDiscover.showSuggestionAfterError(false);
-commandDiscover.configureOutput({
-    outputError: (message) => output_1.default.json({
-        error: {
-            code: 'usage_error',
-            message: message.trim(),
-            hint: texts_1.TXT_DISCOVER_USAGE_HINT,
-        },
-    }),
-});
 commandDiscover.argument('[command...]', texts_1.OPTION_DISCOVER_COMMAND);
 commandDiscover.option('--full', texts_1.OPTION_DISCOVER_FULL);
 commandDiscover.action((path, options, command) => {
     const result = (0, discovery_1.discoverCommands)(command.parent, path, (0, utils_1.getVersion)(), options.full);
-    output_1.default.json(result);
-    if ('error' in result)
+    if (result.error) {
+        const { code, message, hint } = result.error;
+        output_1.default.writeError(new cliError_1.default(code, message, hint), 'json');
         process.exitCode = 1;
+    }
+    else {
+        output_1.default.json(result);
+    }
 });
 exports.default = commandDiscover;

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

@@ -20,6 +20,7 @@ commandDistroCreate.option('-i, --identifier <identifier>', texts_1.OPT_COMMAND_
 commandDistroCreate.option('-n, --name <name>', texts_1.OPT_COMMAND_DISTRO_NAME);
 commandDistroCreate.option('--note <note>', texts_1.OPT_COMMAND_DISTRO_NOTE);
 commandDistroCreate.option('--agent-note <note>', texts_1.OPT_COMMAND_DISTRO_AGENT_NOTE);
+commandDistroCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroCreate.action(async (options) => {
     const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -43,6 +44,10 @@ commandDistroCreate.action(async (options) => {
     if (project && scope === distro_1.SCOPE.PROJECT)
         body.project_name = project;
     const result = await client.createDistro(workspace, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.identifier(result.identifier);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_DISTRO_CREATED);

package/distTs/src/command/distro/route/create.js

@@ -24,6 +24,7 @@ commandDistroRouteCreate.option('--note <note>', texts_1.OPT_COMMAND_ROUTE_NOTE)
 commandDistroRouteCreate.option('--agent-note <note>', texts_1.OPT_COMMAND_ROUTE_AGENT_NOTE);
 commandDistroRouteCreate.option('--target <targets...>', texts_1.OPT_COMMAND_ROUTE_TARGET);
 commandDistroRouteCreate.argument('<identifier>', texts_1.OPT_COMMAND_DISTRO_IDENTIFIER);
+commandDistroRouteCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroRouteCreate.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -53,6 +54,10 @@ commandDistroRouteCreate.action(async (identifier, options) => {
     }
     body.targets = await input_1.default.routeTarget(client, workspace, scope === distro_1.SCOPE.PROJECT ? project : null, options.target);
     const result = await client.createRoute(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, data.distribution_id, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.id(result.id);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_ROUTE_CREATED);

package/distTs/src/command/distro/route/update.js

@@ -25,6 +25,7 @@ commandDistroRouteUpdate.option('--agent-note <note>', texts_1.OPT_COMMAND_ROUTE
 commandDistroRouteUpdate.option('--target <targets...>', texts_1.OPT_COMMAND_ROUTE_TARGET);
 commandDistroRouteUpdate.argument('<identifier>', texts_1.OPT_COMMAND_DISTRO_IDENTIFIER);
 commandDistroRouteUpdate.argument('<route-id>', texts_1.OPT_COMMAND_ROUTE_ID);
+commandDistroRouteUpdate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroRouteUpdate.action(async (identifier, routeId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -82,6 +83,10 @@ commandDistroRouteUpdate.action(async (identifier, routeId, options) => {
         output_1.default.exitError(texts_1.ERR_COMMAND_NO_UPDATE);
     }
     const result = await client.updateRoute(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, data.distribution_id, routeId, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.id(result.id);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_ROUTE_UPDATED);

package/distTs/src/command/distro/update.js

@@ -22,6 +22,7 @@ commandDistroUpdate.option('--agent-note <note>', texts_1.OPT_COMMAND_DISTRO_AGE
 commandDistroUpdate.option('--enable', texts_1.OPT_COMMAND_DISTRO_ENABLE);
 commandDistroUpdate.option('--disable', texts_1.OPT_COMMAND_DISTRO_DISABLE);
 commandDistroUpdate.argument('<identifier>', texts_1.OPT_COMMAND_DISTRO_IDENTIFIER);
+commandDistroUpdate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroUpdate.action(async (identifier, options) => {
     if (options.enable && options.disable) {
         output_1.default.exitError(texts_1.ERR_COMMAND_DISTRO_ENABLE_DISABLE);
@@ -59,6 +60,10 @@ commandDistroUpdate.action(async (identifier, options) => {
         output_1.default.exitError(texts_1.ERR_COMMAND_DISTRO_NOT_FOUND);
     }
     const result = await client.updateDistribution(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, data.distribution_id, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.identifier(result.identifier);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_DISTRO_UPDATED);

package/distTs/src/command/domain/search.js

@@ -20,12 +20,16 @@ const sort = (arr, sort) => {
         return 0;
     });
 };
-const commandDomainSearch = (0, utils_1.newCommand)('search', texts_1.DESC_COMMAND_DOMAIN_SEARCH);
+const commandDomainSearch = (0, utils_1.newCommand)('search', texts_1.DESC_COMMAND_DOMAIN_SEARCH, {
+    helpText: texts_1.HELP_DOMAIN_SEARCH_JSON,
+    examples: texts_1.EXAMPLE_DOMAIN_SEARCH,
+});
 commandDomainSearch.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandDomainSearch.option('-d, --tld <tld...>', texts_1.OPT_COMMAND_DOMAIN_BUY_TLD);
 commandDomainSearch.option('-s, --sort <name|price>', texts_1.OPT_COMMAND_DOMAIN_SORT);
 commandDomainSearch.option('-a, --only-available', texts_1.OPT_COMMAND_DOMAIN_ONLY_AVAILABLE);
 commandDomainSearch.argument('[domain|prompt]', texts_1.OPT_COMMAND_DOMAIN_PHRASE);
+commandDomainSearch.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDomainSearch.action(async (text, options) => {
     const onlyAvailable = options.onlyAvailable;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -38,12 +42,17 @@ commandDomainSearch.action(async (text, options) => {
     if (!prompt) {
         output_1.default.exitError(texts_1.TXT_COMMAND_DOMAIN_PROMPT_REQUIRED);
     }
-    output_1.default.arrowSign();
-    output_1.default.normal(`Searching...`);
+    let searchResponse = null;
+    let claimsResponse = null;
+    if (options.format !== 'json') {
+        output_1.default.arrowSign();
+        output_1.default.normal(`Searching...`);
+    }
     const matched = [];
     if ((0, utils_1.isValidDomain)(prompt)) {
         const subdomain = (0, utils_1.getSubdomain)(prompt);
         const claims = await client.domainClaimable(workspace, subdomain);
+        claimsResponse = claims;
         const claimable = claims.domains.find((c) => `${subdomain}.${c.domain}` === prompt);
         if (claimable && (!onlyAvailable || claimable.available)) {
             matched.push({
@@ -54,6 +63,7 @@ commandDomainSearch.action(async (text, options) => {
         }
         else {
             const search = await client.domainSearch(workspace, [prompt]);
+            searchResponse = search;
             const buyable = search.domains.find((d) => d.name === prompt);
             if (buyable &&
                 (!onlyAvailable || buyable.available)) {
@@ -67,6 +77,7 @@ commandDomainSearch.action(async (text, options) => {
     }
     else if ((0, utils_1.isValidSubdomain)(prompt)) {
         const claims = await client.domainClaimable(workspace, prompt);
+        claimsResponse = claims;
         const domains = [];
         const popularTlds = (0, utils_1.getPopularTlds)();
         const searchTlds = tlds.length > 0 ? tlds : popularTlds;
@@ -74,13 +85,15 @@ commandDomainSearch.action(async (text, options) => {
             domains.push(`${prompt}.${tld}`);
         });
         const search = await client.domainSearch(workspace, domains);
-        search.domains = search.domains.sort((a, b) => {
-            const aTld = (0, utils_1.getDomainTld)(a.name);
-            const bTld = (0, utils_1.getDomainTld)(b.name);
-            const aIdx = popularTlds.indexOf(aTld);
-            const bIdx = popularTlds.indexOf(bTld);
-            return aIdx < bIdx ? -1 : 1;
-        });
+        searchResponse = search;
+        if (options.format !== 'json')
+            search.domains = search.domains.sort((a, b) => {
+                const aTld = (0, utils_1.getDomainTld)(a.name);
+                const bTld = (0, utils_1.getDomainTld)(b.name);
+                const aIdx = popularTlds.indexOf(aTld);
+                const bIdx = popularTlds.indexOf(bTld);
+                return aIdx < bIdx ? -1 : 1;
+            });
         claims.domains.forEach((c) => {
             if (!onlyAvailable || c.available) {
                 const name = `${prompt}.${c.domain}`;
@@ -103,6 +116,14 @@ commandDomainSearch.action(async (text, options) => {
         });
     }
     const result = await client.domainSuggest(workspace, prompt, tlds, 5);
+    if (options.format === 'json') {
+        output_1.default.json({
+            search: searchResponse,
+            claims: claimsResponse,
+            suggestions: result,
+        });
+        output_1.default.exitNormal();
+    }
     output_1.default.clearPreviousLine();
     let hasAny = false;
     if (matched.length > 0) {

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

@@ -20,6 +20,7 @@ commandEnvironmentCreate.option('--icon <icon>', texts_1.OPTION_ENVIRONMENT_ICON
 commandEnvironmentCreate.option('--note <note>', texts_1.OPT_COMMAND_NOTE);
 commandEnvironmentCreate.option('--agent-note <note>', texts_1.OPT_COMMAND_AGENT_NOTE);
 commandEnvironmentCreate.argument('[name]', texts_1.OPTION_ENVIRONMENT_NAME);
+commandEnvironmentCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandEnvironmentCreate.action(async (name, options) => {
     const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -64,6 +65,10 @@ commandEnvironmentCreate.action(async (name, options) => {
     }
     const client = input_1.default.restApiTokenClient();
     const result = await client.createEnvironment(workspace, data);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.exitSuccess((0, texts_1.TXT_ENVIRONMENT_CREATED)(result.identifier, result.html_url));
 });
 exports.default = commandEnvironmentCreate;

package/distTs/src/command/environment/update.js

@@ -18,6 +18,7 @@ commandEnvironmentUpdate.option('--icon <icon>', texts_1.OPTION_ENVIRONMENT_ICON
 commandEnvironmentUpdate.option('--note <note>', texts_1.OPT_COMMAND_NOTE);
 commandEnvironmentUpdate.option('--agent-note <note>', texts_1.OPT_COMMAND_AGENT_NOTE);
 commandEnvironmentUpdate.argument('<identifier>', texts_1.OPTION_ENVIRONMENT_IDENTIFIER);
+commandEnvironmentUpdate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandEnvironmentUpdate.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const body = {};
@@ -53,6 +54,10 @@ commandEnvironmentUpdate.action(async (identifier, options) => {
     const environment_id = await input_1.default.environmentId(client, workspace, identifier, options, 
     /* strictProject */ true);
     const result = await client.updateEnvironment(workspace, environment_id, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.exitSuccess((0, texts_1.TXT_ENVIRONMENT_UPDATED)(result.identifier, result.html_url));
 });
 exports.default = commandEnvironmentUpdate;

package/distTs/src/command/sandbox/app/add.js

@@ -9,10 +9,12 @@ const input_1 = __importDefault(require("../../../input"));
 const output_1 = __importDefault(require("../../../output"));
 const commandSandboxAppAdd = (0, utils_1.newCommand)('add', texts_1.DESC_COMMAND_SANDBOX_APP_ADD, {
     examples: texts_1.EXAMPLE_SANDBOX_APP_ADD,
+    helpText: texts_1.HELP_SANDBOX_APP_ADD_JSON,
 });
 (0, utils_1.sandboxScopeOptions)(commandSandboxAppAdd);
 commandSandboxAppAdd.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxAppAdd.argument('<app-command>', texts_1.OPTION_SANDBOX_APP_COMMAND);
+commandSandboxAppAdd.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxAppAdd.action(async (identifier, app, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
@@ -20,9 +22,13 @@ commandSandboxAppAdd.action(async (identifier, app, options) => {
     const sandbox = await client.getSandbox(workspace, sandboxId);
     const apps = sandbox.apps || [];
     apps.push(app);
-    await client.updateSandbox(workspace, sandboxId, {
+    const updated = await client.updateSandbox(workspace, sandboxId, {
         apps,
     });
+    if (options.format === 'json') {
+        output_1.default.json(updated);
+        output_1.default.exitNormal();
+    }
     output_1.default.exitSuccess(texts_1.TXT_SANDBOX_APP_ADDED);
 });
 exports.default = commandSandboxAppAdd;

package/distTs/src/command/sandbox/app/logs.js

@@ -20,18 +20,23 @@ const fetchLogsWithLimit = async (client, workspace, sandboxId, appId, limit) =>
         const { cursor, logs } = await client.getSandboxAppLogs(workspace, sandboxId, appId, c);
         l = l.concat(logs);
         if (l.length > limit)
-            return l.slice(0, limit).join('\n');
+            return l.slice(0, limit);
         if (!cursor || !logs.length)
-            return l.join('\n');
+            return l;
         c = cursor;
     } while (c != null);
-    return l.join('\n');
+    return l;
 };
+commandSandboxAppLogs.option('--format <text|jsonl>', texts_1.OPTION_FORMAT_JSONL);
 commandSandboxAppLogs.action(async (identifier, appId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
     const sandboxId = await input_1.default.sandboxId(client, workspace, options, identifier);
     const logs = await fetchLogsWithLimit(client, workspace, sandboxId, appId, options.limit || 100);
-    output_1.default.exitNormal(logs);
+    if (options.format === 'jsonl') {
+        logs.forEach((data) => output_1.default.json({ type: 'log', data }));
+        output_1.default.exitNormal();
+    }
+    output_1.default.exitNormal(logs.join('\n'));
 });
 exports.default = commandSandboxAppLogs;

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

@@ -51,8 +51,10 @@ commandSandboxCreate.option('--yaml <content|@path>', texts_1.OPTION_SANDBOX_YAM
 commandSandboxCreate.option('--wait-for-running [seconds]', texts_1.OPTION_SANDBOX_WAIT_RUNNING);
 commandSandboxCreate.option('--wait-for-configured [seconds]', texts_1.OPTION_SANDBOX_WAIT_CONFIGURED);
 commandSandboxCreate.option('--wait-for-apps [seconds]', texts_1.OPTION_SANDBOX_WAIT_APPS);
+commandSandboxCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxCreate.action(async (options) => {
     const humanId = require('human-id').default;
+    const say = output_1.default.progress(options.format === 'json');
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
     const scope = input_1.default.scope(project, options.scope, options.environment, true);
@@ -78,7 +80,7 @@ commandSandboxCreate.action(async (options) => {
         const body = {
             yaml: Buffer.from(yaml, 'utf8').toString('base64'),
         };
-        output_1.default.normal((0, texts_1.TXT_SANDBOX_CREATING)());
+        say((0, texts_1.TXT_SANDBOX_CREATING)());
         result = await client.createSandboxByYaml(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, body, environmentId);
     }
     else {
@@ -143,12 +145,12 @@ commandSandboxCreate.action(async (options) => {
         if (options.appDir) {
             body.app_dir = options.appDir;
         }
-        output_1.default.normal((0, texts_1.TXT_SANDBOX_CREATING)(body.name, body.identifier));
+        say((0, texts_1.TXT_SANDBOX_CREATING)(body.name, body.identifier));
         result = await client.createSandbox(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, body);
     }
     const sandboxId = result.id;
     if (options.waitForRunning) {
-        output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_RUNNING);
+        say(texts_1.TXT_SANDBOX_WAITING_RUNNING);
         const timeout = parseInt(options.waitForRunning, 10) || 300;
         try {
             const status = await client.sandboxWaitForRunning(workspace, sandboxId, timeout);
@@ -161,7 +163,7 @@ commandSandboxCreate.action(async (options) => {
         }
     }
     if (options.waitForConfigured) {
-        output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_SETUP);
+        say(texts_1.TXT_SANDBOX_WAITING_SETUP);
         const timeout = parseInt(options.waitForConfigured, 10) || 300;
         try {
             const status = await client.sandboxWaitForConfigured(workspace, sandboxId, timeout);
@@ -174,7 +176,7 @@ commandSandboxCreate.action(async (options) => {
         }
     }
     if (options.waitForApps) {
-        output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_APPS);
+        say(texts_1.TXT_SANDBOX_WAITING_APPS);
         const timeout = parseInt(options.waitForApps, 10) || 300;
         try {
             const status = await client.sandboxWaitForApps(workspace, sandboxId, timeout);
@@ -195,6 +197,12 @@ commandSandboxCreate.action(async (options) => {
             output_1.default.exitError(texts_1.ERR_SANDBOX_RUNNING_TIMEOUT);
         }
     }
+    if (options.format === 'json') {
+        if (options.waitForRunning || options.waitForConfigured || options.waitForApps)
+            result = await client.getSandbox(workspace, sandboxId);
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.dim('Identifier:   ', false);
     output_1.default.cyan(result.identifier);
     output_1.default.dim('SSH:          ', false);

package/distTs/src/command/sandbox/endpoint/add.js

@@ -10,6 +10,7 @@ const input_1 = __importDefault(require("../../../input"));
 const tunnel_1 = require("../../../types/tunnel");
 const commandSandboxEndpointAdd = (0, utils_1.getBasicCommandSandboxEndpoint)('add', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_ADD, { examples: texts_1.EXAMPLE_SANDBOX_ENDPOINT_CREATE });
 commandSandboxEndpointAdd.alias('create');
+commandSandboxEndpointAdd.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandSandboxEndpointAdd.action(async (identifier, options) => {
     const humanId = require('human-id').default;
     let name = options.name;
@@ -32,6 +33,10 @@ commandSandboxEndpointAdd.action(async (identifier, options) => {
         endpoints: updatedEndpoints,
     });
     const addedEndpoint = (updatedSandbox.endpoints || []).find((ep) => ep.name === name);
+    if (options.format === 'json') {
+        output_1.default.json(addedEndpoint);
+        output_1.default.exitNormal();
+    }
     output_1.default.object({
         Name: name,
         Url: addedEndpoint.endpoint_url || '-',

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

@@ -7,13 +7,18 @@ const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const commandSandboxExecCommand = (0, utils_1.newCommand)('command', texts_1.DESC_COMMAND_SANDBOX_EXEC_COMMAND, { examples: texts_1.EXAMPLE_SANDBOX_EXEC_COMMAND });
+const finishExec_1 = require("../finishExec");
+const commandSandboxExecCommand = (0, utils_1.newCommand)('command', texts_1.DESC_COMMAND_SANDBOX_EXEC_COMMAND, {
+    helpText: texts_1.HELP_SANDBOX_EXEC_COMMAND_JSONL,
+    examples: texts_1.EXAMPLE_SANDBOX_EXEC_COMMAND,
+});
 commandSandboxExecCommand.alias('cmd');
 (0, utils_1.sandboxScopeOptions)(commandSandboxExecCommand);
 commandSandboxExecCommand.option('--runtime <runtime>', texts_1.OPTION_SANDBOX_RUNTIME);
 commandSandboxExecCommand.option('--wait', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxExecCommand.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecCommand.argument('<command>');
+commandSandboxExecCommand.option('--format <text|jsonl>', texts_1.OPTION_FORMAT_JSONL);
 commandSandboxExecCommand.action(async (identifier, command, options) => {
     output_1.default.handleSignals();
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -24,39 +29,19 @@ commandSandboxExecCommand.action(async (identifier, command, options) => {
         command,
         runtime,
     });
-    output_1.default.gray((0, texts_1.TXT_SANDBOX_EXEC_ID)(cmdResult.id));
+    if (options.format === 'jsonl') {
+        output_1.default.json({ type: 'command', command: cmdResult });
+    }
+    else {
+        output_1.default.gray((0, texts_1.TXT_SANDBOX_EXEC_ID)(cmdResult.id));
+    }
     if (!options.wait) {
+        if (options.format === 'jsonl')
+            output_1.default.exitNormal();
         output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_EXEC_BACKGROUND)(identifier, cmdResult.id));
     }
     else {
-        const body = await client.streamSandboxCommandLogs(workspace, sandboxId, cmdResult.id);
-        body.on('data', (data) => {
-            if (data) {
-                try {
-                    const str = data.toString('utf8').split('\n');
-                    str.forEach((s) => {
-                        const json = JSON.parse(s);
-                        if (json.data)
-                            output_1.default.data(json.data);
-                    });
-                }
-                catch {
-                    // do nothing
-                }
-            }
-        });
-        body.on('close', async () => {
-            const cmdExit = await client.getSandboxCommand(workspace, sandboxId, cmdResult.id);
-            if (cmdExit.status === utils_1.SANDBOX_EXEC_STATUS.SUCCESSFUL) {
-                output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_EXEC_SUCCESS)(identifier, cmdResult.id));
-            }
-            else if (cmdExit.status === utils_1.SANDBOX_EXEC_STATUS.INPROGRESS) {
-                output_1.default.exitNormal((0, texts_1.TXT_SANDBOX_EXEC_INPROGRESS)(identifier, cmdResult.id));
-            }
-            else {
-                output_1.default.exitError((0, texts_1.TXT_SANDBOX_EXEC_FAILED)(identifier, cmdResult.id));
-            }
-        });
+        await (0, finishExec_1.finishExec)(client, workspace, sandboxId, identifier, cmdResult.id, true, options.format === 'jsonl');
     }
 });
 exports.default = commandSandboxExecCommand;