@nxtedition/http 1.0.0 → 1.0.2

package/lib/index.d.ts

@@ -108,5 +108,5 @@ type ContextOptions = Record<string, unknown> & {
 };
 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;
+type MiddlewareFn = (ctx: Context, next: () => void | Promise<void>) => void | Promise<void>;
 export declare const compose: (...middleware: (MiddlewareFn | MiddlewareFn[])[]) => MiddlewareFn;

package/lib/index.js

@@ -220,10 +220,10 @@ export async function upgradeMiddleware(
       reqLogger?.debug({ req }, 'request started')
     }
 
-    const thenable = next()
+    const thenable = next()                      
 
-    if (Object.hasOwnProperty.call(thenable, 'then')) {
-      await thenable
+    if (thenable?.then) {
+      await (thenable                 )
     }
 
     if (!socket.destroyed && !socket.writableEnded) {
@@ -323,7 +323,11 @@ export async function requestMiddleware(
       r._read()
     }
 
-    await next()
+    const thenable = next()                      
+
+    if (thenable?.then) {
+      await (thenable                 )
+    }
 
     if (!res.destroyed && !res.writableEnded) {
       throw new Error('Response not completed')
@@ -971,6 +975,8 @@ export function createServer(...args           )              {
       ? middleware
       : [requestMiddleware, ...middleware]
     middleware = compose(middleware)
+  } else {
+    middleware = requestMiddleware
   }
 
   let factory                                                        
@@ -999,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)
@@ -1018,12 +1027,12 @@ export function createServer(...args           )              {
   return server
 }
 
-                                                                  
+                                                                                            
 
 const composeSlim =
   (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
     }
@@ -1043,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.0",
+  "version": "1.0.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,5 +32,5 @@
     "rimraf": "^6.1.2",
     "typescript": "^5.9.3"
   },
-  "gitHead": "64c1bd97cf9a785ca4a750b5380418878cbed2d2"
+  "gitHead": "37c6127808e4ed12b94810c04dc9788afaad7222"
 }