dxkj 0.1.1 → 0.1.3

package/README.md

@@ -40,6 +40,16 @@ dxkj list --source ./node_modules/dxkj/fixtures/sample-registry.json
 | `navlink` | 装入目标 NavLink 实例的 `plugins/` 目录 | `--dir` 或 `config.targets.navlink.pluginsDir` |
 | `generic` | 解压到任意目录 | `--dir` 或 `config.targets.generic.dir` |
 
+## 三种安装源格式（install_format）
+
+| 格式 | 行为 | 需要 |
+| :--- | :--- | :--- |
+| `zip` | 从本站下载 zip 解压 | 本站托管安装包 |
+| `url` | 下载外链；是 zip 则解压，否则作为单文件落盘 | 外部直链（CDN / GitHub Release / npm tarball） |
+| `git` | `git clone --depth 1`（可指定 ref），拷贝子目录到目标 | 本机已装 git |
+
+安装包不必都放本站：`url` / `git` 可把重文件外置到外部，npm 只承载瘦 CLI。
+
 ## 配置
 
 配置文件：`~/.dxkj/config.json`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxkj",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "dxkj CLI — browse and install prompts/skills/agents/plugins/tools from the dxkj catalog, plus an opencode plugin shell.",
   "type": "module",
   "license": "Apache-2.0",

package/src/cli.js

@@ -6,9 +6,8 @@ import { loadRegistry, filterItems, findByRef, resolveSource } from './lib/regis
 import { validateItem, formatReport } from './lib/validator.js';
 import { renderList, renderDetail } from './lib/format.js';
 import { resolveTargetDir } from './lib/targets.js';
-import { downloadToTemp, extractZip, writeManifest, cleanup } from './lib/installer.js';
-
-const VERSION = '0.1.0';
+import { downloadToTemp, extractZip, writeManifest, cleanup, installFromUrl, installFromGit } from './lib/installer.js';
+import { VERSION } from './lib/version.js';
 
 const OPTIONS = {
   source: { type: 'string' },
@@ -145,9 +144,20 @@ async function cmdInstall(argv) {
       continue;
     }
     let temp = null;
+    const fmt = item.install.format || 'zip';
     try {
-      temp = await downloadToTemp(item.install.url);
-      extractZip(temp, dest.dir);
+      let detail = fmt;
+      if (fmt === 'git') {
+        const r = await installFromGit(item.install.url, item.install.ref, item.install.subdir, dest.dir);
+        detail = `git${r.commit ? ' @' + r.commit : ''}`;
+      } else if (fmt === 'url') {
+        const r = await installFromUrl(item.install.url, dest.dir);
+        detail = `url/${r.mode}`;
+      } else {
+        temp = await downloadToTemp(item.install.url);
+        extractZip(temp, dest.dir);
+        detail = 'zip';
+      }
       writeManifest(dest.dir, {
         id: item.id,
         number: item.number,
@@ -155,10 +165,11 @@ async function cmdInstall(argv) {
         kind: item.kind,
         version: item.version,
         source: item.install.url,
+        format: fmt,
         target: dest.target,
         installedAt: new Date().toISOString()
       });
-      console.log(`✓ 已安装 #${item.number} ${item.name} → ${dest.dir}  (${dest.hint})`);
+      console.log(`✓ 已安装 #${item.number} ${item.name} → ${dest.dir}  (${detail} · ${dest.hint})`);
       ok++;
     } catch (err) {
       console.error(`✗ #${item.number} ${item.name}: ${err.message}`);

package/src/lib/installer.js

@@ -2,7 +2,12 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { pipeline } from 'node:stream/promises';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
 import AdmZip from 'adm-zip';
+import { USER_AGENT } from './version.js';
+
+const execFileAsync = promisify(execFile);
 
 export const MANIFEST = '.dxkj.json';
 
@@ -12,7 +17,7 @@ export async function downloadToTemp(url) {
   const target = path.join(tmp, 'package.zip');
 
   if (/^https?:\/\//i.test(url)) {
-    const res = await fetch(url, { headers: { 'User-Agent': 'dxkj-cli/0.1.0' } });
+    const res = await fetch(url, { headers: { 'User-Agent': USER_AGENT } });
     if (!res.ok) throw new Error(`下载失败 HTTP ${res.status}：${url}`);
     await pipeline(res.body, fs.createWriteStream(target));
   } else {
@@ -66,3 +71,69 @@ export function cleanup(tempFile) {
     /* ignore */
   }
 }
+
+/** 是否为 zip 包（按魔数判断） */
+export function isZipBuffer(buf) {
+  return buf.length >= 4 && buf[0] === 0x50 && buf[1] === 0x4b && (buf[2] === 0x03 || buf[2] === 0x05 || buf[2] === 0x07);
+}
+
+function copyDir(src, dest, { exclude = [] } = {}) {
+  fs.mkdirSync(dest, { recursive: true });
+  for (const entry of fs.readdirSync(src, { withFileTypes: true })) {
+    if (exclude.includes(entry.name)) continue;
+    const s = path.join(src, entry.name);
+    const d = path.join(dest, entry.name);
+    if (entry.isDirectory()) copyDir(s, d, { exclude });
+    else fs.copyFileSync(s, d);
+  }
+}
+
+/**
+ * format=url：下载外链，zip 则解压，否则作为单文件落盘
+ */
+export async function installFromUrl(url, destDir) {
+  const temp = await downloadToTemp(url);
+  try {
+    const buf = fs.readFileSync(temp);
+    fs.mkdirSync(destDir, { recursive: true });
+    if (isZipBuffer(buf)) {
+      extractZip(temp, destDir);
+      return { mode: 'zip' };
+    }
+    const name = decodeURIComponent((url.split('/').pop() || 'file.bin').split('?')[0]) || 'file.bin';
+    fs.copyFileSync(temp, path.join(destDir, name));
+    return { mode: 'file', filename: name };
+  } finally {
+    cleanup(temp);
+  }
+}
+
+/**
+ * format=git：clone 仓库（浅克隆），拷贝子目录/根目录到目标（排除 .git）
+ */
+export async function installFromGit(repo, ref, subdir, destDir) {
+  const tmp = path.join(os.tmpdir(), `dxkj-git-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+  fs.mkdirSync(tmp, { recursive: true });
+  const args = ['clone', '--depth', '1'];
+  if (ref) args.push('--branch', ref);
+  args.push(repo, tmp);
+  try {
+    await execFileAsync('git', args, { timeout: 180000 });
+  } catch (e) {
+    const msg = (e.stderr ? String(e.stderr).trim().split('\n').slice(-1)[0] : e.message) || '未知错误';
+    throw new Error(`git clone 失败：${msg}（请确认已安装 git 且仓库可访问）`);
+  }
+  try {
+    const src = subdir ? path.join(tmp, subdir) : tmp;
+    if (!fs.existsSync(src)) throw new Error(`子目录不存在：${subdir}`);
+    copyDir(src, destDir, { exclude: subdir ? [] : ['.git'] });
+    let commit = '';
+    try {
+      const { stdout } = await execFileAsync('git', ['-C', tmp, 'rev-parse', '--short', 'HEAD'], { timeout: 20000 });
+      commit = stdout.trim();
+    } catch { /* ignore */ }
+    return { mode: 'git', commit };
+  } finally {
+    fs.rmSync(tmp, { recursive: true, force: true });
+  }
+}

package/src/lib/registry.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { loadConfig, resolveServerUrl, REGISTRY_PATH } from './config.js';
+import { USER_AGENT } from './version.js';
 
 /** 去除 Windows 写文件常见的 UTF-8 BOM，避免 JSON.parse 失败 */
 export function stripBom(text) {
@@ -34,8 +35,10 @@ function normalizeItem(raw, index) {
     images: Array.isArray(raw.images) ? raw.images : [],
     install: {
       format: install.format || raw.install_format || 'zip',
-      url: install.url || raw.downloadUrl || raw.package_url || '',
-      entry: install.entry || raw.entry || ''
+      url: install.url || raw.downloadUrl || raw.package_url || raw.install_url || '',
+      entry: install.entry || raw.entry || '',
+      ref: install.ref || raw.install_ref || '',
+      subdir: install.subdir || raw.install_subdir || ''
     },
     raw
   };
@@ -52,7 +55,7 @@ export async function loadRegistry(opts = {}, cfg = loadConfig()) {
     try {
       const res = await fetch(source, {
         signal: controller.signal,
-        headers: { 'User-Agent': 'dxkj-cli/0.1.0', Accept: 'application/json' }
+        headers: { 'User-Agent': USER_AGENT, Accept: 'application/json' }
       });
       if (!res.ok) throw new Error(`HTTP ${res.status}`);
       json = await res.json();

package/src/lib/version.js

@@ -0,0 +1,8 @@
+import { readFileSync } from 'node:fs';
+
+/** 版本号唯一来源：package.json，避免与硬编码漂移 */
+export const VERSION = JSON.parse(
+  readFileSync(new URL('../../package.json', import.meta.url), 'utf-8')
+).version;
+
+export const USER_AGENT = `dxkj-cli/${VERSION}`;