fix: fix global error handling for ServerExceptions

momentumframework · Feb 23, 2021 · 350cd59 · 350cd59
1 parent 03095d3
commit 350cd59
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/core/mv-middleware.ts b/core/mv-middleware.ts
@@ -1,3 +1,5 @@
+import { ContextAccessor } from "./context-accessor.ts";
+
 export type NextMiddlewareFunction = () => Promise<void>;
 
 /**
@@ -7,5 +9,8 @@ export type NextMiddlewareFunction = () => Promise<void>;
  * Middleware will be executed immediately before a request is processed.
  */
 export interface MvMiddleware {
-  execute(context: unknown, next: NextMiddlewareFunction): Promise<void>;
+  execute(
+    context: ContextAccessor,
+    next: NextMiddlewareFunction,
+  ): Promise<void>;
 }
diff --git a/core/server-controller.ts b/core/server-controller.ts
@@ -246,6 +246,7 @@ export class ServerController {
           },
           parameterMetadatas?.map((parameterMetadata) => ({
             index: parameterMetadata.index,
+            name: parameterMetadata.name,
             type: parameterMetadata.type,
           })),
         );
@@ -255,15 +256,6 @@ export class ServerController {
 
   private async handleError(err: unknown, contextAccessor: ContextAccessor) {
     this.#logger.error(err, "An unhandled exception occurred");
-    for (const handler of this.getGlobalErrorHandlers()) {
-      try {
-        const result = await handler(err, contextAccessor);
-        if (result && result.handled) {
-          return;
-        }
-        // deno-lint-ignore no-empty
-      } catch {}
-    }
     if (err instanceof ServerException) {
       try {
         let content: string;
@@ -283,6 +275,15 @@ export class ServerController {
         // deno-lint-ignore no-empty
       } catch {}
     }
+    for (const handler of this.getGlobalErrorHandlers()) {
+      try {
+        const result = await handler(err, contextAccessor);
+        if (result && result.handled) {
+          return;
+        }
+        // deno-lint-ignore no-empty
+      } catch {}
+    }
     contextAccessor.setBody("An unknown error occurred");
     contextAccessor.setHeader("Content-Type", "text/plain");
     contextAccessor.setStatus(500);