tapimo 0.4.3 → 0.4.4

package/src/internal/Auth.ts

@@ -9,6 +9,7 @@ import { findTargetHandler } from 'hono/utils/handler'
 import { decodeJwt } from 'jose'
 import { Credential, type Method } from 'mppx'
 import { Mppx, tempo } from 'mppx/hono'
+import { Addresses } from 'viem/tempo'
 import * as z from 'zod/mini'
 
 import type * as App from '../App.js'
@@ -30,6 +31,7 @@ import * as Users from '../db/tables/users.js'
 import * as Viem from './Viem.js'
 
 const policySymbol = Symbol('tempo-api.auth.policy')
+const defaultMppRateLimit = { perMinute: 100 } satisfies RateLimit.Limit
 
 /** Auth context consumed by Tempo API handlers. */
 export type Context = {
@@ -47,7 +49,7 @@ export type Context = {
       }
     | undefined
   /** MPP payment configuration. */
-  mpp?: Mpp | undefined
+  mpp?: MppHandler | undefined
   /**
    * Configured default anonymous public quota. Used as the throttle ceiling for
    * sandbox keys without active billing on routes that expose no public lane
@@ -89,22 +91,27 @@ export type Payment = {
   type: 'mpp'
 }
 
-/** MPP charge options used by route access policies. */
-export type Charge = Method.RequestDefaults<ReturnType<typeof tempo.charge>> & {
-  /** Optional human-readable payment description. */
-  description?: string | undefined
-  /** Optional challenge expiration timestamp or date. */
-  expires?: Date | string | undefined
-  /** Optional server-defined correlation data. */
-  meta?: Record<string, string> | undefined
-  /** Optional route/resource scope bound to the challenge. */
-  scope?: string | undefined
+/** MPP route-policy types. Distinct from the SIWE {@link Session} capability. */
+export declare namespace Mpp {
+  /** MPP Session request options used by route access policies. */
+  type Session = Method.RequestDefaults<ReturnType<typeof tempo.session>> & {
+    /** Optional human-readable payment description. */
+    description?: string | undefined
+    /** Optional challenge expiration timestamp or date. */
+    expires?: Date | string | undefined
+    /** Optional server-defined correlation data. */
+    meta?: Record<string, string> | undefined
+    /** Optional route/resource scope bound to the challenge. */
+    scope?: string | undefined
+  }
 }
 
 /** MPP payment handler consumed by auth policies. */
-type Mpp = {
-  /** Creates a Hono middleware for a Tempo charge. */
-  charge(options: Charge): MiddlewareHandler
+type MppHandler = {
+  /** Paid-request quota per access principal. */
+  rateLimit?: RateLimit.Limit | undefined
+  /** Creates a Hono middleware for a Tempo Session payment. */
+  session(options: Mpp.Session): MiddlewareHandler
 }
 
 /**
@@ -127,11 +134,13 @@ export type PolicyOverride = {
       }
     | boolean
     | undefined
-  /** MPP paid lane: object to override the charge, or boolean to enable/disable. */
+  /** MPP paid lane: object to override the Session request, or boolean to enable/disable. */
   mpp?:
     | {
-        /** Tempo charge override for this route. */
-        charge?: Charge | undefined
+        /** Paid-request quota override for this route (a protective per-route cap). */
+        rateLimit?: RateLimit.Limit | undefined
+        /** Tempo Session request override for this route. */
+        session?: Mpp.Session | undefined
       }
     | boolean
     | undefined
@@ -465,7 +474,11 @@ export function middleware<
   endpoint extends string = string,
   environment extends Environment = Environment,
 >(options: middleware.Options<endpoint>): MiddlewareHandler<environment> {
-  const { charge = {}, ...mpp } = options.mpp === false ? {} : (options.mpp ?? {})
+  const {
+    rateLimit: mppRateLimit = defaultMppRateLimit,
+    session: session_ = {},
+    ...mpp
+  } = options.mpp === false ? {} : (options.mpp ?? {})
   const defaults = laneDefaults(options)
   // Default-deny: no lanes open until a route grants them via `policy`.
   // Otherwise the `super_admin` principal bypasses lane checks entirely.
@@ -503,11 +516,23 @@ export function middleware<
     ...(options.mpp === false
       ? {}
       : {
-          mpp: Mppx.create({
-            ...mpp,
-            methods: [tempo.charge({ amount: '0.001', ...charge })],
-            secretKey: mpp.secretKey ?? crypto.randomUUID(),
-          }),
+          mpp: {
+            rateLimit: mppRateLimit,
+            session: Mppx.create({
+              ...mpp,
+              // Defaults only; global `session` options may override, including
+              // enabling same-route HEAD bootstrap.
+              methods: [
+                tempo.session({
+                  amount: '0.0001',
+                  bootstrap: false,
+                  currency: Addresses.pathUsd,
+                  unitType: 'request',
+                  ...session_,
+                }),
+              ],
+            }).session,
+          },
         }),
     rateLimit: RateLimit.memory(options.rateLimit),
     ...(options.session ? { session: options.session } : {}),
@@ -600,8 +625,10 @@ export declare namespace middleware {
 
   /** MPP payment options used by auth middleware. */
   type MppOptions = Omit<NonNullable<Parameters<typeof Mppx.create>[0]>, 'methods'> & {
-    /** Global Tempo charge options passed to the MPP method instantiator. */
-    charge?: NonNullable<Parameters<typeof tempo.charge>[0]> | undefined
+    /** Paid-request quota per access principal. Defaults to 100 per minute. */
+    rateLimit?: RateLimit.Limit | undefined
+    /** Global Tempo Session options passed to the MPP method instantiator. */
+    session?: NonNullable<Parameters<typeof tempo.session>[0]> | undefined
   }
 }
 
@@ -1043,7 +1070,7 @@ function laneDefaults(options: middleware.Options): LaneDefaults {
       // catalog scopes via `Auth.policy`.
       scopes: apiKey?.scopes ?? [Scope.wildcard],
     },
-    mpp: { charge: {} },
+    mpp: { session: {} },
     public: { rateLimit: public_?.rateLimit ?? { perMinute: 60 } },
     session: true,
   }
@@ -1072,8 +1099,8 @@ function resolvePolicy(
   // The OpenAPI summary/description rides along as the payment-challenge
   // description. It is metadata, not a policy override, so it only applies when
   // the paid lane is actually enabled and has no explicit description already.
-  if (mpp && description !== undefined && mpp.charge.description === undefined)
-    mpp = { charge: { ...mpp.charge, description } }
+  if (mpp && description !== undefined && mpp.session.description === undefined)
+    mpp = { ...mpp, session: { ...mpp.session, description } }
 
   // A lane-less policy stays enforced for super admin; only an explicit
   // `false` override opts a route out of auth entirely.
@@ -1109,7 +1136,10 @@ function resolveMppLane(
   if (override === false) return undefined
   if (override === true) return current ?? default_
   const base = current ?? default_
-  return { charge: { ...base.charge, ...override.charge } }
+  return {
+    rateLimit: override.rateLimit ?? base.rateLimit,
+    session: { ...base.session, ...override.session },
+  }
 }
 
 function resolvePublicLane(
@@ -1483,8 +1513,10 @@ export declare namespace require {
     /** MPP payment access policy. */
     mpp?:
       | {
-          /** Tempo charge policy. */
-          charge: Charge
+          /** Paid-request quota override for this route (a protective per-route cap). */
+          rateLimit?: RateLimit.Limit | undefined
+          /** Tempo Session request policy. */
+          session: Mpp.Session
         }
       | undefined
     /** Public access policy. */
@@ -1729,7 +1761,19 @@ async function requirePayment<environment extends Environment>(
   next: () => Promise<void>,
   options: PaymentAccess,
 ) {
-  const middleware = options.auth.mpp?.charge(options.policy.mpp?.charge ?? {})
+  if (hasPaymentCredential(c)) {
+    const result = await consumeRateLimit(options.auth, {
+      key: `mpp:${options.principal.type}:${options.principal.id}`,
+      limit: options.policy.mpp?.rateLimit ?? options.auth.mpp?.rateLimit ?? defaultMppRateLimit,
+    })
+    if (result) {
+      setRateLimitHeaders(c, result)
+      c.header('RateLimit-Scope', 'mpp')
+      if (!result.allowed) return rateLimitExceeded(c, result)
+    }
+  }
+
+  const middleware = options.auth.mpp?.session(options.policy.mpp?.session ?? {})
   if (!middleware)
     return jsonError(c, {
       code: 'payment_required',

package/src/internal/FundingRoutes.test.ts

@@ -2,16 +2,7 @@ import * as FundingRoutes from './FundingRoutes.js'
 
 const baseUsdcRequest = {
   limit: 10,
-  provider: 'across',
-  sourceAmount: '1000000',
-  sourceAmountUnits: 'baseUnits',
-  sourceChain: 'base',
-  sourceToken: 'USDC',
-} as const
-
-const baseAcrossQuoteRequest = {
-  depositor: '0x1111111111111111111111111111111111111111',
-  provider: 'across',
+  provider: 'relay',
   sourceAmount: '1000000',
   sourceAmountUnits: 'baseUnits',
   sourceChain: 'base',
@@ -24,7 +15,7 @@ describe('listRoutes', () => {
     const routes = await FundingRoutes.listRoutes({
       ...baseUsdcRequest,
       adapters: {
-        across: {
+        relay: {
           async probeQuote(input, signal) {
             seen = input
             expect(signal.aborted).toBe(false)
@@ -62,14 +53,14 @@ describe('listRoutes', () => {
       },
     })
 
-    expect(seen?.route.id).toBe('base-usdc-tempo-usdce-across')
+    expect(seen?.route.id).toBe('base-usdc-tempo-usdce-relay')
     expect(seen?.sourceAmount.amount).toBe('1000000')
     expect(seen?.sourceChain.id).toBe('eip155:8453')
     expect(seen?.sourceToken.symbol).toBe('USDC')
     expect(routes).toHaveLength(1)
     expect(routes[0]).toMatchObject({
       errorCode: null,
-      id: 'base-usdc-tempo-usdce-across',
+      id: 'base-usdc-tempo-usdce-relay',
       quality: {
         availableVolumeUsd: '1000.00',
         estimatedSeconds: 4,
@@ -103,7 +94,7 @@ describe('listRoutes', () => {
     const routes = await FundingRoutes.listRoutes({
       ...baseUsdcRequest,
       adapters: {
-        relay: {
+        bridge: {
           async probeQuote() {
             calls += 1
             throw new Error('unexpected call')
@@ -128,7 +119,7 @@ describe('listRoutes', () => {
     const routes = await FundingRoutes.listRoutes({
       ...baseUsdcRequest,
       adapters: {
-        across: {
+        relay: {
           async probeQuote() {
             throw new Error('upstream unavailable')
           },
@@ -154,7 +145,7 @@ describe('listRoutes', () => {
       ...baseUsdcRequest,
       adapterTimeoutMs: 1,
       adapters: {
-        across: {
+        relay: {
           probeQuote(_input, signal) {
             signal.addEventListener('abort', () => {
               aborted = true
@@ -183,7 +174,7 @@ describe('listRoutes', () => {
     const routes = await FundingRoutes.listRoutes({
       ...baseUsdcRequest,
       adapters: {
-        across: {
+        relay: {
           async probeQuote(input) {
             seen = input
             return {
@@ -209,23 +200,6 @@ describe('listRoutes', () => {
   })
 })
 
-describe('quoteRoute', () => {
-  test('rejects requests without a configured quote capability', async () => {
-    await expect(FundingRoutes.quoteRoute(baseAcrossQuoteRequest)).rejects.toBeInstanceOf(
-      FundingRoutes.ProviderNotConfiguredError,
-    )
-  })
-
-  test('rejects requests outside curated inventory', async () => {
-    await expect(
-      FundingRoutes.quoteRoute({
-        ...baseAcrossQuoteRequest,
-        sourceToken: 'USDT',
-      }),
-    ).rejects.toBeInstanceOf(FundingRoutes.FundingRouteNotFoundError)
-  })
-})
-
 describe('parseInclude', () => {
   test('parses comma-separated include values', () => {
     expect(FundingRoutes.parseInclude('quotes,quotes')).toEqual(['quotes'])

package/src/internal/FundingRoutes.ts

@@ -18,7 +18,6 @@ const sourceChains = [
     kind: 'evm',
     name: 'Ethereum',
     providerIds: {
-      across: '1',
       bridge: 'ethereum',
       bungee: '1',
       lifi: '1',
@@ -75,7 +74,6 @@ const sourceChains = [
     kind: 'evm',
     name: 'Base',
     providerIds: {
-      across: '8453',
       bridge: 'base',
       bungee: '8453',
       lifi: '8453',
@@ -116,7 +114,6 @@ const sourceChains = [
     kind: 'evm',
     name: 'BNB Smart Chain',
     providerIds: {
-      across: '56',
       bungee: '56',
       lifi: '56',
       relay: '56',
@@ -241,14 +238,6 @@ const destinationTokens = [
 
 /** Providers exposed by the generic provider catalog. */
 const providers = [
-  {
-    capabilities: ['fundingRoutes'],
-    id: 'across',
-    kind: 'intentBridge',
-    name: 'Across',
-    requiresApiKey: true,
-    status: 'inventoryOnly',
-  },
   {
     capabilities: ['fundingRoutes'],
     id: 'relay',
@@ -413,64 +402,6 @@ export type QuoteProbeResult = {
   }
 }
 
-/** Token reference attached to a normalized provider fee. */
-export type ProviderQuoteFeeToken = {
-  /** Token contract address on its chain. */
-  address: string
-  /** CAIP-2 chain id for the fee token. */
-  chainId: string
-  /** Number of decimal places used by the fee token. */
-  decimals: number
-  /** Fee token ticker symbol. */
-  symbol: string
-}
-
-/** Normalized fee amount returned by a provider quote. */
-export type ProviderQuoteFee = {
-  /** Fee amount in the fee token's base units. */
-  amount: string
-  /** Provider-estimated USD value of the fee. */
-  amountUsd: string | null
-  /** Fee as basis points of the quoted input, when available. */
-  bps: number | null
-  /** Token in which the fee amount is denominated. */
-  token: ProviderQuoteFeeToken
-}
-
-/** Input passed to a provider for one explicit, depositor-specific quote. */
-export type ProviderQuoteInput = {
-  /** Address that would submit the funding transaction. */
-  depositor: string
-  /** Optional destination recipient; providers default it to the depositor. */
-  recipient?: string | undefined
-  /** Curated route selected by the caller. */
-  route: RouteCandidate
-}
-
-/** Dynamic data returned by an explicit provider quote. */
-export type ProviderQuoteResult = {
-  /** Estimated settlement time in seconds. */
-  estimatedSeconds: number | null
-  /** Provider quote expiry timestamp. */
-  expiresAt: string
-  /** Current and maximum fee summaries. */
-  fees: {
-    /** Current estimated total fee. */
-    total: ProviderQuoteFee
-    /** Maximum total fee allowed by the quote. */
-    totalMax: ProviderQuoteFee
-  }
-  /** Slippage-adjusted minimum destination amount in base units. */
-  minimumOutputAmount: string
-  /** Expected destination amount in base units. */
-  outputAmount: string
-  /** Timestamp when Tempo sampled the quote. */
-  sampledAt: string
-}
-
-/** A normalized explicit funding quote returned to callers. */
-export type FundingQuote = ReturnType<typeof formatFundingQuote>
-
 /** Adapter used to enrich a static route candidate with live provider information. */
 export type ProviderAdapter = {
   /** Probes provider-backed quote information for one static candidate. */
@@ -480,15 +411,8 @@ export type ProviderAdapter = {
 /** Provider adapter registry, keyed by provider id. Missing adapters leave routes static. */
 export type ProviderAdapters = Partial<Record<ProviderId, ProviderAdapter>>
 
-/** Gets a depositor-specific quote without exposing provider execution payloads. */
-export type ProviderQuote = (
-  input: ProviderQuoteInput,
-  signal: AbortSignal,
-) => Promise<ProviderQuoteResult>
-
 /** Static provider support rows used until live quote adapters are configured. */
 const inventory: readonly InventoryEntry[] = [
-  { destinationToken: 'usdce', provider: 'across', sourceChains: ['ethereum', 'base', 'bnb'], sourceTokens: ['USDC'] }, // prettier-ignore
   { destinationToken: 'usdce', provider: 'relay', sourceChains: ['ethereum', 'base', 'bnb'], sourceTokens: ['USDC', 'USDT'] }, // prettier-ignore
   { destinationToken: 'usdce', provider: 'bridge', sourceChains: ['ethereum', 'base', 'solana'], sourceTokens: ['USDC'] }, // prettier-ignore
   { destinationToken: 'usdce', provider: 'bridge', sourceChains: ['ethereum', 'solana', 'tron'], sourceTokens: ['USDT'] }, // prettier-ignore
@@ -503,7 +427,6 @@ type InventoryEntry = {
 }
 
 const defaultAdapterTimeoutMs = 750
-const defaultQuoteTimeoutMs = 5_000
 const includes = ['quotes'] as const
 
 /** Lists normalized chains and source tokens that can fund Tempo. */
@@ -522,10 +445,7 @@ export function listProviders(options: listProviders.Options = {}) {
     )
     .map((provider) => ({
       ...formatProvider(provider),
-      status:
-        options.adapters?.[provider.id] || options.configuredProviders?.includes(provider.id)
-          ? ('configured' as const)
-          : provider.status,
+      status: options.adapters?.[provider.id] ? ('configured' as const) : provider.status,
     }))
 }
 
@@ -534,8 +454,6 @@ export declare namespace listProviders {
   type Options = {
     /** Provider adapters configured for this deployment. */
     adapters?: ProviderAdapters | undefined
-    /** Providers configured through capabilities outside discovery adapters. */
-    configuredProviders?: readonly ProviderId[] | undefined
     /** Provider capability to require. */
     capability?: Capability | undefined
   }
@@ -581,55 +499,6 @@ export async function listRoutes(options: listRoutes.Options) {
   )
 }
 
-/** Gets a depositor-specific quote for one curated funding route. */
-export async function quoteRoute(options: quoteRoute.Options): Promise<FundingQuote> {
-  const [route] = listStaticRoutes({
-    destinationToken: options.destinationToken,
-    limit: 1,
-    provider: options.provider,
-    sourceAmount: options.sourceAmount,
-    sourceAmountUnits: options.sourceAmountUnits,
-    sourceChain: options.sourceChain,
-    sourceToken: options.sourceToken,
-  })
-  if (!route) throw new FundingRouteNotFoundError()
-
-  const quote = options.quote
-  if (!quote) throw new ProviderNotConfiguredError()
-
-  return formatFundingQuote(
-    route,
-    await runWithTimeout(
-      (signal) =>
-        quote(
-          {
-            depositor: options.depositor,
-            ...(options.recipient === undefined ? {} : { recipient: options.recipient }),
-            route,
-          },
-          signal,
-        ),
-      options.quoteTimeoutMs ?? defaultQuoteTimeoutMs,
-    ),
-  )
-}
-
-export declare namespace quoteRoute {
-  /** Options for resolving and quoting one curated funding route. */
-  type Options = Omit<listStaticRoutes.Options, 'limit' | 'provider'> & {
-    /** Address that would submit the funding transaction. */
-    depositor: string
-    /** Configured provider quote capability. */
-    quote?: ProviderQuote | undefined
-    /** Provider selected for the quote. */
-    provider: 'across'
-    /** Maximum time allowed for the live provider request. */
-    quoteTimeoutMs?: number | undefined
-    /** Optional destination recipient; defaults to the depositor. */
-    recipient?: string | undefined
-  }
-}
-
 /** Lists static funding route candidates for a normalized caller request. */
 export function listStaticRoutes(options: listStaticRoutes.Options) {
   const sourceChain = resolveSourceChain(options.sourceChain)
@@ -881,28 +750,6 @@ function formatRouteQuote(route: RouteCandidate, quote: QuoteProbeResult) {
   } as const
 }
 
-function formatFundingQuote(route: RouteCandidate, quote: ProviderQuoteResult) {
-  return {
-    destinationChain: route.destinationChain,
-    destinationToken: route.destinationToken,
-    estimatedSeconds: quote.estimatedSeconds,
-    expiresAt: quote.expiresAt,
-    fees: quote.fees,
-    inputAmount: route.sourceAmount.amount,
-    minimumOutputAmount: quote.minimumOutputAmount,
-    outputAmount: quote.outputAmount,
-    outputAmountFormatted: decimalFromBaseUnits(
-      quote.outputAmount,
-      route.destinationToken.decimals,
-    ),
-    provider: route.provider,
-    routeId: route.id,
-    sampledAt: quote.sampledAt,
-    sourceChain: route.sourceChain,
-    sourceToken: route.sourceToken,
-  } as const
-}
-
 function markRouteError(route: RouteCandidate, errorCode: string) {
   return {
     ...route,
@@ -1026,31 +873,11 @@ export class InvalidAmountError extends Error {
   override name = 'FundingRoutes.InvalidAmountError'
 }
 
-/** Error thrown when no curated route matches an explicit quote request. */
-export class FundingRouteNotFoundError extends Error {
-  override name = 'FundingRoutes.FundingRouteNotFoundError'
-}
-
 /** Error thrown internally when a provider adapter exceeds its route quote timeout. */
 export class ProviderAdapterTimeoutError extends Error {
   override name = 'FundingRoutes.ProviderAdapterTimeoutError'
 }
 
-/** Error thrown when a requested provider quote is temporarily unavailable. */
-export class ProviderQuoteUnavailableError extends Error {
-  override name = 'FundingRoutes.ProviderQuoteUnavailableError'
-}
-
-/** Error thrown when a provider rate-limits a quote request. */
-export class ProviderRateLimitError extends Error {
-  override name = 'FundingRoutes.ProviderRateLimitError'
-}
-
-/** Error thrown when a route provider lacks explicit quote capability. */
-export class ProviderNotConfiguredError extends Error {
-  override name = 'FundingRoutes.ProviderNotConfiguredError'
-}
-
 /** Error thrown when the caller filters to an unknown provider. */
 export class UnsupportedProviderError extends Error {
   override name = 'FundingRoutes.UnsupportedProviderError'

package/src/internal/Log.test.ts

@@ -145,8 +145,8 @@ describe('middleware', () => {
       c.set('providerFailure', {
         code: 'UNAUTHORIZED',
         failure: 'http',
-        id: 'across',
-        operation: 'swap/approval',
+        id: 'relay',
+        operation: 'quote/v2',
         status: 401,
       })
       return Response.error(c, {
@@ -167,8 +167,8 @@ describe('middleware', () => {
         "provider": {
           "code": "UNAUTHORIZED",
           "failure": "http",
-          "id": "across",
-          "operation": "swap/approval",
+          "id": "relay",
+          "operation": "quote/v2",
           "status": 401,
         },
         "route": "/provider",

package/src/internal/Store.test-d.ts

@@ -0,0 +1,15 @@
+import type { Store as MppStore } from 'mppx'
+import { Store } from 'tapimo'
+
+declare const namespace: Store.durableObject.Namespace
+
+type Items = {
+  channel: { spent: bigint }
+}
+
+describe('durableObject', () => {
+  test('matches typed atomic stores', () => {
+    expectTypeOf(Store.durableObject(namespace)).toExtend<MppStore.AtomicStore<Items>>()
+    expectTypeOf(Store.durableObject<Items>(namespace)).toEqualTypeOf<Store.AtomicState<Items>>()
+  })
+})