@rapidrest/core 3.1.0 → 4.0.0

package/dist/lib/CacheUtils.js

@@ -12,11 +12,14 @@ export class CacheUtils {
      * whatever entry was `set()` least recently among those still present.
      *
      * @param map The map to evict the oldest entry from.
+     * @param num The total number of items to evict. Default is `1`.
      */
-    static evictOldest(map) {
-        const oldestKey = map.keys().next().value;
-        if (oldestKey !== undefined) {
-            map.delete(oldestKey);
+    static evictOldest(map, num = 1) {
+        for (let i = 0; i < num; i++) {
+            const oldestKey = map.keys().next().value;
+            if (oldestKey !== undefined) {
+                map.delete(oldestKey);
+            }
         }
     }
 }

package/dist/lib/CacheUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheUtils.js","sourceRoot":"","sources":["../../src/CacheUtils.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,mEAAmE;AACnE,+EAA+E;AAE/E;;;;GAIG;AACH,MAAM,OAAO,UAAU;IACnB;;;;;OAKG;IACI,MAAM,CAAC,WAAW,CAAO,GAAc;QAC1C,MAAM,SAAS,GAAkB,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;QACzD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC1B,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"CacheUtils.js","sourceRoot":"","sources":["../../src/CacheUtils.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,mEAAmE;AACnE,+EAA+E;AAE/E;;;;GAIG;AACH,MAAM,OAAO,UAAU;IACnB;;;;;;OAMG;IACI,MAAM,CAAC,WAAW,CAAO,GAAc,EAAE,MAAc,CAAC;QAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAkB,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;YACzD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC1B,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC1B,CAAC;QACL,CAAC;IACL,CAAC;CACJ"}

package/dist/lib/MemoryStore.js

@@ -26,9 +26,28 @@ export class MemoryStore {
         this.entries = new Map();
         /** The maximum number of records to store. */
         this.maxSize = 10000;
+        this.sets = new Map();
         this.sweepTimer = setInterval(() => this.sweep(), SWEEP_INTERVAL_MS);
         this.sweepTimer.unref?.();
     }
+    clear() {
+        this.entries.clear();
+        this.sets.clear();
+    }
+    delete(id) {
+        this.entries.delete(id);
+    }
+    deleteMany(ids) {
+        for (const id of ids) {
+            this.entries.delete(id);
+        }
+    }
+    deleteSet(id) {
+        // We purposefully don't delete the individually stored records
+        // as they may be relevant to other valid queries. Let them expire
+        // naturally.
+        this.sets.delete(id);
+    }
     /** Stops the background sweep timer. Call when the owning `SessionManager` is destroyed. */
     destroy() {
         clearInterval(this.sweepTimer);
@@ -45,6 +64,20 @@ export class MemoryStore {
         }
         return entry.data;
     }
+    loadMany(ids) {
+        const results = [];
+        for (const id of ids) {
+            results.push(this.load(id));
+        }
+        return results;
+    }
+    loadSet(id) {
+        const ids = this.sets.get(id);
+        if (!ids) {
+            return undefined;
+        }
+        return this.loadMany(ids);
+    }
     save(id, data, ttl = this.defaultTTL) {
         if (!this.entries.has(id) && this.entries.size >= this.maxSize) {
             // Reclaim space by sweeping expired entries first, then evicting the oldest surviving entries
@@ -60,8 +93,34 @@ export class MemoryStore {
         this.entries.delete(id);
         this.entries.set(id, { data, expiresAt: Date.now() + ttl * 1000 });
     }
-    delete(id) {
-        this.entries.delete(id);
+    saveMany(ids, data, ttl = this.defaultTTL) {
+        if (ids.length !== data.length) {
+            throw new Error("The ids and data arrays have different lengths.");
+        }
+        for (let i = 0; i < ids.length; i++) {
+            this.save(ids[i], data[i], ttl);
+        }
+    }
+    saveSet(id, data, idProp = "uid", ttl = this.defaultTTL) {
+        // Extract the list of ids from the data set, skipping any record that has no idProp value — otherwise
+        // every such record would collide under the same String(undefined) === "undefined" key and silently
+        // overwrite one another. We convert this to string so that it's a usable reference in our primary
+        // storage map.
+        const ids = [];
+        const records = [];
+        for (const record of data) {
+            const recordId = record[idProp];
+            if (recordId !== undefined && recordId !== null) {
+                ids.push(String(recordId));
+                records.push(record);
+            }
+        }
+        // Now store each record
+        for (let i = 0; i < ids.length; i++) {
+            this.save(ids[i], records[i], ttl);
+        }
+        // Now store the id set
+        this.sets.set(id, ids);
     }
     sweep() {
         const now = Date.now();

package/dist/lib/MemoryStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryStore.js","sourceRoot":"","sources":["../../src/MemoryStore.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+EAA+E;AAC/E,mEAAmE;AACnE,+EAA+E;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAG3D,8EAA8E;AAC9E,MAAM,iBAAiB,GAAG,KAAM,CAAC;AAEjC;;;;GAIG;AACH,MAAM,OAAO,WAAW;IAWpB;QAVA,2CAA2C;QACpC,eAAU,GAAW,EAAE,CAAC;QAErB,YAAO,GAAkC,IAAI,GAAG,EAAE,CAAC;QAE7D,8CAA8C;QACvC,YAAO,GAAW,KAAK,CAAC;QAK3B,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,iBAAiB,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC;IAC9B,CAAC;IAED,4FAA4F;IAErF,OAAO;QACV,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAEM,IAAI,CAAC,EAAU;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,2CAA2C;QAC3C,IAAI,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACxB,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC;IACtB,CAAC;IAEM,IAAI,CAAC,EAAU,EAAE,IAAyB,EAAE,MAAc,IAAI,CAAC,UAAU;QAC5E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAC7D,8FAA8F;YAC9F,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAChE,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QACD,uGAAuG;QACvG,0GAA0G;QAC1G,uGAAuG;QACvG,kBAAkB;QAClB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC;IACvE,CAAC;IAEM,MAAM,CAAC,EAAU;QACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;IAEO,KAAK;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACtD,IAAI,KAAK,CAAC,SAAS,IAAI,GAAG;gBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;CACJ;AA7CU;IADN,OAAO;;;;0CAGP"}
+{"version":3,"file":"MemoryStore.js","sourceRoot":"","sources":["../../src/MemoryStore.ts"],"names":[],"mappings":"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"}

package/dist/lib/RedisStore.js

@@ -22,22 +22,69 @@ const SWEEP_INTERVAL_MS = 60000;
  */
 export class RedisStore {
     /**
+     * @param baseKey The base key that is pre-pended to all IDs.
      * @param client The Redis client to back this store with. When omitted, the store operates purely in-memory.
      */
-    constructor(client) {
+    constructor(baseKey = "store", client) {
         /** The default record TTL (in seconds). */
         this.defaultTTL = 60;
         this.entries = new Map();
         /** The maximum number of records to store. */
         this.maxSize = 10000;
+        this.sets = new Map();
+        this.baseKey = baseKey;
         this.client = client;
         this.sweepTimer = setInterval(() => this.sweep(), SWEEP_INTERVAL_MS);
         this.sweepTimer.unref?.();
     }
+    async clear() {
+        this.entries.clear();
+        this.sets.clear();
+        // Delete all entries in redis
+        if (this.client) {
+            let keys = [];
+            for await (const results of this.client.scanIterator({ MATCH: this.baseKey + "*" })) {
+                keys.push(...results);
+            }
+            if (keys.length > 0) {
+                await this.client.unlink(keys);
+            }
+        }
+    }
+    async delete(id) {
+        // Prepend the base key to the id
+        id = this.baseKey + id;
+        this.entries.delete(id);
+        await this.client?.del(id);
+    }
+    async deleteMany(ids) {
+        if (ids.length === 0) {
+            return;
+        }
+        // Pre-pend the baseKey to all ids
+        ids = ids.map((id) => this.baseKey + id);
+        // Delete all local entries
+        for (const id of ids) {
+            this.entries.delete(id);
+        }
+        // Now delete all entries in redis
+        await this.client?.del(ids);
+    }
+    async deleteSet(id) {
+        // Prepend the base key to the id
+        id = this.baseKey + id;
+        // We purposefully don't delete the individually stored records
+        // as they may be relevant to other valid queries. Let them expire
+        // naturally.
+        this.sets.delete(id);
+        await this.client?.del(id);
+    }
     destroy() {
         clearInterval(this.sweepTimer);
     }
-    async load(id) {
+    async load(id, skipRedis = false) {
+        // Prepend the base key to the id
+        id = this.baseKey + id;
         const entry = this.entries.get(id);
         if (entry) {
             // If the local copy hasn't expired, it's safe to serve directly.
@@ -50,22 +97,12 @@ export class RedisStore {
             this.entries.delete(id);
         }
         // Without a Redis client, this is a pure in-memory store: a local miss/expiry is a real miss.
-        if (!this.client) {
+        if (!this.client || skipRedis) {
             return undefined;
         }
         // The entry wasn't found locally. Try retrieving from redis.
         // We'll also grab the ttl so we can add it to our local map.
-        const result = await this.client
-            .multi([
-            ["get", id],
-            ["ttl", id],
-        ])
-            .exec();
-        if (!result) {
-            return undefined;
-        }
-        const data = result[0][1] ? result[0][1] : undefined;
-        const ttl = result[1][1] ?? undefined;
+        const [data, ttl] = await this.client.multi().get(id).ttl(id).execAsPipelineTyped();
         if (!data) {
             return undefined;
         }
@@ -85,12 +122,98 @@ export class RedisStore {
         this.entries.set(id, newEntry);
         return newEntry.data;
     }
-    async save(id, data, ttl = this.defaultTTL) {
+    async loadMany(ids) {
+        const results = new Array(ids.length);
+        // Load as many from the local store as possible
+        let missing = [];
+        for (let idx = 0; idx < ids.length; idx++) {
+            const id = ids[idx];
+            const result = await this.load(id, true);
+            if (result) {
+                results[idx] = result;
+            }
+            else {
+                missing.push({ idx, id });
+            }
+        }
+        if (!this.client) {
+            return results;
+        }
+        // Now load all remaining items from redis. Note that we don't call load() here, instead we use the multi
+        // command to reduce the number of times we hit redis (1 call vs n*2 calls).
+        if (missing.length > 0) {
+            let pipe = this.client.multi();
+            for (const pair of missing) {
+                const id = this.baseKey + pair.id;
+                pipe.get(id).ttl(id);
+            }
+            const result = await pipe.execAsPipeline();
+            let toSave = [];
+            for (let i = 0; i < missing.length; i++) {
+                const pair = missing[i];
+                const data = result[i * 2];
+                const ttl = result[i * 2 + 1];
+                if (data) {
+                    const record = JSON.parse(data);
+                    // Store the result in the same position in our final array
+                    results[pair.idx] = record;
+                    // Now add the list of items to store locally
+                    toSave.push({ id: pair.id, data: record, ttl });
+                }
+            }
+            // Finally go through all items to save.
+            if (toSave.length > 0) {
+                // Let's do a sweep on the local map and free up space while we're at it. Every id in `toSave` is
+                // guaranteed to be a genuinely new key (load() already deleted any expired local copy before
+                // reporting a miss), so `toSave.length` is exactly how much the map is about to grow by.
+                if (this.entries.size + toSave.length > this.maxSize) {
+                    // Reclaim space by sweeping expired entries first, then evicting exactly enough of the oldest
+                    // surviving entries for the whole batch to fit — evicting a fixed `toSave.length` regardless
+                    // of how much the sweep already freed would evict more live entries than necessary.
+                    this.sweep();
+                    const overflow = this.entries.size + toSave.length - this.maxSize;
+                    if (overflow > 0) {
+                        CacheUtils.evictOldest(this.entries, Math.min(overflow, this.entries.size));
+                    }
+                }
+                for (const entry of toSave) {
+                    this.entries.set(this.baseKey + entry.id, {
+                        data: entry.data,
+                        expiresAt: Date.now() + entry.ttl * 1000,
+                    });
+                }
+            }
+        }
+        return results;
+    }
+    async loadSet(id) {
+        id = this.baseKey + id;
+        // First look up the list of ids from local storage
+        const ids = this.sets.get(id);
+        if (ids) {
+            return this.loadMany(ids);
+        }
+        if (!this.client) {
+            return undefined;
+        }
+        // The set ids aren't stored locally, so let's try redis.
+        const json = await this.client.get(id);
+        if (json) {
+            const ids = JSON.parse(json);
+            // Store the list of ids locally for faster retrieval next time
+            this.sets.set(id, ids);
+            return this.loadMany(ids);
+        }
+        return undefined;
+    }
+    async save(id, data, ttl = this.defaultTTL, skipRedis = false) {
+        // Prepend the base key to the id
+        id = this.baseKey + id;
         // Write to Redis first (when configured): if it fails (bad connection, etc.), the local cache is left
         // untouched instead of reporting a "saved" value locally that never made it to the shared store other
         // instances read from.
-        if (this.client) {
-            await this.client.setex(id, ttl, JSON.stringify(data));
+        if (this.client && !skipRedis) {
+            await this.client.setEx(id, ttl, JSON.stringify(data));
         }
         if (!this.entries.has(id) && this.entries.size >= this.maxSize) {
             // Reclaim space by sweeping expired entries first, then evicting the oldest surviving entries
@@ -106,11 +229,63 @@ export class RedisStore {
         this.entries.delete(id);
         this.entries.set(id, { data, expiresAt: Date.now() + ttl * 1000 });
     }
-    async delete(id) {
-        this.entries.delete(id);
+    async saveMany(ids, data, ttl = this.defaultTTL) {
+        if (ids.length !== data.length) {
+            throw new Error("The ids and data arguments must have the same length.");
+        }
+        // Prepend the base key to each id
+        ids = ids.map((id) => this.baseKey + id);
+        // Write to Redis first (when configured): if it fails (bad connection, etc.), the local cache is left
+        // untouched instead of reporting a "saved" value locally that never made it to the shared store other
+        // instances read from.
         if (this.client) {
-            await this.client.del(id);
+            // Insert into redis using a pipeline to redis network traffic
+            const pipe = this.client.multi();
+            for (let i = 0; i < ids.length; i++) {
+                const id = ids[i];
+                const record = data[i];
+                pipe.setEx(id, ttl, JSON.stringify(record));
+            }
+            await pipe.execAsPipeline();
+        }
+        // Evict per-id, exactly like save() does, rather than pre-computing a single batch eviction count: a
+        // batched "evict N oldest, then insert the batch" approach can evict an entry that is itself one of the
+        // ids being (re-)saved in this same batch — that id then gets reinserted right after anyway, so the
+        // eviction bought no real space and the map ends up larger than maxSize.
+        for (let i = 0; i < ids.length; i++) {
+            const id = ids[i];
+            const record = data[i];
+            if (!this.entries.has(id) && this.entries.size >= this.maxSize) {
+                // Reclaim space by sweeping expired entries first, then evicting the oldest surviving entries
+                this.sweep();
+                while (this.entries.size >= this.maxSize && this.entries.size > 0) {
+                    CacheUtils.evictOldest(this.entries);
+                }
+            }
+            // Delete before re-inserting so a renewed entry moves to the end of the Map's iteration order. A
+            // `Map` does not reorder on `set()` of an already-present key, so without this, an actively-renewed
+            // entry stays at its original (oldest) position and `evictOldest()` would evict it ahead of a
+            // genuinely idle entry inserted later.
+            this.entries.delete(id);
+            this.entries.set(id, { data: record, expiresAt: Date.now() + ttl * 1000 });
+        }
+    }
+    async saveSet(id, data, idProp = "uid", ttl = this.defaultTTL) {
+        const ids = [];
+        const records = [];
+        // Create a list of ids that we'll store as a set
+        for (const record of data) {
+            const recordId = record[idProp];
+            if (recordId !== undefined && recordId !== null) {
+                ids.push(recordId);
+                records.push(record);
+            }
         }
+        // Now store all the records in the cache
+        await this.saveMany(ids, records, ttl);
+        // Finally, store our set of ids
+        await this.client?.setEx(this.baseKey + id, ttl, JSON.stringify(ids));
+        this.sets.set(this.baseKey + id, ids);
     }
     sweep() {
         const now = Date.now();

package/dist/lib/RedisStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisStore.js","sourceRoot":"","sources":["../../src/RedisStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RedisStore.js","sourceRoot":"","sources":["../../src/RedisStore.ts"],"names":[],"mappings":"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"}

package/dist/types/CacheUtils.d.ts

@@ -9,6 +9,7 @@ export declare class CacheUtils {
      * whatever entry was `set()` least recently among those still present.
      *
      * @param map The map to evict the oldest entry from.
+     * @param num The total number of items to evict. Default is `1`.
      */
-    static evictOldest<K, V>(map: Map<K, V>): void;
+    static evictOldest<K, V>(map: Map<K, V>, num?: number): void;
 }

package/dist/types/MemoryStore.d.ts

@@ -10,12 +10,20 @@ export declare class MemoryStore implements SimpleStore {
     protected entries: Map<string, MemoryStoreEntry>;
     /** The maximum number of records to store. */
     maxSize: number;
+    protected sets: Map<string, any[]>;
     private sweepTimer;
     constructor();
+    clear(): void;
+    delete(id: string): void;
+    deleteMany(ids: string[]): void;
+    deleteSet(id: string): void;
     /** Stops the background sweep timer. Call when the owning `SessionManager` is destroyed. */
     destroy(): void;
     load(id: string): Record<string, any> | undefined;
+    loadMany(ids: string[]): (Record<string, any> | undefined)[];
+    loadSet(id: string): (Record<string, any> | undefined)[] | undefined;
     save(id: string, data: Record<string, any>, ttl?: number): void;
-    delete(id: string): void;
+    saveMany(ids: string[], data: Record<string, any>[], ttl?: number): void;
+    saveSet(id: string, data: Record<string, any>[], idProp?: string, ttl?: number): void;
     private sweep;
 }

package/dist/types/RedisStore.d.ts

@@ -1,5 +1,5 @@
 import { MemoryStoreEntry, SimpleStore } from "./SimpleStore.js";
-import type * as ioredis from "ioredis";
+import { RedisClientType } from "redis";
 /**
  * Implements a SimpleStore storage system that combines a local in-memory store optionally backed by Redis. When
  * no Redis client is given, the store behaves as a plain in-memory store (equivalent to `MemoryStore`).
@@ -7,20 +7,33 @@ import type * as ioredis from "ioredis";
  * @author Jean-Philippe Steinmetz
  */
 export declare class RedisStore implements SimpleStore {
-    client?: ioredis.Redis;
+    /**
+     * The base key that is pre-pended to all IDs.
+     */
+    readonly baseKey: string;
+    client?: RedisClientType;
     /** The default record TTL (in seconds). */
     defaultTTL: number;
     protected entries: Map<string, MemoryStoreEntry>;
     /** The maximum number of records to store. */
     maxSize: number;
+    protected sets: Map<string, any[]>;
     private sweepTimer;
     /**
+     * @param baseKey The base key that is pre-pended to all IDs.
      * @param client The Redis client to back this store with. When omitted, the store operates purely in-memory.
      */
-    constructor(client?: ioredis.Redis);
-    destroy(): void;
-    load(id: string): Promise<Record<string, any> | undefined>;
-    save(id: string, data: Record<string, any>, ttl?: number): Promise<void>;
+    constructor(baseKey?: string, client?: RedisClientType);
+    clear(): Promise<void>;
     delete(id: string): Promise<void>;
+    deleteMany(ids: string[]): Promise<void>;
+    deleteSet(id: string): Promise<void>;
+    destroy(): void;
+    load(id: string, skipRedis?: boolean): Promise<Record<string, any> | undefined>;
+    loadMany(ids: string[]): Promise<(Record<string, any> | undefined)[]>;
+    loadSet(id: string): Promise<(Record<string, any> | undefined)[] | undefined>;
+    save(id: string, data: Record<string, any>, ttl?: number, skipRedis?: boolean): Promise<void>;
+    saveMany(ids: string[], data: Record<string, any>[], ttl?: number): Promise<void>;
+    saveSet(id: string, data: Record<string, any>[], idProp?: string, ttl?: number): Promise<void>;
     private sweep;
 }

package/dist/types/SimpleStore.d.ts

@@ -4,7 +4,7 @@ export interface MemoryStoreEntry {
 }
 /**
  * Defines an interface for a simple key-value storage system that stores temporary records with a specified
- * lifetime (TTL) and size.
+ * lifetime (TTL) and size. Supports the storage and retrieval of individual records as well as sets of records.
  *
  * @author Jean-Philippe Steinmetz
  */
@@ -14,20 +14,59 @@ export interface SimpleStore {
     /** The maximum number of records to store. */
     maxSize: number;
     /**
-     * Deletes the record with the given id.
+     * Deletes all entries in the storage system.
+     */
+    clear(): Promise<void> | void;
+    /**
+     * Deletes a single record with the given id.
      * @param id The id of the record to delete.
      */
     delete(id: string): Promise<void> | void;
     /**
-     * Retrieves the record with the given id.
+     * Deletes the records associated with the list of given ids.
+     * @param ids The list of ids to delete.
+     */
+    deleteMany(ids: string[]): Promise<void> | void;
+    /**
+     * Deletes the set of records associated with the given id.
+     * @param ids The id of the set to delete.
+     */
+    deleteSet(id: string): Promise<void> | void;
+    /**
+     * Retrieves a single record with the given id.
      * @param id The id of the record to retrieve.
      */
     load(id: string): Promise<Record<string, any> | undefined> | Record<string, any> | undefined;
     /**
-     * Stores the record with the given id for the specified TTL.
+     * Retrieves the list of records for the given list of ids.
+     * @param ids The list of ids of records to retrieve.
+     */
+    loadMany(ids: string[]): Promise<(Record<string, any> | undefined)[]> | (Record<string, any> | undefined)[];
+    /**
+     * Retrieves the set of records with the given id.
+     * @param ids The id associated with the set of records to retrieve.
+     */
+    loadSet(id: string): Promise<(Record<string, any> | undefined)[] | undefined> | (Record<string, any> | undefined)[] | undefined;
+    /**
+     * Stores a single record with the given id for the specified TTL.
      * @param id The id of the record to retrieve.
      * @param data The record to store.
      * @param ttl The number of seconds that the record will be stored.
      */
-    save(id: string, data: Record<string, any>, ttl: number): Promise<void> | void;
+    save(id: string, data: Record<string, any>, ttl?: number): Promise<void> | void;
+    /**
+     * Stores a list of records with the given list of ids for the specified TTL.
+     * @param id The list of ids to store records for.
+     * @param data The list of records to store.
+     * @param ttl The number of seconds that each record will be stored.
+     */
+    saveMany(ids: string[], data: Record<string, any>[], ttl?: number): Promise<void> | void;
+    /**
+     * Stores a set of records with the given id for the specified TTL.
+     * @param id The id of the record set to store.
+     * @param data The record to store.
+     * @param idProp The name of the property in data to use as an id for storage.
+     * @param ttl The number of seconds that the set will be stored.
+     */
+    saveSet(id: string, data: Record<string, any>[], idProp: string, ttl?: number): Promise<void> | void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rapidrest/core",
-    "version": "3.1.0",
+    "version": "4.0.0",
     "description": "A collection of common utilities and core functionality for rapidly building RESTful applications.",
     "repository": "https://github.com/rapidrest/core.git",
     "author": "RapidREST <rapidrests@gmail.com>",
@@ -34,7 +34,7 @@
     },
     "peerDependencies": {
         "axios": "1.x",
-        "ioredis": "6.x",
+        "redis": "6.x",
         "reflect-metadata": "0.2.x",
         "winston": "3.x",
         "winston-transport": "4.x"
@@ -59,12 +59,12 @@
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-jsdoc": "^63.0.2",
-        "ioredis": "^6.0.0",
         "mkdirp": "^3.0.1",
         "nconf": "^0.13.0",
         "nock": "^14.0.15",
         "nodemailer": "^8.0.10",
         "prettier": "^3.8.4",
+        "redis": "^6.2.1",
         "reflect-metadata": "^0.2.2",
         "rimraf": "^6.1.3",
         "ts-node": "^10.9.2",