@sebspark/promise-cache 1.4.0 → 2.0.1

package/dist/index.d.mts

@@ -1,5 +1,6 @@
 import { createClient, RedisClientOptions } from 'redis';
 export { RedisClientOptions } from 'redis';
+import { UUID } from 'node:crypto';
 
 type GetType<T> = {
     value: T;
@@ -18,6 +19,7 @@ type PersistorConstructorType = {
 };
 declare class Persistor {
     client: ReturnType<typeof createClient> | null;
+    private clientId;
     private onError;
     private onSuccess;
     private readonly redis?;
@@ -26,6 +28,7 @@ declare class Persistor {
     startConnection(): Promise<unknown>;
     size(): Promise<number>;
     get<T>(key: string): Promise<GetType<T> | null>;
+    getClientId(): UUID;
     private createOptions;
     set<T>(key: string, { value, timestamp, ttl }: SetParams<T>): Promise<void>;
     delete(key: string): Promise<void>;
@@ -35,7 +38,6 @@ declare const createPersistor: ({ redis, onError, onSuccess, }: {
     onError?: () => void;
     onSuccess?: () => void;
 }) => Persistor;
-declare const clean: () => void;
 
 type PromiseCacheOptions = {
     ttlInSeconds?: number;
@@ -44,6 +46,7 @@ type PromiseCacheOptions = {
     onError?: () => void;
     onSuccess?: () => void;
 };
+declare const promises: {};
 declare class PromiseCache<U> {
     persistor: Persistor;
     private readonly caseSensitive;
@@ -95,4 +98,4 @@ declare class LocalStorage {
 }
 declare const createLocalMemoryClient: () => LocalStorage;
 
-export { LocalStorage, Persistor, PromiseCache, type PromiseCacheOptions, clean, createLocalMemoryClient, createPersistor };
+export { LocalStorage, Persistor, PromiseCache, type PromiseCacheOptions, createLocalMemoryClient, createPersistor, promises };

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { createClient, RedisClientOptions } from 'redis';
 export { RedisClientOptions } from 'redis';
+import { UUID } from 'node:crypto';
 
 type GetType<T> = {
     value: T;
@@ -18,6 +19,7 @@ type PersistorConstructorType = {
 };
 declare class Persistor {
     client: ReturnType<typeof createClient> | null;
+    private clientId;
     private onError;
     private onSuccess;
     private readonly redis?;
@@ -26,6 +28,7 @@ declare class Persistor {
     startConnection(): Promise<unknown>;
     size(): Promise<number>;
     get<T>(key: string): Promise<GetType<T> | null>;
+    getClientId(): UUID;
     private createOptions;
     set<T>(key: string, { value, timestamp, ttl }: SetParams<T>): Promise<void>;
     delete(key: string): Promise<void>;
@@ -35,7 +38,6 @@ declare const createPersistor: ({ redis, onError, onSuccess, }: {
     onError?: () => void;
     onSuccess?: () => void;
 }) => Persistor;
-declare const clean: () => void;
 
 type PromiseCacheOptions = {
     ttlInSeconds?: number;
@@ -44,6 +46,7 @@ type PromiseCacheOptions = {
     onError?: () => void;
     onSuccess?: () => void;
 };
+declare const promises: {};
 declare class PromiseCache<U> {
     persistor: Persistor;
     private readonly caseSensitive;
@@ -95,4 +98,4 @@ declare class LocalStorage {
 }
 declare const createLocalMemoryClient: () => LocalStorage;
 
-export { LocalStorage, Persistor, PromiseCache, type PromiseCacheOptions, clean, createLocalMemoryClient, createPersistor };
+export { LocalStorage, Persistor, PromiseCache, type PromiseCacheOptions, createLocalMemoryClient, createPersistor, promises };

package/dist/index.js

@@ -23,13 +23,14 @@ __export(src_exports, {
   LocalStorage: () => LocalStorage,
   Persistor: () => Persistor,
   PromiseCache: () => PromiseCache,
-  clean: () => clean,
   createLocalMemoryClient: () => createLocalMemoryClient,
-  createPersistor: () => createPersistor
+  createPersistor: () => createPersistor,
+  promises: () => promises
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/persistor.ts
+var import_node_crypto = require("crypto");
 var import_retry = require("@sebspark/retry");
 var import_redis = require("redis");
 
@@ -77,6 +78,7 @@ var CACHE_CLIENT = import_redis.createClient;
 var isTestRunning = process.env.NODE_ENV === "test";
 var Persistor = class {
   client = null;
+  clientId = (0, import_node_crypto.randomUUID)();
   onError;
   onSuccess;
   redis;
@@ -98,7 +100,8 @@ var Persistor = class {
       },
       maxRetries: 5,
       retryCondition: () => {
-        console.log("Trying to connect!");
+        var _a;
+        console.log(`Trying to connect: ${this.clientId}, ${(_a = this.redis) == null ? void 0 : _a.name}`);
         return true;
       }
     };
@@ -116,11 +119,15 @@ var Persistor = class {
         throw new Error(`\u274C REDIS | Client Error | ${(_b2 = this.redis) == null ? void 0 : _b2.url} ${err}`);
       });
       this.client.on("connect", () => {
-        var _a2, _b2;
+        var _a2, _b2, _c, _d;
         if (this.onSuccess) {
-          this.onSuccess(`\u{1F4E6} REDIS | Connection Ready | ${(_a2 = this.redis) == null ? void 0 : _a2.url}`);
+          this.onSuccess(
+            `\u{1F4E6} REDIS | Connection Ready | ${(_a2 = this.redis) == null ? void 0 : _a2.name} | ${this.clientId} | ${(_b2 = this.redis) == null ? void 0 : _b2.url}`
+          );
         }
-        console.log(`\u{1F4E6} REDIS | Connection Ready | ${(_b2 = this.redis) == null ? void 0 : _b2.url}`);
+        console.log(
+          `\u{1F4E6} REDIS | Connection Ready | ${(_c = this.redis) == null ? void 0 : _c.name}\xA0| ${this.clientId} | ${(_d = this.redis) == null ? void 0 : _d.url}`
+        );
       });
       return await this.client.connect();
     } catch (err) {
@@ -150,6 +157,9 @@ var Persistor = class {
       throw new Error(`Error getting data from redis: ${error}`);
     }
   }
+  getClientId() {
+    return this.clientId;
+  }
   createOptions(ttl) {
     if (ttl !== null && ttl !== void 0) {
       return { PX: Math.round(ttl) };
@@ -179,33 +189,35 @@ var Persistor = class {
     }
   }
 };
-var _persistors = {};
+var persistors = {};
 var createPersistor = ({
   redis,
   onError,
   onSuccess
 }) => {
   if (redis) {
-    const key = JSON.stringify(redis);
-    if (!_persistors[key]) {
-      _persistors[key] = new Persistor({
+    let connectionName = redis.url;
+    if (redis.name) {
+      connectionName = redis.name;
+    }
+    const key = connectionName;
+    if (!persistors[key]) {
+      persistors[key] = new Persistor({
         redis,
         onError,
         onSuccess
       });
     }
-    return _persistors[key];
+    return persistors[key];
   }
   return new Persistor({
     onSuccess,
     onError
   });
 };
-var clean = () => {
-  _persistors = {};
-};
 
 // src/promiseCache.ts
+var promises = {};
 var PromiseCache = class {
   persistor;
   caseSensitive;
@@ -293,7 +305,7 @@ var PromiseCache = class {
   LocalStorage,
   Persistor,
   PromiseCache,
-  clean,
   createLocalMemoryClient,
-  createPersistor
+  createPersistor,
+  promises
 });

package/dist/index.mjs

@@ -1,4 +1,5 @@
 // src/persistor.ts
+import { randomUUID } from "node:crypto";
 import { retry } from "@sebspark/retry";
 import { createClient } from "redis";
 
@@ -46,6 +47,7 @@ var CACHE_CLIENT = createClient;
 var isTestRunning = process.env.NODE_ENV === "test";
 var Persistor = class {
   client = null;
+  clientId = randomUUID();
   onError;
   onSuccess;
   redis;
@@ -67,7 +69,8 @@ var Persistor = class {
       },
       maxRetries: 5,
       retryCondition: () => {
-        console.log("Trying to connect!");
+        var _a;
+        console.log(`Trying to connect: ${this.clientId}, ${(_a = this.redis) == null ? void 0 : _a.name}`);
         return true;
       }
     };
@@ -85,11 +88,15 @@ var Persistor = class {
         throw new Error(`\u274C REDIS | Client Error | ${(_b2 = this.redis) == null ? void 0 : _b2.url} ${err}`);
       });
       this.client.on("connect", () => {
-        var _a2, _b2;
+        var _a2, _b2, _c, _d;
         if (this.onSuccess) {
-          this.onSuccess(`\u{1F4E6} REDIS | Connection Ready | ${(_a2 = this.redis) == null ? void 0 : _a2.url}`);
+          this.onSuccess(
+            `\u{1F4E6} REDIS | Connection Ready | ${(_a2 = this.redis) == null ? void 0 : _a2.name} | ${this.clientId} | ${(_b2 = this.redis) == null ? void 0 : _b2.url}`
+          );
         }
-        console.log(`\u{1F4E6} REDIS | Connection Ready | ${(_b2 = this.redis) == null ? void 0 : _b2.url}`);
+        console.log(
+          `\u{1F4E6} REDIS | Connection Ready | ${(_c = this.redis) == null ? void 0 : _c.name}\xA0| ${this.clientId} | ${(_d = this.redis) == null ? void 0 : _d.url}`
+        );
       });
       return await this.client.connect();
     } catch (err) {
@@ -119,6 +126,9 @@ var Persistor = class {
       throw new Error(`Error getting data from redis: ${error}`);
     }
   }
+  getClientId() {
+    return this.clientId;
+  }
   createOptions(ttl) {
     if (ttl !== null && ttl !== void 0) {
       return { PX: Math.round(ttl) };
@@ -148,33 +158,35 @@ var Persistor = class {
     }
   }
 };
-var _persistors = {};
+var persistors = {};
 var createPersistor = ({
   redis,
   onError,
   onSuccess
 }) => {
   if (redis) {
-    const key = JSON.stringify(redis);
-    if (!_persistors[key]) {
-      _persistors[key] = new Persistor({
+    let connectionName = redis.url;
+    if (redis.name) {
+      connectionName = redis.name;
+    }
+    const key = connectionName;
+    if (!persistors[key]) {
+      persistors[key] = new Persistor({
         redis,
         onError,
         onSuccess
       });
     }
-    return _persistors[key];
+    return persistors[key];
   }
   return new Persistor({
     onSuccess,
     onError
   });
 };
-var clean = () => {
-  _persistors = {};
-};
 
 // src/promiseCache.ts
+var promises = {};
 var PromiseCache = class {
   persistor;
   caseSensitive;
@@ -261,7 +273,7 @@ export {
   LocalStorage,
   Persistor,
   PromiseCache,
-  clean,
   createLocalMemoryClient,
-  createPersistor
+  createPersistor,
+  promises
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/promise-cache",
-  "version": "1.4.0",
+  "version": "2.0.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",