avoid errors when middleware isn't in desired shape & make middleware optional & rename onRequestFn back to onRequest

Author: huseeiin

packages/start/src/middleware/index.ts

@@ -14,11 +14,11 @@ export type ResponseMiddleware = (
   response: Response,
 ) => ReturnType<Parameters<typeof onResponse>[0]>;
 
-function wrapRequestMiddleware(onRequestFn: RequestMiddleware) {
+function wrapRequestMiddleware(onRequest: RequestMiddleware) {
   return async (h3Event: H3Event) => {
     // h3 onRequest doesn't allow returning a response, but we will for backwards compatibility with start v1
     const fetchEvent = getFetchEvent(h3Event);
-    const response = await onRequestFn(fetchEvent);
+    const response = await onRequest(fetchEvent);
     if (response) return response;
   };
 }
@@ -32,13 +32,14 @@ function wrapResponseMiddleware(onBeforeResponse: ResponseMiddleware): Middlewar
 }
 
 export function createMiddleware(
-  args:
+  args?:
     | {
         onRequest?: RequestMiddleware | RequestMiddleware[] | undefined;
         onBeforeResponse?: ResponseMiddleware | ResponseMiddleware[] | undefined;
       }
     | Middleware[],
 ): Middleware[] {
+  if (!args) return [];
   if (Array.isArray(args)) return args;
 
   const mw: Middleware[] = [];

packages/start/src/server/handler.ts

@@ -21,7 +21,7 @@ export function createBaseHandler(
   options: HandlerOptions | ((context: PageEvent) => HandlerOptions | Promise<HandlerOptions>) = {},
 ) {
   const handler = defineHandler({
-    middleware: middleware.length ? middleware.map(decorateMiddleware) : undefined,
+    middleware: middleware?.length ? middleware.map(decorateMiddleware) : undefined,
     handler: decorateHandler(async (e: H3Event) => {
       const event = getRequestEvent()!;
       const url = new URL(event.request.url);

packages/start/src/virtual.d.ts

@@ -23,5 +23,5 @@ declare module "solid-start:app" {
 
 declare module "solid-start:middleware" {
   type MaybeArray<T> = T | Array<T>;
-  export default Middleware as import("h3").Middleware[];
+  export default Middleware as import("h3").Middleware[] | undefined;
 }