Merge pull request #16 from storyofams/fix/manual-response

ggurkal · web-flow · commit 26da90012f73 · 2021-02-11T18:18:53.000+01:00
handle manual res when not returning
diff --git a/lib/internals/handler.ts b/lib/internals/handler.ts
@@ -80,7 +80,7 @@ export function Handler(method?: HttpVerb): MethodDecorator {
 
         const returnValue = await originalHandler.call(this, ...parameters);
 
-        if (returnValue instanceof ServerResponse) {
+        if (returnValue instanceof ServerResponse || res.headersSent) {
           return;
         }
 
@@ -92,8 +92,6 @@ export function Handler(method?: HttpVerb): MethodDecorator {
           res.json(returnValue ?? null);
         }
       } catch (err) {
-        console.error(err);
-
         const statusCode = err instanceof HttpException ? err.statusCode : 500;
         const message = err instanceof HttpException ? err.message : 'An unknown error occurred.';
         const errors = err instanceof HttpException && err.errors?.length ? err.errors : [message];

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export function Handler(method?: HttpVerb): MethodDecorator {`
`80`	`80`
`81`	`81`	`const returnValue = await originalHandler.call(this, ...parameters);`
`82`	`82`
`83`		`- if (returnValue instanceof ServerResponse) {`
	`83`	`+ if (returnValue instanceof ServerResponse \|\| res.headersSent) {`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`	`86`
`@@ -92,8 +92,6 @@ export function Handler(method?: HttpVerb): MethodDecorator {`
`92`	`92`	`res.json(returnValue ?? null);`
`93`	`93`	`}`
`94`	`94`	`} catch (err) {`
`95`		`- console.error(err);`
`96`		`-`
`97`	`95`	`const statusCode = err instanceof HttpException ? err.statusCode : 500;`
`98`	`96`	`const message = err instanceof HttpException ? err.message : 'An unknown error occurred.';`
`99`	`97`	`const errors = err instanceof HttpException && err.errors?.length ? err.errors : [message];`