@nocobase/cli 2.1.3 → 2.1.4-test.1

package/dist/commands/app/destroy.js

@@ -143,6 +143,7 @@ export default class AppDestroy extends Command {
         }
         announceTargetEnv(runtime.envName);
         try {
+            const retryCommand = `nb env remove ${runtime.envName} --purge --force`;
             if (runtime.kind === 'docker') {
                 startTask(`Removing Docker app container for "${runtime.envName}"...`);
                 const state = await removeDockerContainerIfExists(runtime.containerName, {
@@ -192,7 +193,7 @@ export default class AppDestroy extends Command {
                     const localAppPath = resolveManagedLocalAppPath(runtime);
                     if (localAppPath && removesManagedLocalAppFiles) {
                         startTask(`Removing managed local app files for "${runtime.envName}"...`);
-                        await removePathIfExists(localAppPath, `managed app files for "${runtime.envName}"`);
+                        await removePathIfExists(localAppPath, `managed app files for "${runtime.envName}"`, { retryCommand });
                         succeedTask(`Managed local app files removed for "${runtime.envName}".`);
                     }
                     else {
@@ -206,13 +207,13 @@ export default class AppDestroy extends Command {
                 ];
                 startTask(`Removing proxy entry files for "${runtime.envName}"...`);
                 for (const proxyEntryDir of proxyEntryDirs) {
-                    await removePathIfExists(proxyEntryDir, `proxy entry files for "${runtime.envName}"`);
+                    await removePathIfExists(proxyEntryDir, `proxy entry files for "${runtime.envName}"`, { retryCommand });
                 }
                 succeedTask(`Proxy entry files removed for "${runtime.envName}".`);
                 const configuredStoragePath = resolveConfiguredStoragePath(runtime.env.config);
                 if (configuredStoragePath) {
                     startTask(`Removing storage data for "${runtime.envName}"...`);
-                    await removePathIfExists(configuredStoragePath, `storage data for "${runtime.envName}"`);
+                    await removePathIfExists(configuredStoragePath, `storage data for "${runtime.envName}"`, { retryCommand });
                     succeedTask(`Storage data removed for "${runtime.envName}".`);
                 }
                 else {

package/dist/commands/app/shared.js

@@ -25,10 +25,54 @@ function assertSafeRemovalPath(target, label) {
         throw new Error(`Refusing to remove ${label} at "${resolved}" because it is too broad.`);
     }
 }
-export async function removePathIfExists(target, label) {
+function getErrorCode(error) {
+    if (!(error instanceof Error)) {
+        return undefined;
+    }
+    const { code } = error;
+    return typeof code === 'string' ? code : undefined;
+}
+function isPermissionDeniedError(error) {
+    const code = getErrorCode(error);
+    return code === 'EACCES' || code === 'EPERM';
+}
+function formatOriginalError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const code = getErrorCode(error);
+    return code && !message.includes(code) ? `${code}: ${message}` : message;
+}
+function quoteShellValue(value) {
+    return `"${value.replace(/(["\\$`])/g, '\\$1')}"`;
+}
+function formatPermissionDeniedRemovalError(target, label, error, options) {
+    const retryLines = os.platform() === 'win32' ? [] : [`  sudo chown -R "$(id -u):$(id -g)" ${quoteShellValue(target)}`];
+    if (options.retryCommand) {
+        retryLines.push(`  ${options.retryCommand}`);
+    }
+    return [
+        `Failed to remove ${label} at "${target}".`,
+        'The current user cannot delete one or more files under this path. Files may have been created by a Docker container running as root.',
+        '',
+        retryLines.length > 0
+            ? 'Fix ownership or permissions, then retry:'
+            : 'Fix ownership or permissions, then retry the command.',
+        ...retryLines,
+        '',
+        `Original error: ${formatOriginalError(error)}`,
+    ].join('\n');
+}
+export async function removePathIfExists(target, label, options = {}) {
     const resolved = path.resolve(target);
     assertSafeRemovalPath(resolved, label);
-    await fsp.rm(resolved, { recursive: true, force: true });
+    try {
+        await fsp.rm(resolved, { recursive: true, force: true });
+    }
+    catch (error) {
+        if (isPermissionDeniedError(error)) {
+            throw new Error(formatPermissionDeniedRemovalError(resolved, label, error, options));
+        }
+        throw error;
+    }
 }
 function isMissingDockerContainerError(error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -116,7 +160,9 @@ export function managedDockerNetworkName(runtime) {
     return runtime.dockerNetworkName?.trim() || runtime.workspaceName?.trim() || undefined;
 }
 export function resolveManagedLocalAppPath(runtime) {
-    return resolveConfiguredAppPath(runtime.env.config) || runtime.projectRoot || resolveConfiguredPath(runtime.env.config.appRootPath);
+    return (resolveConfiguredAppPath(runtime.env.config) ||
+        runtime.projectRoot ||
+        resolveConfiguredPath(runtime.env.config.appRootPath));
 }
 export function shouldRemoveManagedLocalAppFiles(runtime) {
     return runtime.source === 'npm' || runtime.source === 'git' || runtime.source === 'local';

package/dist/commands/license/activate.js

@@ -143,11 +143,14 @@ export default class LicenseActivate extends Command {
         const validation = await validateLicenseKey(runtime, resolvedKey);
         const ok = !validation.keyStatus && validation.envMatch && validation.domainMatch && validation.licenseStatus === 'active';
         const licenseKeyPath = ok ? await saveLicenseKey(runtime, resolvedKey) : resolveLicenseKeyFile(runtime);
+        const shouldResolveInstanceId = Boolean(interactiveKeyFlowInstanceId || ok || (flags.json && !validation.keyStatus));
         const payload = {
             ok,
             env: runtime.envName,
             kind: runtime.kind,
-            instanceId: interactiveKeyFlowInstanceId ?? (await ensureInstanceId(runtime)),
+            instanceId: shouldResolveInstanceId
+                ? interactiveKeyFlowInstanceId ?? (await ensureInstanceId(runtime))
+                : undefined,
             mode: 'key',
             key: redactLicenseKey(resolvedKey),
             keyFile: keyFile || undefined,

package/dist/commands/license/shared.js

@@ -10,8 +10,8 @@ import { Flags } from '@oclif/core';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { getEnvAsync, getInstanceIdAsync, keyDecrypt } from '@nocobase/license-kit';
-import { checkExternalDbConnection, readExternalDbConnectionConfig, } from "../../lib/db-connection-check.js";
-import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef, } from "../../lib/docker-image.js";
+import { checkExternalDbConnection, readExternalDbConnectionConfig } from "../../lib/db-connection-check.js";
+import { DEFAULT_DOCKER_REGISTRY, DEFAULT_DOCKER_VERSION, resolveDockerImageRef } from "../../lib/docker-image.js";
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
 import { buildRuntimeEnvVars } from '../../lib/runtime-env-vars.js';
 import { resolveLicensePkgUrlFromConfig } from '../../lib/cli-config.js';
@@ -102,12 +102,7 @@ function buildDockerLicenseDbFlagArgs(envVars) {
     ];
 }
 async function runDockerLicenseJsonCommand(runtime, commandArgs) {
-    const args = [
-        'run',
-        '--rm',
-        '--network',
-        runtime.dockerNetworkName || runtime.workspaceName,
-    ];
+    const args = ['run', '--rm', '--network', runtime.dockerNetworkName || runtime.workspaceName];
     const dockerPlatform = normalizeDockerPlatform(runtime.env.config?.dockerPlatform);
     if (dockerPlatform) {
         args.push('--platform', dockerPlatform);
@@ -193,11 +188,11 @@ export async function generateValidatedInstanceIdFromEnvVars(envVars) {
 }
 async function generateInstanceIdForDockerRuntime(runtime) {
     const envVars = await buildRuntimeEnvVars(runtime);
-    const payload = await runDockerLicenseJsonCommand(runtime, [
+    const payload = (await runDockerLicenseJsonCommand(runtime, [
         'license',
         'generate-id',
         ...buildDockerLicenseDbFlagArgs(envVars),
-    ]);
+    ]));
     const instanceId = trimValue(payload.instanceId);
     if (!instanceId) {
         throw new Error('Docker instance ID generation did not return an instance ID.');
@@ -337,7 +332,7 @@ export async function getLicenseStatus(keyData) {
             }),
             signal: controller.signal,
         });
-        const payload = await response.json();
+        const payload = (await response.json());
         return payload?.data?.status === 'active' ? 'active' : 'invalid';
     }
     catch {
@@ -356,6 +351,22 @@ export async function validateLicenseKey(runtime, key) {
     catch {
         keyStatus = 'invalid';
     }
+    if (keyStatus) {
+        const currentDomain = appUrl(runtime);
+        return {
+            current: {
+                env: undefined,
+                domain: currentDomain ? new URL(currentDomain).host : '',
+            },
+            keyData,
+            keyStatus,
+            dbMatch: false,
+            sysMatch: false,
+            envMatch: false,
+            domainMatch: false,
+            licenseStatus: 'invalid',
+        };
+    }
     const currentEnv = await getCurrentLicenseEnv(runtime);
     const currentDomain = appUrl(runtime);
     const dbMatch = isDbMatch(currentEnv, keyData);
@@ -391,7 +402,7 @@ export async function resolveLicenseServiceUrl(value) {
     return (await resolveLicensePkgUrl(value)).replace(/\/+$/, '');
 }
 export async function resolveLicensePkgUrl(value) {
-    const normalized = String(value ?? '').trim() || await resolveLicensePkgUrlFromConfig();
+    const normalized = String(value ?? '').trim() || (await resolveLicensePkgUrlFromConfig());
     return normalized.replace(/\/+$/, '') + '/';
 }
 function shouldRedactOutputKey(key) {
@@ -414,9 +425,7 @@ export function sanitizeLicenseOutput(value) {
     if (value && typeof value === 'object') {
         return Object.fromEntries(Object.entries(value).map(([key, nestedValue]) => [
             key,
-            shouldRedactOutputKey(key)
-                ? redactOutputValue(String(nestedValue ?? ''))
-                : sanitizeLicenseOutput(nestedValue),
+            shouldRedactOutputKey(key) ? redactOutputValue(String(nestedValue ?? '')) : sanitizeLicenseOutput(nestedValue),
         ]));
     }
     return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.3",
+  "version": "2.1.4-test.1",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -142,6 +142,5 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
-  },
-  "gitHead": "f61e75119a74bbac25879f4edb8cf9913c99098a"
+  }
 }