@apifuse/provider-sdk 2.2.0-beta.31 → 2.2.0-beta.33

package/src/runtime/resolver-vendors/twocaptcha.ts

@@ -338,11 +338,6 @@ export function createTwoCaptchaResolverVendorAdapter(
 			if (!resolverVendorSupports(TWOCAPTCHA_VENDOR_ID, challenge.kind)) {
 				throw new TypeError(`2captcha resolver does not support ${challenge.kind}`);
 			}
-			if (challenge.kind !== "recaptcha_v2" && challenge.kind !== "aws_waf") {
-				throw new ResolverVendorUnavailableError(TWOCAPTCHA_VENDOR_ID, "not_implemented", {
-					phase: "create_task",
-				});
-			}
 			if (
 				challenge.kind === "aws_waf" &&
 				(!challenge.siteKey?.trim() ||
@@ -354,6 +349,11 @@ export function createTwoCaptchaResolverVendorAdapter(
 					phase: "create_task",
 				});
 			}
+			if (challenge.kind === "recaptcha_v3" && challenge.minScore === undefined) {
+				throw new ResolverVendorUnavailableError(TWOCAPTCHA_VENDOR_ID, "transport_failure", {
+					phase: "create_task",
+				});
+			}
 
 			assertResolverHostAllowed(challenge.pageUrl, options.allowedHosts);
 			callerSignal.throwIfAborted();
@@ -388,14 +388,49 @@ export function createTwoCaptchaResolverVendorAdapter(
 									...(identity ? { userAgent: identity.userAgent } : {}),
 									...(proxy ?? {}),
 								}
-							: {
-									type: proxy ? "RecaptchaV2Task" : "RecaptchaV2TaskProxyless",
+						: challenge.kind === "recaptcha_v2"
+							? {
+								type: proxy ? "RecaptchaV2Task" : "RecaptchaV2TaskProxyless",
 									websiteURL: challenge.pageUrl,
 									websiteKey: challenge.siteKey,
 									isInvisible: false,
 									...(identity ? { userAgent: identity.userAgent } : {}),
+								...(proxy ?? {}),
+							}
+						: challenge.kind === "recaptcha_v3"
+							? {
+									type: "RecaptchaV3TaskProxyless",
+									websiteURL: challenge.pageUrl,
+									websiteKey: challenge.siteKey,
+									minScore: challenge.minScore,
+									pageAction: challenge.action,
+									...(identity ? { userAgent: identity.userAgent } : {}),
+								}
+						: challenge.kind === "hcaptcha"
+							? {
+									type: proxy ? "HCaptchaTask" : "HCaptchaTaskProxyless",
+									websiteURL: challenge.pageUrl,
+									websiteKey: challenge.siteKey,
+									...(identity ? { userAgent: identity.userAgent } : {}),
+									...(proxy ?? {}),
+								}
+						: challenge.kind === "turnstile"
+							? {
+									type: proxy ? "TurnstileTask" : "TurnstileTaskProxyless",
+									websiteURL: challenge.pageUrl,
+									websiteKey: challenge.siteKey,
+									...(challenge.action !== undefined ? { action: challenge.action } : {}),
+									...(challenge.cdata !== undefined ? { data: challenge.cdata } : {}),
+									...(identity ? { userAgent: identity.userAgent } : {}),
 									...(proxy ?? {}),
-								};
+								}
+							: // `resolverVendorSupports` above already rejected every kind this
+								// adapter does not build a task for, so this branch is unreachable.
+								(() => {
+									throw new TypeError(
+										`2captcha resolver does not support ${challenge.kind}`,
+									);
+								})();
 					const createResult = await postJson(
 						fetchImpl,
 						endpoint(baseUrl, "createTask"),

package/src/runtime/resolver-vendors/types.ts

@@ -8,15 +8,18 @@ import type { TraceRecorder } from "../trace.js";
 
 export const RESOLVER_VENDOR_CAPABILITIES = {
 	browser: ["aws_waf", "cloudflare_interstitial"],
+	// Every kind listed per vendor is implemented by that vendor's adapter; the
+	// per-adapter "agrees with every declared capability" tests iterate this
+	// table, so adding a kind here without an implementation fails the suite.
+	// 2captcha omits `cloudflare_interstitial`, `akamai_sec_cpt`, and
+	// `akamai_sensor`: their API offers no task type for them, so declaring them
+	// would route challenges to a vendor that can only refuse.
 	"2captcha": [
 		"turnstile",
 		"recaptcha_v2",
 		"recaptcha_v3",
 		"hcaptcha",
-		"cloudflare_interstitial",
 		"aws_waf",
-		"akamai_sec_cpt",
-		"akamai_sensor",
 	],
 	capsolver: [
 		"turnstile",

package/src/runtime/resolver.ts

@@ -24,6 +24,7 @@ import {
 	resolverChallengeIssuingIdentity,
 } from "./resolver-vendors/bindings.js";
 import { createBrowserResolverVendorAdapter } from "./resolver-vendors/browser.js";
+import { createCapsolverResolverVendorAdapter } from "./resolver-vendors/capsolver.js";
 import { assertResolverHostAllowed } from "./resolver-vendors/hosts.js";
 import { createTwoCaptchaResolverVendorAdapter } from "./resolver-vendors/twocaptcha.js";
 import {
@@ -70,7 +71,7 @@ type ResolvedResolverVendor =
 	| {
 			readonly vendor: Exclude<ProviderResolverVendor, "custom">;
 			readonly available: true;
-			readonly configuration: string;
+			readonly configuration: string | undefined;
 	  }
 	| {
 			readonly vendor: ProviderResolverVendor;
@@ -183,19 +184,29 @@ export type ResolverInstrumentationMetadata = {
 };
 
 export type ResolverAdapterFactory = (
-	configuration: string,
+	configuration: string | undefined,
 	timeoutMs: number,
 	allowedHosts: readonly string[],
 ) => ResolverVendorAdapter;
 
 const resolverAdapterRegistry: Partial<Record<ProviderResolverVendor, ResolverAdapterFactory>> = {
 	"2captcha"(configuration, timeoutMs, allowedHosts) {
+		if (configuration === undefined) {
+			throw new Error("2captcha resolver adapter factory requires an API key");
+		}
 		return createTwoCaptchaResolverVendorAdapter({
 			allowedHosts,
 			apiKey: configuration,
 			timeoutMs,
 		});
 	},
+	capsolver(configuration, timeoutMs, allowedHosts) {
+		return createCapsolverResolverVendorAdapter({
+			allowedHosts,
+			apiKey: configuration,
+			timeoutMs,
+		});
+	},
 	browser(configuration, timeoutMs, allowedHosts) {
 		return createBrowserResolverVendorAdapter({
 			allowedHosts,
@@ -246,7 +257,6 @@ export function swapResolverDefaultUserAgentForTests(
 // This is the sole allowlist for declared vendors whose registry entry may be absent.
 // Remove a vendor here when its adapter is registered.
 const KNOWN_UNIMPLEMENTED_RESOLVER_VENDORS: ReadonlySet<ProviderResolverVendor> = new Set([
-	"capsolver",
 	"capmonster",
 	"custom",
 ]);
@@ -959,15 +969,20 @@ function resolveVendorAvailability(
 			reason: "missing_transport",
 		};
 	}
+	if (vendor === "browser") {
+		return {
+			vendor,
+			available: true,
+			configuration: normalizedEnvValue(env, APIFUSE__CDP_POOL__URL),
+		};
+	}
 
 	const envKey =
 		vendor === "2captcha"
 			? APIFUSE__RESOLVER__2CAPTCHA__API_KEY
 			: vendor === "capsolver"
 				? APIFUSE__RESOLVER__CAPSOLVER__API_KEY
-				: vendor === "capmonster"
-					? APIFUSE__RESOLVER__CAPMONSTER__API_KEY
-					: APIFUSE__CDP_POOL__URL;
+				: APIFUSE__RESOLVER__CAPMONSTER__API_KEY;
 
 	const configuration = normalizedEnvValue(env, envKey);
 	return configuration

package/src/server/serve-implementation.ts

@@ -39,7 +39,6 @@ import { createProviderCache } from "../runtime/cache.js";
 import {
 	createProviderChoiceContext,
 	PROVIDER_RUNTIME_CHOICE_TOKEN_MASTER_SECRET_ENV,
-	PROVIDER_RUNTIME_CHOICE_WORD_ISSUANCE_ENV,
 } from "../runtime/choice.js";
 import { createCredentialContext } from "../runtime/credential.js";
 import { createEnvContext } from "../runtime/env.js";
@@ -627,7 +626,6 @@ function createProviderContext(
 	const env = createEnvContext([
 		...(provider.secrets?.map((secret) => secret.name) ?? []),
 		PROVIDER_RUNTIME_CHOICE_TOKEN_MASTER_SECRET_ENV,
-		PROVIDER_RUNTIME_CHOICE_WORD_ISSUANCE_ENV,
 	]);
 	const credential = createCredentialContext({
 		allowedKeys: provider.credential?.keys,

package/src/types.ts

@@ -1757,7 +1757,7 @@ export interface BrowserCookie {
 	readonly sameSite?: "Strict" | "Lax" | "None";
 }
 
-export type BrowserResourceMethod = "GET" | "HEAD";
+export type BrowserResourceMethod = "GET" | "HEAD" | "POST";
 
 export type BrowserResourceRequest = {
 	readonly url: string;
@@ -1769,6 +1769,9 @@ export type BrowserResourceRequest = {
 export type BrowserResourceBody = Buffer | Uint8Array | ArrayBuffer | string;
 
 export type BrowserResourceDecision =
+	| {
+			readonly action: "continue";
+		}
 	| {
 			readonly action: "fulfill";
 			readonly status?: number;
@@ -1793,6 +1796,12 @@ export type BrowserResourceRoute = {
 export type BrowserResourcePolicy = {
 	readonly defaultAction?: "block";
 	readonly allowedMethods?: readonly BrowserResourceMethod[];
+	/**
+	 * Appends an enforcing CSP header to every renderable document response
+	 * while the policy is active. Existing CSP headers are retained, so this
+	 * can only further restrict the document.
+	 */
+	readonly documentContentSecurityPolicy?: string;
 	readonly routes: readonly BrowserResourceRoute[];
 };