@swarmmachina/swm-core 1.1.3 → 1.1.5

package/README.md

@@ -327,6 +327,16 @@ const page = ctx.query('page') // ?page=1
 
 **Returns:** `string`
 
+##### `ctx.fullQuery()`
+
+Get full raw query string.
+
+```javascript
+const q = ctx.fullQuery() // page=1&limit=20
+```
+
+**Returns:** `string`
+
 ##### `ctx.param(indexOrName)`
 
 Get URL parameter by index or name (for pattern matching in native routing).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swarmmachina/swm-core",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Zero-dependency high-performance HTTP/WebSocket server built on uWebSockets.js",
   "keywords": [
     "http",

package/src/http-context.js

@@ -8,12 +8,14 @@ export default class HttpContext {
   #url = ''
   #headersCached = false
   #headers = {}
-  #fullQuery = null
+  #fullQuery = ''
+  #fullQueryCached = false
   #fullQueryParsed = false
   #query = {}
   #params = {}
   #statusOverride = null
   #contentLength = undefined
+  #pendingHeaders = new Map()
   #bodyParser = new BodyParser()
   #resStreamer = new ResStreamer()
 
@@ -114,13 +116,15 @@ export default class HttpContext {
 
     this.#statusOverride = null
     this.#contentLength = undefined
+    this.#pendingHeaders.clear()
 
     this.#ip = ''
     this.#url = ''
     this.#method = ''
     this.#headersCached = false
     this.#headers = {}
-    this.#fullQuery = null
+    this.#fullQuery = ''
+    this.#fullQueryCached = false
     this.#fullQueryParsed = false
     this.#query = {}
     this.#params = {}
@@ -147,12 +151,14 @@ export default class HttpContext {
 
     this.#statusOverride = null
     this.#contentLength = undefined
+    this.#pendingHeaders.clear()
     this.#ip = ''
     this.#url = ''
     this.#method = ''
     this.#headersCached = false
     this.#headers = {}
-    this.#fullQuery = null
+    this.#fullQuery = ''
+    this.#fullQueryCached = false
     this.#fullQueryParsed = false
     this.#query = {}
     this.#params = {}
@@ -197,13 +203,14 @@ export default class HttpContext {
   }
 
   cacheQuery() {
-    if (this.#fullQuery !== null || !this.req) {
+    if (this.#fullQueryCached || !this.req) {
       return
     }
 
     const fullQuery = this.req.getQuery()
 
     this.#fullQuery = typeof fullQuery === 'string' ? fullQuery : ''
+    this.#fullQueryCached = true
     this.#fullQueryParsed = false
   }
 
@@ -288,6 +295,27 @@ export default class HttpContext {
     return this.#url
   }
 
+  /**
+   * @returns {string}
+   */
+  fullQuery() {
+    if (this.#fullQueryCached) {
+      return this.#fullQuery
+    }
+
+    if (!this.req) {
+      return ''
+    }
+
+    const fullQuery = this.req.getQuery()
+
+    this.#fullQuery = typeof fullQuery === 'string' ? fullQuery : ''
+    this.#fullQueryCached = true
+    this.#fullQueryParsed = false
+
+    return this.#fullQuery
+  }
+
   /**
    * @param {string} name
    * @returns {string|undefined}
@@ -297,7 +325,7 @@ export default class HttpContext {
       return this.#query[name]
     }
 
-    if (this.#fullQuery !== null) {
+    if (this.#fullQueryCached) {
       this.#parseFullQuery()
 
       if (name in this.#query) {
@@ -396,7 +424,11 @@ export default class HttpContext {
    * @returns {HttpContext}
    */
   setHeader(key, value) {
-    this.res.writeHeader(key, value)
+    if (this.replied || this.aborted) {
+      return this
+    }
+
+    this.#stageHeader(key, value)
     return this
   }
 
@@ -404,32 +436,83 @@ export default class HttpContext {
    * @param {Record<string, string> | null | undefined} headers
    */
   setHeaders(headers) {
+    if (this.replied || this.aborted) {
+      return
+    }
+
+    this.#stageHeaders(headers)
+  }
+
+  /**
+   * @param {Record<string, string> | null | undefined} headers
+   */
+  flushHeaders(headers = null) {
+    this.#flushPendingHeaders(headers)
+  }
+
+  /**
+   * @param {string} key
+   * @param {string} value
+   */
+  #stageHeader(key, value) {
+    if (value === undefined || value === null) {
+      return
+    }
+
+    const headerName = String(key)
+    const headerValue = String(value)
+
+    this.#pendingHeaders.set(headerName.toLowerCase(), [headerName, headerValue])
+  }
+
+  /**
+   * @param {Record<string, string> | null | undefined} headers
+   */
+  #stageHeaders(headers) {
     if (!headers) {
       return
     }
 
     if (headers === TEXT_PLAIN_HEADER) {
-      this.res.writeHeader('content-type', 'text/plain; charset=utf-8')
+      this.#stageHeader('content-type', 'text/plain; charset=utf-8')
       return
     }
 
     if (headers === JSON_HEADER) {
-      this.res.writeHeader('content-type', 'application/json; charset=utf-8')
+      this.#stageHeader('content-type', 'application/json; charset=utf-8')
       return
     }
 
     if (headers === OCTET_STREAM_HEADER) {
-      this.res.writeHeader('content-type', 'application/octet-stream')
+      this.#stageHeader('content-type', 'application/octet-stream')
       return
     }
 
     for (const key in headers) {
       const value = headers[key]
 
-      if (value !== undefined && value !== null) {
-        this.res.writeHeader(key, value)
-      }
+      this.#stageHeader(key, value)
+    }
+  }
+
+  /**
+   * @param {Record<string, string> | null | undefined} headers
+   */
+  #flushPendingHeaders(headers = null) {
+    if (!this.res) {
+      this.#pendingHeaders.clear()
+      return
+    }
+
+    if (headers) {
+      this.#stageHeaders(headers)
     }
+
+    for (const [, [key, value]] of this.#pendingHeaders) {
+      this.res.writeHeader(key, value)
+    }
+
+    this.#pendingHeaders.clear()
   }
 
   /**
@@ -515,7 +598,7 @@ export default class HttpContext {
       }
 
       this.res.writeStatus(this.getStatus(status))
-      this.setHeaders(headers)
+      this.#flushPendingHeaders(headers)
 
       if (body != null) {
         this.res.end(body)

package/src/res-streamer.js

@@ -107,7 +107,7 @@ export default class ResStreamer {
 
     res.cork(() => {
       res.writeStatus(typeof status === 'string' ? status : this.#ctx.getStatus(status))
-      this.#ctx.setHeaders(headers)
+      this.#ctx.flushHeaders(headers)
     })
 
     this.#started = true