@unchainedshop/utils 4.8.21 → 4.8.22

package/lib/generate-random-hash.js

@@ -1,12 +1,3 @@
-import Hashids from 'hashids';
-const hashids = new Hashids('unchained', 6, 'ABCDEFGHIJKLMNPQRSTUVWXYZ23456789');
-const RANGE = 999999998;
-const REJECTION_LIMIT = Math.floor(0x100000000 / RANGE) * RANGE;
-export default () => {
-    let value = crypto.getRandomValues(new Uint32Array(1))[0];
-    while (value >= REJECTION_LIMIT) {
-        value = crypto.getRandomValues(new Uint32Array(1))[0];
-    }
-    const randomNumber = (value % RANGE) + 1;
-    return hashids.encode(randomNumber);
-};
+import { randomInt } from 'node:crypto';
+const ALPHABET = 'ABCDEFGHIJKLMNPQRSTUVWXYZ23456789';
+export default () => Array.from({ length: 6 }, () => ALPHABET[randomInt(ALPHABET.length)]).join('');

package/lib/memoize-with-ttl.d.ts

@@ -1,8 +1,9 @@
-type AsyncFunction = (...args: any[]) => Promise<any>;
-interface MemoizeOptions {
-    cacheKey?: (args: any[]) => string;
-}
-export declare function memoizeWithTTL<T extends AsyncFunction>(fn: T, ttlMs: number, options?: MemoizeOptions): T & {
+export interface MemoizedWithTTL<A extends unknown[], R> {
+    (...args: A): Promise<R>;
     clear: () => void;
-};
-export {};
+    delete: (key: unknown) => boolean;
+}
+export default function memoizeWithTTL<A extends unknown[], R>(fn: (...args: A) => Promise<R>, { ttl, cacheKey }: {
+    ttl: number;
+    cacheKey?: (args: A) => unknown;
+}): MemoizedWithTTL<A, R>;

package/lib/memoize-with-ttl.js

@@ -1,35 +1,27 @@
-function createTTLCache(ttlMs) {
-    const store = new Map();
-    return {
-        get(key) {
-            const entry = store.get(key);
-            if (!entry)
-                return undefined;
-            if (Date.now() > entry.expiry) {
-                store.delete(key);
-                return undefined;
-            }
-            return entry.value;
-        },
-        set(key, value) {
-            store.set(key, { value, expiry: Date.now() + ttlMs });
-        },
-        clear() {
-            store.clear();
-        },
-    };
-}
-export function memoizeWithTTL(fn, ttlMs, options) {
-    const cache = createTTLCache(ttlMs);
-    const memoized = async function (...args) {
-        const key = options?.cacheKey ? options.cacheKey(args) : JSON.stringify(args);
-        const cached = cache.get(key);
-        if (cached !== undefined)
-            return cached;
-        const result = await fn(...args);
-        cache.set(key, result);
-        return result;
+export default function memoizeWithTTL(fn, { ttl, cacheKey = (args) => args[0] }) {
+    const cache = new Map();
+    const memoized = (...args) => {
+        const key = cacheKey(args);
+        const now = Date.now();
+        const hit = cache.get(key);
+        if (hit && (!hit.settled || hit.expires > now))
+            return hit.promise;
+        for (const [expiredKey, entry] of cache) {
+            if (entry.settled && entry.expires <= now)
+                cache.delete(expiredKey);
+        }
+        const entry = { promise: fn(...args), settled: false, expires: Infinity };
+        cache.set(key, entry);
+        entry.promise.then(() => {
+            entry.settled = true;
+            entry.expires = Date.now() + ttl;
+        }, () => {
+            if (cache.get(key) === entry)
+                cache.delete(key);
+        });
+        return entry.promise;
     };
     memoized.clear = () => cache.clear();
+    memoized.delete = (key) => cache.delete(key);
     return memoized;
 }

package/lib/utils-index.d.ts

@@ -5,6 +5,7 @@ export { default as objectInvert } from './object-invert.ts';
 export { default as findUnusedSlug } from './find-unused-slug.ts';
 export { default as slugify } from './slugify.ts';
 export { default as generateRandomHash } from './generate-random-hash.ts';
+export { default as memoizeWithTTL } from './memoize-with-ttl.ts';
 export { default as buildObfuscatedFieldsFilter } from './build-obfuscated-fields-filter.ts';
 export { default as sha256 } from './sha256.ts';
 export { default as sha1 } from './sha1.ts';

package/lib/utils-index.js

@@ -5,6 +5,7 @@ export { default as objectInvert } from "./object-invert.js";
 export { default as findUnusedSlug } from "./find-unused-slug.js";
 export { default as slugify } from "./slugify.js";
 export { default as generateRandomHash } from "./generate-random-hash.js";
+export { default as memoizeWithTTL } from "./memoize-with-ttl.js";
 export { default as buildObfuscatedFieldsFilter } from "./build-obfuscated-fields-filter.js";
 export { default as sha256 } from "./sha256.js";
 export { default as sha1 } from "./sha1.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/utils",
   "description": "Common utility functions and base classes for the Unchained Engine",
-  "version": "4.8.21",
+  "version": "4.8.22",
   "main": "lib/utils-index.js",
   "types": "lib/utils-index.d.ts",
   "type": "module",
@@ -30,7 +30,6 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
     "@unchainedshop/logger": "^4.8.12",
-    "hashids": "^2.3.0",
     "libphonenumber-js": "^1.13.11",
     "resolve-accept-language": "^3.1.11"
   },