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

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

@@ -2,7 +2,6 @@ import { DefaultAppContext, RequestInfo } from "./types";
 type DefaultRequestInfo = RequestInfo<DefaultAppContext>;
 export declare const requestInfo: DefaultRequestInfo;
 export declare function getRequestInfo(): RequestInfo;
-export declare function waitForRequestInfo(): Promise<DefaultRequestInfo>;
 export declare function runWithRequestInfo<Result>(nextRequestInfo: DefaultRequestInfo, fn: () => Result): Result;
 export declare function runWithRequestInfoOverrides<Result>(overrides: Partial<DefaultRequestInfo>, fn: () => Result): Result;
 export {};

package/dist/runtime/requestInfo/worker.js

@@ -1,5 +1,4 @@
 import { AsyncLocalStorage } from "async_hooks";
-const requestInfoDeferred = Promise.withResolvers();
 const requestInfoStore = new AsyncLocalStorage();
 const requestInfoBase = {};
 const REQUEST_INFO_KEYS = [
@@ -17,7 +16,27 @@ REQUEST_INFO_KEYS.forEach((key) => {
         configurable: false,
         get: function () {
             const store = requestInfoStore.getStore();
-            return store ? store[key] : undefined;
+            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;
+        },
+        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;
+            }
         },
     });
 });
@@ -29,15 +48,8 @@ export function getRequestInfo() {
     }
     return store;
 }
-export function waitForRequestInfo() {
-    return requestInfoDeferred.promise;
-}
 export function runWithRequestInfo(nextRequestInfo, fn) {
-    const runWithRequestInfoFn = () => {
-        requestInfoDeferred.resolve(nextRequestInfo);
-        return fn();
-    };
-    return requestInfoStore.run(nextRequestInfo, runWithRequestInfoFn);
+    return requestInfoStore.run(nextRequestInfo, fn);
 }
 export function runWithRequestInfoOverrides(overrides, fn) {
     const requestInfo = requestInfoStore.getStore();

package/package.json

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