@unchainedshop/core-warehousing 4.8.21 → 4.8.22

package/lib/module/configureWarehousingModule.d.ts

@@ -31,7 +31,7 @@ export declare const configureWarehousingModule: ({ db }: ModuleInput<Record<str
         walletAddresses: string[];
     }, options?: mongodb.FindOptions) => Promise<TokenSurrogate[]>;
     findProviders: (query?: WarehousingProviderQuery, options?: mongodb.FindOptions) => Promise<WarehousingProvider[]>;
-    allProviders: () => Promise<mongodb.WithId<WarehousingProvider>[]>;
+    allProviders: import("@unchainedshop/utils/lib/memoize-with-ttl.js").MemoizedWithTTL<[], mongodb.WithId<WarehousingProvider>[]>;
     providerExists: ({ warehousingProviderId, }: {
         warehousingProviderId: string;
     }) => Promise<boolean>;

package/lib/module/configureWarehousingModule.js

@@ -2,8 +2,7 @@ import { emit, registerEvents } from '@unchainedshop/events';
 import { generateDbFilterById, generateDbObjectId, escapeRegexString, } from '@unchainedshop/mongodb';
 import { WarehousingProvidersCollection, } from "../db/WarehousingProvidersCollection.js";
 import { TokenSurrogateCollection } from "../db/TokenSurrogateCollection.js";
-import pMemoize from 'p-memoize';
-import ExpiryMap from 'expiry-map';
+import { memoizeWithTTL } from '@unchainedshop/utils';
 const WAREHOUSING_PROVIDER_EVENTS = [
     'WAREHOUSING_PROVIDER_CREATE',
     'WAREHOUSING_PROVIDER_UPDATE',
@@ -11,7 +10,6 @@ const WAREHOUSING_PROVIDER_EVENTS = [
     'TOKEN_OWNERSHIP_CHANGED',
     'TOKEN_INVALIDATED',
 ];
-const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
 export const buildFindSelector = ({ includeDeleted = false, queryString, warehousingProviderIds, type, } = {}) => {
     const selector = includeDeleted ? {} : { deleted: null };
     if (warehousingProviderIds) {
@@ -39,6 +37,7 @@ export const buildTokenFindSelector = ({ queryString, walletAddressExists, ...re
 export const configureWarehousingModule = async ({ db }) => {
     registerEvents(WAREHOUSING_PROVIDER_EVENTS);
     const WarehousingProviders = await WarehousingProvidersCollection(db);
+    const allProviders = memoizeWithTTL(async () => WarehousingProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray(), { ttl: process.env.NODE_ENV === 'production' ? 60000 : 1 });
     const TokenSurrogates = await TokenSurrogateCollection(db);
     return {
         count: async (query = {}) => {
@@ -82,11 +81,7 @@ export const configureWarehousingModule = async ({ db }) => {
             const providers = WarehousingProviders.find(buildFindSelector(query), options);
             return providers.toArray();
         },
-        allProviders: pMemoize(async function () {
-            return WarehousingProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray();
-        }, {
-            cache: allProvidersCache,
-        }),
+        allProviders,
         providerExists: async ({ warehousingProviderId, }) => {
             const providerCount = await WarehousingProviders.countDocuments(generateDbFilterById(warehousingProviderId, { deleted: null }), { limit: 1 });
             return !!providerCount;
@@ -151,7 +146,7 @@ export const configureWarehousingModule = async ({ db }) => {
             const warehousingProvider = (await WarehousingProviders.findOne({
                 _id: warehousingProviderId,
             }));
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('WAREHOUSING_PROVIDER_CREATE', { warehousingProvider });
             return warehousingProvider;
         },
@@ -164,7 +159,7 @@ export const configureWarehousingModule = async ({ db }) => {
             }, { returnDocument: 'after' });
             if (!warehousingProvider)
                 return null;
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('WAREHOUSING_PROVIDER_UPDATE', { warehousingProvider });
             return warehousingProvider;
         },
@@ -176,7 +171,7 @@ export const configureWarehousingModule = async ({ db }) => {
             }, { returnDocument: 'after' });
             if (!warehousingProvider)
                 return null;
-            allProvidersCache.clear();
+            allProviders.clear();
             await emit('WAREHOUSING_PROVIDER_REMOVE', { warehousingProvider });
             return warehousingProvider;
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-warehousing",
   "description": "Inventory and stock management module for the Unchained Engine",
-  "version": "4.8.21",
+  "version": "4.8.22",
   "main": "lib/warehousing-index.js",
   "types": "lib/warehousing-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",