Fixed error handling

Author: nora-soderlund

src/index.ts

@@ -1,6 +1,5 @@
 import { triggerAlarm } from "./controllers/alarms/triggerAlarm";
 import createRouter from "./domains/router";
-import D1Error from "./models/D1Error";
 
 const router = createRouter();
 
@@ -22,33 +21,32 @@ export default {
         try {
             const response = await getRequest(request, env, context);
 
-            if(response.status >= 200 && response.status <= 299) { 
-                response.headers.set("Access-Control-Allow-Origin", "*");
-                response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
-                response.headers.set("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization");
-            }
-            else
-                context.waitUntil(new Promise(async (resolve) => {
+            if(response.status < 200 || response.status > 299) { 
+                context.waitUntil(new Promise<void>(async (resolve) => {
                     const text = await response.text();
 
-                    if(text.length)
-                        await triggerAlarm(env, "Unsuccessful Status Code Alarm", `A response has returned an unsuccessfull status code.\n \n\`\`\`\n${response.status} ${response.statusText}\n\`\`\`\`\`\`\n${text}\n\`\`\`\n${request.method} ${request.url}\nRemote Address: || ${request.headers.get("CF-Connecting-IP")} ||`);
-                    else
-                        await triggerAlarm(env, "Unsuccessful Status Code Alarm", `A response has returned an unsuccessfull status code.\n \n\`\`\`\n${response.status} ${response.statusText}\n\`\`\`\n${request.method} ${request.url}\nRemote Address: || ${request.headers.get("CF-Connecting-IP")} ||`);
+                    await triggerAlarm(env, "Unsuccessful Status Code Alarm", `A response has returned an unsuccessfull status code.\n \n\`\`\`\n${response.status} ${response.statusText}\n\`\`\`${(text.length)?(`\`\`\`\n${text}\n\`\`\``):("")}\n${request.method} ${request.url}\nRemote Address: || ${request.headers.get("CF-Connecting-IP")} ||`);
+             
+                    resolve();
                 }));
+            }
+
+            response.headers.set("Access-Control-Allow-Origin", "*");
+            response.headers.set("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
+            response.headers.set("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization");
 
             return response;
         }
         catch(error: any) {
-            if((error as Error).message.startsWith("D1_")) {
-                const d1Error: D1Error = error;
-
-                context.waitUntil(triggerAlarm(env, "D1 Error Alarm", `An error was thrown by D1 during execution.\n \n\`\`\`\n${d1Error.message}\n\`\`\`\`\`\`\n${d1Error.cause.message}\n\`\`\`\n${request.method} ${request.url}\nRemote Address: || ${request.headers.get("CF-Connecting-IP")} ||`));
-            
-                return new Response(undefined, {
-                    status: 502,
-                    statusText: "Bad Gateway"
-                });
+            if(error instanceof Error) {
+                if(error.message.startsWith("D1_") && error.cause instanceof Error) {
+                    context.waitUntil(triggerAlarm(env, "D1 Error Alarm", `An error was thrown by D1 during execution.\n \n\`\`\`\n${error.message}\n\`\`\`\`\`\`\n${error.cause.message}\n\`\`\`\n${request.method} ${request.url}\nRemote Address: || ${request.headers.get("CF-Connecting-IP")} ||`));
+                
+                    return new Response(undefined, {
+                        status: 502,
+                        statusText: "Bad Gateway"
+                    });
+                }
             }
 
             context.waitUntil(triggerAlarm(env, "Uncaught Error Alarm", `An uncaught error was thrown during a response.\n \n\`\`\`\n${error}\n\`\`\`\n${request.method} ${request.url}\nRemote Address: || ${request.headers.get("CF-Connecting-IP")} ||`));

src/models/D1Error.ts

@@ -11,9 +11,9 @@
 		// "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
 		/* Language and Environment */
-		"target": "es2020" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
+		"target": "ES2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
 		"lib": [
-			"es2020"
+			"ES2022"
 		] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
 		// "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
 		// "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */