@sebspark/promise-cache 2.0.1 → 2.0.3

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,30 +14,28 @@ type SetParams<T> = {
 };
 type PersistorConstructorType = {
     redis?: RedisClientOptions;
+    clientId?: UUID;
     onError?: (c: string) => void;
     onSuccess?: (c: string) => 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;
@@ -46,9 +44,9 @@ type PromiseCacheOptions = {
     onError?: () => void;
     onSuccess?: () => void;
 };
-declare const promises: {};
 declare class PromiseCache<U> {
     persistor: Persistor;
+    private clientId;
     private readonly caseSensitive;
     private readonly ttl?;
     /**
@@ -98,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,30 +14,28 @@ type SetParams<T> = {
 };
 type PersistorConstructorType = {
     redis?: RedisClientOptions;
+    clientId?: UUID;
     onError?: (c: string) => void;
     onSuccess?: (c: string) => 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;
@@ -46,9 +44,9 @@ type PromiseCacheOptions = {
     onError?: () => void;
     onSuccess?: () => void;
 };
-declare const promises: {};
 declare class PromiseCache<U> {
     persistor: Persistor;
+    private clientId;
     private readonly caseSensitive;
     private readonly ttl?;
     /**
@@ -98,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,20 +78,28 @@ 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 {
       CACHE_CLIENT = createLocalMemoryClient;
     }
-    this.connect();
+    if (!this.isConnected) {
+      this.connect();
+    }
   }
   async connect() {
     const settings = {
@@ -113,6 +121,7 @@ var Persistor = class {
       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}`);
         }
@@ -120,6 +129,7 @@ var Persistor = class {
       });
       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}`
@@ -160,6 +170,9 @@ var Persistor = class {
   getClientId() {
     return this.clientId;
   }
+  getIsClientConnected() {
+    return this.isConnected;
+  }
   createOptions(ttl) {
     if (ttl !== null && ttl !== void 0) {
       return { PX: Math.round(ttl) };
@@ -167,8 +180,8 @@ var Persistor = class {
     return {};
   }
   async set(key, { value, timestamp, ttl }) {
-    if (!this.client) {
-      throw new Error("Client not initialized");
+    if (!this.isConnected || !this.client) {
+      throw new Error("Client not connected");
     }
     try {
       const serializedData = JSON.stringify({ value, ttl, timestamp });
@@ -179,8 +192,8 @@ var Persistor = class {
     }
   }
   async delete(key) {
-    if (!this.client) {
-      throw new Error("Client not initialized");
+    if (!this.isConnected || !this.client) {
+      throw new Error("Client not connected");
     }
     try {
       await this.client.del(key);
@@ -189,37 +202,29 @@ 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 == null ? void 0 : redis.name) || "default";
+  if (!persistors[connectionName]) {
+    persistors[connectionName] = new Persistor({
+      redis,
+      onError,
+      onSuccess,
+      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.
@@ -235,7 +240,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;
@@ -305,7 +315,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,20 +49,28 @@ 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 {
       CACHE_CLIENT = createLocalMemoryClient;
     }
-    this.connect();
+    if (!this.isConnected) {
+      this.connect();
+    }
   }
   async connect() {
     const settings = {
@@ -82,6 +92,7 @@ var Persistor = class {
       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}`);
         }
@@ -89,6 +100,7 @@ var Persistor = class {
       });
       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}`
@@ -129,6 +141,9 @@ var Persistor = class {
   getClientId() {
     return this.clientId;
   }
+  getIsClientConnected() {
+    return this.isConnected;
+  }
   createOptions(ttl) {
     if (ttl !== null && ttl !== void 0) {
       return { PX: Math.round(ttl) };
@@ -136,8 +151,8 @@ var Persistor = class {
     return {};
   }
   async set(key, { value, timestamp, ttl }) {
-    if (!this.client) {
-      throw new Error("Client not initialized");
+    if (!this.isConnected || !this.client) {
+      throw new Error("Client not connected");
     }
     try {
       const serializedData = JSON.stringify({ value, ttl, timestamp });
@@ -148,8 +163,8 @@ var Persistor = class {
     }
   }
   async delete(key) {
-    if (!this.client) {
-      throw new Error("Client not initialized");
+    if (!this.isConnected || !this.client) {
+      throw new Error("Client not connected");
     }
     try {
       await this.client.del(key);
@@ -158,37 +173,29 @@ 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 == null ? void 0 : redis.name) || "default";
+  if (!persistors[connectionName]) {
+    persistors[connectionName] = new Persistor({
+      redis,
+      onError,
+      onSuccess,
+      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.
@@ -204,7 +211,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;
@@ -273,7 +285,5 @@ export {
   LocalStorage,
   Persistor,
   PromiseCache,
-  createLocalMemoryClient,
-  createPersistor,
-  promises
+  createLocalMemoryClient
 };

package/package.json

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