@yixinkj/cli 1.0.1 → 1.0.3

package/README.md

@@ -36,16 +36,20 @@ YIXIN_AUTH_URL=https://你的授权服务域名/v1/token
 1. 从环境变量读取 `YIXIN_KEY`。
 2. 向 `YIXIN_AUTH_URL` 提交 `{ key, skill: "ads", version }`。
 3. 获取短期授权 token。
-4. 使用以下参数运行 `~/.yixin/bin/alibaba-cli-{platform}`：
+4. 如当前版本二进制尚未安装，则从公开 GitHub Release 下载对应平台包并解压到 `~/.yixin/bin`。
+5. 使用以下参数运行 `~/.yixin/bin/alibaba-cli-{platform}`：
 
 ```text
 --ads --period <period>
 ```
 
-5. 将原生二进制的 stdout 返回给 MCP 客户端。
+6. 将原生二进制的 stdout 返回给 MCP 客户端。
 
-## 本地二进制名称
+## 二进制发布包
 
-- `darwin-arm64` -> `~/.yixin/bin/alibaba-cli-mac-arm64`
-- `darwin-x64` -> `~/.yixin/bin/alibaba-cli-mac-x64`
-- `win32-x64` -> `~/.yixin/bin/alibaba-cli-win-x64.exe`
+默认从 `yixinkj/cli-releases` 下载与 npm 包版本一致的 release asset：
+
+- `darwin-arm64` -> `yixin-mac-arm64.tar.gz`
+- `win32-x64` -> `yixin-win-x64.zip`
+
+可通过 `YIXIN_RELEASE_REPO` 或 `YIXIN_RELEASE_BASE_URL` 覆盖下载来源。

package/index.js

@@ -16,12 +16,24 @@ const require = createRequire(import.meta.url);
 const packageJson = require('./package.json');
 
 const VERSION = packageJson.version;
+const RELEASE_REPO = process.env.YIXIN_RELEASE_REPO || 'yixinkj/cli-releases';
+const CACHE_ROOT = path.join(os.homedir(), '.yixin');
 const BIN_DIR = path.join(os.homedir(), '.yixin', 'bin');
+const VERSION_FILE = path.join(CACHE_ROOT, 'version');
 
-const PLATFORM_BINARIES = {
-  'darwin-arm64': 'alibaba-cli-mac-arm64',
-  'darwin-x64': 'alibaba-cli-mac-x64',
-  'win32-x64': 'alibaba-cli-win-x64.exe'
+const PLATFORM_TARGETS = {
+  'darwin-arm64': {
+    id: 'mac-arm64',
+    archive: 'yixin-mac-arm64.tar.gz',
+    mainBinary: 'alibaba-cli-mac-arm64',
+    binaries: ['alibaba-cli-mac-arm64', 'report-engine-mac-arm64', 'browser-bridge-mac-arm64']
+  },
+  'win32-x64': {
+    id: 'win-x64',
+    archive: 'yixin-win-x64.zip',
+    mainBinary: 'alibaba-cli-win-x64.exe',
+    binaries: ['alibaba-cli-win-x64.exe', 'report-engine-win-x64.exe']
+  }
 };
 
 const PERIOD_ALIASES = {
@@ -47,25 +59,161 @@ const PERIOD_ALIASES = {
   'last-30-days': 'last-30-days'
 };
 
-function detectBinary() {
+function detectTarget() {
   const platformKey = `${process.platform}-${process.arch}`;
-  const binaryName = PLATFORM_BINARIES[platformKey];
-  if (!binaryName) {
-    throw new Error(`暂不支持当前平台：${process.platform}/${process.arch}。已支持：mac-arm64、mac-x64、win-x64。`);
+  const target = PLATFORM_TARGETS[platformKey];
+  if (!target) {
+    throw new Error(`暂不支持当前平台：${process.platform}/${process.arch}。已支持：mac-arm64、win-x64。`);
+  }
+  return target;
+}
+
+function binaryPath(target) {
+  return path.join(BIN_DIR, target.mainBinary);
+}
+
+function isInstalled(target) {
+  if (!fs.existsSync(VERSION_FILE)) {
+    return false;
+  }
+  if (fs.readFileSync(VERSION_FILE, 'utf8').trim() !== VERSION) {
+    return false;
   }
-  return path.join(BIN_DIR, binaryName);
+  return target.binaries.every((name) => fs.existsSync(path.join(BIN_DIR, name)));
 }
 
-function ensureBinary(binaryPath) {
-  if (!fs.existsSync(binaryPath)) {
-    throw new Error(`未找到本地二进制：${binaryPath}`);
+function releaseUrl(target) {
+  if (process.env.YIXIN_RELEASE_BASE_URL) {
+    return `${process.env.YIXIN_RELEASE_BASE_URL.replace(/\/$/, '')}/${target.archive}`;
   }
-  if (process.platform !== 'win32') {
-    try {
-      fs.chmodSync(binaryPath, 0o755);
-    } catch (_) {
-      // 继续执行，让 spawnSync 在真正启动失败时返回具体错误。
+  return `https://github.com/${RELEASE_REPO}/releases/download/v${VERSION}/${target.archive}`;
+}
+
+function downloadFile(url, outputPath, redirectsLeft = 5) {
+  return new Promise((resolve, reject) => {
+    const requestUrl = new URL(url);
+    const headers = {
+      'User-Agent': '@yixinkj/cli',
+      Accept: 'application/octet-stream'
+    };
+
+    if (process.env.YIXIN_GITHUB_TOKEN && requestUrl.hostname.endsWith('github.com')) {
+      headers.Authorization = `Bearer ${process.env.YIXIN_GITHUB_TOKEN}`;
+    }
+
+    https.get(url, { headers }, (response) => {
+      if ([301, 302, 303, 307, 308].includes(response.statusCode)) {
+        response.resume();
+        if (redirectsLeft <= 0) {
+          reject(new Error(`下载时重定向次数过多：${url}`));
+          return;
+        }
+        const location = response.headers.location;
+        if (!location) {
+          reject(new Error(`重定向响应缺少 Location：${url}`));
+          return;
+        }
+        const nextUrl = new URL(location, url).toString();
+        downloadFile(nextUrl, outputPath, redirectsLeft - 1).then(resolve, reject);
+        return;
+      }
+
+      if (response.statusCode !== 200) {
+        response.resume();
+        reject(new Error(`下载失败：HTTP ${response.statusCode} ${url}`));
+        return;
+      }
+
+      const file = fs.createWriteStream(outputPath);
+      response.pipe(file);
+      file.on('finish', () => {
+        file.close(resolve);
+      });
+      file.on('error', reject);
+    }).on('error', reject);
+  });
+}
+
+function runCommand(command, args) {
+  const result = spawnSync(command, args, {
+    encoding: 'utf8',
+    stdio: ['ignore', 'pipe', 'pipe']
+  });
+  if (result.error) {
+    throw result.error;
+  }
+  if (result.status !== 0) {
+    const detail = [result.stderr, result.stdout].filter(Boolean).join('\n').trim();
+    throw new Error(detail || `${command} 退出码为 ${result.status}`);
+  }
+}
+
+function extractArchive(archivePath, target) {
+  fs.rmSync(BIN_DIR, { recursive: true, force: true });
+  fs.mkdirSync(BIN_DIR, { recursive: true });
+
+  if (target.archive.endsWith('.tar.gz')) {
+    runCommand('tar', ['-xzf', archivePath, '-C', BIN_DIR]);
+    return;
+  }
+
+  if (target.archive.endsWith('.zip')) {
+    if (process.platform === 'win32') {
+      runCommand('powershell.exe', [
+        '-NoProfile',
+        '-ExecutionPolicy',
+        'Bypass',
+        '-Command',
+        `Expand-Archive -LiteralPath ${JSON.stringify(archivePath)} -DestinationPath ${JSON.stringify(BIN_DIR)} -Force`
+      ]);
+      return;
+    }
+    runCommand('unzip', ['-q', archivePath, '-d', BIN_DIR]);
+    return;
+  }
+
+  throw new Error(`暂不支持的压缩包类型：${target.archive}`);
+}
+
+function chmodExecutables(target) {
+  if (process.platform === 'win32') {
+    return;
+  }
+  for (const name of target.binaries) {
+    const filePath = path.join(BIN_DIR, name);
+    if (fs.existsSync(filePath)) {
+      fs.chmodSync(filePath, 0o755);
+    }
+  }
+}
+
+async function ensureInstalled(target) {
+  if (isInstalled(target)) {
+    chmodExecutables(target);
+    return;
+  }
+
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'yixin-cli-'));
+  const archivePath = path.join(tempDir, target.archive);
+  const url = releaseUrl(target);
+
+  try {
+    console.error(`[yixin] 正在安装 ${target.id} 二进制，版本 ${VERSION}`);
+    console.error(`[yixin] 正在下载 ${url}`);
+    await downloadFile(url, archivePath);
+    extractArchive(archivePath, target);
+    chmodExecutables(target);
+
+    for (const name of target.binaries) {
+      const filePath = path.join(BIN_DIR, name);
+      if (!fs.existsSync(filePath)) {
+        throw new Error(`压缩包中缺少 ${name}`);
+      }
     }
+    fs.mkdirSync(CACHE_ROOT, { recursive: true });
+    fs.writeFileSync(VERSION_FILE, `${VERSION}\n`);
+  } finally {
+    fs.rmSync(tempDir, { recursive: true, force: true });
   }
 }
 
@@ -132,9 +280,10 @@ async function authorize(skill) {
   return auth.token;
 }
 
-function runNative({ binaryPath, args, token }) {
-  ensureBinary(binaryPath);
-  const result = spawnSync(binaryPath, args, {
+async function runNative({ target, args, token }) {
+  await ensureInstalled(target);
+  const executablePath = binaryPath(target);
+  const result = spawnSync(executablePath, args, {
     encoding: 'utf8',
     env: {
       ...process.env,
@@ -147,7 +296,7 @@ function runNative({ binaryPath, args, token }) {
   }
   if (result.status !== 0) {
     const detail = [result.stderr, result.stdout].filter(Boolean).join('\n').trim();
-    throw new Error(detail || `${binaryPath} exited with code ${result.status}`);
+    throw new Error(detail || `${executablePath} exited with code ${result.status}`);
   }
   return result.stdout || '';
 }
@@ -159,8 +308,9 @@ async function runAdsReport({ period }) {
   }
 
   const token = await authorize('ads');
-  const stdout = runNative({
-    binaryPath: detectBinary(),
+  const target = detectTarget();
+  const stdout = await runNative({
+    target,
     args: ['--ads', '--period', normalizedPeriod],
     token
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yixinkj/cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Yixin local MCP server and CLI launcher for MCP clients.",
   "type": "module",
   "bin": {