Fixed type conversions

Author: AyronK

README.md

@@ -83,6 +83,8 @@ if (process.env.NEXT_RUNTIME === "nodejs") {
 
 ## Installation
 
+If you come from Next 14 or below, ensure to flush Redis cache before you run the project with this library. Cache format between Next 15 and Next <14 are not compatible!
+
 ## Next 15 Support and migration from `@neshca/cache-handler`
 
 As `@neshca/cache-handler` does not officially support Next 15+ yet, we try to keep up with Next and prepare more or less temporary workarounds. At some point we will either create a fork of `@neshca/cache-handler` to fully support Next 15 or it gets updated by the maintainers. As for now we're building a set of decorators/workarounds you can use to build cache solutions for Next 15. We might need to do a full-blown rework which will be marked with a proper major version upgrade.

packages/nextjs-cache-handler/package.json

@@ -18,7 +18,7 @@
     "next",
     "redis"
   ],
-  "version": "2.0.0-canary3",
+  "version": "2.0.0-canary4",
   "type": "module",
   "license": "MIT",
   "description": "Next.js cache handlers",

packages/nextjs-cache-handler/src/handlers/redis-strings.ts

@@ -1,13 +1,15 @@
 import { REVALIDATED_TAGS_KEY } from "../constants";
 import { isImplicitTag } from "../helpers/isImplicitTag";
 import { CacheHandlerValue, Handler } from "./cache-handler.types";
-import { IncrementalCacheValue } from "next/dist/server/response-cache/types";
 import {
-  CreateRedisStringsHandlerOptions,
-  ConvertedCachedRouteValue,
   CachedRouteValue,
-  ConvertedCachedAppPageValue,
-  CachedAppPageValue,
+  IncrementalCachedAppPageValue,
+  IncrementalCacheValue,
+} from "next/dist/server/response-cache/types";
+import {
+  CreateRedisStringsHandlerOptions,
+  RedisCompliantCachedAppPageValue,
+  RedisCompliantCachedRouteValue,
 } from "./redis-strings.types";
 
 /**
@@ -327,7 +329,7 @@ export default function createHandler({
     const kind = value?.kind;
 
     if (kind === "APP_ROUTE") {
-      const appRouteData = value as unknown as ConvertedCachedRouteValue;
+      const appRouteData = value as unknown as RedisCompliantCachedRouteValue;
       const appRouteValue = value as unknown as CachedRouteValue;
 
       if (appRouteValue?.body) {
@@ -336,8 +338,8 @@ export default function createHandler({
         appRouteData.body = appRouteValue.body.toString();
       }
     } else if (kind === "APP_PAGE") {
-      const appPageData = value as unknown as ConvertedCachedAppPageValue;
-      const appPageValue = value as unknown as CachedAppPageValue;
+      const appPageData = value as unknown as RedisCompliantCachedAppPageValue;
+      const appPageValue = value as unknown as IncrementalCachedAppPageValue;
 
       if (appPageValue?.rscData) {
         // Convert rscData Buffer to string
@@ -363,7 +365,7 @@ export default function createHandler({
     const kind = value?.kind;
 
     if (kind === "APP_ROUTE") {
-      const appRouteData = value as unknown as ConvertedCachedRouteValue;
+      const appRouteData = value as unknown as RedisCompliantCachedRouteValue;
 
       if (appRouteData?.body) {
         // Convert body string to Buffer
@@ -372,8 +374,8 @@ export default function createHandler({
         appRouteValue.body = Buffer.from(appRouteData.body, "utf-8");
       }
     } else if (kind === "APP_PAGE") {
-      const appPageData = value as unknown as ConvertedCachedAppPageValue;
-      const appPageValue = value as unknown as CachedAppPageValue;
+      const appPageData = value as unknown as RedisCompliantCachedAppPageValue;
+      const appPageValue = value as unknown as IncrementalCachedAppPageValue;
 
       if (appPageData.rscData) {
         // Convert rscData string to Buffer

packages/nextjs-cache-handler/src/handlers/redis-strings.types.ts

@@ -1,25 +1,14 @@
 import type { createClient } from "@redis/client";
 
-export type CachedRouteValue = {
-  kind: "APP_ROUTE";
-  body: Buffer | undefined;
-};
-
-export type ConvertedCachedRouteValue = {
+export type RedisCompliantCachedRouteValue = {
   // See: https://github.com/vercel/next.js/blob/f5444a16ec2ef7b82d30048890b613aa3865c1f1/packages/next/src/server/response-cache/types.ts#L97
-  kind: "ROUTE";
+  kind: "APP_ROUTE";
   body: string | undefined;
 };
 
-export type CachedAppPageValue = {
-  kind: "APP_PAGE";
-  rscData: Buffer | undefined;
-  segmentData: Map<string, Buffer> | undefined;
-};
-
-export type ConvertedCachedAppPageValue = {
+export type RedisCompliantCachedAppPageValue = {
   // See: https://github.com/vercel/next.js/blob/f5444a16ec2ef7b82d30048890b613aa3865c1f1/packages/next/src/server/response-cache/types.ts#L76
-  kind: "PAGE";
+  kind: "APP_PAGE";
   rscData: string | undefined;
   segmentData: Record<string, string> | undefined;
 };