@nxtedition/lib 23.7.4 → 23.7.6

package/http.js

@@ -8,6 +8,7 @@ import compose from 'koa-compose'
 import http from 'http'
 import fp from 'lodash/fp.js'
 import tp from 'timers/promises'
+import querystring from 'fast-querystring'
 
 export const kAbortController = Symbol('abortController')
 
@@ -133,6 +134,7 @@ export class Context {
       return this.#req.query
     }
 
+    this.#target ??= requestTarget(this.#req)
     this.#query ??=
       this.#target.search.length > 1
         ? Object.freeze(querystring.parse(this.#target.search.slice(1)))
@@ -350,10 +352,13 @@ export async function requestMiddleware(ctx, next) {
 }
 
 export class IncomingMessage extends http.IncomingMessage {
-  #target
   #host
   #url
   #socket
+  #target
+
+  #search
+  #query
 
   constructor(...args) {
     super(...args)
@@ -369,13 +374,26 @@ export class IncomingMessage extends http.IncomingMessage {
       this.#url !== this.url ||
       this.#socket !== this.socket
     ) {
-      this.#target = undefined
+      this.#socket = this.socket
       this.#host = this.headers.host
       this.#url = this.url
-      this.#socket = this.socket
+      this.#target = undefined
     }
+
     return (this.#target ??= requestTarget(this))
   }
+
+  get query() {
+    const search = this.target.search
+
+    if (this.#search !== search) {
+      this.#search = search
+      this.#query = undefined
+    }
+
+    return (this.#query ??=
+      search.length > 1 ? Object.freeze(querystring.parse(search.slice(1))) : {})
+  }
 }
 
 export class ServerResponse extends http.ServerResponse {
@@ -478,10 +496,13 @@ export class ServerResponse extends http.ServerResponse {
 }
 
 export class Http2ServerRequest extends http2.Http2ServerRequest {
-  #target
   #host
   #url
   #socket
+  #target
+
+  #search
+  #query
 
   constructor(...args) {
     super(...args)
@@ -497,13 +518,26 @@ export class Http2ServerRequest extends http2.Http2ServerRequest {
       this.#url !== this.url ||
       this.#socket !== this.socket
     ) {
-      this.#target = undefined
+      this.#socket = this.socket
       this.#host = this.headers.host
       this.#url = this.url
-      this.#socket = this.socket
+      this.#target = undefined
     }
+
     return (this.#target ??= requestTarget(this))
   }
+
+  get query() {
+    const search = this.target.search
+
+    if (this.#search !== search) {
+      this.#search = search
+      this.#query = undefined
+    }
+
+    return (this.#query ??=
+      search.length > 1 ? Object.freeze(querystring.parse(search.slice(1))) : {})
+  }
 }
 
 export class Http2ServerResponse extends http2.Http2ServerResponse {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "23.7.4",
+  "version": "23.7.6",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -72,7 +72,7 @@
     "@swc/wasm-web": "^1.11.22",
     "date-fns": "^4.1.0",
     "diff": "5.2.0",
-    "fast-querystring": "^1.1.1",
+    "fast-querystring": "^1.1.2",
     "hasha": "^6.0.0",
     "http-errors": "^2.0.0",
     "json5": "^2.2.3",