strapi-cache 1.8.8 → 1.9.0

package/README.md

@@ -139,7 +139,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) {
@@ -157,10 +157,10 @@ const generateCacheKey = (context) => {
   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) => {
@@ -390,7 +390,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 +424,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 +478,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;

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) {
@@ -153,10 +153,10 @@ const generateCacheKey = (context) => {
   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) => {
@@ -386,7 +386,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 +420,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 +474,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;

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

@@ -1,5 +1,6 @@
+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 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.9.0",
   "keywords": [
     "strapi cache",
     "strapi rest cache",