fix: Improve error handling

TheCommieAxolotl · Aug 16, 2023 · fdbb444 · fdbb444
1 parent 176b6e6
commit fdbb444
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 23 deletions.
diff --git a/src/app/index.ts b/src/app/index.ts
@@ -2,9 +2,9 @@ import { App, AppDetails } from "../types";
 
 import { Server } from "node:http";
 
+import { ANSI, color } from "../util/logger";
 import { Route } from "../router/route";
 import { startServer } from "./server";
-import { color } from "../util/logger";
 import { use } from "./use";
 
 /**
@@ -23,7 +23,7 @@ export const app = (options: number | Server, log = true): App => {
     const attach = (route: Route): boolean => {
         _routes.add(route);
 
-        if (log) console.log(` - ${color(route.path, "blue")}`);
+        if (log) console.log(` - ${color(route.path, ANSI.blue)}`);
 
         return true;
     };

diff --git a/src/app/server.ts b/src/app/server.ts
@@ -2,8 +2,8 @@ import { App } from "../types";
 
 import https, { Server } from "node:http";
 
+import { ANSI, log } from "../util/logger";
 import { handleRequest } from "../router";
-import { log } from "../util/logger";
 
 export const startServer = (app: Partial<App>, doLog = true) => {
     let server: Server;
@@ -23,18 +23,18 @@ export const startServer = (app: Partial<App>, doLog = true) => {
     if (doLog) {
         log(
             `Listening${app.details["port"] ? ` on http://localhost:${app.details["port"]}/` : " to Server"}`,
-            "magenta"
+            ANSI.magenta
         );
-        log(`Press Ctrl+C to exit process.`, "yellow");
+        log(`Press Ctrl+C to exit process.`, ANSI.yellow);
         log("");
-        log("Page Routes", "bold");
+        log("Page Routes", ANSI.bold);
     }
 
     return () => {
         return new Promise<boolean>((resolve) => {
             if (server.listening) {
                 server.close(() => {
-                    if (doLog) log("Server closed.", "red");
+                    if (doLog) log("Server closed.", ANSI.red);
 
                     resolve(true);
                 });

diff --git a/src/aura/common.ts b/src/aura/common.ts
@@ -1,3 +1,5 @@
+import { log } from "../util/logger";
+
 export type MIME =
     | "text/html"
     | "application/json"
@@ -27,11 +29,30 @@ export type ResponseData = {
     headers?: Record<string, string>;
 };
 
-const make = (type: MIME, content: string | TemplateStringsArray): ResponseData => ({
-    type,
-    content: String(content),
-    status: 200,
-});
+const make = (type: MIME, content: string | TemplateStringsArray | []): ResponseData => {
+    if (Array.isArray(content))
+        return {
+            type: "text/plain",
+            content: "Uncaught server error",
+            status: 500,
+        };
+
+    try {
+        return {
+            type,
+            content: String(content),
+            status: 200,
+        };
+    } catch (e) {
+        log(e as Error);
+
+        return {
+            type: "text/plain",
+            content: "Uncaught server error",
+            status: 500,
+        };
+    }
+};
 
 export const error = (status: number, content: string | TemplateStringsArray) => ({
     type: "text/plain",
@@ -52,7 +73,17 @@ export const html = (content: string | TemplateStringsArray) => make("text/html"
  * Create a response object for JSON content.
  */
 export const json = (content: object | string | TemplateStringsArray) =>
-    make("application/json", typeof content === "string" ? content : JSON.stringify(content));
+    make(
+        "application/json",
+        (() => {
+            try {
+                return typeof content === "string" ? content : JSON.stringify(content);
+            } catch (e) {
+                log(e as Error);
+                return [];
+            }
+        })()
+    );
 /**
  * Create a response object for plaintext content.
  */

diff --git a/src/util/logger.ts b/src/util/logger.ts
@@ -1,4 +1,4 @@
-export enum ASCII {
+export enum ANSI {
     reset = "\x1b[0m",
     bold = "\x1b[1m",
     dim = "\x1b[2m",
@@ -24,34 +24,38 @@ export enum ASCII {
     bg_white = "\x1b[47m",
 }
 
-export const log = (message: string, ...colors: (keyof typeof ASCII)[]): void => {
+export const log = (message: string | Error, ...colors: ANSI[]): void => {
+    if (message instanceof Error) {
+        message = `\n${color(" ERROR ", ANSI.bg_red)} ${message.message}`;
+    }
+
     console.log(
         colors
             .map((color) => {
-                if (color.toLowerCase() in ASCII) {
-                    return ASCII[color.toLowerCase()];
+                if (color.toLowerCase() in ANSI) {
+                    return ANSI[color.toLowerCase()];
                 } else {
                     return color;
                 }
             })
             .join("") +
             message +
-            ASCII.reset
+            ANSI.reset
     );
 };
 
-export const color = (message: string, ...colors: string[]): string => {
+export const color = (message: string, ...colors: ANSI[]): string => {
     return (
         colors
             .map((color) => {
-                if (color.toLowerCase() in ASCII) {
-                    return ASCII[color.toLowerCase()];
+                if (color.toLowerCase() in ANSI) {
+                    return ANSI[color.toLowerCase()];
                 } else {
                     return color;
                 }
             })
             .join("") +
         message +
-        ASCII.reset
+        ANSI.reset
     );
 };
diff --git a/test/standalone.run.js b/test/standalone.run.js
@@ -7,7 +7,13 @@ server.attach(route("/", () => html`<h1>Hello World</h1>`));
 server.attach(route("/json", () => json({ hello: "world" })));
 
 server.attach(
-    route("/[path]", () => {
+    route("/path/[e]", (e) => {
+        return json(e);
+    })
+);
+
+server.attach(
+    route("/[...404]", () => {
         return status(404);
     })
 );