strapi-cache 1.5.7-rc.2 → 1.5.8

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)
+    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)
     redisClusterNodes: [], // If provided any cluster node (this list is not empty), initialize ioredis redis cluster client. Each object must have keys 'host' and 'port'. See https://github.com/redis/ioredis for references
@@ -60,6 +61,7 @@ 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
+    autoPurgeCacheOnStart: true, // Automatically purge cache on Strapi startup
   },
 },
 ```
@@ -95,34 +97,6 @@ All of these routes are protected by the policies `admin::isAuthenticatedAdmin`
 
 If you encounter any issues, please feel free to open an issue on the [GitHub repo](https://github.com/TupiC/strapi-cache/issues/new).
 
-## 🛠️ Troubleshooting
-
-If you encounter an error like:
-
-```
-Access to fetch at 'http://your-backend.com' from origin 'http://your-origin.com' has been blocked by CORS policy:
-Request header field cache-control is not allowed by Access-Control-Allow-Headers in preflight response.
-```
-
-You might need to adjust your CORS middleware settings in Strapi:
-
-```javascript
-// config/middlewares.{js,ts}
-'strapi::cors';
-```
-
-with:
-
-```javascript
-// config/middlewares.{js,ts}
-{
-  name: "strapi::cors",
-  config: {
-    headers: ["Content-Type", "Authorization", "Cache-Control"], // Add 'Cache-Control' to the allowed headers
-  },
-},
-```
-
 ## 🛠️ Contributing
 
 Contributions are welcome! If you have suggestions or improvements, please open an issue or submit a pull request.

package/dist/admin/index.js

@@ -161,7 +161,11 @@ function PurgeCacheButton() {
 function PurgeEntityButton() {
   const { formatMessage } = reactIntl.useIntl();
   const { id, isSingleType, contentType } = admin.unstable_useContentManagerContext();
-  const keyToUse = isSingleType ? contentType?.info.singularName : id;
+  const apiPath = isSingleType ? contentType?.info.singularName : id;
+  if (!apiPath) {
+    return null;
+  }
+  const keyToUse = encodeURIComponent(apiPath);
   const contentTypeName = isSingleType ? contentType?.info.singularName : contentType?.info.pluralName;
   return /* @__PURE__ */ jsxRuntime.jsx(
     PurgeModal,

package/dist/admin/index.mjs

@@ -160,7 +160,11 @@ function PurgeCacheButton() {
 function PurgeEntityButton() {
   const { formatMessage } = useIntl();
   const { id, isSingleType, contentType } = unstable_useContentManagerContext();
-  const keyToUse = isSingleType ? contentType?.info.singularName : id;
+  const apiPath = isSingleType ? contentType?.info.singularName : id;
+  if (!apiPath) {
+    return null;
+  }
+  const keyToUse = encodeURIComponent(apiPath);
   const contentTypeName = isSingleType ? contentType?.info.singularName : contentType?.info.pluralName;
   return /* @__PURE__ */ jsx(
     PurgeModal,

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

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

package/dist/server/index.js

@@ -73,6 +73,7 @@ const bootstrap = ({ strapi: strapi2 }) => {
   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 cacheStore = cacheService.getCacheInstance();
     if (!cacheStore) {
       loggy.error("Plugin could not be initialized");
@@ -95,6 +96,13 @@ const bootstrap = ({ strapi: strapi2 }) => {
         }
       });
     }
+    if (autoPurgeCacheOnStart) {
+      cacheStore.reset().then(() => {
+        loggy.info("Cache purged successfully");
+      }).catch((error) => {
+        loggy.error(`Error purging cache on start: ${error.message}`);
+      });
+    }
   } catch (error) {
     loggy.error("Plugin could not be initialized");
     return;
@@ -179,6 +187,7 @@ function getCacheHeaderConfig() {
 const middleware$1 = async (ctx, next) => {
   const cacheService = strapi.plugin("strapi-cache").services.service;
   const cacheableRoutes = strapi.plugin("strapi-cache").config("cacheableRoutes");
+  const excludeRoutes = strapi.plugin("strapi-cache").config("excludeRoutes");
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
   const { url } = ctx.request;
@@ -186,6 +195,12 @@ const middleware$1 = async (ctx, next) => {
   const cacheEntry = await cacheStore.get(key);
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
+  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("/api");
   const authorizationHeader = ctx.request.headers["authorization"];
   if (authorizationHeader && !cacheAuthorizedRequests) {
@@ -193,12 +208,32 @@ const middleware$1 = async (ctx, next) => {
     await next();
     return;
   }
+  const middlewaresConfig = strapi.config.get("middlewares");
+  const corsMiddleware = middlewaresConfig.find((mw) => mw.name === "strapi::cors");
+  const corsConfig = corsMiddleware?.config;
+  const origin = ctx?.request?.headers?.origin;
+  let allowedOrigins = corsConfig?.origin ?? "*";
+  if (typeof allowedOrigins === "string") {
+    allowedOrigins = [allowedOrigins];
+  }
   if (cacheEntry && !noCache) {
     loggy.info(`HIT with key: ${key}`);
     ctx.status = 200;
     ctx.body = cacheEntry.body;
     if (cacheHeaders) {
       ctx.set(cacheEntry.headers);
+    }
+    if (corsMiddleware) {
+      loggy.info("CORS middleware is set, checking allowed origins");
+      if (allowedOrigins.includes(origin)) {
+        loggy.info(`Setting Access-Control-Allow-Origin to ${origin}`);
+        ctx.set("Access-Control-Allow-Origin", origin);
+      } else if (typeof origin === "undefined" || allowedOrigins.includes("*")) {
+        loggy.info("No origin header or * in allowed origins, setting to *");
+        ctx.set("Access-Control-Allow-Origin", "*");
+      }
+    } else {
+      loggy.info("No CORS middleware set, setting to request origin or *");
       ctx.set("Access-Control-Allow-Origin", ctx.request.headers.origin || "*");
     }
     return;
@@ -212,15 +247,27 @@ const middleware$1 = async (ctx, next) => {
       cacheHeadersAllowList,
       cacheHeadersDenyList
     );
+    let setCache = true;
+    if (corsMiddleware) {
+      if (allowedOrigins.includes(origin)) ;
+      else if (typeof origin === "undefined" || allowedOrigins.includes("*")) ;
+      else {
+        setCache = false;
+      }
+    }
     if (ctx.body instanceof Stream__default.default) {
       const buf = await streamToBuffer(ctx.body);
       const contentEncoding = ctx.response.headers["content-encoding"];
       const decompressed = await decompressBuffer(buf, contentEncoding);
       const responseText = decodeBufferToText(decompressed);
-      await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      }
       ctx.body = buf;
     } else {
-      await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      }
     }
   }
 };
@@ -259,12 +306,32 @@ const middleware = async (ctx, next) => {
     await next();
     return;
   }
+  const middlewaresConfig = strapi.config.get("middlewares");
+  const corsMiddleware = middlewaresConfig.find((mw) => mw.name === "strapi::cors");
+  const corsConfig = corsMiddleware?.config;
+  const origin = ctx?.request?.headers?.origin;
+  let allowedOrigins = corsConfig?.origin ?? "*";
+  if (typeof allowedOrigins === "string") {
+    allowedOrigins = [allowedOrigins];
+  }
   if (cacheEntry && !noCache) {
     loggy.info(`HIT with key: ${key}`);
     ctx.status = 200;
     ctx.body = cacheEntry.body;
     if (cacheHeaders) {
       ctx.set(cacheEntry.headers);
+    }
+    if (corsMiddleware) {
+      loggy.info("CORS middleware is set, checking allowed origins");
+      if (allowedOrigins.includes(origin)) {
+        loggy.info(`Setting Access-Control-Allow-Origin to ${origin}`);
+        ctx.set("Access-Control-Allow-Origin", origin);
+      } else if (typeof origin === "undefined" || allowedOrigins.includes("*")) {
+        loggy.info("No origin header or * in allowed origins, setting to *");
+        ctx.set("Access-Control-Allow-Origin", "*");
+      }
+    } else {
+      loggy.info("No CORS middleware set, setting to request origin or *");
       ctx.set("Access-Control-Allow-Origin", ctx.request.headers.origin || "*");
     }
     return;
@@ -284,15 +351,27 @@ const middleware = async (ctx, next) => {
       cacheHeadersAllowList,
       cacheHeadersDenyList
     );
+    let setCache = true;
+    if (corsMiddleware) {
+      if (allowedOrigins.includes(origin)) ;
+      else if (typeof origin === "undefined" || allowedOrigins.includes("*")) ;
+      else {
+        setCache = false;
+      }
+    }
     if (ctx.body instanceof Stream__default.default) {
       const buf = await streamToBuffer(ctx.body);
       const contentEncoding = ctx.response.headers["content-encoding"];
       const decompressed = await decompressBuffer(buf, contentEncoding);
       const responseText = decodeBufferToText(decompressed);
-      await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      }
       ctx.body = buf;
     } else {
-      await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      }
     }
   }
 };
@@ -313,6 +392,7 @@ const config = {
     allowStale: false,
     cacheableRoutes: [],
     provider: "memory",
+    excludeRoutes: [],
     redisConfig: env("REDIS_URL"),
     redisClusterNodes: [],
     redisClusterOptions: {},
@@ -321,7 +401,8 @@ const config = {
     cacheHeadersAllowList: [],
     cacheAuthorizedRequests: false,
     cacheGetTimeoutInMs: 1e3,
-    autoPurgeCache: true
+    autoPurgeCache: true,
+    autoPurgeCacheOnStart: true
   }),
   validator: (config2) => {
     if (typeof config2.debug !== "boolean") {
@@ -342,6 +423,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 (!Array.isArray(config2.excludeRoutes) || config2.excludeRoutes.some((item) => typeof item !== "string")) {
+      throw new Error(`Invalid config: excludeRoutes must be a string array`);
+    }
     if (typeof config2.provider !== "string") {
       throw new Error(`Invalid config: provider must be a string`);
     }
@@ -382,6 +466,9 @@ const config = {
     if (typeof config2.autoPurgeCache !== "boolean") {
       throw new Error(`Invalid config: autoPurgeCache must be a boolean`);
     }
+    if (typeof config2.autoPurgeCacheOnStart !== "boolean") {
+      throw new Error(`Invalid config: autoPurgeCacheOnStart must be a boolean`);
+    }
   }
 };
 const contentTypes = {};
@@ -591,6 +678,7 @@ class RedisCacheProvider {
       this.cacheGetTimeoutInMs = Number(
         this.strapi.plugin("strapi-cache").config("cacheGetTimeoutInMs")
       );
+      this.keyPrefix = this.strapi.plugin("strapi-cache").config("redisConfig")?.["keyPrefix"] ?? "";
       if (redisClusterNodes.length) {
         const redisClusterOptions = this.strapi.plugin("strapi-cache").config("redisClusterOptions");
         if (!redisClusterOptions["redisOptions"]) {
@@ -640,8 +728,9 @@ class RedisCacheProvider {
   async del(key) {
     if (!this.ready) return null;
     try {
-      loggy.info(`Redis PURGING KEY: ${key}`);
-      await this.client.del(key);
+      const relativeKey = key.slice(this.keyPrefix.length);
+      loggy.info(`Redis PURGING KEY: ${relativeKey}`);
+      await this.client.del(relativeKey);
       return true;
     } catch (error) {
       loggy.error(`Redis del error: ${error}`);
@@ -651,7 +740,7 @@ class RedisCacheProvider {
   async keys() {
     if (!this.ready) return null;
     try {
-      const keys = await this.client.keys("*");
+      const keys = await this.client.keys(`${this.keyPrefix}*`);
       return keys;
     } catch (error) {
       loggy.error(`Redis keys error: ${error}`);
@@ -661,6 +750,14 @@ class RedisCacheProvider {
   async reset() {
     if (!this.ready) return null;
     try {
+      if (this.keyPrefix) {
+        loggy.info(`Redis FLUSHING NAMESPACE: ${this.keyPrefix}`);
+        const keys = await this.keys();
+        if (!keys) return null;
+        const toDelete = keys.filter((key) => key.startsWith(this.keyPrefix));
+        await Promise.all(toDelete.map((key) => this.del(key)));
+        return true;
+      }
       loggy.info(`Redis FLUSHING ALL KEYS`);
       await this.client.flushdb();
       return true;

package/dist/server/index.mjs

@@ -69,6 +69,7 @@ const bootstrap = ({ strapi: strapi2 }) => {
   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 cacheStore = cacheService.getCacheInstance();
     if (!cacheStore) {
       loggy.error("Plugin could not be initialized");
@@ -91,6 +92,13 @@ const bootstrap = ({ strapi: strapi2 }) => {
         }
       });
     }
+    if (autoPurgeCacheOnStart) {
+      cacheStore.reset().then(() => {
+        loggy.info("Cache purged successfully");
+      }).catch((error) => {
+        loggy.error(`Error purging cache on start: ${error.message}`);
+      });
+    }
   } catch (error) {
     loggy.error("Plugin could not be initialized");
     return;
@@ -175,6 +183,7 @@ function getCacheHeaderConfig() {
 const middleware$1 = async (ctx, next) => {
   const cacheService = strapi.plugin("strapi-cache").services.service;
   const cacheableRoutes = strapi.plugin("strapi-cache").config("cacheableRoutes");
+  const excludeRoutes = strapi.plugin("strapi-cache").config("excludeRoutes");
   const { cacheHeaders, cacheHeadersDenyList, cacheHeadersAllowList, cacheAuthorizedRequests } = getCacheHeaderConfig();
   const cacheStore = cacheService.getCacheInstance();
   const { url } = ctx.request;
@@ -182,6 +191,12 @@ const middleware$1 = async (ctx, next) => {
   const cacheEntry = await cacheStore.get(key);
   const cacheControlHeader = ctx.request.headers["cache-control"];
   const noCache = cacheControlHeader && cacheControlHeader.includes("no-cache");
+  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("/api");
   const authorizationHeader = ctx.request.headers["authorization"];
   if (authorizationHeader && !cacheAuthorizedRequests) {
@@ -189,12 +204,32 @@ const middleware$1 = async (ctx, next) => {
     await next();
     return;
   }
+  const middlewaresConfig = strapi.config.get("middlewares");
+  const corsMiddleware = middlewaresConfig.find((mw) => mw.name === "strapi::cors");
+  const corsConfig = corsMiddleware?.config;
+  const origin = ctx?.request?.headers?.origin;
+  let allowedOrigins = corsConfig?.origin ?? "*";
+  if (typeof allowedOrigins === "string") {
+    allowedOrigins = [allowedOrigins];
+  }
   if (cacheEntry && !noCache) {
     loggy.info(`HIT with key: ${key}`);
     ctx.status = 200;
     ctx.body = cacheEntry.body;
     if (cacheHeaders) {
       ctx.set(cacheEntry.headers);
+    }
+    if (corsMiddleware) {
+      loggy.info("CORS middleware is set, checking allowed origins");
+      if (allowedOrigins.includes(origin)) {
+        loggy.info(`Setting Access-Control-Allow-Origin to ${origin}`);
+        ctx.set("Access-Control-Allow-Origin", origin);
+      } else if (typeof origin === "undefined" || allowedOrigins.includes("*")) {
+        loggy.info("No origin header or * in allowed origins, setting to *");
+        ctx.set("Access-Control-Allow-Origin", "*");
+      }
+    } else {
+      loggy.info("No CORS middleware set, setting to request origin or *");
       ctx.set("Access-Control-Allow-Origin", ctx.request.headers.origin || "*");
     }
     return;
@@ -208,15 +243,27 @@ const middleware$1 = async (ctx, next) => {
       cacheHeadersAllowList,
       cacheHeadersDenyList
     );
+    let setCache = true;
+    if (corsMiddleware) {
+      if (allowedOrigins.includes(origin)) ;
+      else if (typeof origin === "undefined" || allowedOrigins.includes("*")) ;
+      else {
+        setCache = false;
+      }
+    }
     if (ctx.body instanceof Stream) {
       const buf = await streamToBuffer(ctx.body);
       const contentEncoding = ctx.response.headers["content-encoding"];
       const decompressed = await decompressBuffer(buf, contentEncoding);
       const responseText = decodeBufferToText(decompressed);
-      await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      }
       ctx.body = buf;
     } else {
-      await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      }
     }
   }
 };
@@ -255,12 +302,32 @@ const middleware = async (ctx, next) => {
     await next();
     return;
   }
+  const middlewaresConfig = strapi.config.get("middlewares");
+  const corsMiddleware = middlewaresConfig.find((mw) => mw.name === "strapi::cors");
+  const corsConfig = corsMiddleware?.config;
+  const origin = ctx?.request?.headers?.origin;
+  let allowedOrigins = corsConfig?.origin ?? "*";
+  if (typeof allowedOrigins === "string") {
+    allowedOrigins = [allowedOrigins];
+  }
   if (cacheEntry && !noCache) {
     loggy.info(`HIT with key: ${key}`);
     ctx.status = 200;
     ctx.body = cacheEntry.body;
     if (cacheHeaders) {
       ctx.set(cacheEntry.headers);
+    }
+    if (corsMiddleware) {
+      loggy.info("CORS middleware is set, checking allowed origins");
+      if (allowedOrigins.includes(origin)) {
+        loggy.info(`Setting Access-Control-Allow-Origin to ${origin}`);
+        ctx.set("Access-Control-Allow-Origin", origin);
+      } else if (typeof origin === "undefined" || allowedOrigins.includes("*")) {
+        loggy.info("No origin header or * in allowed origins, setting to *");
+        ctx.set("Access-Control-Allow-Origin", "*");
+      }
+    } else {
+      loggy.info("No CORS middleware set, setting to request origin or *");
       ctx.set("Access-Control-Allow-Origin", ctx.request.headers.origin || "*");
     }
     return;
@@ -280,15 +347,27 @@ const middleware = async (ctx, next) => {
       cacheHeadersAllowList,
       cacheHeadersDenyList
     );
+    let setCache = true;
+    if (corsMiddleware) {
+      if (allowedOrigins.includes(origin)) ;
+      else if (typeof origin === "undefined" || allowedOrigins.includes("*")) ;
+      else {
+        setCache = false;
+      }
+    }
     if (ctx.body instanceof Stream) {
       const buf = await streamToBuffer(ctx.body);
       const contentEncoding = ctx.response.headers["content-encoding"];
       const decompressed = await decompressBuffer(buf, contentEncoding);
       const responseText = decodeBufferToText(decompressed);
-      await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: responseText, headers: headersToStore });
+      }
       ctx.body = buf;
     } else {
-      await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      if (setCache) {
+        await cacheStore.set(key, { body: ctx.body, headers: headersToStore });
+      }
     }
   }
 };
@@ -309,6 +388,7 @@ const config = {
     allowStale: false,
     cacheableRoutes: [],
     provider: "memory",
+    excludeRoutes: [],
     redisConfig: env("REDIS_URL"),
     redisClusterNodes: [],
     redisClusterOptions: {},
@@ -317,7 +397,8 @@ const config = {
     cacheHeadersAllowList: [],
     cacheAuthorizedRequests: false,
     cacheGetTimeoutInMs: 1e3,
-    autoPurgeCache: true
+    autoPurgeCache: true,
+    autoPurgeCacheOnStart: true
   }),
   validator: (config2) => {
     if (typeof config2.debug !== "boolean") {
@@ -338,6 +419,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 (!Array.isArray(config2.excludeRoutes) || config2.excludeRoutes.some((item) => typeof item !== "string")) {
+      throw new Error(`Invalid config: excludeRoutes must be a string array`);
+    }
     if (typeof config2.provider !== "string") {
       throw new Error(`Invalid config: provider must be a string`);
     }
@@ -378,6 +462,9 @@ const config = {
     if (typeof config2.autoPurgeCache !== "boolean") {
       throw new Error(`Invalid config: autoPurgeCache must be a boolean`);
     }
+    if (typeof config2.autoPurgeCacheOnStart !== "boolean") {
+      throw new Error(`Invalid config: autoPurgeCacheOnStart must be a boolean`);
+    }
   }
 };
 const contentTypes = {};
@@ -587,6 +674,7 @@ class RedisCacheProvider {
       this.cacheGetTimeoutInMs = Number(
         this.strapi.plugin("strapi-cache").config("cacheGetTimeoutInMs")
       );
+      this.keyPrefix = this.strapi.plugin("strapi-cache").config("redisConfig")?.["keyPrefix"] ?? "";
       if (redisClusterNodes.length) {
         const redisClusterOptions = this.strapi.plugin("strapi-cache").config("redisClusterOptions");
         if (!redisClusterOptions["redisOptions"]) {
@@ -636,8 +724,9 @@ class RedisCacheProvider {
   async del(key) {
     if (!this.ready) return null;
     try {
-      loggy.info(`Redis PURGING KEY: ${key}`);
-      await this.client.del(key);
+      const relativeKey = key.slice(this.keyPrefix.length);
+      loggy.info(`Redis PURGING KEY: ${relativeKey}`);
+      await this.client.del(relativeKey);
       return true;
     } catch (error) {
       loggy.error(`Redis del error: ${error}`);
@@ -647,7 +736,7 @@ class RedisCacheProvider {
   async keys() {
     if (!this.ready) return null;
     try {
-      const keys = await this.client.keys("*");
+      const keys = await this.client.keys(`${this.keyPrefix}*`);
       return keys;
     } catch (error) {
       loggy.error(`Redis keys error: ${error}`);
@@ -657,6 +746,14 @@ class RedisCacheProvider {
   async reset() {
     if (!this.ready) return null;
     try {
+      if (this.keyPrefix) {
+        loggy.info(`Redis FLUSHING NAMESPACE: ${this.keyPrefix}`);
+        const keys = await this.keys();
+        if (!keys) return null;
+        const toDelete = keys.filter((key) => key.startsWith(this.keyPrefix));
+        await Promise.all(toDelete.map((key) => this.del(key)));
+        return true;
+      }
       loggy.info(`Redis FLUSHING ALL KEYS`);
       await this.client.flushdb();
       return true;

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

@@ -9,6 +9,7 @@ declare const _default: {
         allowStale: boolean;
         cacheableRoutes: any[];
         provider: string;
+        excludeRoutes: any[];
         redisConfig: any;
         redisClusterNodes: any[];
         redisClusterOptions: {};
@@ -18,6 +19,7 @@ declare const _default: {
         cacheAuthorizedRequests: boolean;
         cacheGetTimeoutInMs: number;
         autoPurgeCache: boolean;
+        autoPurgeCacheOnStart: boolean;
     };
     validator: (config: any) => void;
 };

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

@@ -18,6 +18,7 @@ declare const _default: {
             allowStale: boolean;
             cacheableRoutes: any[];
             provider: string;
+            excludeRoutes: any[];
             redisConfig: any;
             redisClusterNodes: any[];
             redisClusterOptions: {};
@@ -27,6 +28,7 @@ declare const _default: {
             cacheAuthorizedRequests: boolean;
             cacheGetTimeoutInMs: number;
             autoPurgeCache: boolean;
+            autoPurgeCacheOnStart: boolean;
         };
         validator: (config: any) => void;
     };

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

@@ -5,6 +5,7 @@ export declare class RedisCacheProvider implements CacheProvider {
     private initialized;
     private client;
     private cacheGetTimeoutInMs;
+    private keyPrefix;
     constructor(strapi: Core.Strapi);
     init(): void;
     get ready(): boolean;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.7-rc.2",
+  "version": "1.5.8",
   "keywords": [
     "strapi cache",
     "strapi rest cache",
@@ -42,8 +42,7 @@
     "ioredis": "^5.6.1",
     "lru-cache": "^11.1.0",
     "raw-body": "^3.0.0",
-    "react-intl": "^7.1.10",
-    "strapi-cache": "file:.yalc/strapi-cache"
+    "react-intl": "^7.1.10"
   },
   "devDependencies": {
     "@strapi/sdk-plugin": "^5.3.2",