@nxtedition/lib 20.3.7 → 20.4.0

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'
@@ -222,6 +223,71 @@ export class ServerResponse extends http.ServerResponse {
   }
 }
 
+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.#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.#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.#timing.headers === -1) {
+      this.#timing.headers = this.#timing.data
+    }
+
+    return super.end(chunk, encoding, callback)
+  }
+
+  destroy(err) {
+    if (this.#timing.complete === -1) {
+      this.#timing.complete = performance.now() - this.#created
+    }
+
+    return super.destroy(err)
+  }
+}
+
 export function createServer(options, ctx, middleware) {
   middleware = Array.isArray(middleware) ? middleware : [middleware]
   middleware = fp.values(middleware)

package/package.json

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

package/util/compare-rev.js

@@ -12,29 +12,29 @@ export function compareRevStringString(a, b) {
     }
   }
 
-  let indexA = 0
   const endA = a.length
+  let idxA = 0
   let lenA = endA
 
-  let indexB = 0
   const endB = b.length
+  let idxB = 0
   let lenB = endB
 
   // Skip leading zeroes
-  while (a[indexA] === '0') {
-    ++indexA
+  while (a[idxA] === '0') {
+    ++idxA
     --lenA
   }
-  while (b[indexB] === '0') {
-    ++indexB
+  while (b[idxB] === '0') {
+    ++idxB
     --lenB
   }
 
   // Compare the revision number
   let result = 0
-  while (indexA < endA && indexB < endB) {
-    const ac = a[indexA++]
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = a[idxA++]
+    const bc = b[idxB++]
 
     if (ac === '-') {
       if (bc === '-') {
@@ -53,9 +53,9 @@ export function compareRevStringString(a, b) {
   }
 
   // Compare the rest
-  while (indexA < endA && indexB < endB) {
-    const ac = a[indexA++]
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = a[idxA++]
+    const bc = b[idxB++]
     if (ac !== bc) {
       return ac < bc ? -1 : 1
     }
@@ -78,29 +78,29 @@ export function compareRevBufferBuffer(a, b) {
     }
   }
 
-  let indexA = 0
   const endA = a.length
+  let idxA = 0
   let lenA = endA
 
-  let indexB = 0
   const endB = b.length
+  let idxB = 0
   let lenB = endB
 
   // Skip leading zeroes
-  while (a[indexA] === ordZero) {
-    ++indexA
+  while (a[idxA] === ordZero) {
+    ++idxA
     --lenA
   }
-  while (b[indexB] === ordZero) {
-    ++indexB
+  while (b[idxB] === ordZero) {
+    ++idxB
     --lenB
   }
 
   // Compare the revision number
   let result = 0
-  while (indexA < endA && indexB < endB) {
-    const ac = a[indexA++]
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = a[idxA++]
+    const bc = b[idxB++]
 
     const isDashA = ac === ordDash
     const isDashB = bc === ordDash
@@ -121,9 +121,9 @@ export function compareRevBufferBuffer(a, b) {
   }
 
   // Compare the rest
-  while (indexA < endA && indexB < endB) {
-    const ac = a[indexA++]
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = a[idxA++]
+    const bc = b[idxB++]
     result = ac - bc
     if (result) {
       return result
@@ -143,29 +143,29 @@ export function compareRevBufferString(a, b) {
     }
   }
 
-  let indexA = 0
+  let idxA = 0
   const endA = a.length
   let lenA = endA
 
-  let indexB = 0
+  let idxB = 0
   const endB = b.length
   let lenB = endB
 
   // Skip leading zeroes
-  while (a[indexA] === ordZero) {
-    ++indexA
+  while (a[idxA] === ordZero) {
+    ++idxA
     --lenA
   }
-  while (b[indexB] === '0') {
-    ++indexB
+  while (b[idxB] === '0') {
+    ++idxB
     --lenB
   }
 
   // Compare the revision number
   let result = 0
-  while (indexA < endA && indexB < endB) {
-    const ac = String.fromCharCode(a[indexA++])
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = String.fromCharCode(a[idxA++])
+    const bc = b[idxB++]
 
     const isDashA = ac === '-'
     const isDashB = bc === '-'
@@ -186,9 +186,9 @@ export function compareRevBufferString(a, b) {
   }
 
   // Compare the rest
-  while (indexA < endA && indexB < endB) {
-    const ac = String.fromCharCode(a[indexA++])
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = String.fromCharCode(a[idxA++])
+    const bc = b[idxB++]
     if (ac !== bc) {
       return ac < bc ? -1 : 1
     }
@@ -209,40 +209,60 @@ export function compareRevSliceSlice(a, b) {
     return 0
   }
 
-  let indexA = a.byteOffset
   const endA = a.byteOffset + a.byteLength
+  let idxA = a.byteOffset
   let lenA = endA
   a = a.buffer
 
-  let indexB = b.byteOffset
+  if (
+    !Buffer.isBuffer(a) ||
+    !Number.isInteger(idxA) ||
+    idxA < 0 ||
+    !Number.isInteger(lenA) ||
+    lenA < 0
+  ) {
+    throw new Error('invalid argument: a')
+  }
+
   const endB = b.byteOffset + b.byteLength
+  let idxB = b.byteOffset
   let lenB = endB
   b = b.buffer
 
+  if (
+    !Buffer.isBuffer(b) ||
+    !Number.isInteger(idxB) ||
+    idxB < 0 ||
+    !Number.isInteger(lenB) ||
+    lenB < 0
+  ) {
+    throw new Error('invalid argument: b')
+  }
+
   // Handle INF-XXXXXXXX
   {
-    const isInfA = a[indexA] === ordI
-    const isInfB = b[indexB] === ordI
+    const isInfA = a[idxA] === ordI
+    const isInfB = b[idxB] === ordI
     if (isInfA !== isInfB) {
       return isInfB ? -1 : 1
     }
   }
 
   // Skip leading zeroes
-  while (a[indexA] === ordZero) {
-    ++indexA
+  while (a[idxA] === ordZero) {
+    ++idxA
     --lenA
   }
-  while (b[indexB] === ordZero) {
-    ++indexB
+  while (b[idxB] === ordZero) {
+    ++idxB
     --lenB
   }
 
   // Compare the revision number
   let result = 0
-  while (indexA < endA && indexB < endB) {
-    const ac = a[indexA++]
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = a[idxA++]
+    const bc = b[idxB++]
 
     const isDashA = ac === ordDash
     const isDashB = bc === ordDash
@@ -263,9 +283,9 @@ export function compareRevSliceSlice(a, b) {
   }
 
   // Compare the rest
-  while (indexA < endA && indexB < endB) {
-    const ac = a[indexA++]
-    const bc = b[indexB++]
+  while (idxA < endA && idxB < endB) {
+    const ac = a[idxA++]
+    const bc = b[idxB++]
     result = ac - bc
     if (result) {
       return result