Version Packages

.changeset/config.json

@@ -0,0 +1,11 @@
+{
+  "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
+  "changelog": "@changesets/cli/changelog",
+  "commit": false,
+  "fixed": [],
+  "linked": [],
+  "access": "public",
+  "baseBranch": "main",
+  "updateInternalDependencies": "patch",
+  "ignore": []
+}

.github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-name: ci
+name: Tests
 
 on: [push]
 
@@ -9,12 +9,14 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         node-version: [22.x, 24.x]
-        deno-version: [1.40.x]
+        deno-version: [2.5.x]
     runs-on: ${{ matrix.os }}
+    env:
+      CI: true
     steps:
       - uses: actions/checkout@v5
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
       - name: Use Deno Version ${{ matrix.deno-version }}
@@ -23,13 +25,5 @@ jobs:
           deno-version: ${{ matrix.deno-version }}
       - name: npm install
         run: npm ci
-        env:
-          CI: true
-      - name: prepare
-        run: npm run prepare
-        env:
-          CI: true
       - name: vitest
         run: npm run test
-        env:
-          CI: true

.github/workflows/release.yml

@@ -0,0 +1,46 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+permissions:
+  contents: write
+  pull-requests: write
+  id-token: write
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v5
+
+      - name: Setup Node.js 22
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+
+      - name: Use Deno Version 2.5.3
+        uses: denolib/setup-deno@master
+        with:
+          deno-version: 2.5.3
+
+      - name: update npm
+        run: npm update -g npm
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Create Release Pull Request or Publish to npm
+        id: changesets
+        uses: changesets/action@v1
+        with:
+          publish: npm publish
+        env:
+          NPM_CONFIG_PROVENANCE: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 .DS_Store
 dist
-tsconfig.tsbuildinfo
+*.tsbuildinfo

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "deno.enablePaths": ["deno-bootstrap", "src/test"]
+}

CHANGELOG.md

@@ -0,0 +1,41 @@
+# @valtown/deno-http-worker
+
+## 2.0.0
+
+### Major Changes
+
+- 7fef5bf: Remove configurable spawn function option
+
+  Previously, we supported a `spawnFunc` option which let you use spawn methods
+  other than child_process.spawn. Given the lack of useful alternatives to child_process.spawn
+  and our efforts to really optimize this module, we're removing this option.
+
+### Patch Changes
+
+- c834beb: Improve error testing
+- 3bca30f: Internal refactor: use once() and move sync code out of promise callback
+
+## 1.1.4
+
+### Patch Changes
+
+- 6764cf6: Don't close the pool (bugfix)
+
+## 1.1.3
+
+### Patch Changes
+
+- 1ad123c: Don't include tests in NPM dist
+- c9b56ac: Close request pools when terminating workers
+
+## 1.1.2
+
+### Patch Changes
+
+- f009504: Adopt deno 2.5.x and OIDC
+
+## 1.1.1
+
+### Patch Changes
+
+- c48cbdd: Adopt changesets

README.md

@@ -1,43 +1,53 @@
 # deno-http-worker
 
-[![NPM version](https://img.shields.io/npm/v/deno-http-worker.svg?style=flat)](https://npmjs.org/package/deno-http-worker)
+[![NPM version](https://img.shields.io/npm/v/@valtown/deno-http-worker.svg?style=flat)](https://npmjs.org/package/@valtown/deno-http-worker)
 
-Similarly to [deno-vm](https://github.com/casual-simulation/node-deno-vm), deno-http-worker lets you securely spawn Deno http servers.
+Similarly to [deno-vm](https://github.com/casual-simulation/node-deno-vm),
+deno-http-worker lets you securely spawn Deno http servers.
 
 ## Usage
 
 ```ts
-import { newDenoHTTPWorker } from 'deno-http-worker';
+import { newDenoHTTPWorker } from "@valtown/deno-http-worker";
 
 let worker = await newDenoHTTPWorker(
     `export default {
         async fetch(req: Request): Promise<Response> {
             return Response.json({ ok: req.url });
         },
     }`,
-    { printOutput: true, runFlags: ["--allow-net"] }
+    { printOutput: true, runFlags: ["--allow-net"] },
 );
 
-const body = await new Promise((resolve, reject) => {
-    const req = worker.request("https://hello/world?query=param", {}, (resp) => {
-        const body = [];
-        resp.on("error", reject);
-        resp.on("data", (chunk) => {
-            body.push(chunk);
-        });
-        resp.on("end", () => {
-            resolve(Buffer.concat(body).toString());
-        });
-    })
-    req.end();
-})
-console.log(body) // => {"ok":"https://hello/world?query=param"}
+const req = await worker.request({
+    url: "https://hello/world?query=param",
+    method: "GET",
+});
+const body = await req.body.json();
+
+console.log(body); // => {"ok":"https://hello/world?query=param"}
 
 worker.terminate();
 ```
 
 ## Internals
 
-Deno-http-worker connects to the Deno process over a Unix socket to make requests.  As a result, the worker does not provide an address or url, but instead returns `request` function that calls `http.request` under the hood, but modifies the request attributes to work over the socket.
-
-If you need more advanced usage here, or run into bugs, please open an issue.
+> [!TIP]
+> This package [globally patches](/deno-bootstrap/index.ts#L28)
+> Deno.upgradeWebSocket to enable websocket proxying. You can provide your own
+> bootstrap script if different behavior is desired.
+
+Deno-http-worker connects to the Deno process over a Unix socket via undici to
+make requests. As a result, the worker does not provide an address or url, but
+instead returns `undici.ResponseData` that uses `undici.Pool.request` under the
+hood, but modifies the request attributes to work over the socket, and we expose
+parts of [request and response interface](./src/types.ts).
+
+You can also connect to the Deno process over a WebSocket connection, which uses
+the same `undici.Pool`. We modify the inbound Request objects to preserve
+various headers. Unfortunately Deno doesn't let you copy a request and then
+modify properties, so we patch `Deno.upgradeWebSocket` when you use the
+WebSockets functionality to use the original request for the upgrade, which may
+be slightly different.
+
+If you need more advanced usage here, or run into bugs, please open an issue.

biome.json

@@ -5,10 +5,11 @@
     "indentStyle": "space"
   },
   "files": {
-    "includes": ["**", "!**/dist"]
+    "includes": ["**", "!**/dist", "!**/deno-bootstrap", "!**/src/test"]
   },
   "assist": { "actions": { "source": { "organizeImports": "off" } } },
   "linter": {
+    "includes": ["**", "!**/dist", "!**/deno-bootstrap", "!**/src/test"],
     "enabled": true,
     "rules": {
       "recommended": true,

deno-bootstrap/index.ts

@@ -21,23 +21,43 @@ const onError = mod.default.onError ??
   });
 const onListen = mod.default.onListen ?? ((_localAddr: Deno.NetAddr) => {});
 
-// Use an empty onListen callback to prevent Deno from logging
+const originalRequestProp = Symbol("originalRequest");
+
+// We need to override Deno.upgradeWebSocket to use the original request object
+// since Deno doesn't let us use copied request objects.
+const originalUpgrade = Deno.upgradeWebSocket;
+Object.defineProperty(Deno, "upgradeWebSocket", {
+  value: (req: Request) => {
+    return originalUpgrade(
+      (req as unknown as { [originalRequestProp]: Request })[
+        originalRequestProp
+      ],
+    );
+  },
+});
+
 const server = Deno.serve(
   {
     path: socketFile,
+    // Use an empty onListen callback to prevent Deno from logging
     onListen: onListen,
     onError: onError,
   },
-  (req: Request) => {
-    const headerUrl = req.headers.get("X-Deno-Worker-URL");
+  (originalReq: Request) => {
+    const headerUrl = originalReq.headers.get("X-Deno-Worker-URL");
     if (!headerUrl) {
       // This is just for the warming request, shouldn't be seen by clients.
       return Response.json({ warming: true }, { status: 200 });
     }
-    const url = new URL(headerUrl);
+
     // Deno Request headers are immutable so we must make a new Request in order
     // to delete our headers.
-    req = new Request(url.toString(), req);
+    const req = new Request(headerUrl, originalReq);
+
+    // Add the original request so that we can use it during Deno.upgradeWebSocket
+    (req as unknown as { [originalRequestProp]: Request })[
+      originalRequestProp
+    ] = originalReq;
 
     // Restore host and connection headers.
     req.headers.delete("host");
@@ -51,24 +71,19 @@ const server = Deno.serve(
         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);
   },
 );
 
-addEventListener("error", (e) => {
+globalThis.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
   // unresolved promises to complete before exiting.

mise.toml

@@ -1,2 +1,3 @@
 [tools]
 node = "24"
+deno = "2.5.5"