@402flow/sdk 0.1.0-alpha.3 → 0.1.0-alpha.30

package/dist/challenge-detection.js

@@ -1,123 +1,86 @@
-import { createParsedChallenge, getX402PaymentRequired, } from './challenge-types.js';
-import { parseX402V1BodyChallenge, parseX402V1HeaderChallenge, parseX402V1PaymentResponseHeader, } from './x402-v1.js';
-import { parseX402V2BodyChallenge, parseX402V2HeaderChallenge, parseX402V2PaymentResponseHeader, } from './x402-v2.js';
-import { monetaryAmountToMinorUnits, normalizedMoneySchema } from './contracts.js';
+/**
+ * Inspect a merchant response for x402/l402 challenge evidence in either headers
+ * or a JSON body. The SDK prefers header evidence first because that is the most
+ * direct live protocol signal.
+ */
 export async function detectChallengeFromResponse(response) {
-    const v2HeaderChallenge = parseX402V2HeaderChallenge(response);
-    if (v2HeaderChallenge) {
-        return v2HeaderChallenge;
-    }
-    const v1HeaderChallenge = parseX402V1HeaderChallenge(response);
-    if (v1HeaderChallenge) {
-        return v1HeaderChallenge;
-    }
-    const authenticateChallenge = parseAuthenticateHeader(response.headers.get('www-authenticate'));
-    if (authenticateChallenge) {
-        return authenticateChallenge;
-    }
-    const contentType = response.headers.get('content-type') ?? '';
-    if (!contentType.includes('application/json')) {
-        return undefined;
-    }
-    try {
-        const payload = await response.clone().json();
-        return parseBodyChallenge(payload);
-    }
-    catch {
-        return undefined;
-    }
-}
-export function parseX402PaymentResponseFromHeaders(headers) {
-    const headerMap = headers instanceof Headers ? headers : new Headers(headers);
-    const v2Header = headerMap.get('payment-response');
-    if (v2Header) {
-        return parseX402V2PaymentResponseHeader(v2Header);
-    }
-    const v1Header = headerMap.get('x-payment-response');
-    if (v1Header) {
-        return parseX402V1PaymentResponseHeader(v1Header);
+    const headers = captureHeaders(response.headers);
+    const protocol = sniffProtocolFromHeaders(headers);
+    if (protocol) {
+        const body = await tryReadJsonBody(response);
+        return body !== undefined
+            ? { protocol, headers, body }
+            : { protocol, headers };
+    }
+    const body = await tryReadJsonBody(response);
+    if (body !== undefined) {
+        const bodyProtocol = sniffProtocolFromBody(body);
+        if (bodyProtocol) {
+            return { protocol: bodyProtocol, headers, body };
+        }
     }
     return undefined;
 }
-export function parseX402PaymentResponseHeader(headerValue) {
-    return (parseX402V2PaymentResponseHeader(headerValue) ??
-        parseX402V1PaymentResponseHeader(headerValue));
+function captureHeaders(source) {
+    const headers = {};
+    source.forEach((value, key) => {
+        headers[key] = value;
+    });
+    return headers;
 }
-function parseAuthenticateHeader(headerValue) {
-    if (!headerValue) {
-        return undefined;
-    }
-    const protocolMatch = headerValue.match(/\b(x402|l402)\b/i);
-    if (!protocolMatch) {
-        return undefined;
-    }
-    const protocol = protocolMatch[1]?.toLowerCase();
-    const attributePattern = /(amount|asset|precision|payee)="([^"]+)"/gi;
-    const attributes = {};
-    let match = attributePattern.exec(headerValue);
-    while (match) {
-        const attributeName = match[1];
-        const attributeValue = match[2];
-        if (attributeName && attributeValue) {
-            attributes[attributeName.toLowerCase()] = attributeValue;
+// Header detection is the primary path because a real payable merchant usually
+// signals the protocol directly in response headers.
+function sniffProtocolFromHeaders(headers) {
+    if (headers['payment-required']) {
+        return 'x402';
+    }
+    const paymentProtocol = headers['x-payment-protocol']?.toLowerCase();
+    if (paymentProtocol === 'x402' || paymentProtocol === 'l402') {
+        return paymentProtocol;
+    }
+    const authenticate = headers['www-authenticate'];
+    if (authenticate) {
+        const match = authenticate.match(/\b(x402|l402)\b/i);
+        if (match) {
+            return match[1].toLowerCase();
         }
-        match = attributePattern.exec(headerValue);
-    }
-    if (!attributes.amount || !attributes.asset) {
-        return undefined;
     }
-    return createParsedChallenge({
-        protocol,
-        money: normalizedMoneySchema.parse({
-            asset: attributes.asset,
-            amount: attributes.amount,
-            amountMinor: monetaryAmountToMinorUnits(attributes.amount, Number(attributes.precision ?? '6')),
-            precision: Number(attributes.precision ?? '6'),
-            unit: 'minor',
-        }),
-        payee: attributes.payee,
-        raw: {
-            authenticate: headerValue,
-        },
-    });
+    return undefined;
 }
-function parseBodyChallenge(payload) {
+// Some compatibility merchants embed the challenge in JSON instead of, or in
+// addition to, headers. This fallback keeps the client tolerant of that shape.
+function sniffProtocolFromBody(payload) {
     if (!payload || typeof payload !== 'object') {
         return undefined;
     }
-    const candidate = 'challenge' in payload && payload.challenge && typeof payload.challenge === 'object'
+    const candidate = 'challenge' in payload &&
+        payload.challenge &&
+        typeof payload.challenge === 'object'
         ? payload.challenge
         : payload;
-    const v2Challenge = parseX402V2BodyChallenge(candidate);
-    if (v2Challenge) {
-        return v2Challenge;
+    if ('x402Version' in candidate) {
+        return 'x402';
     }
-    const v1Challenge = parseX402V1BodyChallenge(candidate);
-    if (v1Challenge) {
-        return v1Challenge;
+    if ('protocol' in candidate && typeof candidate.protocol === 'string') {
+        const protocol = candidate.protocol.toLowerCase();
+        if (protocol === 'x402' || protocol === 'l402') {
+            return protocol;
+        }
     }
-    if (!candidate || typeof candidate !== 'object') {
+    return undefined;
+}
+// The detector only parses JSON bodies when content-type says JSON, and it never
+// consumes the original response stream thanks to clone().
+async function tryReadJsonBody(response) {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (!contentType.includes('application/json')) {
         return undefined;
     }
-    const protocol = 'protocol' in candidate && typeof candidate.protocol === 'string'
-        ? candidate.protocol.toLowerCase()
-        : undefined;
-    const money = 'money' in candidate ? candidate.money : undefined;
-    const payee = 'payee' in candidate && typeof candidate.payee === 'string'
-        ? candidate.payee
-        : undefined;
-    const raw = 'raw' in candidate && candidate.raw && typeof candidate.raw === 'object'
-        ? candidate.raw
-        : undefined;
-    if ((protocol !== 'x402' && protocol !== 'l402') || !money) {
+    try {
+        return await response.clone().json();
+    }
+    catch {
         return undefined;
     }
-    return createParsedChallenge({
-        protocol,
-        money: normalizedMoneySchema.parse(money),
-        payee,
-        raw: raw ?? candidate,
-    });
 }
-export { getX402PaymentRequired };
 //# sourceMappingURL=challenge-detection.js.map

package/dist/challenge-detection.js.map

@@ -1 +1 @@
-{"version":3,"file":"challenge-detection.js","sourceRoot":"","sources":["../src/challenge-detection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"challenge-detection.js","sourceRoot":"","sources":["../src/challenge-detection.ts"],"names":[],"mappings":"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"}