uhhhhhhhhhhhhhhhhhhhhhhhhhhb hgvyujhbuiyxfgh

fart_server/serve.ts

@@ -2,32 +2,47 @@ import { redirectToDenoDeployPreviewUrl } from "./bonus_features/versions/mod.ts
 import { redirectIfShortlink } from "./bonus_features/shortlinks/mod.ts";
 import { getSize, inject, register } from "./utils.ts";
 
-export const handleRequest = async (event: Deno.RequestEvent) => {
-  const { request, respondWith } = event;
-  respondWith(await inject(request));
-};
-
-// redirect to another server running a different version of the Fart library
-register(redirectToDenoDeployPreviewUrl);
+const middleware = [
+  // redirect to another server running a different version of the Fart library
+  redirectToDenoDeployPreviewUrl,
+  // redirect to an external URL
+  redirectIfShortlink,
+  // show how many handlers are registered
+  (request) => {
+    if (new URL(request.url).pathname === "/debug/size") {
+      return new Response(String(getSize()));
+    }
+    return null;
+  },
+  // show deployment ID if running on Deno Deploy
+  (request) => {
+    if (new URL(request.url).pathname === "/debug/deployment") {
+      return new Response(String(Deno.env.get("DENO_DEPLOYMENT_ID")));
+    }
+    return null;
+  },
+];
 
-// redirect to an external URL
-register(redirectIfShortlink);
+export const setup = () => {
+  if (getSize() === middlware.length) return;
+  clear();
+  register(...middleware);
+};
 
-// show how many handlers are registered
-register((request) => {
-  if (new URL(request.url).pathname === "/debug/size") {
-    return new Response(String(getSize()));
-  }
-  return null;
-});
+export const handleRequest = async (event: Deno.RequestEvent) => {
+  setup();
+  event.respondWith(await inject(event.request));
+};
 
-// show deployment ID if running on Deno Deploy
-register((request) => {
-  if (new URL(request.url).pathname === "/debug/deployment") {
-    return new Response(String(Deno.env.get("DENO_DEPLOYMENT_ID")));
+export const serve = async () => {
+  const port = parseInt(Deno.env.get("PORT") || "8080");
+  console.log(`Access HTTP webserver at: http://localhost:${port}/`);
+  for await (const connection of Deno.listen({ port })) {
+    for await (const event of Deno.serveHttp(connection)) {
+      await handleRequest(event);
+    }
   }
-  return null;
-});
+};
 
 if (Deno.env.get("DENO_DEPLOYMENT_ID") !== undefined) {
   // add the fetch listener if running on Deno Deploy
@@ -37,11 +52,5 @@ if (Deno.env.get("DENO_DEPLOYMENT_ID") !== undefined) {
   );
 } else if (import.meta.main) {
   // serve the HTTP server if running locally
-  const port = parseInt(Deno.env.get("PORT") || "8080");
-  console.log(`Access HTTP webserver at: http://localhost:${port}/`);
-  for await (const connection of Deno.listen({ port })) {
-    for await (const event of Deno.serveHttp(connection)) {
-      await handleRequest(event);
-    }
-  }
+  await serve();
 }

fart_server/watch_serve.ts

@@ -1,16 +1,10 @@
-const makeWorker = () => {
-    const workerPath = new URL("./serve.ts", import.meta.url).href;
-    return new Worker(workerPath, { type: "module", deno: true })
+const restartServer = async () => {
+    console.log(">>> restarting server");
+    const { serve } = await import("./serve.ts");
+    serve();
 };
 
-const resetWorker = () => {
-    worker.terminate();
-    worker = makeWorker();
-}
-
-let worker = makeWorker();
-
 for await (const event of Deno.watchFs(".")) {
   console.log(">>>> event", event);
-  resetWorker();
+  restartServer();
 }