bdy 1.16.21-dev → 1.16.23-dev

package/distTs/src/command/package/download.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const output_1 = __importDefault(require("../../output"));
 const logger_1 = __importDefault(require("../../logger"));
 const path_1 = require("path");
@@ -26,11 +25,10 @@ commandPackageDownload.option('-r, --replace', texts_1.OPTION_PACKAGE_DOWNLOAD_R
 commandPackageDownload.argument('<identifier>', texts_1.OPTION_PACKAGE_ID);
 commandPackageDownload.argument('<directory>', texts_1.OPTION_PACKAGE_DOWNLOAD_PATH);
 commandPackageDownload.action(async (id, path, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
-    const client = new client_1.default(baseUrl, token);
     // eslint-disable-next-line prefer-const
     let { identifier, version } = input_1.default.packageSplitIdentifier(id);
     const data = await client.getPackageVersionByIdentifier(workspace, project, identifier, version);

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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
-const client_1 = __importDefault(require("../../api/client"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
@@ -16,11 +15,10 @@ commandPackageList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WO
 commandPackageList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandPackageList.alias('ls');
 commandPackageList.action(async (options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const response = await client.getPackages(workspace, project);
     if (!response.packages || response.packages.length === 0) {
         output_1.default.exitError(texts_1.ERR_COMMAND_PACKAGE_NO_PROJECTS);

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const output_1 = __importDefault(require("../../output"));
 const logger_1 = __importDefault(require("../../logger"));
 const fflate_1 = __importDefault(require("fflate"));
@@ -26,7 +25,6 @@ commandPackagePublish.argument('<identifier>', texts_1.OPTION_PACKAGE_ID);
 commandPackagePublish.argument('<directory>', texts_1.OPTION_PACKAGE_PUBLISH_PATH);
 commandPackagePublish.action(async (id, path, options) => {
     let dirPath = input_1.default.resolvePath(path);
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -34,7 +32,7 @@ commandPackagePublish.action(async (id, path, options) => {
     let { identifier, version } = input_1.default.packageSplitIdentifier(id);
     if (!version)
         version = (0, uuid_1.v4)();
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const data = await client.getPackageVersionByIdentifier(workspace, project, identifier, version);
     if (!data || !data.domain) {
         output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const format_1 = __importDefault(require("../../format"));
 const commandPipelineRun = (0, utils_1.newCommand)('run', texts_1.DESC_COMMAND_PIPELINE_RUN);
 commandPipelineRun.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -31,11 +30,10 @@ commandPipelineRun.option('--wait [minutes]', texts_1.OPTION_PIPELINE_RUN_WAIT);
 commandPipelineRun.argument('<identifier>', texts_1.OPTION_PIPELINE_RUN_ARGUMENT);
 commandPipelineRun.usage('<identifier> [options]');
 commandPipelineRun.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const data = await client.getPipelineByIdentifier(workspace, project, identifier);
     if (!data || !data.domain) {
         output_1.default.exitError(texts_1.ERR_WORKSPACE_NOT_FOUND);

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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
-const client_1 = __importDefault(require("../../api/client"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
@@ -15,17 +14,21 @@ commandProjectList.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandProjectList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandProjectList.alias('ls');
 commandProjectList.action(async (options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const response = await client.getProjects(workspace);
     if (!response.projects || response.projects.length === 0) {
         output_1.default.exitError(texts_1.ERR_PROJECT_NO_PROJECTS);
     }
-    const data = [['NAME', 'DISPLAY NAME', 'STATUS']];
+    const data = [['NAME', 'DISPLAY NAME', 'STATUS', 'URL']];
     for (const proj of response.projects) {
-        data.push([proj.name, proj.display_name, proj.status]);
+        data.push([
+            proj.name,
+            proj.display_name,
+            proj.status,
+            (0, utils_1.getAppProjectUrl)(baseUrl, workspace, proj.name),
+        ]);
     }
     output_1.default.table(data);
     output_1.default.exitNormal();

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cfg_1 = __importDefault(require("../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../output"));
-const client_1 = __importDefault(require("../../api/client"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const input_1 = __importDefault(require("../../input"));
@@ -17,10 +16,9 @@ commandProjectSet.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WOR
 commandProjectSet.argument('[project]', texts_1.ARG_COMMAND_PROJECT_NAME);
 commandProjectSet.action(async (projectName, options) => {
     output_1.default.handleSignals();
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const response = await client.getProjects(workspace);
     if (!response.projects || response.projects.length === 0) {
         output_1.default.exitError(texts_1.ERR_PROJECT_NO_PROJECTS);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const fdir_1 = require("fdir");
 const path_1 = require("path");
 const commandSandboxCp = (0, utils_1.newCommand)('cp', texts_1.DESC_COMMAND_SANDBOX_CP);
@@ -20,11 +19,10 @@ commandSandboxCp.option('-s, --silent', texts_1.OPTION_SANDBOX_CP_SILENT);
 commandSandboxCp.argument('<source>', texts_1.OPTION_SANDBOX_CP_SOURCE);
 commandSandboxCp.argument('<destination>', texts_1.OPTION_SANDBOX_CP_DEST);
 commandSandboxCp.action(async (source, destination, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const { identifier, remotePath } = input_1.default.restApiSandboxDestinationPath(destination);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const human_id_1 = __importDefault(require("human-id"));
 const VALID_RESOURCES = [
     '1x2',
@@ -39,18 +38,14 @@ commandSandboxCreate.option('--run-command <command>', texts_1.OPTION_SANDBOX_RU
 commandSandboxCreate.option('--app-dir <directory>', texts_1.OPTION_SANDBOX_APP_DIR);
 commandSandboxCreate.option('--app-type <type>', texts_1.OPTION_SANDBOX_APP_TYPE);
 commandSandboxCreate.option('--tag <tags...>', texts_1.OPTION_SANDBOX_TAGS);
-commandSandboxCreate.option('--wait-for-running', texts_1.OPTION_SANDBOX_WAIT_RUNNING);
-commandSandboxCreate.option('--wait-for-running-timeout <seconds>', texts_1.OPTION_SANDBOX_WAIT_TIMEOUT, '300');
-commandSandboxCreate.option('--wait-for-configured', texts_1.OPTION_SANDBOX_WAIT_CONFIGURED);
-commandSandboxCreate.option('--wait-for-configured-timeout <seconds>', texts_1.OPTION_SANDBOX_WAIT_TIMEOUT, '300');
-commandSandboxCreate.option('--wait-for-app', texts_1.OPTION_SANDBOX_WAIT_APP);
-commandSandboxCreate.option('--wait-for-app-timeout <seconds>', texts_1.OPTION_SANDBOX_WAIT_TIMEOUT, '300');
+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-app [seconds]', texts_1.OPTION_SANDBOX_WAIT_APP);
 commandSandboxCreate.action(async (options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     if (options.resources && !VALID_RESOURCES.includes(options.resources)) {
         output_1.default.exitError((0, texts_1.ERR_SANDBOX_INVALID_RESOURCES)(options.resources));
     }
@@ -105,7 +100,7 @@ commandSandboxCreate.action(async (options) => {
     const sandboxId = result.id;
     if (options.waitForRunning) {
         output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_RUNNING);
-        const timeout = parseInt(options.waitForRunningTimeout, 10) || 300;
+        const timeout = parseInt(options.waitForRunning, 10) || 300;
         try {
             const status = await client.sandboxWaitForRunning(workspace, sandboxId, timeout);
             if (status !== utils_1.SANDBOX_STATUS.RUNNING) {
@@ -118,7 +113,7 @@ commandSandboxCreate.action(async (options) => {
     }
     if (options.waitForConfigured) {
         output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_SETUP);
-        const timeout = parseInt(options.waitForConfiguredTimeout, 10) || 300;
+        const timeout = parseInt(options.waitForConfigured, 10) || 300;
         try {
             const status = await client.sandboxWaitForConfigured(workspace, sandboxId, timeout);
             if (status !== utils_1.SANDBOX_SETUP_STATUS.SUCCESS) {
@@ -131,7 +126,7 @@ commandSandboxCreate.action(async (options) => {
     }
     if (options.waitForApp) {
         output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_APP);
-        const timeout = parseInt(options.waitForAppTimeout, 10) || 300;
+        const timeout = parseInt(options.waitForApp, 10) || 300;
         try {
             const status = await client.sandboxWaitForApp(workspace, sandboxId, timeout);
             if (status !== utils_1.SANDBOX_APP_STATUS.RUNNING) {

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const commandSandboxDestroy = (0, utils_1.newCommand)('destroy', texts_1.DESC_COMMAND_SANDBOX_DESTROY);
 commandSandboxDestroy.alias('rm');
 commandSandboxDestroy.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -17,11 +16,10 @@ commandSandboxDestroy.option('-w, --workspace <domain>', texts_1.OPTION_REST_API
 commandSandboxDestroy.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxDestroy.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxDestroy.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -7,15 +7,13 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const logger_1 = __importDefault(require("../../../logger"));
 const commandSandboxEndpointAdd = (0, utils_1.getBasicCommandSandboxEndpoint)('add', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_ADD);
 commandSandboxEndpointAdd.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const commandSandboxEndpointDelete = (0, utils_1.newCommand)('delete', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_DELETE);
 commandSandboxEndpointDelete.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxEndpointDelete.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -17,11 +16,10 @@ commandSandboxEndpointDelete.option('-p, --project <name>', texts_1.OPTION_REST_
 commandSandboxEndpointDelete.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxEndpointDelete.argument('<endpoint-name>', texts_1.OPTION_SANDBOX_ENDPOINT_NAME_ARG);
 commandSandboxEndpointDelete.action(async (identifier, endpointName, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);
@@ -35,7 +33,9 @@ commandSandboxEndpointDelete.action(async (identifier, endpointName, options) =>
         output_1.default.exitError(texts_1.ERR_SANDBOX_ENDPOINT_NOT_FOUND);
     }
     const updatedEndpoints = endpoints.filter((ep) => ep.name !== endpointName);
-    await client.updateSandbox(workspace, found.id, { endpoints: updatedEndpoints });
+    await client.updateSandbox(workspace, found.id, {
+        endpoints: updatedEndpoints,
+    });
     output_1.default.exitSuccess((0, texts_1.TXT_SANDBOX_ENDPOINT_DELETED)(endpointName));
 });
 exports.default = commandSandboxEndpointDelete;

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const commandSandboxEndpointGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_GET);
 commandSandboxEndpointGet.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxEndpointGet.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -17,11 +16,10 @@ commandSandboxEndpointGet.option('-p, --project <name>', texts_1.OPTION_REST_API
 commandSandboxEndpointGet.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxEndpointGet.argument('<endpoint-name>', texts_1.OPTION_SANDBOX_ENDPOINT_NAME_ARG);
 commandSandboxEndpointGet.action(async (identifier, endpointName, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const commandSandboxEndpointList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_SANDBOX_ENDPOINT_LIST);
 commandSandboxEndpointList.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxEndpointList.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -16,11 +15,10 @@ commandSandboxEndpointList.option('-w, --workspace <domain>', texts_1.OPTION_RES
 commandSandboxEndpointList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxEndpointList.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxEndpointList.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -7,7 +7,6 @@ const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const commandSandboxExecCommand = (0, utils_1.newCommand)('command', texts_1.DESC_COMMAND_SANDBOX_EXEC);
 commandSandboxExecCommand.alias('cmd');
 commandSandboxExecCommand.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -21,11 +20,10 @@ commandSandboxExecCommand.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTI
 commandSandboxExecCommand.argument('<command>');
 commandSandboxExecCommand.action(async (identifier, command, options) => {
     output_1.default.handleSignals();
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const runtime = input_1.default.restApiSandboxExecRuntime(options.runtime);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const output_1 = __importDefault(require("../../../output"));
 const commandSandboxExecKill = (0, utils_1.newCommand)('kill', texts_1.DESC_COMMAND_SANDBOX_EXEC_KILL);
 commandSandboxExecKill.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -17,11 +16,10 @@ commandSandboxExecKill.option('-p, --project <name>', texts_1.OPTION_REST_API_PR
 commandSandboxExecKill.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecKill.argument('<command-id>', texts_1.OPTION_SANDBOX_COMMAND_ID);
 commandSandboxExecKill.action(async (identifier, commandId, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const output_1 = __importDefault(require("../../../output"));
 const commandSandboxExecList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_SANDBOX_EXEC_LIST);
 commandSandboxExecList.alias('ls');
@@ -17,11 +16,10 @@ commandSandboxExecList.option('-w, --workspace <domain>', texts_1.OPTION_REST_AP
 commandSandboxExecList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxExecList.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecList.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const commandSandboxExecLogs = (0, utils_1.newCommand)('logs', texts_1.DESC_COMMAND_SANDBOX_EXEC_LOGS);
 commandSandboxExecLogs.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxExecLogs.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -19,11 +18,10 @@ commandSandboxExecLogs.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIE
 commandSandboxExecLogs.argument('<command-id>', texts_1.OPTION_SANDBOX_COMMAND_ID);
 commandSandboxExecLogs.action(async (identifier, commandId, options) => {
     output_1.default.handleSignals();
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const output_1 = __importDefault(require("../../../output"));
 const commandSandboxExecStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_SANDBOX_EXEC_STATUS);
 commandSandboxExecStatus.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -17,11 +16,10 @@ commandSandboxExecStatus.option('-p, --project <name>', texts_1.OPTION_REST_API_
 commandSandboxExecStatus.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxExecStatus.argument('<command-id>', texts_1.OPTION_SANDBOX_COMMAND_ID);
 commandSandboxExecStatus.action(async (identifier, commandId, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const commandSandboxGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_SANDBOX_GET);
 commandSandboxGet.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxGet.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -16,11 +15,10 @@ commandSandboxGet.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WOR
 commandSandboxGet.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxGet.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxGet.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);
@@ -42,7 +40,10 @@ commandSandboxGet.action(async (identifier, options) => {
         ['URL', sandbox.html_url || '-'],
     ];
     if (sandbox.endpoints && sandbox.endpoints.length > 0) {
-        data.push(['Endpoints', sandbox.endpoints.map((e) => `${e.name}: ${e.endpoint}`).join('\n')]);
+        data.push([
+            'Endpoints',
+            sandbox.endpoints.map((e) => `${e.name}: ${e.endpoint}`).join('\n'),
+        ]);
     }
     output_1.default.table(data);
     output_1.default.exitNormal();

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const commandSandboxList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_SANDBOX_LIST);
 commandSandboxList.alias('ls');
 commandSandboxList.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -16,23 +15,23 @@ commandSandboxList.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandSandboxList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxList.action(async (options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     if (sandboxes.length === 0) {
         output_1.default.exitNormal('No sandboxes found');
     }
-    const data = [['IDENTIFIER', 'NAME', 'STATUS', 'ID']];
+    const data = [['NAME', 'STATUS', 'ID', 'IDENTIFIER', 'URL']];
     for (const sandbox of sandboxes) {
         data.push([
-            sandbox.identifier || '-',
             sandbox.name || '-',
             sandbox.status || '-',
             sandbox.id || '-',
+            sandbox.identifier || '-',
+            (0, utils_1.getAppSandboxUrl)(baseUrl, workspace, project, sandbox.id)
         ]);
     }
     output_1.default.table(data);

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

@@ -7,22 +7,19 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const output_1 = __importDefault(require("../../output"));
 const input_1 = __importDefault(require("../../input"));
-const client_1 = __importDefault(require("../../api/client"));
 const commandSandboxRestart = (0, utils_1.newCommand)('restart', texts_1.DESC_COMMAND_SANDBOX_RESTART);
 commandSandboxRestart.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxRestart.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
 commandSandboxRestart.option('--region <region>', texts_1.OPTION_REST_API_REGION);
 commandSandboxRestart.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandSandboxRestart.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
-commandSandboxRestart.option('--wait', texts_1.OPTION_SANDBOX_WAIT);
-commandSandboxRestart.option('--wait-timeout <seconds>', texts_1.OPTION_SANDBOX_WAIT_TIMEOUT, '300');
+commandSandboxRestart.option('--wait [seconds]', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxRestart.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxRestart.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);
@@ -32,7 +29,7 @@ commandSandboxRestart.action(async (identifier, options) => {
     await client.restartSandbox(workspace, found.id);
     if (options.wait) {
         output_1.default.normal(texts_1.TXT_SANDBOX_WAITING_START);
-        const timeout = parseInt(options.waitTimeout, 10) || 300;
+        const timeout = parseInt(options.wait, 10) || 300;
         try {
             const status = await client.sandboxWaitForRunning(workspace, found.id, timeout);
             if (status !== utils_1.SANDBOX_STATUS.RUNNING) {

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

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const human_id_1 = __importDefault(require("human-id"));
 const commandSandboxSnapshotCreate = (0, utils_1.newCommand)('create', texts_1.DESC_COMMAND_SANDBOX_SNAPSHOT_CREATE);
 commandSandboxSnapshotCreate.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
@@ -17,14 +16,12 @@ commandSandboxSnapshotCreate.option('-w, --workspace <domain>', texts_1.OPTION_R
 commandSandboxSnapshotCreate.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandSandboxSnapshotCreate.option('-n, --name <name>', texts_1.OPTION_SANDBOX_SNAPSHOT_NAME);
 commandSandboxSnapshotCreate.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
-commandSandboxSnapshotCreate.option('--wait', texts_1.OPTION_SANDBOX_WAIT);
-commandSandboxSnapshotCreate.option('--wait-timeout <seconds>', texts_1.OPTION_SANDBOX_WAIT_TIMEOUT, '300');
+commandSandboxSnapshotCreate.option('--wait [seconds]', texts_1.OPTION_SANDBOX_WAIT);
 commandSandboxSnapshotCreate.action(async (identifier, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);
@@ -40,7 +37,7 @@ commandSandboxSnapshotCreate.action(async (identifier, options) => {
     const snapshotId = snapshot.id;
     if (options.wait) {
         output_1.default.normal(texts_1.TXT_SANDBOX_SNAPSHOT_WAITING);
-        const timeout = parseInt(options.waitTimeout, 10) || 300;
+        const timeout = parseInt(options.wait, 10) || 300;
         try {
             const status = await client.sandboxWaitForSnapshot(workspace, found.id, snapshotId, timeout);
             if (status !== utils_1.SANDBOX_SNAPSHOT_STATUS.CREATED) {

package/distTs/src/command/sandbox/snapshot/delete.js

@@ -7,7 +7,6 @@ const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
 const input_1 = __importDefault(require("../../../input"));
-const client_1 = __importDefault(require("../../../api/client"));
 const commandSandboxSnapshotDelete = (0, utils_1.newCommand)('delete', texts_1.DESC_COMMAND_SANDBOX_SNAPSHOT_DELETE);
 commandSandboxSnapshotDelete.option('--token <token>', texts_1.OPTION_REST_API_TOKEN);
 commandSandboxSnapshotDelete.option('--api <url>', texts_1.OPTION_REST_API_ENDPOINT);
@@ -17,11 +16,10 @@ commandSandboxSnapshotDelete.option('-p, --project <name>', texts_1.OPTION_REST_
 commandSandboxSnapshotDelete.argument('<identifier>', texts_1.OPTION_SANDBOX_IDENTIFIER);
 commandSandboxSnapshotDelete.argument('<snapshot-name>', texts_1.OPTION_SANDBOX_SNAPSHOT_NAME_ARG);
 commandSandboxSnapshotDelete.action(async (identifier, snapshotName, options) => {
-    const token = input_1.default.restApiToken(options.token);
     const baseUrl = input_1.default.restApiBaseUrl(options.api, options.region);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project);
-    const client = new client_1.default(baseUrl, token);
+    const client = input_1.default.restApiTokenClient(baseUrl, options.token);
     const result = await client.listSandboxes(workspace, project);
     const sandboxes = result.sandboxes || [];
     const found = sandboxes.find((s) => s.identifier === identifier);