mppx 0.5.1 → 0.5.4

package/src/tempo/server/internal/transport.test.ts

@@ -113,19 +113,20 @@ describe('sse transport', () => {
     expect((credential!.payload as any).channelId).toBe(channelId)
   })
 
-  test('getCredential captures SSE context in contextMap', async () => {
+  test('respondReceipt derives SSE context from the verified credential', async () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
 
-    const request = makeAuthorizedRequest()
-    transport.getCredential(request)
+    const credential = makeCredential()
 
     async function* gen() {
       yield 'test'
     }
 
     const response = transport.respondReceipt({
+      credential,
+      input: new Request('https://test.example.com/session'),
       receipt: makeReceipt(),
       response: gen(),
       challengeId,
@@ -151,8 +152,7 @@ describe('sse transport', () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     async function* gen() {
       yield 'hello'
@@ -160,6 +160,8 @@ describe('sse transport', () => {
     }
 
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: gen(),
       challengeId,
@@ -184,10 +186,11 @@ describe('sse transport', () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: async function* (stream) {
         await stream.charge()
@@ -202,8 +205,7 @@ describe('sse transport', () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     const encoder = new TextEncoder()
     const upstream = new Response(
@@ -218,6 +220,8 @@ describe('sse transport', () => {
     )
 
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: upstream,
       challengeId,
@@ -241,6 +245,8 @@ describe('sse transport', () => {
     })
 
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: new Request('https://test.example.com/session'),
       receipt,
       response: plainResponse,
       challengeId,
@@ -249,34 +255,24 @@ describe('sse transport', () => {
     expect(response.headers.get('Payment-Receipt')).toBeTruthy()
   })
 
-  test('respondReceipt cleans up contextMap after use', async () => {
+  test('respondReceipt no longer depends on prior getCredential side effects', async () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     async function* gen() {
       yield 'first'
     }
 
-    transport.respondReceipt({
+    const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: gen(),
       challengeId,
     })
-
-    async function* gen2() {
-      yield 'second'
-    }
-
-    expect(() =>
-      transport.respondReceipt({
-        receipt: makeReceipt(),
-        response: gen2(),
-        challengeId,
-      }),
-    ).toThrow('No SSE context available')
+    expect(response.headers.get('Content-Type')).toContain('text/event-stream')
   })
 
   test('respondReceipt throws when no SSE context available', () => {
@@ -287,8 +283,15 @@ describe('sse transport', () => {
       yield 'hello'
     }
 
+    const credential = Credential.from({
+      challenge: makeChallenge(),
+      payload: { signature: '0xabc123', type: 'transaction' },
+    })
+
     expect(() =>
       transport.respondReceipt({
+        credential,
+        input: new Request('https://test.example.com/session'),
         receipt: makeReceipt(),
         response: gen(),
         challengeId,
@@ -300,14 +303,15 @@ describe('sse transport', () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     const plainResponse = new Response(JSON.stringify({ content: 'hello' }), {
       headers: { 'Content-Type': 'application/json' },
     })
 
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: plainResponse,
       challengeId,
@@ -328,11 +332,12 @@ describe('sse transport', () => {
     const store = memoryStore()
     await seedChannel(store, 10000000n)
     const transport = sse({ store })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     const managementResponse = new Response(null, { status: 204 })
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: managementResponse,
       challengeId,
@@ -353,14 +358,15 @@ describe('sse transport', () => {
     await seedChannel(store, 10000000n)
 
     const transport = sse({ store, poll: true })
-
-    transport.getCredential(makeAuthorizedRequest())
+    const request = makeAuthorizedRequest()
 
     async function* gen() {
       yield 'test'
     }
 
     const response = transport.respondReceipt({
+      credential: makeCredential(),
+      input: request,
       receipt: makeReceipt(),
       response: gen(),
       challengeId,

package/src/tempo/server/internal/transport.ts

@@ -1,6 +1,6 @@
 /**
  * Tempo-specific SSE transport that wraps the base HTTP transport
- * with metering logic (context capture from credentials, per-token
+ * with metering logic (context capture from verified credentials, per-token
  * charging via Sse.serve).
  *
  * @internal
@@ -8,6 +8,7 @@
 import * as Transport from '../../../server/Transport.js'
 import * as ChannelStore from '../../session/ChannelStore.js'
 import * as Sse_core from '../../session/Sse.js'
+import type { SessionCredentialPayload } from '../../session/Types.js'
 
 /** SSE transport with Tempo session controller. */
 export type Sse = Transport.Sse<Sse_core.SessionController>
@@ -33,30 +34,24 @@ export function sse(options: sse.Options & { store: ChannelStore.ChannelStore })
     return store
   })()
 
-  const contextMap = new Map<string, Sse_core.fromRequest.Context & { signal?: AbortSignal }>()
-
   const base = Transport.http()
   return Transport.from<Request, Response, Transport.ReceiptResponseOf<Sse>, Response>({
     name: 'sse',
 
     getCredential(request) {
-      const credential = base.getCredential(request)
-      if (credential) {
-        try {
-          const ctx = Sse_core.fromRequest(request)
-          contextMap.set(ctx.challengeId, { ...ctx, signal: request.signal })
-        } catch {
-          // ignore — non-SSE credentials won't have session context
-        }
-      }
-      return credential
+      return base.getCredential(request)
     },
 
     respondChallenge(options) {
       return base.respondChallenge(options) as Response
     },
 
-    respondReceipt({ receipt, response, challengeId }) {
+    respondReceipt({ credential, receipt, response, challengeId, input }) {
+      const payload = credential.payload as Partial<SessionCredentialPayload>
+      if (!payload.channelId) throw new Error('No SSE context available')
+      const channelId = payload.channelId
+      const tickCost = BigInt(credential.challenge.request.amount as string)
+
       // Auto-detect upstream SSE responses and parse them into an
       // AsyncIterable so they flow through the metered pipeline.
       // This lets proxy consumers simply pass `result.withReceipt(upstreamRes)`
@@ -67,10 +62,6 @@ export function sse(options: sse.Options & { store: ChannelStore.ChannelStore })
           : response
 
       if (isAsyncGeneratorFunction(resolved) || isAsyncIterable(resolved)) {
-        const ctx = contextMap.get(challengeId)
-        if (!ctx) throw new Error('No SSE context available — credential was not parsed')
-        contextMap.delete(challengeId)
-
         // Pass async generator functions directly so Sse.serve gives them
         // a SessionController for manual charge(). Pass raw AsyncIterables
         // as-is so Sse.serve auto-charges per yielded value.
@@ -79,17 +70,19 @@ export function sse(options: sse.Options & { store: ChannelStore.ChannelStore })
           : (resolved as AsyncIterable<string>)
         const stream = Sse_core.serve({
           store,
-          channelId: ctx.channelId,
+          channelId,
           challengeId,
-          tickCost: ctx.tickCost,
+          tickCost,
           pollIntervalMs: pollingInterval,
           generate,
-          signal: ctx.signal,
+          signal: input.signal,
         })
         return Sse_core.toResponse(stream)
       }
 
       const baseResponse = base.respondReceipt({
+        credential,
+        input,
         receipt,
         response: response as Response,
         challengeId,
@@ -97,45 +90,38 @@ export function sse(options: sse.Options & { store: ChannelStore.ChannelStore })
 
       // Non-SSE response (e.g. upstream returned JSON instead of event-stream).
       // Need to deduct tickCost so request isn't free.
-      const ctx = contextMap.get(challengeId)
-      if (ctx) {
-        contextMap.delete(challengeId)
-
-        // Null-body statuses (e.g. 204 from management actions) cannot carry a
-        // response body per Fetch/HTTP semantics.
-        if (isNullBodyStatus(baseResponse.status)) {
-          return baseResponse
-        }
-
-        const stream = new ReadableStream<Uint8Array>({
-          async start(controller) {
-            // deduction completes before consumer reads
-            await ChannelStore.deductFromChannel(store, ctx.channelId, ctx.tickCost)
-            if (!baseResponse.body) {
-              controller.close()
-              return
-            }
-            const reader = baseResponse.body.getReader()
-            try {
-              while (true) {
-                const { done, value } = await reader.read()
-                if (done) break
-                controller.enqueue(value)
-              }
-            } finally {
-              reader.releaseLock()
-              controller.close()
-            }
-          },
-        })
-        return new Response(stream, {
-          status: baseResponse.status,
-          statusText: baseResponse.statusText,
-          headers: baseResponse.headers,
-        })
+      // Null-body statuses (e.g. 204 from management actions) cannot carry a
+      // response body per Fetch/HTTP semantics.
+      if (isNullBodyStatus(baseResponse.status)) {
+        return baseResponse
       }
 
-      return baseResponse
+      const stream = new ReadableStream<Uint8Array>({
+        async start(controller) {
+          // deduction completes before consumer reads
+          await ChannelStore.deductFromChannel(store, channelId, tickCost)
+          if (!baseResponse.body) {
+            controller.close()
+            return
+          }
+          const reader = baseResponse.body.getReader()
+          try {
+            while (true) {
+              const { done, value } = await reader.read()
+              if (done) break
+              controller.enqueue(value)
+            }
+          } finally {
+            reader.releaseLock()
+            controller.close()
+          }
+        },
+      })
+      return new Response(stream, {
+        status: baseResponse.status,
+        statusText: baseResponse.statusText,
+        headers: baseResponse.headers,
+      })
     },
   })
 }

package/src/tsconfig.json

@@ -6,5 +6,5 @@
     "types": ["node"]
   },
   "include": ["./**/*.ts"],
-  "exclude": ["./**/*.test.ts", "./**/*.test-d.ts"]
+  "exclude": ["./**/*.test.ts", "./**/*.test-d.ts", "./**/internal/html/**"]
 }