Support any fetcher for data fetching

ije · ije · commit 085b9b77f8f3 · 2022-04-30T19:25:01.000+08:00
diff --git a/server/error.ts b/server/error.ts
@@ -0,0 +1,81 @@
+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"),
+  );
+};
+
+const errorTemplate = (message: string) => `
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>SSR Error - Aleph.js</title>
+    <style>
+      body {
+        overflow: hidden;
+      }
+      .error {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100vw;
+        height: 100vh;
+      }
+      .error .box {
+        box-sizing: border-box;
+        position: relative;
+        max-width: 80%;
+        max-height: 90%;
+        overflow: auto;
+        padding: 24px 36px;
+        border-radius: 12px;
+        border: 2px solid rgba(255, 0, 0, 0.8);
+        background-color: rgba(255, 0, 0, 0.1);
+        color: rgba(255, 0, 0, 1);
+      }
+      .error .logo {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        margin-top: -45px;
+        margin-left: -45px;
+        opacity: 0.1;
+      }
+      .error pre {
+        position: relative;
+        line-height: 1.4;
+      }
+      .error code {
+        font-size: 14px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="error">
+      <div class="box">
+        <div class="logo">
+          <svg width="90" height="90" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M52.9528 11.1C54.0959 11.1 55.1522 11.7097 55.7239 12.6995C68.5038 34.8259 81.2837 56.9524 94.0636 79.0788C94.642 80.0802 94.6355 81.316 94.0425 82.3088C93.0466 83.9762 92.028 85.6661 91.0325 87.3331C90.4529 88.3035 89.407 88.9 88.2767 88.9C62.7077 88.9 37.0519 88.9 11.4828 88.9C10.3207 88.9 9.25107 88.2693 8.67747 87.2586C7.75465 85.6326 6.81025 84.0065 5.88797 82.3805C5.33314 81.4023 5.34422 80.2041 5.90662 79.2302C18.6982 57.0794 31.4919 34.8415 44.3746 12.6907C44.9474 11.7058 46.0009 11.1 47.1402 11.1C49.0554 11.1 51.0005 11.1 52.9528 11.1Z" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linejoin="round"/>
+            <path d="M28.2002 72.8H80.8002L45.8187 12.5494" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+            <path d="M71.4999 72.7L45.1999 27.2L10.6519 87.1991" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+            <path d="M49.8 35.3L23.5 80.8H93.9333" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+          </svg>
+        </div>
+        <pre><code>${message}</code></pre>
+      </div>
+    </div>
+  </body>
+</html>
+`;
diff --git a/server/mod.ts b/server/mod.ts
@@ -5,10 +5,10 @@ import { getContentType } from "../lib/mime.ts";
 import type { Routes } from "../lib/route.ts";
 import util from "../lib/util.ts";
 import { VERSION } from "../version.ts";
+import { errorHtml } from "./error.ts";
 import { getDeploymentId, initModuleLoaders, loadImportMap, loadJSXConfig } from "./helpers.ts";
-import { loadAndFixIndexHtml } from "./html.ts";
-import type { HTMLRewriterHandlers, SSR } from "./renderer.ts";
-import renderer from "./renderer.ts";
+import { type HTMLRewriterHandlers, loadAndFixIndexHtml } from "./html.ts";
+import renderer, { type SSR } from "./renderer.ts";
 import { content, type CookieOptions, json, setCookieHeader } from "./response.ts";
 import { importRouteModule, initRoutes, revive } from "./routing.ts";
 import clientModuleTransformer from "./transformer.ts";
@@ -67,7 +67,7 @@ export const serve = (options: ServerOptions = {}) => {
       } catch (err) {
         if (!(err instanceof Deno.errors.NotFound)) {
           log.error(err);
-          return onError?.(err) ?? new Response(err.message, { status: 500 });
+          return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });
         }
       }
     }
@@ -94,7 +94,7 @@ export const serve = (options: ServerOptions = {}) => {
       } catch (err) {
         if (!(err instanceof Deno.errors.NotFound)) {
           log.error(err);
-          return onError?.(err) ?? new Response(err.message, { status: 500 });
+          return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });
         }
       }
     }
@@ -131,7 +131,7 @@ export const serve = (options: ServerOptions = {}) => {
       } catch (err) {
         if (!(err instanceof Deno.errors.NotFound)) {
           log.error(err);
-          return onError?.(err) ?? new Response(err.message, { status: 500 });
+          return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });
         }
       }
     }
@@ -230,7 +230,7 @@ export const serve = (options: ServerOptions = {}) => {
           }
         }
       } catch (err) {
-        return onError?.(err) ?? new Response(err.message, { status: 500 });
+        return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });
       }
     }
 
@@ -247,9 +247,17 @@ export const serve = (options: ServerOptions = {}) => {
               req.method !== "GET" || mod.default === undefined || req.headers.get("Accept") === "application/json" ||
               !req.headers.get("Accept")?.includes("html")
             ) {
+              Object.assign(ctx.params, ret.pathname.groups);
+              const anyFetcher = dataConfig.any;
+              if (typeof anyFetcher === "function") {
+                const res = await anyFetcher(req, ctx);
+                if (res instanceof Response) {
+                  return res;
+                }
+              }
               const fetcher = dataConfig[req.method.toLowerCase()];
               if (typeof fetcher === "function") {
-                const res = await fetcher(req, { ...ctx, params: ret.pathname.groups });
+                const res = await fetcher(req, ctx);
                 if (res instanceof Response) {
                   return res;
                 }
@@ -301,7 +309,7 @@ export const serve = (options: ServerOptions = {}) => {
           indexHtml = null;
         } else {
           log.error("read index.html:", err);
-          return onError?.(err) ?? new Response(err.message, { status: 500 });
+          return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });
         }
       }
     }
diff --git a/server/renderer.ts b/server/renderer.ts
@@ -3,9 +3,10 @@ import log from "../lib/log.ts";
 import util from "../lib/util.ts";
 import type { RouteModule, Routes } from "../lib/route.ts";
 import { matchRoutes } from "../lib/route.ts";
+import { errorHtml } from "./error.ts";
 import type { DependencyGraph, Module } from "./graph.ts";
 import { builtinModuleExts, getDeploymentId, getUnoGenerator } from "./helpers.ts";
-import type { Comment, Element } from "./html.ts";
+import type { Element, HTMLRewriterHandlers } from "./html.ts";
 import { HTMLRewriter } from "./html.ts";
 import { importRouteModule } from "./routing.ts";
 
@@ -20,11 +21,6 @@ export type SSRContext = {
   readonly onError?: (error: unknown) => void;
 };
 
-export type HTMLRewriterHandlers = {
-  element?: (element: Element) => void;
-  comments?: (element: Comment) => void;
-};
-
 export type SSR = {
   suspense: true;
   render(ssr: SSRContext): Promise<ReadableStream> | ReadableStream;
@@ -33,7 +29,7 @@ export type SSR = {
   render(ssr: SSRContext): Promise<string | ReadableStream> | string | ReadableStream;
 } | ((ssr: SSRContext) => Promise<string | ReadableStream> | string | ReadableStream);
 
-type SSRResult = {
+export type SSRResult = {
   context: SSRContext;
   errorBoundaryHandlerFilename?: string;
   body: ReadableStream | string;
@@ -142,25 +138,14 @@ export default {
         }
         let message: string;
         if (e instanceof Error) {
-          const regStackLoc = /(http:\/\/localhost:60\d{2}\/.+)(:\d+:\d+)/;
-          message = (e.stack as string).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) {
-              return `<strong>SSR ${line}</strong>`;
-            }
-            return line;
-          }).join("\n");
+          message = e.stack as string;
           log.error("SSR", e);
         } else {
           message = e?.toString?.() || String(e);
         }
         headers.append("Cache-Control", "public, max-age=0, must-revalidate");
         headers.append("Content-Type", "text/html; charset=utf-8");
-        return new Response(errorHtml(message), { headers });
+        return new Response(errorHtml(message, "SSR"), { headers });
       }
     } else {
       const { mtime, size } = await Deno.lstat("./index.html");
@@ -338,6 +323,8 @@ async function initSSR(
   const url = new URL(req.url);
   const matches = matchRoutes(url, routes);
   const suspenseData: Record<string, unknown> = {};
+
+  // import module and fetch data for each matched route
   const modules = await Promise.all(matches.map(async ([ret, { filename }]) => {
     const mod = await importRouteModule(filename);
     const dataConfig: Record<string, unknown> = util.isPlainObject(mod.data) ? mod.data : {};
@@ -348,10 +335,24 @@ async function initSSR(
       defaultExport: mod.default,
       dataCacheTtl: dataConfig?.cacheTtl as (number | undefined),
     };
+
+    // assign route params to context
+    Object.assign(ctx.params, ret.pathname.groups);
+
+    // check `any` fetch of data, throw if it returns a response object
+    const anyFetcher = dataConfig.any;
+    if (typeof anyFetcher === "function") {
+      const res = await anyFetcher(req, ctx);
+      if (res instanceof Response) {
+        throw res;
+      }
+    }
+
+    // check `get` of data, if `suspense` is enabled then return a promise instead
     const fetcher = dataConfig.get;
     if (typeof fetcher === "function") {
       const fetchData = async () => {
-        let res = fetcher(req, { ...ctx, params: rmod.params });
+        let res = fetcher(req, ctx);
         if (res instanceof Promise) {
           res = await res;
         }
@@ -384,79 +385,31 @@ async function initSSR(
         rmod.data = await fetchData();
       }
     }
+
     return rmod;
   }));
-  const routeModules = modules.filter(({ defaultExport }) => defaultExport !== undefined);
+
+  // find error boundary handler
   if (routes._error) {
     const [_, meta] = routes._error;
     const mod = await importRouteModule(meta.filename);
     if (typeof mod.default === "function") {
-      return [url, routeModules, suspenseData, { filename: meta.filename, default: mod.default }];
+      return [
+        url,
+        modules.filter(({ defaultExport }) => defaultExport !== undefined),
+        suspenseData,
+        {
+          filename: meta.filename,
+          default: mod.default,
+        },
+      ];
     }
   }
-  return [url, routeModules, suspenseData, undefined];
-}
 
-const errorHtml = (message: string) => `
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>SSR Error - Aleph.js</title>
-    <style>
-      body {
-        overflow: hidden;
-      }
-      .error {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100vw;
-        height: 100vh;
-      }
-      .error .box {
-        box-sizing: border-box;
-        position: relative;
-        max-width: 80%;
-        max-height: 90%;
-        overflow: auto;
-        padding: 24px 36px;
-        border-radius: 12px;
-        border: 2px solid rgba(255, 0, 0, 0.8);
-        background-color: rgba(255, 0, 0, 0.1);
-        color: rgba(255, 0, 0, 1);
-      }
-      .error .logo {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        margin-top: -45px;
-        margin-left: -45px;
-        opacity: 0.1;
-      }
-      .error pre {
-        position: relative;
-        line-height: 1.4;
-      }
-      .error code {
-        font-size: 14px;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="error">
-      <div class="box">
-        <div class="logo">
-          <svg width="90" height="90" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M52.9528 11.1C54.0959 11.1 55.1522 11.7097 55.7239 12.6995C68.5038 34.8259 81.2837 56.9524 94.0636 79.0788C94.642 80.0802 94.6355 81.316 94.0425 82.3088C93.0466 83.9762 92.028 85.6661 91.0325 87.3331C90.4529 88.3035 89.407 88.9 88.2767 88.9C62.7077 88.9 37.0519 88.9 11.4828 88.9C10.3207 88.9 9.25107 88.2693 8.67747 87.2586C7.75465 85.6326 6.81025 84.0065 5.88797 82.3805C5.33314 81.4023 5.34422 80.2041 5.90662 79.2302C18.6982 57.0794 31.4919 34.8415 44.3746 12.6907C44.9474 11.7058 46.0009 11.1 47.1402 11.1C49.0554 11.1 51.0005 11.1 52.9528 11.1Z" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linejoin="round"/>
-            <path d="M28.2002 72.8H80.8002L45.8187 12.5494" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-            <path d="M71.4999 72.7L45.1999 27.2L10.6519 87.1991" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-            <path d="M49.8 35.3L23.5 80.8H93.9333" stroke="#f00" stroke-width="3.2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
-          </svg>
-        </div>
-        <pre><code>${message}</code></pre>
-      </div>
-    </div>
-  </body>
-</html>
-`;
+  return [
+    url,
+    modules.filter(({ defaultExport }) => defaultExport !== undefined),
+    suspenseData,
+    undefined,
+  ];
+}

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,10 @@ import { getContentType } from "../lib/mime.ts";`
`5`	`5`	`import type { Routes } from "../lib/route.ts";`
`6`	`6`	`import util from "../lib/util.ts";`
`7`	`7`	`import { VERSION } from "../version.ts";`
	`8`	`+import { errorHtml } from "./error.ts";`
`8`	`9`	`import { getDeploymentId, initModuleLoaders, loadImportMap, loadJSXConfig } from "./helpers.ts";`
`9`		`-import { loadAndFixIndexHtml } from "./html.ts";`
`10`		`-import type { HTMLRewriterHandlers, SSR } from "./renderer.ts";`
`11`		`-import renderer from "./renderer.ts";`
	`10`	`+import { type HTMLRewriterHandlers, loadAndFixIndexHtml } from "./html.ts";`
	`11`	`+import renderer, { type SSR } from "./renderer.ts";`
`12`	`12`	`import { content, type CookieOptions, json, setCookieHeader } from "./response.ts";`
`13`	`13`	`import { importRouteModule, initRoutes, revive } from "./routing.ts";`
`14`	`14`	`import clientModuleTransformer from "./transformer.ts";`
`@@ -67,7 +67,7 @@ export const serve = (options: ServerOptions = {}) => {`
`67`	`67`	`} catch (err) {`
`68`	`68`	`if (!(err instanceof Deno.errors.NotFound)) {`
`69`	`69`	`log.error(err);`
`70`		`- return onError?.(err) ?? new Response(err.message, { status: 500 });`
	`70`	`+ return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -94,7 +94,7 @@ export const serve = (options: ServerOptions = {}) => {`
`94`	`94`	`} catch (err) {`
`95`	`95`	`if (!(err instanceof Deno.errors.NotFound)) {`
`96`	`96`	`log.error(err);`
`97`		`- return onError?.(err) ?? new Response(err.message, { status: 500 });`
	`97`	`+ return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
`@@ -131,7 +131,7 @@ export const serve = (options: ServerOptions = {}) => {`
`131`	`131`	`} catch (err) {`
`132`	`132`	`if (!(err instanceof Deno.errors.NotFound)) {`
`133`	`133`	`log.error(err);`
`134`		`- return onError?.(err) ?? new Response(err.message, { status: 500 });`
	`134`	`+ return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -230,7 +230,7 @@ export const serve = (options: ServerOptions = {}) => {`
`230`	`230`	`}`
`231`	`231`	`}`
`232`	`232`	`} catch (err) {`
`233`		`- return onError?.(err) ?? new Response(err.message, { status: 500 });`
	`233`	`+ return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`@@ -247,9 +247,17 @@ export const serve = (options: ServerOptions = {}) => {`
`247`	`247`	`req.method !== "GET" \|\| mod.default === undefined \|\| req.headers.get("Accept") === "application/json" \|\|`
`248`	`248`	`!req.headers.get("Accept")?.includes("html")`
`249`	`249`	`) {`
	`250`	`+ Object.assign(ctx.params, ret.pathname.groups);`
	`251`	`+ const anyFetcher = dataConfig.any;`
	`252`	`+ if (typeof anyFetcher === "function") {`
	`253`	`+ const res = await anyFetcher(req, ctx);`
	`254`	`+ if (res instanceof Response) {`
	`255`	`+ return res;`
	`256`	`+ }`
	`257`	`+ }`
`250`	`258`	`const fetcher = dataConfig[req.method.toLowerCase()];`
`251`	`259`	`if (typeof fetcher === "function") {`
`252`		`- const res = await fetcher(req, { ...ctx, params: ret.pathname.groups });`
	`260`	`+ const res = await fetcher(req, ctx);`
`253`	`261`	`if (res instanceof Response) {`
`254`	`262`	`return res;`
`255`	`263`	`}`
`@@ -301,7 +309,7 @@ export const serve = (options: ServerOptions = {}) => {`
`301`	`309`	`indexHtml = null;`
`302`	`310`	`} else {`
`303`	`311`	`log.error("read index.html:", err);`
`304`		`- return onError?.(err) ?? new Response(err.message, { status: 500 });`
	`312`	`+ return onError?.(err) ?? new Response(errorHtml(err.message), { status: 500 });`
`305`	`313`	`}`
`306`	`314`	`}`
`307`	`315`	`}`