@sebspark/promise-cache 3.0.0 → 3.1.0

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -30,6 +40,7 @@ var import_node_crypto = require("crypto");
 
 // src/persistor.ts
 var import_redis = require("redis");
+var import_superjson = __toESM(require("superjson"));
 
 // src/localMemory.ts
 var LocalStorage = class {
@@ -72,123 +83,11 @@ var createLocalMemoryClient = () => {
   return localStorage;
 };
 
-// src/serializerUtils.ts
-function serialize(value) {
-  const type = typeof value;
-  if (value === null) {
-    return JSON.stringify({ type: "null" });
-  }
-  if (value === void 0) {
-    return JSON.stringify({ type: "undefined" });
-  }
-  switch (type) {
-    case "string":
-    case "number":
-    case "boolean":
-      return JSON.stringify({ type, value });
-    case "bigint":
-      return JSON.stringify({ type: "bigint", value: value.toString() });
-    case "object": {
-      if (Array.isArray(value)) {
-        return JSON.stringify({ type: "array", value: value.map(serialize) });
-      }
-      if (value instanceof Map) {
-        const entries = Array.from(value.entries()).map(([key, val]) => [
-          serialize(key),
-          serialize(val)
-        ]);
-        return JSON.stringify({ type: "map", value: entries });
-      }
-      if (value instanceof Set) {
-        const entries = Array.from(value).map(serialize);
-        return JSON.stringify({ type: "set", value: entries });
-      }
-      if (value.constructor === Object) {
-        const entries = Object.entries(value).reduce(
-          (acc, [key, val]) => {
-            acc[key] = serialize(val);
-            return acc;
-          },
-          {}
-        );
-        return JSON.stringify({ type: "object", value: entries });
-      }
-      throw new Error("Cannot serialize non-plain objects");
-    }
-    default:
-      throw new Error(`Unsupported type: ${type}`);
-  }
-}
-function deserializePrimitives(serialized) {
-  let parsed = serialized;
-  if (typeof serialized === "string") {
-    parsed = JSON.parse(serialized);
-  }
-  switch (parsed.type) {
-    case "string":
-      return parsed.value;
-    case "number":
-      return Number(parsed.value);
-    case "boolean":
-      return Boolean(parsed.value);
-    case "undefined":
-      return void 0;
-    case "bigint":
-      return BigInt(parsed.value);
-    case "null":
-      return null;
-    default:
-      throw new Error(
-        `Unsupported type during deserialization: ${JSON.stringify(parsed)}`
-      );
-  }
-}
-function deserialize(serialized) {
-  let parsed = serialized;
-  if (typeof serialized === "string") {
-    parsed = JSON.parse(serialized);
-  }
-  switch (parsed.type) {
-    case "string":
-    case "number":
-    case "boolean":
-    case "undefined":
-    case "bigint":
-    case "null":
-      return deserializePrimitives(parsed);
-    case "array":
-      return parsed.value.map(deserialize);
-    case "map": {
-      const map = /* @__PURE__ */ new Map();
-      for (const [key, val] of parsed.value) {
-        map.set(deserialize(key), deserialize(val));
-      }
-      return map;
-    }
-    case "set": {
-      const set = /* @__PURE__ */ new Set();
-      for (const item of parsed.value) {
-        set.add(deserialize(item));
-      }
-      return set;
-    }
-    case "object": {
-      const obj = {};
-      for (const [key, val] of Object.entries(parsed.value)) {
-        obj[key] = deserialize(val);
-      }
-      return obj;
-    }
-    default:
-      throw new Error(`Unsupported type during deserialization: ${parsed}`);
-  }
-}
-
 // src/persistor.ts
 var CACHE_CLIENT = import_redis.createClient;
 var isTestRunning = process.env.NODE_ENV === "test";
 function toMillis(seconds) {
-  return seconds / 1e3;
+  return seconds * 1e3;
 }
 var Persistor = class {
   client = null;
@@ -279,20 +178,21 @@ var Persistor = class {
    * @param object.timestamp Timestamp
    */
   async set(key, { value, timestamp = Date.now(), ttl }) {
-    var _a;
+    var _a, _b;
     if (!this.client || !this.client.isReady) {
       (_a = this.logger) == null ? void 0 : _a.error("Client not ready");
       return;
     }
     try {
-      const serializedData = JSON.stringify({
-        value: serialize(value),
+      const serializedData = import_superjson.default.stringify({
+        value,
         ttl,
         timestamp
       });
       const options = this.createOptions(ttl);
       await this.client.set(key, serializedData, options);
     } catch (error) {
+      (_b = this.logger) == null ? void 0 : _b.error(`Error setting data in redis: ${error}`);
       throw new Error(`Error setting data in redis: ${error}`);
     }
   }
@@ -302,21 +202,19 @@ var Persistor = class {
    * @returns GetType<T> value
    */
   async get(key) {
+    var _a, _b;
     if (!this.client) {
-      throw new Error("Client not initialized");
+      (_a = this.logger) == null ? void 0 : _a.error("Client not ready");
+      return null;
     }
     try {
       const data = await this.client.get(key);
       if (!data) {
         return null;
       }
-      const storedData = JSON.parse(data);
-      const deserialized = JSON.parse(storedData.value);
-      return {
-        ...storedData,
-        value: deserialize(deserialized)
-      };
+      return import_superjson.default.parse(data);
     } catch (error) {
+      (_b = this.logger) == null ? void 0 : _b.error(`Error getting data in redis: ${error}`);
       throw new Error(`Error getting data from redis: ${error}`);
     }
   }
@@ -325,7 +223,7 @@ var Persistor = class {
    * @param key Cache key
    */
   async delete(key) {
-    var _a;
+    var _a, _b;
     if (!this.client || !this.client.isReady) {
       (_a = this.logger) == null ? void 0 : _a.error("Client not ready");
       return;
@@ -333,6 +231,7 @@ var Persistor = class {
     try {
       await this.client.del(key);
     } catch (error) {
+      (_b = this.logger) == null ? void 0 : _b.error(`Error deleting data from redis: ${error}`);
       throw new Error(`Error deleting data from redis: ${error}`);
     }
   }

package/dist/index.mjs

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 
 // src/persistor.ts
 import { createClient } from "redis";
+import superjson from "superjson";
 
 // src/localMemory.ts
 var LocalStorage = class {
@@ -45,123 +46,11 @@ var createLocalMemoryClient = () => {
   return localStorage;
 };
 
-// src/serializerUtils.ts
-function serialize(value) {
-  const type = typeof value;
-  if (value === null) {
-    return JSON.stringify({ type: "null" });
-  }
-  if (value === void 0) {
-    return JSON.stringify({ type: "undefined" });
-  }
-  switch (type) {
-    case "string":
-    case "number":
-    case "boolean":
-      return JSON.stringify({ type, value });
-    case "bigint":
-      return JSON.stringify({ type: "bigint", value: value.toString() });
-    case "object": {
-      if (Array.isArray(value)) {
-        return JSON.stringify({ type: "array", value: value.map(serialize) });
-      }
-      if (value instanceof Map) {
-        const entries = Array.from(value.entries()).map(([key, val]) => [
-          serialize(key),
-          serialize(val)
-        ]);
-        return JSON.stringify({ type: "map", value: entries });
-      }
-      if (value instanceof Set) {
-        const entries = Array.from(value).map(serialize);
-        return JSON.stringify({ type: "set", value: entries });
-      }
-      if (value.constructor === Object) {
-        const entries = Object.entries(value).reduce(
-          (acc, [key, val]) => {
-            acc[key] = serialize(val);
-            return acc;
-          },
-          {}
-        );
-        return JSON.stringify({ type: "object", value: entries });
-      }
-      throw new Error("Cannot serialize non-plain objects");
-    }
-    default:
-      throw new Error(`Unsupported type: ${type}`);
-  }
-}
-function deserializePrimitives(serialized) {
-  let parsed = serialized;
-  if (typeof serialized === "string") {
-    parsed = JSON.parse(serialized);
-  }
-  switch (parsed.type) {
-    case "string":
-      return parsed.value;
-    case "number":
-      return Number(parsed.value);
-    case "boolean":
-      return Boolean(parsed.value);
-    case "undefined":
-      return void 0;
-    case "bigint":
-      return BigInt(parsed.value);
-    case "null":
-      return null;
-    default:
-      throw new Error(
-        `Unsupported type during deserialization: ${JSON.stringify(parsed)}`
-      );
-  }
-}
-function deserialize(serialized) {
-  let parsed = serialized;
-  if (typeof serialized === "string") {
-    parsed = JSON.parse(serialized);
-  }
-  switch (parsed.type) {
-    case "string":
-    case "number":
-    case "boolean":
-    case "undefined":
-    case "bigint":
-    case "null":
-      return deserializePrimitives(parsed);
-    case "array":
-      return parsed.value.map(deserialize);
-    case "map": {
-      const map = /* @__PURE__ */ new Map();
-      for (const [key, val] of parsed.value) {
-        map.set(deserialize(key), deserialize(val));
-      }
-      return map;
-    }
-    case "set": {
-      const set = /* @__PURE__ */ new Set();
-      for (const item of parsed.value) {
-        set.add(deserialize(item));
-      }
-      return set;
-    }
-    case "object": {
-      const obj = {};
-      for (const [key, val] of Object.entries(parsed.value)) {
-        obj[key] = deserialize(val);
-      }
-      return obj;
-    }
-    default:
-      throw new Error(`Unsupported type during deserialization: ${parsed}`);
-  }
-}
-
 // src/persistor.ts
 var CACHE_CLIENT = createClient;
 var isTestRunning = process.env.NODE_ENV === "test";
 function toMillis(seconds) {
-  return seconds / 1e3;
+  return seconds * 1e3;
 }
 var Persistor = class {
   client = null;
@@ -252,20 +141,21 @@ var Persistor = class {
    * @param object.timestamp Timestamp
    */
   async set(key, { value, timestamp = Date.now(), ttl }) {
-    var _a;
+    var _a, _b;
     if (!this.client || !this.client.isReady) {
       (_a = this.logger) == null ? void 0 : _a.error("Client not ready");
       return;
     }
     try {
-      const serializedData = JSON.stringify({
-        value: serialize(value),
+      const serializedData = superjson.stringify({
+        value,
         ttl,
         timestamp
       });
       const options = this.createOptions(ttl);
       await this.client.set(key, serializedData, options);
     } catch (error) {
+      (_b = this.logger) == null ? void 0 : _b.error(`Error setting data in redis: ${error}`);
       throw new Error(`Error setting data in redis: ${error}`);
     }
   }
@@ -275,21 +165,19 @@ var Persistor = class {
    * @returns GetType<T> value
    */
   async get(key) {
+    var _a, _b;
     if (!this.client) {
-      throw new Error("Client not initialized");
+      (_a = this.logger) == null ? void 0 : _a.error("Client not ready");
+      return null;
     }
     try {
       const data = await this.client.get(key);
       if (!data) {
         return null;
       }
-      const storedData = JSON.parse(data);
-      const deserialized = JSON.parse(storedData.value);
-      return {
-        ...storedData,
-        value: deserialize(deserialized)
-      };
+      return superjson.parse(data);
     } catch (error) {
+      (_b = this.logger) == null ? void 0 : _b.error(`Error getting data in redis: ${error}`);
       throw new Error(`Error getting data from redis: ${error}`);
     }
   }
@@ -298,7 +186,7 @@ var Persistor = class {
    * @param key Cache key
    */
   async delete(key) {
-    var _a;
+    var _a, _b;
     if (!this.client || !this.client.isReady) {
       (_a = this.logger) == null ? void 0 : _a.error("Client not ready");
       return;
@@ -306,6 +194,7 @@ var Persistor = class {
     try {
       await this.client.del(key);
     } catch (error) {
+      (_b = this.logger) == null ? void 0 : _b.error(`Error deleting data from redis: ${error}`);
       throw new Error(`Error deleting data from redis: ${error}`);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/promise-cache",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -19,6 +19,7 @@
     "tsconfig": "*"
   },
   "dependencies": {
-    "redis": "4.7.0"
+    "redis": "4.7.0",
+    "superjson": "^2.2.2"
   }
 }