@swarmmachina/swm-core 1.1.2 → 1.1.4

package/package.json

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

package/src/http-context.js

@@ -6,8 +6,15 @@ export default class HttpContext {
   #ip = ''
   #method = ''
   #url = ''
+  #headersCached = false
+  #headers = {}
+  #fullQuery = null
+  #fullQueryParsed = false
+  #query = {}
+  #params = {}
   #statusOverride = null
   #contentLength = undefined
+  #pendingHeaders = new Map()
   #bodyParser = new BodyParser()
   #resStreamer = new ResStreamer()
 
@@ -108,10 +115,17 @@ 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.#fullQueryParsed = false
+    this.#query = {}
+    this.#params = {}
 
     this.#bodyParser.reset(this, maxSize)
     this.#resStreamer.reset(this, res)
@@ -135,9 +149,16 @@ 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.#fullQueryParsed = false
+    this.#query = {}
+    this.#params = {}
 
     this.#bodyParser.clear()
     this.#resStreamer.clear()
@@ -166,6 +187,68 @@ export default class HttpContext {
     }
   }
 
+  cacheHeaders() {
+    if (this.#headersCached || !this.req) {
+      return
+    }
+
+    this.req.forEach((key, value) => {
+      this.#headers[key] = value
+    })
+
+    this.#headersCached = true
+  }
+
+  cacheQuery() {
+    if (this.#fullQuery !== null || !this.req) {
+      return
+    }
+
+    const fullQuery = this.req.getQuery()
+
+    this.#fullQuery = typeof fullQuery === 'string' ? fullQuery : ''
+    this.#fullQueryParsed = false
+  }
+
+  #parseFullQuery() {
+    if (this.#fullQueryParsed) {
+      return
+    }
+
+    const fullQuery = this.#fullQuery
+
+    if (!fullQuery) {
+      this.#fullQueryParsed = true
+      return
+    }
+
+    let start = 0
+
+    while (start <= fullQuery.length) {
+      let end = fullQuery.indexOf('&', start)
+
+      if (end === -1) {
+        end = fullQuery.length
+      }
+
+      const eq = fullQuery.indexOf('=', start)
+      const hasEq = eq !== -1 && eq < end
+      const key = hasEq ? fullQuery.slice(start, eq) : fullQuery.slice(start, end)
+
+      if (!(key in this.#query)) {
+        this.#query[key] = hasEq ? fullQuery.slice(eq + 1, end) : ''
+      }
+
+      if (end === fullQuery.length) {
+        break
+      }
+
+      start = end + 1
+    }
+
+    this.#fullQueryParsed = true
+  }
+
   ip() {
     if (!this.res) {
       return ''
@@ -213,7 +296,25 @@ export default class HttpContext {
    * @returns {string|undefined}
    */
   query(name) {
-    return this.req.getQuery(name)
+    if (name in this.#query) {
+      return this.#query[name]
+    }
+
+    if (this.#fullQuery !== null) {
+      this.#parseFullQuery()
+
+      if (name in this.#query) {
+        return this.#query[name]
+      }
+
+      this.#query[name] = undefined
+      return undefined
+    }
+
+    const value = this.req.getQuery(name)
+
+    this.#query[name] = value
+    return value
   }
 
   /**
@@ -221,7 +322,14 @@ export default class HttpContext {
    * @returns {string|undefined}
    */
   param(i) {
-    return this.req.getParameter(i)
+    if (i in this.#params) {
+      return this.#params[i]
+    }
+
+    const value = this.req.getParameter(i)
+
+    this.#params[i] = value
+    return value
   }
 
   /**
@@ -229,7 +337,18 @@ export default class HttpContext {
    * @returns {string}
    */
   header(name) {
-    return this.req.getHeader(name)
+    if (name in this.#headers) {
+      return this.#headers[name]
+    }
+
+    if (this.#headersCached) {
+      return ''
+    }
+
+    const value = this.req.getHeader(name)
+
+    this.#headers[name] = value
+    return value
   }
 
   contentLength() {
@@ -280,7 +399,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
   }
 
@@ -288,34 +411,85 @@ 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()
+  }
+
   /**
    * @param {any} result
    * @returns {void}
@@ -399,7 +573,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/index.js

@@ -325,6 +325,11 @@ export default class Server {
     }
 
     if (isPromise(result)) {
+      ctx.method()
+      ctx.url()
+      ctx.cacheQuery()
+      ctx.cacheHeaders()
+
       // eslint-disable-next-line promise/catch-or-return
       result.then(ctx.onResolve, ctx.onReject)
       return

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