Clean up

ije · ije · commit 5675123a4177 · 2022-05-07T20:47:31.000+08:00
diff --git a/server/build.ts b/server/build.ts
@@ -26,6 +26,13 @@ const supportedPlatforms: Record<BuildPlatform, string> = {
   "vercel": "Vercel",
 };
 
+/**
+ * Build the app into a worker for serverless platform. Functions include:
+ * - import routes modules (since deno deploy/clouflare don't support dynamic import)
+ * - resolve import maps
+ * - pre-compile client modules
+ * - bundle client modules
+ */
 export async function build(serverEntry?: string) {
   const workingDir = Deno.cwd();
   const alephPkgUri = getAlephPkgUri();
@@ -50,6 +57,7 @@ export async function build(serverEntry?: string) {
     await Deno.mkdir(outputDir, { recursive: true });
   }
 
+  // find route files by the `routes` config
   let routeFiles: [filename: string, exportNames: string[]][] = [];
   if (config?.routes) {
     const { routes } = await initRoutes(config?.routes);
@@ -140,6 +148,7 @@ export async function build(serverEntry?: string) {
     );
   };
 
+  // check if the url is esm.sh package
   const isEsmPkg = (url: string) => {
     return url.startsWith("https://esm.sh/") && !url.endsWith(".js") && !url.endsWith(".css");
   };
@@ -236,6 +245,7 @@ export async function build(serverEntry?: string) {
     }],
   });
 
+  // get depndency graph
   const serverDependencyGraph: DependencyGraph | undefined = Reflect.get(globalThis, "serverDependencyGraph");
   const clientDependencyGraph: DependencyGraph | undefined = Reflect.get(globalThis, "clientDependencyGraph");
 
diff --git a/server/error.ts b/server/error.ts
@@ -1,28 +1,30 @@
 const regStackLoc = /(http:\/\/localhost:60\d{2}\/.+)(:\d+:\d+)/;
 
-export const errorHtml = (message: string, prefix?: string): string => {
-  return errorTemplate(
-    message.split("\n").map((line, i) => {
-      const ret = line.match(regStackLoc);
-      if (ret) {
-        const url = new URL(ret[1]);
-        line = line.replace(ret[0], `.${url.pathname}${ret[2]}`);
-      }
-      if (i === 0 && prefix) {
-        return `<strong>${prefix} ${line}</strong>`;
-      }
-      return line;
-    }).join("\n"),
-  );
+export const errorHtml = (message: string, type?: string): string => {
+  const formatMessage = message.split("\n").map((line, i) => {
+    const ret = line.match(regStackLoc);
+    if (ret) {
+      const url = new URL(ret[1]);
+      line = line.replace(ret[0], `.${url.pathname}${ret[2]}`);
+    }
+    if (i === 0) {
+      if (type) {
+        return `<strong>${type} ${line}</strong>`;
+      }
+      return `<strong>${line}</strong>`;
+    }
+    return line;
+  }).join("\n");
+  return errorTemplate(formatMessage, type);
 };
 
-const errorTemplate = (message: string) => `
+const errorTemplate = (message: string, type?: string) => `
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>SSR Error - Aleph.js</title>
+    <title>${type} Error - Aleph.js</title>
     <style>
       body {
         overflow: hidden;
diff --git a/server/mod.ts b/server/mod.ts
@@ -55,10 +55,14 @@ export const serve = (options: ServerOptions = {}) => {
     const url = new URL(req.url);
     const { host, pathname, searchParams } = url;
 
+    // close the hot-reloading websocket connection and tell the client to reload
     if (pathname === "/-/hmr") {
       const { socket, response } = Deno.upgradeWebSocket(req, {});
       socket.addEventListener("open", () => {
         socket.send(JSON.stringify({ type: "reload" }));
+        setTimeout(() => {
+          socket.close();
+        }, 50);
       });
       return response;
     }
