dsh-m 0.1.1 → 0.2.1

package/lib/cli.js

@@ -2,10 +2,14 @@
 /**
  * dshm — DSH Marketplace 薄 CLI（DESIGN.md §5）。与 dshm_* agent 工具同核。
  * 变更类命令（uninstall/upgrade/restart）必须带 --yes 显式确认。
+ * 独立 CLI 固定 namespace:'cli'（与 Host 的 host namespace cache 互不影响）；
+ * registry/search/list/outdated 在清单不可用时打印配置/实际生效地址并 exit 1。
  */
-import { installFromRegistry, listInstalledWithMeta, uninstallPlugin, upgradePlugin, withMutationLock, } from './core/market.js';
+import { installFromRegistry, listInstalledWithMeta, listMarket, uninstallPlugin, upgradePlugin, withMutationLock, } from './core/market.js';
 import { loadRegistry } from './core/registry.js';
 import { scheduleRestart } from './core/restart.js';
+import { pathToFileURL } from 'node:url';
+import { resolve } from 'node:path';
 function parseArgs(argv) {
     const cmd = argv[0] || 'help';
     const flags = {};
@@ -35,20 +39,44 @@ function cliConfig() {
 function needFlag(flags, name) {
     const v = flags[name];
     if (typeof v !== 'string' || !v.trim()) {
-        console.error(`错误：缺少 --${name} 参数`);
-        process.exit(1);
+        throw new Error(`缺少 --${name} 参数`);
     }
     return v.trim();
 }
 function requireYes(flags, action) {
     if (flags.yes !== true) {
-        console.error(`拒绝执行：${action} 是变更操作，必须带 --yes 显式确认。`);
-        process.exit(1);
+        throw new Error(`拒绝执行：${action} 是变更操作，必须带 --yes 显式确认。`);
     }
 }
 function sourceLabel(s) {
     return { npm: 'npm', github: 'github', link: '本地 link', file: '本地 file', unknown: '未知' }[s] || s;
 }
+/** registry 来源的用户友好名称（CLI 本地终端可见）。 */
+function registrySourceLabel(s) {
+    return {
+        'default-raw': 'GitHub 原始文件（@main）',
+        'default-jsdelivr': 'GitHub 镜像（备用）',
+        'default-cache': '默认清单缓存',
+        bundled: '包内快照（兜底）',
+        'custom-url': '自定义 URL 源',
+        'custom-file': '本地文件源',
+        'custom-cache': '自定义源（缓存）',
+        'custom-unavailable': '自定义源（不可用）',
+    }[s] || s;
+}
+function addressLines(state) {
+    return [
+        `配置地址：${state.configuredAddress === '' ? '（默认官方清单）' : state.configuredAddress}`,
+        `实际生效：${state.activeAddress ?? '—'}`,
+    ];
+}
+function unavailableLines(state) {
+    return [
+        '收录清单当前不可用：',
+        ...addressLines(state),
+        state.errors.length ? `错误：${state.errors.join('；')}` : '',
+    ].filter(Boolean);
+}
 const HELP = `dshm — DSH Marketplace（个人自用 DSH 插件市场）
 
 用法：dshm <命令> [参数]
@@ -67,45 +95,74 @@ const HELP = `dshm — DSH Marketplace（个人自用 DSH 插件市场）
 
 环境变量：DSHM_REGISTRY_URL（registry 源覆盖）、DSHM_TIMEOUT_MS、DSHM_CACHE_TTL_MIN、DSHM_CACHE_DIR
 `;
-async function main() {
-    const { cmd, flags } = parseArgs(process.argv.slice(2));
+export async function runCli(argv, deps = {}, io = {}) {
+    const out = io.out ?? ((line) => console.log(line));
+    const err = io.err ?? ((line) => console.error(line));
+    try {
+        return await runCliDispatch(argv, deps, { out, err });
+    }
+    catch (e) {
+        // 业务错误统一在这里打印并 exit 1（覆盖 install/upgrade/uninstall 等）
+        err(`错误：${e instanceof Error ? e.message : String(e)}`);
+        return 1;
+    }
+}
+async function runCliDispatch(argv, deps, io) {
+    const { out, err } = io;
+    const d = {
+        listMarket: deps.listMarket ?? listMarket,
+        loadRegistry: deps.loadRegistry ?? loadRegistry,
+        listInstalledWithMeta: deps.listInstalledWithMeta ?? listInstalledWithMeta,
+        installFromRegistry: deps.installFromRegistry ?? installFromRegistry,
+        uninstallPlugin: deps.uninstallPlugin ?? uninstallPlugin,
+        upgradePlugin: deps.upgradePlugin ?? upgradePlugin,
+    };
+    const { cmd, flags } = parseArgs(argv);
     const cfg = cliConfig();
     switch (cmd) {
         case 'help':
         case '--help':
         case '-h':
-            console.log(HELP);
+            out(HELP);
             return 0;
         case 'search': {
-            const { listMarket } = await import('./core/market.js');
-            const result = await listMarket(cfg);
-            const q = typeof flags.query === 'string' ? flags.query.toLowerCase() : '';
-            const cat = typeof flags.category === 'string' ? flags.category : null;
-            const limit = Number(flags.limit) || Infinity;
-            const items = result.items.filter((it) => {
-                if (cat && it.category !== cat)
-                    return false;
-                if (!q)
-                    return true;
-                return `${it.id} ${it.name} ${it.description} ${it.tags.join(' ')}`.toLowerCase().includes(q);
-            }).slice(0, limit);
-            if (!items.length) {
-                console.log('没有匹配的收录条目。');
+            // metadata-only：不构造全量 latest，query/category/limit 直接交给 core
+            const limit = Number.isFinite(Number(flags.limit)) && Number(flags.limit) > 0 ? Number(flags.limit) : undefined;
+            const result = await d.listMarket(cfg, {
+                query: typeof flags.query === 'string' ? flags.query : undefined,
+                category: typeof flags.category === 'string' ? flags.category : null,
+                offset: 0,
+                limit,
+                withLatest: false,
+                namespace: 'cli',
+            });
+            if (result.registryState.status === 'unavailable') {
+                for (const line of unavailableLines(result.registryState))
+                    err(line);
+                return 1;
+            }
+            if (!result.items.length) {
+                out('没有匹配的收录条目。');
                 return 0;
             }
-            for (const it of items) {
+            for (const it of result.items) {
                 const inst = it.installed ? ` [已安装 v${it.installedVersion || '?'}]` : '';
-                const latest = it.latestVersion ? ` 最新 v${it.latestVersion}` : it.latestSha ? ` HEAD ${it.latestSha.slice(0, 7)}` : '';
-                console.log(`• ${it.name} (${it.id}) · ${it.category} · ${it.source}${inst}${latest}`);
-                console.log(`  ${it.description}`);
+                out(`• ${it.name} (${it.id}) · ${it.category} · ${it.source}${inst}`);
+                out(`  ${it.description}`);
             }
-            console.log(`\n来源：${result.registrySource}（${result.registryFetchedAt ?? '—'}），共 ${result.items.length} 条`);
+            const s = result.registryState;
+            out(`\n来源：${registrySourceLabel(s.source)}${s.stale ? '（缓存）' : ''} · 更新：${s.fetchedAt ?? '—'} · 共 ${result.total} 条`);
             return 0;
         }
         case 'list': {
-            const result = await listInstalledWithMeta(cfg);
+            const result = await d.listInstalledWithMeta(cfg, { namespace: 'cli' });
+            if (result.registryState.status === 'unavailable') {
+                for (const line of unavailableLines(result.registryState))
+                    out(line);
+                out('（registry 不可用，仅列出已装插件）');
+            }
             if (!result.items.length) {
-                console.log(`web profile（${result.profileDir}）还没有已装的 dsh 插件。`);
+                out(`web profile（${result.profileDir}）还没有已装的 dsh 插件。`);
                 return 0;
             }
             for (const it of result.items) {
@@ -113,84 +170,111 @@ async function main() {
                     it.registryId ? '市场' : '非市场',
                     it.outdated && it.latestVersion ? `可升级 → v${it.latestVersion}` : null,
                 ].filter(Boolean).join('，');
-                console.log(`• ${it.name} (${it.pkg}) v${it.version || '?'} · ${sourceLabel(it.source)}${marks ? ` · ${marks}` : ''}`);
+                out(`• ${it.name} (${it.pkg}) v${it.version || '?'} · ${sourceLabel(it.source)}${marks ? ` · ${marks}` : ''}`);
             }
             if (result.others)
-                console.log(`\n另有 ${result.others} 个非 dsh 依赖未列出。`);
+                out(`\n另有 ${result.others} 个非 dsh 依赖未列出。`);
             return 0;
         }
         case 'outdated': {
-            const result = await listInstalledWithMeta(cfg);
+            const result = await d.listInstalledWithMeta(cfg, { namespace: 'cli' });
+            if (result.registryState.status === 'unavailable') {
+                for (const line of unavailableLines(result.registryState))
+                    err(line);
+                return 1;
+            }
             const outdated = result.items.filter((it) => it.outdated);
             if (!outdated.length) {
-                console.log(`全部 ${result.items.length} 个插件均已是最新版本。`);
+                out(`全部 ${result.items.length} 个插件均已是最新版本。`);
                 return 0;
             }
             for (const it of outdated) {
-                console.log(`• ${it.name} (${it.pkg})：v${it.version} → ${it.latestVersion || '最新'}`);
+                out(`• ${it.name} (${it.pkg})：v${it.version} → ${it.latestVersion || '最新'}`);
             }
-            console.log(`\n升级：dshm upgrade --pkg <包名> --yes`);
+            out(`\n升级：dshm upgrade --pkg <包名> --yes`);
             return 0;
         }
         case 'registry': {
-            const loaded = await loadRegistry(cfg, { force: flags.force === true });
-            console.log(`来源：${loaded.source} · 更新时间：${loaded.fetchedAt ?? '—'} · 条目：${loaded.registry.plugins.length}`);
+            const loaded = await d.loadRegistry(cfg, { namespace: 'cli', force: flags.force === true });
+            if (loaded.status === 'unavailable') {
+                for (const line of unavailableLines(loaded))
+                    err(line);
+                return 1;
+            }
+            out(`来源：${registrySourceLabel(loaded.source)} · 更新时间：${loaded.fetchedAt ?? '—'} · 条目：${loaded.count}`);
+            for (const line of addressLines(loaded))
+                out(line);
             for (const e of loaded.registry.plugins) {
-                console.log(`  • ${e.id} · ${e.name} · ${e.category} · ${e.source === 'npm' ? e.npm : e.github}`);
+                out(`  • ${e.id} · ${e.name} · ${e.category} · ${e.source === 'npm' ? e.npm : e.github}`);
             }
             if (loaded.errors.length)
-                console.log(`提示：${loaded.errors.join('；')}`);
+                out(`提示：${loaded.errors.join('；')}`);
             return 0;
         }
         case 'install': {
             const id = needFlag(flags, 'id');
             const version = typeof flags.version === 'string' ? flags.version : undefined;
-            const res = await withMutationLock(() => installFromRegistry(id, cfg, { version }));
-            console.log(`✅ 已安装 ${res.pkg}（${res.spec}）`);
+            const res = await withMutationLock(() => d.installFromRegistry(id, cfg, { version, namespace: 'cli' }));
+            out(`✅ 已安装 ${res.pkg}（${res.spec}）`);
             if (res.usedAllowAllBuilds)
-                console.log('⚠️  该插件执行了构建脚本（已按策略放行）。');
-            console.log('需要重启 DSH Web 生效：dshm restart --yes');
+                out('⚠️  该插件执行了构建脚本（已按策略放行）。');
+            out('需要重启 DSH Web 生效：dshm restart --yes');
             return 0;
         }
         case 'upgrade': {
             const target = needFlag(flags, 'pkg');
             requireYes(flags, '升级');
-            const res = await withMutationLock(() => upgradePlugin(target, cfg));
+            const res = await withMutationLock(() => d.upgradePlugin(target, cfg, { namespace: 'cli' }));
             const from = res.fromVersion ? `v${res.fromVersion} → ` : '';
             const to = res.version ? `v${res.version}` : res.sha ? res.sha.slice(0, 7) : '最新';
-            console.log(`✅ 已升级 ${res.pkg}（${from}${to}）`);
+            out(`✅ 已升级 ${res.pkg}（${from}${to}）`);
             if (res.usedAllowAllBuilds)
-                console.log('⚠️  该插件执行了构建脚本（已按策略放行）。');
-            console.log('需要重启 DSH Web 生效：dshm restart --yes');
+                out('⚠️  该插件执行了构建脚本（已按策略放行）。');
+            out('需要重启 DSH Web 生效：dshm restart --yes');
             return 0;
         }
         case 'uninstall': {
             const target = needFlag(flags, 'pkg');
             requireYes(flags, '卸载');
-            const res = await withMutationLock(() => uninstallPlugin(target, cfg));
-            console.log(`✅ 已卸载 ${res.pkg}${res.liveDisabled ? '（运行中的界面已先下线）' : ''}`);
+            const res = await withMutationLock(() => d.uninstallPlugin(target, cfg, { namespace: 'cli' }));
+            out(`✅ 已卸载 ${res.pkg}${res.liveDisabled ? '（运行中的界面已先下线）' : ''}`);
             if (res.leftovers.length)
-                console.log(`ℹ️  疑似残留数据（未删除）：${res.leftovers.join('、')}`);
-            console.log('需要重启 DSH Web 生效：dshm restart --yes');
+                out(`ℹ️  疑似残留数据（未删除）：${res.leftovers.join('、')}`);
+            out('需要重启 DSH Web 生效：dshm restart --yes');
             return 0;
         }
         case 'restart': {
             requireYes(flags, '重启 DSH Web');
             const res = scheduleRestart(null);
-            console.log(`✅ 已请求重启（via ${res.via}）。服务恢复后刷新页面即可。`);
+            out(`✅ 已请求重启（via ${res.via}）。服务恢复后刷新页面即可。`);
             return 0;
         }
-        default:
-            console.error(`未知命令：${cmd}\n`);
-            console.log(HELP);
+        default: {
+            err(`未知命令：${cmd}\n`);
+            out(HELP);
             return 1;
+        }
+    }
+}
+/** 仅在直接执行（bin/node lib/cli.js）时运行；被测试导入时无副作用。 */
+const invokedDirectly = (() => {
+    const entry = process.argv[1];
+    if (!entry)
+        return false;
+    try {
+        return import.meta.url === pathToFileURL(resolve(entry)).href;
+    }
+    catch {
+        return false;
     }
+})();
+if (invokedDirectly) {
+    runCli(process.argv.slice(2))
+        .then((code) => {
+        process.exitCode = code;
+    })
+        .catch((err) => {
+        console.error('错误：', err instanceof Error ? err.message : String(err));
+        process.exitCode = 1;
+    });
 }
-main()
-    .then((code) => {
-    process.exitCode = code;
-})
-    .catch((err) => {
-    console.error('错误：', err instanceof Error ? err.message : String(err));
-    process.exitCode = 1;
-});