mppx 0.4.12 → 0.5.1

package/src/middlewares/elysia.test.ts

@@ -2,14 +2,18 @@ import * as http from 'node:http'
 
 import { Elysia } from 'elysia'
 import { Receipt } from 'mppx'
-import { Mppx as Mppx_client, tempo as tempo_client } from 'mppx/client'
+import { Mppx as Mppx_client, session as sessionIntent, tempo as tempo_client } from 'mppx/client'
 import { Mppx, discovery } from 'mppx/elysia'
 import { tempo as tempo_server } from 'mppx/server'
-import { describe, expect, test } from 'vp/test'
-import { accounts, asset, client } from '~test/tempo/viem.js'
+import type { Address } from 'viem'
+import { Addresses } from 'viem/tempo'
+import { beforeAll, describe, expect, test } from 'vp/test'
+import * as TestHttp from '~test/Http.js'
+import { deployEscrow } from '~test/tempo/session.js'
+import { accounts, asset, client, fundAccount } from '~test/tempo/viem.js'
 
 function createServer(app: Elysia<any, any, any, any, any, any, any>) {
-  return new Promise<{ url: string; close: () => void }>((resolve) => {
+  return new Promise<TestHttp.TestServer>((resolve) => {
     const server = http.createServer(async (req, res) => {
       const url = `http://localhost${req.url}`
       const headers = new Headers()
@@ -24,23 +28,21 @@ function createServer(app: Elysia<any, any, any, any, any, any, any>) {
     })
     server.listen(0, () => {
       const { port } = server.address() as { port: number }
-      resolve({
-        url: `http://localhost:${port}`,
-        close: () => server.close(),
-      })
+      resolve(TestHttp.wrapServer(server, { port, url: `http://localhost:${port}` }))
     })
   })
 }
 
 const secretKey = 'test-secret-key'
 
-describe('charge', () => {
+function createChargeHarness(feePayer: boolean) {
   const mppx = Mppx.create({
     methods: [
       tempo_server.charge({
         getClient: () => client,
         currency: asset,
         recipient: accounts[0].address,
+        ...(feePayer ? { feePayer: true } : {}),
       }),
     ],
     secretKey,
@@ -56,7 +58,13 @@ describe('charge', () => {
     ],
   })
 
+  return { fetch, mppx }
+}
+
+describe('charge', () => {
   test('returns 402 when no credential', async () => {
+    const { mppx } = createChargeHarness(false)
+
     const app = new Elysia().guard({ beforeHandle: mppx.charge({ amount: '1' }) }, (app) =>
       app.get('/', () => ({ fortune: 'You will be rich' })),
     )
@@ -70,6 +78,8 @@ describe('charge', () => {
   })
 
   test('returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createChargeHarness(false)
+
     const app = new Elysia().guard({ beforeHandle: mppx.charge({ amount: '1' }) }, (app) =>
       app.get('/', () => ({ fortune: 'You will be rich' })),
     )
@@ -88,7 +98,24 @@ describe('charge', () => {
     server.close()
   })
 
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createChargeHarness(true)
+
+    const app = new Elysia().guard({ beforeHandle: mppx.charge({ amount: '1' }) }, (app) =>
+      app.get('/', () => ({ fortune: 'You will be rich' })),
+    )
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
+  })
+
   test('serves /openapi.json from discovery plugin', async () => {
+    const { mppx } = createChargeHarness(false)
+
     const app = new Elysia().use(
       discovery(mppx, {
         info: { title: 'Elysia API', version: '1.0.0' },
@@ -113,3 +140,97 @@ describe('charge', () => {
     server.close()
   })
 })
+
+describe('session', () => {
+  let escrowContract: Address
+
+  function createSessionHarness(feePayer: boolean) {
+    const mppx = Mppx.create({
+      methods: [
+        tempo_server.session({
+          getClient: () => client,
+          account: accounts[0],
+          currency: asset,
+          escrowContract,
+          ...(feePayer ? { feePayer: accounts[1] } : {}),
+        } as any),
+      ],
+      secretKey,
+    })
+
+    const { fetch } = Mppx_client.create({
+      polyfill: false,
+      methods: [
+        sessionIntent({
+          account: accounts[2],
+          deposit: '10',
+          getClient: () => client,
+        }),
+      ],
+    })
+
+    return { fetch, mppx }
+  }
+
+  beforeAll(async () => {
+    escrowContract = await deployEscrow()
+    await fundAccount({ address: accounts[1].address, token: Addresses.pathUsd })
+    await fundAccount({ address: accounts[1].address, token: asset })
+    await fundAccount({ address: accounts[2].address, token: Addresses.pathUsd })
+    await fundAccount({ address: accounts[2].address, token: asset })
+  })
+
+  test('returns 402 when no credential', async () => {
+    const { mppx } = createSessionHarness(false)
+
+    const app = new Elysia().guard(
+      { beforeHandle: mppx.session({ amount: '1', currency: asset, unitType: 'token' }) },
+      (app) => app.get('/', () => ({ data: 'streamed' })),
+    )
+
+    const server = await createServer(app)
+    const response = await globalThis.fetch(server.url)
+    expect(response.status).toBe(402)
+    expect(response.headers.get('WWW-Authenticate')).toContain('Payment')
+
+    server.close()
+  })
+
+  test('returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createSessionHarness(false)
+
+    const app = new Elysia().guard(
+      { beforeHandle: mppx.session({ amount: '1', currency: asset, unitType: 'token' }) },
+      (app) => app.get('/', () => ({ data: 'streamed' })),
+    )
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+
+    const body = await response.json()
+    expect(body).toEqual({ data: 'streamed' })
+
+    const receipt = Receipt.fromResponse(response)
+    expect(receipt.status).toBe('success')
+    expect(receipt.method).toBe('tempo')
+
+    server.close()
+  })
+
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createSessionHarness(true)
+
+    const app = new Elysia().guard(
+      { beforeHandle: mppx.session({ amount: '1', currency: asset, unitType: 'token' }) },
+      (app) => app.get('/', () => ({ data: 'streamed' })),
+    )
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
+  })
+})

package/src/middlewares/express.test.ts

@@ -6,30 +6,29 @@ import { Mppx as Mppx_server, tempo as tempo_server } from 'mppx/server'
 import type { Address } from 'viem'
 import { Addresses } from 'viem/tempo'
 import { beforeAll, describe, expect, test } from 'vp/test'
+import * as Http from '~test/Http.js'
 import { deployEscrow } from '~test/tempo/session.js'
 import { accounts, asset, client, fundAccount } from '~test/tempo/viem.js'
 
 function createServer(app: express.Express) {
-  return new Promise<{ url: string; close: () => void }>((resolve) => {
+  return new Promise<Http.TestServer>((resolve) => {
     const server = app.listen(0, () => {
       const { port } = server.address() as { port: number }
-      resolve({
-        url: `http://localhost:${port}`,
-        close: () => server.close(),
-      })
+      resolve(Http.wrapServer(server, { port, url: `http://localhost:${port}` }))
     })
   })
 }
 
 const secretKey = 'test-secret-key'
 
-describe('charge', () => {
+function createChargeHarness(feePayer: boolean) {
   const mppx = Mppx.create({
     methods: [
       tempo_server({
         getClient: () => client,
         currency: asset,
         account: accounts[0],
+        ...(feePayer ? { feePayer: true } : {}),
       }),
     ],
     secretKey,
@@ -45,7 +44,39 @@ describe('charge', () => {
     ],
   })
 
+  return { fetch, mppx }
+}
+
+function createCoreChargeHarness(feePayer: boolean) {
+  const mppx = Mppx_server.create({
+    methods: [
+      tempo_server({
+        getClient: () => client,
+        currency: asset,
+        account: accounts[0],
+        ...(feePayer ? { feePayer: true } : {}),
+      }),
+    ],
+    secretKey,
+  })
+
+  const { fetch } = Mppx_client.create({
+    polyfill: false,
+    methods: [
+      tempo_client({
+        account: accounts[1],
+        getClient: () => client,
+      }),
+    ],
+  })
+
+  return { fetch, mppx }
+}
+
+describe('charge', () => {
   test('returns 402 when no credential', async () => {
+    const { mppx } = createChargeHarness(false)
+
     const app = express()
     app.get('/', mppx.charge({ amount: '1' }), (_req, res) => {
       res.json({ fortune: 'You will be rich' })
@@ -60,6 +91,8 @@ describe('charge', () => {
   })
 
   test('returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createChargeHarness(false)
+
     const app = express()
     app.get('/', mppx.charge({ amount: '1' }), (_req, res) => {
       res.json({ fortune: 'You will be rich' })
@@ -82,7 +115,25 @@ describe('charge', () => {
     server.close()
   })
 
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createChargeHarness(true)
+
+    const app = express()
+    app.get('/', mppx.charge({ amount: '1' }), (_req, res) => {
+      res.json({ fortune: 'You will be rich' })
+    })
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
+  })
+
   test('serves /openapi.json from a handler-derived route config', async () => {
+    const { mppx } = createChargeHarness(false)
+
     const app = express()
     const pay = mppx.charge({ amount: '1' })
     app.get('/', pay, (_req, res) => {
@@ -114,13 +165,7 @@ describe('charge', () => {
 describe('session', () => {
   let escrowContract: Address
 
-  beforeAll(async () => {
-    escrowContract = await deployEscrow()
-    await fundAccount({ address: accounts[2].address, token: Addresses.pathUsd })
-    await fundAccount({ address: accounts[2].address, token: asset })
-  })
-
-  test('returns 402 when no credential', async () => {
+  function createSessionHarness(feePayer: boolean) {
     const mppx = Mppx.create({
       methods: [
         tempo_server.session({
@@ -128,13 +173,39 @@ describe('session', () => {
           account: accounts[0],
           currency: asset,
           escrowContract,
-        }),
+          ...(feePayer ? { feePayer: accounts[1] } : {}),
+        } as any),
       ],
       secretKey,
     })
 
+    const { fetch } = Mppx_client.create({
+      polyfill: false,
+      methods: [
+        sessionIntent({
+          account: accounts[2],
+          deposit: '10',
+          getClient: () => client,
+        }),
+      ],
+    })
+
+    return { fetch, mppx }
+  }
+
+  beforeAll(async () => {
+    escrowContract = await deployEscrow()
+    await fundAccount({ address: accounts[1].address, token: Addresses.pathUsd })
+    await fundAccount({ address: accounts[1].address, token: asset })
+    await fundAccount({ address: accounts[2].address, token: Addresses.pathUsd })
+    await fundAccount({ address: accounts[2].address, token: asset })
+  })
+
+  test('returns 402 when no credential', async () => {
+    const { mppx } = createSessionHarness(false)
+
     const app = express()
-    app.get('/', mppx.session({ amount: '1', unitType: 'token' }), (_req, res) => {
+    app.get('/', mppx.session({ amount: '1', currency: asset, unitType: 'token' }), (_req, res) => {
       res.json({ data: 'streamed' })
     })
 
@@ -147,32 +218,10 @@ describe('session', () => {
   })
 
   test('returns 200 with receipt on valid payment', async () => {
-    const mppx = Mppx.create({
-      methods: [
-        tempo_server.session({
-          getClient: () => client,
-          account: accounts[0],
-          currency: asset,
-          escrowContract,
-          feePayer: true,
-        }),
-      ],
-      secretKey,
-    })
-
-    const { fetch } = Mppx_client.create({
-      polyfill: false,
-      methods: [
-        sessionIntent({
-          account: accounts[2],
-          deposit: '10',
-          getClient: () => client,
-        }),
-      ],
-    })
+    const { fetch, mppx } = createSessionHarness(false)
 
     const app = express()
-    app.get('/', mppx.session({ amount: '1', unitType: 'token' }), (_req, res) => {
+    app.get('/', mppx.session({ amount: '1', currency: asset, unitType: 'token' }), (_req, res) => {
       res.json({ data: 'streamed' })
     })
 
@@ -185,31 +234,28 @@ describe('session', () => {
 
     server.close()
   })
-})
 
-describe('payment', () => {
-  const mppx = Mppx_server.create({
-    methods: [
-      tempo_server({
-        getClient: () => client,
-        currency: asset,
-        account: accounts[0],
-      }),
-    ],
-    secretKey,
-  })
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createSessionHarness(true)
 
-  const { fetch } = Mppx_client.create({
-    polyfill: false,
-    methods: [
-      tempo_client({
-        account: accounts[1],
-        getClient: () => client,
-      }),
-    ],
+    const app = express()
+    app.get('/', mppx.session({ amount: '1', currency: asset, unitType: 'token' }), (_req, res) => {
+      res.json({ data: 'streamed' })
+    })
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
   })
+})
 
+describe('payment', () => {
   test('returns 402 when no credential', async () => {
+    const { mppx } = createCoreChargeHarness(false)
+
     const app = express()
     app.get('/', payment(mppx.charge, { amount: '1' }), (_req, res) => {
       res.json({ fortune: 'You will be rich' })
@@ -224,6 +270,8 @@ describe('payment', () => {
   })
 
   test('returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createCoreChargeHarness(false)
+
     const app = express()
     app.get('/', payment(mppx.charge, { amount: '1' }), (_req, res) => {
       res.json({ fortune: 'You will be rich' })
@@ -245,4 +293,20 @@ describe('payment', () => {
 
     server.close()
   })
+
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createCoreChargeHarness(true)
+
+    const app = express()
+    app.get('/', payment(mppx.charge, { amount: '1' }), (_req, res) => {
+      res.json({ fortune: 'You will be rich' })
+    })
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
+  })
 })

package/src/middlewares/hono.test.ts

@@ -7,29 +7,33 @@ import { tempo as tempo_server } from 'mppx/server'
 import type { Address } from 'viem'
 import { Addresses } from 'viem/tempo'
 import { beforeAll, describe, expect, test } from 'vp/test'
+import * as Http from '~test/Http.js'
 import { deployEscrow } from '~test/tempo/session.js'
 import { accounts, asset, client, fundAccount } from '~test/tempo/viem.js'
 
 function createServer(app: Hono) {
-  return new Promise<{ url: string; close: () => void }>((resolve) => {
+  return new Promise<Http.TestServer>((resolve) => {
     const server = serve({ fetch: app.fetch, port: 0 }, (info) => {
-      resolve({
-        url: `http://localhost:${info.port}`,
-        close: () => server.close(),
-      })
+      resolve(
+        Http.wrapServer(server as unknown as import('node:http').Server, {
+          port: info.port,
+          url: `http://localhost:${info.port}`,
+        }),
+      )
     })
   })
 }
 
 const secretKey = 'test-secret-key'
 
-describe('charge', () => {
+function createChargeHarness(feePayer: boolean) {
   const mppx = Mppx.create({
     methods: [
       tempo_server.charge({
         getClient: () => client,
         currency: asset,
         account: accounts[0],
+        ...(feePayer ? { feePayer: true } : {}),
       }),
     ],
     secretKey,
@@ -45,7 +49,13 @@ describe('charge', () => {
     ],
   })
 
+  return { fetch, mppx }
+}
+
+describe('charge', () => {
   test('returns 402 when no credential', async () => {
+    const { mppx } = createChargeHarness(false)
+
     const app = new Hono()
     app.get('/', mppx.charge({ amount: '1' }), (c) => c.json({ fortune: 'You will be rich' }))
 
@@ -58,6 +68,8 @@ describe('charge', () => {
   })
 
   test('returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createChargeHarness(false)
+
     const app = new Hono()
     app.get('/', mppx.charge({ amount: '1' }), (c) => c.json({ fortune: 'You will be rich' }))
 
@@ -75,7 +87,23 @@ describe('charge', () => {
     server.close()
   })
 
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createChargeHarness(true)
+
+    const app = new Hono()
+    app.get('/', mppx.charge({ amount: '1' }), (c) => c.json({ fortune: 'You will be rich' }))
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
+  })
+
   test('serves /openapi.json via auto discovery', async () => {
+    const { mppx } = createChargeHarness(false)
+
     const app = new Hono()
     app.get('/', mppx.charge({ amount: '1' }), (c) => c.json({ fortune: 'You will be rich' }))
     discovery(app, mppx, { auto: true, info: { title: 'Auto API', version: '2.0.0' } })
@@ -101,13 +129,7 @@ describe('charge', () => {
 describe('session', () => {
   let escrowContract: Address
 
-  beforeAll(async () => {
-    escrowContract = await deployEscrow()
-    await fundAccount({ address: accounts[2].address, token: Addresses.pathUsd })
-    await fundAccount({ address: accounts[2].address, token: asset })
-  })
-
-  test('returns 402 when no credential', async () => {
+  function createSessionHarness(feePayer: boolean) {
     const mppx = Mppx.create({
       methods: [
         tempo_server.session({
@@ -115,13 +137,39 @@ describe('session', () => {
           account: accounts[0],
           currency: asset,
           escrowContract,
-        }),
+          ...(feePayer ? { feePayer: accounts[1] } : {}),
+        } as any),
       ],
       secretKey,
     })
 
+    const { fetch } = Mppx_client.create({
+      polyfill: false,
+      methods: [
+        sessionIntent({
+          account: accounts[2],
+          deposit: '10',
+          getClient: () => client,
+        }),
+      ],
+    })
+
+    return { fetch, mppx }
+  }
+
+  beforeAll(async () => {
+    escrowContract = await deployEscrow()
+    await fundAccount({ address: accounts[1].address, token: Addresses.pathUsd })
+    await fundAccount({ address: accounts[1].address, token: asset })
+    await fundAccount({ address: accounts[2].address, token: Addresses.pathUsd })
+    await fundAccount({ address: accounts[2].address, token: asset })
+  })
+
+  test('returns 402 when no credential', async () => {
+    const { mppx } = createSessionHarness(false)
+
     const app = new Hono()
-    app.get('/', mppx.session({ amount: '1', unitType: 'token' }), (c) =>
+    app.get('/', mppx.session({ amount: '1', currency: asset, unitType: 'token' }), (c) =>
       c.json({ data: 'streamed' }),
     )
 
@@ -134,32 +182,10 @@ describe('session', () => {
   })
 
   test('returns 200 with receipt on valid payment', async () => {
-    const mppx = Mppx.create({
-      methods: [
-        tempo_server.session({
-          getClient: () => client,
-          account: accounts[0],
-          currency: asset,
-          escrowContract,
-          feePayer: true,
-        }),
-      ],
-      secretKey,
-    })
-
-    const { fetch } = Mppx_client.create({
-      polyfill: false,
-      methods: [
-        sessionIntent({
-          account: accounts[2],
-          deposit: '10',
-          getClient: () => client,
-        }),
-      ],
-    })
+    const { fetch, mppx } = createSessionHarness(false)
 
     const app = new Hono()
-    app.get('/', mppx.session({ amount: '1', unitType: 'token' }), (c) =>
+    app.get('/', mppx.session({ amount: '1', currency: asset, unitType: 'token' }), (c) =>
       c.json({ data: 'streamed' }),
     )
 
@@ -172,4 +198,20 @@ describe('session', () => {
 
     server.close()
   })
+
+  test('fee payer: returns 200 with receipt on valid payment', async () => {
+    const { fetch, mppx } = createSessionHarness(true)
+
+    const app = new Hono()
+    app.get('/', mppx.session({ amount: '1', currency: asset, unitType: 'token' }), (c) =>
+      c.json({ data: 'streamed' }),
+    )
+
+    const server = await createServer(app)
+    const response = await fetch(server.url)
+    expect(response.status).toBe(200)
+    expect(Receipt.fromResponse(response).status).toBe('success')
+
+    server.close()
+  })
 })