@nocobase/cli 2.1.19 → 2.1.20

package/assets/env-proxy/nginx/snippets/proxy-location.conf

@@ -15,3 +15,4 @@ proxy_connect_timeout 600;
 proxy_send_timeout 600;
 proxy_read_timeout 600;
 send_timeout 600;
+proxy_buffering off;

package/dist/commands/app/start.js

@@ -37,6 +37,9 @@ function buildLicenseSyncArgv(envName, options) {
 }
 function resolveHookCommand(value) {
     const text = String(value ?? '').trim();
+    if (text === 'init') {
+        return text;
+    }
     if (text === 'app:restart' || text === 'app:upgrade') {
         return text;
     }
@@ -225,7 +228,7 @@ export default class AppStart extends Command {
         }),
         'hook-command': Flags.string({
             hidden: true,
-            options: ['app:start', 'app:restart', 'app:upgrade'],
+            options: ['init', 'app:start', 'app:restart', 'app:upgrade'],
         }),
     };
     async run() {

package/dist/commands/install.js

@@ -13,11 +13,11 @@ import path from 'node:path';
 import { exit } from 'node:process';
 import { appendAppPublicPath } from '../lib/app-public-path.js';
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
-import { applyCliLocale, localeText, resolveCliLocale, translateCli } from "../lib/cli-locale.js";
+import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRoot, resolveEnvRelativePath, } from '../lib/cli-home.js';
 import { defaultDockerContainerPrefix, defaultDockerNetworkName, managedAppLifecycleEnvVars, } from '../lib/app-runtime.js';
-import { resolveDefaultApiHost, resolveDockerContainerPrefix, resolveDockerNetworkName } from '../lib/cli-config.js';
-import { DEFAULT_DOCKER_VERSION, resolveDockerImageRef } from "../lib/docker-image.js";
+import { getCliConfigValue, resolveDefaultApiHost, resolveDockerContainerPrefix, resolveDockerNetworkName, } from '../lib/cli-config.js';
+import { DEFAULT_DOCKER_VERSION, DEFAULT_NB_IMAGE_VARIANT, inferNbImageRegistryFromRepository, normalizeNbImageVariant, resolveBuiltinDbImage, resolveDockerImageContainerPort, resolveDockerImageRef, resolveOfficialDockerRegistry, } from "../lib/docker-image.js";
 import { findAvailableTcpPort, validateAppPublicPath, validateAvailableTcpPort, validateTcpPort, validateEnvKey, } from "../lib/prompt-validators.js";
 import { validateExternalDbConfig, validateMysqlLowerCaseTableNamesCompatibility } from "../lib/db-connection-check.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
@@ -31,7 +31,7 @@ import { startDockerLogFollower } from '../lib/docker-log-stream.js';
 import { buildInitAppEnvVarsFromConfig } from '../lib/managed-init-env.js';
 import { buildHookContext, persistHookScript, resolveHookScriptPath, runHookScriptHook, } from '../lib/hook-script.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
-import Download, { defaultDockerRegistryForLang } from './download.js';
+import Download from './download.js';
 import EnvAdd from "./env/add.js";
 import { resolveAppUrlFromApiBaseUrl } from "./env/shared.js";
 const DEFAULT_INSTALL_ENV_NAME = 'local';
@@ -45,18 +45,6 @@ const DEFAULT_INSTALL_DB_PORTS = {
     mariadb: '3306',
     kingbase: '54321',
 };
-const DEFAULT_INSTALL_BUILTIN_DB_IMAGES = {
-    postgres: 'postgres:16',
-    mysql: 'mysql:8',
-    mariadb: 'mariadb:11',
-    kingbase: 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86',
-};
-const DEFAULT_INSTALL_BUILTIN_DB_IMAGES_ZH_CN = {
-    postgres: 'registry.cn-shanghai.aliyuncs.com/nocobase/postgres:16',
-    mysql: 'registry.cn-shanghai.aliyuncs.com/nocobase/mysql:8',
-    mariadb: 'registry.cn-shanghai.aliyuncs.com/nocobase/mariadb:11',
-    kingbase: 'registry.cn-shanghai.aliyuncs.com/nocobase/kingbase:v009r001c001b0030_single_x86',
-};
 const DEFAULT_INSTALL_DB_DATABASE = 'nocobase';
 const DEFAULT_INSTALL_DB_USER = 'nocobase';
 const DEFAULT_INSTALL_DB_PASSWORD = 'nocobase';
@@ -179,22 +167,23 @@ function downloadVersionPromptValue(version) {
 }
 function supportsBuiltinDbDialect(value) {
     const dialect = String(value ?? '').trim();
-    return Object.prototype.hasOwnProperty.call(DEFAULT_INSTALL_BUILTIN_DB_IMAGES, dialect);
+    return INSTALL_DB_DIALECTS.includes(dialect);
 }
 export function defaultDbPortForDialect(value) {
     const dialect = String(value ?? 'postgres').trim();
     return DEFAULT_INSTALL_DB_PORTS[isInstallDbDialect(dialect) ? dialect : 'postgres'];
 }
-function defaultBuiltinDbImageForDialect(value) {
+function defaultBuiltinDbImageForDialect(value, options) {
     const dialect = String(value ?? 'postgres').trim();
-    const defaults = resolveCliLocale(process.env.NB_LOCALE) === 'zh-CN'
-        ? DEFAULT_INSTALL_BUILTIN_DB_IMAGES_ZH_CN
-        : DEFAULT_INSTALL_BUILTIN_DB_IMAGES;
-    return supportsBuiltinDbDialect(dialect) ? defaults[dialect] : defaults.postgres;
+    return resolveBuiltinDbImage(dialect, { registry: options?.registry });
 }
 function defaultDbDatabaseForDialect(value) {
     return String(value ?? '').trim() === 'kingbase' ? 'kingbase' : DEFAULT_INSTALL_DB_DATABASE;
 }
+function supportsDbSchemaPrompt(value) {
+    const dialect = String(value ?? '').trim();
+    return dialect === 'postgres' || dialect === 'kingbase';
+}
 function defaultDbHostForBuiltinDb(values) {
     return values.builtinDb ? DEFAULT_INSTALL_BUILTIN_DB_HOST : DEFAULT_INSTALL_DB_HOST;
 }
@@ -601,7 +590,7 @@ export default class Install extends Command {
             type: 'text',
             message: installText('prompts.dbSchema.message'),
             placeholder: installText('prompts.dbSchema.placeholder'),
-            hidden: (values) => String(values.dbDialect ?? '').trim() !== 'postgres',
+            hidden: (values) => !supportsDbSchemaPrompt(values.dbDialect),
         },
         dbTablePrefix: {
             type: 'text',
@@ -1279,19 +1268,25 @@ export default class Install extends Command {
         return builtinDb && Install.shouldPublishBuiltinDbPort(values.source);
     }
     static async buildDbPromptInitialValues(params) {
-        if (params.flags['db-port'] !== undefined) {
-            return {};
-        }
+        const configuredRegistry = await getCliConfigValue('nb-image-registry');
         const values = {
             ...params.downloadResults,
             ...params.dbPreset,
         };
+        const dockerRegistry = String(values.dockerRegistry ?? '').trim() || resolveOfficialDockerRegistry(configuredRegistry);
+        const dialect = String(values.dbDialect ?? 'postgres').trim() || 'postgres';
+        const initialValues = values.builtinDb !== false && params.dbPreset.builtinDbImage === undefined
+            ? { builtinDbImage: defaultBuiltinDbImageForDialect(dialect, { registry: dockerRegistry }) }
+            : {};
+        if (params.flags['db-port'] !== undefined) {
+            return initialValues;
+        }
         if (!Install.shouldPublishBuiltinDbPortForValues(values)) {
-            return {};
+            return initialValues;
         }
-        const dialect = String(values.dbDialect ?? 'postgres').trim() || 'postgres';
         const defaultPort = defaultDbPortForDialect(dialect);
         return {
+            ...initialValues,
             dbPort: await Install.resolveAvailableDefaultPort(defaultPort, {
                 label: `Default ${dialect} port`,
                 warn: params.warnOnPortFallback ?? true,
@@ -1302,12 +1297,13 @@ export default class Install extends Command {
      * When install runs {@link Download.prompts} after app prompts, align the download
      * output directory with app settings, while Docker registry defaults follow the CLI locale.
      */
-    static buildDownloadPromptOptionsForInstall(appResults, envName) {
+    static async buildDownloadPromptOptionsForInstall(appResults, envName) {
         const appRoot = resolveConfiguredSourcePathValue(appResults, envName);
         const lang = String(appResults.lang ?? DEFAULT_INSTALL_LANG).trim() || DEFAULT_INSTALL_LANG;
+        const dockerRegistry = resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
         const initialValues = {
             lang,
-            dockerRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            dockerRegistry,
             outputDir: appRoot,
         };
         const values = {
@@ -1760,12 +1756,15 @@ export default class Install extends Command {
         return plan;
     }
     static async buildDockerAppPlan(params) {
+        const configuredRegistry = await getCliConfigValue('nb-image-registry');
+        const configuredVariant = normalizeNbImageVariant(await getCliConfigValue('nb-image-variant')) ?? DEFAULT_NB_IMAGE_VARIANT;
         const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim() ||
-            defaultDockerRegistryForLang(process.env.NB_LOCALE);
+            resolveOfficialDockerRegistry(configuredRegistry);
         const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
         const imageRef = resolveDockerImageRef(dockerRegistry, version, {
-            defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+            defaultRegistry: resolveOfficialDockerRegistry(configuredRegistry),
             defaultVersion: DEFAULT_DOCKER_VERSION,
+            variant: inferNbImageRegistryFromRepository(dockerRegistry) ? configuredVariant : undefined,
         });
         const appPort = String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT;
         const configuredStoragePath = resolveConfiguredStoragePathValue(params.appResults, params.envName);
@@ -1792,6 +1791,7 @@ export default class Install extends Command {
             appResults: params.appResults,
             rootResults: params.rootResults,
         });
+        const containerPort = resolveDockerImageContainerPort(imageRef);
         const args = [
             'run',
             '-d',
@@ -1800,7 +1800,7 @@ export default class Install extends Command {
             '--network',
             params.networkName,
             '-p',
-            `${appPort}:80`,
+            `${appPort}:${containerPort}`,
         ];
         if (envFile) {
             args.push('--env-file', envFile);
@@ -1990,12 +1990,15 @@ export default class Install extends Command {
     }
     async ensureSkippedDownloadInputsReady(params) {
         if (params.source === 'docker') {
+            const configuredRegistry = await getCliConfigValue('nb-image-registry');
+            const configuredVariant = normalizeNbImageVariant(await getCliConfigValue('nb-image-variant')) ?? DEFAULT_NB_IMAGE_VARIANT;
             const dockerRegistry = String(downloadResultsValue(params.downloadResults, 'dockerRegistry') ?? '').trim() ||
-                defaultDockerRegistryForLang(process.env.NB_LOCALE);
+                resolveOfficialDockerRegistry(configuredRegistry);
             const version = String(downloadResultsValue(params.downloadResults, 'version') ?? '').trim() || DEFAULT_DOCKER_VERSION;
             const imageRef = resolveDockerImageRef(dockerRegistry, version, {
-                defaultRegistry: defaultDockerRegistryForLang(process.env.NB_LOCALE),
+                defaultRegistry: resolveOfficialDockerRegistry(configuredRegistry),
                 defaultVersion: DEFAULT_DOCKER_VERSION,
+                variant: inferNbImageRegistryFromRepository(dockerRegistry) ? configuredVariant : undefined,
             });
             const imageExists = await commandSucceeds('docker', ['image', 'inspect', imageRef]);
             if (!imageExists) {
@@ -2254,6 +2257,13 @@ export default class Install extends Command {
         }
         await this.config.runCommand('env:update', [params.envName]);
     }
+    buildAppStartArgv(params) {
+        const argv = ['--env', params.envName, '--yes', '--no-sync-licensed-plugins', '--hook-command', 'init'];
+        if (params.verbose) {
+            argv.push('--verbose');
+        }
+        return argv;
+    }
     async runInstallHookIfNeeded(params) {
         const appPath = Install.resolveAbsoluteAppPath(params.envName, params.appResults);
         const savedHookScript = Install.toOptionalPromptString(params.appResults.hookScript);
@@ -2391,7 +2401,7 @@ export default class Install extends Command {
         if (resumePreset?.appPreset?.hookScript !== undefined && appResults.hookScript === undefined) {
             appResults.hookScript = resumePreset.appPreset.hookScript;
         }
-        const downloadOpts = Install.buildDownloadPromptOptionsForInstall(appResults, envName);
+        const downloadOpts = await Install.buildDownloadPromptOptionsForInstall(appResults, envName);
         downloadOpts.values = {
             ...(resumePreset?.downloadPreset ?? {}),
             ...downloadOpts.values,
@@ -2498,7 +2508,6 @@ export default class Install extends Command {
         const parsed = {
             ...flags,
         };
-        const defaultApiHost = await resolveDefaultApiHost();
         if (parsed['skip-auth'] && (parsed['access-token'] !== undefined || parsed.token !== undefined)) {
             this.error('--skip-auth cannot be used with --access-token or --token.');
         }
@@ -2578,8 +2587,7 @@ export default class Install extends Command {
             dbResults.dbUser = builtinDbPlan.dbUser;
             dbResults.dbPassword = builtinDbPlan.dbPassword;
         }
-        let dockerAppPlan;
-        let localAppPlan;
+        let shouldStartApp = false;
         if (source === 'docker' || source === 'npm' || source === 'git') {
             this.logStage('Preparing application');
             if (source === 'docker') {
@@ -2591,111 +2599,28 @@ export default class Install extends Command {
                     printInfo('Application image ready.');
                 }
                 if (!parsed['prepare-only']) {
-                    await this.runInstallHookIfNeeded({
-                        hookName: 'beforeAppInstall',
-                        envName,
-                        source,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        envAddResults,
-                        defaultApiHost,
-                    });
-                    dockerAppPlan = await this.installDockerApp({
-                        envName,
-                        dockerNetworkName,
-                        dockerContainerPrefix,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        builtinDbPlan,
-                        force: parsed.force,
-                        commandStdio,
-                    });
-                    appResults.appKey = dockerAppPlan.appKey;
-                    appResults.timeZone = dockerAppPlan.timeZone;
+                    shouldStartApp = true;
                 }
             }
             else if (source === 'npm' || source === 'git') {
-                const localSource = source === 'npm' ? 'npm' : 'git';
-                const projectRoot = parsed['skip-download'] || parsed['prepare-only']
-                    ? Install.resolveLocalProjectRoot({
-                        envName,
-                        appResults,
-                        downloadResults,
-                    })
-                    : await this.downloadLocalApp({
+                if (!parsed['skip-download'] && !parsed['prepare-only']) {
+                    await this.downloadLocalApp({
                         envName,
                         appResults,
                         downloadResults,
                         verbose: parsed.verbose,
                     });
-                if (!parsed['skip-download'] && !parsed['prepare-only']) {
                     printInfo('Application files ready.');
                 }
                 if (!parsed['prepare-only']) {
-                    await this.runInstallHookIfNeeded({
-                        hookName: 'beforeAppInstall',
-                        envName,
-                        source,
-                        appResults,
-                        downloadResults,
-                        dbResults,
-                        rootResults,
-                        envAddResults,
-                        projectRoot,
-                        defaultApiHost,
-                    });
-                    localAppPlan = await this.startLocalApp({
-                        envName,
-                        source: localSource,
-                        projectRoot,
-                        appResults,
-                        dbResults,
-                        rootResults,
-                        commandStdio,
-                    });
-                    appResults.appKey = localAppPlan.appKey;
-                    appResults.timeZone = localAppPlan.timeZone;
+                    shouldStartApp = true;
                 }
             }
         }
         else {
             this.logDetail('Skipped app download and install.');
         }
-        if (dockerAppPlan || localAppPlan) {
-            this.logStage('Starting NocoBase');
-            await this.waitForAppHealthCheck(Install.resolveApiBaseUrl({
-                appResults,
-                envAddResults,
-                defaultApiHost,
-            }), {
-                containerName: dockerAppPlan?.containerName,
-                verbose: parsed.verbose,
-            });
-            const displayApiBaseUrl = Install.resolveApiBaseUrl({
-                appResults,
-                envAddResults,
-                defaultApiHost,
-            });
-            printInfo(`NocoBase is ready at ${formatInstallDisplayUrl(displayApiBaseUrl)}`);
-            appResults.setupState = 'installed';
-            await this.runInstallHookIfNeeded({
-                hookName: 'afterAppStart',
-                envName,
-                source,
-                appResults,
-                downloadResults,
-                dbResults,
-                rootResults,
-                envAddResults,
-                projectRoot: localAppPlan?.projectRoot,
-                defaultApiHost,
-            });
-        }
-        if (dockerAppPlan || localAppPlan || builtinDbPlan) {
+        if (shouldStartApp || builtinDbPlan) {
             await this.saveInstalledEnv({
                 envName,
                 appResults,
@@ -2705,10 +2630,14 @@ export default class Install extends Command {
                 envAddResults,
             });
         }
+        if (shouldStartApp) {
+            this.logStage('Starting NocoBase');
+            await this.config.runCommand('app:start', this.buildAppStartArgv({ envName, verbose: parsed.verbose }));
+        }
         await this.syncInstalledEnvConnection({
             envName,
             envAddResults,
-            appReady: Boolean(dockerAppPlan || localAppPlan),
+            appReady: shouldStartApp,
             skipAuth: Boolean(parsed['skip-auth']),
         });
         if (!parsed['prepare-only']) {
@@ -2717,7 +2646,7 @@ export default class Install extends Command {
         if (parsed['prepare-only']) {
             printInfo(`Preparation complete for "${envName}". Activate the license, then run \`nb app start --env ${envName}\`.`);
         }
-        else if (!dockerAppPlan && !localAppPlan) {
+        else if (!shouldStartApp) {
             printInfo(`Install config for "${envName}" has been saved.`);
         }
     }

package/dist/commands/proxy/caddy/generate.js

@@ -8,6 +8,8 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, } from '../../../lib/app-runtime.js';
+import { resolveEnvProxyEntry, setEnvProxyEntry } from '../../../lib/auth-store.js';
+import { resolveDefaultConfigScope } from '../../../lib/cli-home.js';
 import { getCaddyProxyDriver, writeManualCaddyProxyBundle, writeCaddyProxyBundle, resolveCaddyProxyRuntimeContext, } from '../../../lib/proxy-caddy.js';
 import { normalizeProxyListenPort } from '../../../lib/proxy-nginx.js';
 import { announceTargetEnv, failTask, startTask, succeedTask } from '../../../lib/ui.js';
@@ -17,7 +19,7 @@ export default class ProxyCaddyGenerate extends Command {
         '<%= config.bin %> proxy caddy generate --host app1.example.com',
         '<%= config.bin %> proxy caddy generate --env app1 --host app1.example.com',
         '<%= config.bin %> proxy caddy generate --env app1 --host app1.example.com --port 8080',
-        '<%= config.bin %> proxy caddy generate --manual --name default --app-port 13000 --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0',
+        '<%= config.bin %> proxy caddy generate --manual --name default --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0 --upstream-port 13000',
     ];
     static flags = {
         env: Flags.string({
@@ -31,9 +33,6 @@ export default class ProxyCaddyGenerate extends Command {
         name: Flags.string({
             description: 'Output bundle name used under .nocobase/proxy/caddy in manual mode',
         }),
-        'app-port': Flags.string({
-            description: 'Upstream NocoBase app port in manual mode',
-        }),
         'storage-path': Flags.string({
             description: 'Path to the NocoBase storage directory in manual mode',
         }),
@@ -49,6 +48,9 @@ export default class ProxyCaddyGenerate extends Command {
         'upstream-host': Flags.string({
             description: 'Upstream host used by caddy reverse_proxy in manual mode',
         }),
+        'upstream-port': Flags.string({
+            description: 'Upstream port used by caddy reverse_proxy in manual mode',
+        }),
         'cdn-base-url': Flags.string({
             description: 'Client asset CDN base URL used when generating runtime HTML',
         }),
@@ -73,16 +75,16 @@ export default class ProxyCaddyGenerate extends Command {
         }
         if (manual) {
             const name = flags.name?.trim() || undefined;
-            const requestedAppPort = flags['app-port']?.trim() || undefined;
-            const appPort = normalizeProxyListenPort(requestedAppPort);
+            const requestedUpstreamPort = flags['upstream-port']?.trim() || undefined;
+            const upstreamPort = normalizeProxyListenPort(requestedUpstreamPort);
             const storagePath = flags['storage-path']?.trim() || undefined;
             const distRootPath = flags['dist-root-path']?.trim() || undefined;
             const runtimeVersion = flags['runtime-version']?.trim() || undefined;
-            if (requestedAppPort && !appPort) {
-                this.error(`Invalid manual app port "${requestedAppPort}". Use an integer between 1 and 65535.`);
+            if (requestedUpstreamPort && !upstreamPort) {
+                this.error(`Invalid manual upstream port "${requestedUpstreamPort}". Use an integer between 1 and 65535.`);
             }
-            if (!name || !appPort || !storagePath || !distRootPath || !runtimeVersion) {
-                this.error('Manual mode requires `--name`, `--app-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
+            if (!name || !upstreamPort || !storagePath || !distRootPath || !runtimeVersion) {
+                this.error('Manual mode requires `--name`, `--upstream-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
             }
             const driver = await getCaddyProxyDriver();
             const runtimeContext = await resolveCaddyProxyRuntimeContext();
@@ -91,12 +93,12 @@ export default class ProxyCaddyGenerate extends Command {
             try {
                 const { bundle, status } = await writeManualCaddyProxyBundle({
                     name,
-                    appPort,
                     storagePath,
                     distRootPath,
                     runtimeVersion,
                     appPublicPath: flags['app-public-path']?.trim() || undefined,
                     upstreamHost: flags['upstream-host']?.trim() || undefined,
+                    upstreamPort,
                     cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
                 }, {
                     host: flags.host?.trim() || undefined,
@@ -129,12 +131,18 @@ export default class ProxyCaddyGenerate extends Command {
         announceTargetEnv(runtime.envName);
         startTask(`Generating caddy proxy config for env "${runtime.envName}" with the ${driver} driver...`);
         try {
-            const { bundle, status } = await writeCaddyProxyBundle(runtime, {
-                host: flags.host?.trim() || undefined,
-                port: normalizedPort,
-            }, runtimeContext, {
+            const savedAppEntryOptions = resolveEnvProxyEntry(runtime.env.config, 'caddy');
+            const appEntryOptions = {
+                host: flags.host?.trim() || savedAppEntryOptions?.host,
+                port: normalizedPort ?? (savedAppEntryOptions?.port !== undefined ? String(savedAppEntryOptions.port) : undefined),
+            };
+            const { bundle, status } = await writeCaddyProxyBundle(runtime, appEntryOptions, runtimeContext, {
                 cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
             });
+            await setEnvProxyEntry(runtime.envName, 'caddy', {
+                host: appEntryOptions.host,
+                port: appEntryOptions.port ? Number(appEntryOptions.port) : undefined,
+            }, { scope: resolveDefaultConfigScope() });
             succeedTask(status === 'created'
                 ? `Saved caddy proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and created app.caddy at ${bundle.appConfigPath}.`
                 : `Saved caddy proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and refreshed app.caddy at ${bundle.appConfigPath}.`);

package/dist/commands/proxy/nginx/generate.js

@@ -8,7 +8,9 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime, } from '../../../lib/app-runtime.js';
+import { resolveDefaultConfigScope } from '../../../lib/cli-home.js';
 import { getNginxProxyDriver, normalizeProxyListenPort, resolveNginxProxyRuntimeContext, writeManualNginxProxyBundle, writeNginxProxyBundle, } from '../../../lib/proxy-nginx.js';
+import { resolveEnvProxyEntry, setEnvProxyEntry } from '../../../lib/auth-store.js';
 import { announceTargetEnv, failTask, startTask, succeedTask } from '../../../lib/ui.js';
 export default class ProxyNginxGenerate extends Command {
     static summary = 'Generate nginx proxy files for one managed env';
@@ -16,7 +18,7 @@ export default class ProxyNginxGenerate extends Command {
         '<%= config.bin %> proxy nginx generate --host app1.example.com',
         '<%= config.bin %> proxy nginx generate --env app1 --host app1.example.com',
         '<%= config.bin %> proxy nginx generate --env app1 --host app1.example.com --port 8080',
-        '<%= config.bin %> proxy nginx generate --manual --name default --app-port 13000 --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0',
+        '<%= config.bin %> proxy nginx generate --manual --name default --storage-path /path/to/storage --dist-root-path /path/to/dist-client --runtime-version 2.1.0 --upstream-port 13000',
     ];
     static flags = {
         env: Flags.string({
@@ -30,9 +32,6 @@ export default class ProxyNginxGenerate extends Command {
         name: Flags.string({
             description: 'Output bundle name used under .nocobase/proxy/nginx in manual mode',
         }),
-        'app-port': Flags.string({
-            description: 'Upstream NocoBase app port in manual mode',
-        }),
         'storage-path': Flags.string({
             description: 'Path to the NocoBase storage directory in manual mode',
         }),
@@ -48,6 +47,9 @@ export default class ProxyNginxGenerate extends Command {
         'upstream-host': Flags.string({
             description: 'Upstream host used by nginx proxy_pass in manual mode',
         }),
+        'upstream-port': Flags.string({
+            description: 'Upstream port used by nginx proxy_pass in manual mode',
+        }),
         'cdn-base-url': Flags.string({
             description: 'Client asset CDN base URL used when generating runtime HTML',
         }),
@@ -76,16 +78,16 @@ export default class ProxyNginxGenerate extends Command {
         }
         if (manual) {
             const name = flags.name?.trim() || undefined;
-            const requestedAppPort = flags['app-port']?.trim() || undefined;
-            const appPort = normalizeProxyListenPort(requestedAppPort);
+            const requestedUpstreamPort = flags['upstream-port']?.trim() || undefined;
+            const upstreamPort = normalizeProxyListenPort(requestedUpstreamPort);
             const storagePath = flags['storage-path']?.trim() || undefined;
             const distRootPath = flags['dist-root-path']?.trim() || undefined;
             const runtimeVersion = flags['runtime-version']?.trim() || undefined;
-            if (requestedAppPort && !appPort) {
-                this.error(`Invalid manual app port "${requestedAppPort}". Use an integer between 1 and 65535.`);
+            if (requestedUpstreamPort && !upstreamPort) {
+                this.error(`Invalid manual upstream port "${requestedUpstreamPort}". Use an integer between 1 and 65535.`);
             }
-            if (!name || !appPort || !storagePath || !distRootPath || !runtimeVersion) {
-                this.error('Manual mode requires `--name`, `--app-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
+            if (!name || !upstreamPort || !storagePath || !distRootPath || !runtimeVersion) {
+                this.error('Manual mode requires `--name`, `--upstream-port`, `--storage-path`, `--dist-root-path`, and `--runtime-version`.');
             }
             const driver = await getNginxProxyDriver();
             const runtimeContext = await resolveNginxProxyRuntimeContext();
@@ -94,12 +96,12 @@ export default class ProxyNginxGenerate extends Command {
             try {
                 const { bundle, status } = await writeManualNginxProxyBundle({
                     name,
-                    appPort,
                     storagePath,
                     distRootPath,
                     runtimeVersion,
                     appPublicPath: flags['app-public-path']?.trim() || undefined,
                     upstreamHost: flags['upstream-host']?.trim() || undefined,
+                    upstreamPort,
                     cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
                 }, {
                     host: flags.host?.trim() || undefined,
@@ -132,13 +134,19 @@ export default class ProxyNginxGenerate extends Command {
         announceTargetEnv(runtime.envName);
         startTask(`Generating nginx proxy config for env "${runtime.envName}" with the ${driver} driver...`);
         try {
-            const { bundle, status } = await writeNginxProxyBundle(runtime, {
-                host: flags.host?.trim() || undefined,
-                port: normalizedPort,
-            }, runtimeContext, {
+            const savedAppEntryOptions = resolveEnvProxyEntry(runtime.env.config, 'nginx');
+            const appEntryOptions = {
+                host: flags.host?.trim() || savedAppEntryOptions?.host,
+                port: normalizedPort ?? (savedAppEntryOptions?.port !== undefined ? String(savedAppEntryOptions.port) : undefined),
+            };
+            const { bundle, status } = await writeNginxProxyBundle(runtime, appEntryOptions, runtimeContext, {
                 cdnBaseUrl: flags['cdn-base-url']?.trim() || undefined,
                 force: flags.force,
             });
+            await setEnvProxyEntry(runtime.envName, 'nginx', {
+                host: appEntryOptions.host,
+                port: appEntryOptions.port ? Number(appEntryOptions.port) : undefined,
+            }, { scope: resolveDefaultConfigScope() });
             succeedTask(status === 'created'
                 ? `Saved nginx proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and created editable app entry config at ${bundle.appConfigPath}.`
                 : `Saved nginx proxy files for env "${runtime.envName}" under ${bundle.entryDir}, and refreshed editable app entry config at ${bundle.appConfigPath}.`);