aws-runtime-bridge 1.9.106 → 1.9.108

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.9.106",
+  "version": "1.9.108",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",

package/scripts/ensure-playwright-browser.mjs

@@ -11,11 +11,14 @@
  *   浏览器内核与系统依赖（libnss3 等）一步到位；--with-deps 失败时回退为仅下载内核。
  * - Linux 非 root：仅下载内核，缺系统库时输出可操作的 sudo 提示。
  * - 其他平台（Windows/macOS）：`install chromium`（系统库由系统自带）。
+ * - 下载源：动态读取当前 npm registry 配置，若为 npmmirror/taobao 系镜像则自动
+ *   推导对应的 Playwright 二进制镜像加速下载；官方源或其他源走 playwright 默认 CDN。
+ *   用户显式设置 PLAYWRIGHT_DOWNLOAD_HOST 时优先尊重用户选择。
  * - 幂等：playwright 检测到浏览器已安装时直接跳过，重复安装无副作用。
  * - 容错：任何失败仅警告并给出手动命令，绝不阻断 npm 安装。
  * - 跳过：设置环境变量 AWS_BRIDGE_SKIP_PLAYWRIGHT_INSTALL=1。
  */
-import { execFile } from "node:child_process";
+import { execFile, spawnSync } from "node:child_process";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
 import { promisify } from "node:util";
@@ -26,9 +29,6 @@ const require = createRequire(import.meta.url);
 /** 下载超时：Chromium 约 150MB，慢网络下允许 15 分钟。 */
 const INSTALL_TIMEOUT_MS = 15 * 60 * 1000;
 
-/** npmmirror 镜像，加速国内下载；用户已显式设置 PLAYWRIGHT_DOWNLOAD_HOST 时尊重用户选择。 */
-const DEFAULT_PLAYWRIGHT_DOWNLOAD_HOST = "https://npmmirror.com/mirrors/playwright";
-
 /** 定位 playwright 包的 CLI 入口（兼容 npm hoist 与嵌套安装两种布局）。 */
 function resolvePlaywrightCliPath() {
   try {
@@ -39,12 +39,47 @@ function resolvePlaywrightCliPath() {
   }
 }
 
-async function runInstall(cliPath, args) {
-  // 未显式设置 PLAYWRIGHT_DOWNLOAD_HOST 时，默认使用 npmmirror 镜像加速国内下载。
-  const env = { ...process.env };
-  if (!env.PLAYWRIGHT_DOWNLOAD_HOST) {
-    env.PLAYWRIGHT_DOWNLOAD_HOST = DEFAULT_PLAYWRIGHT_DOWNLOAD_HOST;
+/**
+ * 读取当前 npm 配置中的 registry（综合 npm config get registry 与 .npmrc）。
+ * 失败时返回 null，调用方按官方源默认处理。
+ */
+function resolveNpmRegistry() {
+  try {
+    const result = spawnSync("npm", ["config", "get", "registry"], {
+      encoding: "utf-8",
+      shell: process.platform === "win32",
+      stdio: ["ignore", "pipe", "ignore"],
+    });
+    if (result.status === 0 && result.stdout) {
+      const url = result.stdout.trim();
+      if (url && !/^undefined$/i.test(url)) return url;
+    }
+  } catch {
+    // 忽略，返回 null
+  }
+  return null;
+}
+
+/**
+ * 根据 npm registry 推导 Playwright 二进制镜像下载源。
+ *
+ * 映射规则：
+ * - npmmirror.com / npm.taobao.org 系：返回 https://npmmirror.com/mirrors/playwright
+ *   （npmmirror 的 binary 镜像路径，已验证可用，与 playwright 的 ${host}/${downloadPath} 拼接格式匹配）
+ * - 官方源 registry.npmjs.org 或 null：返回 null，走 playwright 默认 CDN
+ * - 其他未知源：返回 null，避免错误覆盖
+ */
+function resolvePlaywrightDownloadHost(registry) {
+  if (!registry) return null;
+  const r = registry.toLowerCase();
+  if (r.includes("npmmirror.com") || r.includes("npm.taobao.org")) {
+    return "https://npmmirror.com/mirrors/playwright";
   }
+  // 其他镜像源不自动推导，避免路径错误
+  return null;
+}
+
+async function runInstall(cliPath, args, env) {
   const { stdout, stderr } = await execFileAsync(
     process.execPath,
     [cliPath, ...args],
@@ -81,23 +116,33 @@ async function main() {
     return;
   }
 
-  const isLinux = process.platform === "linux";
-  const isRoot =
-    typeof process.getuid === "function" && process.getuid() === 0;
+  // 优先级：用户显式 PLAYWRIGHT_DOWNLOAD_HOST > 动态推导（npm registry 镜像） > 走 playwright 默认 CDN
+  const userHost = process.env.PLAYWRIGHT_DOWNLOAD_HOST;
+  const registry = resolveNpmRegistry();
+  const derivedHost = resolvePlaywrightDownloadHost(registry);
+  const downloadHost = userHost || derivedHost;
+  const downloadSource = downloadHost || "playwright 默认 CDN";
+
+  const env = { ...process.env };
+  if (downloadHost) {
+    env.PLAYWRIGHT_DOWNLOAD_HOST = downloadHost;
+  }
 
-  const downloadHost = process.env.PLAYWRIGHT_DOWNLOAD_HOST || DEFAULT_PLAYWRIGHT_DOWNLOAD_HOST;
-  const usingDefaultMirror = downloadHost === DEFAULT_PLAYWRIGHT_DOWNLOAD_HOST;
+  const sourceDesc =
+    (userHost ? "用户设置" : derivedHost ? `镜像加速（${registry}）` : "playwright 默认 CDN");
   console.log(
     `[aws-runtime-bridge] 正在准备 Playwright Chromium（首次安装需下载约 150MB，请耐心等待）...` +
-      (usingDefaultMirror
-        ? `\n[aws-runtime-bridge] 下载源：${downloadHost}（npmmirror 镜像加速；如需切换可设 PLAYWRIGHT_DOWNLOAD_HOST）`
-        : ""),
+      `\n[aws-runtime-bridge] 下载源：${downloadSource}（${sourceDesc}；如需切换可设 PLAYWRIGHT_DOWNLOAD_HOST）`,
   );
 
+  const isLinux = process.platform === "linux";
+  const isRoot =
+    typeof process.getuid === "function" && process.getuid() === 0;
+
   // Linux + root：连系统依赖一起装（sudo npm install -g 场景一步到位）
   if (isLinux && isRoot) {
     try {
-      await runInstall(cliPath, ["install", "--with-deps", "chromium"]);
+      await runInstall(cliPath, ["install", "--with-deps", "chromium"], env);
       console.log("[aws-runtime-bridge] Playwright Chromium 与系统依赖安装完成");
       return;
     } catch (error) {
@@ -112,7 +157,7 @@ async function main() {
   }
 
   try {
-    await runInstall(cliPath, ["install", "chromium"]);
+    await runInstall(cliPath, ["install", "chromium"], env);
     console.log("[aws-runtime-bridge] Playwright Chromium 安装完成");
   } catch (error) {
     console.warn(