@cacheable/node-cache 1.7.5 → 2.0.0

package/README.md

@@ -16,6 +16,7 @@
 * Faster than the original `node-cache` package 🚀
 * Async/Await functionality with `{NodeCacheStore}`
 * Storage Adapters via [Keyv](https://keyv.org) with `{NodeCacheStore}`
+* Lightweight - uses `@cacheable/utils` for utilities
 * Maintained and Updated Regularly! 🎉
 
 # Table of Contents
@@ -277,7 +278,7 @@ cache.on('set', (key, value) => {
 
 # NodeCacheStore
 
-`NodeCacheStore` has a similar API to `NodeCache` but it is using `async / await` as it uses the `Keyv` storage adapters under the hood. This means that you can use all the storage adapters that are available in `Keyv` and it will work seamlessly with the `NodeCacheStore`. To learn more about the `Keyv` storage adapters you can check out the [Keyv documentation](https://keyv.org).
+`NodeCacheStore` has a similar API to `NodeCache` but it is using `async / await` as it uses [Keyv](https://keyv.org) under the hood. This means that you can use any storage adapter that is available in `Keyv` and it will work seamlessly with the `NodeCacheStore`. To learn more about the `Keyv` storage adapters you can check out the [Keyv documentation](https://keyv.org).
 
 ```javascript
 import {NodeCacheStore} from '@cacheable/node-cache';
@@ -287,38 +288,33 @@ await cache.set('foo', 'bar');
 await cache.get('foo'); // 'bar'
 ```
 
-Here is an example of how to use the `NodeCacheStore` with a primary and secondary storage adapter:
+Here is an example of how to use the `NodeCacheStore` with a Redis storage adapter:
 
 ```javascript
 import {NodeCacheStore} from '@cacheable/node-cache';
-import {Keyv} from 'keyv';
-import {KeyvRedis} from '@keyv/redis';
+import Keyv from 'keyv';
+import KeyvRedis from '@keyv/redis';
 
-const primary = new Keyv(); // In-memory storage as primary
-const secondary = new Keyv({store: new KeyvRedis('redis://user:pass@localhost:6379')});
-const cache = new NodeCacheStore({primary, secondary});
+const keyv = new Keyv({store: new KeyvRedis('redis://user:pass@localhost:6379')});
+const cache = new NodeCacheStore({store: keyv});
 
 // with storage you have the same functionality as the NodeCache but will be using async/await
 await cache.set('foo', 'bar');
 await cache.get('foo'); // 'bar'
-
-// if you call getStats() this will now only be for the single instance of the adapter as it is in memory
-cache.getStats(); // {hits: 1, misses: 1, keys: 1, ksize: 2, vsize: 3}
 ```
 
 When initializing the cache you can pass in the options below:
 
 ```javascript
 export type NodeCacheStoreOptions = {
-	ttl?: number; // The standard ttl as number in milliseconds for every generated cache element. 0 = unlimited
-	primary?: Keyv; // The primary storage adapter
-	secondary?: Keyv; // The secondary storage adapter
-	maxKeys?: number; // Default is 0 (unlimited). If this is set it will throw and error if you try to set more keys than the max.
-	stats?: boolean; // Default is true, if this is set to false it will not track stats
+	ttl?: number | string; // The standard ttl as number in milliseconds for every generated cache element. 0 = unlimited. Supports shorthand like '1h' for 1 hour.
+	store?: Keyv; // The storage adapter (defaults to in-memory Keyv)
+	maxKeys?: number; // Default is 0 (unlimited). If this is set it will return false when trying to set more keys than the max.
+	stats?: boolean; // Default is true, if this is set to false it will not track stats internally
 };
 ```
 
-Note: the `ttl` is now in milliseconds and not seconds like `stdTTL` in `NodeCache`. You can learn more about using shorthand also in the [cacheable documentation](https://github.com/jaredwray/cacheable/blob/main/packages/cacheable/README.md#shorthand-for-time-to-live-ttl) as it is fully supported. Here is an example:
+Note: the `ttl` is now in milliseconds and not seconds like `stdTTL` in `NodeCache`. You can also use shorthand notation for TTL values. Here is an example:
 
 ```javascript
 const cache = new NodeCacheStore({ttl: 60000 }); // 1 minute as it defaults to milliseconds
@@ -328,21 +324,19 @@ await cache.set('longfoo', 'bar', '1d'); // 1 day
 
 ## NodeCacheStore API
 
-* `set(key: string | number, value: any, ttl?: number): Promise<boolean>` - Set a key value pair with an optional ttl (in milliseconds). Will return true on success. If the ttl is not set it will default to 0 (no ttl)
-* `mset(data: Array<NodeCacheItem>): Promise<boolean>` - Set multiple key value pairs at once
-* `get<T>(key: string | number): Promise<T>` - Get a value from the cache by key
-* `mget(keys: Array<string | number>): Promise<Record<string, unknown>>` - Get multiple values from the cache by keys
-* `take<T>(key: string | number): Promise<T>` - Get a value from the cache by key and delete it
+* `set(key: string | number, value: any, ttl?: number | string): Promise<boolean>` - Set a key value pair with an optional ttl (in milliseconds or shorthand string). Will return true on success, false if maxKeys limit is reached. If the ttl is not set it will default to the instance ttl or no expiration.
+* `mset(data: Array<NodeCacheItem>): Promise<void>` - Set multiple key value pairs at once
+* `get<T>(key: string | number): Promise<T | undefined>` - Get a value from the cache by key
+* `mget<T>(keys: Array<string | number>): Promise<Record<string, T | undefined>>` - Get multiple values from the cache by keys
+* `take<T>(key: string | number): Promise<T | undefined>` - Get a value from the cache by key and delete it
 * `del(key: string | number): Promise<boolean>` - Delete a key
 * `mdel(keys: Array<string | number>): Promise<boolean>` - Delete multiple keys
 * `clear(): Promise<void>` - Clear the cache
-* `setTtl(key: string | number, ttl: number): Promise<boolean>` - Set the ttl of a key
-* `disconnect(): Promise<void>` - Disconnect the storage adapters
-* `stats`: `NodeCacheStats` - Get the stats of the cache
-* `ttl`: `number` | `string` - The standard ttl as number in seconds for every generated cache element. `< 0` or `undefined` = unlimited
-* `primary`: `Keyv` - The primary storage adapter
-* `secondary`: `Keyv` - The secondary storage adapter
-* `maxKeys`: `number` - If this is set it will throw and error if you try to set more keys than the max
+* `setTtl(key: string | number, ttl?: number): Promise<boolean>` - Set the ttl of an existing key
+* `disconnect(): Promise<void>` - Disconnect the storage adapter
+* `ttl`: `number | string | undefined` - The standard ttl for every generated cache element. `undefined` = unlimited
+* `store`: `Keyv` - The storage adapter (read-only)
+* `maxKeys`: `number` - If this is set it will return false when trying to set more keys than the max
 
 # How to Contribute
 

package/dist/index.cjs

@@ -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
@@ -26,86 +36,52 @@ __export(index_exports, {
   default: () => index_default
 });
 module.exports = __toCommonJS(index_exports);
-var import_cacheable2 = require("cacheable");
+var import_utils2 = require("@cacheable/utils");
 var import_hookified2 = require("hookified");
 
 // src/store.ts
-var import_cacheable = require("cacheable");
+var import_utils = require("@cacheable/utils");
 var import_hookified = require("hookified");
+var import_keyv = __toESM(require("keyv"), 1);
 var NodeCacheStore = class extends import_hookified.Hookified {
   _maxKeys = 0;
-  _cache = new import_cacheable.Cacheable();
+  _keyv;
+  _stats;
+  _ttl;
   constructor(options) {
     super();
-    if (options) {
-      const cacheOptions = {
-        ttl: options.ttl,
-        primary: options.primary,
-        secondary: options.secondary,
-        stats: options.stats ?? true
-      };
-      this._cache = new import_cacheable.Cacheable(cacheOptions);
-      if (options.maxKeys) {
-        this._maxKeys = options.maxKeys;
-      }
+    this._stats = new import_utils.Stats({ enabled: options?.stats ?? true });
+    this._ttl = options?.ttl;
+    this._keyv = options?.store ?? new import_keyv.default();
+    if (options?.maxKeys) {
+      this._maxKeys = options.maxKeys;
     }
-    this._cache.on("error", (error) => {
+    this._keyv.on("error", (error) => {
       this.emit("error", error);
     });
   }
-  /**
-   * Cacheable instance.
-   * @returns {Cacheable}
-   * @readonly
-   */
-  get cache() {
-    return this._cache;
-  }
   /**
    * Time to live in milliseconds.
    * @returns {number | string | undefined}
    * @readonly
    */
   get ttl() {
-    return this._cache.ttl;
+    return this._ttl;
   }
   /**
    * Time to live in milliseconds.
    * @param {number | string | undefined} ttl
    */
   set ttl(ttl) {
-    this._cache.ttl = ttl;
+    this._ttl = ttl;
   }
   /**
-   * Primary cache store.
+   * The Keyv store instance.
    * @returns {Keyv<T>}
    * @readonly
    */
-  get primary() {
-    return this._cache.primary;
-  }
-  /**
-   * Primary cache store.
-   * @param {Keyv<T>} primary
-   */
-  set primary(primary) {
-    this._cache.primary = primary;
-  }
-  /**
-   * Secondary cache store. Learn more about the secondary cache store in the
-   * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-   * @returns {Keyv<T> | undefined}
-   */
-  get secondary() {
-    return this._cache.secondary;
-  }
-  /**
-   * Secondary cache store. Learn more about the secondary cache store in the
-   * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-   * @param {Keyv | undefined} secondary
-   */
-  set secondary(secondary) {
-    this._cache.secondary = secondary;
+  get store() {
+    return this._keyv;
   }
   /**
    * Maximum number of keys to store in the cache. if this is set to a value greater than 0,
@@ -124,7 +100,7 @@ var NodeCacheStore = class extends import_hookified.Hookified {
   set maxKeys(maxKeys) {
     this._maxKeys = maxKeys;
     if (this._maxKeys > 0) {
-      this._cache.stats.enabled = true;
+      this._stats.enabled = true;
     }
   }
   /**
@@ -136,11 +112,13 @@ var NodeCacheStore = class extends import_hookified.Hookified {
    */
   async set(key, value, ttl) {
     if (this._maxKeys > 0) {
-      if (this._cache.stats.count >= this._maxKeys) {
+      if (this._stats.count >= this._maxKeys) {
         return false;
       }
     }
-    await this._cache.set(key.toString(), value, ttl);
+    const finalTtl = this.resolveTtl(ttl);
+    await this._keyv.set(key.toString(), value, finalTtl);
+    this._stats.incrementCount();
     return true;
   }
   /**
@@ -149,15 +127,11 @@ var NodeCacheStore = class extends import_hookified.Hookified {
    * @returns {void}
    */
   async mset(list) {
-    const items = [];
     for (const item of list) {
-      items.push({
-        key: item.key.toString(),
-        value: item.value,
-        ttl: item.ttl
-      });
+      const finalTtl = this.resolveTtl(item.ttl);
+      await this._keyv.set(item.key.toString(), item.value, finalTtl);
+      this._stats.incrementCount();
     }
-    await this._cache.setMany(items);
   }
   /**
    * Get a value from the cache.
@@ -165,7 +139,13 @@ var NodeCacheStore = class extends import_hookified.Hookified {
    * @returns {any | undefined}
    */
   async get(key) {
-    return this._cache.get(key.toString());
+    const result = await this._keyv.get(key.toString());
+    if (result !== void 0) {
+      this._stats.incrementHits();
+    } else {
+      this._stats.incrementMisses();
+    }
+    return result;
   }
   /**
    * Get multiple values from the cache.
@@ -175,7 +155,13 @@ var NodeCacheStore = class extends import_hookified.Hookified {
   async mget(keys) {
     const result = {};
     for (const key of keys) {
-      result[key.toString()] = await this._cache.get(key.toString());
+      const value = await this._keyv.get(key.toString());
+      if (value !== void 0) {
+        this._stats.incrementHits();
+      } else {
+        this._stats.incrementMisses();
+      }
+      result[key.toString()] = value;
     }
     return result;
   }
@@ -185,7 +171,11 @@ var NodeCacheStore = class extends import_hookified.Hookified {
    * @returns {boolean}
    */
   async del(key) {
-    return this._cache.delete(key.toString());
+    const deleted = await this._keyv.delete(key.toString());
+    if (deleted) {
+      this._stats.decreaseCount();
+    }
+    return deleted;
   }
   /**
    * Delete multiple keys from the cache.
@@ -193,42 +183,77 @@ var NodeCacheStore = class extends import_hookified.Hookified {
    * @returns {boolean}
    */
   async mdel(keys) {
-    return this._cache.deleteMany(keys.map((key) => key.toString()));
+    const deleted = await this._keyv.delete(keys.map((key) => key.toString()));
+    if (deleted) {
+      for (const _ of keys) {
+        this._stats.decreaseCount();
+      }
+    }
+    return deleted;
   }
   /**
    * Clear the cache.
    * @returns {void}
    */
   async clear() {
-    return this._cache.clear();
+    await this._keyv.clear();
+    this._stats.resetStoreValues();
   }
   /**
-   * Check if a key exists in the cache.
+   * Set the TTL of an existing key in the cache.
    * @param {string | number} key
+   * @param {number | string} [ttl]
    * @returns {boolean}
    */
   async setTtl(key, ttl) {
-    const item = await this._cache.get(key.toString());
+    const item = await this._keyv.get(key.toString());
     if (item) {
-      await this._cache.set(key.toString(), item, ttl);
+      const finalTtl = this.resolveTtl(ttl);
+      await this._keyv.set(key.toString(), item, finalTtl);
       return true;
     }
     return false;
   }
   /**
-   * Check if a key exists in the cache. If it does exist it will get the value and delete the item from the cache.
+   * Get a key from the cache and delete it. If it does exist it will get the value and delete the item from the cache.
    * @param {string | number} key
    * @returns {T | undefined}
    */
   async take(key) {
-    return this._cache.take(key.toString());
+    const result = await this._keyv.get(key.toString());
+    if (result !== void 0) {
+      this._stats.incrementHits();
+      await this._keyv.delete(key.toString());
+      this._stats.decreaseCount();
+    } else {
+      this._stats.incrementMisses();
+    }
+    return result;
   }
   /**
    * Disconnect from the cache.
    * @returns {void}
    */
   async disconnect() {
-    await this._cache.disconnect();
+    await this._keyv.disconnect();
+  }
+  /**
+   * Resolve the TTL to milliseconds.
+   * @param {number | string | undefined} ttl
+   * @returns {number | undefined}
+   */
+  resolveTtl(ttl) {
+    const effectiveTtl = ttl ?? this._ttl;
+    if (effectiveTtl === void 0) {
+      return void 0;
+    }
+    if (typeof effectiveTtl === "string") {
+      return (0, import_utils.shorthandToMilliseconds)(effectiveTtl);
+    }
+    if (effectiveTtl === 0) {
+      return void 0;
+    }
+    return effectiveTtl;
   }
 };
 
@@ -249,8 +274,7 @@ var NodeCache = class extends import_hookified2.Hookified {
     maxKeys: -1
   };
   store = /* @__PURE__ */ new Map();
-  _stats = new import_cacheable2.CacheableStats({ enabled: true });
-  _cacheable = new import_cacheable2.CacheableMemory();
+  _stats = new import_utils2.Stats({ enabled: true });
   intervalId = 0;
   constructor(options) {
     super();
@@ -335,13 +359,13 @@ var NodeCache = class extends import_hookified2.Hookified {
         }
         this._stats.incrementHits();
         if (this.options.useClones) {
-          return this._cacheable.clone(result.value);
+          return this.clone(result.value);
         }
         return result.value;
       }
       this._stats.incrementHits();
       if (this.options.useClones) {
-        return this._cacheable.clone(result.value);
+        return this.clone(result.value);
       }
       return result.value;
     }
@@ -375,7 +399,7 @@ var NodeCache = class extends import_hookified2.Hookified {
     if (result) {
       this.del(key);
       if (this.options.useClones) {
-        return this._cacheable.clone(result);
+        return this.clone(result);
       }
       return result;
     }
@@ -494,7 +518,7 @@ var NodeCache = class extends import_hookified2.Hookified {
    * @returns {void}
    */
   flushStats() {
-    this._stats = new import_cacheable2.CacheableStats({ enabled: true });
+    this._stats = new import_utils2.Stats({ enabled: true });
     this.emit("flush_stats");
   }
   /**
@@ -511,28 +535,44 @@ var NodeCache = class extends import_hookified2.Hookified {
   getIntervalId() {
     return this.intervalId;
   }
+  startInterval() {
+    if (this.options.checkperiod && this.options.checkperiod > 0) {
+      const checkPeriodinSeconds = this.options.checkperiod * 1e3;
+      this.intervalId = setInterval(() => {
+        this.checkData();
+      }, checkPeriodinSeconds).unref();
+      return;
+    }
+    this.intervalId = 0;
+  }
+  stopInterval() {
+    if (this.intervalId !== 0) {
+      clearInterval(this.intervalId);
+      this.intervalId = 0;
+    }
+  }
   formatKey(key) {
     return key.toString();
   }
+  // biome-ignore lint/suspicious/noExplicitAny: type format
+  clone(value) {
+    if (value === null || value === void 0) {
+      return value;
+    }
+    if (typeof value !== "object") {
+      return value;
+    }
+    return structuredClone(value);
+  }
   getExpirationTimestamp(ttlInSeconds) {
     if (typeof ttlInSeconds === "string") {
-      return (0, import_cacheable2.shorthandToTime)(ttlInSeconds);
+      return (0, import_utils2.shorthandToTime)(ttlInSeconds);
     }
     const currentTimestamp = Date.now();
     const ttlInMilliseconds = ttlInSeconds * 1e3;
     const expirationTimestamp = currentTimestamp + ttlInMilliseconds;
     return expirationTimestamp;
   }
-  startInterval() {
-    if (this.options.checkperiod && this.options.checkperiod > 0) {
-      const checkPeriodinSeconds = this.options.checkperiod * 1e3;
-      this.intervalId = setInterval(() => {
-        this.checkData();
-      }, checkPeriodinSeconds).unref();
-      return;
-    }
-    this.intervalId = 0;
-  }
   checkData() {
     for (const [key, value] of this.store.entries()) {
       if (value.ttl > 0 && value.ttl < Date.now()) {
@@ -543,12 +583,6 @@ var NodeCache = class extends import_hookified2.Hookified {
       }
     }
   }
-  stopInterval() {
-    if (this.intervalId !== 0) {
-      clearInterval(this.intervalId);
-      this.intervalId = 0;
-    }
-  }
   createError(errorCode, key) {
     let error = errorCode;
     if (key) {

package/dist/index.d.cts

@@ -1,6 +1,5 @@
 import { Hookified } from 'hookified';
-import { Cacheable } from 'cacheable';
-import { Keyv } from 'keyv';
+import Keyv from 'keyv';
 
 type NodeCacheStoreOptions<T> = {
     /**
@@ -12,14 +11,9 @@ type NodeCacheStoreOptions<T> = {
      */
     maxKeys?: number;
     /**
-     * Primary cache store.
+     * The Keyv store instance.
      */
-    primary?: Keyv<T>;
-    /**
-     * Secondary cache store. Learn more about the secondary cache store in the cacheable documentation.
-     * [storage-tiering-and-caching](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching)
-     */
-    secondary?: Keyv<T>;
+    store?: Keyv<T>;
     /**
      * Enable stats tracking. This is a breaking change from the original NodeCache.
      */
@@ -27,14 +21,10 @@ type NodeCacheStoreOptions<T> = {
 };
 declare class NodeCacheStore<T> extends Hookified {
     private _maxKeys;
-    private readonly _cache;
+    private _keyv;
+    private readonly _stats;
+    private _ttl?;
     constructor(options?: NodeCacheStoreOptions<T>);
-    /**
-     * Cacheable instance.
-     * @returns {Cacheable}
-     * @readonly
-     */
-    get cache(): Cacheable;
     /**
      * Time to live in milliseconds.
      * @returns {number | string | undefined}
@@ -47,28 +37,11 @@ declare class NodeCacheStore<T> extends Hookified {
      */
     set ttl(ttl: number | string | undefined);
     /**
-     * Primary cache store.
+     * The Keyv store instance.
      * @returns {Keyv<T>}
      * @readonly
      */
-    get primary(): Keyv<T>;
-    /**
-     * Primary cache store.
-     * @param {Keyv<T>} primary
-     */
-    set primary(primary: Keyv<T>);
-    /**
-     * Secondary cache store. Learn more about the secondary cache store in the
-     * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-     * @returns {Keyv<T> | undefined}
-     */
-    get secondary(): Keyv<T> | undefined;
-    /**
-     * Secondary cache store. Learn more about the secondary cache store in the
-     * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-     * @param {Keyv | undefined} secondary
-     */
-    set secondary(secondary: Keyv | undefined);
+    get store(): Keyv<T>;
     /**
      * Maximum number of keys to store in the cache. if this is set to a value greater than 0,
      * the cache will keep track of the number of keys and will not store more than the specified number of keys.
@@ -89,7 +62,7 @@ declare class NodeCacheStore<T> extends Hookified {
      * @param {number} [ttl]
      * @returns {boolean}
      */
-    set(key: string | number, value: T, ttl?: number): Promise<boolean>;
+    set(key: string | number, value: T, ttl?: number | string): Promise<boolean>;
     /**
      * Set multiple key/value pairs in the cache.
      * @param {PartialNodeCacheItem[]} list
@@ -126,13 +99,14 @@ declare class NodeCacheStore<T> extends Hookified {
      */
     clear(): Promise<void>;
     /**
-     * Check if a key exists in the cache.
+     * Set the TTL of an existing key in the cache.
      * @param {string | number} key
+     * @param {number | string} [ttl]
      * @returns {boolean}
      */
-    setTtl(key: string | number, ttl?: number): Promise<boolean>;
+    setTtl(key: string | number, ttl?: number | string): Promise<boolean>;
     /**
-     * Check if a key exists in the cache. If it does exist it will get the value and delete the item from the cache.
+     * Get a key from the cache and delete it. If it does exist it will get the value and delete the item from the cache.
      * @param {string | number} key
      * @returns {T | undefined}
      */
@@ -142,6 +116,12 @@ declare class NodeCacheStore<T> extends Hookified {
      * @returns {void}
      */
     disconnect(): Promise<void>;
+    /**
+     * Resolve the TTL to milliseconds.
+     * @param {number | string | undefined} ttl
+     * @returns {number | undefined}
+     */
+    private resolveTtl;
 }
 
 type NodeCacheOptions = {
@@ -224,7 +204,6 @@ declare class NodeCache<T> extends Hookified {
     readonly options: NodeCacheOptions;
     readonly store: Map<string, NodeCacheItem<T>>;
     private _stats;
-    private readonly _cacheable;
     private intervalId;
     constructor(options?: NodeCacheOptions);
     /**
@@ -324,11 +303,12 @@ declare class NodeCache<T> extends Hookified {
      * @returns {number | NodeJS.Timeout} the interval id
      */
     getIntervalId(): number | NodeJS.Timeout;
+    startInterval(): void;
+    stopInterval(): void;
     private formatKey;
+    private clone;
     private getExpirationTimestamp;
-    private startInterval;
     private checkData;
-    private stopInterval;
     private createError;
 }
 

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { Hookified } from 'hookified';
-import { Cacheable } from 'cacheable';
-import { Keyv } from 'keyv';
+import Keyv from 'keyv';
 
 type NodeCacheStoreOptions<T> = {
     /**
@@ -12,14 +11,9 @@ type NodeCacheStoreOptions<T> = {
      */
     maxKeys?: number;
     /**
-     * Primary cache store.
+     * The Keyv store instance.
      */
-    primary?: Keyv<T>;
-    /**
-     * Secondary cache store. Learn more about the secondary cache store in the cacheable documentation.
-     * [storage-tiering-and-caching](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching)
-     */
-    secondary?: Keyv<T>;
+    store?: Keyv<T>;
     /**
      * Enable stats tracking. This is a breaking change from the original NodeCache.
      */
@@ -27,14 +21,10 @@ type NodeCacheStoreOptions<T> = {
 };
 declare class NodeCacheStore<T> extends Hookified {
     private _maxKeys;
-    private readonly _cache;
+    private _keyv;
+    private readonly _stats;
+    private _ttl?;
     constructor(options?: NodeCacheStoreOptions<T>);
-    /**
-     * Cacheable instance.
-     * @returns {Cacheable}
-     * @readonly
-     */
-    get cache(): Cacheable;
     /**
      * Time to live in milliseconds.
      * @returns {number | string | undefined}
@@ -47,28 +37,11 @@ declare class NodeCacheStore<T> extends Hookified {
      */
     set ttl(ttl: number | string | undefined);
     /**
-     * Primary cache store.
+     * The Keyv store instance.
      * @returns {Keyv<T>}
      * @readonly
      */
-    get primary(): Keyv<T>;
-    /**
-     * Primary cache store.
-     * @param {Keyv<T>} primary
-     */
-    set primary(primary: Keyv<T>);
-    /**
-     * Secondary cache store. Learn more about the secondary cache store in the
-     * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-     * @returns {Keyv<T> | undefined}
-     */
-    get secondary(): Keyv<T> | undefined;
-    /**
-     * Secondary cache store. Learn more about the secondary cache store in the
-     * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-     * @param {Keyv | undefined} secondary
-     */
-    set secondary(secondary: Keyv | undefined);
+    get store(): Keyv<T>;
     /**
      * Maximum number of keys to store in the cache. if this is set to a value greater than 0,
      * the cache will keep track of the number of keys and will not store more than the specified number of keys.
@@ -89,7 +62,7 @@ declare class NodeCacheStore<T> extends Hookified {
      * @param {number} [ttl]
      * @returns {boolean}
      */
-    set(key: string | number, value: T, ttl?: number): Promise<boolean>;
+    set(key: string | number, value: T, ttl?: number | string): Promise<boolean>;
     /**
      * Set multiple key/value pairs in the cache.
      * @param {PartialNodeCacheItem[]} list
@@ -126,13 +99,14 @@ declare class NodeCacheStore<T> extends Hookified {
      */
     clear(): Promise<void>;
     /**
-     * Check if a key exists in the cache.
+     * Set the TTL of an existing key in the cache.
      * @param {string | number} key
+     * @param {number | string} [ttl]
      * @returns {boolean}
      */
-    setTtl(key: string | number, ttl?: number): Promise<boolean>;
+    setTtl(key: string | number, ttl?: number | string): Promise<boolean>;
     /**
-     * Check if a key exists in the cache. If it does exist it will get the value and delete the item from the cache.
+     * Get a key from the cache and delete it. If it does exist it will get the value and delete the item from the cache.
      * @param {string | number} key
      * @returns {T | undefined}
      */
@@ -142,6 +116,12 @@ declare class NodeCacheStore<T> extends Hookified {
      * @returns {void}
      */
     disconnect(): Promise<void>;
+    /**
+     * Resolve the TTL to milliseconds.
+     * @param {number | string | undefined} ttl
+     * @returns {number | undefined}
+     */
+    private resolveTtl;
 }
 
 type NodeCacheOptions = {
@@ -224,7 +204,6 @@ declare class NodeCache<T> extends Hookified {
     readonly options: NodeCacheOptions;
     readonly store: Map<string, NodeCacheItem<T>>;
     private _stats;
-    private readonly _cacheable;
     private intervalId;
     constructor(options?: NodeCacheOptions);
     /**
@@ -324,11 +303,12 @@ declare class NodeCache<T> extends Hookified {
      * @returns {number | NodeJS.Timeout} the interval id
      */
     getIntervalId(): number | NodeJS.Timeout;
+    startInterval(): void;
+    stopInterval(): void;
     private formatKey;
+    private clone;
     private getExpirationTimestamp;
-    private startInterval;
     private checkData;
-    private stopInterval;
     private createError;
 }
 

package/dist/index.js

@@ -1,84 +1,50 @@
 // src/index.ts
-import { CacheableMemory, CacheableStats, shorthandToTime } from "cacheable";
+import { Stats as Stats2, shorthandToTime } from "@cacheable/utils";
 import { Hookified as Hookified2 } from "hookified";
 
 // src/store.ts
-import { Cacheable } from "cacheable";
+import { Stats, shorthandToMilliseconds } from "@cacheable/utils";
 import { Hookified } from "hookified";
+import Keyv from "keyv";
 var NodeCacheStore = class extends Hookified {
   _maxKeys = 0;
-  _cache = new Cacheable();
+  _keyv;
+  _stats;
+  _ttl;
   constructor(options) {
     super();
-    if (options) {
-      const cacheOptions = {
-        ttl: options.ttl,
-        primary: options.primary,
-        secondary: options.secondary,
-        stats: options.stats ?? true
-      };
-      this._cache = new Cacheable(cacheOptions);
-      if (options.maxKeys) {
-        this._maxKeys = options.maxKeys;
-      }
+    this._stats = new Stats({ enabled: options?.stats ?? true });
+    this._ttl = options?.ttl;
+    this._keyv = options?.store ?? new Keyv();
+    if (options?.maxKeys) {
+      this._maxKeys = options.maxKeys;
     }
-    this._cache.on("error", (error) => {
+    this._keyv.on("error", (error) => {
       this.emit("error", error);
     });
   }
-  /**
-   * Cacheable instance.
-   * @returns {Cacheable}
-   * @readonly
-   */
-  get cache() {
-    return this._cache;
-  }
   /**
    * Time to live in milliseconds.
    * @returns {number | string | undefined}
    * @readonly
    */
   get ttl() {
-    return this._cache.ttl;
+    return this._ttl;
   }
   /**
    * Time to live in milliseconds.
    * @param {number | string | undefined} ttl
    */
   set ttl(ttl) {
-    this._cache.ttl = ttl;
+    this._ttl = ttl;
   }
   /**
-   * Primary cache store.
+   * The Keyv store instance.
    * @returns {Keyv<T>}
    * @readonly
    */
-  get primary() {
-    return this._cache.primary;
-  }
-  /**
-   * Primary cache store.
-   * @param {Keyv<T>} primary
-   */
-  set primary(primary) {
-    this._cache.primary = primary;
-  }
-  /**
-   * Secondary cache store. Learn more about the secondary cache store in the
-   * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-   * @returns {Keyv<T> | undefined}
-   */
-  get secondary() {
-    return this._cache.secondary;
-  }
-  /**
-   * Secondary cache store. Learn more about the secondary cache store in the
-   * [cacheable](https://github.com/jaredwray/cacheable/tree/main/packages/cacheable#storage-tiering-and-caching) documentation.
-   * @param {Keyv | undefined} secondary
-   */
-  set secondary(secondary) {
-    this._cache.secondary = secondary;
+  get store() {
+    return this._keyv;
   }
   /**
    * Maximum number of keys to store in the cache. if this is set to a value greater than 0,
@@ -97,7 +63,7 @@ var NodeCacheStore = class extends Hookified {
   set maxKeys(maxKeys) {
     this._maxKeys = maxKeys;
     if (this._maxKeys > 0) {
-      this._cache.stats.enabled = true;
+      this._stats.enabled = true;
     }
   }
   /**
@@ -109,11 +75,13 @@ var NodeCacheStore = class extends Hookified {
    */
   async set(key, value, ttl) {
     if (this._maxKeys > 0) {
-      if (this._cache.stats.count >= this._maxKeys) {
+      if (this._stats.count >= this._maxKeys) {
         return false;
       }
     }
-    await this._cache.set(key.toString(), value, ttl);
+    const finalTtl = this.resolveTtl(ttl);
+    await this._keyv.set(key.toString(), value, finalTtl);
+    this._stats.incrementCount();
     return true;
   }
   /**
@@ -122,15 +90,11 @@ var NodeCacheStore = class extends Hookified {
    * @returns {void}
    */
   async mset(list) {
-    const items = [];
     for (const item of list) {
-      items.push({
-        key: item.key.toString(),
-        value: item.value,
-        ttl: item.ttl
-      });
+      const finalTtl = this.resolveTtl(item.ttl);
+      await this._keyv.set(item.key.toString(), item.value, finalTtl);
+      this._stats.incrementCount();
     }
-    await this._cache.setMany(items);
   }
   /**
    * Get a value from the cache.
@@ -138,7 +102,13 @@ var NodeCacheStore = class extends Hookified {
    * @returns {any | undefined}
    */
   async get(key) {
-    return this._cache.get(key.toString());
+    const result = await this._keyv.get(key.toString());
+    if (result !== void 0) {
+      this._stats.incrementHits();
+    } else {
+      this._stats.incrementMisses();
+    }
+    return result;
   }
   /**
    * Get multiple values from the cache.
@@ -148,7 +118,13 @@ var NodeCacheStore = class extends Hookified {
   async mget(keys) {
     const result = {};
     for (const key of keys) {
-      result[key.toString()] = await this._cache.get(key.toString());
+      const value = await this._keyv.get(key.toString());
+      if (value !== void 0) {
+        this._stats.incrementHits();
+      } else {
+        this._stats.incrementMisses();
+      }
+      result[key.toString()] = value;
     }
     return result;
   }
@@ -158,7 +134,11 @@ var NodeCacheStore = class extends Hookified {
    * @returns {boolean}
    */
   async del(key) {
-    return this._cache.delete(key.toString());
+    const deleted = await this._keyv.delete(key.toString());
+    if (deleted) {
+      this._stats.decreaseCount();
+    }
+    return deleted;
   }
   /**
    * Delete multiple keys from the cache.
@@ -166,42 +146,77 @@ var NodeCacheStore = class extends Hookified {
    * @returns {boolean}
    */
   async mdel(keys) {
-    return this._cache.deleteMany(keys.map((key) => key.toString()));
+    const deleted = await this._keyv.delete(keys.map((key) => key.toString()));
+    if (deleted) {
+      for (const _ of keys) {
+        this._stats.decreaseCount();
+      }
+    }
+    return deleted;
   }
   /**
    * Clear the cache.
    * @returns {void}
    */
   async clear() {
-    return this._cache.clear();
+    await this._keyv.clear();
+    this._stats.resetStoreValues();
   }
   /**
-   * Check if a key exists in the cache.
+   * Set the TTL of an existing key in the cache.
    * @param {string | number} key
+   * @param {number | string} [ttl]
    * @returns {boolean}
    */
   async setTtl(key, ttl) {
-    const item = await this._cache.get(key.toString());
+    const item = await this._keyv.get(key.toString());
     if (item) {
-      await this._cache.set(key.toString(), item, ttl);
+      const finalTtl = this.resolveTtl(ttl);
+      await this._keyv.set(key.toString(), item, finalTtl);
       return true;
     }
     return false;
   }
   /**
-   * Check if a key exists in the cache. If it does exist it will get the value and delete the item from the cache.
+   * Get a key from the cache and delete it. If it does exist it will get the value and delete the item from the cache.
    * @param {string | number} key
    * @returns {T | undefined}
    */
   async take(key) {
-    return this._cache.take(key.toString());
+    const result = await this._keyv.get(key.toString());
+    if (result !== void 0) {
+      this._stats.incrementHits();
+      await this._keyv.delete(key.toString());
+      this._stats.decreaseCount();
+    } else {
+      this._stats.incrementMisses();
+    }
+    return result;
   }
   /**
    * Disconnect from the cache.
    * @returns {void}
    */
   async disconnect() {
-    await this._cache.disconnect();
+    await this._keyv.disconnect();
+  }
+  /**
+   * Resolve the TTL to milliseconds.
+   * @param {number | string | undefined} ttl
+   * @returns {number | undefined}
+   */
+  resolveTtl(ttl) {
+    const effectiveTtl = ttl ?? this._ttl;
+    if (effectiveTtl === void 0) {
+      return void 0;
+    }
+    if (typeof effectiveTtl === "string") {
+      return shorthandToMilliseconds(effectiveTtl);
+    }
+    if (effectiveTtl === 0) {
+      return void 0;
+    }
+    return effectiveTtl;
   }
 };
 
@@ -222,8 +237,7 @@ var NodeCache = class extends Hookified2 {
     maxKeys: -1
   };
   store = /* @__PURE__ */ new Map();
-  _stats = new CacheableStats({ enabled: true });
-  _cacheable = new CacheableMemory();
+  _stats = new Stats2({ enabled: true });
   intervalId = 0;
   constructor(options) {
     super();
@@ -308,13 +322,13 @@ var NodeCache = class extends Hookified2 {
         }
         this._stats.incrementHits();
         if (this.options.useClones) {
-          return this._cacheable.clone(result.value);
+          return this.clone(result.value);
         }
         return result.value;
       }
       this._stats.incrementHits();
       if (this.options.useClones) {
-        return this._cacheable.clone(result.value);
+        return this.clone(result.value);
       }
       return result.value;
     }
@@ -348,7 +362,7 @@ var NodeCache = class extends Hookified2 {
     if (result) {
       this.del(key);
       if (this.options.useClones) {
-        return this._cacheable.clone(result);
+        return this.clone(result);
       }
       return result;
     }
@@ -467,7 +481,7 @@ var NodeCache = class extends Hookified2 {
    * @returns {void}
    */
   flushStats() {
-    this._stats = new CacheableStats({ enabled: true });
+    this._stats = new Stats2({ enabled: true });
     this.emit("flush_stats");
   }
   /**
@@ -484,9 +498,35 @@ var NodeCache = class extends Hookified2 {
   getIntervalId() {
     return this.intervalId;
   }
+  startInterval() {
+    if (this.options.checkperiod && this.options.checkperiod > 0) {
+      const checkPeriodinSeconds = this.options.checkperiod * 1e3;
+      this.intervalId = setInterval(() => {
+        this.checkData();
+      }, checkPeriodinSeconds).unref();
+      return;
+    }
+    this.intervalId = 0;
+  }
+  stopInterval() {
+    if (this.intervalId !== 0) {
+      clearInterval(this.intervalId);
+      this.intervalId = 0;
+    }
+  }
   formatKey(key) {
     return key.toString();
   }
+  // biome-ignore lint/suspicious/noExplicitAny: type format
+  clone(value) {
+    if (value === null || value === void 0) {
+      return value;
+    }
+    if (typeof value !== "object") {
+      return value;
+    }
+    return structuredClone(value);
+  }
   getExpirationTimestamp(ttlInSeconds) {
     if (typeof ttlInSeconds === "string") {
       return shorthandToTime(ttlInSeconds);
@@ -496,16 +536,6 @@ var NodeCache = class extends Hookified2 {
     const expirationTimestamp = currentTimestamp + ttlInMilliseconds;
     return expirationTimestamp;
   }
-  startInterval() {
-    if (this.options.checkperiod && this.options.checkperiod > 0) {
-      const checkPeriodinSeconds = this.options.checkperiod * 1e3;
-      this.intervalId = setInterval(() => {
-        this.checkData();
-      }, checkPeriodinSeconds).unref();
-      return;
-    }
-    this.intervalId = 0;
-  }
   checkData() {
     for (const [key, value] of this.store.entries()) {
       if (value.ttl > 0 && value.ttl < Date.now()) {
@@ -516,12 +546,6 @@ var NodeCache = class extends Hookified2 {
       }
     }
   }
-  stopInterval() {
-    if (this.intervalId !== 0) {
-      clearInterval(this.intervalId);
-      this.intervalId = 0;
-    }
-  }
   createError(errorCode, key) {
     let error = errorCode;
     if (key) {

package/package.json

@@ -1,15 +1,21 @@
 {
   "name": "@cacheable/node-cache",
-  "version": "1.7.5",
+  "version": "2.0.0",
   "description": "Simple and Maintained fast NodeJS internal caching",
   "type": "module",
-  "main": "./dist/index.cjs",
+  "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     }
   },
   "engines": {
@@ -34,19 +40,19 @@
     "cacheable-node"
   ],
   "devDependencies": {
-    "@biomejs/biome": "^2.3.5",
+    "@biomejs/biome": "^2.3.8",
     "@faker-js/faker": "^10.1.0",
-    "@types/node": "^24.10.1",
-    "@vitest/coverage-v8": "^4.0.9",
-    "rimraf": "^6.1.0",
+    "@types/node": "^25.0.2",
+    "@vitest/coverage-v8": "^4.0.15",
+    "rimraf": "^6.1.2",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.9"
+    "vitest": "^4.0.15"
   },
   "dependencies": {
-    "hookified": "^1.13.0",
-    "keyv": "^5.5.4",
-    "cacheable": "^2.2.0"
+    "hookified": "^1.14.0",
+    "keyv": "^5.5.5",
+    "@cacheable/utils": "^2.3.3"
   },
   "files": [
     "dist",