@nocobase/cli 2.1.0-beta.33 → 2.1.0-beta.34

package/dist/lib/skills-manager.js

@@ -6,8 +6,11 @@
  * 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 fs from 'node:fs';
 import fsp from 'node:fs/promises';
 import path from 'node:path';
+import { createGunzip } from 'node:zlib';
+import * as tar from 'tar';
 import { resolveCliHomeDir } from './cli-home.js';
 import { compareVersions } from './self-manager.js';
 import { commandOutput, commandOutputViaFile, run } from './run-npm.js';
@@ -33,6 +36,15 @@ function resolveSkillsRoot(options = {}) {
 function getSkillsCacheRoot(globalRoot) {
     return path.join(globalRoot, 'cache', 'skills');
 }
+function getCachedSkillsPackageDir(cacheRoot) {
+    return path.join(cacheRoot, 'node_modules', '@nocobase', 'skills');
+}
+function getCachedSkillsPackRoot(cacheRoot) {
+    return path.join(cacheRoot, 'pack');
+}
+function getCachedSkillsExtractRoot(cacheRoot) {
+    return path.join(cacheRoot, 'extract');
+}
 export function getManagedSkillsStateFile(workspaceRoot) {
     return path.join(workspaceRoot, 'skills.json');
 }
@@ -95,7 +107,7 @@ async function readPublishedSkillsVersion(options = {}) {
     }
 }
 async function readCachedSkillsVersion(cacheRoot) {
-    const packageJsonPath = path.join(cacheRoot, 'node_modules', '@nocobase', 'skills', 'package.json');
+    const packageJsonPath = path.join(getCachedSkillsPackageDir(cacheRoot), 'package.json');
     try {
         const content = await fsp.readFile(packageJsonPath, 'utf8');
         const parsed = JSON.parse(content);
@@ -106,9 +118,59 @@ async function readCachedSkillsVersion(cacheRoot) {
         return undefined;
     }
 }
+async function resolvePackedSkillsTarball(packRoot) {
+    const entries = await fsp.readdir(packRoot, { withFileTypes: true });
+    const tarballs = entries
+        .filter((entry) => entry.isFile() && entry.name.endsWith('.tgz'))
+        .map((entry) => path.join(packRoot, entry.name))
+        .sort();
+    if (tarballs.length === 1) {
+        return tarballs[0];
+    }
+    if (tarballs.length === 0) {
+        throw new Error(`npm pack did not produce a local tarball for ${NOCOBASE_SKILLS_PACKAGE_NAME}.`);
+    }
+    throw new Error(`npm pack produced multiple tarballs for ${NOCOBASE_SKILLS_PACKAGE_NAME}.`);
+}
+async function extractPackedSkillsTarball(tarballPath, cacheRoot, targetVersion) {
+    const packageDir = getCachedSkillsPackageDir(cacheRoot);
+    const extractRoot = getCachedSkillsExtractRoot(cacheRoot);
+    await fsp.rm(extractRoot, { recursive: true, force: true });
+    await fsp.mkdir(extractRoot, { recursive: true });
+    try {
+        await new Promise((resolve, reject) => {
+            fs.createReadStream(tarballPath)
+                .pipe(createGunzip())
+                .pipe(tar.extract({ cwd: extractRoot, strip: 1 }))
+                .on('finish', () => resolve())
+                .on('error', reject);
+        });
+        const packageJsonPath = path.join(extractRoot, 'package.json');
+        const packageJsonRaw = await fsp.readFile(packageJsonPath, 'utf8');
+        const manifest = JSON.parse(packageJsonRaw);
+        const packageName = String(manifest.name ?? '').trim();
+        const packageVersion = String(manifest.version ?? '').trim();
+        if (packageName !== NOCOBASE_SKILLS_PACKAGE_NAME) {
+            throw new Error(`packed tarball resolved to ${packageName || '(missing package name)'} instead of ${NOCOBASE_SKILLS_PACKAGE_NAME}.`);
+        }
+        if (targetVersion && packageVersion !== targetVersion) {
+            throw new Error(`packed tarball resolved to version ${packageVersion || '(missing version)'} instead of ${targetVersion}.`);
+        }
+        await fsp.rm(packageDir, { recursive: true, force: true });
+        await fsp.mkdir(path.dirname(packageDir), { recursive: true });
+        await fsp.rename(extractRoot, packageDir);
+        return packageDir;
+    }
+    catch (error) {
+        await fsp.rm(extractRoot, { recursive: true, force: true });
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`failed to extract ${NOCOBASE_SKILLS_PACKAGE_NAME} tarball: ${message}`);
+    }
+}
 async function prepareLocalSkillsPackage(globalRoot, options = {}, targetVersion) {
     const cacheRoot = getSkillsCacheRoot(globalRoot);
-    const packageDir = path.join(cacheRoot, 'node_modules', '@nocobase', 'skills');
+    const packageDir = getCachedSkillsPackageDir(cacheRoot);
+    const packRoot = getCachedSkillsPackRoot(cacheRoot);
     const packageSpec = targetVersion ? `${NOCOBASE_SKILLS_PACKAGE_NAME}@${targetVersion}` : NOCOBASE_SKILLS_PACKAGE_NAME;
     const cachedVersion = await readCachedSkillsVersion(cacheRoot);
     await fsp.mkdir(cacheRoot, { recursive: true });
@@ -118,17 +180,19 @@ async function prepareLocalSkillsPackage(globalRoot, options = {}, targetVersion
             cleanup: async () => undefined,
         };
     }
-    await fsp.rm(path.join(cacheRoot, 'node_modules'), { recursive: true, force: true });
-    await (options.runFn ?? run)('npm', ['install', '--no-save', '--ignore-scripts', '--no-package-lock', packageSpec], {
-        cwd: cacheRoot,
-        stdio: options.verbose ? 'inherit' : 'ignore',
-        errorName: 'npm install',
-    });
+    await fsp.rm(packRoot, { recursive: true, force: true });
+    await fsp.mkdir(packRoot, { recursive: true });
     try {
-        await fsp.access(packageDir);
+        await (options.runFn ?? run)('npm', ['pack', '--silent', packageSpec], {
+            cwd: packRoot,
+            stdio: options.verbose ? 'inherit' : 'ignore',
+            errorName: 'npm pack',
+        });
+        const tarballPath = await resolvePackedSkillsTarball(packRoot);
+        await extractPackedSkillsTarball(tarballPath, cacheRoot, targetVersion);
     }
-    catch {
-        throw new Error(`npm install did not produce a local ${NOCOBASE_SKILLS_PACKAGE_NAME} package.`);
+    finally {
+        await fsp.rm(packRoot, { recursive: true, force: true });
     }
     return {
         packageDir,

package/dist/lib/startup-update.js

@@ -9,7 +9,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
-import * as p from '@clack/prompts';
+import { confirm } from "./inquirer.js";
 import { inspectSelfInstall, inspectSelfStatus, } from './self-manager.js';
 import { inspectSkillsStatus } from './skills-manager.js';
 import { resolveCliHomeDir } from './cli-home.js';
@@ -264,13 +264,17 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'warned' };
     }
-    const answer = await p.confirm({
-        message: buildPromptMessage(selfStatus, skillsStatus),
-        active: 'Yes',
-        inactive: 'No',
-        initialValue: true,
-    });
-    if (p.isCancel(answer) || !answer) {
+    let answer = false;
+    try {
+        answer = await confirm({
+            message: buildPromptMessage(selfStatus, skillsStatus),
+            default: true,
+        });
+    }
+    catch {
+        answer = false;
+    }
+    if (!answer) {
         printWarning(buildDeclinedWarning(selfStatus, skillsStatus));
         await markChecked();
         return { kind: 'declined' };

package/dist/lib/ui.js

@@ -6,12 +6,14 @@
  * 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 readline from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 import ora from 'ora';
 import pc from 'picocolors';
 let activeSpinner;
 let verboseMode = false;
+let lastStaticTaskMessage;
+let lastStaticTaskAt = 0;
+const STATIC_TASK_UPDATE_THROTTLE_MS = 3_000;
 function stringWidth(value) {
     return Array.from(value).length;
 }
@@ -22,58 +24,21 @@ function pad(value, width) {
 export function isInteractiveTerminal() {
     return Boolean(input.isTTY && output.isTTY);
 }
+function supportsDynamicTaskUpdates() {
+    return isInteractiveTerminal() && process.env.TERM !== 'dumb';
+}
 export function setVerboseMode(value) {
     verboseMode = value;
 }
 export function isVerboseMode() {
     return verboseMode;
 }
-export async function promptText(message, options) {
-    if (!isInteractiveTerminal()) {
-        return options?.defaultValue ?? '';
-    }
-    const rl = readline.createInterface({
-        input,
-        output,
-        terminal: true,
-    });
-    try {
-        const suffix = options?.defaultValue ? ` (${options.defaultValue})` : '';
-        const hint = options?.secret ? ' [input visible]' : '';
-        const prompt = `${message}${suffix}${hint}: `;
-        const answer = await rl.question(prompt);
-        return answer.trim() || options?.defaultValue || '';
-    }
-    finally {
-        rl.close();
-    }
-}
-export async function confirmAction(message, options) {
-    if (!isInteractiveTerminal()) {
-        return Boolean(options?.defaultValue);
-    }
-    stopTask();
-    const rl = readline.createInterface({
-        input,
-        output,
-        terminal: true,
-    });
-    try {
-        const suffix = options?.defaultValue ? pc.dim('[Y/n]') : pc.dim('[y/N]');
-        const prompt = `${pc.yellow('?')} ${pc.bold(message)} ${suffix} `;
-        const answer = await rl.question(prompt);
-        const normalized = answer.trim().toLowerCase();
-        if (!normalized) {
-            return Boolean(options?.defaultValue);
-        }
-        return normalized === 'y' || normalized === 'yes';
-    }
-    finally {
-        rl.close();
-    }
-}
 export function printSection(title) {
-    console.log(pc.bold(title));
+    console.log(title);
+}
+export function printStage(title) {
+    clearActiveSpinner();
+    console.log(title);
 }
 export function printInfo(message) {
     if (activeSpinner) {
@@ -134,17 +99,27 @@ export function startTask(message) {
     if (activeSpinner) {
         activeSpinner.stop();
     }
+    lastStaticTaskMessage = message;
+    lastStaticTaskAt = Date.now();
+    if (!supportsDynamicTaskUpdates()) {
+        activeSpinner = undefined;
+        console.log(pc.cyan(message));
+        return;
+    }
     activeSpinner = ora({
         text: pc.cyan(message),
-        isSilent: !isInteractiveTerminal(),
+        isSilent: false,
     }).start();
-    if (!isInteractiveTerminal()) {
-        console.log(pc.cyan(message));
-    }
 }
 export function updateTask(message) {
     if (!activeSpinner) {
-        startTask(message);
+        const now = Date.now();
+        if (message !== lastStaticTaskMessage
+            && now - lastStaticTaskAt >= STATIC_TASK_UPDATE_THROTTLE_MS) {
+            console.log(pc.cyan(message));
+            lastStaticTaskMessage = message;
+            lastStaticTaskAt = now;
+        }
         return;
     }
     activeSpinner.text = pc.cyan(message);
@@ -166,6 +141,8 @@ export function failTask(message) {
     console.error(pc.red(message));
 }
 export function stopTask() {
+    lastStaticTaskMessage = undefined;
+    lastStaticTaskAt = 0;
     clearActiveSpinner();
 }
 export function renderTable(headers, rows) {

package/dist/locale/en-US.json

@@ -51,7 +51,12 @@
   "validators": {
     "apiBaseUrl": {
       "invalid": "Enter a valid URL, for example {{example}}.",
-      "invalidProtocol": "URL must start with http:// or https://, for example {{example}}."
+      "invalidProtocol": "URL must start with http:// or https://, for example {{example}}.",
+      "healthCheckPathNotAllowed": "Do not include /__health_check in the API base URL. Enter the application API base URL, for example http://localhost:13000/api.",
+      "maintaining": "The API base URL is reachable, but the app is still starting or in maintenance mode. Please try again later.",
+      "healthCheckFailed": "The API base URL did not pass the health check (HTTP {{status}}). Make sure it points to a running NocoBase API endpoint.",
+      "timeout": "Timed out waiting for the API base URL health check after about {{seconds}} seconds.",
+      "unreachable": "Unable to connect to the API base URL. Check the address and make sure the server is reachable. Details: {{details}}"
     },
     "envKey": {
       "invalid": "Use letters and numbers only."
@@ -85,7 +90,7 @@
         },
         "apiBaseUrl": {
           "message": "What is the API base URL?",
-          "placeholder": "http://localhost:13000/api"
+          "placeholder": "https://demo.example.com/api or https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
           "message": "How would you like to sign in?",
@@ -302,7 +307,7 @@
         },
         "apiBaseUrl": {
           "message": "API base URL",
-          "placeholder": "http://localhost:13000/api"
+          "placeholder": "https://demo.example.com/api or https://demo.example.com/api/__app/<subapp>"
         }
       },
       "webUi": {

package/dist/locale/zh-CN.json

@@ -51,7 +51,12 @@
   "validators": {
     "apiBaseUrl": {
       "invalid": "请输入有效的 URL，例如 {{example}}。",
-      "invalidProtocol": "URL 必须以 http:// 或 https:// 开头，例如 {{example}}。"
+      "invalidProtocol": "URL 必须以 http:// 或 https:// 开头，例如 {{example}}。",
+      "healthCheckPathNotAllowed": "API 基础地址中不要包含 /__health_check。请输入应用的 API 基础地址，例如 http://localhost:13000/api。",
+      "maintaining": "该 API 地址可以访问，但应用仍在启动或维护过程中，请稍后再试。",
+      "healthCheckFailed": "该 API 地址未通过健康检查（HTTP {{status}}），请确认它指向的是一个正在运行的 NocoBase API 地址。",
+      "timeout": "等待 API 地址健康检查超时，约 {{seconds}} 秒内未收到响应。",
+      "unreachable": "无法连接到该 API 地址，请检查地址是否正确，并确认服务可访问。详情：{{details}}"
     },
     "envKey": {
       "invalid": "仅支持字母和数字。"
@@ -85,7 +90,7 @@
         },
         "apiBaseUrl": {
           "message": "API 基础地址是什么？",
-          "placeholder": "http://localhost:13000/api"
+          "placeholder": "https://demo.example.com/api 或 https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
           "message": "你想使用哪种登录方式？",
@@ -302,7 +307,7 @@
         },
         "apiBaseUrl": {
           "message": "API 基础地址",
-          "placeholder": "http://localhost:13000/api"
+          "placeholder": "https://demo.example.com/api 或 https://demo.example.com/api/__app/<subapp>"
         }
       },
       "webUi": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.34",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -80,12 +80,14 @@
     }
   },
   "dependencies": {
-    "@clack/prompts": "^0.9.1",
+    "@inquirer/ansi": "^2.0.5",
+    "@inquirer/confirm": "^6.0.13",
+    "@inquirer/core": "^11.1.10",
+    "@inquirer/select": "^5.1.5",
+    "@inquirer/type": "^4.0.5",
     "@nocobase/license-kit": "^0.3.8",
     "@oclif/core": "^4.10.4",
     "cross-spawn": "^7.0.6",
-    "lodash": "^4.17.21",
-    "mariadb": "^2.5.6",
     "mysql2": "^3.14.0",
     "openapi-types": "^12.1.3",
     "ora": "^8.2.0",
@@ -103,5 +105,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "ca804833299c547f8d49f8d58f73273a4bfcd03c"
 }