fix: update for more recent deno versions (#44)

Author: stainless-em

deno-bootstrap/index.ts

@@ -2,10 +2,9 @@ const socketFile = Deno.args[0];
 const scriptType = Deno.args[1];
 const script = Deno.args[2];
 
-const importURL =
-  scriptType === "import"
-    ? script
-    : `data:text/tsx,${encodeURIComponent(script)}`;
+const importURL = scriptType === "import"
+  ? script
+  : `data:text/tsx,${encodeURIComponent(script)}`;
 
 const mod = await import(importURL);
 if (!mod.default) {
@@ -15,8 +14,7 @@ if (typeof mod.default.fetch !== "function") {
   throw new Error("Default export does not have a fetch function.");
 }
 
-const onError =
-  mod.default.onError ??
+const onError = mod.default.onError ??
   ((error: unknown) => {
     console.error(error);
     return new Response("Internal Server Error", { status: 500 });
@@ -44,25 +42,32 @@ const server = Deno.serve(
     // Restore host and connection headers.
     req.headers.delete("host");
     req.headers.delete("connection");
-    if (req.headers.has("X-Deno-Worker-Host"))
+    if (req.headers.has("X-Deno-Worker-Host")) {
       req.headers.set("host", req.headers.get("X-Deno-Worker-Host")!);
-    if (req.headers.has("X-Deno-Worker-Connection"))
+    }
+    if (req.headers.has("X-Deno-Worker-Connection")) {
       req.headers.set(
         "connection",
-        req.headers.get("X-Deno-Worker-Connection")!
+        req.headers.get("X-Deno-Worker-Connection")!,
       );
+    }
 
     req.headers.delete("X-Deno-Worker-URL");
     req.headers.delete("X-Deno-Worker-Host");
     req.headers.delete("X-Deno-Worker-Connection");
     return mod.default.fetch(req);
-  }
+  },
 );
 
-globalThis.onerror = (e) => {
+addEventListener("error", (e) => {
   console.error(e.error);
   e.preventDefault();
-};
+});
+
+addEventListener("unhandledrejection", (e) => {
+  console.error(e.reason);
+  e.preventDefault();
+});
 
 Deno.addSignalListener("SIGINT", async () => {
   // On interrupt we only shut down the server. Deno will wait for all

src/DenoHTTPWorker.test.ts

@@ -103,7 +103,7 @@ describe("DenoHTTPWorker", { timeout: 1000 }, () => {
     worker.terminate();
   });
 
-  it("dont crash on socket removal", async () => {
+  it("don't crash on socket removal", async () => {
     const worker = await newDenoHTTPWorker(
       `
         export default { async fetch (req: Request): Promise<Response> {
@@ -170,21 +170,44 @@ describe("DenoHTTPWorker", { timeout: 1000 }, () => {
 
     worker.terminate();
   });
+
   it("onError not handled", { timeout: 20_000 }, async () => {
-    // onError is not called in all cases, for example, here I can pass a
-    // readable stream and the error is only caught by the global onerror handler.
+    // onError is not called for errors that happen outside the request
     const worker = await newDenoHTTPWorker(
       `
         export default { async fetch (req: Request): Promise<Response> {
-          const body = new ReadableStream({
-            start(controller) {
-              setTimeout(() => {
-                controller.enqueue(1);
-              }, 10);
-            },
-            cancel() {},
-          });
-          return new Response(body)
+          setTimeout(() => {
+            throw new Error("uncaught!")
+          })
+          return Response.json(null)
+        }, onError (error: Error): Response {
+          return Response.json({ error: error.message }, { status: 500 })
+        }}
+      `,
+      { printOutput: false }
+    );
+    jsonRequest(worker, "https://localhost/hello?isee=you", {
+      headers: { accept: "application/json" },
+    }).catch(() => {});
+
+    for (;;) {
+      const stderr = worker.stderr.read();
+      if (stderr) {
+        expect(stderr.toString()).toContain("Error: uncaught!");
+        break;
+      }
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+    worker.terminate();
+  });
+
+  it("unhandled rejection", { timeout: 20_000 }, async () => {
+    // onError is not called for unhandled rejections that happen outside the request
+    const worker = await newDenoHTTPWorker(
+      `
+        export default { async fetch (req: Request): Promise<Response> {
+          Promise.reject(new Error("uncaught!"))
+          return Response.json(null)
         }, onError (error: Error): Response {
           return Response.json({ error: error.message }, { status: 500 })
         }}
@@ -198,8 +221,7 @@ describe("DenoHTTPWorker", { timeout: 1000 }, () => {
     for (;;) {
       const stderr = worker.stderr.read();
       if (stderr) {
-        console.log(stderr.toString());
-        expect(stderr.toString()).toContain("expected typed ArrayBufferView");
+        expect(stderr.toString()).toContain("Error: uncaught!");
         break;
       }
       await new Promise((resolve) => setTimeout(resolve, 100));

src/DenoHTTPWorker.ts

@@ -138,7 +138,7 @@ export const newDenoHTTPWorker = async (
   const allowReadFlagValue =
     typeof script === "string"
       ? socketFile
-      : `${socketFile},${script.href.replace("file://", "")}`;
+      : `${socketFile},${fileURLToPath(script)}`;
 
   let allowReadFound = false;
   let allowWriteFound = false;
@@ -182,6 +182,8 @@ export const newDenoHTTPWorker = async (
       ? _options.denoExecutable
       : (_options.denoExecutable[0] as string);
 
+  const bootstrap = await fs.readFile(_options.denoBootstrapScriptPath, "utf-8");
+
   return new Promise((resolve, reject) => {
     (async (): Promise<DenoHTTPWorker> => {
       const args = [
@@ -190,7 +192,7 @@ export const newDenoHTTPWorker = async (
           : _options.denoExecutable.slice(1)),
         "run",
         ..._options.runFlags,
-        _options.denoBootstrapScriptPath,
+        "data:text/typescript," + encodeURIComponent(bootstrap),
         ...scriptArgs,
       ];
       if (_options.printCommandAndArguments) {
@@ -351,10 +353,12 @@ class denoHTTPWorker {
     // (https://nodejs.org/api/http.html#new-agentoptions). We don't want these
     // to make it to Deno unless they are explicitly set by the user. So store
     // them to reconstruct on the other size.
-    if (options.headers.host)
+    if (options.headers.host) {
       options.headers["X-Deno-Worker-Host"] = options.headers.host;
-    if (options.headers.connection)
+    }
+    if (options.headers.connection) {
       options.headers["X-Deno-Worker-Connection"] = options.headers.connection;
+    }
 
     options.headers = {
       ...options.headers,