@nxtedition/http 1.0.1 → 1.0.3

package/lib/index.d.ts

@@ -94,7 +94,7 @@ export declare class Http2ServerResponse extends http2.Http2ServerResponse {
     end(data: string | Uint8Array, encoding: BufferEncoding, callback?: () => void): this;
     destroy(err?: Error): this;
 }
-interface CreateServerOptions extends http.ServerOptions {
+export interface CreateServerOptions extends http.ServerOptions {
     logger?: Logger;
     signal?: AbortSignal;
     socketTimeout?: number;
@@ -102,11 +102,11 @@ interface CreateServerOptions extends http.ServerOptions {
     headersTimeout?: number;
     requestTimeout?: number;
 }
-type ContextFactory = (req: IncomingMessage, res: ServerResponse) => Context;
-type ContextOptions = Record<string, unknown> & {
+export type ContextFactory = (req: IncomingMessage, res: ServerResponse) => Context;
+export type ContextOptions = Record<string, unknown> & {
     logger?: Logger;
 };
-export declare function createServer(ctx: ContextFactory | ContextOptions, middleware?: MiddlewareFn | MiddlewareFn[]): http.Server;
-export declare function createServer(options: CreateServerOptions, ctx: ContextOptions | ContextFactory, middleware?: MiddlewareFn | MiddlewareFn[]): http.Server;
-type MiddlewareFn = (ctx: Context, next: () => unknown) => unknown;
-export declare const compose: (...middleware: (MiddlewareFn | MiddlewareFn[])[]) => MiddlewareFn;
+export declare function createServer(ctx: ContextFactory | ContextOptions, middleware?: Middleware | Middleware[]): http.Server;
+export declare function createServer(options: CreateServerOptions, ctx: ContextOptions | ContextFactory, middleware?: Middleware | Middleware[]): http.Server;
+export type Middleware = (ctx: Context, next: () => void | Promise<void>) => void | Promise<void>;
+export declare const compose: (...middleware: (Middleware | Middleware[])[]) => Middleware;

package/lib/index.js

@@ -932,7 +932,7 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
   }
 }
 
-                                                          
+                                                                 
                  
                       
                         
@@ -941,32 +941,32 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
                          
  
 
-                                                                            
-                                                                   
+                                                                                   
+                                                                          
 
 const httpServers = ((globalThis                                      ).__nxt_lib_http_servers =
   new Array             ())
                              
                                        
-                                             
+                                         
               
                              
                                
                                        
-                                             
+                                         
               
 export function createServer(...args           )              {
   let options                                 
   let ctx                                             
-  let middleware                                           
+  let middleware                                       
 
   if (typeof args[0] === 'function') {
     ctx = args[0]                  
-    middleware = args[1]                                             
+    middleware = args[1]                                         
   } else {
     options = args[0]                                   
     ctx = args[1]                                               
-    middleware = args[2]                                             
+    middleware = args[2]                                         
   }
 
   if (middleware) {
@@ -975,6 +975,8 @@ export function createServer(...args           )              {
       ? middleware
       : [requestMiddleware, ...middleware]
     middleware = compose(middleware)
+  } else {
+    middleware = requestMiddleware
   }
 
   let factory                                                        
@@ -1003,10 +1005,13 @@ export function createServer(...args           )              {
       requestTimeout: 48 * 60e3,
       ...options,
     },
-    (req, res) =>
-      middleware
-        ? middleware(factory(req                   , res                  ), noop)
-        : factory(req                   , res                  ),
+    (req, res) => {
+      const ret = middleware(factory(req                   , res                  ), noop)
+      ret?.catch((err) => {
+        res.on('error', noop)
+        res.destroy(err         )
+      })
+    },
   )
 
   server.setTimeout(options?.socketTimeout ?? 2 * 60e3)
@@ -1022,19 +1027,19 @@ export function createServer(...args           )              {
   return server
 }
 
-                                                                  
+                                                                                                 
 
 const composeSlim =
-  (middleware                )               =>
+  (middleware              )             =>
   (ctx, next) => {
-    const dispatch = (i        ) => ()          => {
+    const dispatch = (i        ) => ()                       => {
       const fn = i === middleware.length ? next : middleware[i]
       return fn ? fn(ctx, dispatch(i + 1)) : undefined
     }
     return dispatch(0)()
   }
 
-export const compose = (...middleware                                   )               => {
+export const compose = (...middleware                               )             => {
   const funcs = middleware.flat()
 
   for (const fn of funcs) {
@@ -1047,8 +1052,8 @@ export const compose = (...middleware                                   )
     return composeSlim(funcs)
   }
 
-  return async (ctx         , next                = noop) => {
-    const dispatch = async (i        )                   => {
+  return async (ctx         , next                             = noop) => {
+    const dispatch = async (i        )                => {
       const fn = i === funcs.length ? next : funcs[i]
       if (!fn) {
         return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/http",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,5 +32,5 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   },
-  "gitHead": "9cff555aa7e0481dccf43c3c030ecfcab8595235"
+  "gitHead": "be57f23ab8b0c6d10e8a5d600e0d5f15a9e209d5"
 }