@unchainedshop/core-payment 4.8.21 → 4.8.23

package/lib/module/configurePaymentModule.d.ts

@@ -7,7 +7,7 @@ export declare const configurePaymentModule: ({ db, options: paymentOptions, }:
             paymentProviderId: string;
         }, options?: import("mongodb").FindOptions) => Promise<import("../db/PaymentProvidersCollection.ts").PaymentProvider | null>;
         findProviders: (query?: import("./configurePaymentProvidersModule.ts").PaymentProviderQuery, options?: import("mongodb").FindOptions) => Promise<import("../db/PaymentProvidersCollection.ts").PaymentProvider[]>;
-        allProviders: () => Promise<import("mongodb").WithId<import("../db/PaymentProvidersCollection.ts").PaymentProvider>[]>;
+        allProviders: import("@unchainedshop/utils/lib/memoize-with-ttl.js").MemoizedWithTTL<[], import("mongodb").WithId<import("../db/PaymentProvidersCollection.ts").PaymentProvider>[]>;
         providerExists: ({ paymentProviderId }: {
             paymentProviderId: string;
         }) => Promise<boolean>;

package/lib/module/configurePaymentProvidersModule.d.ts

@@ -18,7 +18,7 @@ export declare const configurePaymentProvidersModule: (PaymentProviders: mongodb
         paymentProviderId: string;
     }, options?: mongodb.FindOptions) => Promise<PaymentProvider | null>;
     findProviders: (query?: PaymentProviderQuery, options?: mongodb.FindOptions) => Promise<PaymentProvider[]>;
-    allProviders: () => Promise<mongodb.WithId<PaymentProvider>[]>;
+    allProviders: import("@unchainedshop/utils/lib/memoize-with-ttl.js").MemoizedWithTTL<[], mongodb.WithId<PaymentProvider>[]>;
     providerExists: ({ paymentProviderId }: {
         paymentProviderId: string;
     }) => Promise<boolean>;

package/lib/module/configurePaymentProvidersModule.js

@@ -1,13 +1,11 @@
 import { emit, registerEvents } from '@unchainedshop/events';
 import { generateDbFilterById, generateDbObjectId, mongodb, escapeRegexString, } from '@unchainedshop/mongodb';
-import pMemoize from 'p-memoize';
-import ExpiryMap from 'expiry-map';
+import { memoizeWithTTL } from '@unchainedshop/utils';
 const PAYMENT_PROVIDER_EVENTS = [
     'PAYMENT_PROVIDER_CREATE',
     'PAYMENT_PROVIDER_UPDATE',
     'PAYMENT_PROVIDER_REMOVE',
 ];
-const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
 export const buildFindSelector = ({ includeDeleted = false, queryString, paymentProviderIds, type, } = {}) => {
     const selector = includeDeleted ? {} : { deleted: null };
     if (paymentProviderIds) {
@@ -24,6 +22,7 @@ export const buildFindSelector = ({ includeDeleted = false, queryString, payment
 };
 export const configurePaymentProvidersModule = (PaymentProviders) => {
     registerEvents(PAYMENT_PROVIDER_EVENTS);
+    const allProviders = memoizeWithTTL(async () => PaymentProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray(), { ttl: process.env.NODE_ENV === 'production' ? 60000 : 1 });
     return {
         count: async (query = {}) => {
             const providerCount = await PaymentProviders.countDocuments(buildFindSelector(query));
@@ -36,11 +35,7 @@ export const configurePaymentProvidersModule = (PaymentProviders) => {
             const providers = PaymentProviders.find(buildFindSelector(query), options);
             return providers.toArray();
         },
-        allProviders: pMemoize(async function () {
-            return PaymentProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray();
-        }, {
-            cache: allProvidersCache,
-        }),
+        allProviders,
         providerExists: async ({ paymentProviderId }) => {
             const providerCount = await PaymentProviders.countDocuments(generateDbFilterById(paymentProviderId, { deleted: null }), { limit: 1 });
             return !!providerCount;
@@ -52,7 +47,7 @@ export const configurePaymentProvidersModule = (PaymentProviders) => {
                 ...doc,
             });
             const paymentProvider = (await PaymentProviders.findOne(generateDbFilterById(paymentProviderId), {}));
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('PAYMENT_PROVIDER_CREATE', { paymentProvider });
             return paymentProvider;
         },
@@ -65,7 +60,7 @@ export const configurePaymentProvidersModule = (PaymentProviders) => {
             }, { returnDocument: 'after' });
             if (!paymentProvider)
                 return null;
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('PAYMENT_PROVIDER_UPDATE', { paymentProvider });
             return paymentProvider;
         },
@@ -77,7 +72,7 @@ export const configurePaymentProvidersModule = (PaymentProviders) => {
             }, { returnDocument: 'after' });
             if (!paymentProvider)
                 return null;
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('PAYMENT_PROVIDER_REMOVE', { paymentProvider });
             return paymentProvider;
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-payment",
   "description": "Payment provider management module for the Unchained Engine",
-  "version": "4.8.21",
+  "version": "4.8.23",
   "main": "lib/payment-index.js",
   "types": "lib/payment-index.d.ts",
   "type": "module",
@@ -36,10 +36,8 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@unchainedshop/events": "^4.8.12",
-    "@unchainedshop/logger": "^4.8.12",
-    "@unchainedshop/utils": "^4.8.12",
-    "expiry-map": "^2.0.0",
-    "p-memoize": "^8.0.0"
+    "@unchainedshop/mongodb": "^4.8.12",
+    "@unchainedshop/utils": "^4.8.12"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",