@nocobase/cli 2.1.0-alpha.35 → 2.1.0-alpha.36

package/dist/commands/install.js

@@ -7,8 +7,6 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Command, Flags } from '@oclif/core';
-import * as p from '@clack/prompts';
-import _ from 'lodash';
 import { spawn } from 'node:child_process';
 import crypto from 'node:crypto';
 import { mkdir } from 'node:fs/promises';
@@ -24,7 +22,8 @@ import { findAvailableTcpPort, validateAvailableTcpPort, validateTcpPort, valida
 import { validateExternalDbConfig } from "../lib/db-connection-check.js";
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { run, runNocoBaseCommand } from '../lib/run-npm.js';
-import { startTask, stopTask, updateTask } from '../lib/ui.js';
+import { printInfo, printStage, printVerbose, printWarning, setVerboseMode, } from '../lib/ui.js';
+import { omitKeys, upperFirst } from "../lib/object-utils.js";
 import { getEnv, setCurrentEnv, upsertEnv } from '../lib/auth-store.js';
 import { buildStoredEnvConfig } from '../lib/env-config.js';
 import Download, { defaultDockerRegistryForLang, } from './download.js';
@@ -260,6 +259,13 @@ async function commandOutput(command, args, options) {
     });
 }
 export default class Install extends Command {
+    ensuredDockerNetworks = new Set();
+    logStage(title) {
+        printStage(title);
+    }
+    logDetail(message) {
+        printVerbose(message);
+    }
     static hidden = true;
     static description = 'Install NocoBase: database, storage, admin user, and `nocobase-v1 install`. Optionally run `nb source download` first; distribution and image details are configured on `nb source download`, not here. Use `--resume` to continue an interrupted setup from the saved workspace env config.';
     static examples = [
@@ -288,6 +294,10 @@ export default class Install extends Command {
             description: 'Show detailed command output',
             default: false,
         }),
+        'skip-save-env-log': Flags.boolean({
+            hidden: true,
+            default: false,
+        }),
         env: Flags.string({
             char: 'e',
             description: 'App/env name to create or update. Defaults app paths to ./<envName>/source/ and ./<envName>/storage/.',
@@ -373,7 +383,7 @@ export default class Install extends Command {
             description: 'Download NocoBase app files or pull a Docker image before installing',
             default: false,
         }),
-        ..._.omit(Download.flags, ['yes']),
+        ...omitKeys(Download.flags, ['yes']),
     };
     /** Environment name only: run before {@link Install.prompts} (see `run`). */
     static envPrompts = {
@@ -797,7 +807,7 @@ export default class Install extends Command {
         const database = String(dbResults.dbDatabase ?? '').trim();
         const address = host && port ? `${host}:${port}` : host || port || '(unknown address)';
         const target = database ? `${address}/${database}` : address;
-        p.log.step(`Checking external ${dialect} database: ${target}`);
+        printVerbose(`Checking external ${dialect} database: ${target}`);
         const validationError = await validateExternalDbConfig(dbResults);
         if (validationError) {
             throw new Error(validationError);
@@ -1026,7 +1036,7 @@ export default class Install extends Command {
         }
         const nextPort = await findAvailableTcpPort();
         if (options?.warn) {
-            p.log.warn(`${options.label ?? 'Default port'} ${normalized} is already in use. Using available port ${nextPort} for this setup.`);
+            printWarning(`${options.label ?? 'Default port'} ${normalized} is already in use. Using available port ${nextPort} for this setup.`);
         }
         return nextPort;
     }
@@ -1093,7 +1103,6 @@ export default class Install extends Command {
             yes: false,
             hooks: {
                 onCancel: () => {
-                    p.cancel('Download cancelled.');
                     exit(0);
                 },
                 onMissingNonInteractive: (message) => {
@@ -1443,18 +1452,23 @@ export default class Install extends Command {
         throw new Error(`Built-in database does not support "${dbDialect}" yet. Please choose PostgreSQL, MySQL, MariaDB, or KingbaseES.`);
     }
     async ensureDockerNetwork(name) {
-        p.log.step(`Checking Docker network: ${name}`);
+        if (this.ensuredDockerNetworks.has(name)) {
+            return;
+        }
+        printVerbose(`Checking Docker network: ${name}`);
         const exists = await commandSucceeds('docker', ['network', 'inspect', name]);
         if (exists) {
-            p.log.info(`Docker network already exists: ${name}`);
+            printVerbose(`Docker network already exists: ${name}`);
+            this.ensuredDockerNetworks.add(name);
             return;
         }
-        p.log.step(`Creating Docker network: ${name}`);
+        printVerbose(`Creating Docker network: ${name}`);
         try {
             await run('docker', ['network', 'create', name], {
                 errorName: 'docker network create',
             });
-            p.log.info(`Docker network is ready: ${name}`);
+            printVerbose(`Docker network is ready: ${name}`);
+            this.ensuredDockerNetworks.add(name);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
@@ -1489,7 +1503,7 @@ export default class Install extends Command {
         if (!params.force) {
             return true;
         }
-        p.log.info(`Removing existing ${params.displayName}: ${params.containerName}`);
+        printVerbose(`Removing existing ${params.displayName}: ${params.containerName}`);
         await this.removeDockerContainer(params.containerName);
         return false;
     }
@@ -1513,7 +1527,7 @@ export default class Install extends Command {
     async ensureBuiltinDbContainer(plan, options) {
         const exists = await this.dockerContainerExists(plan.containerName);
         if (exists) {
-            p.log.info(`Built-in ${plan.dbDialect} container already exists: ${plan.containerName}`);
+            printVerbose(`Built-in ${plan.dbDialect} container already exists: ${plan.containerName}`);
             return;
         }
         await mkdir(plan.dataDir, { recursive: true });
@@ -1540,7 +1554,8 @@ export default class Install extends Command {
             dbPassword: params.dbResults.dbPassword,
             builtinDbImage: params.dbResults.builtinDbImage,
         });
-        p.log.step(`Preparing built-in ${plan.dbDialect} database`);
+        this.logStage('Preparing database');
+        printInfo(`Using built-in ${plan.dbDialect} database.`);
         await this.ensureDockerNetwork(plan.networkName);
         const existingContainerKept = await this.removeDockerContainerIfForced({
             containerName: plan.containerName,
@@ -1556,7 +1571,8 @@ export default class Install extends Command {
         await this.ensureBuiltinDbContainer(plan, {
             stdio: params.commandStdio ?? 'ignore',
         });
-        p.log.info(`Built-in ${plan.dbDialect} database is ready at ${plan.dbHost}:${plan.dbPort}`);
+        printInfo(`${upperFirst(plan.dbDialect)} database ready.`);
+        printVerbose(`Built-in ${plan.dbDialect} database ready at ${plan.dbHost}:${plan.dbPort}`);
         return plan;
     }
     static buildDockerAppPlan(params) {
@@ -1617,7 +1633,7 @@ export default class Install extends Command {
     async ensureDockerAppContainer(plan, options) {
         const exists = await this.dockerContainerExists(plan.containerName);
         if (exists) {
-            p.log.info(`App container already exists: ${plan.containerName}`);
+            printVerbose(`App container already exists: ${plan.containerName}`);
             return 'existing';
         }
         await mkdir(plan.storagePath, { recursive: true });
@@ -1641,7 +1657,7 @@ export default class Install extends Command {
             rootResults: params.rootResults,
             networkName,
         });
-        p.log.step(`Starting Docker app ${plan.imageRef}`);
+        printVerbose('Starting NocoBase app (Docker)');
         await this.removeDockerContainerIfForced({
             containerName: plan.containerName,
             displayName: 'app container',
@@ -1655,7 +1671,7 @@ export default class Install extends Command {
             plan.appKey = env.APP_KEY || plan.appKey;
             plan.timeZone = env.TZ || plan.timeZone;
         }
-        p.log.info(`App container is ready at http://127.0.0.1:${plan.appPort}`);
+        printVerbose(`NocoBase app is starting at http://127.0.0.1:${plan.appPort}`);
         return plan;
     }
     static pushDownloadArgIfValue(argv, flag, value) {
@@ -1666,6 +1682,9 @@ export default class Install extends Command {
     }
     static buildDownloadArgvFromResults(results, options) {
         const argv = ['-y', '--no-intro'];
+        if (options?.compactLog) {
+            argv.push('--compact-log');
+        }
         const source = String(results.source ?? '').trim();
         if (options?.verbose) {
             argv.push('--verbose');
@@ -1718,11 +1737,8 @@ export default class Install extends Command {
     async downloadManagedSource(params) {
         const argv = Install.buildDownloadArgvFromResults(params.downloadResults, {
             verbose: params.verbose,
+            compactLog: true,
         });
-        const source = String(params.downloadResults.source ?? '').trim();
-        p.log.step(source === 'docker'
-            ? 'Downloading Docker image'
-            : 'Downloading local NocoBase app files');
         return await this.config.runCommand('source:download', argv);
     }
     async downloadLocalApp(params) {
@@ -1784,7 +1800,7 @@ export default class Install extends Command {
             rootResults: params.rootResults,
         });
         const args = ['start', '--quickstart', '--daemon'];
-        p.log.step(`Stopping any existing local NocoBase process in ${params.projectRoot}`);
+        this.logDetail(`Stopping any existing local NocoBase process in ${params.projectRoot}`);
         try {
             await runNocoBaseCommand(['pm2', 'kill'], {
                 cwd: params.projectRoot,
@@ -1794,15 +1810,15 @@ export default class Install extends Command {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            p.log.info(`Skipped local process cleanup before start: ${message}`);
+            this.logDetail(`Skipped local process cleanup before start: ${message}`);
         }
-        p.log.step(`Starting local NocoBase app from ${params.projectRoot}`);
+        this.logDetail(`Starting local NocoBase app from ${params.projectRoot}`);
         await runNocoBaseCommand(args, {
             cwd: params.projectRoot,
             env,
             stdio: params.commandStdio ?? 'ignore',
         });
-        p.log.info(`Local app is starting at http://127.0.0.1:${env.APP_PORT}`);
+        this.logDetail(`Local app is starting at http://127.0.0.1:${env.APP_PORT}`);
         return {
             source: params.source,
             projectRoot: params.projectRoot,
@@ -1876,35 +1892,29 @@ export default class Install extends Command {
         const fetchImpl = options?.fetchImpl ?? fetch;
         const startedAt = Date.now();
         let lastMessage = 'No response yet';
-        let taskActive = true;
-        startTask(`Waiting for application health check: ${healthCheckUrl}. NocoBase has started and is still booting...`);
-        try {
-            while (Date.now() - startedAt < timeoutMs) {
-                const result = await Install.requestAppHealthCheck({
-                    healthCheckUrl,
-                    fetchImpl,
-                    requestTimeoutMs,
-                });
-                if (result.ok) {
-                    stopTask();
-                    taskActive = false;
-                    p.log.info(`Application health check passed: ${healthCheckUrl}`);
-                    return;
-                }
-                lastMessage = result.message;
-                const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
-                updateTask(`Waiting for application health check: ${healthCheckUrl}. Still starting... (${elapsedSeconds}s elapsed, last status: ${Install.formatHealthCheckMessage(lastMessage)})`);
-                const remainingMs = timeoutMs - (Date.now() - startedAt);
-                if (remainingMs <= 0) {
-                    break;
-                }
-                await Install.sleep(Math.min(intervalMs, remainingMs));
+        let lastLoggedStatus = '';
+        printInfo('Waiting for NocoBase to become ready...');
+        while (Date.now() - startedAt < timeoutMs) {
+            const result = await Install.requestAppHealthCheck({
+                healthCheckUrl,
+                fetchImpl,
+                requestTimeoutMs,
+            });
+            if (result.ok) {
+                return;
             }
-        }
-        finally {
-            if (taskActive) {
-                stopTask();
+            lastMessage = result.message;
+            const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
+            const statusLine = `Waiting for NocoBase to become ready... (${elapsedSeconds}s elapsed, last status: ${Install.formatHealthCheckMessage(lastMessage)})`;
+            if (statusLine !== lastLoggedStatus) {
+                printInfo(statusLine);
+                lastLoggedStatus = statusLine;
+            }
+            const remainingMs = timeoutMs - (Date.now() - startedAt);
+            if (remainingMs <= 0) {
+                break;
             }
+            await Install.sleep(Math.min(intervalMs, remainingMs));
         }
         const logHint = options?.containerName
             ? ` You can inspect startup logs with: docker logs ${options.containerName}`
@@ -2049,7 +2059,14 @@ export default class Install extends Command {
             },
             yes,
         });
-        const envAddResults = await runPromptCatalog(EnvAdd.prompts, {
+        const envAddPromptsForInstall = {
+            ...EnvAdd.prompts,
+            apiBaseUrl: {
+                ...EnvAdd.prompts.apiBaseUrl,
+                validate: undefined,
+            },
+        };
+        const envAddResults = await runPromptCatalog(envAddPromptsForInstall, {
             initialValues: {
                 apiBaseUrl: `http://127.0.0.1:${appResults.appPort ?? DEFAULT_INSTALL_APP_PORT}/api`,
             },
@@ -2077,13 +2094,14 @@ export default class Install extends Command {
         const parsed = {
             ...flags,
         };
+        setVerboseMode(Boolean(parsed.verbose));
         const commandStdio = this.commandStdio(parsed.verbose);
         if (!parsed['no-intro']) {
-            p.intro('Set Up NocoBase');
+            this.logStage('Set up NocoBase');
         }
         if (parsed.resume) {
             const envLabel = Install.toOptionalPromptString(parsed.env);
-            p.log.step(envLabel
+            printInfo(envLabel
                 ? `Resuming setup for env "${envLabel}" from the saved workspace config`
                 : 'Resuming setup from the saved workspace config');
         }
@@ -2100,6 +2118,9 @@ export default class Install extends Command {
             : undefined;
         await Install.ensureExternalDbReadyForInstall(dbResults);
         if (!parsed.resume) {
+            if (!parsed['skip-save-env-log']) {
+                this.logStage('Saving env config');
+            }
             await this.saveInstalledEnv({
                 envName,
                 appResults,
@@ -2108,7 +2129,9 @@ export default class Install extends Command {
                 rootResults,
                 envAddResults,
             });
-            p.log.info(`Saved install config for env "${envName}"`);
+            if (!parsed['skip-save-env-log']) {
+                printInfo(`Saved env config for "${envName}".`);
+            }
         }
         let builtinDbPlan;
         if (Boolean(dbResults.builtinDb)) {
@@ -2132,11 +2155,13 @@ export default class Install extends Command {
         let dockerAppPlan;
         let localAppPlan;
         if (Boolean(appResults.fetchSource)) {
+            this.logStage('Preparing application');
             if (source === 'docker') {
                 await this.downloadManagedSource({
                     downloadResults,
                     verbose: parsed.verbose,
                 });
+                printInfo('Application image ready.');
                 dockerAppPlan = await this.installDockerApp({
                     envName,
                     dockerNetworkName,
@@ -2160,6 +2185,7 @@ export default class Install extends Command {
                     downloadResults,
                     verbose: parsed.verbose,
                 });
+                printInfo('Application files ready.');
                 localAppPlan = await this.startLocalApp({
                     envName,
                     source: localSource,
@@ -2174,15 +2200,17 @@ export default class Install extends Command {
             }
         }
         else {
-            p.log.info('Skipped app download and install.');
+            this.logDetail('Skipped app download and install.');
         }
         if (dockerAppPlan || localAppPlan) {
+            this.logStage('Starting NocoBase');
             await this.waitForAppHealthCheck(Install.resolveApiBaseUrl({
                 appResults,
                 envAddResults,
             }), {
                 containerName: dockerAppPlan?.containerName,
             });
+            printInfo(`NocoBase is ready at http://127.0.0.1:${dockerAppPlan?.appPort ?? localAppPlan?.appPort}`);
         }
         if (dockerAppPlan || localAppPlan || builtinDbPlan) {
             await this.saveInstalledEnv({
@@ -2199,9 +2227,9 @@ export default class Install extends Command {
             envAddResults,
             appReady: Boolean(dockerAppPlan || localAppPlan),
         });
-        p.outro(dockerAppPlan || localAppPlan
-            ? `NocoBase is ready at http://127.0.0.1:${dockerAppPlan?.appPort ?? localAppPlan?.appPort}`
-            : `Install config for "${envName}" has been saved.`);
+        if (!dockerAppPlan && !localAppPlan) {
+            printInfo(`Install config for "${envName}" has been saved.`);
+        }
     }
 }
 function downloadResultsValue(downloadResults, key) {

package/dist/commands/license/activate.js

@@ -6,10 +6,10 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import * as p from '@clack/prompts';
 import { Command, Flags } from '@oclif/core';
 import { readFile } from 'node:fs/promises';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
+import { input, password as promptPassword, select } from "../../lib/inquirer.js";
 import { createLicenseEnvFlag, ensureInstanceId, licenseJsonFlag, licensePkgUrlFlag, licenseYesFlag, redactLicenseKey, requireLicenseRuntime, resolveLicenseKeyFile, resolveLicenseServiceUrl, saveLicenseKey, sanitizeLicenseOutput, validateLicenseKey, } from './shared.js';
 import { announceTargetEnv, isInteractiveTerminal } from '../../lib/ui.js';
 import { appUrl } from '../env/shared.js';
@@ -17,102 +17,107 @@ function resolveOnlineInputValue(value) {
     return String(value ?? '').trim();
 }
 async function promptActivationMode() {
-    const answer = await p.select({
-        message: 'How do you want to activate the license?',
-        options: [
-            { value: 'key', label: 'Use an existing license key' },
-            { value: 'online', label: 'Request and activate a license online' },
-            { value: 'cancel', label: 'Cancel' },
-        ],
-        initialValue: 'key',
-    });
-    if (p.isCancel(answer)) {
-        p.cancel('License activation cancelled.');
+    try {
+        return await select({
+            message: 'How do you want to activate the license?',
+            choices: [
+                { value: 'key', name: 'Use an existing license key' },
+                { value: 'online', name: 'Request and activate a license online' },
+                { value: 'cancel', name: 'Cancel' },
+            ],
+            default: 'key',
+        });
+    }
+    catch {
         return 'cancel';
     }
-    return answer;
 }
 async function promptLicenseKeyInput() {
-    const answer = await p.select({
-        message: 'How do you want to provide the license key?',
-        options: [
-            { value: 'key', label: 'Paste the license key' },
-            { value: 'file', label: 'Read the key from a file' },
-        ],
-        initialValue: 'key',
-    });
-    if (p.isCancel(answer)) {
-        p.cancel('License activation cancelled.');
+    let answer;
+    try {
+        answer = await select({
+            message: 'How do you want to provide the license key?',
+            choices: [
+                { value: 'key', name: 'Paste the license key' },
+                { value: 'file', name: 'Read the key from a file' },
+            ],
+            default: 'key',
+        });
+    }
+    catch {
         return {};
     }
     if (answer === 'key') {
-        const key = await p.text({
-            message: 'License key',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'License key is required.',
-        });
-        if (p.isCancel(key)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const key = await input({
+                message: 'License key',
+                validate: (value) => String(value ?? '').trim() ? true : 'License key is required.',
+            });
+            return { key: String(key ?? '').trim() || undefined };
+        }
+        catch {
             return {};
         }
-        return { key: String(key ?? '').trim() || undefined };
     }
-    const keyFile = await p.text({
-        message: 'Path to the license key file',
-        validate: (value) => String(value ?? '').trim() ? undefined : 'License key file path is required.',
-    });
-    if (p.isCancel(keyFile)) {
-        p.cancel('License activation cancelled.');
+    try {
+        const keyFile = await input({
+            message: 'Path to the license key file',
+            validate: (value) => String(value ?? '').trim() ? true : 'License key file path is required.',
+        });
+        return { keyFile: String(keyFile ?? '').trim() || undefined };
+    }
+    catch {
         return {};
     }
-    return { keyFile: String(keyFile ?? '').trim() || undefined };
 }
 async function promptOnlineActivationInput(initial) {
     let account = String(initial.account ?? '').trim();
     if (!account) {
-        const answer = await p.text({
-            message: 'Service account',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'Service account is required.',
-        });
-        if (p.isCancel(answer)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const answer = await input({
+                message: 'Service account',
+                validate: (value) => String(value ?? '').trim() ? true : 'Service account is required.',
+            });
+            account = String(answer ?? '').trim();
+        }
+        catch {
             return;
         }
-        account = String(answer ?? '').trim();
     }
     if (!account) {
-        p.cancel('License activation cancelled.');
         return;
     }
     let password = String(initial.password ?? '').trim();
     if (!password) {
-        const answer = await p.password({
-            message: 'Service password',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'Service password is required.',
-        });
-        if (p.isCancel(answer)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const answer = await promptPassword({
+                message: 'Service password',
+                mask: '•',
+                validate: (value) => String(value ?? '').trim() ? true : 'Service password is required.',
+            });
+            password = String(answer ?? '').trim();
+        }
+        catch {
             return;
         }
-        password = String(answer ?? '').trim();
     }
     if (!password) {
-        p.cancel('License activation cancelled.');
         return;
     }
     let appName = String(initial.appName ?? '').trim();
     if (!appName) {
-        const answer = await p.text({
-            message: 'Application name',
-            validate: (value) => String(value ?? '').trim() ? undefined : 'Application name is required.',
-        });
-        if (p.isCancel(answer)) {
-            p.cancel('License activation cancelled.');
+        try {
+            const answer = await input({
+                message: 'Application name',
+                validate: (value) => String(value ?? '').trim() ? true : 'Application name is required.',
+            });
+            appName = String(answer ?? '').trim();
+        }
+        catch {
             return;
         }
-        appName = String(answer ?? '').trim();
     }
     if (!appName) {
-        p.cancel('License activation cancelled.');
         return;
     }
     return {
@@ -206,7 +211,6 @@ export default class LicenseActivate extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }
@@ -223,7 +227,6 @@ export default class LicenseActivate extends Command {
             }
             const mode = await promptActivationMode();
             if (mode === 'cancel') {
-                this.log('Cancelled license activation.');
                 return;
             }
             if (mode === 'online') {
@@ -258,7 +261,6 @@ export default class LicenseActivate extends Command {
                 }
                 const prompted = await promptOnlineActivationInput(initialOnline);
                 if (!prompted) {
-                    this.log('Cancelled license activation.');
                     return;
                 }
                 onlineInput = prompted;

package/dist/commands/license/id.js

@@ -39,7 +39,6 @@ export default class LicenseId extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/plugins/clean.js

@@ -56,7 +56,6 @@ export default class LicensePluginsClean extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/plugins/list.js

@@ -36,7 +36,6 @@ export default class LicensePluginsList extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/plugins/sync.js

@@ -167,7 +167,6 @@ export default class LicensePluginsSync extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }

package/dist/commands/license/shared.js

@@ -10,12 +10,12 @@ 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 _ from 'lodash';
 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';
+import { deepEqual, omitKeys } from "../../lib/object-utils.js";
 import { commandOutput } from '../../lib/run-npm.js';
 import { appUrl } from '../env/shared.js';
 export function createLicenseEnvFlag(description) {
@@ -296,7 +296,7 @@ export function isDbMatch(env, keyData) {
     if (currentDb?.id && licenseDb?.id) {
         return currentDb.id === licenseDb.id;
     }
-    return _.isEqual(_.omit(currentDb, ['id']), _.omit(licenseDb, ['id']));
+    return deepEqual(omitKeys(currentDb, ['id']), omitKeys(licenseDb, ['id']));
 }
 export function isSysMatch(env, keyData) {
     const instance = keyData?.instanceData;
@@ -307,7 +307,7 @@ export function isSysMatch(env, keyData) {
         sys: item?.sys ?? null,
         osVer: item?.osVer ?? null,
     });
-    return _.isEqual(normalize(env), normalize(instance));
+    return deepEqual(normalize(env), normalize(instance));
 }
 export async function getLicenseStatus(keyData) {
     if (!keyData) {

package/dist/commands/license/status.js

@@ -38,7 +38,6 @@ export default class LicenseStatus extends Command {
                 yes: flags.yes,
             });
             if (!confirmed) {
-                this.log('Canceled.');
                 return;
             }
         }