@nocobase/cli 2.1.0-beta.42-test.1 → 2.1.0-beta.42-test.2

package/dist/commands/init.js

@@ -8,6 +8,7 @@
  */
 import { Command, Flags } from '@oclif/core';
 import pc from 'picocolors';
+import crypto from 'node:crypto';
 import { existsSync } from 'node:fs';
 import path from 'node:path';
 import { stdin as stdinStream, stdout as stdoutStream } from 'node:process';
@@ -84,6 +85,16 @@ function explicitApiBaseUrlFlag(flags) {
 function explicitDbHostFlag(flags) {
     return String(flags['db-host'] ?? '').trim();
 }
+function optionalInitString(value) {
+    const text = String(value ?? '').trim();
+    return text || undefined;
+}
+function resolveManagedAppKey(value) {
+    return optionalInitString(value) ?? crypto.randomBytes(32).toString('hex');
+}
+function resolveManagedTimeZone(value) {
+    return optionalInitString(value) ?? (Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC');
+}
 function shouldAllowExistingInitEnv() {
     return argvHasToken(process.argv.slice(2), ['--force', '-f']);
 }
@@ -803,6 +814,7 @@ Prompt modes:
     }
     async persistManagedEnvConfig(results, flags = {}) {
         const envName = String(results.appName ?? DEFAULT_INIT_APP_NAME).trim() || DEFAULT_INIT_APP_NAME;
+        const existingEnv = await getEnv(envName, { scope: resolveDefaultConfigScope() });
         const appPort = String(results.appPort ?? '').trim();
         const source = String(results.source ?? '').trim();
         const version = resolveInitDownloadVersion(results);
@@ -826,11 +838,15 @@ Prompt modes:
         const authUsername = authType === 'basic' ? String(results.username ?? results.rootUsername ?? '').trim() : '';
         const accessToken = String(results.accessToken ?? '');
         const skipDownload = results.skipDownload === true;
+        const appKey = resolveManagedAppKey(results.appKey ?? existingEnv?.config.appKey);
+        const timeZone = resolveManagedTimeZone(results.timeZone ?? existingEnv?.config.timezone);
         const builtinDb = explicitDbHostFlag(flags)
             ? false
             : results.builtinDb === undefined
                 ? undefined
                 : Boolean(results.builtinDb);
+        results.appKey = appKey;
+        results.timeZone = timeZone;
         await upsertEnv(envName, {
             ...(source === 'docker'
                 ? { kind: 'docker' }
@@ -852,6 +868,8 @@ Prompt modes:
             ...(appRootPath ? { appRootPath } : {}),
             ...(storagePath ? { storagePath } : {}),
             ...(appPort ? { appPort } : {}),
+            ...(appKey ? { appKey } : {}),
+            ...(timeZone ? { timezone: timeZone } : {}),
             ...(!skipDownload && results.devDependencies !== undefined
                 ? { devDependencies: Boolean(results.devDependencies) }
                 : {}),

package/dist/commands/install.js

@@ -843,6 +843,18 @@ export default class Install extends Command {
         const text = String(value).trim();
         return text || undefined;
     }
+    static resolveManagedAppKey(value) {
+        return Install.toOptionalPromptString(value) ?? crypto.randomBytes(32).toString('hex');
+    }
+    static resolveManagedTimeZone(value) {
+        return Install.toOptionalPromptString(value) ?? (Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC');
+    }
+    async ensureManagedAppRuntimeConfig(params) {
+        const savedEnv = await getEnv(params.envName, { scope: resolveDefaultConfigScope() });
+        const savedConfig = savedEnv?.config;
+        params.appResults.appKey = Install.resolveManagedAppKey(params.appResults.appKey ?? savedConfig?.appKey);
+        params.appResults.timeZone = Install.resolveManagedTimeZone(params.appResults.timeZone ?? savedConfig?.timezone);
+    }
     static async validateAppPort(value, values) {
         const formatError = validateTcpPort(value);
         if (formatError) {
@@ -1665,8 +1677,8 @@ export default class Install extends Command {
         const dbSchema = optionalEnvString(params.dbResults.dbSchema);
         const dbTablePrefix = optionalEnvString(params.dbResults.dbTablePrefix);
         const dbUnderscored = optionalEnvBoolean(params.dbResults.dbUnderscored);
-        const appKey = crypto.randomBytes(32).toString('hex');
-        const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
+        const appKey = Install.resolveManagedAppKey(params.appResults.appKey);
+        const timeZone = Install.resolveManagedTimeZone(params.appResults.timeZone);
         const containerName = Install.buildDockerAppContainerName(params.envName, params.dockerContainerPrefix ?? params.workspaceName);
         const configuredEnvFile = String(params.appResults.envFile ?? '').trim();
         const envFile = await resolveDockerEnvFileArg(params.envName, configuredEnvFile ? { envFile: configuredEnvFile } : undefined);
@@ -1889,8 +1901,8 @@ export default class Install extends Command {
         const storagePath = resolveConfiguredEnvPath(configuredStoragePath) ??
             resolveEnvRelativePath(defaultInstallStoragePath(params.envName));
         const dbDialect = String(params.dbResults.dbDialect ?? 'postgres').trim() || 'postgres';
-        const appKey = crypto.randomBytes(32).toString('hex');
-        const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC';
+        const appKey = Install.resolveManagedAppKey(params.appResults.appKey);
+        const timeZone = Install.resolveManagedTimeZone(params.appResults.timeZone);
         const env = {
             STORAGE_PATH: storagePath,
             APP_PORT: String(params.appResults.appPort ?? DEFAULT_INSTALL_APP_PORT).trim() || DEFAULT_INSTALL_APP_PORT,
@@ -2280,6 +2292,10 @@ export default class Install extends Command {
         }
         const promptResults = await this.collectPromptResults(parsed, flags.yes);
         const { envName, appResults, downloadResults, dbResults, rootResults, envAddResults } = promptResults;
+        await this.ensureManagedAppRuntimeConfig({
+            envName,
+            appResults,
+        });
         const source = String(downloadResultsValue(downloadResults, 'source') ?? '').trim();
         const usesDockerResources = Boolean(dbResults.builtinDb) || source === 'docker';
         const dockerNetworkName = usesDockerResources

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.42-test.1",
+  "version": "2.1.0-beta.42-test.2",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",