unbrowse 9.5.0-preview.1 → 9.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unbrowse",
-  "version": "9.5.0-preview.1",
+  "version": "9.5.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/unbrowse-ai/unbrowse.git"

package/runtime/cli.js

@@ -2223,7 +2223,7 @@ var init_telemetry = __esm(() => {
 });
 
 // .tmp-runtime-src/build-info.generated.ts
-var BUILD_RELEASE_VERSION = "9.5.0-preview.1", BUILD_GIT_SHA = "77a00a93a3da", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiOS41LjAtcHJldmlldy4xIiwiZ2l0X3NoYSI6Ijc3YTAwYTkzYTNkYSIsImNvZGVfaGFzaCI6IjVkOWViZjYxOWM2MSIsInRyYWNlX3ZlcnNpb24iOiI1ZDllYmY2MTljNjFANzdhMDBhOTNhM2RhIiwiaXNzdWVkX2F0IjoiMjAyNi0wNi0xN1QxNjoyMjozNC41MjdaIn0", BUILD_RELEASE_MANIFEST_SIGNATURE = "S6SeRd9EuGt1SLhfbZOdCZbjCUsYF8E0D-Yx-cet33g", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
+var BUILD_RELEASE_VERSION = "9.5.0", BUILD_GIT_SHA = "e89197aa72c5", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiOS41LjAiLCJnaXRfc2hhIjoiZTg5MTk3YWE3MmM1IiwiY29kZV9oYXNoIjoiNWQ5ZWJmNjE5YzYxIiwidHJhY2VfdmVyc2lvbiI6IjVkOWViZjYxOWM2MUBlODkxOTdhYTcyYzUiLCJpc3N1ZWRfYXQiOiIyMDI2LTA2LTE3VDIwOjQzOjE0LjU3NVoifQ", BUILD_RELEASE_MANIFEST_SIGNATURE = "1UkHiCAP05Uq70_rXEXyo_0Z_VqVHG23WPNTxBlX5Fo", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
 
 // .tmp-runtime-src/version.ts
 import { createHash as createHash7 } from "crypto";
@@ -123597,6 +123597,125 @@ var init_fetch_ladder = __esm(() => {
   ];
 });
 
+// .tmp-runtime-src/execution/tencent-waf-solve.ts
+function parseCapzyProxy(proxyUrl) {
+  try {
+    const u = new URL(proxyUrl);
+    if (!u.hostname || !u.port)
+      return;
+    const scheme = u.protocol.replace(":", "").toLowerCase();
+    const type = scheme === "socks5" || scheme === "socks4" || scheme === "https" ? scheme : "http";
+    return {
+      type,
+      address: u.hostname,
+      port: Number(u.port),
+      ...u.username ? { login: decodeURIComponent(u.username) } : {},
+      ...u.password ? { password: decodeURIComponent(u.password) } : {}
+    };
+  } catch {
+    return;
+  }
+}
+
+// .tmp-runtime-src/execution/capzy-cf-solve.ts
+function extractCfClearance(solution) {
+  if (!solution || typeof solution !== "object")
+    return null;
+  const s = solution;
+  const ua = typeof s.user_agent === "string" && s.user_agent || typeof s.userAgent === "string" && s.userAgent || undefined;
+  if (typeof s.cf_clearance === "string" && s.cf_clearance) {
+    return { cf_clearance: s.cf_clearance, user_agent: ua || undefined };
+  }
+  if (typeof s.token === "string" && s.token && s.type !== "turnstile") {
+    return { cf_clearance: s.token, user_agent: ua || undefined };
+  }
+  const cookies = s.cookies;
+  if (cookies && typeof cookies === "object" && !Array.isArray(cookies)) {
+    const v = cookies.cf_clearance;
+    if (typeof v === "string" && v)
+      return { cf_clearance: v, user_agent: ua || undefined };
+  }
+  if (Array.isArray(cookies)) {
+    for (const c of cookies) {
+      if (c && typeof c === "object") {
+        const o = c;
+        if (o.name === "cf_clearance" && typeof o.value === "string" && o.value) {
+          return { cf_clearance: o.value, user_agent: ua || undefined };
+        }
+      } else if (typeof c === "string" && c.startsWith("cf_clearance=")) {
+        const v = c.slice("cf_clearance=".length).split(";")[0];
+        if (v)
+          return { cf_clearance: v, user_agent: ua || undefined };
+      }
+    }
+  }
+  return null;
+}
+function buildCfTask(websiteURL, proxy) {
+  return {
+    type: "AntiCloudflareTask",
+    websiteURL,
+    proxyType: proxy.type,
+    proxyAddress: proxy.address,
+    proxyPort: proxy.port,
+    ...proxy.login ? { proxyLogin: proxy.login } : {},
+    ...proxy.password ? { proxyPassword: proxy.password } : {}
+  };
+}
+async function solveCfViaCapzy(input) {
+  const clientKey = input.clientKey ?? process.env.UNBROWSE_CAPZY_KEY?.trim();
+  if (!clientKey)
+    return null;
+  if (!input.proxy)
+    return null;
+  const apiBase = (input.apiBase ?? process.env.UNBROWSE_CAPZY_URL?.trim() ?? "https://api.capzy.ai").replace(/\/+$/, "");
+  const doFetch = input.fetchImpl ?? fetch;
+  const deadline = Date.now() + (input.timeoutMs ?? 120000);
+  const task = buildCfTask(input.websiteURL, input.proxy);
+  let taskId;
+  try {
+    const created = await doFetch(`${apiBase}/createTask`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ clientKey, task }),
+      signal: AbortSignal.timeout(Math.max(1, Math.min(20000, deadline - Date.now())))
+    });
+    if (!created.ok)
+      return null;
+    const cj = await created.json().catch(() => null);
+    if (!cj || cj.errorId || !cj.taskId)
+      return null;
+    taskId = cj.taskId;
+  } catch {
+    return null;
+  }
+  while (Date.now() < deadline) {
+    try {
+      const res = await doFetch(`${apiBase}/getTaskResult`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ clientKey, taskId }),
+        signal: AbortSignal.timeout(Math.max(1, Math.min(15000, deadline - Date.now())))
+      });
+      if (!res.ok)
+        return null;
+      const rj = await res.json().catch(() => null);
+      if (!rj || rj.errorId)
+        return null;
+      if (rj.status === "failed")
+        return null;
+      if (rj.status === "ready") {
+        return extractCfClearance(rj.solution);
+      }
+    } catch {
+      return null;
+    }
+    await new Promise((r) => setTimeout(r, 2500));
+  }
+  return null;
+}
+var init_capzy_cf_solve = () => {};
+
 // .tmp-runtime-src/execution/cf-challenge.ts
 var exports_cf_challenge = {};
 __export(exports_cf_challenge, {
@@ -123617,6 +123736,31 @@ function extractCfBundleUrl(body, requestUrl) {
   }
 }
 async function solveCfAndRetry(input) {
+  if (process.env.UNBROWSE_CAPZY_KEY?.trim()) {
+    const viaCapzy = await solveCfViaCapzy({
+      websiteURL: input.url,
+      proxy: input.proxy ? parseCapzyProxy(input.proxy) : undefined,
+      timeoutMs: input.timeoutMs
+    });
+    if (viaCapzy?.cf_clearance) {
+      const merged2 = mergeCookieJar(input.cookies ?? [], [
+        { name: "cf_clearance", value: viaCapzy.cf_clearance }
+      ]);
+      const cookieHeader2 = merged2.map((c) => `${c.name}=${c.value}`).join("; ");
+      try {
+        const retry = await globalThis.fetch(input.url, {
+          method: "GET",
+          headers: {
+            ...cookieHeader2 ? { cookie: cookieHeader2 } : {},
+            ...viaCapzy.user_agent ? { "user-agent": viaCapzy.user_agent } : {}
+          }
+        });
+        if (retry.status >= 200 && retry.status < 400) {
+          return { status: retry.status, html: await retry.text(), cookies: merged2 };
+        }
+      } catch {}
+    }
+  }
   const bundleUrl = extractCfBundleUrl(input.body, input.url);
   if (!bundleUrl)
     return null;
@@ -123698,6 +123842,7 @@ function mergeCookieJar(a, b) {
 var CF_BUNDLE_RE;
 var init_cf_challenge = __esm(() => {
   init_bundle_replay_client();
+  init_capzy_cf_solve();
   CF_BUNDLE_RE = /src=["'](\/cdn-cgi\/challenge-platform\/h\/[gb]\/scripts\/jsd\/[a-f0-9]+\/main\.js)/i;
 });
 
@@ -154011,7 +154156,7 @@ var exports_tencent_waf_solve = {};
 __export(exports_tencent_waf_solve, {
   submitWafClearance: () => submitWafClearance,
   solveTencentViaCapzy: () => solveTencentViaCapzy,
-  parseCapzyProxy: () => parseCapzyProxy,
+  parseCapzyProxy: () => parseCapzyProxy2,
   mergeCookieHeader: () => mergeCookieHeader,
   extractTencentChallenge: () => extractTencentChallenge,
   clearTencentWafViaCapzy: () => clearTencentWafViaCapzy
@@ -154112,7 +154257,7 @@ async function submitWafClearance(input) {
     return { ok: false, status: 0, setCookies: [] };
   }
 }
-function parseCapzyProxy(proxyUrl) {
+function parseCapzyProxy2(proxyUrl) {
   try {
     const u = new URL(proxyUrl);
     if (!u.hostname || !u.port)
@@ -154153,7 +154298,7 @@ async function clearTencentWafViaCapzy(input) {
     websiteURL: input.url,
     appId: challenge.appId,
     clientKey: input.capzyKey,
-    proxy: input.proxyUrl ? parseCapzyProxy(input.proxyUrl) : undefined,
+    proxy: input.proxyUrl ? parseCapzyProxy2(input.proxyUrl) : undefined,
     timeoutMs: input.timeoutMs,
     fetchImpl: input.fetchImpl
   });

package/runtime/mcp.js

@@ -36310,7 +36310,7 @@ var init_cached_resolution = __esm(() => {
 });
 
 // .tmp-runtime-src/build-info.generated.ts
-var BUILD_RELEASE_VERSION = "9.5.0-preview.1", BUILD_GIT_SHA = "77a00a93a3da", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiOS41LjAtcHJldmlldy4xIiwiZ2l0X3NoYSI6Ijc3YTAwYTkzYTNkYSIsImNvZGVfaGFzaCI6IjVkOWViZjYxOWM2MSIsInRyYWNlX3ZlcnNpb24iOiI1ZDllYmY2MTljNjFANzdhMDBhOTNhM2RhIiwiaXNzdWVkX2F0IjoiMjAyNi0wNi0xN1QxNjoyMjozNC41MjdaIn0", BUILD_RELEASE_MANIFEST_SIGNATURE = "S6SeRd9EuGt1SLhfbZOdCZbjCUsYF8E0D-Yx-cet33g", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
+var BUILD_RELEASE_VERSION = "9.5.0", BUILD_GIT_SHA = "e89197aa72c5", BUILD_CODE_HASH = "5d9ebf619c61", BUILD_RELEASE_MANIFEST_BASE64 = "eyJzY2hlbWFfdmVyc2lvbiI6MSwicmVsZWFzZV92ZXJzaW9uIjoiOS41LjAiLCJnaXRfc2hhIjoiZTg5MTk3YWE3MmM1IiwiY29kZV9oYXNoIjoiNWQ5ZWJmNjE5YzYxIiwidHJhY2VfdmVyc2lvbiI6IjVkOWViZjYxOWM2MUBlODkxOTdhYTcyYzUiLCJpc3N1ZWRfYXQiOiIyMDI2LTA2LTE3VDIwOjQzOjE0LjU3NVoifQ", BUILD_RELEASE_MANIFEST_SIGNATURE = "1UkHiCAP05Uq70_rXEXyo_0Z_VqVHG23WPNTxBlX5Fo", BUILD_DEFAULT_BACKEND_URL = "https://beta-api.unbrowse.ai", BUILD_DEFAULT_PROFILE = "";
 
 // .tmp-runtime-src/version.ts
 import { createHash as createHash4 } from "crypto";
@@ -121818,6 +121818,292 @@ var init_fetch_ladder = __esm(() => {
   ];
 });
 
+// .tmp-runtime-src/execution/tencent-waf-solve.ts
+var exports_tencent_waf_solve = {};
+__export(exports_tencent_waf_solve, {
+  submitWafClearance: () => submitWafClearance,
+  solveTencentViaCapzy: () => solveTencentViaCapzy,
+  parseCapzyProxy: () => parseCapzyProxy,
+  mergeCookieHeader: () => mergeCookieHeader,
+  extractTencentChallenge: () => extractTencentChallenge,
+  clearTencentWafViaCapzy: () => clearTencentWafViaCapzy
+});
+function extractTencentChallenge(html3) {
+  if (!html3 || typeof html3 !== "string")
+    return null;
+  const appMatch = html3.match(/new\s+Captcha\(\s*["']([0-9]{5,})["']/);
+  const seqMatch = html3.match(/var\s+seqid\s*=\s*["']([^"']+?)["']/);
+  if (!appMatch || !seqMatch)
+    return null;
+  return { appId: appMatch[1], seqid: seqMatch[1] };
+}
+async function solveTencentViaCapzy(input) {
+  const clientKey = input.clientKey ?? process.env.UNBROWSE_CAPZY_KEY?.trim();
+  if (!clientKey)
+    return null;
+  const apiBase = (input.apiBase ?? process.env.UNBROWSE_CAPZY_URL?.trim() ?? "https://api.capzy.ai").replace(/\/+$/, "");
+  const doFetch = input.fetchImpl ?? fetch;
+  const deadline = Date.now() + (input.timeoutMs ?? 90000);
+  const task = input.proxy ? {
+    type: "TencentTask",
+    websiteURL: input.websiteURL,
+    websiteKey: input.appId,
+    proxyType: input.proxy.type,
+    proxyAddress: input.proxy.address,
+    proxyPort: input.proxy.port,
+    ...input.proxy.login ? { proxyLogin: input.proxy.login } : {},
+    ...input.proxy.password ? { proxyPassword: input.proxy.password } : {}
+  } : {
+    type: "TencentTaskProxyLess",
+    websiteURL: input.websiteURL,
+    websiteKey: input.appId
+  };
+  let taskId;
+  try {
+    const created = await doFetch(`${apiBase}/createTask`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ clientKey, task }),
+      signal: AbortSignal.timeout(Math.max(1, Math.min(20000, deadline - Date.now())))
+    });
+    if (!created.ok)
+      return null;
+    const cj = await created.json().catch(() => null);
+    if (!cj || cj.errorId || !cj.taskId)
+      return null;
+    taskId = cj.taskId;
+  } catch {
+    return null;
+  }
+  while (Date.now() < deadline) {
+    try {
+      const res = await doFetch(`${apiBase}/getTaskResult`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ clientKey, taskId }),
+        signal: AbortSignal.timeout(Math.max(1, Math.min(15000, deadline - Date.now())))
+      });
+      if (!res.ok)
+        return null;
+      const rj = await res.json().catch(() => null);
+      if (!rj || rj.errorId)
+        return null;
+      if (rj.status === "ready") {
+        const s = rj.solution ?? {};
+        if (s.ticket && s.randstr) {
+          return { ticket: s.ticket, randstr: s.randstr, appid: s.appid ?? input.appId };
+        }
+        return null;
+      }
+    } catch {
+      return null;
+    }
+    await new Promise((r) => setTimeout(r, 2000));
+  }
+  return null;
+}
+async function submitWafClearance(input) {
+  const doFetch = input.fetchImpl ?? fetch;
+  const ret = input.ret ?? 0;
+  const body = [String(ret), input.ticket, input.randstr, input.seqid].join(`
+`);
+  const headers = { "Content-Type": "text/plain;charset=UTF-8" };
+  if (input.cookieHeader)
+    headers["Cookie"] = input.cookieHeader;
+  try {
+    const res = await doFetch(input.wafUrl, {
+      method: "POST",
+      headers,
+      body,
+      signal: AbortSignal.timeout(input.timeoutMs ?? 20000),
+      ...input.proxyUrl ? { proxy: input.proxyUrl } : {}
+    });
+    const setCookies2 = typeof res.headers.getSetCookie === "function" ? res.headers.getSetCookie() : res.headers.get("set-cookie") ? [res.headers.get("set-cookie")] : [];
+    return { ok: res.ok, status: res.status, setCookies: setCookies2 };
+  } catch {
+    return { ok: false, status: 0, setCookies: [] };
+  }
+}
+function parseCapzyProxy(proxyUrl) {
+  try {
+    const u = new URL(proxyUrl);
+    if (!u.hostname || !u.port)
+      return;
+    const scheme = u.protocol.replace(":", "").toLowerCase();
+    const type = scheme === "socks5" || scheme === "socks4" || scheme === "https" ? scheme : "http";
+    return {
+      type,
+      address: u.hostname,
+      port: Number(u.port),
+      ...u.username ? { login: decodeURIComponent(u.username) } : {},
+      ...u.password ? { password: decodeURIComponent(u.password) } : {}
+    };
+  } catch {
+    return;
+  }
+}
+function mergeCookieHeader(prior, setCookies2) {
+  const jar = new Map;
+  for (const pair of (prior ?? "").split(/;\s*/)) {
+    const eq2 = pair.indexOf("=");
+    if (eq2 > 0)
+      jar.set(pair.slice(0, eq2).trim(), pair.slice(eq2 + 1).trim());
+  }
+  for (const sc of setCookies2) {
+    const first2 = sc.split(";")[0] ?? "";
+    const eq2 = first2.indexOf("=");
+    if (eq2 > 0)
+      jar.set(first2.slice(0, eq2).trim(), first2.slice(eq2 + 1).trim());
+  }
+  return Array.from(jar, ([k, v]) => `${k}=${v}`).join("; ");
+}
+async function clearTencentWafViaCapzy(input) {
+  const challenge = extractTencentChallenge(input.html);
+  if (!challenge)
+    return null;
+  const solved = await solveTencentViaCapzy({
+    websiteURL: input.url,
+    appId: challenge.appId,
+    clientKey: input.capzyKey,
+    proxy: input.proxyUrl ? parseCapzyProxy(input.proxyUrl) : undefined,
+    timeoutMs: input.timeoutMs,
+    fetchImpl: input.fetchImpl
+  });
+  if (!solved)
+    return null;
+  let origin;
+  try {
+    origin = new URL(input.url).origin;
+  } catch {
+    return null;
+  }
+  const clearance = await submitWafClearance({
+    wafUrl: `${origin}/WafCaptcha`,
+    ticket: solved.ticket,
+    randstr: solved.randstr,
+    seqid: challenge.seqid,
+    cookieHeader: input.cookieHeader,
+    proxyUrl: input.proxyUrl,
+    fetchImpl: input.fetchImpl
+  });
+  if (!clearance.ok)
+    return null;
+  const cookieHeader = mergeCookieHeader(input.cookieHeader, clearance.setCookies);
+  const doFetch = input.fetchImpl ?? fetch;
+  try {
+    const res = await doFetch(input.url, {
+      headers: { Cookie: cookieHeader, Accept: "*/*" },
+      signal: AbortSignal.timeout(input.timeoutMs ?? 30000),
+      ...input.proxyUrl ? { proxy: input.proxyUrl } : {}
+    });
+    const html3 = await res.text();
+    if (!html3 || extractTencentChallenge(html3))
+      return null;
+    return { html: html3, cookieHeader };
+  } catch {
+    return null;
+  }
+}
+
+// .tmp-runtime-src/execution/capzy-cf-solve.ts
+function extractCfClearance(solution) {
+  if (!solution || typeof solution !== "object")
+    return null;
+  const s = solution;
+  const ua = typeof s.user_agent === "string" && s.user_agent || typeof s.userAgent === "string" && s.userAgent || undefined;
+  if (typeof s.cf_clearance === "string" && s.cf_clearance) {
+    return { cf_clearance: s.cf_clearance, user_agent: ua || undefined };
+  }
+  if (typeof s.token === "string" && s.token && s.type !== "turnstile") {
+    return { cf_clearance: s.token, user_agent: ua || undefined };
+  }
+  const cookies = s.cookies;
+  if (cookies && typeof cookies === "object" && !Array.isArray(cookies)) {
+    const v = cookies.cf_clearance;
+    if (typeof v === "string" && v)
+      return { cf_clearance: v, user_agent: ua || undefined };
+  }
+  if (Array.isArray(cookies)) {
+    for (const c of cookies) {
+      if (c && typeof c === "object") {
+        const o = c;
+        if (o.name === "cf_clearance" && typeof o.value === "string" && o.value) {
+          return { cf_clearance: o.value, user_agent: ua || undefined };
+        }
+      } else if (typeof c === "string" && c.startsWith("cf_clearance=")) {
+        const v = c.slice("cf_clearance=".length).split(";")[0];
+        if (v)
+          return { cf_clearance: v, user_agent: ua || undefined };
+      }
+    }
+  }
+  return null;
+}
+function buildCfTask(websiteURL, proxy) {
+  return {
+    type: "AntiCloudflareTask",
+    websiteURL,
+    proxyType: proxy.type,
+    proxyAddress: proxy.address,
+    proxyPort: proxy.port,
+    ...proxy.login ? { proxyLogin: proxy.login } : {},
+    ...proxy.password ? { proxyPassword: proxy.password } : {}
+  };
+}
+async function solveCfViaCapzy(input) {
+  const clientKey = input.clientKey ?? process.env.UNBROWSE_CAPZY_KEY?.trim();
+  if (!clientKey)
+    return null;
+  if (!input.proxy)
+    return null;
+  const apiBase = (input.apiBase ?? process.env.UNBROWSE_CAPZY_URL?.trim() ?? "https://api.capzy.ai").replace(/\/+$/, "");
+  const doFetch = input.fetchImpl ?? fetch;
+  const deadline = Date.now() + (input.timeoutMs ?? 120000);
+  const task = buildCfTask(input.websiteURL, input.proxy);
+  let taskId;
+  try {
+    const created = await doFetch(`${apiBase}/createTask`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ clientKey, task }),
+      signal: AbortSignal.timeout(Math.max(1, Math.min(20000, deadline - Date.now())))
+    });
+    if (!created.ok)
+      return null;
+    const cj = await created.json().catch(() => null);
+    if (!cj || cj.errorId || !cj.taskId)
+      return null;
+    taskId = cj.taskId;
+  } catch {
+    return null;
+  }
+  while (Date.now() < deadline) {
+    try {
+      const res = await doFetch(`${apiBase}/getTaskResult`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ clientKey, taskId }),
+        signal: AbortSignal.timeout(Math.max(1, Math.min(15000, deadline - Date.now())))
+      });
+      if (!res.ok)
+        return null;
+      const rj = await res.json().catch(() => null);
+      if (!rj || rj.errorId)
+        return null;
+      if (rj.status === "failed")
+        return null;
+      if (rj.status === "ready") {
+        return extractCfClearance(rj.solution);
+      }
+    } catch {
+      return null;
+    }
+    await new Promise((r) => setTimeout(r, 2500));
+  }
+  return null;
+}
+var init_capzy_cf_solve = () => {};
+
 // .tmp-runtime-src/execution/cf-challenge.ts
 var exports_cf_challenge = {};
 __export(exports_cf_challenge, {
@@ -121838,6 +122124,31 @@ function extractCfBundleUrl(body, requestUrl) {
   }
 }
 async function solveCfAndRetry(input) {
+  if (process.env.UNBROWSE_CAPZY_KEY?.trim()) {
+    const viaCapzy = await solveCfViaCapzy({
+      websiteURL: input.url,
+      proxy: input.proxy ? parseCapzyProxy(input.proxy) : undefined,
+      timeoutMs: input.timeoutMs
+    });
+    if (viaCapzy?.cf_clearance) {
+      const merged2 = mergeCookieJar(input.cookies ?? [], [
+        { name: "cf_clearance", value: viaCapzy.cf_clearance }
+      ]);
+      const cookieHeader2 = merged2.map((c) => `${c.name}=${c.value}`).join("; ");
+      try {
+        const retry = await globalThis.fetch(input.url, {
+          method: "GET",
+          headers: {
+            ...cookieHeader2 ? { cookie: cookieHeader2 } : {},
+            ...viaCapzy.user_agent ? { "user-agent": viaCapzy.user_agent } : {}
+          }
+        });
+        if (retry.status >= 200 && retry.status < 400) {
+          return { status: retry.status, html: await retry.text(), cookies: merged2 };
+        }
+      } catch {}
+    }
+  }
   const bundleUrl = extractCfBundleUrl(input.body, input.url);
   if (!bundleUrl)
     return null;
@@ -121919,6 +122230,7 @@ function mergeCookieJar(a, b) {
 var CF_BUNDLE_RE;
 var init_cf_challenge = __esm(() => {
   init_bundle_replay_client();
+  init_capzy_cf_solve();
   CF_BUNDLE_RE = /src=["'](\/cdn-cgi\/challenge-platform\/h\/[gb]\/scripts\/jsd\/[a-f0-9]+\/main\.js)/i;
 });
 
@@ -148674,193 +148986,6 @@ function isGithubBlob(url) {
   return githubBlobToRaw(url) !== null;
 }
 
-// .tmp-runtime-src/execution/tencent-waf-solve.ts
-var exports_tencent_waf_solve = {};
-__export(exports_tencent_waf_solve, {
-  submitWafClearance: () => submitWafClearance,
-  solveTencentViaCapzy: () => solveTencentViaCapzy,
-  parseCapzyProxy: () => parseCapzyProxy,
-  mergeCookieHeader: () => mergeCookieHeader,
-  extractTencentChallenge: () => extractTencentChallenge,
-  clearTencentWafViaCapzy: () => clearTencentWafViaCapzy
-});
-function extractTencentChallenge(html3) {
-  if (!html3 || typeof html3 !== "string")
-    return null;
-  const appMatch = html3.match(/new\s+Captcha\(\s*["']([0-9]{5,})["']/);
-  const seqMatch = html3.match(/var\s+seqid\s*=\s*["']([^"']+?)["']/);
-  if (!appMatch || !seqMatch)
-    return null;
-  return { appId: appMatch[1], seqid: seqMatch[1] };
-}
-async function solveTencentViaCapzy(input) {
-  const clientKey = input.clientKey ?? process.env.UNBROWSE_CAPZY_KEY?.trim();
-  if (!clientKey)
-    return null;
-  const apiBase = (input.apiBase ?? process.env.UNBROWSE_CAPZY_URL?.trim() ?? "https://api.capzy.ai").replace(/\/+$/, "");
-  const doFetch = input.fetchImpl ?? fetch;
-  const deadline = Date.now() + (input.timeoutMs ?? 90000);
-  const task = input.proxy ? {
-    type: "TencentTask",
-    websiteURL: input.websiteURL,
-    websiteKey: input.appId,
-    proxyType: input.proxy.type,
-    proxyAddress: input.proxy.address,
-    proxyPort: input.proxy.port,
-    ...input.proxy.login ? { proxyLogin: input.proxy.login } : {},
-    ...input.proxy.password ? { proxyPassword: input.proxy.password } : {}
-  } : {
-    type: "TencentTaskProxyLess",
-    websiteURL: input.websiteURL,
-    websiteKey: input.appId
-  };
-  let taskId;
-  try {
-    const created = await doFetch(`${apiBase}/createTask`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ clientKey, task }),
-      signal: AbortSignal.timeout(Math.max(1, Math.min(20000, deadline - Date.now())))
-    });
-    if (!created.ok)
-      return null;
-    const cj = await created.json().catch(() => null);
-    if (!cj || cj.errorId || !cj.taskId)
-      return null;
-    taskId = cj.taskId;
-  } catch {
-    return null;
-  }
-  while (Date.now() < deadline) {
-    try {
-      const res = await doFetch(`${apiBase}/getTaskResult`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ clientKey, taskId }),
-        signal: AbortSignal.timeout(Math.max(1, Math.min(15000, deadline - Date.now())))
-      });
-      if (!res.ok)
-        return null;
-      const rj = await res.json().catch(() => null);
-      if (!rj || rj.errorId)
-        return null;
-      if (rj.status === "ready") {
-        const s = rj.solution ?? {};
-        if (s.ticket && s.randstr) {
-          return { ticket: s.ticket, randstr: s.randstr, appid: s.appid ?? input.appId };
-        }
-        return null;
-      }
-    } catch {
-      return null;
-    }
-    await new Promise((r) => setTimeout(r, 2000));
-  }
-  return null;
-}
-async function submitWafClearance(input) {
-  const doFetch = input.fetchImpl ?? fetch;
-  const ret = input.ret ?? 0;
-  const body = [String(ret), input.ticket, input.randstr, input.seqid].join(`
-`);
-  const headers = { "Content-Type": "text/plain;charset=UTF-8" };
-  if (input.cookieHeader)
-    headers["Cookie"] = input.cookieHeader;
-  try {
-    const res = await doFetch(input.wafUrl, {
-      method: "POST",
-      headers,
-      body,
-      signal: AbortSignal.timeout(input.timeoutMs ?? 20000),
-      ...input.proxyUrl ? { proxy: input.proxyUrl } : {}
-    });
-    const setCookies2 = typeof res.headers.getSetCookie === "function" ? res.headers.getSetCookie() : res.headers.get("set-cookie") ? [res.headers.get("set-cookie")] : [];
-    return { ok: res.ok, status: res.status, setCookies: setCookies2 };
-  } catch {
-    return { ok: false, status: 0, setCookies: [] };
-  }
-}
-function parseCapzyProxy(proxyUrl) {
-  try {
-    const u = new URL(proxyUrl);
-    if (!u.hostname || !u.port)
-      return;
-    const scheme = u.protocol.replace(":", "").toLowerCase();
-    const type = scheme === "socks5" || scheme === "socks4" || scheme === "https" ? scheme : "http";
-    return {
-      type,
-      address: u.hostname,
-      port: Number(u.port),
-      ...u.username ? { login: decodeURIComponent(u.username) } : {},
-      ...u.password ? { password: decodeURIComponent(u.password) } : {}
-    };
-  } catch {
-    return;
-  }
-}
-function mergeCookieHeader(prior, setCookies2) {
-  const jar = new Map;
-  for (const pair of (prior ?? "").split(/;\s*/)) {
-    const eq2 = pair.indexOf("=");
-    if (eq2 > 0)
-      jar.set(pair.slice(0, eq2).trim(), pair.slice(eq2 + 1).trim());
-  }
-  for (const sc of setCookies2) {
-    const first2 = sc.split(";")[0] ?? "";
-    const eq2 = first2.indexOf("=");
-    if (eq2 > 0)
-      jar.set(first2.slice(0, eq2).trim(), first2.slice(eq2 + 1).trim());
-  }
-  return Array.from(jar, ([k, v]) => `${k}=${v}`).join("; ");
-}
-async function clearTencentWafViaCapzy(input) {
-  const challenge = extractTencentChallenge(input.html);
-  if (!challenge)
-    return null;
-  const solved = await solveTencentViaCapzy({
-    websiteURL: input.url,
-    appId: challenge.appId,
-    clientKey: input.capzyKey,
-    proxy: input.proxyUrl ? parseCapzyProxy(input.proxyUrl) : undefined,
-    timeoutMs: input.timeoutMs,
-    fetchImpl: input.fetchImpl
-  });
-  if (!solved)
-    return null;
-  let origin;
-  try {
-    origin = new URL(input.url).origin;
-  } catch {
-    return null;
-  }
-  const clearance = await submitWafClearance({
-    wafUrl: `${origin}/WafCaptcha`,
-    ticket: solved.ticket,
-    randstr: solved.randstr,
-    seqid: challenge.seqid,
-    cookieHeader: input.cookieHeader,
-    proxyUrl: input.proxyUrl,
-    fetchImpl: input.fetchImpl
-  });
-  if (!clearance.ok)
-    return null;
-  const cookieHeader = mergeCookieHeader(input.cookieHeader, clearance.setCookies);
-  const doFetch = input.fetchImpl ?? fetch;
-  try {
-    const res = await doFetch(input.url, {
-      headers: { Cookie: cookieHeader, Accept: "*/*" },
-      signal: AbortSignal.timeout(input.timeoutMs ?? 30000),
-      ...input.proxyUrl ? { proxy: input.proxyUrl } : {}
-    });
-    const html3 = await res.text();
-    if (!html3 || extractTencentChallenge(html3))
-      return null;
-    return { html: html3, cookieHeader };
-  } catch {
-    return null;
-  }
-}
-
 // .tmp-runtime-src/extraction/readability.ts
 function linkDensity($2, $el) {
   const textLen = $el.text().replace(/\s+/g, " ").trim().length || 1;

package/vendor/kuri/manifest.json

@@ -2,7 +2,7 @@
   "repo_url": "https://github.com/justrach/kuri.git",
   "branch": "adding-extensions",
   "source_sha": "149881254046a20778f642b69f20f0c6468f6fb4",
-  "built_at": "2026-06-17T15:12:51.641Z",
+  "built_at": "2026-06-17T20:24:54.012Z",
   "binaries": {
     "darwin-arm64": {
       "zig_target": "aarch64-macos",
@@ -21,11 +21,11 @@
     },
     "linux-x64": {
       "zig_target": "x86_64-linux",
-      "sha256": "4d009a669b71c2e11d747fb2839da17b1f89b62b4e937a9f5bb7274cc2ee2b4a"
+      "sha256": "63a56d1b15d5ea1f7fe5f37157a1a018cbd1a9308c8dd126a4992a8d05a9970c"
     },
     "win-x64": {
       "zig_target": "x86_64-windows-gnu",
-      "sha256": "4a244ea5f508b7dbeff9227f43458bb03e6db2e11f72abd00ab3c81c0fde973d",
+      "sha256": "24cf7b34a6d29b1bf9bd2dec1f616828cf88211a4c171b63b25265d467b93cb6",
       "source": "pre-staged"
     }
   },
@@ -33,22 +33,22 @@
     "darwin-arm64": {
       "zig_target": "aarch64-macos",
       "lib": "libkuri_ffi.dylib",
-      "sha256": "c49a5ad76c782f3fa351a8c8f797f63bf92a2e4f4405a76fc92d59cba9e52dee"
+      "sha256": "3b2c830e62bfe76605bc1a0531f8af362cfaece72b3675511407c295f6768d1f"
     },
     "darwin-x64": {
       "zig_target": "x86_64-macos",
       "lib": "libkuri_ffi.dylib",
-      "sha256": "44ef8a02fa2e3f70f52cfb915cc2cf69e321964770c3fcdaaa9906341044fa5d"
+      "sha256": "b510792c338e0cc618e79cdacfe1b85258be9904d6768b089cc63ed561a631ba"
     },
     "linux-arm64": {
       "zig_target": "aarch64-linux",
       "lib": "libkuri_ffi.so",
-      "sha256": "18a8c9834bfd1090d29d9ea20426dc8b798a7eb0c3a64949cefe0ef83551a7e3"
+      "sha256": "72335f81d0a6048b7228fece8fcce861884a059fb0ac4475a5577b5fa9b02ccf"
     },
     "linux-x64": {
       "zig_target": "x86_64-linux",
       "lib": "libkuri_ffi.so",
-      "sha256": "9c874005b5d4b32ed52999a68a4f5961b304e072cf152bac28aa86351d662ac7"
+      "sha256": "50db645f48c0d49d53733bc1eb099bc08a9a493c1f79f893566775700c504ecf"
     }
   }
 }