next-ws 0.0.0-beta-20250824054249 → 0.0.0-beta-20250826080310

package/dist/cli.cjs

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var import_minimist = __toESM(require("minimist"));
 
 // package.json
-var version = "0.0.0-beta-20250824054249";
+var version = "0.0.0-beta-20250826080310";
 
 // src/commands/helpers/define.ts
 function defineCommandGroup(definition) {
@@ -757,14 +757,78 @@ var patchRouterServer = definePatchStep({
     }).toSource();
   }
 });
+var patchHeaders = definePatchStep({
+  title: "Add WebSocket contextual headers resolution to request headers",
+  path: "next:dist/client/components/headers.js",
+  async transform(code) {
+    const marker = "@patch headers";
+    const snippet = (0, import_jscodeshift.default)(`
+      // ${marker}
+      const kRequestStorage = Symbol.for('next-ws.request-store');
+      const requestStorage = Reflect.get(globalThis, kRequestStorage);
+      const contextualHeaders = requestStorage?.getStore()?.headers;
+      if (contextualHeaders) return contextualHeaders;
+    `);
+    const block = import_jscodeshift.default.blockStatement(snippet.nodes()[0].program.body);
+    return (0, import_jscodeshift.default)(code).find(import_jscodeshift.default.FunctionDeclaration, { id: { name: "headers" } }).forEach(({ node }) => {
+      const body = node.body.body;
+      const existing = (0, import_jscodeshift.default)(body).find(CommentLine, { value: ` ${marker}` }).paths()[0];
+      const idx = body.indexOf(existing?.parent.node);
+      if (existing && idx > -1) body[idx] = block;
+      else body.unshift(block);
+    }).toSource();
+  }
+});
+var patchCookies = definePatchStep({
+  title: "Add WebSocket contextual cookies resolution to request cookies",
+  path: "next:dist/client/components/headers.js",
+  async transform(code) {
+    const marker = "@patch cookies";
+    const snippet = (0, import_jscodeshift.default)(`
+      // ${marker}
+      const kRequestStorage = Symbol.for('next-ws.request-store');
+      const requestStorage = Reflect.get(globalThis, kRequestStorage);
+      const contextualCookies = requestStorage?.getStore()?.cookies;
+      if (contextualCookies) return contextualCookies;
+    `);
+    const block = import_jscodeshift.default.blockStatement(snippet.nodes()[0].program.body);
+    return (0, import_jscodeshift.default)(code).find(import_jscodeshift.default.FunctionDeclaration, { id: { name: "cookies" } }).forEach(({ node }) => {
+      const body = node.body.body;
+      const existing = (0, import_jscodeshift.default)(body).find(CommentLine, { value: ` ${marker}` }).paths()[0];
+      const idx = body.indexOf(existing?.parent.node);
+      if (existing && idx > -1) body[idx] = block;
+      else body.unshift(block);
+    }).toSource();
+  }
+});
 var patch_1_default = definePatch({
   name: "patch-1",
-  versions: ">=13.5.1 <=15.5.0",
-  steps: [patchNextNodeServer, patchRouterServer]
+  versions: ">=13.5.1 <=14.2.32",
+  steps: [patchNextNodeServer, patchRouterServer, patchHeaders, patchCookies]
+});
+
+// src/patches/patch-2.ts
+var patchHeaders2 = definePatchStep({
+  ...patchHeaders,
+  path: "next:dist/server/request/headers.js"
+});
+var patchCookies2 = definePatchStep({
+  ...patchCookies,
+  path: "next:dist/server/request/cookies.js"
+});
+var patch_2_default = definePatch({
+  name: "patch-2",
+  versions: ">=15.0.0 <=15.5.0",
+  steps: [
+    patchNextNodeServer,
+    patchRouterServer,
+    patchHeaders2,
+    patchCookies2
+  ]
 });
 
 // src/patches/index.ts
-var patches_default = [patch_1_default];
+var patches_default = [patch_1_default, patch_2_default];
 
 // src/commands/helpers/semver.ts
 var import_range = __toESM(require("semver/classes/range.js"));

package/dist/server/index.cjs

@@ -65,8 +65,16 @@ var [getHttpServer, setHttpServer, useHttpServer] = (
 var [getWebSocketServer, setWebSocketServer, useWebSocketServer] = useGlobal(
   Symbol.for("next-ws.websocket-server")
 );
+var [getRequestStorage, setRequestStorage, useRequestStorage] = (
+  //
+  useGlobal(
+    Symbol.for("next-ws.request-store")
+    //
+  )
+);
 
 // src/server/setup.ts
+var import_node_async_hooks2 = require("async_hooks");
 var logger2 = __toESM(require("next/dist/build/output/log.js"));
 var import_ws = require("ws");
 
@@ -130,7 +138,7 @@ async function importRouteModule(nextServer, filePath) {
   }
   try {
     const buildPagePath = nextServer.getPagePath(filePath);
-    return require(buildPagePath).routeModule;
+    return (await require(buildPagePath)).routeModule;
   } catch (cause) {
     console.error(cause);
     return void 0;
@@ -154,6 +162,36 @@ function toNextRequest(message) {
   });
 }
 
+// src/server/helpers/store.ts
+var import_node_async_hooks = require("async_hooks");
+var import_cookies = require("next/dist/compiled/@edge-runtime/cookies");
+var ReadonlyHeaders = class extends Headers {
+  append() {
+    throw new Error("Headers are read-only");
+  }
+  set() {
+    throw new Error("Headers are read-only");
+  }
+  delete() {
+    throw new Error("Headers are read-only");
+  }
+};
+var ReadonlyRequestsCookies = class extends import_cookies.RequestCookies {
+  set() {
+    throw new Error("Cookies are read-only");
+  }
+  delete() {
+    throw new Error("Cookies are read-only");
+  }
+};
+function createRequestStore(request) {
+  return {
+    headers: new ReadonlyHeaders(request.headers),
+    cookies: new ReadonlyRequestsCookies(request.headers)
+  };
+}
+var requestStorage = new import_node_async_hooks.AsyncLocalStorage();
+
 // src/server/setup.ts
 function setupWebSocketServer(nextServer) {
   const httpServer = (
@@ -167,6 +205,10 @@ function setupWebSocketServer(nextServer) {
     //
     useWebSocketServer(() => new import_ws.WebSocketServer({ noServer: true }))
   );
+  const requestStorage2 = (
+    //
+    useRequestStorage(() => new import_node_async_hooks2.AsyncLocalStorage())
+  );
   logger2.ready("[next-ws] has started the WebSocket server");
   const kInstalled = Symbol.for("next-ws.http-server.attached");
   if (Reflect.has(httpServer, kInstalled)) return;
@@ -193,14 +235,18 @@ function setupWebSocketServer(nextServer) {
     }
     if (handleSocket)
       logger2.warnOnce(
-        "DeprecationWarning: [next-ws] SOCKET is deprecated, use UPGRADE instead, see https://github.com/apteryxxyz/next-ws#-usage"
+        "DeprecationWarning: [next-ws] SOCKET is deprecated, prefer UPGRADE instead, see https://github.com/apteryxxyz/next-ws#-usage"
       );
     wsServer.handleUpgrade(message, socket, head, async (client) => {
       wsServer.emit("connection", client, message);
       try {
         const context = { params: route.params };
         if (handleUpgrade) {
-          await handleUpgrade(client, wsServer, request, context);
+          await requestStorage2.run(
+            createRequestStore(request),
+            //
+            () => handleUpgrade(client, wsServer, request, context)
+          );
         } else if (handleSocket) {
           const handleClose = (
             //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-ws",
-  "version": "0.0.0-beta-20250824054249",
+  "version": "0.0.0-beta-20250826080310",
   "description": "Add support for WebSockets in the Next.js app directory",
   "license": "MIT",
   "keywords": [