strapi-cache 1.8.8 → 1.10.0

package/README.md

@@ -72,6 +72,7 @@ Full configuration example:
     size: 1024 * 1024 * 1024, // Maximum size of the cache (1 GB) (only for memory cache)
     allowStale: false, // Allow stale cache items (only for memory cache)
     cacheableRoutes: ['/api/products', '/api/categories'], // Caches routes which start with these paths (if empty array, all '/api' routes are cached)
+    keyGenerator: (ctx) => `${ctx.request.method}:${ctx.request.url}`, // Optional custom cache key for REST requests; receives koa ctx
     // cacheableEntities: ['products', 'categories'], // (Optional) Specify which entities to cache. When set, only these entities will be cached (ignores cacheableRoutes). If not set (undefined), cacheableRoutes logic is used
     excludeRoutes: ['/api/products/private'], // Exclude routes which start with these paths from being cached (takes precedence over cacheableRoutes). **Note:** `excludeRoutes` takes precedence over `cacheableRoutes`.
     provider: 'memory', // Cache provider ('memory', 'redis' or 'valkey')
@@ -109,6 +110,7 @@ Possible configuration keys are listed below; omitted keys keep the plugin defau
 | `size`                    | Approximate max total size in bytes (in-memory provider only)                                                                 | Positive integer (default: `10485760`, i.e. 10 MB)                                                                            |
 | `allowStale`              | Whether stale entries may be returned (in-memory provider only)                                                               | `true` or `false` (default: `false`)                                                                                          |
 | `cacheableRoutes`         | Only URLs starting with one of these paths are cached; if empty, every URL under the REST API prefix matches                  | Array of path prefix strings (default: `[]` meaning “all API routes”)                                                         |
+| `keyGenerator`            | Custom function to build REST cache keys; receives Koa `ctx`; when omitted, default key is `${method}:${url}`                 | Function `(ctx) => string` (default: unset)                                                                                   |
 | `cacheableEntities`       | If non-empty, only these API “entity” segments are cached; **when set, this drives eligibility instead of** `cacheableRoutes` | Array of strings (e.g. collection/table names), or omit / leave empty to use `cacheableRoutes`                                |
 | `excludeRoutes`           | URLs starting with any of these prefixes are **never** cached; evaluated before `cacheableRoutes` / entities                  | Array of path prefix strings (default: `[]`)                                                                                  |
 | `cacheHeaders`            | Store and replay response headers with the body                                                                               | `true` or `false` (default: `true`)                                                                                           |
@@ -139,7 +141,7 @@ All of these routes are protected by the policies `admin::isAuthenticatedAdmin`
 - **Packages**: Uses [lru-cache](https://github.com/isaacs/node-lru-cache) for in-memory cache. Uses [ioredis](https://github.com/redis/ioredis) for Redis and [iovalkey](https://github.com/valkey-io/iovalkey) for Valkey caching.
 - **Automatic Invalidation**: When `autoPurgeCache` is enabled (default), relevant REST cache entries are invalidated on content create, update, or delete. When `autoPurgeGraphQL` is enabled, GraphQL cache is invalidated the same way (it is off unless you set it in config).
 - **`no-cache` Header Support**: Respects the `no-cache` header, letting you skip the cache by setting `Cache-Control: no-cache` in your request.
-- **Default Cached Requests**: By default, caches all GET requests to `/api` (or whatever prefix you defined) and POST requests to `/graphql`. You can customize which routes or entities to cache using `cacheableRoutes` or `cacheableEntities` config options.
+- **Default Cached Requests**: By default, caches all GET requests to `/api` (or whatever prefix you defined) and POST requests to `/graphql` or predefined graphql route from graphql plugin config. You can customize which routes or entities to cache using `cacheableRoutes` or `cacheableEntities` config options.
 
 ## 🔮 Planned Features
 

package/dist/server/index.js

@@ -63,7 +63,7 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const contentType = strapi2.contentType(model.uid);
     if (!contentType || !contentType.info) {
       loggy.info(`Content type ${model.uid} not found, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):/graphql:.*`);
+      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
@@ -72,12 +72,12 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const fieldNames = [...new Set([singularName, pluralName].filter(Boolean))];
     if (fieldNames.length === 0) {
       loggy.info(`No field names for ${model.uid}, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):/graphql:.*`);
+      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
     const escapedNames = fieldNames.map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-    const graphqlRegex = new RegExp(`^(GET|POST):/graphql:[^:]*\\b(${escapedNames})\\b[^:]*:`);
+    const graphqlRegex = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:[^:]*\\b(${escapedNames})\\b[^:]*:`);
     await cacheStore.clearByRegexp([graphqlRegex]);
     loggy.info(`Invalidated GraphQL cache for ${model.uid} (${fieldNames.join(", ")})`);
   } catch (error) {
@@ -152,15 +152,21 @@ const bootstrap = ({ strapi: strapi2 }) => {
   loggy.info("Plugin initialized");
   strapi2.admin.services.permission.actionProvider.registerMany(actions);
 };
-const generateCacheKey = (context) => {
+const generateCacheKey = (context, keyGenerator) => {
+  if (typeof keyGenerator === "function") {
+    const customKey = keyGenerator(context);
+    if (typeof customKey === "string") {
+      return customKey;
+    }
+  }
   const { url } = context.request;
   const { method } = context.request;
   return `${method}:${url}`;
 };
-const generateGraphqlCacheKey = (payload, method = "POST", rootFields = []) => {
+const generateGraphqlCacheKey = (payload, method = "POST", rootFields = [], strapi2) => {
   const hash = crypto.createHash("sha256").update(payload).digest("base64url");
   const rootFieldsSegment = rootFields.length > 0 ? [...rootFields].sort((a, b) => a.localeCompare(b)).join(",") : "_";
-  return `${method}:/graphql:${rootFieldsSegment}:${hash}`;
+  return `${method}:${strapi2?.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:${rootFieldsSegment}:${hash}`;
 };
 const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const generateEntityKey = (url, restApiPrefix) => {
@@ -238,10 +244,11 @@ const middleware$1 = async (ctx, next) => {
   const cacheableEntities = strapi.plugin("strapi-cache").config("cacheableEntities");
   const cacheableRoutes = strapi.plugin("strapi-cache").config("cacheableRoutes");
   const excludeRoutes = strapi.plugin("strapi-cache").config("excludeRoutes");
+  const keyGenerator = strapi.plugin("strapi-cache").config("keyGenerator");
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
   const { url } = ctx.request;
-  const key = generateCacheKey(ctx);
+  const key = generateCacheKey(ctx, keyGenerator);
   const cacheEntry = await cacheStore.get(key);
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
@@ -390,7 +397,7 @@ function getRootFieldsFromQuery(query) {
 }
 const middleware = async (ctx, next) => {
   const { url, method } = ctx.request;
-  if (!url.startsWith("/graphql")) {
+  if (!url.startsWith(strapi.plugin("graphql")?.config("endpoint", "/graphql"))) {
     await next();
     return;
   }
@@ -424,7 +431,7 @@ const middleware = async (ctx, next) => {
   }
   const payload = parseGraphqlPayload(body, isGet);
   const rootFields = getRootFieldsFromQuery(payload.query);
-  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields);
+  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields, strapi);
   loggy.info(
     `GraphQL request: ${JSON.stringify({
       operationName: payload.operationName,
@@ -478,7 +485,7 @@ const middleware = async (ctx, next) => {
     return;
   }
   await next();
-  const shouldCache = (ctx.method === "POST" || ctx.method === "GET") && ctx.status >= 200 && ctx.status < 300 && url.startsWith("/graphql");
+  const shouldCache = (ctx.method === "POST" || ctx.method === "GET") && ctx.status >= 200 && ctx.status < 300 && url.startsWith(strapi.plugin("graphql")?.config("endpoint", "/graphql"));
   if (shouldCache) {
     loggy.info(`MISS with key: ${key}`);
     const headers = ctx.request.headers;
@@ -533,6 +540,7 @@ const config = {
     size: 1024 * 1024 * 10,
     allowStale: false,
     cacheableRoutes: [],
+    keyGenerator: void 0,
     provider: "memory",
     excludeRoutes: [],
     redisConfig: env("REDIS_URL"),
@@ -568,6 +576,9 @@ const config = {
     if (!Array.isArray(config2.cacheableRoutes) || config2.cacheableRoutes.some((item) => typeof item !== "string")) {
       throw new Error(`Invalid config: cacheableRoutes must be an string array`);
     }
+    if (config2.keyGenerator !== void 0 && typeof config2.keyGenerator !== "function") {
+      throw new Error(`Invalid config: keyGenerator must be a function`);
+    }
     if (config2.cacheableEntities !== void 0 && (!Array.isArray(config2.cacheableEntities) || config2.cacheableEntities.some((item) => typeof item !== "string"))) {
       throw new Error(`Invalid config: cacheableEntities must be a string array`);
     }

package/dist/server/index.mjs

@@ -59,7 +59,7 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const contentType = strapi2.contentType(model.uid);
     if (!contentType || !contentType.info) {
       loggy.info(`Content type ${model.uid} not found, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):/graphql:.*`);
+      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
@@ -68,12 +68,12 @@ async function invalidateGraphqlCache(event, cacheStore, strapi2) {
     const fieldNames = [...new Set([singularName, pluralName].filter(Boolean))];
     if (fieldNames.length === 0) {
       loggy.info(`No field names for ${model.uid}, purging all GraphQL cache`);
-      const graphqlRegex2 = new RegExp(`^(GET|POST):/graphql:.*`);
+      const graphqlRegex2 = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:.*`);
       await cacheStore.clearByRegexp([graphqlRegex2]);
       return;
     }
     const escapedNames = fieldNames.map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
-    const graphqlRegex = new RegExp(`^(GET|POST):/graphql:[^:]*\\b(${escapedNames})\\b[^:]*:`);
+    const graphqlRegex = new RegExp(`^(GET|POST):${strapi2.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:[^:]*\\b(${escapedNames})\\b[^:]*:`);
     await cacheStore.clearByRegexp([graphqlRegex]);
     loggy.info(`Invalidated GraphQL cache for ${model.uid} (${fieldNames.join(", ")})`);
   } catch (error) {
@@ -148,15 +148,21 @@ const bootstrap = ({ strapi: strapi2 }) => {
   loggy.info("Plugin initialized");
   strapi2.admin.services.permission.actionProvider.registerMany(actions);
 };
-const generateCacheKey = (context) => {
+const generateCacheKey = (context, keyGenerator) => {
+  if (typeof keyGenerator === "function") {
+    const customKey = keyGenerator(context);
+    if (typeof customKey === "string") {
+      return customKey;
+    }
+  }
   const { url } = context.request;
   const { method } = context.request;
   return `${method}:${url}`;
 };
-const generateGraphqlCacheKey = (payload, method = "POST", rootFields = []) => {
+const generateGraphqlCacheKey = (payload, method = "POST", rootFields = [], strapi2) => {
   const hash = createHash("sha256").update(payload).digest("base64url");
   const rootFieldsSegment = rootFields.length > 0 ? [...rootFields].sort((a, b) => a.localeCompare(b)).join(",") : "_";
-  return `${method}:/graphql:${rootFieldsSegment}:${hash}`;
+  return `${method}:${strapi2?.plugin("graphql")?.config("endpoint", "/graphql") ?? "/graphql"}:${rootFieldsSegment}:${hash}`;
 };
 const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 const generateEntityKey = (url, restApiPrefix) => {
@@ -234,10 +240,11 @@ const middleware$1 = async (ctx, next) => {
   const cacheableEntities = strapi.plugin("strapi-cache").config("cacheableEntities");
   const cacheableRoutes = strapi.plugin("strapi-cache").config("cacheableRoutes");
   const excludeRoutes = strapi.plugin("strapi-cache").config("excludeRoutes");
+  const keyGenerator = strapi.plugin("strapi-cache").config("keyGenerator");
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
   const { url } = ctx.request;
-  const key = generateCacheKey(ctx);
+  const key = generateCacheKey(ctx, keyGenerator);
   const cacheEntry = await cacheStore.get(key);
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
@@ -386,7 +393,7 @@ function getRootFieldsFromQuery(query) {
 }
 const middleware = async (ctx, next) => {
   const { url, method } = ctx.request;
-  if (!url.startsWith("/graphql")) {
+  if (!url.startsWith(strapi.plugin("graphql")?.config("endpoint", "/graphql"))) {
     await next();
     return;
   }
@@ -420,7 +427,7 @@ const middleware = async (ctx, next) => {
   }
   const payload = parseGraphqlPayload(body, isGet);
   const rootFields = getRootFieldsFromQuery(payload.query);
-  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields);
+  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields, strapi);
   loggy.info(
     `GraphQL request: ${JSON.stringify({
       operationName: payload.operationName,
@@ -474,7 +481,7 @@ const middleware = async (ctx, next) => {
     return;
   }
   await next();
-  const shouldCache = (ctx.method === "POST" || ctx.method === "GET") && ctx.status >= 200 && ctx.status < 300 && url.startsWith("/graphql");
+  const shouldCache = (ctx.method === "POST" || ctx.method === "GET") && ctx.status >= 200 && ctx.status < 300 && url.startsWith(strapi.plugin("graphql")?.config("endpoint", "/graphql"));
   if (shouldCache) {
     loggy.info(`MISS with key: ${key}`);
     const headers = ctx.request.headers;
@@ -529,6 +536,7 @@ const config = {
     size: 1024 * 1024 * 10,
     allowStale: false,
     cacheableRoutes: [],
+    keyGenerator: void 0,
     provider: "memory",
     excludeRoutes: [],
     redisConfig: env("REDIS_URL"),
@@ -564,6 +572,9 @@ const config = {
     if (!Array.isArray(config2.cacheableRoutes) || config2.cacheableRoutes.some((item) => typeof item !== "string")) {
       throw new Error(`Invalid config: cacheableRoutes must be an string array`);
     }
+    if (config2.keyGenerator !== void 0 && typeof config2.keyGenerator !== "function") {
+      throw new Error(`Invalid config: keyGenerator must be a function`);
+    }
     if (config2.cacheableEntities !== void 0 && (!Array.isArray(config2.cacheableEntities) || config2.cacheableEntities.some((item) => typeof item !== "string"))) {
       throw new Error(`Invalid config: cacheableEntities must be a string array`);
     }

package/dist/server/src/config/index.d.ts

@@ -8,6 +8,7 @@ declare const _default: {
         size: number;
         allowStale: boolean;
         cacheableRoutes: any[];
+        keyGenerator: any;
         provider: string;
         excludeRoutes: any[];
         redisConfig: any;

package/dist/server/src/index.d.ts

@@ -17,6 +17,7 @@ declare const _default: {
             size: number;
             allowStale: boolean;
             cacheableRoutes: any[];
+            keyGenerator: any;
             provider: string;
             excludeRoutes: any[];
             redisConfig: any;

package/dist/server/src/utils/key.d.ts

@@ -1,5 +1,7 @@
+import { Core } from '@strapi/strapi';
 import { Context } from 'koa';
-export declare const generateCacheKey: (context: Context) => string;
-export declare const generateGraphqlCacheKey: (payload: string, method?: 'GET' | 'POST', rootFields?: string[]) => string;
+export type CacheKeyGenerator = (context: Context) => string;
+export declare const generateCacheKey: (context: Context, keyGenerator?: CacheKeyGenerator) => string;
+export declare const generateGraphqlCacheKey: (payload: string, method?: 'GET' | 'POST', rootFields?: string[], strapi?: Core.Strapi) => string;
 export declare const escapeRegExp: (s: string) => string;
 export declare const generateEntityKey: (url: string, restApiPrefix: string) => string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.8",
+  "version": "1.10.0",
   "keywords": [
     "strapi cache",
     "strapi rest cache",
@@ -35,7 +35,7 @@
     "test:ts:front": "run -T tsc -p admin/tsconfig.json",
     "test:ts:back": "run -T tsc -p server/tsconfig.json",
     "test": "vitest run --exclude 'test/integration/**'",
-    "test:integration": "npm run build && rm -rf playground/.cache && mkdir -p playground/.yalc/strapi-cache && cp -r dist package.json LICENSE README.md playground/.yalc/strapi-cache/ && cd playground && npm install && npm run build && cd .. && NODE_ENV=test jest --config jest.integration.config.js --runInBand --forceExit --detectOpenHandles",
+    "test:integration": "npm run build && rm -rf playground/.cache playground/node_modules playground/.yalc && mkdir -p playground/.yalc/strapi-cache && cp -r dist package.json LICENSE README.md playground/.yalc/strapi-cache/ && node -e \"const fs=require('fs');const p='playground/.yalc/strapi-cache/package.json';const pkg=JSON.parse(fs.readFileSync(p,'utf8'));delete pkg.devDependencies;delete pkg.optionalDependencies;delete pkg.scripts;fs.writeFileSync(p,JSON.stringify(pkg,null,2));\" && cd playground && npm ci --ignore-scripts && npm rebuild better-sqlite3 @swc/core sharp --foreground-scripts && npm run build && cd .. && NODE_ENV=test jest --config jest.integration.config.js --runInBand --forceExit --detectOpenHandles",
     "test:all": "npm test -- --run && npm run test:integration"
   },
   "dependencies": {