Prefer static WeChat fallback before Browser Use

Digidai · Digidai · commit 228e11e39811 · 2026-05-07T19:35:13.000+08:00
diff --git a/src/__tests__/index-mocked-branches.test.ts b/src/__tests__/index-mocked-branches.test.ts
@@ -265,6 +265,31 @@ describe("index mocked branch coverage", () => {
     expect(res.headers.get("X-Markdown-Fallbacks")).toContain("wechat_static_fallback");
   });
 
+  it("tries static WeChat fetch before Browser Use for anonymous users", async () => {
+    mocked.browser.alwaysNeedsBrowser.mockReturnValue(true);
+    const fetchMock = vi.fn().mockResolvedValue(
+      new Response("<html><body><div id=\"js_content\">wechat static first</div></body></html>", {
+        status: 200,
+        headers: { "Content-Type": "text/html; charset=utf-8" },
+      }),
+    );
+    vi.stubGlobal("fetch", fetchMock);
+    mocked.converter.htmlToMarkdown.mockImplementation((html: string) => ({
+      markdown: html.includes("wechat static first") ? "# wechat static first" : "",
+      title: "wechat",
+      contentHtml: "<article>wechat static first</article>",
+    }));
+
+    const req = new Request("https://md.example.com/https://mp.weixin.qq.com/s/static-first?raw=true", {
+      headers: { Accept: "text/markdown" },
+    });
+    const res = await worker.fetch(req, createMockEnv({ BROWSER_USE_API_KEY: "browser-use-key" }).env, mockCtx());
+
+    expect(res.status).toBe(200);
+    expect(await res.text()).toContain("proxied:# wechat static first");
+    expect(mocked.browserUse.fetchViaBrowserUse).not.toHaveBeenCalled();
+  });
+
   it("retries through proxy and succeeds after PROXY_RETRY signal", async () => {
     mocked.browser.alwaysNeedsBrowser.mockReturnValue(true);
     mocked.browser.fetchWithBrowser.mockRejectedValueOnce(
diff --git a/src/handlers/convert.ts b/src/handlers/convert.ts
@@ -520,8 +520,31 @@ async function tryFetchAndParse(
       browserRendered = true;
     }
   } else if (!finalHtml && requiresBrowser && !browserAllowed) {
+    // WeChat often serves usable article HTML to a MicroMessenger UA. Try this
+    // before the slower remote-browser/proxy paths so public page loads do not
+    // wait on a long-running Browser Use session.
+    if (targetUrl.includes("mp.weixin.qq.com")) {
+      const staticResult = await tryStaticFetch(
+        targetUrl, env, host, format, selector, forceBrowser, noCache, engine,
+        fallbacks, browserRendered, paywallDetected, sourceContentType,
+        resolvedUrl, method, progress, abortSignal, browserAllowed,
+      );
+      if (staticResult.earlyReturn) {
+        return staticResult.earlyReturn;
+      }
+      finalHtml = staticResult.finalHtml;
+      method = staticResult.method;
+      resolvedUrl = staticResult.resolvedUrl;
+      browserRendered = staticResult.browserRendered;
+      paywallDetected = staticResult.paywallDetected;
+      sourceContentType = staticResult.sourceContentType;
+      if (finalHtml) {
+        fallbacks.add("wechat_static_fallback");
+      }
+    }
+
     // Anonymous 用户无 browser 权限 — 先走 Browser Use 远程浏览器，再降级住宅代理
-    if (env.BROWSER_USE_API_KEY) {
+    if (!finalHtml && env.BROWSER_USE_API_KEY) {
       throwIfAborted(abortSignal);
       await progress("fetch", "Fetching via remote browser");
       const buHtml = await fetchViaBrowserUse(targetUrl, env.BROWSER_USE_API_KEY, abortSignal);
@@ -541,28 +564,6 @@ async function tryFetchAndParse(
       }
     }
 
-    // WeChat often serves usable article HTML to a MicroMessenger UA. Use this
-    // as a low-cost fallback for anonymous users before failing the request.
-    if (!finalHtml && targetUrl.includes("mp.weixin.qq.com")) {
-      const staticResult = await tryStaticFetch(
-        targetUrl, env, host, format, selector, forceBrowser, noCache, engine,
-        fallbacks, browserRendered, paywallDetected, sourceContentType,
-        resolvedUrl, method, progress, abortSignal, browserAllowed,
-      );
-      if (staticResult.earlyReturn) {
-        return staticResult.earlyReturn;
-      }
-      finalHtml = staticResult.finalHtml;
-      method = staticResult.method;
-      resolvedUrl = staticResult.resolvedUrl;
-      browserRendered = staticResult.browserRendered;
-      paywallDetected = staticResult.paywallDetected;
-      sourceContentType = staticResult.sourceContentType;
-      if (finalHtml) {
-        fallbacks.add("wechat_static_fallback");
-      }
-    }
-
     if (!finalHtml) {
       throw new ConvertError(
         "Fetch Failed",
