Skip to content

fix(rest-cache): improve module loading and error handling #118 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mehdiraized wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −8
Open

fix(rest-cache): improve module loading and error handling #118 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/plugin-rest-cache/server/src/bootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ const createProvider = async (providerConfig, { strapi }) => {
const requireProvider = createRequire(import.meta.url);
provider = requireProvider(modulePath);
} catch (err) {
const details = err?.message
? `\nTried to load: ${modulePath}\nCause: ${err.message}`
: `\nTried to load: ${modulePath}`;
throw new Error(
`Could not load REST Cache provider "${providerName}". You may need to install a provider plugin "yarn add @strapi-community/provider-rest-cache-${providerName}".`
`Could not load REST Cache provider "${providerName}". You may need to install a provider plugin "yarn add @strapi-community/provider-rest-cache-${providerName}".${details}`
);
}

Expand Down
8 changes: 5 additions & 3 deletions packages/provider-rest-cache-memory/lib/MemoryCacheProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
'use strict';

const Keyv = require('keyv').default;
const QuickLRU = require('quick-lru');
const keyvModule = require('keyv');
const Keyv = keyvModule.default ?? keyvModule;
const quickLruModule = require('quick-lru');
const QuickLRU = quickLruModule.default ?? quickLruModule;
const { createCache } = require('cache-manager');
const { CacheProvider } = require('@strapi-community/plugin-rest-cache/types');

Expand All @@ -20,7 +22,7 @@ class MemoryCacheProvider extends CacheProvider {
ttl,
stores: [
new Keyv({
store: new QuickLRU.default(adapterOptions),
store: new QuickLRU(adapterOptions),
}),
],
});
Expand Down
1 change: 1 addition & 0 deletions packages/provider-rest-cache-memory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
},
"dependencies": {
"cache-manager": "^7.1.1",
"keyv": "^5.5.0",
"quick-lru": "7.0.1"
},
"devDependencies": {
Expand Down
8 changes: 5 additions & 3 deletions packages/provider-rest-cache-redis/lib/RedisCacheProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
'use strict';

const { createCache } = require('cache-manager');
const Keyv = require('keyv').default;
const KeyvRedis = require('@keyv/redis');
const keyvModule = require('keyv');
const Keyv = keyvModule.default ?? keyvModule;
const keyvRedisModule = require('@keyv/redis');
const KeyvRedis = keyvRedisModule.default ?? keyvRedisModule;
const { CacheProvider } = require('@strapi-community/plugin-rest-cache/types');

class RedisCacheProvider extends CacheProvider {
Expand All @@ -16,7 +18,7 @@ class RedisCacheProvider extends CacheProvider {
ttl,
stores: [
new Keyv({
store: new KeyvRedis.default(client, adapterOptions),
store: new KeyvRedis(client, adapterOptions),
}),
],
});
Expand Down
3 changes: 2 additions & 1 deletion packages/provider-rest-cache-redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
},
"dependencies": {
"@keyv/redis": "^3.0.1",
"cache-manager": "^7.1.1"
"cache-manager": "^7.1.1",
"keyv": "^5.5.0"
},
"devDependencies": {
"@strapi-community/plugin-redis": "^2.0.0",
Expand Down