fix: id fallback from headers

Author: ronag

lib/index.js

@@ -69,14 +69,12 @@ function wrapDispatch(dispatcher) {
       (dispatch) => (opts, handler) => {
         const headers = parseHeaders(opts.headers)
 
-        const userAgent = opts.userAgent ?? globalThis.userAgent
-        if (userAgent && headers?.['user-agent'] !== userAgent) {
-          headers['user-agent'] = userAgent
-        }
+        // TODO (fix): Move to interceptor?
+        headers['user-agent'] ??= opts.userAgent ?? globalThis.userAgent
 
         return dispatch(
           {
-            id: opts.id,
+            id: opts.id ?? headers['request-id'],
             origin: opts.origin,
             path: opts.path,
             method: opts.method ?? (opts.body ? 'POST' : 'GET'),

lib/interceptor/response-verify.js

@@ -2,8 +2,6 @@ import crypto from 'node:crypto'
 import assert from 'node:assert'
 import { DecoratorHandler, parseHeaders } from '../utils.js'
 
-const DEFAULT_OPTS = { hash: null }
-
 class Handler extends DecoratorHandler {
   #verifyOpts
   #contentMD5
@@ -14,8 +12,7 @@ class Handler extends DecoratorHandler {
   constructor(opts, { handler }) {
     super(handler)
 
-    this.#verifyOpts =
-      opts.verify === true ? { hash: true, size: true } : (opts.verify ?? DEFAULT_OPTS)
+    this.#verifyOpts = opts.verify === true ? { hash: true, size: true } : opts.verify
   }
 
   onConnect(abort) {
@@ -31,7 +28,7 @@ class Handler extends DecoratorHandler {
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     this.#contentMD5 = this.#verifyOpts.hash ? headers['content-md5'] : null
-    this.#contentLength = this.#verifyOpts.hash ? headers['content-length'] : null
+    this.#contentLength = this.#verifyOpts.size ? headers['content-length'] : null
     this.#hasher = this.#contentMD5 != null ? crypto.createHash('md5') : null
 
     return super.onHeaders(statusCode, null, resume, null, headers)

test/response-content.js

@@ -83,7 +83,7 @@ test('put & get', (t) => {
         verify: true,
         method: 'PUT',
         body: async function () {
-          const { body } = await request(`http://0.0.0.0:${port}`)
+          const { body } = await request(`http://0.0.0.0:${port}`, { verify: true })
           return body
         },
       })