Respect headers from transport option nodeOptions.headers (#1219)

connectrpc · Sep 9, 2024 · ed63cee · ed63cee
1 parent 6d375c1
commit ed63cee
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 26 deletions.
diff --git a/packages/connect-node/src/node-universal-client.ts b/packages/connect-node/src/node-universal-client.ts
@@ -130,13 +130,12 @@ function createNodeHttp1Client(
       sentinel.catch((e) => {
         reject(e);
       });
-
       h1Request(
         sentinel,
         req.url,
         {
           ...httpOptions,
-          headers: webHeaderToNodeHeaders(req.header),
+          headers: webHeaderToNodeHeaders(req.header, httpOptions?.headers),
           method: req.method,
         },
         (request) => {

diff --git a/packages/connect-node/src/node-universal-header.spec.ts b/packages/connect-node/src/node-universal-header.spec.ts
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import * as http from "http";
 import {
   nodeHeaderToWebHeader,
   webHeaderToNodeHeaders,
@@ -124,4 +125,24 @@ describe("webHeaderToNodeHeaders()", function () {
       });
     });
   }
+  it("should accept default node headers", function () {
+    const nodeDefaults: http.OutgoingHttpHeaders = {
+      a: "a",
+      b: ["b1", "b2"],
+      c: 123,
+    };
+    const webHeaders: HeadersInit = [
+      ["b", "web"],
+      ["c", "456"],
+      ["d", "d1"],
+      ["d", "d2"],
+    ];
+    const h = webHeaderToNodeHeaders(webHeaders, nodeDefaults);
+    expect(h).toEqual({
+      a: "a",
+      b: ["b1", "b2", "web"],
+      c: ["123", "456"],
+      d: ["d1", "d2"],
+    });
+  });
 });
diff --git a/packages/connect-node/src/node-universal-header.ts b/packages/connect-node/src/node-universal-header.ts
@@ -53,45 +53,66 @@ export function nodeHeaderToWebHeader(
 
 /**
  * Convert a fetch API Headers object to a Node.js headers object.
+ *
+ * Optionally accepts default Node.js headers. If provided, fetch API headers
+ * are appended to the defaults. The original defaults headers are not modified.
  */
 export function webHeaderToNodeHeaders(
   headersInit: HeadersInit,
+  defaultNodeHeaders?: http.OutgoingHttpHeaders,
 ): http.OutgoingHttpHeaders;
 export function webHeaderToNodeHeaders(
   headersInit: HeadersInit | undefined,
 ): http.OutgoingHttpHeaders | undefined;
 export function webHeaderToNodeHeaders(
   headersInit: HeadersInit | undefined,
+  defaultNodeHeaders?: http.OutgoingHttpHeaders,
 ): http.OutgoingHttpHeaders | undefined {
-  if (headersInit === undefined) {
+  if (headersInit === undefined && defaultNodeHeaders === undefined) {
     return undefined;
   }
   const o = Object.create(null) as http.OutgoingHttpHeaders;
-  const append = (key: string, value: string): void => {
-    key = key.toLowerCase();
-    const existing = o[key];
-    if (typeof existing == "string") {
-      o[key] = [existing, value];
-    } else if (Array.isArray(existing)) {
-      existing.push(value);
-    } else {
-      o[key] = value;
-    }
-  };
-  if (Array.isArray(headersInit)) {
-    for (const [key, value] of headersInit) {
-      append(key, value);
-    }
-  } else if ("forEach" in headersInit) {
-    if (typeof headersInit.forEach == "function") {
-      headersInit.forEach((value, key) => {
-        append(key, value);
-      });
+  if (defaultNodeHeaders !== undefined) {
+    for (const [key, value] of Object.entries(defaultNodeHeaders)) {
+      if (Array.isArray(value)) {
+        o[key] = value.concat();
+      } else if (value !== undefined) {
+        o[key] = value;
+      }
     }
-  } else {
-    for (const [key, value] of Object.entries<string>(headersInit)) {
-      append(key, value);
+  }
+  if (headersInit !== undefined) {
+    if (Array.isArray(headersInit)) {
+      for (const [key, value] of headersInit) {
+        appendWebHeader(o, key, value);
+      }
+    } else if ("forEach" in headersInit) {
+      if (typeof headersInit.forEach == "function") {
+        headersInit.forEach((value, key) => {
+          appendWebHeader(o, key, value);
+        });
+      }
+    } else {
+      for (const [key, value] of Object.entries<string>(headersInit)) {
+        appendWebHeader(o, key, value);
+      }
     }
   }
   return o;
 }
+
+function appendWebHeader(
+  o: http.OutgoingHttpHeaders,
+  key: string,
+  value: string,
+) {
+  key = key.toLowerCase();
+  const existing = o[key];
+  if (Array.isArray(existing)) {
+    existing.push(value);
+  } else if (existing === undefined) {
+    o[key] = value;
+  } else {
+    o[key] = [existing.toString(), value];
+  }
+}