tempo.ts 0.7.0 → 0.7.2

package/src/server/Handler.test.ts

@@ -1,3 +1,4 @@
+import { Elysia } from 'elysia'
 import express from 'express'
 import { Hono } from 'hono'
 import type { RpcRequest } from 'ox'
@@ -20,6 +21,210 @@ import { withFeePayer } from '../viem/Transport.js'
 import * as Handler from './Handler.js'
 import * as Kv from './Kv.js'
 
+describe('compose', () => {
+  test('default', async () => {
+    const handler1 = Handler.from()
+    handler1.get('/test', () => new Response('test'))
+    const handler2 = Handler.from()
+    handler2.get('/test2', () => new Response('test2'))
+
+    const handler = Handler.compose([handler1, handler2])
+    expect(handler).toBeDefined()
+
+    {
+      const response = await handler.fetch(new Request('http://localhost/test'))
+      expect(response.status).toBe(200)
+      expect(await response.text()).toBe('test')
+    }
+
+    {
+      const response = await handler.fetch(
+        new Request('http://localhost/test2'),
+      )
+      expect(response.status).toBe(200)
+      expect(await response.text()).toBe('test2')
+    }
+  })
+
+  test('behavior: path', async () => {
+    const handler1 = Handler.from()
+    handler1.get('/test', () => new Response('test'))
+    const handler2 = Handler.from()
+    handler2.get('/test2', () => new Response('test2'))
+
+    const handler = Handler.compose([handler1, handler2], {
+      path: '/api',
+    })
+    expect(handler).toBeDefined()
+
+    {
+      const response = await handler.fetch(
+        new Request('http://localhost/api/test'),
+      )
+      expect(response.status).toBe(200)
+      expect(await response.text()).toBe('test')
+    }
+
+    {
+      const response = await handler.fetch(
+        new Request('http://localhost/api/test2'),
+      )
+      expect(response.status).toBe(200)
+      expect(await response.text()).toBe('test2')
+    }
+  })
+
+  describe('integration', () => {
+    const handler1 = Handler.from()
+    handler1.get('/foo', () => new Response('foo'))
+    handler1.post('/bar', () => new Response('bar'))
+
+    const handler2 = Handler.from()
+    handler2.get('/baz', () => new Response('baz'))
+    handler2.post('/qux', () => new Response('qux'))
+
+    const handler = Handler.compose([handler1, handler2], {
+      path: '/api',
+    })
+
+    test('hono', async () => {
+      const app = new Hono()
+      app.use((c) => handler.fetch(c.req.raw))
+
+      {
+        const response = await app.request('/api/foo')
+        expect(await response.text()).toBe('foo')
+      }
+
+      {
+        const response = await app.request('/api/bar', {
+          method: 'POST',
+        })
+        expect(await response.text()).toBe('bar')
+      }
+
+      {
+        const response = await app.request('/api/baz', {
+          method: 'GET',
+        })
+        expect(await response.text()).toBe('baz')
+      }
+
+      {
+        const response = await app.request('/api/qux', {
+          method: 'POST',
+        })
+        expect(await response.text()).toBe('qux')
+      }
+    })
+
+    test('elysia', async () => {
+      const app = new Elysia().all('*', ({ request }) => handler.fetch(request))
+
+      {
+        const response = await app.handle(
+          new Request('http://localhost/api/foo'),
+        )
+        expect(await response.text()).toBe('foo')
+      }
+
+      {
+        const response = await app.handle(
+          new Request('http://localhost/api/bar', {
+            method: 'POST',
+          }),
+        )
+        expect(await response.text()).toBe('bar')
+      }
+
+      {
+        const response = await app.handle(
+          new Request('http://localhost/api/baz', {
+            method: 'GET',
+          }),
+        )
+        expect(await response.text()).toBe('baz')
+      }
+
+      {
+        const response = await app.handle(
+          new Request('http://localhost/api/qux', {
+            method: 'POST',
+          }),
+        )
+        expect(await response.text()).toBe('qux')
+      }
+    })
+
+    test('node.js', async () => {
+      const server = await createServer(handler.listener)
+
+      {
+        const response = await fetch(`${server.url}/api/foo`)
+        expect(await response.text()).toBe('foo')
+      }
+
+      {
+        const response = await fetch(`${server.url}/api/bar`, {
+          method: 'POST',
+        })
+        expect(await response.text()).toBe('bar')
+      }
+
+      {
+        const response = await fetch(`${server.url}/api/baz`, {
+          method: 'GET',
+        })
+        expect(await response.text()).toBe('baz')
+      }
+
+      {
+        const response = await fetch(`${server.url}/api/qux`, {
+          method: 'POST',
+        })
+        expect(await response.text()).toBe('qux')
+      }
+
+      await server.closeAsync()
+    })
+
+    test('express', async () => {
+      const app = express()
+      app.use(handler.listener)
+
+      const server = await createServer(app)
+
+      {
+        const response = await fetch(`${server.url}/api/foo`)
+        expect(await response.text()).toBe('foo')
+      }
+
+      {
+        const response = await fetch(`${server.url}/api/bar`, {
+          method: 'POST',
+        })
+        expect(await response.text()).toBe('bar')
+      }
+
+      {
+        const response = await fetch(`${server.url}/api/baz`, {
+          method: 'GET',
+        })
+        expect(await response.text()).toBe('baz')
+      }
+
+      {
+        const response = await fetch(`${server.url}/api/qux`, {
+          method: 'POST',
+        })
+        expect(await response.text()).toBe('qux')
+      }
+
+      await server.closeAsync()
+    })
+  })
+})
+
 describe('from', () => {
   test('default', () => {
     const handler = Handler.from()
@@ -73,6 +278,24 @@ describe('from', () => {
       }
     })
 
+    test('elysia', async () => {
+      const app = new Elysia().all('*', ({ request }) => handler.fetch(request))
+
+      {
+        const response = await app.handle(new Request('http://localhost/foo'))
+        expect(await response.text()).toBe('foo')
+      }
+
+      {
+        const response = await app.handle(
+          new Request('http://localhost/bar', {
+            method: 'POST',
+          }),
+        )
+        expect(await response.text()).toBe('bar')
+      }
+    })
+
     test('node.js', async () => {
       const server = await createServer(handler.listener)
 

package/src/server/Handler.ts

@@ -1,4 +1,8 @@
-import { createRouter, type Router } from '@remix-run/fetch-router'
+import {
+  createRouter,
+  type Router,
+  type RouterOptions,
+} from '@remix-run/fetch-router'
 import { RpcRequest, RpcResponse } from 'ox'
 import * as Base64 from 'ox/Base64'
 import * as Hex from 'ox/Hex'
@@ -16,14 +20,44 @@ export type Handler = Router & {
   listener: (req: any, res: any) => void
 }
 
+export function compose(
+  handlers: Handler[],
+  options: compose.Options = {},
+): Handler {
+  const path = options.path ?? '/'
+
+  return from({
+    async defaultHandler(context) {
+      const url = new URL(context.request.url)
+      if (!url.pathname.startsWith(path))
+        return new Response('Not Found', { status: 404 })
+
+      url.pathname = url.pathname.replace(path, '')
+      for (const handler of handlers) {
+        const request = new Request(url, context.request.clone())
+        const response = await handler.fetch(request)
+        if (response.status !== 404) return response
+      }
+      return new Response('Not Found', { status: 404 })
+    },
+  })
+}
+
+export declare namespace compose {
+  export type Options = {
+    /** The path to use for the handler. */
+    path?: string | undefined
+  }
+}
+
 /**
  * Instantiates a new request handler.
  *
  * @param options - constructor options
  * @returns Handler instance
  */
-export function from(): Handler {
-  const router = createRouter()
+export function from(options: from.Options = {}): Handler {
+  const router = createRouter(options)
   return {
     ...router,
     listener: RequestListener.fromFetchHandler((request) => {
@@ -32,6 +66,10 @@ export function from(): Handler {
   }
 }
 
+export declare namespace from {
+  export type Options = RouterOptions
+}
+
 /**
  * Defines a Key Manager request handler.
  *