@nxtedition/lib 21.8.3 → 21.8.4

package/http.js

@@ -363,7 +363,6 @@ export async function request(ctx, next) {
 }
 
 export class ServerResponse extends http.ServerResponse {
-  #now = 0
   #created = 0
   #timing = {
     connect: -1,
@@ -380,15 +379,13 @@ export class ServerResponse extends http.ServerResponse {
     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
+        this.#timing.headers = performance.now() - this.#created
       }
     }
     return super.flushHeaders()
@@ -397,8 +394,7 @@ export class ServerResponse extends http.ServerResponse {
   write(chunk, encoding, callback) {
     if (!this.destroyed) {
       if (this.#timing.data === -1) {
-        this.#timing.data = performance.now() - this.#now
-        this.#now += this.#timing.data
+        this.#timing.data = performance.now() - this.#created
       }
 
       if (this.#timing.headers === -1) {
@@ -411,17 +407,15 @@ export class ServerResponse extends http.ServerResponse {
 
   end(chunk, encoding, callback) {
     if (!this.destroyed) {
+      this.#timing.end = performance.now() - this.#created
+
       if (this.#timing.data === -1) {
-        this.#timing.data = performance.now() - this.#now
-        this.#now += this.#timing.data
+        this.#timing.data = this.#timing.end
       }
 
       if (this.#timing.headers === -1) {
         this.#timing.headers = this.#timing.data
       }
-
-      this.#timing.end = performance.now() - this.#now
-      this.#now += this.#timing.end
     }
 
     return super.end(chunk, encoding, callback)
@@ -430,8 +424,7 @@ export class ServerResponse extends http.ServerResponse {
   destroy(err) {
     if (!this.destroyed) {
       if (this.#timing.end === -1) {
-        this.#timing.end = performance.now() - this.#now
-        this.#now += this.#timing.end
+        this.#timing.end = performance.now() - this.#created
       }
     }
 
@@ -440,7 +433,6 @@ export class ServerResponse extends http.ServerResponse {
 }
 
 export class Http2ServerResponse extends http2.Http2ServerResponse {
-  #now = 0
   #created = 0
   #timing = {
     connect: -1,
@@ -457,15 +449,13 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
     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
+        this.#timing.headers = performance.now() - this.#created
       }
     }
     return super.flushHeaders()
@@ -474,8 +464,7 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
   write(chunk, encoding, callback) {
     if (!this.destroyed) {
       if (this.#timing.data === -1) {
-        this.#timing.data = performance.now() - this.#now
-        this.#now += this.#timing.data
+        this.#timing.data = performance.now() - this.#created
       }
 
       if (this.#timing.headers === -1) {
@@ -488,17 +477,15 @@ export class Http2ServerResponse extends http2.Http2ServerResponse {
 
   end(chunk, encoding, callback) {
     if (!this.destroyed) {
+      this.#timing.end = performance.now() - this.#created
+
       if (this.#timing.data === -1) {
-        this.#timing.data = performance.now() - this.#now
-        this.#now += this.#timing.data
+        this.#timing.data = this.#timing.end
       }
 
       if (this.#timing.headers === -1) {
         this.#timing.headers = this.#timing.data
       }
-
-      this.#timing.end = performance.now() - this.#now
-      this.#now += this.#timing.end
     }
 
     return super.end(chunk, encoding, callback)

package/package.json

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