bdy 1.25.13-dev → 1.25.14-dev

package/distTs/src/command/agent/target/enable.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentTargetEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_TARGET_ENABLE);
-commandAgentTargetEnable.action(async () => {
+const commandAgentTargetEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_TARGET_ENABLE, { requiredScopes: [] });
+commandAgentTargetEnable.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTargetEnable.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTargetEnable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -18,7 +19,7 @@ commandAgentTargetEnable.action(async () => {
     try {
         const api = new ApiAgent(commandAgentTargetEnable.agentPort || 0);
         await api.enableAgentTarget();
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_TARGET_ENABLED);
+        output_1.default.exitResult(options.format === 'json', { target: true }, texts_1.TXT_AGENT_TARGET_ENABLED);
     }
     catch (err) {
         output_1.default.exitError(err);

package/distTs/src/command/agent/target/status.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentTargetStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TARGET_STATUS, { examples: texts_1.EXAMPLE_AGENT_TARGET_STATUS });
+const commandAgentTargetStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TARGET_STATUS, { requiredScopes: [], examples: texts_1.EXAMPLE_AGENT_TARGET_STATUS });
 commandAgentTargetStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentTargetStatus.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;

package/distTs/src/command/agent/tunnel/disable.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentTunnelDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_TUNNELING_DISABLE);
-commandAgentTunnelDisable.action(async () => {
+const commandAgentTunnelDisable = (0, utils_1.newCommand)('disable', texts_1.DESC_COMMAND_AGENT_TUNNELING_DISABLE, { requiredScopes: [] });
+commandAgentTunnelDisable.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTunnelDisable.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTunnelDisable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -18,7 +19,7 @@ commandAgentTunnelDisable.action(async () => {
     try {
         const api = new ApiAgent(commandAgentTunnelDisable.agentPort || 0);
         await api.disableAgentTunneling();
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_TUNNELING_DISABLED);
+        output_1.default.exitResult(options.format === 'json', { tunneling: false }, texts_1.TXT_AGENT_TUNNELING_DISABLED);
     }
     catch (err) {
         output_1.default.exitError(err);

package/distTs/src/command/agent/tunnel/enable.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentTunnelEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_TUNNELING_ENABLE);
-commandAgentTunnelEnable.action(async () => {
+const commandAgentTunnelEnable = (0, utils_1.newCommand)('enable', texts_1.DESC_COMMAND_AGENT_TUNNELING_ENABLE, { requiredScopes: [] });
+commandAgentTunnelEnable.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTunnelEnable.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTunnelEnable.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -18,7 +19,7 @@ commandAgentTunnelEnable.action(async () => {
     try {
         const api = new ApiAgent(commandAgentTunnelEnable.agentPort || 0);
         await api.enableAgentTunneling();
-        output_1.default.exitSuccess(texts_1.TXT_AGENT_TUNNELING_ENABLED);
+        output_1.default.exitResult(options.format === 'json', { tunneling: true }, texts_1.TXT_AGENT_TUNNELING_ENABLED);
     }
     catch (err) {
         output_1.default.exitError(err);

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

@@ -5,18 +5,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const output_1 = __importDefault(require("../../../output"));
+const cliError_1 = __importDefault(require("../../../cliError"));
 const texts_1 = require("../../../texts");
 const tunnel_1 = require("../../../types/tunnel");
 const commandAgentTunnelHttp = (0, utils_1.getBasicCommandHttp)({
+    requiredScopes: [],
     examples: (0, texts_1.EXAMPLE_TUNNEL_HTTP)(true),
 });
 commandAgentTunnelHttp.description(texts_1.DESC_COMMAND_AGENT_TUNNEL_HTTP);
 commandAgentTunnelHttp.option('-f, --follow', texts_1.OPTION_FOLLOW);
+commandAgentTunnelHttp.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentTunnelHttp.argument('[protocol://host:port]', texts_1.OPTION_TARGET);
 commandAgentTunnelHttp.action(async (target, options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     const AgentSocketTunnel = require('../../../agent/socket/tunnel').default;
     const Cfg = require('../../../tunnel/cfg').default;
+    const json = options.format === 'json';
+    if (json && options.follow) {
+        throw new cliError_1.default('usage_error', texts_1.ERR_FOLLOW_WITH_JSON);
+    }
     if (!commandAgentTunnelHttp.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -25,7 +32,8 @@ commandAgentTunnelHttp.action(async (target, options) => {
     }
     const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.HTTP, target, options, true);
     try {
-        await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
+        if (!json)
+            await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
         const api = new ApiAgent(commandAgentTunnelHttp.agentPort || 0);
         const data = await api.addTunnel(prepared);
         if (options.follow) {
@@ -35,7 +43,7 @@ commandAgentTunnelHttp.action(async (target, options) => {
             output_1.default.tunnel(tunnel);
         }
         else {
-            output_1.default.exitSuccess((0, texts_1.TXT_TUNNEL_STARTED)(data.type));
+            output_1.default.exitResult(json, data, (0, texts_1.TXT_TUNNEL_STARTED)(data.type));
         }
     }
     catch (err) {

package/distTs/src/command/agent/tunnel/list.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandAgentTunnelList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_AGENT_TUNNEL_LIST, { examples: texts_1.EXAMPLE_AGENT_TUNNEL_LIST });
+const commandAgentTunnelList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_AGENT_TUNNEL_LIST, { requiredScopes: [], examples: texts_1.EXAMPLE_AGENT_TUNNEL_LIST });
 commandAgentTunnelList.alias('ls');
 commandAgentTunnelList.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentTunnelList.action(async (options) => {

package/distTs/src/command/agent/tunnel/remove.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandAgentTunnelRemove = (0, utils_1.newCommand)('rm', texts_1.DESC_COMMAND_AGENT_TUNNEL_REMOVE, { examples: texts_1.EXAMPLE_AGENT_TUNNEL_REMOVE });
+const commandAgentTunnelRemove = (0, utils_1.newCommand)('rm', texts_1.DESC_COMMAND_AGENT_TUNNEL_REMOVE, { requiredScopes: [], examples: texts_1.EXAMPLE_AGENT_TUNNEL_REMOVE });
 commandAgentTunnelRemove.argument('<id>', texts_1.OPTION_ID);
-commandAgentTunnelRemove.action(async (id) => {
+commandAgentTunnelRemove.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTunnelRemove.action(async (id, options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTunnelRemove.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -19,7 +20,7 @@ commandAgentTunnelRemove.action(async (id) => {
     try {
         const api = new ApiAgent(commandAgentTunnelRemove.agentPort || 0);
         await api.stopTunnel(id);
-        output_1.default.exitSuccess(texts_1.TXT_TUNNEL_STOPPED);
+        output_1.default.exitResult(options.format === 'json', { removed: id }, texts_1.TXT_TUNNEL_STOPPED);
     }
     catch (err) {
         output_1.default.exitError(err);

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

@@ -3,12 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cliError_1 = __importDefault(require("../../../cliError"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandAgentTunnelStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_AGENT_TUNNEL_START, { examples: texts_1.EXAMPLE_AGENT_TUNNEL_START });
+const commandAgentTunnelStart = (0, utils_1.newCommand)('start', texts_1.DESC_COMMAND_AGENT_TUNNEL_START, { requiredScopes: [], examples: texts_1.EXAMPLE_AGENT_TUNNEL_START });
 commandAgentTunnelStart.argument('<name>', texts_1.OPTION_NAME);
-commandAgentTunnelStart.action(async (name) => {
+commandAgentTunnelStart.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTunnelStart.action(async (name, options) => {
+    const json = options.format === 'json';
     const ApiAgent = require('../../../tunnel/api/agent').default;
     const Cfg = require('../../../tunnel/cfg').default;
     if (!commandAgentTunnelStart.agentInstalled) {
@@ -18,14 +21,15 @@ commandAgentTunnelStart.action(async (name) => {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
     if (!Cfg.hasTunnel(name)) {
-        output_1.default.exitError((0, texts_1.ERR_TUNNEL_NOT_FOUND)(name));
+        output_1.default.exitError(new cliError_1.default('not_found', (0, texts_1.ERR_TUNNEL_NOT_FOUND)(name), texts_1.HINT_TUNNEL_CONFIG_LIST));
     }
     const prepared = Cfg.getTunnel(name);
     try {
-        await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
+        if (!json)
+            await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
         const api = new ApiAgent(commandAgentTunnelStart.agentPort || 0);
         const data = await api.addTunnel(prepared);
-        output_1.default.exitSuccess((0, texts_1.TXT_TUNNEL_STARTED)(data.type));
+        output_1.default.exitResult(json, data, (0, texts_1.TXT_TUNNEL_STARTED)(data.type));
     }
     catch (err) {
         output_1.default.exitError(err);

package/distTs/src/command/agent/tunnel/status.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const utils_1 = require("../../../utils");
-const commandAgentTunnelStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TUNNEL_STATUS, { examples: texts_1.EXAMPLE_AGENT_TUNNEL_STATUS });
+const commandAgentTunnelStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TUNNEL_STATUS, { requiredScopes: [], examples: texts_1.EXAMPLE_AGENT_TUNNEL_STATUS });
 commandAgentTunnelStatus.argument('[id]', texts_1.OPTION_ID);
 commandAgentTunnelStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentTunnelStatus.action(async (id, options) => {

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

@@ -5,18 +5,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const output_1 = __importDefault(require("../../../output"));
+const cliError_1 = __importDefault(require("../../../cliError"));
 const texts_1 = require("../../../texts");
 const tunnel_1 = require("../../../types/tunnel");
 const commandAgentTunnelTcp = (0, utils_1.getBasicCommandTcp)({
+    requiredScopes: [],
     examples: (0, texts_1.EXAMPLE_TUNNEL_TCP)(true),
 });
 commandAgentTunnelTcp.description(texts_1.DESC_COMMAND_AGENT_TUNNEL_TCP);
 commandAgentTunnelTcp.option('-f, --follow', texts_1.OPTION_FOLLOW);
+commandAgentTunnelTcp.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentTunnelTcp.argument('[host:port]', texts_1.OPTION_TARGET);
 commandAgentTunnelTcp.action(async (target, options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     const AgentSocketTunnel = require('../../../agent/socket/tunnel').default;
     const Cfg = require('../../../tunnel/cfg').default;
+    const json = options.format === 'json';
+    if (json && options.follow) {
+        throw new cliError_1.default('usage_error', texts_1.ERR_FOLLOW_WITH_JSON);
+    }
     if (!commandAgentTunnelTcp.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -25,7 +32,8 @@ commandAgentTunnelTcp.action(async (target, options) => {
     }
     const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.TCP, target, options, true);
     try {
-        await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
+        if (!json)
+            await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
         const api = new ApiAgent(commandAgentTunnelTcp.agentPort || 0);
         const data = await api.addTunnel(prepared);
         if (options.follow) {
@@ -35,7 +43,7 @@ commandAgentTunnelTcp.action(async (target, options) => {
             output_1.default.tunnel(tunnel);
         }
         else {
-            output_1.default.exitSuccess((0, texts_1.TXT_TUNNEL_STARTED)(data.type));
+            output_1.default.exitResult(json, data, (0, texts_1.TXT_TUNNEL_STARTED)(data.type));
         }
     }
     catch (err) {

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

@@ -5,18 +5,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const output_1 = __importDefault(require("../../../output"));
+const cliError_1 = __importDefault(require("../../../cliError"));
 const texts_1 = require("../../../texts");
 const tunnel_1 = require("../../../types/tunnel");
 const commandAgentTunnelTls = (0, utils_1.getBasicCommandTls)({
+    requiredScopes: [],
     examples: (0, texts_1.EXAMPLE_TUNNEL_TLS)(true),
 });
 commandAgentTunnelTls.description(texts_1.DESC_COMMAND_AGENT_TUNNEL_TLS);
 commandAgentTunnelTls.option('-f, --follow', texts_1.OPTION_FOLLOW);
+commandAgentTunnelTls.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentTunnelTls.argument('[host:port]', texts_1.OPTION_TARGET);
 commandAgentTunnelTls.action(async (target, options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     const AgentSocketTunnel = require('../../../agent/socket/tunnel').default;
     const Cfg = require('../../../tunnel/cfg').default;
+    const json = options.format === 'json';
+    if (json && options.follow) {
+        throw new cliError_1.default('usage_error', texts_1.ERR_FOLLOW_WITH_JSON);
+    }
     if (!commandAgentTunnelTls.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
@@ -25,7 +32,8 @@ commandAgentTunnelTls.action(async (target, options) => {
     }
     const prepared = await Cfg.prepareTunnel(tunnel_1.TUNNEL_TYPE.TLS, target, options, true);
     try {
-        await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
+        if (!json)
+            await output_1.default.spinner(texts_1.TXT_OPENING_TUNNEL);
         const api = new ApiAgent(commandAgentTunnelTls.agentPort || 0);
         const data = await api.addTunnel(prepared);
         if (options.follow) {
@@ -35,7 +43,7 @@ commandAgentTunnelTls.action(async (target, options) => {
             output_1.default.tunnel(tunnel);
         }
         else {
-            output_1.default.exitSuccess((0, texts_1.TXT_TUNNEL_STARTED)(data.type));
+            output_1.default.exitResult(json, data, (0, texts_1.TXT_TUNNEL_STARTED)(data.type));
         }
     }
     catch (err) {

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

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
-const commandAgentUninstall = (0, utils_1.newCommand)('uninstall', texts_1.DESC_COMMAND_AGENT_UNINSTALL);
+const commandAgentUninstall = (0, utils_1.newCommand)('uninstall', texts_1.DESC_COMMAND_AGENT_UNINSTALL, { requiredScopes: [] });
 commandAgentUninstall.option('-f, --force', texts_1.OPTION_CONFIRM_FORCE);
+commandAgentUninstall.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentUninstall.action(async (options) => {
     const AgentManager = require('../../agent/manager').default;
     const ApiBuddy = require('../../tunnel/api/buddy').default;
@@ -16,9 +17,10 @@ commandAgentUninstall.action(async (options) => {
     if (!hasRights) {
         output_1.default.exitError(texts_1.ERR_AGENT_ADMIN_RIGHTS);
     }
-    const confirmed = await output_1.default.confirmDestructive(options.force, texts_1.TXY_AGENT_CONFIRM_DELETE);
+    const json = options.format === 'json';
+    const confirmed = await output_1.default.confirmDestructive(options.force, texts_1.TXY_AGENT_CONFIRM_DELETE, json);
     if (!confirmed)
-        output_1.default.exitNormal();
+        output_1.default.exitResult(json, { uninstalled: false });
     try {
         const api = new ApiAgent(commandAgentUninstall.agentPort || 0);
         await api.markInactive();
@@ -60,6 +62,6 @@ commandAgentUninstall.action(async (options) => {
     catch {
         // do nothing
     }
-    output_1.default.exitSuccess(texts_1.TXT_AGENT_DISABLED);
+    output_1.default.exitResult(json, { uninstalled: true }, texts_1.TXT_AGENT_DISABLED);
 });
 exports.default = commandAgentUninstall;

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

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const utils_1 = require("../../utils");
-const commandAgentUpdate = (0, utils_1.newCommand)('update', texts_1.DESC_COMMAND_AGENT_UPDATE);
+const commandAgentUpdate = (0, utils_1.newCommand)('update', texts_1.DESC_COMMAND_AGENT_UPDATE, { requiredScopes: [] });
 commandAgentUpdate.hideVersionUpdate = true;
-commandAgentUpdate.action(async () => {
+commandAgentUpdate.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentUpdate.action(async (options) => {
+    const json = options.format === 'json';
     const AgentManager = require('../../agent/manager').default;
     const ApiAgent = require('../../tunnel/api/agent').default;
     const waitUntilAgentEnabled = require('../../agent/wait').default;
@@ -24,11 +26,17 @@ commandAgentUpdate.action(async () => {
     if (commandAgentUpdate.agentStatus?.updating) {
         output_1.default.exitError(texts_1.ERR_AGENT_UPDATE_IN_PROGRESS);
     }
-    output_1.default.normal(texts_1.TXT_UPDATING_AGENT);
+    if (!json)
+        output_1.default.normal(texts_1.TXT_UPDATING_AGENT);
     if (commandAgentUpdate.agentStandalone) {
         // app
         await AgentManager.system.killStandaloneProc();
-        AgentManager.system.startStandaloneProc();
+        // the standalone agent keeps running in this process: the result is
+        // printed once it is fetched and started, so a failure is the only output
+        AgentManager.system.startStandaloneProc(json, () => {
+            if (json)
+                output_1.default.json({ updated: true });
+        });
     }
     else {
         try {
@@ -37,7 +45,7 @@ commandAgentUpdate.action(async () => {
             await waitUntilAgentEnabled(api, 15000, () => {
                 output_1.default.exitError(texts_1.ERR_SWW_AGENT_UPDATING);
             }, () => {
-                output_1.default.exitSuccess(texts_1.TXT_AGENT_UPDATED);
+                output_1.default.exitResult(json, { updated: true }, texts_1.TXT_AGENT_UPDATED);
             });
         }
         catch {

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

@@ -6,10 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
-const commandAgentUser = (0, utils_1.newCommand)('user', texts_1.DESC_COMMAND_AGENT_USER);
+const commandAgentUser = (0, utils_1.newCommand)('user', texts_1.DESC_COMMAND_AGENT_USER, { requiredScopes: [] });
 commandAgentUser.argument('[user]', texts_1.OPTION_USER);
 commandAgentUser.argument('[password]', texts_1.OPTION_PASS);
-commandAgentUser.action(async (user, password) => {
+commandAgentUser.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentUser.action(async (user, password, options) => {
     const AgentManager = require('../../agent/manager').default;
     const hasAdminRights = await AgentManager.system.hasAdminRights();
     if (!hasAdminRights) {
@@ -29,6 +30,6 @@ commandAgentUser.action(async (user, password) => {
     else {
         u = user;
     }
-    output_1.default.exitSuccess((0, texts_1.TXT_AGENT_USER_CHANGED)(u));
+    output_1.default.exitResult(options.format === 'json', { user: u }, (0, texts_1.TXT_AGENT_USER_CHANGED)(u));
 });
 exports.default = commandAgentUser;

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
-const commandAgentVersion = (0, utils_1.newCommand)('version', texts_1.DESC_COMMAND_AGENT_VERSION, { examples: texts_1.EXAMPLE_AGENT_VERSION });
+const commandAgentVersion = (0, utils_1.newCommand)('version', texts_1.DESC_COMMAND_AGENT_VERSION, { requiredScopes: [], examples: texts_1.EXAMPLE_AGENT_VERSION });
 commandAgentVersion.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandAgentVersion.action(async (options) => {
     if (!commandAgentVersion.agentInstalled) {

package/distTs/src/command/api/info.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 });
+const cliError_1 = __importDefault(require("../../cliError"));
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
@@ -220,6 +221,7 @@ const chosen = (asked, names) => {
     return Number.isInteger(position) && position >= 1 ? names[position - 1] : undefined;
 };
 const commandApiInfo = (0, utils_1.newCommand)('info', texts_1.DESC_COMMAND_API_INFO, {
+    requiredScopes: [],
     helpText: texts_1.HELP_API_INFO_JSON,
     examples: texts_1.EXAMPLE_API_INFO,
 });
@@ -241,12 +243,12 @@ commandApiInfo.action(async (fm, filterUrl, options) => {
         (operation.path === filterUrl ||
             (0, utils_1.openApiPrepareUrl)(operation.path, workspace, project) === filterUrl));
     if (!wanted) {
-        output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_API_ENDPOINT_NOT_FOUND, texts_1.HINT_API_LIST));
         return;
     }
     const listed = await api.endpoint(wanted.method, wanted.path);
     if (!listed) {
-        output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_API_ENDPOINT_NOT_FOUND, texts_1.HINT_API_LIST));
         return;
     }
     const namesOf = (bodies) => bodies.flatMap((body) => [...orderedMembers(body)]);
@@ -299,7 +301,7 @@ commandApiInfo.action(async (fm, filterUrl, options) => {
         : undefined;
     const doc = member ? await api.endpoint(wanted.method, wanted.path, member) : listed;
     if (!doc) {
-        output_1.default.exitError(texts_1.ERR_API_ENDPOINT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_API_ENDPOINT_NOT_FOUND, texts_1.HINT_API_LIST));
         return;
     }
     const members = await memberMeta(api, doc);

package/distTs/src/command/api/list.js

@@ -26,6 +26,7 @@ const outputUrl = (operation, workspace, project) => {
         output_1.default.gray(operation.summary);
 };
 const commandApiList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_API_LIST, {
+    requiredScopes: [],
     examples: texts_1.EXAMPLE_API_LIST,
 });
 commandApiList.alias('ls');

package/distTs/src/command/artifact/composer/publish.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 });
+const cliError_1 = __importDefault(require("../../../cliError"));
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
@@ -24,9 +25,12 @@ commandArtifactComposerPublish.option('-c, --create', texts_1.OPTION_ARTIFACT_PU
 commandArtifactComposerPublish.option('--note <note>', texts_1.OPTION_ARTIFACT_VERSION_NOTE);
 commandArtifactComposerPublish.option('--agent-note <note>', texts_1.OPTION_ARTIFACT_VERSION_AGENT_NOTE);
 commandArtifactComposerPublish.option('--ignore <patterns>', texts_1.OPTION_ARTIFACT_IGNORE);
+commandArtifactComposerPublish.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactComposerPublish.argument('<identifier>', texts_1.OPTION_ARTIFACT_ID);
 commandArtifactComposerPublish.argument('<directory>', texts_1.OPTION_ARTIFACT_COMPOSE_PUBLISH_PATH);
 commandArtifactComposerPublish.action(async (id, path, options) => {
+    const json = options.format === 'json';
+    const say = output_1.default.progress(json);
     const dirPath = input_1.default.resolvePath(path);
     if (!fs_1.default.statSync(dirPath).isDirectory()) {
         output_1.default.exitError((0, texts_1.ERR_PATH_IS_NOT_DIRECTORY)(dirPath));
@@ -69,10 +73,10 @@ commandArtifactComposerPublish.action(async (id, path, options) => {
     const client = input_1.default.restApiTokenClient();
     const data = await client.getArtifactVersionByIdentifier(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, identifier, publishVersion);
     if (!data || !data.domain) {
-        output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_WORKSPACE_NOT_FOUND, texts_1.HINT_WORKSPACE_LIST));
     }
     if (scope === distro_1.SCOPE.PROJECT && !data.project_identifier) {
-        output_1.default.exitError(texts_1.ERR_PROJECT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_PROJECT_NOT_FOUND, texts_1.HINT_PROJECT_LIST));
     }
     let artifactId = data.artifact_id;
     if (!artifactId && !options.create) {
@@ -108,7 +112,7 @@ commandArtifactComposerPublish.action(async (id, path, options) => {
         // No --force here: a published composer version is not replaced, only a new one is added
         output_1.default.exitError(texts_1.ERR_ARTIFACT_VERSION_EXISTS_NO_FORCE);
     }
-    output_1.default.normal(texts_1.TXT_ARTIFACT_SCANNING_DIR, false);
+    say(texts_1.TXT_ARTIFACT_SCANNING_DIR, false);
     // At least composer.json is in there, so an empty listing is not a case to handle
     const scanned = fs_1.default.readdirSync(dirPath, {
         withFileTypes: true,
@@ -116,9 +120,9 @@ commandArtifactComposerPublish.action(async (id, path, options) => {
     });
     // composer.json is kept whatever --ignore says - the package is not publishable without it
     const entries = (0, utils_1.filterIgnoredEntries)(dirPath, scanned, [...utils_1.ARTIFACT_IGNORE_DEFAULT, ...(0, utils_1.parseIgnorePatterns)(options.ignore)], ['composer.json']);
-    output_1.default.normal((0, texts_1.TXT_ARTIFACT_ENTRIES_FOUND)(entries.length));
+    say((0, texts_1.TXT_ARTIFACT_ENTRIES_FOUND)(entries.length));
     if (scanned.length !== entries.length) {
-        output_1.default.normal((0, texts_1.TXT_ARTIFACT_IGNORED_ENTRIES)(scanned.length - entries.length));
+        say((0, texts_1.TXT_ARTIFACT_IGNORED_ENTRIES)(scanned.length - entries.length));
     }
     // The path declared in composer.json wins, otherwise the readme lying next to it
     const declaredReadme = (0, utils_1.getComposerReadmePath)(composerJson);
@@ -128,16 +132,16 @@ commandArtifactComposerPublish.action(async (id, path, options) => {
     const readmeFile = (0, utils_1.findArtifactReadme)(dirPath, declaredReadme);
     let readme;
     if (!readmeFile) {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_README_NOT_FOUND);
+        say(texts_1.TXT_ARTIFACT_README_NOT_FOUND);
     }
     else if (readmeFile.content === undefined) {
-        output_1.default.normal((0, texts_1.TXT_ARTIFACT_README_TOO_LARGE)((0, path_1.relative)(dirPath, readmeFile.path), utils_1.ARTIFACT_README_SIZE_LIMIT));
+        say((0, texts_1.TXT_ARTIFACT_README_TOO_LARGE)((0, path_1.relative)(dirPath, readmeFile.path), utils_1.ARTIFACT_README_SIZE_LIMIT));
     }
     else {
         readme = readmeFile.content;
-        output_1.default.normal((0, texts_1.TXT_ARTIFACT_README_FOUND)((0, path_1.relative)(dirPath, readmeFile.path)));
+        say((0, texts_1.TXT_ARTIFACT_README_FOUND)((0, path_1.relative)(dirPath, readmeFile.path)));
     }
-    output_1.default.normal((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(0));
+    say((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(0));
     let root;
     const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${(0, uuid_1.v4)()}.zip`);
     const clearZip = () => {
@@ -152,11 +156,9 @@ commandArtifactComposerPublish.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);
         root = await fs_1.default.openAsBlob(zipPath);
     }
     catch (err) {
@@ -165,11 +167,14 @@ commandArtifactComposerPublish.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);
         const d = await client.createArtifactComposerVersion(workspace, artifactId, root, composer, readme, options.note, options.agentNote);
         clearZip();
-        output_1.default.clearPreviousLine();
-        output_1.default.normal(texts_1.TXT_ARTIFACT_UPLOADED);
+        if (json) {
+            output_1.default.json(d);
+            output_1.default.exitNormal();
+        }
+        say(texts_1.TXT_ARTIFACT_UPLOADED, true, true);
         output_1.default.object({
             Version: `${identifier}:${d?.version || publishVersion}`,
             // A composer version has no public preview endpoint the way a bucket artifact does, so the

package/distTs/src/command/artifact/delete.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 });
+const cliError_1 = __importDefault(require("../../cliError"));
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
@@ -17,6 +18,7 @@ commandArtifactDelete.option('-w, --workspace <domain>', texts_1.OPTION_REST_API
 commandArtifactDelete.option('--scope <scope>', texts_1.OPT_COMMAND_SCOPE);
 commandArtifactDelete.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandArtifactDelete.option('-f, --force', texts_1.OPTION_CONFIRM_FORCE);
+commandArtifactDelete.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactDelete.argument('<identifier>', texts_1.OPT_COMMAND_ARTIFACT_IDENTIFIER);
 commandArtifactDelete.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -25,18 +27,19 @@ commandArtifactDelete.action(async (identifier, options) => {
     const client = input_1.default.restApiTokenClient();
     const data = await client.getArtifactVersionByIdentifier(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, identifier);
     if (!data || !data.domain) {
-        output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_WORKSPACE_NOT_FOUND, texts_1.HINT_WORKSPACE_LIST));
     }
     if (!data.artifact_id) {
-        output_1.default.exitError(texts_1.ERR_ARTIFACT_NOT_FOUND);
+        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_ARTIFACT_NOT_FOUND, texts_1.HINT_ARTIFACT_LIST));
     }
-    const confirmed = await output_1.default.confirmDestructive(options.force, (0, texts_1.TXT_ARTIFACT_DELETE_CONFIRM)(identifier));
+    const json = options.format === 'json';
+    const confirmed = await output_1.default.confirmDestructive(options.force, (0, texts_1.TXT_ARTIFACT_DELETE_CONFIRM)(identifier), json);
     if (confirmed) {
         await client.deleteArtifact(workspace, data.artifact_id);
-        output_1.default.exitSuccess(texts_1.TXT_ARTIFACT_DELETED);
+        output_1.default.exitResult(json, { deleted: identifier }, texts_1.TXT_ARTIFACT_DELETED);
     }
     else {
-        output_1.default.exitNormal();
+        output_1.default.exitResult(json, { deleted: null });
     }
 });
 exports.default = commandArtifactDelete;