mppx 0.4.7 → 0.4.9

package/src/server/Response.test.ts

@@ -1,6 +1,7 @@
 import { Challenge } from 'mppx'
 import { Response } from 'mppx/server'
 import { describe, expect, test } from 'vitest'
+
 import * as Errors from '../Errors.js'
 
 const challenge = Challenge.from({

package/src/server/Transport.test.ts

@@ -2,6 +2,7 @@ import { Challenge, Credential, Mcp, Receipt } from 'mppx'
 import { Transport } from 'mppx/server'
 import { Methods } from 'mppx/tempo'
 import { describe, expect, test } from 'vitest'
+
 import { BadRequestError, ChannelClosedError } from '../Errors.js'
 
 const realm = 'api.example.com'

package/src/stripe/Methods.ts

@@ -1,4 +1,5 @@
 import { parseUnits } from 'viem'
+
 import * as Method from '../Method.js'
 import * as z from '../zod.js'
 

package/src/stripe/client/Charge.test.ts

@@ -2,6 +2,7 @@ import { Challenge, Credential } from 'mppx'
 import { Mppx, stripe } from 'mppx/client'
 import { Mppx as Mppx_server, stripe as stripe_server } from 'mppx/server'
 import { describe, expect, test, vi } from 'vitest'
+
 import type { StripeJs } from '../internal/types.js'
 import { charge as clientCharge_ } from './Charge.js'
 

package/src/stripe/server/Charge.test.ts

@@ -2,6 +2,7 @@ import { Challenge, Credential } from 'mppx'
 import { Mppx, stripe } from 'mppx/server'
 import { afterEach, describe, expect, test, vi } from 'vitest'
 import * as Http from '~test/Http.js'
+
 import type { StripeClient } from '../internal/types.js'
 
 const realm = 'api.example.com'

package/src/tempo/Attribution.test.ts

@@ -1,5 +1,6 @@
 import { Bytes, Hash, Hex } from 'ox'
 import { describe, expect, test } from 'vitest'
+
 import * as Attribution from './Attribution.js'
 
 describe('Attribution', () => {

package/src/tempo/Methods.ts

@@ -1,5 +1,6 @@
 import type { Account } from 'viem'
 import { parseUnits } from 'viem'
+
 import * as Method from '../Method.js'
 import * as z from '../zod.js'
 

package/src/tempo/client/ChannelOps.test.ts

@@ -5,6 +5,7 @@ import { Addresses } from 'viem/tempo'
 import { beforeAll, describe, expect, test } from 'vitest'
 import { deployEscrow, openChannel } from '~test/tempo/session.js'
 import { accounts, asset, chain, client, fundAccount, http } from '~test/tempo/viem.js'
+
 import type { Challenge } from '../../Challenge.js'
 import * as Credential from '../../Credential.js'
 import {

package/src/tempo/client/ChannelOps.ts

@@ -15,6 +15,7 @@ import {
 } from 'viem'
 import { prepareTransactionRequest, signTransaction } from 'viem/actions'
 import { Abis } from 'viem/tempo'
+
 import type { Challenge } from '../../Challenge.js'
 import * as Credential from '../../Credential.js'
 import * as defaults from '../internal/defaults.js'

package/src/tempo/client/Charge.ts

@@ -3,6 +3,7 @@ import type { Address } from 'viem'
 import { prepareTransactionRequest, sendCallsSync, signTransaction } from 'viem/actions'
 import { tempo as tempo_chain } from 'viem/chains'
 import { Actions } from 'viem/tempo'
+
 import * as Credential from '../../Credential.js'
 import * as Method from '../../Method.js'
 import * as Account from '../../viem/Account.js'

package/src/tempo/client/Session.test.ts

@@ -4,6 +4,7 @@ import { Addresses } from 'viem/tempo'
 import { beforeAll, describe, expect, test } from 'vitest'
 import { deployEscrow, openChannel } from '~test/tempo/session.js'
 import { accounts, asset, chain, client, fundAccount } from '~test/tempo/viem.js'
+
 import * as Challenge from '../../Challenge.js'
 import * as Credential from '../../Credential.js'
 import { chainId, escrowContract as escrowContractDefaults } from '../internal/defaults.js'

package/src/tempo/client/Session.ts

@@ -1,6 +1,7 @@
 import type { Hex } from 'ox'
 import { type Address, parseUnits, type Account as viem_Account } from 'viem'
 import { tempo as tempo_chain } from 'viem/chains'
+
 import type * as Challenge from '../../Challenge.js'
 import * as Method from '../../Method.js'
 import * as Account from '../../viem/Account.js'

package/src/tempo/client/SessionManager.test.ts

@@ -1,5 +1,6 @@
 import type { Hex } from 'viem'
 import { describe, expect, test, vi } from 'vitest'
+
 import * as Challenge from '../../Challenge.js'
 import { formatNeedVoucherEvent, parseEvent } from '../session/Sse.js'
 import type { NeedVoucherEvent, SessionReceipt } from '../session/Types.js'
@@ -207,6 +208,33 @@ describe('Session', () => {
     })
   })
 
+  describe('.sse() headers normalization', () => {
+    test('preserves Headers instance properties when passed as headers', async () => {
+      const mockFetch = vi.fn().mockResolvedValue(makeSseResponse(['event: message\ndata: ok\n\n']))
+
+      const s = sessionManager({
+        account: '0x0000000000000000000000000000000000000001',
+        fetch: mockFetch as typeof globalThis.fetch,
+      })
+
+      const iterable = await s.sse('https://api.example.com/stream', {
+        headers: new Headers({ 'Content-Type': 'application/json', 'X-Custom': 'value' }),
+      })
+
+      for await (const _ of iterable) {
+        // drain
+      }
+
+      const calledHeaders = (mockFetch.mock.calls[0]![1] as RequestInit).headers as Record<
+        string,
+        string
+      >
+      expect(calledHeaders['content-type']).toBe('application/json')
+      expect(calledHeaders['x-custom']).toBe('value')
+      expect(calledHeaders.Accept).toBe('text/event-stream')
+    })
+  })
+
   describe('.close()', () => {
     test('is no-op when not opened', async () => {
       const mockFetch = vi.fn()

package/src/tempo/client/SessionManager.ts

@@ -1,5 +1,6 @@
 import type { Hex } from 'ox'
 import type { Address } from 'viem'
+
 import type * as Challenge from '../../Challenge.js'
 import * as Fetch from '../../client/internal/Fetch.js'
 import type * as Account from '../../viem/Account.js'
@@ -157,7 +158,7 @@ export function sessionManager(parameters: sessionManager.Parameters): SessionMa
       const sseInit = {
         ...fetchInit,
         headers: {
-          ...fetchInit.headers,
+          ...Fetch.normalizeHeaders(fetchInit.headers),
           Accept: 'text/event-stream',
         },
         ...(signal ? { signal } : {}),

package/src/tempo/internal/address.ts

@@ -0,0 +1,6 @@
+// TODO: Add `isEqual` to `TempoAddress`.
+import type { TempoAddress } from 'ox/tempo'
+
+export function isEqual(a: TempoAddress.Address, b: TempoAddress.Address) {
+  return a.toLowerCase() === b.toLowerCase()
+}

package/src/tempo/internal/auto-swap.test.ts

@@ -1,5 +1,6 @@
 import type { Address } from 'viem'
 import { describe, expect, test } from 'vitest'
+
 import { defaultCurrencies, InsufficientFundsError, resolve } from './auto-swap.js'
 
 describe('defaultCurrencies', () => {

package/src/tempo/internal/auto-swap.ts

@@ -1,7 +1,8 @@
 import type { Address, Client } from 'viem'
-import { isAddressEqual } from 'viem'
 import { readContract } from 'viem/actions'
 import { Actions, Addresses } from 'viem/tempo'
+
+import * as TempoAddress from './address.js'
 import * as defaults from './defaults.js'
 
 /** Basis-point denominator (100% = 10 000 bps). */
@@ -26,7 +27,7 @@ export async function findCalls(
 ): Promise<findCalls.ReturnType> {
   const { account, amountOut, tokenOut, tokenIn, slippage } = parameters
 
-  const candidates = tokenIn.filter((t) => !isAddressEqual(t, tokenOut))
+  const candidates = tokenIn.filter((t) => !TempoAddress.isEqual(t, tokenOut))
 
   const balanceResults = await Promise.allSettled([
     readContract(client, Actions.token.getBalance.call({ account, token: tokenOut }) as never),
@@ -108,7 +109,7 @@ export function resolve(
   const tokenIn = value.tokenIn
     ? [
         ...value.tokenIn,
-        ...defaultCurrencies.filter((d) => !value.tokenIn!.some((c) => isAddressEqual(c, d))),
+        ...defaultCurrencies.filter((d) => !value.tokenIn!.some((c) => TempoAddress.isEqual(c, d))),
       ]
     : defaultCurrencies
   return {

package/src/tempo/internal/defaults.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from 'vitest'
+
 import {
   chainId,
   currency,

package/src/tempo/internal/fee-payer.test.ts

@@ -1,6 +1,7 @@
 import { encodeFunctionData } from 'viem'
 import { Abis, Addresses } from 'viem/tempo'
 import { describe, expect, test } from 'vitest'
+
 import { callScopes, FeePayerValidationError, validateCalls } from './fee-payer.js'
 import * as Selectors from './selectors.js'
 

package/src/tempo/internal/fee-payer.ts

@@ -1,7 +1,19 @@
-import { decodeFunctionData, isAddressEqual } from 'viem'
+import type { TempoAddress } from 'ox/tempo'
+import { TxEnvelopeTempo } from 'ox/tempo'
+import { decodeFunctionData } from 'viem'
 import { Abis, Addresses } from 'viem/tempo'
+
+import * as TempoAddress_internal from './address.js'
 import * as Selectors from './selectors.js'
 
+/** Returns true if the serialized transaction has a Tempo envelope prefix. */
+export function isTempoTransaction(serialized: string | undefined): boolean {
+  return (
+    serialized?.startsWith(TxEnvelopeTempo.serializedType) === true ||
+    serialized?.startsWith(TxEnvelopeTempo.feePayerMagic) === true
+  )
+}
+
 /**
  * Allowed call patterns for fee-payer sponsored transactions.
  * Each inner array is an ordered list of function selectors.
@@ -15,7 +27,7 @@ export const callScopes = [
 
 /** Validates that a set of transaction calls matches an allowed fee-payer pattern. */
 export function validateCalls(
-  calls: readonly { data?: `0x${string}` | undefined; to?: `0x${string}` | undefined }[],
+  calls: readonly { data?: `0x${string}` | undefined; to?: TempoAddress.Address | undefined }[],
   details: Record<string, string>,
 ) {
   const callSelectors = calls.map((c) => c.data?.slice(0, 10))
@@ -31,11 +43,14 @@ export function validateCalls(
   const approveCall = calls.find((c) => c.data?.slice(0, 10) === Selectors.approve)
   if (approveCall) {
     const { args } = decodeFunctionData({ abi: Abis.tip20, data: approveCall.data! })
-    if (!isAddressEqual((args as [`0x${string}`])[0]!, Addresses.stablecoinDex))
+    if (!TempoAddress_internal.isEqual((args as [`0x${string}`])[0]!, Addresses.stablecoinDex))
       throw new FeePayerValidationError('approve spender is not the DEX', details)
   }
   const buyCall = calls.find((c) => c.data?.slice(0, 10) === Selectors.swapExactAmountOut)
-  if (buyCall && (!buyCall.to || !isAddressEqual(buyCall.to, Addresses.stablecoinDex)))
+  if (
+    buyCall &&
+    (!buyCall.to || !TempoAddress_internal.isEqual(buyCall.to, Addresses.stablecoinDex))
+  )
     throw new FeePayerValidationError('buy target is not the DEX', details)
 }