@unchainedshop/core-delivery 4.8.20 → 4.8.22

package/lib/module/configureDeliveryModule.d.ts

@@ -19,7 +19,7 @@ export declare const configureDeliveryModule: ({ db, options: deliveryOptions, }
         deliveryProviderId: string;
     } & mongodb.Filter<DeliveryProvider>, options?: mongodb.FindOptions) => Promise<DeliveryProvider | null>;
     findProviders: (query?: DeliveryProviderQuery, options?: mongodb.FindOptions) => Promise<DeliveryProvider[]>;
-    allProviders: () => Promise<mongodb.WithId<DeliveryProvider>[]>;
+    allProviders: import("@unchainedshop/utils/lib/memoize-with-ttl.js").MemoizedWithTTL<[], mongodb.WithId<DeliveryProvider>[]>;
     providerExists: ({ deliveryProviderId }: {
         deliveryProviderId: string;
     }) => Promise<boolean>;

package/lib/module/configureDeliveryModule.js

@@ -2,8 +2,7 @@ import { emit, registerEvents } from '@unchainedshop/events';
 import { mongodb, generateDbFilterById, generateDbObjectId, escapeRegexString, } from '@unchainedshop/mongodb';
 import { DeliveryProvidersCollection, } from "../db/DeliveryProvidersCollection.js";
 import { deliverySettings } from "../delivery-settings.js";
-import pMemoize from 'p-memoize';
-import ExpiryMap from 'expiry-map';
+import { memoizeWithTTL } from '@unchainedshop/utils';
 const DELIVERY_PROVIDER_EVENTS = [
     'DELIVERY_PROVIDER_CREATE',
     'DELIVERY_PROVIDER_UPDATE',
@@ -23,11 +22,11 @@ export const buildFindSelector = ({ includeDeleted = false, queryString, deliver
     }
     return selector;
 };
-const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
 export const configureDeliveryModule = async ({ db, options: deliveryOptions = {}, }) => {
     registerEvents(DELIVERY_PROVIDER_EVENTS);
     deliverySettings.configureSettings(deliveryOptions);
     const DeliveryProviders = await DeliveryProvidersCollection(db);
+    const allProviders = memoizeWithTTL(async () => DeliveryProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray(), { ttl: process.env.NODE_ENV === 'production' ? 60000 : 1 });
     return {
         count: async (query = {}) => {
             const providerCount = await DeliveryProviders.countDocuments(buildFindSelector(query));
@@ -40,11 +39,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
             const providers = DeliveryProviders.find(buildFindSelector(query), options);
             return providers.toArray();
         },
-        allProviders: pMemoize(async function () {
-            return DeliveryProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray();
-        }, {
-            cache: allProvidersCache,
-        }),
+        allProviders,
         providerExists: async ({ deliveryProviderId }) => {
             const providerCount = await DeliveryProviders.countDocuments(generateDbFilterById(deliveryProviderId, { deleted: null }), { limit: 1 });
             return !!providerCount;
@@ -56,7 +51,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
                 ...doc,
             });
             const deliveryProvider = (await DeliveryProviders.findOne({ _id: deliveryProviderId }, {}));
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('DELIVERY_PROVIDER_CREATE', { deliveryProvider });
             return deliveryProvider;
         },
@@ -69,7 +64,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
             }, { returnDocument: 'after' });
             if (!deliveryProvider)
                 return null;
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('DELIVERY_PROVIDER_UPDATE', { deliveryProvider });
             return deliveryProvider;
         },
@@ -81,7 +76,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
             }, { returnDocument: 'after' });
             if (!deliveryProvider)
                 return null;
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('DELIVERY_PROVIDER_REMOVE', { deliveryProvider });
             return deliveryProvider;
         },

package/package.json

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