@nxtedition/lib 20.3.9 → 20.4.1

package/http.js

@@ -1,3 +1,4 @@
+import http2 from 'node:http2'
 import createError from 'http-errors'
 import { performance } from 'perf_hooks'
 import requestTarget from 'request-target'
@@ -180,44 +181,129 @@ export class ServerResponse extends http.ServerResponse {
   }
 
   flushHeaders() {
-    if (this.#timing.headers === -1) {
-      this.#timing.headers = performance.now() - this.#now
-      this.#now += this.#timing.headers
+    if (!this.destroyed) {
+      if (this.#timing.headers === -1) {
+        this.#timing.headers = performance.now() - this.#now
+        this.#now += this.#timing.headers
+      }
     }
     return super.flushHeaders()
   }
 
   write(chunk, encoding, callback) {
-    if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#now
-      this.#now += this.#timing.data
-    }
+    if (!this.destroyed) {
+      if (this.#timing.data === -1) {
+        this.#timing.data = performance.now() - this.#now
+        this.#now += this.#timing.data
+      }
 
-    if (this.#timing.headers === -1) {
-      this.#timing.headers = this.#timing.data
+      if (this.#timing.headers === -1) {
+        this.#timing.headers = this.#timing.data
+      }
     }
 
     return super.write(chunk, encoding, callback)
   }
 
   end(chunk, encoding, callback) {
-    if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#now
-      this.#now += this.#timing.data
-    }
+    if (!this.destroyed) {
+      if (this.#timing.data === -1) {
+        this.#timing.data = performance.now() - this.#now
+        this.#now += this.#timing.data
+      }
+
+      if (this.#timing.headers === -1) {
+        this.#timing.headers = this.#timing.data
+      }
 
-    if (this.#timing.headers === -1) {
-      this.#timing.headers = this.#timing.data
+      this.#timing.complete = performance.now() - this.#created
     }
 
     return super.end(chunk, encoding, callback)
   }
 
   destroy(err) {
-    if (this.#timing.complete === -1) {
+    if (!this.destroyed) {
+      if (this.#timing.complete === -1) {
+        this.#timing.complete = performance.now() - this.#created
+      }
+    }
+
+    return super.destroy(err)
+  }
+}
+
+export class Http2ServerResponse extends http2.Http2ServerResponse {
+  #now = 0
+  #created = 0
+  #timing = {
+    connect: -1,
+    headers: -1,
+    data: -1,
+    complete: -1,
+  }
+
+  get timing() {
+    return this.#timing
+  }
+
+  constructor(req) {
+    super(req)
+
+    this.#created = performance.now()
+    this.#now = this.#created
+    this.#timing.connect = 0
+  }
+
+  flushHeaders() {
+    if (!this.destroyed) {
+      if (this.#timing.headers === -1) {
+        this.#timing.headers = performance.now() - this.#now
+        this.#now += this.#timing.headers
+      }
+    }
+    return super.flushHeaders()
+  }
+
+  write(chunk, encoding, callback) {
+    if (!this.destroyed) {
+      if (this.#timing.data === -1) {
+        this.#timing.data = performance.now() - this.#now
+        this.#now += this.#timing.data
+      }
+
+      if (this.#timing.headers === -1) {
+        this.#timing.headers = this.#timing.data
+      }
+    }
+
+    return super.write(chunk, encoding, callback)
+  }
+
+  end(chunk, encoding, callback) {
+    if (!this.destroyed) {
+      if (this.#timing.data === -1) {
+        this.#timing.data = performance.now() - this.#now
+        this.#now += this.#timing.data
+      }
+
+      if (this.#timing.headers === -1) {
+        this.#timing.headers = this.#timing.data
+      }
+
       this.#timing.complete = performance.now() - this.#created
     }
 
+    return super.end(chunk, encoding, callback)
+  }
+
+  destroy(err) {
+    if (!this.destroyed) {
+      if (this.#timing.complete === -1) {
+        this.#timing.complete = performance.now() - this.#created
+      }
+    }
+
     return super.destroy(err)
   }
 }

package/package.json

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

package/serializers.js

@@ -27,7 +27,6 @@ function getTiming(obj) {
     return undefined
   }
   return {
-    created: timing.created ?? -1,
     connect: timing.connect ?? -1,
     headers: timing.headers ?? -1,
     data: timing.data ?? -1,