@nxtedition/lib 20.2.3 → 20.3.1

package/couch.js

@@ -1136,53 +1136,45 @@ const defaultDispatcher = new Agent({
   connections: 8,
 })
 
-export function request(
-  url,
-  {
-    body = null,
-    method = body ? 'POST' : 'GET',
-    query = null,
-    headers = null,
-    dispatcher = defaultDispatcher,
-    signal = null,
-    logger = null,
-    stream = false,
-    blocking = Boolean(stream),
-    headerTimeout,
-    bodyTimeout,
-  } = {},
-) {
-  signal?.throwIfAborted()
-
-  url = new URL(url)
-  if (url.search) {
-    throw new Error('invalid url: ' + url.href)
+export function request(url, opts) {
+  if (typeof url === 'string') {
+    opts = { url: new URL(url), ...opts }
+  } else if (url instanceof URL) {
+    opts = { url, ...opts }
+  } else if (typeof url.origin === 'string' && typeof (url.path ?? url.pathname) === 'string') {
+    opts = opts ? { ...url, ...opts } : url
   }
 
-  const opts = {
+  if (opts == null && typeof url === 'object' && url != null) {
+    opts = url
+  }
+
+  const ureq = {
+    ...opts,
     url,
-    method,
-    query,
-    blocking,
+    method: opts.method ?? (opts.body ? 'POST' : 'GET'),
+    blocking: opts.blocking ?? Boolean(stream),
     headers: {
-      'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
+      'content-type':
+        opts.body != null && typeof opts.body === 'object' ? 'application/json' : 'plain/text',
       accept: 'application/json',
-      ...headers,
+      ...opts.headers,
     },
-    logger,
-    body: body != null && typeof body === 'object' ? JSON.stringify(body) : body,
-    headerTimeout,
-    bodyTimeout,
+    body:
+      opts.body != null && typeof opts.body === 'object' ? JSON.stringify(opts.body) : opts.body,
   }
 
+  const dispatcher = opts.dispatcher ?? defaultDispatcher
+  const signal = opts.signal
+
   if (stream) {
     const handler = new StreamOutput({ signal, ...stream })
-    dispatch(dispatcher, opts, handler)
+    dispatch(dispatcher, ureq, handler)
     return handler
   } else {
     return new Promise((resolve, reject) => {
       const handler = new PromiseOutput({ resolve, reject, signal })
-      dispatch(dispatcher, opts, handler)
+      dispatch(dispatcher, ureq, handler)
     })
   }
 }

package/http.js

@@ -163,41 +163,73 @@ export async function request(ctx, next) {
 }
 
 export class ServerResponse extends http.ServerResponse {
+  #now = 0
+  #created = 0
+  #timing = {
+    connect: -1,
+    headers: -1,
+    data: -1,
+    complete: -1,
+    error: -1,
+  }
+
+  get timing() {
+    return this.#timing
+  }
+
   constructor(req) {
     super(req)
-    this.startTime = performance.now()
-    this.stats = {
-      headers: -1,
-      ttfb: -1,
-    }
+
+    this.#created = performance.now()
+    this.#now = this.#created
+    this.#timing.connect = 0
   }
 
   flushHeaders() {
-    if (this.stats.headers === -1) {
-      this.stats.headers = performance.now() - this.startTime
+    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.stats.ttfb === -1) {
-      this.stats.ttfb = performance.now() - this.startTime
+    if (this.#timing.data === -1) {
+      this.#timing.data = performance.now() - this.#now
+      this.#now += this.#timing.data
     }
-    if (this.stats.headers === -1) {
-      this.stats.headers = this.stats.ttfb
+
+    if (this.#timing.headers === -1) {
+      this.#timing.headers = this.#timing.data
     }
+
     return super.write(chunk, encoding, callback)
   }
 
   end(chunk, encoding, callback) {
-    if (this.stats.ttfb === -1) {
-      this.stats.ttfb = performance.now() - this.startTime
+    if (this.#timing.data === -1) {
+      this.#timing.data = performance.now() - this.#now
+      this.#now += this.#timing.data
     }
-    if (this.stats.headers === -1) {
-      this.stats.headers = this.stats.ttfb
+
+    if (this.#timing.headers === -1) {
+      this.#timing.headers = this.#timing.data
+    }
+
+    if (this.#timing.complete === -1) {
+      this.#timing.complete = performance.now() - this.#created
     }
+
     return super.end(chunk, encoding, callback)
   }
+
+  destroy(err) {
+    if (err != null && this.#timing.error === -1) {
+      this.#timing.error = performance.now() - this.#created
+    }
+
+    return super.destroy(err)
+  }
 }
 
 export function createServer(options, ctx, middleware) {

package/package.json

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

package/serializers.js

@@ -21,19 +21,25 @@ function getHeaders(obj) {
   )
 }
 
+function getTiming(obj) {
+  const timing = obj?.timing ?? obj.stats
+  if (!timing) {
+    return undefined
+  }
+  return {
+    created: timing.created ?? -1,
+    connect: timing.connect ?? -1,
+    headers: timing.headers ?? -1,
+    data: timing.data ?? -1,
+    complete: timing.complete ?? -1,
+    error: timing.error ?? -1,
+  }
+}
+
 export default {
   data: (data) =>
     data != null && typeof data === 'object' ? JSON.stringify(data, undefined, 2) : data,
   err: (err) => errSerializer(err),
-  res: (res) =>
-    res && {
-      id: res.id || res.req?.id || getHeader(res, 'request-id') || getHeader(res.req, 'request-id'),
-      stats: res.stats,
-      statusCode: res.statusCode || res.status,
-      bytesWritten: res.bytesWritten,
-      headers: getHeaders(res),
-      headersSent: res.headersSent,
-    },
   socket: (socket) =>
     socket && {
       id: socket.id || null,
@@ -43,21 +49,35 @@ export default {
       remoteAddress: socket.remoteAddress ?? null,
       headers: socket.headers,
     },
+  res: (res) =>
+    res && {
+      id: res.id || res.req?.id || getHeader(res, 'request-id') || getHeader(res.req, 'request-id'),
+      timing: getTiming(res),
+      statusCode: res.statusCode || res.status,
+      bytesWritten: res.bytesWritten,
+      bytesWrittenPerSecond: res.bytesWrittenPerSecond,
+      headers: getHeaders(res),
+      headersSent: res.headersSent,
+    },
   req: (req) =>
     req && {
       id: req.id || getHeader(req, 'request-id'),
+      timing: getTiming(req),
       method: req.method,
       url: req.url,
       headers: getHeaders(req),
       bytesRead: req.bytesRead,
+      bytesReadPerSecond: req.bytesReadPerSecond,
       remoteAddress: req.socket?.remoteAddress,
       remotePort: req.socket?.remotePort,
     },
   ures: (ures) =>
     ures && {
       id: ures.id || getHeader(ures, 'request-id') || getHeader(ures.req, 'request-id'),
+      timing: getTiming(ures),
       statusCode: ures.statusCode ?? ures.status,
       bytesRead: ures.bytesRead,
+      bytesReadPerSecond: ures.bytesReadPerSecond,
       body: typeof ures.body === 'string' ? ures.body : null,
       headers: getHeaders(ures),
     },
@@ -80,10 +100,12 @@ export default {
 
     return {
       id: ureq.id || getHeader(ureq, 'request-id'),
+      timing: getTiming(ureq),
       method: ureq.method,
       url,
       body: typeof ureq.body === 'string' ? ureq.body : null,
       bytesWritten: ureq.bytesWritten,
+      bytesWrittenPerSecond: ureq.bytesWrittenPerSecond,
       headers: getHeaders(ureq),
       query: ureq.query,
     }