@agentcash/router 1.13.0 → 1.14.1

package/dist/index.cjs

@@ -42,7 +42,7 @@ var init_constants = __esm({
     BASE_USDC_ADDRESS = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
     BASE_USDC_DECIMALS = 6;
     ZERO_EVM_ADDRESS = "0x0000000000000000000000000000000000000000";
-    DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.corbits.dev";
+    DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.payai.network";
     DEFAULT_TEMPO_RPC_URL = "https://rpc.tempo.xyz";
   }
 });
@@ -151,31 +151,64 @@ function buildSolanaExactOptions(accepts, price) {
 function hasSolanaAccepts(accepts) {
   return accepts.some((accept) => isSolanaNetwork(accept.network));
 }
-async function enrichRequirementsWithFacilitatorAccepts(facilitator, resource, requirements) {
+function facilitatorBaseUrl(facilitator) {
   if (!facilitator.url) {
-    throw new Error(`Facilitator for ${facilitator.network} is missing a URL for /accepts`);
+    throw new Error(`Facilitator for ${facilitator.network} is missing a URL`);
   }
-  const authHeaders = await getAcceptsHeadersForFacilitator(facilitator);
-  const response = await fetch(`${facilitator.url.replace(/\/+$/, "")}/accepts`, {
-    method: "POST",
-    headers: {
-      ...authHeaders,
-      "content-type": "application/json"
-    },
-    body: JSON.stringify({
-      x402Version: 2,
-      resource,
-      accepts: requirements
-    })
+  return facilitator.url.replace(/\/+$/, "");
+}
+function matchesSupportedKind(requirement, kind) {
+  const scheme = requirement.scheme ?? "exact";
+  return kind.network === requirement.network && (kind.scheme ?? "exact") === scheme;
+}
+async function fetchFacilitatorSupported(facilitator) {
+  const authHeaders = await getSupportedHeadersForFacilitator(facilitator);
+  const response = await fetch(`${facilitatorBaseUrl(facilitator)}/supported`, {
+    headers: authHeaders
   });
   if (!response.ok) {
-    throw new Error(`Facilitator /accepts failed with status ${response.status}`);
+    throw new Error(`Facilitator /supported failed with status ${response.status}`);
   }
   const body = await response.json();
-  if (!Array.isArray(body.accepts)) {
-    throw new Error("Facilitator /accepts response did not include accepts");
+  if (!Array.isArray(body.kinds)) {
+    throw new Error("Facilitator /supported response did not include kinds");
   }
-  return body.accepts;
+  return body.kinds;
+}
+function enrichRequirementFromKind(requirement, kinds) {
+  const kind = kinds.find((candidate) => matchesSupportedKind(requirement, candidate));
+  if (!kind) {
+    throw new Error(
+      `Facilitator /supported has no kind for ${requirement.scheme} on ${requirement.network}`
+    );
+  }
+  const feePayer = kind.extra?.feePayer;
+  if (!feePayer) {
+    throw new Error(
+      `Facilitator /supported kind for ${requirement.network} is missing extra.feePayer`
+    );
+  }
+  const requirementExtra = requirement.extra ?? {};
+  const kindExtra = kind.extra ?? {};
+  const requirementFeatures = requirementExtra.features ?? {};
+  const kindFeatures = kindExtra.features ?? {};
+  return {
+    ...requirement,
+    ...kind.asset && !requirement.asset ? { asset: kind.asset } : {},
+    extra: {
+      ...requirementExtra,
+      ...kindExtra,
+      features: {
+        ...requirementFeatures,
+        ...kindFeatures,
+        xSettlementAccountSupported: true
+      }
+    }
+  };
+}
+async function enrichRequirementsFromFacilitatorSupported(facilitator, requirements) {
+  const kinds = await fetchFacilitatorSupported(facilitator);
+  return requirements.map((requirement) => enrichRequirementFromKind(requirement, kinds));
 }
 function isSolanaRequirement(requirement) {
   return isSolanaNetwork(requirement.network);
@@ -232,10 +265,7 @@ function getFacilitatorForRequirement(facilitatorsByNetwork, requirement) {
 function sameResolvedX402Facilitator(a, b) {
   return sameFacilitatorConfig(a.config, b.config);
 }
-async function getAcceptsHeadersForFacilitator(facilitator) {
-  if (facilitator.config.createAcceptsHeaders) {
-    return facilitator.config.createAcceptsHeaders();
-  }
+async function getSupportedHeadersForFacilitator(facilitator) {
   if (facilitator.config.createAuthHeaders) {
     const headers = await facilitator.config.createAuthHeaders();
     return headers.supported;
@@ -257,7 +287,7 @@ function getNetworkFamily(network) {
   return null;
 }
 function sameFacilitatorConfig(a, b) {
-  return a.url === b.url && a.createAuthHeaders === b.createAuthHeaders && a.createAcceptsHeaders === b.createAcceptsHeaders;
+  return a.url === b.url && a.createAuthHeaders === b.createAuthHeaders;
 }
 var init_facilitators = __esm({
   "src/protocols/x402/facilitators.ts"() {
@@ -1996,15 +2026,14 @@ async function buildChallengeRequirements(server, request, price, accepts, resou
 function needsFacilitatorEnrichment(accepts) {
   return hasSolanaAccepts(accepts);
 }
-async function enrichGroup(group, resource) {
-  const accepted = await enrichRequirementsWithFacilitatorAccepts(
+async function enrichGroup(group) {
+  const accepted = await enrichRequirementsFromFacilitatorSupported(
     group.facilitator,
-    resource,
     group.items.map(({ requirement }) => requirement)
   );
   if (accepted.length !== group.items.length) {
     throw new Error(
-      `Facilitator /accepts returned ${accepted.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
+      `Facilitator /supported enrichment returned ${accepted.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
     );
   }
   return accepted;
@@ -2015,13 +2044,13 @@ async function enrichChallengeRequirements(requirements, resource, facilitatorsB
   const results = await Promise.all(
     groups.map(async (group) => {
       try {
-        return { success: true, group, accepted: await enrichGroup(group, resource) };
+        return { success: true, group, accepted: await enrichGroup(group) };
       } catch (err) {
         const label = group.facilitator.url ?? group.facilitator.network;
         const reason = err instanceof Error ? err.message : String(err);
         report?.(
           "warn",
-          `${label} /accepts failed, dropping ${group.items.length} requirement(s): ${reason}`
+          `${label} /supported enrichment failed, dropping ${group.items.length} requirement(s): ${reason}`
         );
         return { success: false, group };
       }

package/dist/index.d.cts

@@ -222,8 +222,6 @@ interface X402AcceptConfig extends X402AcceptBase {
     payTo?: PayToConfig;
 }
 interface X402RouterFacilitatorConfig extends FacilitatorConfig {
-    /** Async header builder invoked per facilitator call. Use for short-lived auth tokens (e.g. CDP signed headers). */
-    createAcceptsHeaders?: () => Promise<Record<string, string>>;
 }
 /** A facilitator URL or a full `FacilitatorConfig` (URL + auth header builders). */
 type X402FacilitatorTarget = string | X402RouterFacilitatorConfig;
@@ -972,7 +970,7 @@ declare const BASE_USDC_DECIMALS = 6;
 /** All-zeros EVM address. Used as a placeholder/sentinel; not a valid payee. */
 declare const ZERO_EVM_ADDRESS = "0x0000000000000000000000000000000000000000";
 /** Public Solana x402 facilitator. Override per-deployment via `SOLANA_FACILITATOR_URL`. */
-declare const DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.corbits.dev";
+declare const DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.payai.network";
 /** Public Tempo JSON-RPC endpoint used for MPP on-chain verification. Override per-deployment via `TEMPO_RPC_URL`. */
 declare const DEFAULT_TEMPO_RPC_URL = "https://rpc.tempo.xyz";
 
@@ -1002,9 +1000,10 @@ interface ServiceRouter<TPriceKeys extends string = never> {
     monitors(): MonitorEntry[];
     registry: RouteRegistry;
 }
-declare function createRouter<const P extends Record<string, string> = Record<never, string>>(config: RouterConfig & {
-    prices?: P;
-}): ServiceRouter<Extract<keyof P, string>>;
+type ExtractPriceKeys<C> = [C] extends [{
+    prices: infer P extends Record<string, string>;
+}] ? Extract<keyof P, string> : never;
+declare function createRouter<const C extends RouterConfig>(config: C): ServiceRouter<ExtractPriceKeys<C>>;
 /**
  * Build a {@link ServiceRouter} from environment variables.
  *
@@ -1025,6 +1024,9 @@ declare function createRouter<const P extends Record<string, string> = Record<ne
  * });
  * ```
  */
-declare function createRouterFromEnv<const P extends Record<string, string> = Record<never, string>>(options: CreateRouterFromEnvOptions<P>): ServiceRouter<Extract<keyof P, string>>;
+type ExtractEnvPriceKeys<O> = [O] extends [{
+    prices: infer P extends Record<string, string>;
+}] ? Extract<keyof P, string> : never;
+declare function createRouterFromEnv<const O extends CreateRouterFromEnvOptions>(options: O): ServiceRouter<ExtractEnvPriceKeys<O>>;
 
 export { BASE_MAINNET_NETWORK, BASE_USDC_ADDRESS, BASE_USDC_DECIMALS, type CheckoutSessionContext, type CheckoutSessionFn, type CheckoutSessionResponse, type CreateRouterFromEnvOptions, DEFAULT_SOLANA_FACILITATOR_URL, DEFAULT_TEMPO_RPC_URL, type DiscoveryConfig, type HandlerContext, HttpError, type KvStore, type MppProtocolInfo, type PaidOptions, type ProtocolType, RouteDefinitionError, type RouterConfig, RouterConfigError, type RouterConfigIssue, type RouterConfigIssueCode, type RouterConfigIssueSeverity, type RouterPlugin, SOLANA_MAINNET_NETWORK, type ServiceRouter, type SettlementErrorContext, type SettlementLifecycleContext, type SettlementSettledContext, TEMPO_USDC_ADDRESS, TEMPO_USDC_DECIMALS, type X402FacilitatorsConfig, ZERO_EVM_ADDRESS, createRouter, createRouterFromEnv, routerConfigFromEnv };

package/dist/index.d.ts

@@ -222,8 +222,6 @@ interface X402AcceptConfig extends X402AcceptBase {
     payTo?: PayToConfig;
 }
 interface X402RouterFacilitatorConfig extends FacilitatorConfig {
-    /** Async header builder invoked per facilitator call. Use for short-lived auth tokens (e.g. CDP signed headers). */
-    createAcceptsHeaders?: () => Promise<Record<string, string>>;
 }
 /** A facilitator URL or a full `FacilitatorConfig` (URL + auth header builders). */
 type X402FacilitatorTarget = string | X402RouterFacilitatorConfig;
@@ -972,7 +970,7 @@ declare const BASE_USDC_DECIMALS = 6;
 /** All-zeros EVM address. Used as a placeholder/sentinel; not a valid payee. */
 declare const ZERO_EVM_ADDRESS = "0x0000000000000000000000000000000000000000";
 /** Public Solana x402 facilitator. Override per-deployment via `SOLANA_FACILITATOR_URL`. */
-declare const DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.corbits.dev";
+declare const DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.payai.network";
 /** Public Tempo JSON-RPC endpoint used for MPP on-chain verification. Override per-deployment via `TEMPO_RPC_URL`. */
 declare const DEFAULT_TEMPO_RPC_URL = "https://rpc.tempo.xyz";
 
@@ -1002,9 +1000,10 @@ interface ServiceRouter<TPriceKeys extends string = never> {
     monitors(): MonitorEntry[];
     registry: RouteRegistry;
 }
-declare function createRouter<const P extends Record<string, string> = Record<never, string>>(config: RouterConfig & {
-    prices?: P;
-}): ServiceRouter<Extract<keyof P, string>>;
+type ExtractPriceKeys<C> = [C] extends [{
+    prices: infer P extends Record<string, string>;
+}] ? Extract<keyof P, string> : never;
+declare function createRouter<const C extends RouterConfig>(config: C): ServiceRouter<ExtractPriceKeys<C>>;
 /**
  * Build a {@link ServiceRouter} from environment variables.
  *
@@ -1025,6 +1024,9 @@ declare function createRouter<const P extends Record<string, string> = Record<ne
  * });
  * ```
  */
-declare function createRouterFromEnv<const P extends Record<string, string> = Record<never, string>>(options: CreateRouterFromEnvOptions<P>): ServiceRouter<Extract<keyof P, string>>;
+type ExtractEnvPriceKeys<O> = [O] extends [{
+    prices: infer P extends Record<string, string>;
+}] ? Extract<keyof P, string> : never;
+declare function createRouterFromEnv<const O extends CreateRouterFromEnvOptions>(options: O): ServiceRouter<ExtractEnvPriceKeys<O>>;
 
 export { BASE_MAINNET_NETWORK, BASE_USDC_ADDRESS, BASE_USDC_DECIMALS, type CheckoutSessionContext, type CheckoutSessionFn, type CheckoutSessionResponse, type CreateRouterFromEnvOptions, DEFAULT_SOLANA_FACILITATOR_URL, DEFAULT_TEMPO_RPC_URL, type DiscoveryConfig, type HandlerContext, HttpError, type KvStore, type MppProtocolInfo, type PaidOptions, type ProtocolType, RouteDefinitionError, type RouterConfig, RouterConfigError, type RouterConfigIssue, type RouterConfigIssueCode, type RouterConfigIssueSeverity, type RouterPlugin, SOLANA_MAINNET_NETWORK, type ServiceRouter, type SettlementErrorContext, type SettlementLifecycleContext, type SettlementSettledContext, TEMPO_USDC_ADDRESS, TEMPO_USDC_DECIMALS, type X402FacilitatorsConfig, ZERO_EVM_ADDRESS, createRouter, createRouterFromEnv, routerConfigFromEnv };

package/dist/index.js

@@ -20,7 +20,7 @@ var init_constants = __esm({
     BASE_USDC_ADDRESS = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
     BASE_USDC_DECIMALS = 6;
     ZERO_EVM_ADDRESS = "0x0000000000000000000000000000000000000000";
-    DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.corbits.dev";
+    DEFAULT_SOLANA_FACILITATOR_URL = "https://facilitator.payai.network";
     DEFAULT_TEMPO_RPC_URL = "https://rpc.tempo.xyz";
   }
 });
@@ -129,31 +129,64 @@ function buildSolanaExactOptions(accepts, price) {
 function hasSolanaAccepts(accepts) {
   return accepts.some((accept) => isSolanaNetwork(accept.network));
 }
-async function enrichRequirementsWithFacilitatorAccepts(facilitator, resource, requirements) {
+function facilitatorBaseUrl(facilitator) {
   if (!facilitator.url) {
-    throw new Error(`Facilitator for ${facilitator.network} is missing a URL for /accepts`);
+    throw new Error(`Facilitator for ${facilitator.network} is missing a URL`);
   }
-  const authHeaders = await getAcceptsHeadersForFacilitator(facilitator);
-  const response = await fetch(`${facilitator.url.replace(/\/+$/, "")}/accepts`, {
-    method: "POST",
-    headers: {
-      ...authHeaders,
-      "content-type": "application/json"
-    },
-    body: JSON.stringify({
-      x402Version: 2,
-      resource,
-      accepts: requirements
-    })
+  return facilitator.url.replace(/\/+$/, "");
+}
+function matchesSupportedKind(requirement, kind) {
+  const scheme = requirement.scheme ?? "exact";
+  return kind.network === requirement.network && (kind.scheme ?? "exact") === scheme;
+}
+async function fetchFacilitatorSupported(facilitator) {
+  const authHeaders = await getSupportedHeadersForFacilitator(facilitator);
+  const response = await fetch(`${facilitatorBaseUrl(facilitator)}/supported`, {
+    headers: authHeaders
   });
   if (!response.ok) {
-    throw new Error(`Facilitator /accepts failed with status ${response.status}`);
+    throw new Error(`Facilitator /supported failed with status ${response.status}`);
   }
   const body = await response.json();
-  if (!Array.isArray(body.accepts)) {
-    throw new Error("Facilitator /accepts response did not include accepts");
+  if (!Array.isArray(body.kinds)) {
+    throw new Error("Facilitator /supported response did not include kinds");
   }
-  return body.accepts;
+  return body.kinds;
+}
+function enrichRequirementFromKind(requirement, kinds) {
+  const kind = kinds.find((candidate) => matchesSupportedKind(requirement, candidate));
+  if (!kind) {
+    throw new Error(
+      `Facilitator /supported has no kind for ${requirement.scheme} on ${requirement.network}`
+    );
+  }
+  const feePayer = kind.extra?.feePayer;
+  if (!feePayer) {
+    throw new Error(
+      `Facilitator /supported kind for ${requirement.network} is missing extra.feePayer`
+    );
+  }
+  const requirementExtra = requirement.extra ?? {};
+  const kindExtra = kind.extra ?? {};
+  const requirementFeatures = requirementExtra.features ?? {};
+  const kindFeatures = kindExtra.features ?? {};
+  return {
+    ...requirement,
+    ...kind.asset && !requirement.asset ? { asset: kind.asset } : {},
+    extra: {
+      ...requirementExtra,
+      ...kindExtra,
+      features: {
+        ...requirementFeatures,
+        ...kindFeatures,
+        xSettlementAccountSupported: true
+      }
+    }
+  };
+}
+async function enrichRequirementsFromFacilitatorSupported(facilitator, requirements) {
+  const kinds = await fetchFacilitatorSupported(facilitator);
+  return requirements.map((requirement) => enrichRequirementFromKind(requirement, kinds));
 }
 function isSolanaRequirement(requirement) {
   return isSolanaNetwork(requirement.network);
@@ -210,10 +243,7 @@ function getFacilitatorForRequirement(facilitatorsByNetwork, requirement) {
 function sameResolvedX402Facilitator(a, b) {
   return sameFacilitatorConfig(a.config, b.config);
 }
-async function getAcceptsHeadersForFacilitator(facilitator) {
-  if (facilitator.config.createAcceptsHeaders) {
-    return facilitator.config.createAcceptsHeaders();
-  }
+async function getSupportedHeadersForFacilitator(facilitator) {
   if (facilitator.config.createAuthHeaders) {
     const headers = await facilitator.config.createAuthHeaders();
     return headers.supported;
@@ -235,7 +265,7 @@ function getNetworkFamily(network) {
   return null;
 }
 function sameFacilitatorConfig(a, b) {
-  return a.url === b.url && a.createAuthHeaders === b.createAuthHeaders && a.createAcceptsHeaders === b.createAcceptsHeaders;
+  return a.url === b.url && a.createAuthHeaders === b.createAuthHeaders;
 }
 var init_facilitators = __esm({
   "src/protocols/x402/facilitators.ts"() {
@@ -1957,15 +1987,14 @@ async function buildChallengeRequirements(server, request, price, accepts, resou
 function needsFacilitatorEnrichment(accepts) {
   return hasSolanaAccepts(accepts);
 }
-async function enrichGroup(group, resource) {
-  const accepted = await enrichRequirementsWithFacilitatorAccepts(
+async function enrichGroup(group) {
+  const accepted = await enrichRequirementsFromFacilitatorSupported(
     group.facilitator,
-    resource,
     group.items.map(({ requirement }) => requirement)
   );
   if (accepted.length !== group.items.length) {
     throw new Error(
-      `Facilitator /accepts returned ${accepted.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
+      `Facilitator /supported enrichment returned ${accepted.length} requirements for ${group.items.length} inputs on ${group.facilitator.url ?? group.facilitator.network}`
     );
   }
   return accepted;
@@ -1976,13 +2005,13 @@ async function enrichChallengeRequirements(requirements, resource, facilitatorsB
   const results = await Promise.all(
     groups.map(async (group) => {
       try {
-        return { success: true, group, accepted: await enrichGroup(group, resource) };
+        return { success: true, group, accepted: await enrichGroup(group) };
       } catch (err) {
         const label = group.facilitator.url ?? group.facilitator.network;
         const reason = err instanceof Error ? err.message : String(err);
         report?.(
           "warn",
-          `${label} /accepts failed, dropping ${group.items.length} requirement(s): ${reason}`
+          `${label} /supported enrichment failed, dropping ${group.items.length} requirement(s): ${reason}`
         );
         return { success: false, group };
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcash/router",
-  "version": "1.13.0",
+  "version": "1.14.1",
   "description": "Unified route builder for Next.js App Router APIs with x402, MPP, SIWX, and API key auth",
   "type": "module",
   "exports": {
@@ -65,7 +65,7 @@
   },
   "scripts": {
     "build": "tsup",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc -p tests/tsconfig.json --noEmit",
     "lint": "eslint src/ tests/ --max-warnings 0",
     "lint:fix": "eslint src/ tests/ --fix",
     "format": "prettier --write 'src/**/*.ts' 'tests/**/*.ts' 'examples/fortune/**/*.ts' 'examples/fortune/**/*.md' '*.json' '*.mjs'",