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

package/dist/runtime/resolver-vendors/capsolver.js

@@ -0,0 +1,526 @@
+import { getStealthProfile } from "../../stealth/profiles.js";
+import { redactSensitiveText } from "../request-options.js";
+import { DEFAULT_PROFILE } from "../stealth.js";
+import { assertResolverHostAllowed } from "./hosts.js";
+import { ResolverChallengeVerdictError, ResolverVendorUnavailableError, resolverVendorSupports, } from "./types.js";
+const CAPSOLVER_VENDOR_ID = "capsolver";
+const DEFAULT_CAPSOLVER_BASE_URL = "https://api.capsolver.com";
+const DEFAULT_POLL_INTERVAL_MS = 2_000;
+const DEFAULT_TIMEOUT_MS = 120_000;
+class CapsolverSolveTimeoutError extends Error {
+    constructor() {
+        super("Capsolver resolver solve budget elapsed");
+        this.name = "CapsolverSolveTimeoutError";
+    }
+}
+class CapsolverUnavailableError extends ResolverVendorUnavailableError {
+    errorCode;
+    errorDescription;
+    responseStatus;
+    responseContentType;
+    responseLength;
+    constructor(reason, options) {
+        super(CAPSOLVER_VENDOR_ID, reason, options);
+        this.errorCode = options.errorCode;
+        this.errorDescription = options.errorDescription;
+        this.responseStatus = options.responseStatus;
+        this.responseContentType = options.responseContentType;
+        this.responseLength = options.responseLength;
+    }
+}
+class CapsolverVerdictError extends ResolverChallengeVerdictError {
+    phase;
+    errorCode;
+    errorDescription;
+    constructor(options) {
+        super(CAPSOLVER_VENDOR_ID, "solve_failed", options);
+        this.phase = options.phase;
+        this.errorCode = options.errorCode;
+        this.errorDescription = options.errorDescription;
+    }
+}
+function isJsonRecord(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function abortReason(signal) {
+    return signal.reason ?? new DOMException("The operation was aborted", "AbortError");
+}
+function containsSensitiveValue(value, sensitiveValues) {
+    const secrets = sensitiveValues.filter((secret) => secret.length > 0);
+    if (secrets.length === 0)
+        return false;
+    const seen = new Set();
+    const inspect = (candidate) => {
+        if (typeof candidate === "string") {
+            return secrets.some((secret) => candidate.includes(secret));
+        }
+        if (candidate === null || (typeof candidate !== "object" && typeof candidate !== "function")) {
+            return false;
+        }
+        if (seen.has(candidate))
+            return false;
+        seen.add(candidate);
+        try {
+            for (const property of Reflect.ownKeys(candidate)) {
+                if (typeof property === "string" && inspect(property))
+                    return true;
+                const descriptor = Object.getOwnPropertyDescriptor(candidate, property);
+                if (!descriptor)
+                    return true;
+                if ("value" in descriptor && inspect(descriptor.value))
+                    return true;
+                if (descriptor.get !== undefined || descriptor.set !== undefined)
+                    return true;
+            }
+        }
+        catch {
+            return true;
+        }
+        return false;
+    };
+    return inspect(value);
+}
+function safeCauseOptions(error, sensitiveValues) {
+    return containsSensitiveValue(error, sensitiveValues) ? {} : { cause: error };
+}
+function sanitizedJsonParseCause() {
+    return new SyntaxError("Upstream response failed");
+}
+function raceWithAbort(operation, signal, phase, sensitiveValues = []) {
+    if (signal.aborted)
+        return Promise.reject(abortReason(signal));
+    return new Promise((resolve, reject) => {
+        const cleanup = () => signal.removeEventListener("abort", onAbort);
+        const onAbort = () => {
+            cleanup();
+            reject(abortReason(signal));
+        };
+        signal.addEventListener("abort", onAbort, { once: true });
+        operation().then((value) => {
+            cleanup();
+            resolve(value);
+        }, (error) => {
+            cleanup();
+            if (phase === undefined) {
+                reject(error);
+                return;
+            }
+            reject(new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                ...safeCauseOptions(error, sensitiveValues),
+                phase,
+            }));
+        });
+    });
+}
+async function abortableDelay(ms, signal) {
+    let timer;
+    try {
+        await raceWithAbort(() => new Promise((resolve) => {
+            timer = setTimeout(resolve, ms);
+        }), signal);
+    }
+    finally {
+        if (timer !== undefined)
+            clearTimeout(timer);
+    }
+}
+function responseErrorFields(payload) {
+    return {
+        errorId: typeof payload.errorId === "number" ? payload.errorId : undefined,
+        errorCode: typeof payload.errorCode === "string" ? payload.errorCode : undefined,
+        errorDescription: typeof payload.errorDescription === "string" ? payload.errorDescription : undefined,
+    };
+}
+function parseCreateTaskResponse(payload) {
+    const taskId = payload.taskId;
+    return {
+        ...responseErrorFields(payload),
+        taskId: typeof taskId === "string" || typeof taskId === "number" ? taskId : undefined,
+    };
+}
+function parsePollResultResponse(payload) {
+    const solution = isJsonRecord(payload.solution) ? payload.solution : undefined;
+    const cookies = solution && isJsonRecord(solution.cookies)
+        ? Object.fromEntries(Object.entries(solution.cookies).filter((entry) => typeof entry[1] === "string"))
+        : undefined;
+    return {
+        ...responseErrorFields(payload),
+        status: typeof payload.status === "string" ? payload.status : undefined,
+        solution: solution
+            ? {
+                token: typeof solution.token === "string" ? solution.token : undefined,
+                cookie: typeof solution.cookie === "string" ? solution.cookie : undefined,
+                gRecaptchaResponse: typeof solution.gRecaptchaResponse === "string"
+                    ? solution.gRecaptchaResponse
+                    : undefined,
+                cookies,
+                userAgent: typeof solution.userAgent === "string" ? solution.userAgent : undefined,
+            }
+            : undefined,
+    };
+}
+function proxyForCapsolver(proxyUrl) {
+    try {
+        const url = new URL(proxyUrl);
+        const protocol = url.protocol.slice(0, -1).toLowerCase();
+        const scheme = protocol === "http" || protocol === "socks5" ? protocol : undefined;
+        const port = Number(url.port || (scheme === "socks5" ? 1080 : 80));
+        if (!scheme || !url.hostname || !Number.isInteger(port) || port <= 0 || port > 65_535) {
+            return undefined;
+        }
+        const username = url.username ? decodeURIComponent(url.username) : "";
+        const password = url.password ? decodeURIComponent(url.password) : "";
+        if (username.includes(":") || password.includes(":"))
+            return undefined;
+        const value = `${scheme}:${url.hostname}:${port}${username || password ? `:${username}:${password}` : ""}`;
+        return { value, sensitive: [proxyUrl, value, username, password].filter(Boolean) };
+    }
+    catch {
+        return undefined;
+    }
+}
+function isAllocationExhausted(payload) {
+    const code = payload.errorCode?.toLowerCase() ?? "";
+    const description = payload.errorDescription?.toLowerCase() ?? "";
+    return (code === "error_zero_balance" ||
+        /(?:insufficient|zero|no|not enough)\s+(?:balance|funds|credit)/u.test(`${code} ${description}`));
+}
+function isNegativeVerdict(payload) {
+    return payload.errorCode?.toLowerCase() === "error_captcha_unsolvable";
+}
+function safeVendorDetail(value, sensitiveValues) {
+    const redacted = redactSensitiveText(value, sensitiveValues);
+    return containsSensitiveValue(redacted, sensitiveValues) ? "[REDACTED]" : redacted;
+}
+function vendorErrorDetails(payload, sensitiveValues) {
+    const errorCode = payload.errorCode?.trim();
+    const errorDescription = payload.errorDescription?.trim();
+    return {
+        ...(errorCode ? { errorCode: safeVendorDetail(errorCode, sensitiveValues) } : {}),
+        ...(errorDescription
+            ? { errorDescription: safeVendorDetail(payload.errorDescription ?? "", sensitiveValues) }
+            : {}),
+    };
+}
+function unavailableForPayload(payload, phase, sensitiveValues) {
+    const details = vendorErrorDetails(payload, sensitiveValues);
+    if (isNegativeVerdict(payload)) {
+        return new CapsolverVerdictError({ phase, ...details });
+    }
+    return new CapsolverUnavailableError(isAllocationExhausted(payload) ? "allocation_exhausted" : "transport_failure", { phase, ...details });
+}
+async function postJson(fetchImpl, url, body, signal, phase, sensitiveValues, parseResponse) {
+    const response = await raceWithAbort(() => fetchImpl(url, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify(body),
+        signal,
+        redirect: "error",
+    }), signal, phase, sensitiveValues);
+    let responseText;
+    try {
+        responseText = await raceWithAbort(() => response.text(), signal, phase, sensitiveValues);
+    }
+    catch (error) {
+        if (error instanceof ResolverVendorUnavailableError)
+            throw error;
+        throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+            cause: error,
+            phase,
+        });
+    }
+    let payload;
+    try {
+        payload = JSON.parse(responseText);
+    }
+    catch {
+        const contentType = response.headers.get("content-type");
+        throw new CapsolverUnavailableError("transport_failure", {
+            cause: sanitizedJsonParseCause(),
+            phase,
+            responseStatus: response.status,
+            responseContentType: contentType
+                ? safeVendorDetail(contentType.slice(0, 128), sensitiveValues)
+                : undefined,
+            responseLength: responseText.length,
+        });
+    }
+    if (!isJsonRecord(payload)) {
+        throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+            phase,
+        });
+    }
+    return { ok: response.ok, payload: parseResponse(payload) };
+}
+function endpoint(baseUrl, path) {
+    return `${baseUrl.replace(/\/+$/u, "")}/${path}`;
+}
+function spanErrorAttributes(error, phase) {
+    if (error instanceof ResolverVendorUnavailableError) {
+        return {
+            unavailability_reason: error.reason,
+            transport_phase: error.phase,
+            ...(error instanceof CapsolverUnavailableError
+                ? {
+                    vendor_error_code: error.errorCode,
+                    vendor_error_description: error.errorDescription,
+                    response_status: error.responseStatus,
+                    response_content_type: error.responseContentType,
+                    response_length: error.responseLength,
+                }
+                : {}),
+        };
+    }
+    if (error instanceof CapsolverVerdictError) {
+        return {
+            verdict_reason: error.reason,
+            transport_phase: error.phase,
+            vendor_error_code: error.errorCode,
+            vendor_error_description: error.errorDescription,
+        };
+    }
+    if (error instanceof CapsolverSolveTimeoutError) {
+        return {
+            unavailability_reason: "timeout",
+            transport_phase: phase,
+        };
+    }
+    return undefined;
+}
+export function createCapsolverResolverVendorAdapter(options) {
+    const fetchImpl = options.fetchImpl ?? globalThis.fetch;
+    const baseUrl = options.baseUrl ?? DEFAULT_CAPSOLVER_BASE_URL;
+    const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
+    const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
+    const now = options.now ?? Date.now;
+    const delay = options.delay ?? abortableDelay;
+    return {
+        id: CAPSOLVER_VENDOR_ID,
+        supports(kind) {
+            return resolverVendorSupports(CAPSOLVER_VENDOR_ID, kind);
+        },
+        async solve(challenge, identity, callerSignal, traceRecorder) {
+            const apiKey = options.apiKey?.trim();
+            if (!apiKey) {
+                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "missing_credentials", {
+                    phase: "create_task",
+                });
+            }
+            if (!resolverVendorSupports(CAPSOLVER_VENDOR_ID, challenge.kind)) {
+                throw new TypeError(`Capsolver resolver does not support ${challenge.kind}`);
+            }
+            const proxy = identity ? proxyForCapsolver(identity.proxyUrl) : undefined;
+            if (challenge.kind === "aws_waf" && identity && !proxy) {
+                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                    phase: "create_task",
+                });
+            }
+            if (challenge.kind === "cloudflare_interstitial" && !identity) {
+                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "missing_proxy_identity", {
+                    phase: "create_task",
+                });
+            }
+            if (identity && !proxy) {
+                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                    phase: "create_task",
+                });
+            }
+            const challengeFields = challenge;
+            const sensitiveValues = [
+                apiKey,
+                challenge.pageUrl,
+                ...(typeof challengeFields.siteKey === "string" ? [challengeFields.siteKey] : []),
+                ...(typeof challengeFields.action === "string" ? [challengeFields.action] : []),
+                ...(typeof challengeFields.cdata === "string" ? [challengeFields.cdata] : []),
+                ...(typeof challengeFields.blockedHtml === "string" ? [challengeFields.blockedHtml] : []),
+                ...(typeof challengeFields.captchaScript === "string" ? [challengeFields.captchaScript] : []),
+                ...(typeof challengeFields.context === "string" ? [challengeFields.context] : []),
+                ...(typeof challengeFields.iv === "string" ? [challengeFields.iv] : []),
+                ...(proxy?.sensitive ?? []),
+            ];
+            assertResolverHostAllowed(challenge.pageUrl, options.allowedHosts);
+            callerSignal.throwIfAborted();
+            const solveController = new AbortController();
+            const onCallerAbort = () => solveController.abort(abortReason(callerSignal));
+            callerSignal.addEventListener("abort", onCallerAbort, { once: true });
+            const timeout = options.now
+                ? undefined
+                : setTimeout(() => solveController.abort(new CapsolverSolveTimeoutError()), timeoutMs);
+            const startedAt = now();
+            let phase = "create_task";
+            try {
+                const createTask = async () => {
+                    const task = challenge.kind === "aws_waf"
+                        ? {
+                            type: proxy ? "AntiAwsWafTask" : "AntiAwsWafTaskProxyLess",
+                            websiteURL: challenge.pageUrl,
+                            ...(challenge.siteKey !== undefined ? { awsKey: challenge.siteKey } : {}),
+                            ...(challenge.iv !== undefined ? { awsIv: challenge.iv } : {}),
+                            ...(challenge.context !== undefined ? { awsContext: challenge.context } : {}),
+                            ...(challenge.captchaScript !== undefined
+                                ? { awsChallengeJS: challenge.captchaScript }
+                                : {}),
+                            ...(proxy ? { proxy: proxy.value } : {}),
+                        }
+                        : challenge.kind === "turnstile"
+                            ? {
+                                type: "AntiTurnstileTaskProxyLess",
+                                websiteURL: challenge.pageUrl,
+                                websiteKey: challenge.siteKey,
+                                ...(challenge.action !== undefined || challenge.cdata !== undefined
+                                    ? {
+                                        metadata: {
+                                            ...(challenge.action !== undefined ? { action: challenge.action } : {}),
+                                            ...(challenge.cdata !== undefined ? { cdata: challenge.cdata } : {}),
+                                        },
+                                    }
+                                    : {}),
+                            }
+                            : challenge.kind === "recaptcha_v2"
+                                ? {
+                                    type: proxy ? "ReCaptchaV2Task" : "ReCaptchaV2TaskProxyLess",
+                                    websiteURL: challenge.pageUrl,
+                                    websiteKey: challenge.siteKey,
+                                    ...(proxy ? { proxy: proxy.value } : {}),
+                                }
+                                : challenge.kind === "recaptcha_v3"
+                                    ? {
+                                        type: proxy ? "ReCaptchaV3Task" : "ReCaptchaV3TaskProxyLess",
+                                        websiteURL: challenge.pageUrl,
+                                        websiteKey: challenge.siteKey,
+                                        pageAction: challenge.action,
+                                        ...(challenge.minScore !== undefined ? { minScore: challenge.minScore } : {}),
+                                        ...(proxy ? { proxy: proxy.value } : {}),
+                                    }
+                                    : challenge.kind === "hcaptcha"
+                                        ? {
+                                            type: proxy ? "HCaptchaTask" : "HCaptchaTaskProxyLess",
+                                            websiteURL: challenge.pageUrl,
+                                            websiteKey: challenge.siteKey,
+                                            ...(proxy ? { proxy: proxy.value } : {}),
+                                        }
+                                        : challenge.kind === "cloudflare_interstitial"
+                                            ? {
+                                                type: "AntiCloudflareTask",
+                                                websiteURL: challenge.pageUrl,
+                                                proxy: proxy?.value,
+                                                ...(identity?.userAgent ? { userAgent: identity.userAgent } : {}),
+                                                ...(challenge.kind === "cloudflare_interstitial" && challenge.blockedHtml !== undefined
+                                                    ? { html: challenge.blockedHtml }
+                                                    : {}),
+                                            }
+                                            : (() => {
+                                                throw new TypeError(`Capsolver resolver does not support ${challenge.kind}`);
+                                            })();
+                    const createResult = await postJson(fetchImpl, endpoint(baseUrl, "createTask"), { clientKey: apiKey, task }, solveController.signal, phase, sensitiveValues, parseCreateTaskResponse);
+                    const taskId = createResult.payload.taskId;
+                    if (!createResult.ok || createResult.payload.errorId !== 0 || taskId === undefined) {
+                        throw unavailableForPayload(createResult.payload, phase, sensitiveValues);
+                    }
+                    return taskId;
+                };
+                const taskId = traceRecorder
+                    ? await traceRecorder.runSpan("resolver.vendor.create_task", createTask, {
+                        attributes: {
+                            vendor: CAPSOLVER_VENDOR_ID,
+                            challenge_kind: challenge.kind,
+                        },
+                        onError: (error) => spanErrorAttributes(error, "create_task"),
+                    })
+                    : await createTask();
+                phase = "poll_result";
+                const pollResult = async () => {
+                    while (true) {
+                        callerSignal.throwIfAborted();
+                        const remainingMs = timeoutMs - (now() - startedAt);
+                        if (remainingMs <= 0)
+                            throw new CapsolverSolveTimeoutError();
+                        await delay(Math.min(pollIntervalMs, remainingMs), solveController.signal);
+                        callerSignal.throwIfAborted();
+                        if (now() - startedAt >= timeoutMs)
+                            throw new CapsolverSolveTimeoutError();
+                        const result = await postJson(fetchImpl, endpoint(baseUrl, "getTaskResult"), { clientKey: apiKey, taskId }, solveController.signal, phase, sensitiveValues, parsePollResultResponse);
+                        if (!result.ok || result.payload.errorId !== 0) {
+                            throw unavailableForPayload(result.payload, phase, sensitiveValues);
+                        }
+                        switch (result.payload.status) {
+                            case "idle":
+                            case "processing":
+                                continue;
+                            case "ready":
+                                break;
+                            default:
+                                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                                    phase,
+                                });
+                        }
+                        const solutionValue = challenge.kind === "aws_waf"
+                            ? result.payload.solution?.cookie
+                            : result.payload.solution?.token ?? result.payload.solution?.gRecaptchaResponse;
+                        if (challenge.kind === "cloudflare_interstitial") {
+                            const cookies = result.payload.solution?.cookies;
+                            const clearance = cookies?.cf_clearance ?? solutionValue;
+                            if (!clearance?.trim()) {
+                                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                                    phase,
+                                });
+                            }
+                            return {
+                                form: "cookies",
+                                cookies: cookies && Object.keys(cookies).length > 0 ? cookies : { cf_clearance: clearance },
+                                userAgent: result.payload.solution?.userAgent ??
+                                    identity?.userAgent ??
+                                    getStealthProfile(DEFAULT_PROFILE).userAgent,
+                            };
+                        }
+                        if (!solutionValue?.trim()) {
+                            throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                                phase,
+                            });
+                        }
+                        return challenge.kind === "aws_waf"
+                            ? {
+                                form: "cookies",
+                                cookies: { "aws-waf-token": solutionValue },
+                                userAgent: identity?.userAgent ?? getStealthProfile(DEFAULT_PROFILE).userAgent,
+                            }
+                            : { form: "token", token: solutionValue };
+                    }
+                };
+                return traceRecorder
+                    ? await traceRecorder.runSpan("resolver.vendor.poll_result", pollResult, {
+                        attributes: {
+                            vendor: CAPSOLVER_VENDOR_ID,
+                            challenge_kind: challenge.kind,
+                        },
+                        onError: (error) => spanErrorAttributes(error, "poll_result"),
+                    })
+                    : await pollResult();
+            }
+            catch (error) {
+                if (callerSignal.aborted)
+                    throw abortReason(callerSignal);
+                if (error instanceof CapsolverSolveTimeoutError ||
+                    solveController.signal.reason instanceof CapsolverSolveTimeoutError) {
+                    throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "timeout", {
+                        cause: error,
+                        phase,
+                    });
+                }
+                if (error instanceof ResolverVendorUnavailableError ||
+                    error instanceof ResolverChallengeVerdictError) {
+                    throw error;
+                }
+                throw new ResolverVendorUnavailableError(CAPSOLVER_VENDOR_ID, "transport_failure", {
+                    ...safeCauseOptions(error, sensitiveValues),
+                    phase,
+                });
+            }
+            finally {
+                if (timeout !== undefined)
+                    clearTimeout(timeout);
+                callerSignal.removeEventListener("abort", onCallerAbort);
+            }
+        },
+    };
+}

package/dist/runtime/resolver-vendors/twocaptcha.js

@@ -235,11 +235,6 @@ export function createTwoCaptchaResolverVendorAdapter(options) {
             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() ||
                     !challenge.captchaScript?.trim() ||
@@ -249,6 +244,11 @@ export function createTwoCaptchaResolverVendorAdapter(options) {
                     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();
             const proxy = identity ? parseProxyConfiguration(identity.proxyUrl) : undefined;
@@ -278,14 +278,47 @@ export function createTwoCaptchaResolverVendorAdapter(options) {
                             ...(identity ? { userAgent: identity.userAgent } : {}),
                             ...(proxy ?? {}),
                         }
-                        : {
-                            type: proxy ? "RecaptchaV2Task" : "RecaptchaV2TaskProxyless",
-                            websiteURL: challenge.pageUrl,
-                            websiteKey: challenge.siteKey,
-                            isInvisible: false,
-                            ...(identity ? { userAgent: identity.userAgent } : {}),
-                            ...(proxy ?? {}),
-                        };
+                        : 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"), { clientKey: apiKey, task }, solveController.signal, phase, [apiKey]);
                     const taskId = taskIdFrom(createResult.payload);
                     if (!createResult.ok || createResult.payload.errorId !== 0 || taskId === undefined) {

package/dist/runtime/resolver-vendors/types.d.ts

@@ -2,7 +2,7 @@ import type { ChallengeSolution, ProviderChallenge, ProviderChallengeKind, Provi
 import type { TraceRecorder } from "../trace.js";
 export declare const RESOLVER_VENDOR_CAPABILITIES: {
     readonly browser: readonly ["aws_waf", "cloudflare_interstitial"];
-    readonly "2captcha": readonly ["turnstile", "recaptcha_v2", "recaptcha_v3", "hcaptcha", "cloudflare_interstitial", "aws_waf", "akamai_sec_cpt", "akamai_sensor"];
+    readonly "2captcha": readonly ["turnstile", "recaptcha_v2", "recaptcha_v3", "hcaptcha", "aws_waf"];
     readonly capsolver: readonly ["turnstile", "recaptcha_v2", "recaptcha_v3", "hcaptcha", "cloudflare_interstitial", "aws_waf"];
     readonly capmonster: readonly ["turnstile", "recaptcha_v2", "recaptcha_v3", "hcaptcha"];
     readonly custom: readonly ["turnstile", "recaptcha_v2", "recaptcha_v3", "hcaptcha", "cloudflare_interstitial", "aws_waf", "akamai_sec_cpt", "akamai_sensor"];

package/dist/runtime/resolver-vendors/types.js

@@ -1,14 +1,17 @@
 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/dist/runtime/resolver.d.ts

@@ -34,7 +34,7 @@ export type ResolverInstrumentationMetadata = {
     readonly target: ResolverContext;
     readonly traceRecorder: TraceRecorder;
 };
-export type ResolverAdapterFactory = (configuration: string, timeoutMs: number, allowedHosts: readonly string[]) => ResolverVendorAdapter;
+export type ResolverAdapterFactory = (configuration: string | undefined, timeoutMs: number, allowedHosts: readonly string[]) => ResolverVendorAdapter;
 export declare const RESOLVER_ADAPTER_REGISTRY: Partial<Readonly<Record<ProviderResolverVendor, ResolverAdapterFactory>>>;
 export declare function swapResolverAdapterFactoryForTests(vendor: ProviderResolverVendor, factory: ResolverAdapterFactory | undefined): () => void;
 /** Internal test seam; deliberately not re-exported from the package root. */