fix: normalise request headers before sending (#133)

* fix: normalise request headers before sending

* ci: backport semantic release config

fixes #15

Author: alexghr

.eslintignore

@@ -1,2 +1,3 @@
 out/
 jest.config.js
+*.cjs

.github/workflows/pr.yml

@@ -2,7 +2,7 @@ name: PR
 
 on:
   pull_request:
-    branches: [main]
+    branches: [main, 4.x]
 
 jobs:
   test:

.github/workflows/main.yml renamed to .github/workflows/release.yml

@@ -2,7 +2,10 @@ name: Release workflow
 
 on:
   push:
-    branches: [main]
+    branches:
+      - 'main'
+      - 'next'
+      - '4.x'
 
 jobs:
   test:
@@ -42,3 +45,4 @@ jobs:
     - run: yarn release
       env:
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release.config.cjs

@@ -1,6 +1,10 @@
 const { repository } = require("./package.json");
 module.exports = {
-  branches: ["main"],
+  branches: [
+    "+([0-9])?(.{+([0-9]),x}).x",
+    { name: "main" },
+    { name: "next", channel: "next", prerelease: "next" },
+  ],
   plugins: [
     [
       "@semantic-release/commit-analyzer",
@@ -17,6 +21,7 @@ module.exports = {
     "@semantic-release/changelog",
     "@semantic-release/npm",
     "@semantic-release/git",
+    "@semantic-release/github"
   ],
 
   repositoryUrl: repository.url,

src/lib/fetch.ts

@@ -53,21 +53,33 @@ export function createFetch(got: Got): GotFetch {
       responseType: undefined
     };
 
-    const { body, headers: bodyHeaders } = serializeBody(request.body);
+    const { body, headers: bodyHeaders = {} } = serializeBody(request.body);
 
     // only set the `body` key on the options if a body is sent
     // otherwise got crashes
     if (body) {
       gotOpts.body = body;
     }
 
-    if (bodyHeaders || request.headers) {
-      gotOpts.headers = {
-        ...bodyHeaders,
-        ...(request.headers as object)
-      };
+    const headers: GotOptions["headers"] = { ...bodyHeaders };
+    if (request.headers) {
+      if (Array.isArray(request.headers)) {
+        request.headers.forEach(([header, value]) => {
+          headers[header.toLowerCase()] = value;
+        });
+      } else if (typeof request.headers?.forEach === "function") {
+        request.headers.forEach((value, header) => {
+          headers[header.toLowerCase()] = value;
+        });
+      } else {
+        Object.keys(request.headers).forEach((header) => {
+          headers[header.toLowerCase()] = (request.headers as Record<string, string>)[header];
+        });
+      }
     }
 
+    gotOpts.headers = headers;
+
     // there's a bug in got where it crashes if we send both a body and cache
     // https://github.com/sindresorhus/got/issues/1021
     if ((typeof request.cache === 'undefined' || request.cache === 'default') && !gotOpts.body) {

src/test/fetch.request.test.ts

@@ -174,5 +174,29 @@ describe('fetch request', () => {
       }));
 
     });
+
+    it.only("sends own content-type header", async () => {
+      expect.assertions(1);
+
+      // as set by the client
+      interceptor
+        .post("/")
+        .matchHeader("content-type", "text/plain; charset=utf-8")
+        .reply(400);
+
+      interceptor
+        .post("/")
+        .matchHeader("Content-Type", "application/json")
+        .reply(200);
+
+      const fetch = createFetch(got);
+      await assert200(
+        fetch(url("/"), {
+          method: "post",
+          body: JSON.stringify({ foo: "bar" }),
+          headers: { "content-Type": "application/json" },
+        })
+      );
+    });
   });
 });