strapi-cache 1.7.0 → 1.8.1

package/README.md

@@ -50,6 +50,7 @@ In your Strapi project, navigate to `config/plugins.js` and add the following co
     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)
+    // 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'], // (NEW) 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' or 'redis')
     redisConfig: env('REDIS_URL', 'redis://localhost:6379'), // Redis config takes either a string or an object see https://github.com/redis/ioredis for references to what object is available, the object or string is passed directly to ioredis client (if using Redis)
@@ -61,8 +62,10 @@ In your Strapi project, navigate to `config/plugins.js` and add the following co
     cacheAuthorizedRequests: false, // Cache requests with authorization headers (set to true if you want to cache authorized requests)
     cacheGetTimeoutInMs: 1000, // Timeout for getting cached data in milliseconds (default is 1 second)
     autoPurgeCache: true, // Automatically purge cache on content CRUD operations
+    autoPurgeGraphQL: true, // Automatically purge GraphQL cache on content CRUD operations
     autoPurgeCacheOnStart: true, // Automatically purge cache on Strapi startup
     disableAdminPopups: false, // Disable popups in the admin panel
+    disableAdminButtons: false, // Disable the purge cache buttons in the admin panel (list view and edit view)
   },
 },
 ```
@@ -84,7 +87,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 caching.
 - **Automatic Invalidation**: Cache is cleared automatically when content is updated, deleted, or created. (GraphQL cache clears on any content update.)
 - **`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 content types to cache in the config (only for GET requests).
+- **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.
 
 ## 🔮 Planned Features
 

package/dist/_chunks/{index-BjBoZhpS.js → index-B_MAAg0W.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const designSystem = require("@strapi/design-system");
 const reactIntl = require("react-intl");
-const index = require("./index-Dwrl1jfJ.js");
+const index = require("./index-D_ssKKxu.js");
 const react = require("react");
 const SettingsPage = () => {
   const { formatMessage } = reactIntl.useIntl();

package/dist/_chunks/{index-BwjcxGep.mjs → index-BwuX8jJl.mjs}

@@ -297,7 +297,11 @@ function PurgeModal({
 function PurgeCacheButton() {
   const { contentType } = unstable_useContentManagerContext();
   const { formatMessage } = useIntl();
+  const { config } = useCacheConfig();
   const keyToUse = contentType?.info.pluralName;
+  if (config?.disableAdminButtons) {
+    return null;
+  }
   return /* @__PURE__ */ jsx(
     PurgeModal,
     {
@@ -312,10 +316,14 @@ function PurgeCacheButton() {
 function PurgeEntityButton() {
   const { formatMessage } = useIntl();
   const { id, isSingleType, contentType } = unstable_useContentManagerContext();
+  const { config } = useCacheConfig();
   const apiPath = isSingleType ? contentType?.info.singularName : id;
   if (!apiPath) {
     return null;
   }
+  if (config?.disableAdminButtons) {
+    return null;
+  }
   const keyToUse = encodeURIComponent(apiPath);
   const contentTypeName = isSingleType ? contentType?.info.singularName : contentType?.info.pluralName;
   return /* @__PURE__ */ jsx(
@@ -363,7 +371,7 @@ const index = {
           },
           id: "settings",
           to: `${PLUGIN_ID}/settings`,
-          Component: () => import("./index-BInrGFOe.mjs"),
+          Component: () => import("./index-CkLhx2ik.mjs"),
           permissions: []
         }
       ]

package/dist/_chunks/{index-BInrGFOe.mjs → index-CkLhx2ik.mjs}

@@ -1,7 +1,7 @@
 import { jsxs, jsx } from "react/jsx-runtime";
 import { Typography, TextInput } from "@strapi/design-system";
 import { useIntl } from "react-intl";
-import { P as PurgeModal } from "./index-BwjcxGep.mjs";
+import { P as PurgeModal } from "./index-BwuX8jJl.mjs";
 import { useState } from "react";
 const SettingsPage = () => {
   const { formatMessage } = useIntl();

package/dist/_chunks/{index-Dwrl1jfJ.js → index-D_ssKKxu.js}

@@ -298,7 +298,11 @@ function PurgeModal({
 function PurgeCacheButton() {
   const { contentType } = admin.unstable_useContentManagerContext();
   const { formatMessage } = reactIntl.useIntl();
+  const { config } = useCacheConfig();
   const keyToUse = contentType?.info.pluralName;
+  if (config?.disableAdminButtons) {
+    return null;
+  }
   return /* @__PURE__ */ jsxRuntime.jsx(
     PurgeModal,
     {
@@ -313,10 +317,14 @@ function PurgeCacheButton() {
 function PurgeEntityButton() {
   const { formatMessage } = reactIntl.useIntl();
   const { id, isSingleType, contentType } = admin.unstable_useContentManagerContext();
+  const { config } = useCacheConfig();
   const apiPath = isSingleType ? contentType?.info.singularName : id;
   if (!apiPath) {
     return null;
   }
+  if (config?.disableAdminButtons) {
+    return null;
+  }
   const keyToUse = encodeURIComponent(apiPath);
   const contentTypeName = isSingleType ? contentType?.info.singularName : contentType?.info.pluralName;
   return /* @__PURE__ */ jsxRuntime.jsx(
@@ -364,7 +372,7 @@ const index = {
           },
           id: "settings",
           to: `${PLUGIN_ID}/settings`,
-          Component: () => Promise.resolve().then(() => require("./index-BjBoZhpS.js")),
+          Component: () => Promise.resolve().then(() => require("./index-B_MAAg0W.js")),
           permissions: []
         }
       ]

package/dist/admin/index.js

@@ -1,3 +1,3 @@
 "use strict";
-const index = require("../_chunks/index-Dwrl1jfJ.js");
+const index = require("../_chunks/index-D_ssKKxu.js");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-BwjcxGep.mjs";
+import { i } from "../_chunks/index-BwuX8jJl.mjs";
 export {
   i as default
 };

package/dist/admin/src/components/PurgeCacheButton/index.d.ts

@@ -1,2 +1,2 @@
-declare function PurgeCacheButton(): import("react/jsx-runtime").JSX.Element;
+declare function PurgeCacheButton(): import("react/jsx-runtime").JSX.Element | null;
 export default PurgeCacheButton;

package/dist/admin/src/hooks/useCacheConfig.d.ts

@@ -1,6 +1,7 @@
 export type CacheConfig = {
     cacheableRoutes: string[];
     disableAdminPopups: boolean;
+    disableAdminButtons: boolean;
 };
 export declare const useCacheConfig: (enabled?: boolean) => {
     config: CacheConfig | undefined;

package/dist/server/index.js

@@ -35,6 +35,12 @@ async function invalidateCache(event, cacheStore, strapi2) {
   const { model } = event;
   const uid = model.uid;
   const restApiPrefix = strapi2.config.get("api.rest.prefix", "/api");
+  const cacheableEntities = strapi2.plugin("strapi-cache").config("cacheableEntities");
+  const entityIsCacheable = cacheableEntities?.length ? cacheableEntities.includes(model.tableName) : true;
+  if (!entityIsCacheable) {
+    loggy.info(`Not invalidated. ${model.tableName} is not cacheable.`);
+    return;
+  }
   try {
     const contentType = strapi2.contentType(uid);
     if (!contentType || !contentType.kind) {
@@ -51,13 +57,31 @@ async function invalidateCache(event, cacheStore, strapi2) {
     loggy.error(error);
   }
 }
-async function invalidateGraphqlCache(cacheStore) {
+async function invalidateGraphqlCache(event, cacheStore, strapi2) {
   try {
-    const graphqlRegex = new RegExp(`^POST:/graphql(:.*)?$`);
+    const { model } = event;
+    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:.*`);
+      await cacheStore.clearByRegexp([graphqlRegex2]);
+      return;
+    }
+    const singularName = contentType.info.singularName ?? "";
+    const pluralName = contentType.info.pluralName ?? "";
+    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:.*`);
+      await cacheStore.clearByRegexp([graphqlRegex2]);
+      return;
+    }
+    const escapedNames = fieldNames.map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+    const graphqlRegex = new RegExp(`^(GET|POST):/graphql:[^:]*\\b(${escapedNames})\\b[^:]*:`);
     await cacheStore.clearByRegexp([graphqlRegex]);
-    loggy.info(`Invalidated cache for ${graphqlRegex}`);
+    loggy.info(`Invalidated GraphQL cache for ${model.uid} (${fieldNames.join(", ")})`);
   } catch (error) {
-    loggy.error("Cache invalidation error:");
+    loggy.error("GraphQL cache invalidation error:");
     loggy.error(error);
   }
 }
@@ -73,8 +97,9 @@ const bootstrap = ({ strapi: strapi2 }) => {
   loggy.info("Initializing");
   try {
     const cacheService = strapi2.plugin("strapi-cache").services.service;
-    const autoPurgeCache = strapi2.plugin("strapi-cache").config("autoPurgeCache");
-    const autoPurgeCacheOnStart = strapi2.plugin("strapi-cache").config("autoPurgeCacheOnStart");
+    const autoPurgeCache = !!strapi2.plugin("strapi-cache").config("autoPurgeCache");
+    const autoPurgeGraphQL = !!strapi2.plugin("strapi-cache").config("autoPurgeGraphQL");
+    const autoPurgeCacheOnStart = !!strapi2.plugin("strapi-cache").config("autoPurgeCacheOnStart");
     const cacheStore = cacheService.getCacheInstance();
     if (!cacheStore) {
       loggy.error("Plugin could not be initialized");
@@ -85,15 +110,25 @@ const bootstrap = ({ strapi: strapi2 }) => {
       strapi2.db.lifecycles.subscribe({
         async afterCreate(event) {
           await invalidateCache(event, cacheStore, strapi2);
-          await invalidateGraphqlCache(cacheStore);
         },
         async afterUpdate(event) {
           await invalidateCache(event, cacheStore, strapi2);
-          await invalidateGraphqlCache(cacheStore);
         },
         async afterDelete(event) {
           await invalidateCache(event, cacheStore, strapi2);
-          await invalidateGraphqlCache(cacheStore);
+        }
+      });
+    }
+    if (autoPurgeGraphQL) {
+      strapi2.db.lifecycles.subscribe({
+        async afterCreate(event) {
+          await invalidateGraphqlCache(event, cacheStore, strapi2);
+        },
+        async afterUpdate(event) {
+          await invalidateGraphqlCache(event, cacheStore, strapi2);
+        },
+        async afterDelete(event) {
+          await invalidateGraphqlCache(event, cacheStore, strapi2);
         }
       });
     }
@@ -116,11 +151,17 @@ const generateCacheKey = (context) => {
   const { method } = context.request;
   return `${method}:${url}`;
 };
-const generateGraphqlCacheKey = (payload) => {
+const generateGraphqlCacheKey = (payload, method = "POST", rootFields = []) => {
   const hash = crypto.createHash("sha256").update(payload).digest("base64url");
-  return `POST:/graphql:${hash}`;
+  const rootFieldsSegment = rootFields.length > 0 ? [...rootFields].sort((a, b) => a.localeCompare(b)).join(",") : "_";
+  return `${method}:/graphql:${rootFieldsSegment}:${hash}`;
 };
 const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const generateEntityKey = (url, restApiPrefix) => {
+  const regex = new RegExp(`${restApiPrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/([^/?]*)`);
+  const match = url.match(regex);
+  return match ? match[1] : "";
+};
 const streamToBuffer = (stream) => {
   return new Promise((resolve, reject) => {
     const chunks = [];
@@ -188,6 +229,7 @@ function getCacheHeaderConfig() {
 }
 const middleware$1 = async (ctx, next) => {
   const cacheService = strapi.plugin("strapi-cache").services.service;
+  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 { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
@@ -198,13 +240,16 @@ const middleware$1 = async (ctx, next) => {
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
   const restApiPrefix = strapi.config.get("api.rest.prefix", "/api");
+  const entityKey = generateEntityKey(url, restApiPrefix);
   const routeIsExcluded = excludeRoutes.some((route) => url.startsWith(route));
   if (routeIsExcluded) {
     loggy.info(`Route excluded from cache: ${url}`);
     await next();
     return;
   }
-  const routeIsCachable = cacheableRoutes.some((route) => url.startsWith(route)) || cacheableRoutes.length === 0 && url.startsWith(restApiPrefix);
+  const entityIsCacheable = cacheableEntities?.length ? cacheableEntities.includes(entityKey) : void 0;
+  const routeIsCacheable = cacheableRoutes.some((route) => url.startsWith(route)) || cacheableRoutes.length === 0 && url.startsWith(restApiPrefix);
+  const isCacheable = entityIsCacheable ?? routeIsCacheable;
   const authorizationHeader = ctx.request.headers["authorization"];
   if (authorizationHeader && !cacheAuthorizedRequests) {
     loggy.info(`Authorized request bypassing cache: ${key}`);
@@ -242,7 +287,7 @@ const middleware$1 = async (ctx, next) => {
     return;
   }
   await next();
-  if (ctx.method === "GET" && ctx.status >= 200 && ctx.status < 300 && routeIsCachable) {
+  if (ctx.method === "GET" && ctx.status >= 200 && ctx.status < 300 && isCacheable) {
     loggy.info(`MISS with key: ${key}`);
     const headersToStore = getHeadersToStore(
       ctx,
@@ -274,32 +319,116 @@ const middleware$1 = async (ctx, next) => {
     }
   }
 };
+function parseGraphqlPayload(body, isGet) {
+  if (isGet) {
+    try {
+      const parsed = JSON.parse(body);
+      const variables = parsed.variables;
+      const variablesParsed = typeof variables === "string" ? variables ? JSON.parse(variables) : null : variables ?? null;
+      return {
+        query: parsed.query ?? "",
+        variables: variablesParsed,
+        operationName: parsed.operationName ?? null
+      };
+    } catch {
+      return { query: body, variables: null, operationName: null };
+    }
+  }
+  try {
+    const parsed = JSON.parse(body);
+    return {
+      query: parsed.query ?? "",
+      variables: parsed.variables ?? null,
+      operationName: parsed.operationName ?? null
+    };
+  } catch {
+    return { query: body, variables: null, operationName: null };
+  }
+}
+function getRootFieldsFromQuery(query) {
+  const fields = [];
+  let depth = 0;
+  let i = 0;
+  while (i < query.length) {
+    if (query[i] === "{") {
+      depth++;
+      i++;
+      if (depth === 1) {
+        const rest = query.slice(i);
+        const match = rest.match(/^\s*(\w+)\s*([\(\{])/);
+        if (match) {
+          fields.push(match[1]);
+          i += match[0].length - 1;
+        }
+      }
+    } else if (query[i] === "}") {
+      depth--;
+      i++;
+    } else if (depth === 1) {
+      const rest = query.slice(i);
+      const match = rest.match(/^[\s,]*(\w+)\s*([\(\{])/);
+      if (match) {
+        fields.push(match[1]);
+        i += match[0].length - 1;
+      } else {
+        i++;
+      }
+    } else {
+      i++;
+    }
+  }
+  return fields;
+}
 const middleware = async (ctx, next) => {
+  const { url, method } = ctx.request;
+  if (!url.startsWith("/graphql")) {
+    await next();
+    return;
+  }
   const cacheService = strapi.plugin("strapi-cache").services.service;
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
-  const { url } = ctx.request;
-  const originalReq = ctx.req;
-  const bodyBuffer = await rawBody__default.default(originalReq);
-  const body = bodyBuffer.toString();
-  const clonedReq = new Stream.Readable();
-  clonedReq.push(bodyBuffer);
-  clonedReq.push(null);
-  clonedReq.headers = { ...originalReq.headers };
-  clonedReq.method = originalReq.method;
-  clonedReq.url = originalReq.url;
-  clonedReq.httpVersion = originalReq.httpVersion;
-  clonedReq.socket = originalReq.socket;
-  clonedReq.connection = originalReq.connection;
-  ctx.req = clonedReq;
-  ctx.request.req = clonedReq;
+  const isGet = method === "GET";
+  let body;
+  if (isGet) {
+    const { query, variables, operationName } = ctx.request.query;
+    body = JSON.stringify({
+      query: query ?? "",
+      variables: variables ?? "",
+      operationName: operationName ?? ""
+    });
+  } else {
+    const originalReq = ctx.req;
+    const bodyBuffer = await rawBody__default.default(originalReq);
+    body = bodyBuffer.toString();
+    const clonedReq = new Stream.Readable();
+    clonedReq.push(bodyBuffer);
+    clonedReq.push(null);
+    clonedReq.headers = { ...originalReq.headers };
+    clonedReq.method = originalReq.method;
+    clonedReq.url = originalReq.url;
+    clonedReq.httpVersion = originalReq.httpVersion;
+    clonedReq.socket = originalReq.socket;
+    clonedReq.connection = originalReq.connection;
+    ctx.req = clonedReq;
+    ctx.request.req = clonedReq;
+  }
+  const payload = parseGraphqlPayload(body, isGet);
+  const rootFields = getRootFieldsFromQuery(payload.query);
+  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields);
+  loggy.info(
+    `GraphQL request: ${JSON.stringify({
+      operationName: payload.operationName,
+      variables: payload.variables,
+      rootFields: rootFields.length ? rootFields : void 0
+    })}`
+  );
   const isIntrospectionQuery = body.includes("IntrospectionQuery");
   if (isIntrospectionQuery) {
     loggy.info("Skipping cache for introspection query");
     await next();
     return;
   }
-  const key = generateGraphqlCacheKey(body);
   const cacheEntry = await cacheStore.get(key);
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
@@ -340,7 +469,8 @@ const middleware = async (ctx, next) => {
     return;
   }
   await next();
-  if (ctx.method === "POST" && 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("/graphql");
+  if (shouldCache) {
     loggy.info(`MISS with key: ${key}`);
     const headers = ctx.request.headers;
     const authorizationHeader2 = headers["authorization"];
@@ -406,7 +536,8 @@ const config = {
     cacheGetTimeoutInMs: 1e3,
     autoPurgeCache: true,
     autoPurgeCacheOnStart: true,
-    disableAdminPopups: false
+    disableAdminPopups: false,
+    disableAdminButtons: false
   }),
   validator: (config2) => {
     if (typeof config2.debug !== "boolean") {
@@ -427,6 +558,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.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`);
+    }
     if (!Array.isArray(config2.excludeRoutes) || config2.excludeRoutes.some((item) => typeof item !== "string")) {
       throw new Error(`Invalid config: excludeRoutes must be a string array`);
     }
@@ -478,6 +612,9 @@ const config = {
     if (typeof config2.disableAdminPopups !== "boolean") {
       throw new Error(`Invalid config: disableAdminPopups must be a boolean`);
     }
+    if (typeof config2.disableAdminButtons !== "boolean") {
+      throw new Error(`Invalid config: disableAdminButtons must be a boolean`);
+    }
   }
 };
 const contentTypes = {};
@@ -508,8 +645,10 @@ const controller = ({ strapi: strapi2 }) => ({
   async config(ctx) {
     try {
       const config2 = {
+        cacheableEntities: strapi2.plugin("strapi-cache").config("cacheableEntities") ?? [],
         cacheableRoutes: strapi2.plugin("strapi-cache").config("cacheableRoutes") ?? [],
-        disableAdminPopups: strapi2.plugin("strapi-cache").config("disableAdminPopups") ?? false
+        disableAdminPopups: strapi2.plugin("strapi-cache").config("disableAdminPopups") ?? false,
+        disableAdminButtons: strapi2.plugin("strapi-cache").config("disableAdminButtons") ?? false
       };
       ctx.body = config2;
     } catch (error) {
@@ -765,6 +904,18 @@ class RedisCacheProvider {
       return null;
     }
   }
+  /**
+   * Deletes all given keys in Redis pipeline.
+   * @param keys to delete from cache
+   */
+  async delAll(keys) {
+    const pipeline = this.client.pipeline();
+    keys.forEach((key) => {
+      const relativeKey = key.slice(this.keyPrefix.length);
+      pipeline.del(relativeKey);
+    });
+    await pipeline.exec();
+  }
   async keys() {
     if (!this.ready) return null;
     try {
@@ -800,7 +951,7 @@ class RedisCacheProvider {
       return;
     }
     const toDelete = keys.filter((key) => regExps.some((re) => re.test(key)));
-    await Promise.all(toDelete.map((key) => this.del(key)));
+    await this.delAll(toDelete);
   }
 }
 const resolveCacheProvider = (strapi2) => {

package/dist/server/index.mjs

@@ -31,6 +31,12 @@ async function invalidateCache(event, cacheStore, strapi2) {
   const { model } = event;
   const uid = model.uid;
   const restApiPrefix = strapi2.config.get("api.rest.prefix", "/api");
+  const cacheableEntities = strapi2.plugin("strapi-cache").config("cacheableEntities");
+  const entityIsCacheable = cacheableEntities?.length ? cacheableEntities.includes(model.tableName) : true;
+  if (!entityIsCacheable) {
+    loggy.info(`Not invalidated. ${model.tableName} is not cacheable.`);
+    return;
+  }
   try {
     const contentType = strapi2.contentType(uid);
     if (!contentType || !contentType.kind) {
@@ -47,13 +53,31 @@ async function invalidateCache(event, cacheStore, strapi2) {
     loggy.error(error);
   }
 }
-async function invalidateGraphqlCache(cacheStore) {
+async function invalidateGraphqlCache(event, cacheStore, strapi2) {
   try {
-    const graphqlRegex = new RegExp(`^POST:/graphql(:.*)?$`);
+    const { model } = event;
+    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:.*`);
+      await cacheStore.clearByRegexp([graphqlRegex2]);
+      return;
+    }
+    const singularName = contentType.info.singularName ?? "";
+    const pluralName = contentType.info.pluralName ?? "";
+    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:.*`);
+      await cacheStore.clearByRegexp([graphqlRegex2]);
+      return;
+    }
+    const escapedNames = fieldNames.map((name) => name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
+    const graphqlRegex = new RegExp(`^(GET|POST):/graphql:[^:]*\\b(${escapedNames})\\b[^:]*:`);
     await cacheStore.clearByRegexp([graphqlRegex]);
-    loggy.info(`Invalidated cache for ${graphqlRegex}`);
+    loggy.info(`Invalidated GraphQL cache for ${model.uid} (${fieldNames.join(", ")})`);
   } catch (error) {
-    loggy.error("Cache invalidation error:");
+    loggy.error("GraphQL cache invalidation error:");
     loggy.error(error);
   }
 }
@@ -69,8 +93,9 @@ const bootstrap = ({ strapi: strapi2 }) => {
   loggy.info("Initializing");
   try {
     const cacheService = strapi2.plugin("strapi-cache").services.service;
-    const autoPurgeCache = strapi2.plugin("strapi-cache").config("autoPurgeCache");
-    const autoPurgeCacheOnStart = strapi2.plugin("strapi-cache").config("autoPurgeCacheOnStart");
+    const autoPurgeCache = !!strapi2.plugin("strapi-cache").config("autoPurgeCache");
+    const autoPurgeGraphQL = !!strapi2.plugin("strapi-cache").config("autoPurgeGraphQL");
+    const autoPurgeCacheOnStart = !!strapi2.plugin("strapi-cache").config("autoPurgeCacheOnStart");
     const cacheStore = cacheService.getCacheInstance();
     if (!cacheStore) {
       loggy.error("Plugin could not be initialized");
@@ -81,15 +106,25 @@ const bootstrap = ({ strapi: strapi2 }) => {
       strapi2.db.lifecycles.subscribe({
         async afterCreate(event) {
           await invalidateCache(event, cacheStore, strapi2);
-          await invalidateGraphqlCache(cacheStore);
         },
         async afterUpdate(event) {
           await invalidateCache(event, cacheStore, strapi2);
-          await invalidateGraphqlCache(cacheStore);
         },
         async afterDelete(event) {
           await invalidateCache(event, cacheStore, strapi2);
-          await invalidateGraphqlCache(cacheStore);
+        }
+      });
+    }
+    if (autoPurgeGraphQL) {
+      strapi2.db.lifecycles.subscribe({
+        async afterCreate(event) {
+          await invalidateGraphqlCache(event, cacheStore, strapi2);
+        },
+        async afterUpdate(event) {
+          await invalidateGraphqlCache(event, cacheStore, strapi2);
+        },
+        async afterDelete(event) {
+          await invalidateGraphqlCache(event, cacheStore, strapi2);
         }
       });
     }
@@ -112,11 +147,17 @@ const generateCacheKey = (context) => {
   const { method } = context.request;
   return `${method}:${url}`;
 };
-const generateGraphqlCacheKey = (payload) => {
+const generateGraphqlCacheKey = (payload, method = "POST", rootFields = []) => {
   const hash = createHash("sha256").update(payload).digest("base64url");
-  return `POST:/graphql:${hash}`;
+  const rootFieldsSegment = rootFields.length > 0 ? [...rootFields].sort((a, b) => a.localeCompare(b)).join(",") : "_";
+  return `${method}:/graphql:${rootFieldsSegment}:${hash}`;
 };
 const escapeRegExp = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+const generateEntityKey = (url, restApiPrefix) => {
+  const regex = new RegExp(`${restApiPrefix.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/([^/?]*)`);
+  const match = url.match(regex);
+  return match ? match[1] : "";
+};
 const streamToBuffer = (stream) => {
   return new Promise((resolve, reject) => {
     const chunks = [];
@@ -184,6 +225,7 @@ function getCacheHeaderConfig() {
 }
 const middleware$1 = async (ctx, next) => {
   const cacheService = strapi.plugin("strapi-cache").services.service;
+  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 { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
@@ -194,13 +236,16 @@ const middleware$1 = async (ctx, next) => {
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
   const restApiPrefix = strapi.config.get("api.rest.prefix", "/api");
+  const entityKey = generateEntityKey(url, restApiPrefix);
   const routeIsExcluded = excludeRoutes.some((route) => url.startsWith(route));
   if (routeIsExcluded) {
     loggy.info(`Route excluded from cache: ${url}`);
     await next();
     return;
   }
-  const routeIsCachable = cacheableRoutes.some((route) => url.startsWith(route)) || cacheableRoutes.length === 0 && url.startsWith(restApiPrefix);
+  const entityIsCacheable = cacheableEntities?.length ? cacheableEntities.includes(entityKey) : void 0;
+  const routeIsCacheable = cacheableRoutes.some((route) => url.startsWith(route)) || cacheableRoutes.length === 0 && url.startsWith(restApiPrefix);
+  const isCacheable = entityIsCacheable ?? routeIsCacheable;
   const authorizationHeader = ctx.request.headers["authorization"];
   if (authorizationHeader && !cacheAuthorizedRequests) {
     loggy.info(`Authorized request bypassing cache: ${key}`);
@@ -238,7 +283,7 @@ const middleware$1 = async (ctx, next) => {
     return;
   }
   await next();
-  if (ctx.method === "GET" && ctx.status >= 200 && ctx.status < 300 && routeIsCachable) {
+  if (ctx.method === "GET" && ctx.status >= 200 && ctx.status < 300 && isCacheable) {
     loggy.info(`MISS with key: ${key}`);
     const headersToStore = getHeadersToStore(
       ctx,
@@ -270,32 +315,116 @@ const middleware$1 = async (ctx, next) => {
     }
   }
 };
+function parseGraphqlPayload(body, isGet) {
+  if (isGet) {
+    try {
+      const parsed = JSON.parse(body);
+      const variables = parsed.variables;
+      const variablesParsed = typeof variables === "string" ? variables ? JSON.parse(variables) : null : variables ?? null;
+      return {
+        query: parsed.query ?? "",
+        variables: variablesParsed,
+        operationName: parsed.operationName ?? null
+      };
+    } catch {
+      return { query: body, variables: null, operationName: null };
+    }
+  }
+  try {
+    const parsed = JSON.parse(body);
+    return {
+      query: parsed.query ?? "",
+      variables: parsed.variables ?? null,
+      operationName: parsed.operationName ?? null
+    };
+  } catch {
+    return { query: body, variables: null, operationName: null };
+  }
+}
+function getRootFieldsFromQuery(query) {
+  const fields = [];
+  let depth = 0;
+  let i = 0;
+  while (i < query.length) {
+    if (query[i] === "{") {
+      depth++;
+      i++;
+      if (depth === 1) {
+        const rest = query.slice(i);
+        const match = rest.match(/^\s*(\w+)\s*([\(\{])/);
+        if (match) {
+          fields.push(match[1]);
+          i += match[0].length - 1;
+        }
+      }
+    } else if (query[i] === "}") {
+      depth--;
+      i++;
+    } else if (depth === 1) {
+      const rest = query.slice(i);
+      const match = rest.match(/^[\s,]*(\w+)\s*([\(\{])/);
+      if (match) {
+        fields.push(match[1]);
+        i += match[0].length - 1;
+      } else {
+        i++;
+      }
+    } else {
+      i++;
+    }
+  }
+  return fields;
+}
 const middleware = async (ctx, next) => {
+  const { url, method } = ctx.request;
+  if (!url.startsWith("/graphql")) {
+    await next();
+    return;
+  }
   const cacheService = strapi.plugin("strapi-cache").services.service;
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
-  const { url } = ctx.request;
-  const originalReq = ctx.req;
-  const bodyBuffer = await rawBody(originalReq);
-  const body = bodyBuffer.toString();
-  const clonedReq = new Readable();
-  clonedReq.push(bodyBuffer);
-  clonedReq.push(null);
-  clonedReq.headers = { ...originalReq.headers };
-  clonedReq.method = originalReq.method;
-  clonedReq.url = originalReq.url;
-  clonedReq.httpVersion = originalReq.httpVersion;
-  clonedReq.socket = originalReq.socket;
-  clonedReq.connection = originalReq.connection;
-  ctx.req = clonedReq;
-  ctx.request.req = clonedReq;
+  const isGet = method === "GET";
+  let body;
+  if (isGet) {
+    const { query, variables, operationName } = ctx.request.query;
+    body = JSON.stringify({
+      query: query ?? "",
+      variables: variables ?? "",
+      operationName: operationName ?? ""
+    });
+  } else {
+    const originalReq = ctx.req;
+    const bodyBuffer = await rawBody(originalReq);
+    body = bodyBuffer.toString();
+    const clonedReq = new Readable();
+    clonedReq.push(bodyBuffer);
+    clonedReq.push(null);
+    clonedReq.headers = { ...originalReq.headers };
+    clonedReq.method = originalReq.method;
+    clonedReq.url = originalReq.url;
+    clonedReq.httpVersion = originalReq.httpVersion;
+    clonedReq.socket = originalReq.socket;
+    clonedReq.connection = originalReq.connection;
+    ctx.req = clonedReq;
+    ctx.request.req = clonedReq;
+  }
+  const payload = parseGraphqlPayload(body, isGet);
+  const rootFields = getRootFieldsFromQuery(payload.query);
+  const key = generateGraphqlCacheKey(body, isGet ? "GET" : "POST", rootFields);
+  loggy.info(
+    `GraphQL request: ${JSON.stringify({
+      operationName: payload.operationName,
+      variables: payload.variables,
+      rootFields: rootFields.length ? rootFields : void 0
+    })}`
+  );
   const isIntrospectionQuery = body.includes("IntrospectionQuery");
   if (isIntrospectionQuery) {
     loggy.info("Skipping cache for introspection query");
     await next();
     return;
   }
-  const key = generateGraphqlCacheKey(body);
   const cacheEntry = await cacheStore.get(key);
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
@@ -336,7 +465,8 @@ const middleware = async (ctx, next) => {
     return;
   }
   await next();
-  if (ctx.method === "POST" && 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("/graphql");
+  if (shouldCache) {
     loggy.info(`MISS with key: ${key}`);
     const headers = ctx.request.headers;
     const authorizationHeader2 = headers["authorization"];
@@ -402,7 +532,8 @@ const config = {
     cacheGetTimeoutInMs: 1e3,
     autoPurgeCache: true,
     autoPurgeCacheOnStart: true,
-    disableAdminPopups: false
+    disableAdminPopups: false,
+    disableAdminButtons: false
   }),
   validator: (config2) => {
     if (typeof config2.debug !== "boolean") {
@@ -423,6 +554,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.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`);
+    }
     if (!Array.isArray(config2.excludeRoutes) || config2.excludeRoutes.some((item) => typeof item !== "string")) {
       throw new Error(`Invalid config: excludeRoutes must be a string array`);
     }
@@ -474,6 +608,9 @@ const config = {
     if (typeof config2.disableAdminPopups !== "boolean") {
       throw new Error(`Invalid config: disableAdminPopups must be a boolean`);
     }
+    if (typeof config2.disableAdminButtons !== "boolean") {
+      throw new Error(`Invalid config: disableAdminButtons must be a boolean`);
+    }
   }
 };
 const contentTypes = {};
@@ -504,8 +641,10 @@ const controller = ({ strapi: strapi2 }) => ({
   async config(ctx) {
     try {
       const config2 = {
+        cacheableEntities: strapi2.plugin("strapi-cache").config("cacheableEntities") ?? [],
         cacheableRoutes: strapi2.plugin("strapi-cache").config("cacheableRoutes") ?? [],
-        disableAdminPopups: strapi2.plugin("strapi-cache").config("disableAdminPopups") ?? false
+        disableAdminPopups: strapi2.plugin("strapi-cache").config("disableAdminPopups") ?? false,
+        disableAdminButtons: strapi2.plugin("strapi-cache").config("disableAdminButtons") ?? false
       };
       ctx.body = config2;
     } catch (error) {
@@ -761,6 +900,18 @@ class RedisCacheProvider {
       return null;
     }
   }
+  /**
+   * Deletes all given keys in Redis pipeline.
+   * @param keys to delete from cache
+   */
+  async delAll(keys) {
+    const pipeline = this.client.pipeline();
+    keys.forEach((key) => {
+      const relativeKey = key.slice(this.keyPrefix.length);
+      pipeline.del(relativeKey);
+    });
+    await pipeline.exec();
+  }
   async keys() {
     if (!this.ready) return null;
     try {
@@ -796,7 +947,7 @@ class RedisCacheProvider {
       return;
     }
     const toDelete = keys.filter((key) => regExps.some((re) => re.test(key)));
-    await Promise.all(toDelete.map((key) => this.del(key)));
+    await this.delAll(toDelete);
   }
 }
 const resolveCacheProvider = (strapi2) => {

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

@@ -21,6 +21,7 @@ declare const _default: {
         autoPurgeCache: boolean;
         autoPurgeCacheOnStart: boolean;
         disableAdminPopups: boolean;
+        disableAdminButtons: boolean;
     };
     validator: (config: any) => void;
 };

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

@@ -30,6 +30,7 @@ declare const _default: {
             autoPurgeCache: boolean;
             autoPurgeCacheOnStart: boolean;
             disableAdminPopups: boolean;
+            disableAdminButtons: boolean;
         };
         validator: (config: any) => void;
     };

package/dist/server/src/services/redis/provider.d.ts

@@ -12,6 +12,11 @@ export declare class RedisCacheProvider implements CacheProvider {
     get(key: string): Promise<any | null>;
     set(key: string, val: any): Promise<any | null>;
     del(key: string): Promise<any | null>;
+    /**
+     * Deletes all given keys in Redis pipeline.
+     * @param keys to delete from cache
+     */
+    delAll(keys: string[]): Promise<void>;
     keys(): Promise<string[] | null>;
     reset(): Promise<any | null>;
     clearByRegexp(regExps: RegExp[]): Promise<void>;

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

@@ -0,0 +1,6 @@
+export declare function parseGraphqlPayload(body: string, isGet: boolean): {
+    query: string;
+    variables: Record<string, unknown> | string | null;
+    operationName: string | null;
+};
+export declare function getRootFieldsFromQuery(query: string): string[];

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

@@ -1,4 +1,8 @@
 import { Core } from '@strapi/strapi';
 import { CacheProvider } from 'src/types/cache.types';
 export declare function invalidateCache(event: any, cacheStore: CacheProvider, strapi: Core.Strapi): Promise<void>;
-export declare function invalidateGraphqlCache(cacheStore: CacheProvider): Promise<void>;
+export declare function invalidateGraphqlCache(event: {
+    model: {
+        uid: string;
+    };
+}, cacheStore: CacheProvider, strapi: Core.Strapi): Promise<void>;

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

@@ -1,4 +1,5 @@
 import { Context } from 'koa';
 export declare const generateCacheKey: (context: Context) => string;
-export declare const generateGraphqlCacheKey: (payload: string) => string;
+export declare const generateGraphqlCacheKey: (payload: string, method?: 'GET' | 'POST', rootFields?: string[]) => 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.7.0",
+  "version": "1.8.1",
   "keywords": [
     "strapi cache",
     "strapi rest cache",
@@ -34,7 +34,9 @@
     "verify": "strapi-plugin verify",
     "test:ts:front": "run -T tsc -p admin/tsconfig.json",
     "test:ts:back": "run -T tsc -p server/tsconfig.json",
-    "test": "vitest"
+    "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:all": "npm test -- --run && npm run test:integration"
   },
   "dependencies": {
     "@strapi/design-system": "^2.0.1",
@@ -48,14 +50,21 @@
     "@strapi/sdk-plugin": "^5.3.2",
     "@strapi/strapi": "^5.0.0",
     "@strapi/typescript-utils": "^5.0.0",
+    "@types/jest": "^30.0.0",
     "@types/koa": "^2.15.0",
     "@types/react": "^19.1.0",
     "@types/react-dom": "^19.1.1",
+    "@types/supertest": "^6.0.3",
+    "better-sqlite3": "^12.6.2",
+    "jest": "^30.2.0",
     "prettier": "^3.5.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.30.0",
     "styled-components": "^6.1.17",
+    "supertest": "^7.2.2",
+    "ts-jest": "^29.4.6",
+    "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1"
   },
@@ -67,6 +76,11 @@
     "react-router-dom": "^6.30.0",
     "styled-components": "^6.1.17"
   },
+  "optionalDependencies": {
+    "@img/sharp-linux-x64": "*",
+    "@rollup/rollup-linux-x64-gnu": "*",
+    "@swc/core-linux-x64-gnu": "*"
+  },
   "strapi": {
     "kind": "plugin",
     "name": "strapi-cache",