@nocobase/cli 2.1.0-alpha.40 → 2.1.0-alpha.46

package/dist/commands/env/list.js

@@ -7,15 +7,14 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command } from '@oclif/core';
-import { getCurrentEnvName, listEnvs } from '../../lib/auth-store.js';
+import { getCurrentEnvName, listEnvs, resolveConfiguredAuthType } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { translateCli } from '../../lib/cli-locale.js';
 import { renderTable } from '../../lib/ui.js';
 import { resolveApiBaseUrl } from './shared.js';
 export default class EnvList extends Command {
     static summary = 'List configured environments';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>'];
     async run() {
         await this.parse(EnvList);
         const scope = resolveDefaultConfigScope();
@@ -23,8 +22,8 @@ export default class EnvList extends Command {
         const currentEnv = await getCurrentEnvName({ scope });
         const names = Object.keys(envs).sort();
         if (!names.length) {
-            this.log('No envs configured.');
-            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
+            this.log(translateCli('commands.env.messages.noEnvsConfigured'));
+            this.log(translateCli('commands.env.messages.noEnvsConfiguredHelp'));
             return;
         }
         const rows = [];
@@ -35,7 +34,7 @@ export default class EnvList extends Command {
                 name,
                 env.kind ?? '-',
                 resolveApiBaseUrl(env),
-                env.auth?.type ?? '',
+                resolveConfiguredAuthType(env) ?? env.auth?.type ?? '',
                 env.runtime?.version ?? '',
             ]);
         }

package/dist/commands/env/shared.js

@@ -11,13 +11,51 @@ import { executeRawApiRequest } from '../../lib/api-client.js';
 export function resolveApiBaseUrl(config) {
     return String(config.apiBaseUrl ?? config.baseUrl ?? config.apibaseUrl ?? '').trim();
 }
+function buildAppPath(publicPath, subapp) {
+    const normalizedPublicPath = publicPath.replace(/\/+$/, '');
+    if (!subapp) {
+        return normalizedPublicPath ? `${normalizedPublicPath}/` : '/';
+    }
+    const normalizedSubapp = subapp.replace(/^\/+|\/+$/g, '');
+    return `${normalizedPublicPath ? normalizedPublicPath : ''}/apps/${normalizedSubapp}/`;
+}
+export function resolveAppUrlFromApiBaseUrl(apiBaseUrl) {
+    const value = String(apiBaseUrl ?? '').trim();
+    if (!value) {
+        return '';
+    }
+    try {
+        const url = new URL(value);
+        const subappMatch = url.pathname.match(/^(.*)\/api\/__app\/([^/]+)\/?$/);
+        if (subappMatch) {
+            url.pathname = buildAppPath(subappMatch[1] ?? '', subappMatch[2]);
+            url.search = '';
+            url.hash = '';
+            return url.toString();
+        }
+        const appMatch = url.pathname.match(/^(.*)\/api\/?$/);
+        if (appMatch) {
+            url.pathname = buildAppPath(appMatch[1] ?? '');
+            url.search = '';
+            url.hash = '';
+            return url.toString();
+        }
+    }
+    catch {
+        return value;
+    }
+    return value;
+}
 export function appUrl(runtime) {
+    const resolvedFromApiBaseUrl = resolveAppUrlFromApiBaseUrl(runtime.env.apiBaseUrl ?? resolveApiBaseUrl(runtime.env.config));
+    if (resolvedFromApiBaseUrl) {
+        return resolvedFromApiBaseUrl;
+    }
     const port = String(runtime.env.config.appPort ?? '').trim();
     if (port) {
-        return `http://127.0.0.1:${port}`;
+        return `http://127.0.0.1:${port}/`;
     }
-    const baseUrl = resolveApiBaseUrl(runtime.env.config);
-    return baseUrl.replace(/\/api\/?$/, '');
+    return '';
 }
 export function appRootPath(runtime) {
     if (runtime.kind === 'http' || runtime.kind === 'docker') {

package/dist/commands/env/status.js

@@ -10,6 +10,7 @@ import { Args, Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
 import { getCurrentEnvName, listEnvs } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { translateCli } from '../../lib/cli-locale.js';
 import { renderTable } from '../../lib/ui.js';
 import { apiStatus, runtimeStatus } from './shared.js';
 export default class EnvStatus extends Command {
@@ -46,13 +47,11 @@ export default class EnvStatus extends Command {
         const { envs } = await listEnvs({ scope });
         const configuredEnvNames = Object.keys(envs).sort();
         if (!configuredEnvNames.length) {
-            this.log('No envs configured.');
-            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
+            this.log(translateCli('commands.env.messages.noEnvsConfigured'));
+            this.log(translateCli('commands.env.messages.noEnvsConfiguredHelp'));
             return;
         }
-        const envNames = flags.all
-            ? configuredEnvNames
-            : [requestedEnv || (await getCurrentEnvName({ scope }))];
+        const envNames = flags.all ? configuredEnvNames : [requestedEnv || (await getCurrentEnvName({ scope }))];
         const rows = [];
         for (const envName of envNames) {
             const runtime = await resolveManagedAppRuntime(envName);
@@ -76,8 +75,12 @@ export default class EnvStatus extends Command {
             rows.push({
                 env: runtime.envName,
                 status,
-                apiBaseUrl: runtime.env.apiBaseUrl
-                    || String(runtime.env.config.apiBaseUrl ?? runtime.env.config.baseUrl ?? envs[envName]?.apiBaseUrl ?? envs[envName]?.baseUrl ?? '').trim(),
+                apiBaseUrl: runtime.env.apiBaseUrl ||
+                    String(runtime.env.config.apiBaseUrl ??
+                        runtime.env.config.baseUrl ??
+                        envs[envName]?.apiBaseUrl ??
+                        envs[envName]?.baseUrl ??
+                        '').trim(),
             });
         }
         if (flags['json-output']) {