billion-context 0.1.90 → 0.1.91-pr.621.436

package/README.md

@@ -344,6 +344,9 @@ Rules:
 - Both outbound paths are covered: `/bili/` path-mode (fetch) AND MITM CONNECT
   tunnels (the proxy's connection to the real upstream goes through the HTTP
   CONNECT proxy).
+- The auto-updater's own egress (npm registry check + tarball download) uses
+  the same decision for its hosts, so `bili update` and auto-update work on
+  hosts where npm is only reachable through the proxy (#609).
 
 Env override: `BILI_UPSTREAM_PROXY=http://127.0.0.1:20172` (higher priority than
 the config file). On Windows, common Clash/Mihomo static system proxies are

package/dist/index.js

@@ -63303,6 +63303,12 @@ async function tryAcquireLock() {
     }
   };
 }
+function egressDispatcher(opts, url) {
+  return proxyDispatcher(opts.resolveProxy?.(url));
+}
+function fetchWithEgress(url, init) {
+  return fetch(url, init);
+}
 async function checkForUpdate(opts, force = false) {
   if (!opts.autoUpdate && !force) return;
   if (inFlight) return;
@@ -63325,9 +63331,11 @@ async function checkForUpdate(opts, force = false) {
     }
     log("info", `[update] checking npm registry for ${opts.packageName}${sinceLastSec < 0 ? " (startup check)" : sinceLastSec === 0 ? "" : ` (last check ${sinceLastSec}s ago)`}\u2026`);
     const url = `${REGISTRY_BASE}/${opts.packageName}/latest`;
-    const res = await fetch(url, {
+    const registryDispatcher = egressDispatcher(opts, url);
+    const res = await fetchWithEgress(url, {
       signal: AbortSignal.timeout(5e3),
-      headers: { Accept: "application/json" }
+      headers: { Accept: "application/json" },
+      ...registryDispatcher ? { dispatcher: registryDispatcher } : {}
     });
     if (!res.ok) {
       log("warn", `[update] registry returned ${res.status} ${res.statusText}, skipping`);
@@ -63363,7 +63371,7 @@ async function checkForUpdate(opts, force = false) {
       return;
     }
     try {
-      const result = await installViaTarball(latest, tarballUrl, installDir, integrity, shasum);
+      const result = await installViaTarball(latest, tarballUrl, installDir, integrity, shasum, egressDispatcher(opts, tarballUrl));
       if (result.ok) {
         log("info", `[update] installed ${currentVersion} \u2192 ${latest}. Restart to finish.`);
       } else {
@@ -63400,7 +63408,7 @@ function verifyTarballIntegrity(buf, integrity, shasum) {
   }
   return { ok: false, error: "no integrity or shasum from registry" };
 }
-async function installViaTarball(version2, tarballUrl, installDir, integrity, shasum) {
+async function installViaTarball(version2, tarballUrl, installDir, integrity, shasum, dispatcher) {
   if (!installDir) {
     return { ok: false, error: "cannot determine install directory (package.json not found walking up from running binary)" };
   }
@@ -63415,7 +63423,10 @@ async function installViaTarball(version2, tarballUrl, installDir, integrity, sh
   const MAX_TARBALL_BYTES = 100 * 1024 * 1024;
   let tgzBuffer;
   try {
-    const tgzRes = await fetch(tarballUrl, { signal: AbortSignal.timeout(6e4) });
+    const tgzRes = await fetchWithEgress(tarballUrl, {
+      signal: AbortSignal.timeout(6e4),
+      ...dispatcher ? { dispatcher } : {}
+    });
     if (!tgzRes.ok) {
       return { ok: false, error: `tarball download failed: HTTP ${tgzRes.status} ${tgzRes.statusText}` };
     }
@@ -65849,7 +65860,20 @@ async function main() {
     return;
   }
   if (command === "update") {
-    await checkForUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true }, true);
+    for (const [k2, v2] of Object.entries(overrides)) {
+      if (v2 !== void 0) process.env[k2] = v2;
+    }
+    let updaterResolveProxy;
+    try {
+      const o = loadOptions();
+      updaterResolveProxy = (url) => resolveProxy(o.routes, o.proxy, url, o.proxyFallback);
+    } catch (e) {
+      console.error(`bili update: config load failed (${String(e)}); updater egress goes direct`);
+    }
+    await checkForUpdate(
+      { packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true, resolveProxy: updaterResolveProxy },
+      true
+    );
     return;
   }
   if (command === "test") {
@@ -65871,7 +65895,12 @@ async function main() {
   const opts = loadOptions();
   await startServer(opts);
   if (opts.autoUpdate) {
-    startAutoUpdate({ packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true });
+    startAutoUpdate({
+      packageName: PACKAGE_NAME,
+      currentVersion: VERSION3,
+      autoUpdate: true,
+      resolveProxy: (url) => resolveProxy(opts.routes, opts.proxy, url, opts.proxyFallback)
+    });
   }
 }