rwsdk 1.0.0-beta.9-test.20251008035247 → 1.0.0-beta.9-test.20251008040832

package/dist/runtime/requestInfo/worker.d.ts

@@ -1,4 +1,11 @@
 import { DefaultAppContext, RequestInfo } from "./types";
+/**
+ * A custom error class to signal that a request is being processed
+ * on a stale context, likely due to an HMR update.
+ */
+export declare class StaleHmrRequestError extends Error {
+    constructor();
+}
 type DefaultRequestInfo = RequestInfo<DefaultAppContext>;
 export declare const requestInfo: DefaultRequestInfo;
 export declare function getRequestInfo(): RequestInfo;

package/dist/runtime/requestInfo/worker.js

@@ -1,4 +1,14 @@
 import { AsyncLocalStorage } from "async_hooks";
+/**
+ * A custom error class to signal that a request is being processed
+ * on a stale context, likely due to an HMR update.
+ */
+export class StaleHmrRequestError extends Error {
+    constructor() {
+        super("Stale HMR Request");
+        this.name = "StaleHmrRequestError";
+    }
+}
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
 const REQUEST_INFO_KEYS = [
@@ -16,27 +26,18 @@ REQUEST_INFO_KEYS.forEach((key) => {
         configurable: false,
         get: function () {
             const store = requestInfoStore.getStore();
-            if (store) {
-                return store[key];
-            }
-            // context(justinvdm, 2025-10-08): During a chaotic HMR update, the async
-            // context (store) can be torn down while a request is in-flight. If this
-            // happens, we return an empty object for context properties instead of
-            // undefined. This prevents a hard crash when middleware (like setupDb)
-            // tries to set a property on the context of an already-orphaned request.
-            if (key === "ctx" || key === "__userContext") {
-                return {};
-            }
-            return undefined;
+            return store ? store[key] : undefined;
         },
         set: function (value) {
             const store = requestInfoStore.getStore();
-            // context(justinvdm, 2025-10-08): Only set the value if the store exists.
-            // If it doesn't, this is a no-op, which is the desired behavior for an
-            // orphaned request.
-            if (store) {
-                store[key] = value;
+            if (!store) {
+                // If the store is missing, it means this setter is being called on a
+                // request that has been orphaned by an HMR update. We throw a
+                // specific error to signal this condition so the main request
+                // handler can catch it and short-circuit the request.
+                throw new StaleHmrRequestError();
             }
+            store[key] = value;
         },
     });
 });

package/dist/runtime/worker.js

@@ -5,7 +5,7 @@ import { renderToRscStream } from "./render/renderToRscStream";
 import { injectRSCPayload } from "rsc-html-stream/server";
 import { ErrorResponse } from "./error";
 import { rscActionHandler } from "./register/worker";
-import { getRequestInfo, runWithRequestInfo, runWithRequestInfoOverrides, } from "./requestInfo/worker";
+import { getRequestInfo, runWithRequestInfo, runWithRequestInfoOverrides, StaleHmrRequestError, } from "./requestInfo/worker";
 import { ssrWebpackRequire } from "./imports/worker";
 import { defineRoutes } from "./lib/router";
 import { generateNonce } from "./lib/utils";
@@ -160,6 +160,11 @@ export const defineApp = (routes) => {
                         }));
                     }
                     catch (e) {
+                        if (e instanceof StaleHmrRequestError) {
+                            console.warn("RWSDK: A request was short-circuited due to a stale HMR context.");
+                            // Return a simple, empty response to gracefully terminate the request.
+                            return new Response(null, { status: 204 });
+                        }
                         reject(e);
                     }
                 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rwsdk",
-  "version": "1.0.0-beta.9-test.20251008035247",
+  "version": "1.0.0-beta.9-test.20251008040832",
   "description": "Build fast, server-driven webapps on Cloudflare with SSR, RSC, and realtime",
   "type": "module",
   "bin": {