@yixinkj/cli 1.0.15-beta.10 → 1.0.15-beta.11

package/README.md

@@ -29,7 +29,7 @@ yixin --ads --period last-week
 yixin --coffee-prospector --mode fetch --name "Roaster" --website "https://example.com" --country 美国
 ```
 
-首次运行会从公开 GitHub Release 下载二进制到 `~/.yixin/bin`。
+首次运行会优先从阿里云 OSS 下载二进制到 `~/.yixin/bin`；OSS 不可用时自动回退到公开 GitHub Release。
 
 macOS 下下载完成后会自动处理每个二进制：
 
@@ -53,8 +53,8 @@ macOS 下下载完成后会自动处理每个二进制：
 ```text
 YIXIN_PHONE       可选。授权手机号；未设置时 CLI 会读取 ~/.yixin/config.json，仍没有则交互式询问。
 YIXIN_AUTH_URL    可选。授权服务地址，默认已内置。
-YIXIN_RELEASE_REPO       可选。默认 yixinkj/cli-releases。
-YIXIN_RELEASE_BASE_URL   可选。覆盖二进制下载基础 URL。
+YIXIN_RELEASE_REPO       可选。GitHub 备用源仓库，默认 yixinkj/cli-releases。
+YIXIN_RELEASE_BASE_URL   可选。完全覆盖默认下载源；设置后不再自动回退。
 YIXIN_GITHUB_TOKEN       可选。下载私有 Release 时使用；正式公开分发通常不需要。
 TAVILY_API_KEY           coffee-prospector fetch 可选。用于官网相关链接搜索。
 TAVILY_SEARCH_URL        coffee-prospector fetch 可选。覆盖 Tavily 兼容搜索接口地址。
@@ -69,7 +69,19 @@ COFFEE_PROSPECTOR_CRM_PROFILE        可选。直接指定发信账号窗口标
 
 ## 二进制发布包
 
-默认从 `yixinkj/cli-releases` 下载与 npm 包版本一致的 release asset：
+默认优先从杭州 OSS 下载与 npm 包版本一致的 release asset：
+
+```text
+https://yixin-cli-releases-8488540.oss-cn-hangzhou.aliyuncs.com/releases/v{version}/{archive}
+```
+
+OSS 下载失败后自动回退：
+
+```text
+https://github.com/yixinkj/cli-releases/releases/download/v{version}/{archive}
+```
+
+平台压缩包：
 
 - `darwin-arm64` -> `yixin-mac-arm64.tar.gz`
 - `win32-x64` -> `yixin-win32-x64.zip`

package/index.js

@@ -15,6 +15,8 @@ const registry = require('./skills.json');
 
 const VERSION = packageJson.version;
 const RELEASE_REPO = process.env.YIXIN_RELEASE_REPO || 'yixinkj/cli-releases';
+const OSS_RELEASE_BASE_URL =
+  'https://yixin-cli-releases-8488540.oss-cn-hangzhou.aliyuncs.com/releases';
 const CACHE_ROOT = path.join(os.homedir(), '.yixin');
 const BIN_DIR = path.join(CACHE_ROOT, 'bin');
 const VERSION_FILE = path.join(CACHE_ROOT, 'version');
@@ -81,11 +83,14 @@ function isInstalled(target) {
   return target.binaries.every((name) => fs.existsSync(path.join(BIN_DIR, name)));
 }
 
-function releaseUrl(target) {
+function releaseUrls(target) {
   if (process.env.YIXIN_RELEASE_BASE_URL) {
-    return `${process.env.YIXIN_RELEASE_BASE_URL.replace(/\/$/, '')}/${target.archive}`;
+    return [`${process.env.YIXIN_RELEASE_BASE_URL.replace(/\/$/, '')}/${target.archive}`];
   }
-  return `https://github.com/${RELEASE_REPO}/releases/download/v${VERSION}/${target.archive}`;
+  return [
+    `${OSS_RELEASE_BASE_URL}/v${VERSION}/${target.archive}`,
+    `https://github.com/${RELEASE_REPO}/releases/download/v${VERSION}/${target.archive}`
+  ];
 }
 
 function downloadFile(url, outputPath, redirectsLeft = 5) {
@@ -100,7 +105,7 @@ function downloadFile(url, outputPath, redirectsLeft = 5) {
       headers.Authorization = `Bearer ${process.env.YIXIN_GITHUB_TOKEN}`;
     }
 
-    https.get(url, { headers }, (response) => {
+    const request = https.get(url, { headers }, (response) => {
       if ([301, 302, 303, 307, 308].includes(response.statusCode)) {
         response.resume();
         if (redirectsLeft <= 0) {
@@ -125,12 +130,44 @@ function downloadFile(url, outputPath, redirectsLeft = 5) {
 
       const file = fs.createWriteStream(outputPath);
       response.pipe(file);
+      response.on('aborted', () => {
+        file.destroy();
+        reject(new Error(`下载连接意外中断：${url}`));
+      });
+      response.on('error', (error) => {
+        file.destroy();
+        reject(error);
+      });
       file.on('finish', () => file.close(resolve));
       file.on('error', reject);
-    }).on('error', reject);
+    });
+    request.setTimeout(30000, () => {
+      request.destroy(new Error(`下载超时：${url}`));
+    });
+    request.on('error', reject);
   });
 }
 
+async function downloadFromSources(urls, outputPath) {
+  const failures = [];
+  for (let index = 0; index < urls.length; index += 1) {
+    const url = urls[index];
+    try {
+      fs.rmSync(outputPath, { force: true });
+      console.error(`[yixin] 正在下载 ${url}`);
+      await downloadFile(url, outputPath);
+      return;
+    } catch (error) {
+      fs.rmSync(outputPath, { force: true });
+      failures.push(`${url}: ${error.message}`);
+      if (index + 1 < urls.length) {
+        console.error(`[yixin] 当前下载源失败，正在切换备用源：${error.message}`);
+      }
+    }
+  }
+  throw new Error(`所有二进制下载源均失败：\n${failures.join('\n')}`);
+}
+
 function runCommand(command, args) {
   const result = spawnSync(command, args, {
     encoding: 'utf8',
@@ -211,12 +248,11 @@ async function ensureInstalled(target) {
 
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'yixin-cli-'));
   const archivePath = path.join(tempDir, target.archive);
-  const url = releaseUrl(target);
+  const urls = releaseUrls(target);
 
   try {
     console.error(`[yixin] 正在安装 ${target.id} 二进制，版本 ${VERSION}`);
-    console.error(`[yixin] 正在下载 ${url}`);
-    await downloadFile(url, archivePath);
+    await downloadFromSources(urls, archivePath);
     extractArchive(archivePath, target);
     prepareInstalledBinaries(target);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yixinkj/cli",
-  "version": "1.0.15-beta.10",
+  "version": "1.0.15-beta.11",
   "description": "Yixin native CLI launcher.",
   "type": "module",
   "bin": {