galbe 0.1.7 → 0.1.13

package/src/types.ts

@@ -72,6 +72,7 @@ export type GalbeConfig = {
   basePath?: string
   server?: Exclude<ServeOptions, 'port'> | TLSServeOptions
   routes?: boolean | string | string[]
+  router?: { cacheEnabled: boolean }
   plugin?: Record<string, any>
 }
 /**
@@ -129,7 +130,6 @@ export type Context<Path extends string = string, S extends RequestSchema = Requ
       [header: string]: string
     }
     status?: number
-    redirect?: string
   }
 }
 export type Next = () => void | Promise<void>
@@ -146,7 +146,7 @@ export type Endpoint = {
     H extends STHeaders,
     P extends Partial<STParams<Path>>,
     Q extends STQuery,
-    B extends STBody = STObject
+    B extends STBody = any
   >(
     path: Path,
     schema: RequestSchema<Path, H, P, Q, B>,
@@ -158,7 +158,7 @@ export type Endpoint = {
     H extends STHeaders,
     P extends Partial<STParams<Path>>,
     Q extends STQuery,
-    B extends STBody = STObject
+    B extends STBody = any
   >(
     path: Path,
     schema: RequestSchema<Path, H, P, Q, B>,
@@ -169,7 +169,7 @@ export type Endpoint = {
     H extends STHeaders,
     P extends Partial<STParams<Path>>,
     Q extends STQuery,
-    B extends STBody = STObject
+    B extends STBody = any
   >(
     path: Path,
     hooks: Hook<Path, RequestSchema<Path, H, P, Q, B>>[],
@@ -180,7 +180,7 @@ export type Endpoint = {
     H extends STHeaders,
     P extends Partial<STParams<Path>>,
     Q extends STQuery,
-    B extends STBody = STObject
+    B extends STBody = any
   >(
     path: Path,
     handler: Handler<Path, RequestSchema<Path, H, P, Q, B>>
@@ -189,10 +189,10 @@ export type Endpoint = {
 
 export class RequestError {
   status: number
-  error: any
-  constructor(options: { status?: number; error?: any }) {
+  payload: any
+  constructor(options: { status?: number; payload?: any }) {
     this.status = options.status ?? 500
-    this.error = options.error ?? 'Internal server error'
+    this.payload = options.payload ?? 'Internal server error'
   }
 }
 
@@ -225,7 +225,13 @@ export type RouteTree = {
 
 export class NotFoundError extends RequestError {
   constructor(message?: string) {
-    super({ status: 404, error: message ?? 'Not found' })
+    super({ status: 404, payload: message ?? 'Not found' })
+  }
+}
+
+export class InternalError extends RequestError {
+  constructor(message?: string) {
+    super({ status: 500, payload: message ?? 'Internal Server Error' })
   }
 }
 

package/test/hooks.test.ts

@@ -174,4 +174,27 @@ describe('hooks', async () => {
     expect(resp.status).toBe(200)
     expect(await resp?.text()).toBe('handled')
   })
+
+  test('hooks, early response', async () => {
+    let hook = 0
+    galbe.get(
+      '/hooks',
+      [
+        async _ => {
+          hook++
+          return 'hook'
+        }
+      ],
+      () => {
+        expect.unreachable()
+      }
+    )
+    expect(hook).toBe(0)
+    let resp = await fetch(`http://localhost:${port}/hooks`, {
+      method: 'GET'
+    })
+    expect(hook).toBe(1)
+    expect(resp.status).toBe(200)
+    expect(await resp?.text()).toBe('hook')
+  })
 })

package/test/router.test.ts

@@ -141,7 +141,7 @@ describe('router', () => {
     } catch (err: any) {
       expect(err).toBeInstanceOf(NotFoundError)
       expect(err.status).toBe(404)
-      expect(err.error).toBe('Not found')
+      expect(err.payload).toBe('Not found')
     }
 
     try {
@@ -150,7 +150,7 @@ describe('router', () => {
     } catch (err: any) {
       expect(err).toBeInstanceOf(NotFoundError)
       expect(err.status).toBe(404)
-      expect(err.error).toBe('Not found')
+      expect(err.payload).toBe('Not found')
     }
   })
 
@@ -188,10 +188,6 @@ describe('router', () => {
     expect(r1.path).toBe('/test/foo/*')
     expect(r1.handler).toBe(h1)
 
-    let r2 = router.find('GET', '/test//foo/bar')
-    expect(r2.path).toBe('/test/foo/bar')
-    expect(r2.handler).toBe(h2)
-
     let r3 = router.find('GET', '/test/foo/bar/bar')
     expect(r3.path).toBe('/test/foo/:p/bar')
     expect(r3.handler).toBe(h3)