req.node -> req.runtime.node

Author: Murderlon

package-lock.json

@@ -207,7 +207,7 @@ The main server request handler invoked on every request.
 Use this to integrate into your existing Node.js server.
 
 This handler converts `http.IncomingMessage`/`http.ServerResponse` to `Request`/`Response`.
-You can still access the Node.js versions via `req.node.req`/`req.node.res` in the hooks.
+You can still access the Node.js versions via `req.runtime.node.req`/`req.runtime.node.res` in the hooks.
 
 #### `server.handleWeb(req: Request)`
 

packages/server/README.md

@@ -25,7 +25,7 @@
     "debug": "^4.3.4",
     "lodash.throttle": "^4.1.1",
     "set-cookie-parser": "^2.7.1",
-    "srvx": "^0.8.2"
+    "srvx": "~0.8.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",

packages/server/package.json

@@ -130,16 +130,16 @@ export class Server extends EventEmitter {
     return this.handler(req)
   }
 
-  private async handler(req: Request) {
+  private async handler(req: Request | ServerRequest) {
     const context = this.createContext()
     const headers = new Headers()
 
     // Special case on the Node.js runtime,
     // We handle gracefully request errors such as disconnects or timeouts.
     // This is important to avoid memory leaks and ensure that the server can
     // handle subsequent requests without issues.
-    if ('node' in req && req.node) {
-      const nodeReq = (req.node as {req: http.IncomingMessage}).req
+    if ((req as ServerRequest)?.runtime?.node) {
+      const nodeReq = (req as ServerRequest).runtime?.node?.req!
       nodeReq.once('error', () => {
         context.abort()
       })

packages/server/src/server.ts

@@ -443,7 +443,7 @@ describe('Server', () => {
         datastore: new FileStore({directory}),
         async onIncomingRequest(req) {
           // @ts-expect-error fine
-          if (req?.node?.req?.user?.username === 'admin') {
+          if (req?.runtime?.node?.req?.user?.username === 'admin') {
             done()
           } else {
             done(new Error('user data should be preserved in onIncomingRequest'))