Fixed #10 bufferStringDecorator mutates original data

Author: AyronK

packages/nextjs-cache-handler/package.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "git+https://github.com/fortedigital/nextjs-cache-handler.git"
   },
-  "version": "1.3.0-canary4",
+  "version": "1.3.0-canary5",
   "type": "module",
   "license": "MIT",
   "description": "Next.js cache handlers",

packages/nextjs-cache-handler/src/handlers/buffer-string-decorator.ts

@@ -1,10 +1,12 @@
-import { Handler } from "@neshca/cache-handler";
+import { CacheHandlerValue, Handler } from "@neshca/cache-handler";
 import {
   CachedAppPageValue,
   CachedRouteValue,
   ConvertedCachedAppPageValue,
   ConvertedCachedRouteValue,
 } from "./buffer-string-decorator.types";
+import { IncrementalCacheValue } from "next/dist/server/response-cache";
+import { Next15IncrementalCacheValue } from "./next15.types";
 
 /*
  * This cache handler converts buffers from cached route values to strings on save and back to buffers on read.
@@ -64,7 +66,12 @@ export default function bufferStringDecorator(handler: Handler): Handler {
     },
 
     async set(key, data) {
-      const value = data.value;
+      if (!data?.value) {
+        await handler.set(key, data);
+        return;
+      }
+
+      const value = { ...data.value };
       const kind = value?.kind as string;
 
       if (kind === "APP_ROUTE") {
@@ -100,7 +107,7 @@ export default function bufferStringDecorator(handler: Handler): Handler {
         }
       }
 
-      await handler.set(key, data);
+      await handler.set(key, { ...data, value });
     },
 
     async revalidateTag(tag) {

packages/nextjs-cache-handler/src/handlers/next-15-cache-handler.ts

@@ -1,34 +1,9 @@
 import { CacheHandler } from "@neshca/cache-handler";
-import { OutgoingHttpHeaders } from "http";
 import {
-  CachedRedirectValue,
-  CachedImageValue,
   CachedFetchValue,
   IncrementalCacheValue,
 } from "next/dist/server/response-cache";
-
-export interface CachedRouteValue {
-  kind: "APP_ROUTE";
-  body: Buffer;
-  status: number;
-  headers: OutgoingHttpHeaders;
-}
-
-interface IncrementalCachedPageValue {
-  kind: "APP_PAGE";
-  html: string;
-  pageData: Object;
-  postponed: string | undefined;
-  headers: OutgoingHttpHeaders | undefined;
-  status: number | undefined;
-}
-
-export type Next15IncrementalCacheValue =
-  | CachedRedirectValue
-  | IncrementalCachedPageValue
-  | CachedImageValue
-  | CachedFetchValue
-  | CachedRouteValue;
+import { Next15IncrementalCacheValue } from "./next15.types";
 
 /*
  * Use this handler in Next 15.2.1 and higher after `revalidate` property had been removed from context object.

packages/nextjs-cache-handler/src/handlers/next15.types.ts

@@ -0,0 +1,29 @@
+import {
+  CachedRedirectValue,
+  CachedImageValue,
+  CachedFetchValue,
+} from "next/dist/server/response-cache";
+import { OutgoingHttpHeaders } from "http";
+
+export interface CachedRouteValue {
+  kind: "APP_ROUTE";
+  body: Buffer;
+  status: number;
+  headers: OutgoingHttpHeaders;
+}
+
+export interface IncrementalCachedPageValue {
+  kind: "APP_PAGE";
+  html: string;
+  pageData: Object;
+  postponed: string | undefined;
+  headers: OutgoingHttpHeaders | undefined;
+  status: number | undefined;
+}
+
+export type Next15IncrementalCacheValue =
+  | CachedRedirectValue
+  | IncrementalCachedPageValue
+  | CachedImageValue
+  | CachedFetchValue
+  | CachedRouteValue;