fix: clone request object on fetch based adapter (#37)

* test: add test specs * fix: clone request object on fetch based adapter * chore: bump package
daangn · Feb 16, 2024 · f6ff0d9 · f6ff0d9
1 parent 03d215d
commit f6ff0d9
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 3 deletions.
diff --git a/.changeset/flat-students-hear.md b/.changeset/flat-students-hear.md
@@ -0,0 +1,5 @@
+---
+"plantae": patch
+---
+
+fix: clone request object on fetch based adapter
diff --git a/packages/plantae/src/createMiddleware.ts b/packages/plantae/src/createMiddleware.ts
@@ -44,13 +44,15 @@ export function createResponseMiddleware<T, U>({
   extendClientRequest,
   convertToAdapterResponse,
   extendClientResponse,
+  cloneClientRequest,
   retry,
 }: {
   plugins: Plugin[];
   convertToAdapterRequest: ConvertToAdapterRequest<T>;
   extendClientRequest: ExtendClientRequest<T>;
   convertToAdapterResponse: ConvertToAdapterResponse<U>;
   extendClientResponse: ExtendClientResponse<U>;
+  cloneClientRequest?: (req: T) => T;
   retry: Retryer<T, U>;
 }) {
   return async (clientResponse: U, clientRequest: T) => {
@@ -64,12 +66,17 @@ export function createResponseMiddleware<T, U>({
           convertToAdapterRequest(clientRequest),
           // eslint-disable-next-line @typescript-eslint/no-loop-func
           async (adapterRequest) => {
-            clientRequest = await extendClientRequest(
+            const extendedClientRequest = await extendClientRequest(
               clientRequest,
               adapterRequest
             );
+            const clonedClientRequest = cloneClientRequest
+              ? cloneClientRequest(extendedClientRequest)
+              : extendedClientRequest;
 
-            clientResponse = await retry(clientRequest);
+            clientResponse = await retry(extendedClientRequest);
+
+            clientRequest = clonedClientRequest;
 
             return convertToAdapterResponse(clientResponse);
           }
@@ -86,6 +93,7 @@ export default function createMiddleware<Req, Res>({
   extendClientRequest,
   convertToAdapterResponse,
   extendClientResponse,
+  cloneClientRequest,
   plugins,
   retry,
 }: {
@@ -94,6 +102,7 @@ export default function createMiddleware<Req, Res>({
   extendClientRequest: ExtendClientRequest<Req>;
   convertToAdapterResponse: ConvertToAdapterResponse<Res>;
   extendClientResponse: ExtendClientResponse<Res>;
+  cloneClientRequest?: (req: Req) => Req;
   retry: Retryer<Req, Res>;
 }) {
   return {
@@ -108,6 +117,7 @@ export default function createMiddleware<Req, Res>({
       extendClientRequest,
       convertToAdapterResponse,
       extendClientResponse,
+      cloneClientRequest,
       retry,
     }),
   };

diff --git a/packages/plantae/src/fetch/createFetch.spec.ts b/packages/plantae/src/fetch/createFetch.spec.ts
@@ -424,4 +424,33 @@ describe("createFetch", () => {
 
     expect(await res.text()).toBe("retried");
   });
+
+  it("should pass unused request to afterResponse hook", async () => {
+    server.use(http.post(base("/"), () => new Response()));
+
+    const fetch = createFetch({
+      plugins: [
+        {
+          name: "plugin-clone-request",
+          hooks: {
+            beforeRequest: (req) => {
+              return new Request(req, {
+                method: "POST",
+                body: "modified",
+              });
+            },
+            afterResponse: (_, req, retry) => {
+              expect(req.bodyUsed).toBe(false);
+
+              return retry(req);
+            },
+          },
+        },
+      ],
+    });
+
+    await fetch(base("/"));
+
+    expect.assertions(1);
+  });
 });
diff --git a/packages/plantae/src/fetch/createFetch.ts b/packages/plantae/src/fetch/createFetch.ts
@@ -23,15 +23,17 @@ const createFetch = ({
       convertToAdapterResponse: (res) => res,
       extendClientRequest: (_, req) => req as Request,
       extendClientResponse: (_, res) => res as Response,
+      cloneClientRequest: (req) => req.clone(),
       plugins,
       retry: client,
     });
 
     const request = await requestMiddleware(initialRequest);
+    const clonedClientRequest = request.clone();
 
     const initialResponse = await client(request);
 
-    return responseMiddleware(initialResponse, request);
+    return responseMiddleware(initialResponse, clonedClientRequest);
   };
 };
 

diff --git a/packages/plantae/src/ky/createKyHooks.spec.ts b/packages/plantae/src/ky/createKyHooks.spec.ts
@@ -505,4 +505,39 @@ describe("createKyHooks", () => {
 
     expect(await res.text()).toBe("retried");
   });
+
+  it("should pass unused request to afterResponse hook", async () => {
+    server.use(http.post(base("/"), () => new Response()));
+
+    const hooks = createKyHooks({
+      client: Ky,
+      plugins: [
+        {
+          name: "plugin-clone-request",
+          hooks: {
+            beforeRequest: (req) => {
+              return new Request(req, {
+                method: "POST",
+                body: "modified",
+              });
+            },
+            afterResponse: (_, req, retry) => {
+              expect(req.bodyUsed).toBe(false);
+
+              return retry(req);
+            },
+          },
+        },
+      ],
+    });
+
+    const ky = Ky.create({
+      prefixUrl: baseURL,
+      hooks,
+    });
+
+    await ky.get("");
+
+    expect.assertions(1);
+  });
 });
diff --git a/packages/plantae/src/ky/createKyHooks.ts b/packages/plantae/src/ky/createKyHooks.ts
@@ -24,6 +24,7 @@ const createKyHooks = ({
     convertToAdapterResponse: (res) => res,
     extendClientRequest: (_, req) => req as Request,
     extendClientResponse: (_, res) => res as Response,
+    cloneClientRequest: (req) => req.clone(),
     plugins,
     retry: client,
   });