@nxtedition/lib 26.4.2 → 26.4.3

package/http.js

@@ -418,7 +418,8 @@ export class ServerResponse extends http.ServerResponse {
   #data = -1
   #end = -1
 
-  #headersObj = undefined
+  #headersObj = kEmptyObj
+  #headersSent = false
 
   /**
    * @returns {{
@@ -457,13 +458,15 @@ export class ServerResponse extends http.ServerResponse {
    * @param {string} val
    */
   setHeader(key, val) {
-    if (this.#headersObj === null) {
+    if (this.#headersSent) {
       throw new Error('headers already sent')
-    } else if (this.#headersObj === undefined) {
-      this.#headersObj = { key: val }
-    } else {
-      this.#headersObj[key] = val
     }
+
+    if (this.#headersObj === kEmptyObj) {
+      this.#headersObj = {}
+    }
+
+    this.#headersObj[key] = val
   }
 
   /**
@@ -471,11 +474,11 @@ export class ServerResponse extends http.ServerResponse {
    * @param {string} val
    */
   removeHeader(key, val) {
-    if (this.#headersObj === null) {
+    if (this.#headersSent) {
       throw new Error('headers already sent')
-    } else if (this.#headersObj === undefined) {
-      // Do nothing...
-    } else {
+    }
+
+    if (this.#headersObj !== kEmptyObj) {
       delete this.#headersObj[key]
     }
   }
@@ -484,31 +487,25 @@ export class ServerResponse extends http.ServerResponse {
    * @returns {string[]}
    */
   getHeaderNames() {
-    if (this.#headersObj === null) {
+    if (this.#headersSent) {
       throw new Error('headers already sent')
-    } else if (this.#headersObj === undefined) {
-      return kEmptyArr
-    } else {
-      return Object.keys(this.#headersObj)
     }
+
+    return this.#headersObj === kEmptyObj ? kEmptyArr : Object.keys(this.#headersObj)
   }
 
   /**
    * @returns {Record<string, string>}
    */
   getHeaders() {
-    if (this.#headersObj === undefined) {
-      return kEmptyObj
-    } else {
-      return this.#headersObj
-    }
+    return this.#headersObj
   }
 
   /**
    * @returns {boolean}
    */
   get headersSent() {
-    return this.#headersObj === null
+    return this.#headersSent
   }
 
   /**
@@ -517,11 +514,11 @@ export class ServerResponse extends http.ServerResponse {
    * @returns
    */
   writeHead(statusCode, headers) {
-    if (this.#headersObj === null) {
+    if (this.#headersSent) {
       throw new Error('headers already sent')
-    } else if (this.#headersObj === undefined) {
-      // Do nothing...
-    } else {
+    }
+
+    if (this.#headersObj !== kEmptyObj) {
       headers = headers ? Object.assign(this.#headersObj, headers) : this.#headersObj
     }
 
@@ -531,8 +528,6 @@ export class ServerResponse extends http.ServerResponse {
       }
     }
 
-    this.#headersObj = null
-
     return super.writeHead(statusCode, headers)
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "26.4.2",
+  "version": "26.4.3",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",