Handle review comments on respond header prep & sentHeader testing

Author: pimterry

lib/internal/http2/core.js

@@ -2565,7 +2565,7 @@ function prepareResponseHeaders(stream, headersParam, options) {
 }
 
 function prepareResponseHeadersObject(oldHeaders, options) {
-  assertIsObject(oldHeaders, 'headers');
+  assertIsObject(oldHeaders, 'headers', ['Object', 'Array']);
   const headers = { __proto__: null };
 
   if (oldHeaders !== null && oldHeaders !== undefined) {
@@ -2586,18 +2586,7 @@ function prepareResponseHeadersObject(oldHeaders, options) {
     headers[HTTP2_HEADER_DATE] ??= utcDate();
   }
 
-  // This is intentionally stricter than the HTTP/1 implementation, which
-  // allows values between 100 and 999 (inclusive) in order to allow for
-  // backwards compatibility with non-spec compliant code. With HTTP/2,
-  // we have the opportunity to start fresh with stricter spec compliance.
-  // This will have an impact on the compatibility layer for anyone using
-  // non-standard, non-compliant status codes.
-  if (statusCode < 200 || statusCode > 599)
-    throw new ERR_HTTP2_STATUS_INVALID(headers[HTTP2_HEADER_STATUS]);
-
-  const neverIndex = headers[kSensitiveHeaders];
-  if (neverIndex !== undefined && !ArrayIsArray(neverIndex))
-    throw new ERR_INVALID_ARG_VALUE('headers[http2.neverIndex]', neverIndex);
+  validatePreparedResponseHeaders(headers, statusCode);
 
   return {
     headers,
@@ -2629,6 +2618,12 @@ function prepareResponseHeadersArray(headers, options) {
     headers.push(HTTP2_HEADER_DATE, utcDate());
   }
 
+  validatePreparedResponseHeaders(headers, statusCode);
+
+  return { headers, statusCode };
+}
+
+function validatePreparedResponseHeaders(headers, statusCode) {
   // This is intentionally stricter than the HTTP/1 implementation, which
   // allows values between 100 and 999 (inclusive) in order to allow for
   // backwards compatibility with non-spec compliant code. With HTTP/2,
@@ -2641,8 +2636,6 @@ function prepareResponseHeadersArray(headers, options) {
   const neverIndex = headers[kSensitiveHeaders];
   if (neverIndex !== undefined && !ArrayIsArray(neverIndex))
     throw new ERR_INVALID_ARG_VALUE('headers[http2.neverIndex]', neverIndex);
-
-  return { headers, statusCode };
 }
 
 function onFileUnpipe() {

test/parallel/test-http2-raw-headers-defaults.js

@@ -23,6 +23,16 @@ const http2 = require('http2');
       'x-FOO', 'bar',
       'x', '2',
     ]);
+
+    assert.partialDeepStrictEqual(stream.sentHeaders, {
+      '__proto__': null,
+      ':status': 200,
+      'x': [ '1', '2' ],
+      'x-FOO': 'bar',
+    });
+
+    assert.strictEqual(typeof stream.sentHeaders.date, 'string');
+
     stream.end();
   }));