@ada-mcp/launcher 0.1.41 → 0.1.42

package/README.md

@@ -8,7 +8,7 @@
   "mcpServers": {
     "ada-mcp": {
       "command": "pnpm",
-      "args": ["dlx", "@ada-mcp/launcher@0.1.41"]
+      "args": ["dlx", "@ada-mcp/launcher@0.1.42"]
     }
   }
 }
@@ -17,12 +17,12 @@
 命令行：
 
 ```bash
-pnpm dlx @ada-mcp/launcher@0.1.41
+pnpm dlx @ada-mcp/launcher@0.1.42
 ```
 
 npx 等价�?
 ```bash
-npx -y @ada-mcp/launcher@0.1.41
+npx -y @ada-mcp/launcher@0.1.42
 ```
 
 **npx 示例**�?
@@ -31,14 +31,14 @@ npx -y @ada-mcp/launcher@0.1.41
   "mcpServers": {
     "ada-mcp": {
       "command": "npx",
-      "args": ["-y", "@ada-mcp/launcher@0.1.41"]
+      "args": ["-y", "@ada-mcp/launcher@0.1.42"]
     }
   }
 }
 ```
 
 ## 版本�?
-- **使用**：`pnpm dlx @ada-mcp/launcher` �?`@ada-mcp/launcher@0.1.41` 均可；不�?`@x.y.z` 时拉 npm **latest**（推荐生产环境钉版本）�?- **发布**：每�?`npm publish` 前必须在 `package.json` **递增 version**；不能重复发布同一版本�?
+- **使用**：`pnpm dlx @ada-mcp/launcher` �?`@ada-mcp/launcher@0.1.42` 均可；不�?`@x.y.z` 时拉 npm **latest**（推荐生产环境钉版本）�?- **发布**：每�?`npm publish` 前必须在 `package.json` **递增 version**；不能重复发布同一版本�?
 ## 可选环境变�?
 | 变量 | 说明 |
 |------|------|
@@ -51,7 +51,7 @@ npx -y @ada-mcp/launcher@0.1.41
 ## 与直�?`dlx @ada-mcp/mcp-server` 的区�?
 | 方式 | �?MCP �?| 安装 playwright �?|
 |------|-----------|-------------------|
-| **`pnpm dlx @ada-mcp/launcher@0.1.41`**（标准） | launcher 测�?+ `.npmrc` �?`pnpm dlx` mcp-server | mcp-server preinstall + bootstrap |
-| **`npx -y @ada-mcp/launcher@0.1.41`** | 同上 �?**`npx -y` mcp-server** | 同上 |
-| `pnpm dlx @ada-mcp/mcp-server@0.1.41` | 本机默认�?| �?preinstall / bootstrap 测�?|
-| `npx -y @ada-mcp/mcp-server@0.1.41` | �?launcher 测�?| �?preinstall / bootstrap 测�?|
+| **`pnpm dlx @ada-mcp/launcher@0.1.42`**（标准） | launcher 测�?+ `.npmrc` �?`pnpm dlx` mcp-server | mcp-server preinstall + bootstrap |
+| **`npx -y @ada-mcp/launcher@0.1.42`** | 同上 �?**`npx -y` mcp-server** | 同上 |
+| `pnpm dlx @ada-mcp/mcp-server@0.1.42` | 本机默认�?| �?preinstall / bootstrap 测�?|
+| `npx -y @ada-mcp/mcp-server@0.1.42` | �?launcher 测�?| �?preinstall / bootstrap 测�?|

package/download-probe.mjs

@@ -1,8 +1,114 @@
-export {
-  formatDownloadProbeLine,
-  pickBestDownloadProbe,
-  pickFastestProbeUrl,
-  probeDownloadSample,
-  probeDownloadTimeoutMs,
-  probeSampleBytes
-} from "@ada/download-probe";
+/**
+ * 内联 @ada/download-probe（launcher 零 npm 依赖；与 packages/download-probe 保持同步）
+ * 同步：node ../../scripts/sync-download-probe-vendor.mjs
+ */
+
+function parsePositiveInt(raw, fallback) {
+  const parsed = raw ? Number(raw) : fallback;
+  return Number.isFinite(parsed) && parsed > 0 ? Math.floor(parsed) : fallback;
+}
+
+export function probeSampleBytes() {
+  return parsePositiveInt(process.env.ADA_PROBE_DOWNLOAD_BYTES, 512 * 1024);
+}
+
+export function probeDownloadTimeoutMs() {
+  return parsePositiveInt(process.env.ADA_PROBE_DOWNLOAD_TIMEOUT_MS, 20_000);
+}
+
+/** 拉取 url 的前 sampleBytes 字节，返回吞吐；失败返回 null */
+export async function probeDownloadSample(url, options) {
+  const sampleBytes = options?.sampleBytes ?? probeSampleBytes();
+  const timeoutMs = options?.timeoutMs ?? probeDownloadTimeoutMs();
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const started = Date.now();
+  try {
+    const response = await fetch(url, {
+      method: "GET",
+      headers: { Range: `bytes=0-${sampleBytes - 1}`, Accept: "*/*" },
+      redirect: "follow",
+      signal: controller.signal
+    });
+    if (response.status !== 200 && response.status !== 206) {
+      return null;
+    }
+    const body = response.body;
+    if (!body) {
+      return null;
+    }
+    const reader = body.getReader();
+    let bytesRead = 0;
+    try {
+      while (bytesRead < sampleBytes) {
+        const { done, value } = await reader.read();
+        if (done || !value?.length) {
+          break;
+        }
+        bytesRead += value.length;
+      }
+    } finally {
+      try {
+        await reader.cancel();
+      } catch {
+        // ignore
+      }
+    }
+    if (bytesRead < Math.min(sampleBytes / 8, 32 * 1024)) {
+      return null;
+    }
+    const durationMs = Math.max(1, Date.now() - started);
+    const speedKBps = bytesRead / 1024 / (durationMs / 1000);
+    return { durationMs, bytesRead, speedKBps };
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+/** 按 speedKBps 降序；相同时样本耗时更短优先 */
+export function pickBestDownloadProbe(rows, priorityIndex) {
+  const ok = rows.filter((r) => r.probe !== null);
+  if (ok.length === 0) {
+    return null;
+  }
+  ok.sort((a, b) => {
+    if (b.probe.speedKBps !== a.probe.speedKBps) {
+      return b.probe.speedKBps - a.probe.speedKBps;
+    }
+    if (a.probe.durationMs !== b.probe.durationMs) {
+      return a.probe.durationMs - b.probe.durationMs;
+    }
+    return priorityIndex(a.candidate) - priorityIndex(b.candidate);
+  });
+  return ok[0] ?? null;
+}
+
+export function formatDownloadProbeLine(prefix, candidate, probe) {
+  if (!probe) {
+    return `${prefix} ${candidate} -> fail`;
+  }
+  const mib = (probe.bytesRead / (1024 * 1024)).toFixed(2);
+  return `${prefix} ${candidate} -> ${probe.speedKBps.toFixed(0)} KB/s（${mib} MiB / ${probe.durationMs}ms）`;
+}
+
+/** 对 URL 列表测速，返回最快项 */
+export async function pickFastestProbeUrl(urls, onLogLine) {
+  let best = null;
+  for (const url of urls) {
+    onLogLine?.(`[probe] 探测下载速度: ${url}`);
+    const probe = await probeDownloadSample(url);
+    if (!probe) {
+      onLogLine?.(`[probe]   ${url} -> fail`);
+      continue;
+    }
+    onLogLine?.(
+      `[probe]   ${url} -> ${probe.speedKBps.toFixed(0)} KB/s（${(probe.bytesRead / (1024 * 1024)).toFixed(2)} MiB / ${probe.durationMs}ms）`
+    );
+    if (!best || probe.speedKBps > best.probe.speedKBps) {
+      best = { url, probe };
+    }
+  }
+  return best;
+}

package/mirror-candidates.mjs

@@ -1,8 +1,48 @@
-export {
-  CHINA_NPM_REGISTRY_HINTS,
-  CHINA_PLAYWRIGHT_HOST_PRIORITY,
-  DEFAULT_GECKODRIVER_MIRROR_CANDIDATES,
-  DEFAULT_NPM_REGISTRY_CANDIDATES,
-  DEFAULT_PLAYWRIGHT_HOST_CANDIDATES,
-  isChinaFriendlyNpmRegistry
-} from "@ada/download-probe";
+/**
+ * 内联 @ada/download-probe 镜像候选（launcher 零 npm 依赖）
+ * 同步：node ../../scripts/sync-download-probe-vendor.mjs
+ */
+
+/** 国内优先 npmmirror，其次官方；测速相同时列表靠前者优先 */
+export const DEFAULT_NPM_REGISTRY_CANDIDATES = [
+  "https://registry.npmmirror.com",
+  "https://registry.npmjs.org",
+  "https://mirrors.cloud.tencent.com/npm",
+  "https://mirrors.sjtug.sjtu.edu.cn/npm-registry",
+  "https://npmreg.proxy.ustclug.org",
+  "https://repo.huaweicloud.com/repository/npm"
+];
+
+export const CHINA_NPM_REGISTRY_HINTS = [
+  "npmmirror",
+  "sjtug",
+  "sjtu",
+  "ustc",
+  "ustclug",
+  "tencent",
+  "huaweicloud",
+  "huawei.com"
+];
+
+export const DEFAULT_PLAYWRIGHT_HOST_CANDIDATES = [
+  "https://cdn.playwright.dev",
+  "https://playwright.azureedge.net",
+  "https://cdn.npmmirror.com/binaries/playwright",
+  "https://npmmirror.com/mirrors/playwright"
+];
+
+export const CHINA_PLAYWRIGHT_HOST_PRIORITY = [
+  "https://cdn.npmmirror.com/binaries/playwright",
+  "https://npmmirror.com/mirrors/playwright"
+];
+
+export const DEFAULT_GECKODRIVER_MIRROR_CANDIDATES = [
+  "https://cdn.npmmirror.com/binaries/geckodriver",
+  "https://npmmirror.com/mirrors/geckodriver",
+  "https://mirrors.huaweicloud.com/geckodriver"
+];
+
+export function isChinaFriendlyNpmRegistry(registry) {
+  const r = registry.toLowerCase();
+  return CHINA_NPM_REGISTRY_HINTS.some((hint) => r.includes(hint));
+}

package/package.json

@@ -1,15 +1,12 @@
 {
   "name": "@ada-mcp/launcher",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "Probe fastest npm registry then pnpm dlx @ada-mcp/mcp-server (zero deps)",
   "private": false,
   "type": "module",
   "bin": {
     "ada-mcp": "./launcher.mjs"
   },
-  "dependencies": {
-    "@ada/download-probe": "0.1.0"
-  },
   "files": [
     "launcher.mjs",
     "mirror-candidates.mjs",