Add client option to pass custom RequestInit object into fetch requests for supported implementations - refactor test to use own server/endpoint

Author: mellster2012

packages/openapi-fetch/package.json

@@ -74,7 +74,9 @@
     "del-cli": "^5.1.0",
     "esbuild": "^0.23.1",
     "execa": "^8.0.1",
+    "express": "^4.21.1",
     "feature-fetch": "^0.0.15",
+    "node-forge": "^1.3.1",
     "openapi-typescript": "workspace:^",
     "openapi-typescript-codegen": "^0.25.0",
     "openapi-typescript-fetch": "^2.0.0",

packages/openapi-fetch/test/common/create-client-e2e.test.js

@@ -0,0 +1,90 @@
+import express from "express";
+import { expect, test } from "vitest";
+import * as https from "node:https";
+import { Agent } from "undici";
+import createClient from "../../src/index.js";
+import * as forge from "node-forge";
+import * as crypto from "crypto";
+import httpServer from "express/lib/application.js";
+
+const pki = forge.pki;
+
+const genCACert = async (options = {}) => {
+  options = {
+    ...{
+      commonName: "Testing CA - DO NOT TRUST",
+      bits: 2048,
+    },
+    ...options,
+  };
+
+  let keyPair = await new Promise((res, rej) => {
+    pki.rsa.generateKeyPair({ bits: options.bits }, (error, pair) => {
+      if (error) rej(error);
+      else res(pair);
+    });
+  });
+
+  let cert = pki.createCertificate();
+  cert.publicKey = keyPair.publicKey;
+  cert.serialNumber = crypto.randomUUID().replace(/-/g, "");
+
+  cert.validity.notBefore = new Date();
+  cert.validity.notBefore.setDate(cert.validity.notBefore.getDate() - 1);
+  cert.validity.notAfter = new Date();
+  cert.validity.notAfter.setFullYear(cert.validity.notBefore.getFullYear() + 1);
+
+  cert.setSubject([{ name: "commonName", value: options.commonName }]);
+  cert.setExtensions([{ name: "basicConstraints", cA: true }]);
+
+  cert.setIssuer(cert.subject.attributes);
+  cert.sign(keyPair.privateKey, forge.md.sha256.create());
+
+  return {
+    ca: {
+      key: pki.privateKeyToPem(keyPair.privateKey),
+      cert: pki.certificateToPem(cert),
+    },
+    fingerprint: forge.util.encode64(
+      pki.getPublicKeyFingerprint(keyPair.publicKey, {
+        type: "SubjectPublicKeyInfo",
+        md: forge.md.sha256.create(),
+        encoding: "binary",
+      }),
+    ),
+  };
+};
+
+const caToBuffer = (ca) => {
+  return {
+    key: Buffer.from(ca.key),
+    cert: Buffer.from(ca.cert),
+  };
+};
+
+const API_PORT = process.env.API_PORT || 4578;
+
+const app = express();
+app.get("/v1/foo", (req, res) => {
+  res.send("bar");
+});
+
+test("requestInitExt", async () => {
+  let cert = await genCACert();
+  let buffers = caToBuffer(cert.ca);
+  let options = {};
+  options.key = buffers.key;
+  options.cert = buffers.cert;
+  const httpsServer = https.createServer(options, app);
+  httpsServer.listen(4578);
+  const dispatcher = new Agent({
+    connect: {
+      rejectUnauthorized: false,
+    },
+  });
+  const client = createClient({ baseUrl: `https://localhost:${API_PORT}`, requestInitExt: { dispatcher } });
+  const fetchResponse = await client.GET("/v1/foo", { parseAs: "text" });
+  httpsServer.closeAllConnections();
+  httpsServer.close();
+  expect(fetchResponse.response.ok).toBe(true);
+});

packages/openapi-fetch/test/common/create-client.test.ts

@@ -39,18 +39,6 @@ describe("createClient options", () => {
     expect(actualURL.href).toBe("https://api.foo.bar/v3/resources");
   });
 
-  test("requestInitExt", async () => {
-    const dispatcher = new Agent({
-      connect: {
-        rejectUnauthorized: false,
-      },
-    });
-    const client = createClient({ requestInitExt: { dispatcher } });
-    // @ts-ignore
-    const fetchResponse = await client.GET("https://self-signed.badssl.com/", { parseAs: "text" });
-    expect(fetchResponse.response.ok).toBe(true);
-  });
-
   describe("content-type", () => {
     const BODY_ACCEPTING_METHODS = [["PUT"], ["POST"], ["DELETE"], ["OPTIONS"], ["PATCH"]] as const;
     const ALL_METHODS = [...BODY_ACCEPTING_METHODS, ["GET"], ["HEAD"]] as const;