@sebspark/promise-cache 2.0.2 → 2.0.4

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { createClient, RedisClientOptions } from 'redis';
+import { RedisClientOptions, createClient } from 'redis';
 export { RedisClientOptions } from 'redis';
 import { UUID } from 'node:crypto';
 
@@ -14,43 +14,39 @@ type SetParams<T> = {
 };
 type PersistorConstructorType = {
     redis?: RedisClientOptions;
-    onError?: (c: string) => void;
-    onSuccess?: (c: string) => void;
+    clientId?: UUID;
+    onError: (error: string) => void;
+    onSuccess: () => void;
 };
 declare class Persistor {
     client: ReturnType<typeof createClient> | null;
-    private clientId;
+    private clientId?;
     private onError;
     private onSuccess;
     private isConnected;
     private readonly redis?;
-    constructor(options: PersistorConstructorType);
+    constructor({ redis, clientId, onSuccess, onError, }: PersistorConstructorType);
     connect(): Promise<void>;
     startConnection(): Promise<unknown>;
     size(): Promise<number>;
     get<T>(key: string): Promise<GetType<T> | null>;
-    getClientId(): UUID;
+    getClientId(): UUID | undefined;
     getIsClientConnected(): boolean;
     private createOptions;
     set<T>(key: string, { value, timestamp, ttl }: SetParams<T>): Promise<void>;
     delete(key: string): Promise<void>;
 }
-declare const createPersistor: ({ redis, onError, onSuccess, }: {
-    redis?: RedisClientOptions;
-    onError?: () => void;
-    onSuccess?: () => void;
-}) => Persistor;
 
 type PromiseCacheOptions = {
     ttlInSeconds?: number;
     caseSensitive?: boolean;
     redis?: RedisClientOptions;
-    onError?: () => void;
+    onError?: (error: string) => void;
     onSuccess?: () => void;
 };
-declare const promises: {};
 declare class PromiseCache<U> {
     persistor: Persistor;
+    private clientId;
     private readonly caseSensitive;
     private readonly ttl?;
     /**
@@ -100,4 +96,4 @@ declare class LocalStorage {
 }
 declare const createLocalMemoryClient: () => LocalStorage;
 
-export { LocalStorage, Persistor, PromiseCache, type PromiseCacheOptions, createLocalMemoryClient, createPersistor, promises };
+export { LocalStorage, Persistor, type PersistorConstructorType, PromiseCache, type PromiseCacheOptions, createLocalMemoryClient };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { createClient, RedisClientOptions } from 'redis';
+import { RedisClientOptions, createClient } from 'redis';
 export { RedisClientOptions } from 'redis';
 import { UUID } from 'node:crypto';
 
@@ -14,43 +14,39 @@ type SetParams<T> = {
 };
 type PersistorConstructorType = {
     redis?: RedisClientOptions;
-    onError?: (c: string) => void;
-    onSuccess?: (c: string) => void;
+    clientId?: UUID;
+    onError: (error: string) => void;
+    onSuccess: () => void;
 };
 declare class Persistor {
     client: ReturnType<typeof createClient> | null;
-    private clientId;
+    private clientId?;
     private onError;
     private onSuccess;
     private isConnected;
     private readonly redis?;
-    constructor(options: PersistorConstructorType);
+    constructor({ redis, clientId, onSuccess, onError, }: PersistorConstructorType);
     connect(): Promise<void>;
     startConnection(): Promise<unknown>;
     size(): Promise<number>;
     get<T>(key: string): Promise<GetType<T> | null>;
-    getClientId(): UUID;
+    getClientId(): UUID | undefined;
     getIsClientConnected(): boolean;
     private createOptions;
     set<T>(key: string, { value, timestamp, ttl }: SetParams<T>): Promise<void>;
     delete(key: string): Promise<void>;
 }
-declare const createPersistor: ({ redis, onError, onSuccess, }: {
-    redis?: RedisClientOptions;
-    onError?: () => void;
-    onSuccess?: () => void;
-}) => Persistor;
 
 type PromiseCacheOptions = {
     ttlInSeconds?: number;
     caseSensitive?: boolean;
     redis?: RedisClientOptions;
-    onError?: () => void;
+    onError?: (error: string) => void;
     onSuccess?: () => void;
 };
-declare const promises: {};
 declare class PromiseCache<U> {
     persistor: Persistor;
+    private clientId;
     private readonly caseSensitive;
     private readonly ttl?;
     /**
@@ -100,4 +96,4 @@ declare class LocalStorage {
 }
 declare const createLocalMemoryClient: () => LocalStorage;
 
-export { LocalStorage, Persistor, PromiseCache, type PromiseCacheOptions, createLocalMemoryClient, createPersistor, promises };
+export { LocalStorage, Persistor, type PersistorConstructorType, PromiseCache, type PromiseCacheOptions, createLocalMemoryClient };

package/dist/index.js

@@ -23,14 +23,14 @@ __export(src_exports, {
   LocalStorage: () => LocalStorage,
   Persistor: () => Persistor,
   PromiseCache: () => PromiseCache,
-  createLocalMemoryClient: () => createLocalMemoryClient,
-  createPersistor: () => createPersistor,
-  promises: () => promises
+  createLocalMemoryClient: () => createLocalMemoryClient
 });
 module.exports = __toCommonJS(src_exports);
 
-// src/persistor.ts
+// src/promiseCache.ts
 var import_node_crypto = require("crypto");
+
+// src/persistor.ts
 var import_retry = require("@sebspark/retry");
 var import_redis = require("redis");
 
@@ -78,15 +78,20 @@ var CACHE_CLIENT = import_redis.createClient;
 var isTestRunning = process.env.NODE_ENV === "test";
 var Persistor = class {
   client = null;
-  clientId = (0, import_node_crypto.randomUUID)();
+  clientId;
   onError;
   onSuccess;
   isConnected = false;
   redis;
-  constructor(options) {
-    const { redis, onError, onSuccess } = options;
+  constructor({
+    redis,
+    clientId,
+    onSuccess,
+    onError
+  }) {
     this.onError = onError;
     this.onSuccess = onSuccess;
+    this.clientId = clientId;
     if (redis && !isTestRunning) {
       this.redis = redis;
     } else {
@@ -111,36 +116,25 @@ var Persistor = class {
     await (0, import_retry.retry)(() => this.startConnection(), settings);
   }
   async startConnection() {
-    var _a, _b;
-    try {
-      this.client = CACHE_CLIENT(this.redis);
-      this.client.on("error", (err) => {
-        var _a2, _b2;
-        this.isConnected = false;
-        if (this.onError) {
-          this.onError(`\u274C REDIS | Client Error | ${(_a2 = this.redis) == null ? void 0 : _a2.url} ${err}`);
-        }
-        throw new Error(`\u274C REDIS | Client Error | ${(_b2 = this.redis) == null ? void 0 : _b2.url} ${err}`);
-      });
-      this.client.on("connect", () => {
-        var _a2, _b2, _c, _d;
-        this.isConnected = true;
-        if (this.onSuccess) {
-          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 | ${(_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) {
-      if (this.onError) {
-        this.onError(`\u274C REDIS | Connection Error | ${(_a = this.redis) == null ? void 0 : _a.url} ${err}`);
+    return new Promise((resolve, reject) => {
+      try {
+        this.client = CACHE_CLIENT(this.redis);
+        this.client.on("error", (err) => {
+          this.isConnected = false;
+          this.onError(err);
+          reject();
+        });
+        this.client.on("connect", () => {
+          this.isConnected = true;
+          this.onSuccess();
+          resolve(true);
+        });
+        this.client.connect();
+      } catch (err) {
+        this.onError(`${err}`);
+        reject();
       }
-      throw new Error(`\u274C REDIS | Connection Error | ${(_b = this.redis) == null ? void 0 : _b.url} ${err}`);
-    }
+    });
   }
   async size() {
     if (!this.client) {
@@ -176,7 +170,7 @@ var Persistor = class {
   }
   async set(key, { value, timestamp, ttl }) {
     if (!this.client) {
-      throw new Error("Client not initialized");
+      throw new Error("Client not connected");
     }
     try {
       const serializedData = JSON.stringify({ value, ttl, timestamp });
@@ -188,7 +182,7 @@ var Persistor = class {
   }
   async delete(key) {
     if (!this.client) {
-      throw new Error("Client not initialized");
+      throw new Error("Client not connected");
     }
     try {
       await this.client.del(key);
@@ -197,37 +191,39 @@ var Persistor = class {
     }
   }
 };
+
+// src/promiseCache.ts
 var persistors = {};
-var createPersistor = ({
+var getPersistor = ({
   redis,
   onError,
-  onSuccess
+  onSuccess,
+  clientId
 }) => {
-  if (redis) {
-    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];
+  const connectionName = redis ? (redis == null ? void 0 : redis.name) || "default" : "local";
+  if (!persistors[connectionName]) {
+    persistors[connectionName] = new Persistor({
+      redis,
+      onError: (error) => {
+        onError == null ? void 0 : onError(error);
+        console.error(
+          `\u274C REDIS | Client Error | ${connectionName} | ${redis == null ? void 0 : redis.url}: ${error}`
+        );
+      },
+      onSuccess: () => {
+        onSuccess == null ? void 0 : onSuccess();
+        console.log(
+          `\u{1F4E6} REDIS | Connection Ready | ${connectionName} | ${redis == null ? void 0 : redis.url}`
+        );
+      },
+      clientId
+    });
   }
-  return new Persistor({
-    onSuccess,
-    onError
-  });
+  return persistors[connectionName];
 };
-
-// src/promiseCache.ts
-var promises = {};
 var PromiseCache = class {
   persistor;
+  clientId = (0, import_node_crypto.randomUUID)();
   caseSensitive;
   ttl;
   // Time to live in milliseconds.
@@ -243,7 +239,12 @@ var PromiseCache = class {
     onSuccess,
     onError
   }) {
-    this.persistor = createPersistor({ redis, onError, onSuccess });
+    this.persistor = getPersistor({
+      redis,
+      onError,
+      onSuccess,
+      clientId: this.clientId
+    });
     this.caseSensitive = caseSensitive;
     if (ttlInSeconds) {
       this.ttl = ttlInSeconds * 1e3;
@@ -313,7 +314,5 @@ var PromiseCache = class {
   LocalStorage,
   Persistor,
   PromiseCache,
-  createLocalMemoryClient,
-  createPersistor,
-  promises
+  createLocalMemoryClient
 });

package/dist/index.mjs

@@ -1,5 +1,7 @@
-// src/persistor.ts
+// src/promiseCache.ts
 import { randomUUID } from "node:crypto";
+
+// src/persistor.ts
 import { retry } from "@sebspark/retry";
 import { createClient } from "redis";
 
@@ -47,15 +49,20 @@ var CACHE_CLIENT = createClient;
 var isTestRunning = process.env.NODE_ENV === "test";
 var Persistor = class {
   client = null;
-  clientId = randomUUID();
+  clientId;
   onError;
   onSuccess;
   isConnected = false;
   redis;
-  constructor(options) {
-    const { redis, onError, onSuccess } = options;
+  constructor({
+    redis,
+    clientId,
+    onSuccess,
+    onError
+  }) {
     this.onError = onError;
     this.onSuccess = onSuccess;
+    this.clientId = clientId;
     if (redis && !isTestRunning) {
       this.redis = redis;
     } else {
@@ -80,36 +87,25 @@ var Persistor = class {
     await retry(() => this.startConnection(), settings);
   }
   async startConnection() {
-    var _a, _b;
-    try {
-      this.client = CACHE_CLIENT(this.redis);
-      this.client.on("error", (err) => {
-        var _a2, _b2;
-        this.isConnected = false;
-        if (this.onError) {
-          this.onError(`\u274C REDIS | Client Error | ${(_a2 = this.redis) == null ? void 0 : _a2.url} ${err}`);
-        }
-        throw new Error(`\u274C REDIS | Client Error | ${(_b2 = this.redis) == null ? void 0 : _b2.url} ${err}`);
-      });
-      this.client.on("connect", () => {
-        var _a2, _b2, _c, _d;
-        this.isConnected = true;
-        if (this.onSuccess) {
-          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 | ${(_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) {
-      if (this.onError) {
-        this.onError(`\u274C REDIS | Connection Error | ${(_a = this.redis) == null ? void 0 : _a.url} ${err}`);
+    return new Promise((resolve, reject) => {
+      try {
+        this.client = CACHE_CLIENT(this.redis);
+        this.client.on("error", (err) => {
+          this.isConnected = false;
+          this.onError(err);
+          reject();
+        });
+        this.client.on("connect", () => {
+          this.isConnected = true;
+          this.onSuccess();
+          resolve(true);
+        });
+        this.client.connect();
+      } catch (err) {
+        this.onError(`${err}`);
+        reject();
       }
-      throw new Error(`\u274C REDIS | Connection Error | ${(_b = this.redis) == null ? void 0 : _b.url} ${err}`);
-    }
+    });
   }
   async size() {
     if (!this.client) {
@@ -145,7 +141,7 @@ var Persistor = class {
   }
   async set(key, { value, timestamp, ttl }) {
     if (!this.client) {
-      throw new Error("Client not initialized");
+      throw new Error("Client not connected");
     }
     try {
       const serializedData = JSON.stringify({ value, ttl, timestamp });
@@ -157,7 +153,7 @@ var Persistor = class {
   }
   async delete(key) {
     if (!this.client) {
-      throw new Error("Client not initialized");
+      throw new Error("Client not connected");
     }
     try {
       await this.client.del(key);
@@ -166,37 +162,39 @@ var Persistor = class {
     }
   }
 };
+
+// src/promiseCache.ts
 var persistors = {};
-var createPersistor = ({
+var getPersistor = ({
   redis,
   onError,
-  onSuccess
+  onSuccess,
+  clientId
 }) => {
-  if (redis) {
-    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];
+  const connectionName = redis ? (redis == null ? void 0 : redis.name) || "default" : "local";
+  if (!persistors[connectionName]) {
+    persistors[connectionName] = new Persistor({
+      redis,
+      onError: (error) => {
+        onError == null ? void 0 : onError(error);
+        console.error(
+          `\u274C REDIS | Client Error | ${connectionName} | ${redis == null ? void 0 : redis.url}: ${error}`
+        );
+      },
+      onSuccess: () => {
+        onSuccess == null ? void 0 : onSuccess();
+        console.log(
+          `\u{1F4E6} REDIS | Connection Ready | ${connectionName} | ${redis == null ? void 0 : redis.url}`
+        );
+      },
+      clientId
+    });
   }
-  return new Persistor({
-    onSuccess,
-    onError
-  });
+  return persistors[connectionName];
 };
-
-// src/promiseCache.ts
-var promises = {};
 var PromiseCache = class {
   persistor;
+  clientId = randomUUID();
   caseSensitive;
   ttl;
   // Time to live in milliseconds.
@@ -212,7 +210,12 @@ var PromiseCache = class {
     onSuccess,
     onError
   }) {
-    this.persistor = createPersistor({ redis, onError, onSuccess });
+    this.persistor = getPersistor({
+      redis,
+      onError,
+      onSuccess,
+      clientId: this.clientId
+    });
     this.caseSensitive = caseSensitive;
     if (ttlInSeconds) {
       this.ttl = ttlInSeconds * 1e3;
@@ -281,7 +284,5 @@ export {
   LocalStorage,
   Persistor,
   PromiseCache,
-  createLocalMemoryClient,
-  createPersistor,
-  promises
+  createLocalMemoryClient
 };

package/package.json

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