ts-cache-mongoose 0.0.1 → 0.0.3

package/dist/esm/types/cache/Cache.d.ts

@@ -1,12 +1,14 @@
-export declare const engines: readonly ["memory", "redis"];
-declare class Cache {
+import type ICacheOptions from '../interfaces/ICacheOptions';
+declare class CacheEngine {
     private engine;
     private defaultTTL;
-    constructor(engineName: 'memory' | 'redis', defaultTTL: string);
+    private readonly engines;
+    constructor(cacheOptions: ICacheOptions);
     get(key: string): Promise<Record<string, unknown> | Record<string, unknown>[] | undefined>;
-    set(key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: number): Promise<void>;
+    set(key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: string): Promise<void>;
     del(key: string): Promise<void>;
     clear(): Promise<void>;
+    close(): Promise<void>;
 }
-export default Cache;
+export default CacheEngine;
 //# sourceMappingURL=Cache.d.ts.map

package/dist/esm/types/cache/Cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../../src/cache/Cache.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,8BAA+B,CAAA;AAEnD,cAAM,KAAK;IACT,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAQ;gBAEb,UAAU,EAAE,QAAQ,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM;IAczD,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAI3F,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1G,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAG9B;AAED,eAAe,KAAK,CAAA"}
+{"version":3,"file":"Cache.d.ts","sourceRoot":"","sources":["../../../../src/cache/Cache.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,aAAa,MAAM,6BAA6B,CAAA;AAK5D,cAAM,WAAW;IACf,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;gBAE1C,YAAY,EAAE,aAAa;IAoBlC,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAI3F,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1G,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAIvB,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAG9B;AAED,eAAe,WAAW,CAAA"}

package/dist/esm/types/cache/engine/MemoryCacheEngine.d.ts

@@ -6,6 +6,7 @@ declare class MemoryCacheEngine implements ICacheEngine {
     set(key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: number): void;
     del(key: string): void;
     clear(): void;
+    close(): void;
 }
 export default MemoryCacheEngine;
 //# sourceMappingURL=MemoryCacheEngine.d.ts.map

package/dist/esm/types/cache/engine/MemoryCacheEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryCacheEngine.d.ts","sourceRoot":"","sources":["../../../../../src/cache/engine/MemoryCacheEngine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAE7D,cAAM,iBAAkB,YAAW,YAAY;IAC7C,OAAO,CAAC,KAAK,CAA+G;;IAM5H,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS;IAQlF,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,SAAW,GAAG,IAAI;IAInG,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAKvB,KAAK,IAAK,IAAI;CAGf;AAED,eAAe,iBAAiB,CAAA"}
+{"version":3,"file":"MemoryCacheEngine.d.ts","sourceRoot":"","sources":["../../../../../src/cache/engine/MemoryCacheEngine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAE7D,cAAM,iBAAkB,YAAW,YAAY;IAC7C,OAAO,CAAC,KAAK,CAA+G;;IAM5H,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS;IASlF,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,SAAW,GAAG,IAAI;IAInG,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAKvB,KAAK,IAAK,IAAI;IAId,KAAK,IAAK,IAAI;CAGf;AAED,eAAe,iBAAiB,CAAA"}

package/dist/esm/types/cache/engine/RedisCacheEngine.d.ts

@@ -1,11 +1,13 @@
+import type { RedisOptions } from 'ioredis';
 import type ICacheEngine from '../../interfaces/ICacheEngine';
 declare class RedisCacheEngine implements ICacheEngine {
     private client;
-    constructor();
+    constructor(options: RedisOptions);
     get(key: string): Promise<Record<string, unknown> | Record<string, unknown>[] | undefined>;
     set(key: string, value: unknown, ttl?: number): Promise<void>;
     del(key: string): Promise<void>;
     clear(): Promise<void>;
+    close(): Promise<void>;
 }
 export default RedisCacheEngine;
 //# sourceMappingURL=RedisCacheEngine.d.ts.map

package/dist/esm/types/cache/engine/RedisCacheEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RedisCacheEngine.d.ts","sourceRoot":"","sources":["../../../../../src/cache/engine/RedisCacheEngine.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAE7D,cAAM,gBAAiB,YAAW,YAAY;IAC5C,OAAO,CAAC,MAAM,CAAO;;IAMf,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAQ3F,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,SAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAG9B;AAED,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"RedisCacheEngine.d.ts","sourceRoot":"","sources":["../../../../../src/cache/engine/RedisCacheEngine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAS,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAA;AAE7D,cAAM,gBAAiB,YAAW,YAAY;IAC5C,OAAO,CAAC,MAAM,CAAO;gBAER,OAAO,EAAE,YAAY;IAO5B,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAQ3F,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,SAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAKhE,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAIvB,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAG9B;AAED,eAAe,gBAAgB,CAAA"}

package/dist/esm/types/interfaces/ICacheEngine.d.ts

@@ -3,6 +3,7 @@ interface ICacheEngine {
     set: (key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: number) => Promise<void> | void;
     del: (key: string) => Promise<void> | void;
     clear: () => Promise<void> | void;
+    close: () => Promise<void> | void;
 }
 export default ICacheEngine;
 //# sourceMappingURL=ICacheEngine.d.ts.map

package/dist/esm/types/interfaces/ICacheEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ICacheEngine.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/ICacheEngine.ts"],"names":[],"mappings":"AAAA,UAAU,YAAY;IACpB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAA;IAChK,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACpH,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC1C,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAClC;AAED,eAAe,YAAY,CAAA"}
+{"version":3,"file":"ICacheEngine.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/ICacheEngine.ts"],"names":[],"mappings":"AAAA,UAAU,YAAY;IACpB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,SAAS,CAAA;IAChK,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACpH,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC1C,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IACjC,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;CAClC;AAED,eAAe,YAAY,CAAA"}

package/dist/esm/types/interfaces/ICacheOptions.d.ts

@@ -0,0 +1,8 @@
+import type { RedisOptions } from 'ioredis';
+interface ICacheOptions {
+    engine: 'memory' | 'redis';
+    engineOptions?: RedisOptions;
+    defaultTTL?: string;
+}
+export default ICacheOptions;
+//# sourceMappingURL=ICacheOptions.d.ts.map

package/dist/esm/types/interfaces/ICacheOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ICacheOptions.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/ICacheOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAE3C,UAAU,aAAa;IACrB,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC3B,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,eAAe,aAAa,CAAA"}

package/dist/esm/types/plugin.d.ts

@@ -1,12 +1,12 @@
 import type { Mongoose } from 'mongoose';
-import type ICacheMongooseOptions from './interfaces/ICacheMongooseOptions';
+import type ICacheOptions from './interfaces/ICacheOptions';
 declare module 'mongoose' {
     interface Query<ResultType, DocType, THelpers, RawDocType> {
-        cache: (this: Query<ResultType, DocType, THelpers, RawDocType>, ttl?: string) => this;
+        cache: (this: Query<ResultType, DocType, THelpers, RawDocType>, ttl?: string, customKey?: string) => this;
         _key?: string;
         getCacheKey: (this: Query<ResultType, DocType, THelpers, RawDocType>) => string;
-        _ttl: number;
-        getCacheTTL: (this: Query<ResultType, DocType, THelpers, RawDocType>) => number;
+        _ttl?: string;
+        getCacheTTL: (this: Query<ResultType, DocType, THelpers, RawDocType>) => string | undefined;
         op?: string;
         _fields?: unknown;
         _path?: unknown;
@@ -16,9 +16,11 @@ declare module 'mongoose' {
 declare class CacheMongoose {
     private static instance;
     private cache;
+    private cacheOptions;
     private constructor();
-    static init(mongoose: Mongoose, cacheMongooseOptions: ICacheMongooseOptions): CacheMongoose;
-    clearCache(customKey: string): Promise<void>;
+    static init(mongoose: Mongoose, cacheOptions: ICacheOptions): CacheMongoose;
+    clear(customKey?: string): Promise<void>;
+    close(): Promise<void>;
 }
 export default CacheMongoose;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/esm/types/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,KAAK,qBAAqB,MAAM,oCAAoC,CAAA;AAG3E,OAAO,QAAQ,UAAU,CAAC;IACxB,UAAU,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU;QACvD,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;QACrF,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK,MAAM,CAAA;QAC/E,IAAI,EAAE,MAAM,CAAA;QACZ,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK,MAAM,CAAA;QAC/E,EAAE,CAAC,EAAE,MAAM,CAAA;QACX,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,SAAS,CAAC,EAAE,OAAO,CAAA;KACpB;CACF;AAED,cAAM,aAAa;IAEjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA2B;IAClD,OAAO,CAAC,KAAK,CAAQ;IAErB,OAAO;WAKO,IAAI,CAAE,QAAQ,EAAE,QAAQ,EAAE,oBAAoB,EAAE,qBAAqB,GAAG,aAAa;IAgFtF,UAAU,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAO3D;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,KAAK,aAAa,MAAM,4BAA4B,CAAA;AAG3D,OAAO,QAAQ,UAAU,CAAC;IACxB,UAAU,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU;QACvD,KAAK,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;QACzG,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK,MAAM,CAAA;QAC/E,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,WAAW,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,CAAC,KAAK,MAAM,GAAG,SAAS,CAAA;QAC3F,EAAE,CAAC,EAAE,MAAM,CAAA;QACX,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,SAAS,CAAC,EAAE,OAAO,CAAA;KACpB;CACF;AAED,cAAM,aAAa;IAEjB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA2B;IAClD,OAAO,CAAC,KAAK,CAAQ;IACrB,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO;WAKO,IAAI,CAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,aAAa,GAAG,aAAa;IAiFtE,KAAK,CAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOzC,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;CAKrC;AAED,eAAe,aAAa,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-cache-mongoose",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Cache plugin for mongoose",
   "author": "Alex Eagle",
   "license": "MIT",
@@ -80,16 +80,16 @@
   "devDependencies": {
     "@shelf/jest-mongodb": "4.1.7",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.53",
-    "@swc/helpers": "0.5.0",
+    "@swc/core": "1.3.55",
+    "@swc/helpers": "0.5.1",
     "@swc/jest": "0.2.26",
     "@swc/register": "0.1.10",
     "@types/jest": "29.5.1",
     "@types/lodash": "4.14.194",
     "@types/ms": "^0.7.31",
-    "@types/node": "18.16.0",
-    "@typescript-eslint/eslint-plugin": "5.59.0",
-    "@typescript-eslint/parser": "5.59.0",
+    "@types/node": "18.16.1",
+    "@typescript-eslint/eslint-plugin": "5.59.1",
+    "@typescript-eslint/parser": "5.59.1",
     "eslint": "8.39.0",
     "eslint-config-standard": "17.0.0",
     "eslint-plugin-import": "2.27.5",
@@ -103,7 +103,6 @@
     "merge": "2.1.1",
     "mongoose": "6.10.5",
     "open-cli": "7.2.0",
-    "ts-node": "10.9.1",
     "typescript": "5.0.4"
   },
   "peerDependencies": {

package/src/cache/Cache.ts

@@ -1,26 +1,32 @@
 import ms from 'ms'
 
 import type ICacheEngine from '../interfaces/ICacheEngine'
+import type ICacheOptions from '../interfaces/ICacheOptions'
 
 import MemoryCacheEngine from './engine/MemoryCacheEngine'
 import RedisCacheEngine from './engine/RedisCacheEngine'
 
-export const engines = ['memory', 'redis'] as const
-
-class Cache {
-  private engine: ICacheEngine
+class CacheEngine {
+  private engine!: ICacheEngine
   private defaultTTL: number
+  private readonly engines = ['memory', 'redis'] as const
+
+  constructor (cacheOptions: ICacheOptions) {
+    if (!this.engines.includes(cacheOptions.engine)) {
+      throw new Error(`Invalid engine name: ${cacheOptions.engine}`)
+    }
 
-  constructor (engineName: 'memory' | 'redis', defaultTTL: string) {
-    if (!engines.includes(engineName)) {
-      throw new Error(`Invalid engine name: ${engineName}`)
+    if (cacheOptions.engine === 'redis' && !cacheOptions.engineOptions) {
+      throw new Error(`Engine options are required for ${cacheOptions.engine} engine`)
     }
 
-    this.defaultTTL = ms(defaultTTL)
+    this.defaultTTL = ms(cacheOptions.defaultTTL ?? '1 minute')
 
-    if (engineName === 'redis') {
-      this.engine = new RedisCacheEngine()
-    } else {
+    if (cacheOptions.engine === 'redis' && cacheOptions.engineOptions) {
+      this.engine = new RedisCacheEngine(cacheOptions.engineOptions)
+    }
+
+    if (cacheOptions.engine === 'memory') {
       this.engine = new MemoryCacheEngine()
     }
   }
@@ -29,8 +35,8 @@ class Cache {
     return await this.engine.get(key)
   }
 
-  async set (key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: number): Promise<void> {
-    const actualTTL = ttl ?? this.defaultTTL
+  async set (key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: string): Promise<void> {
+    const actualTTL = ttl ? ms(ttl) : this.defaultTTL
     return await this.engine.set(key, value, actualTTL)
   }
 
@@ -41,6 +47,10 @@ class Cache {
   async clear (): Promise<void> {
     return await this.engine.clear()
   }
+
+  async close (): Promise<void> {
+    return await this.engine.close()
+  }
 }
 
-export default Cache
+export default CacheEngine

package/src/cache/engine/MemoryCacheEngine.ts

@@ -10,6 +10,7 @@ class MemoryCacheEngine implements ICacheEngine {
   get (key: string): Record<string, unknown> | Record<string, unknown>[] | undefined {
     const item = this.cache[key]
     if (!item || item.expiresAt < Date.now()) {
+      this.del(key)
       return undefined
     }
     return item.value
@@ -27,6 +28,10 @@ class MemoryCacheEngine implements ICacheEngine {
   clear (): void {
     this.cache = {}
   }
+
+  close (): void {
+    // do nothing
+  }
 }
 
 export default MemoryCacheEngine

package/src/cache/engine/RedisCacheEngine.ts

@@ -1,14 +1,16 @@
 import IORedis from 'ioredis'
 
-import type { Redis } from 'ioredis'
-
+import type { Redis, RedisOptions } from 'ioredis'
 import type ICacheEngine from '../../interfaces/ICacheEngine'
 
 class RedisCacheEngine implements ICacheEngine {
   private client: Redis
 
-  constructor () {
-    this.client = new IORedis()
+  constructor (options: RedisOptions) {
+    if (!options.keyPrefix) {
+      options.keyPrefix = 'cache-mongoose:'
+    }
+    this.client = new IORedis(options)
   }
 
   async get (key: string): Promise<Record<string, unknown> | Record<string, unknown>[] | undefined> {
@@ -31,6 +33,10 @@ class RedisCacheEngine implements ICacheEngine {
   async clear (): Promise<void> {
     await this.client.flushdb()
   }
+
+  async close (): Promise<void> {
+    await this.client.quit()
+  }
 }
 
 export default RedisCacheEngine

package/src/interfaces/ICacheEngine.ts

@@ -3,6 +3,7 @@ interface ICacheEngine {
   set: (key: string, value: Record<string, unknown> | Record<string, unknown>[], ttl?: number) => Promise<void> | void
   del: (key: string) => Promise<void> | void
   clear: () => Promise<void> | void
+  close: () => Promise<void> | void
 }
 
 export default ICacheEngine

package/src/interfaces/ICacheOptions.ts

@@ -0,0 +1,9 @@
+import type { RedisOptions } from 'ioredis'
+
+interface ICacheOptions {
+  engine: 'memory' | 'redis',
+  engineOptions?: RedisOptions,
+  defaultTTL?: string
+}
+
+export default ICacheOptions

package/src/plugin.ts

@@ -1,18 +1,17 @@
 import _ from 'lodash'
-import ms from 'ms'
 import Cache from './cache/Cache'
 
 import type { Mongoose } from 'mongoose'
-import type ICacheMongooseOptions from './interfaces/ICacheMongooseOptions'
+import type ICacheOptions from './interfaces/ICacheOptions'
 import { getKey } from './crypto'
 
 declare module 'mongoose' {
   interface Query<ResultType, DocType, THelpers, RawDocType> {
-    cache: (this: Query<ResultType, DocType, THelpers, RawDocType>, ttl?: string) => this
+    cache: (this: Query<ResultType, DocType, THelpers, RawDocType>, ttl?: string, customKey?: string) => this
     _key?: string
     getCacheKey: (this: Query<ResultType, DocType, THelpers, RawDocType>) => string
-    _ttl: number
-    getCacheTTL: (this: Query<ResultType, DocType, THelpers, RawDocType>) => number
+    _ttl?: string
+    getCacheTTL: (this: Query<ResultType, DocType, THelpers, RawDocType>) => string | undefined
     op?: string
     _fields?: unknown
     _path?: unknown
@@ -24,17 +23,19 @@ class CacheMongoose {
   // eslint-disable-next-line no-use-before-define
   private static instance: CacheMongoose | undefined
   private cache!: Cache
+  private cacheOptions!: ICacheOptions
 
   private constructor () {
     // Private constructor to prevent external instantiation
   }
 
   // eslint-disable-next-line sonarjs/cognitive-complexity
-  public static init (mongoose: Mongoose, cacheMongooseOptions: ICacheMongooseOptions): CacheMongoose {
+  public static init (mongoose: Mongoose, cacheOptions: ICacheOptions): CacheMongoose {
     if (typeof mongoose.Model.hydrate !== 'function') throw new Error('Cache is only compatible with versions of mongoose that implement the `model.hydrate` method')
     if (!this.instance) {
       this.instance = new CacheMongoose()
-      this.instance.cache = new Cache(cacheMongooseOptions.engine, cacheMongooseOptions.defaultTTL = '1 minute')
+      this.instance.cache = new Cache(cacheOptions)
+      this.instance.cacheOptions = cacheOptions
 
       const cache = this.instance.cache
 
@@ -72,14 +73,14 @@ class CacheMongoose {
 
       // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
       mongoose.Query.prototype.cache = function (ttl?: string, customKey?: string) {
-        this._ttl = ms(ttl ?? '1 minute')
+        this._ttl = ttl
         this._key = customKey
         return this
       }
 
       // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
       mongoose.Query.prototype.exec = async function () {
-        if (!_.has(this, '_ttl')) {
+        if (!this._ttl) {
           return mongooseExec.apply(this)
         }
 
@@ -110,12 +111,17 @@ class CacheMongoose {
     return this.instance
   }
 
-  public async clearCache (customKey: string): Promise<void> {
+  public async clear (customKey?: string): Promise<void> {
     if (!customKey) {
-      await this.cache.clear()
-      return
+      return this.cache.clear()
+    }
+    return this.cache.del(customKey)
+  }
+
+  public async close (): Promise<void> {
+    if (this.cacheOptions.engine === 'redis') {
+      await this.cache.close()
     }
-    await this.cache.del(customKey)
   }
 }
 

package/tests/cache-options.test.ts

@@ -0,0 +1,80 @@
+import Cache from '../src/cache/Cache'
+
+import type ICacheOptions from '../src/interfaces/ICacheOptions'
+
+describe('Cache class tests', () => {
+  it('should create a new instance of Cache', () => {
+    const cacheOptions: ICacheOptions = {
+      engine: 'memory'
+    }
+
+    const cache = new Cache(cacheOptions)
+    expect(cache).toBeInstanceOf(Cache)
+    expect(cache).toHaveProperty('get')
+    expect(cache).toHaveProperty('set')
+    expect(cache).toHaveProperty('del')
+    expect(cache).toHaveProperty('clear')
+    expect(cache).toHaveProperty('close')
+  })
+
+  it('should throw an error if the cache engine is not supported', () => {
+    const cacheOptions: ICacheOptions = {
+      engine: 'not-supported'
+    }
+
+    expect(() => new Cache(cacheOptions)).toThrow(`Invalid engine name: ${cacheOptions.engine}`)
+  })
+
+  it('should throw an error if the cache engine is redis and no engine options are provided', () => {
+    const cacheOptions: ICacheOptions = {
+      engine: 'redis'
+    }
+
+    expect(() => new Cache(cacheOptions)).toThrow(`Engine options are required for ${cacheOptions.engine} engine`)
+  })
+
+  it('should create a new instance of Cache with redis engine', async () => {
+    const cacheOptions: ICacheOptions = {
+      engine: 'redis',
+      engineOptions: {
+        host: 'localhost',
+        port: 6379
+      },
+      defaultTTL: '10 minutes'
+    }
+
+    const cache = new Cache(cacheOptions)
+    expect(cache).toBeInstanceOf(Cache)
+    expect(cache).toHaveProperty('get')
+    expect(cache).toHaveProperty('set')
+    expect(cache).toHaveProperty('del')
+    expect(cache).toHaveProperty('clear')
+    expect(cache).toHaveProperty('close')
+
+    await cache.set('bob', { test: 'bob' })
+    await cache.set('john', { test: 'john' }, '1 minute')
+
+    const value = await cache.get('bob')
+    expect(value).toEqual({ test: 'bob' })
+
+    await cache.del('bob')
+    const clearBob = await cache.get('bob')
+    expect(clearBob).toBeUndefined()
+
+    const john = await cache.get('john')
+    expect(john).toEqual({ test: 'john' })
+
+    await cache.clear()
+    const clearJohn = await cache.get('john')
+    expect(clearJohn).toBeUndefined()
+
+    const mockSet = jest.fn()
+    cache.set = mockSet
+
+    await cache.set('bob', { test: 'bob' })
+    expect(mockSet).toHaveBeenCalled()
+    expect(mockSet).toHaveBeenCalledWith('bob', { test: 'bob' })
+
+    await cache.close()
+  })
+})

package/tests/cache.test.ts

@@ -1,14 +1,10 @@
 import mongoose, { model } from 'mongoose'
 import CacheMongoose from '../src/plugin'
 
-import type ICacheOptions from '../src/interfaces/ICacheMongooseOptions'
+import type ICacheOptions from '../src/interfaces/ICacheOptions'
 
 import UserSchema from './schemas/UserSchema'
 
-const cacheOptions: ICacheOptions = {
-  engine: 'memory'
-}
-
 describe('CacheMongoose', () => {
   const uri = `${globalThis.__MONGO_URI__}${globalThis.__MONGO_DB_NAME__}`
 
@@ -26,7 +22,90 @@ describe('CacheMongoose', () => {
     await mongoose.connection.collection('users').deleteMany({})
   })
 
-  it('should be defined', async () => {
+  describe('memory scenarios', () => {
+    const cacheOptions: ICacheOptions = {
+      engine: 'memory'
+    }
+
+    const cache = CacheMongoose.init(mongoose, cacheOptions)
+
+    it('should use memory cache', async () => {
+      const user = await User.create({
+        name: 'John Doe',
+        role: 'admin'
+      })
+
+      const user1 = await User.findById(user._id).cache()
+      await User.updateOne({ _id: user._id }, { name: 'John Doe 2' })
+      const user2 = await User.findById(user._id).cache()
+
+      expect(user1).not.toBeNull()
+      expect(user2).not.toBeNull()
+      expect(user1?._id).toEqual(user2?._id)
+      expect(user1?.name).not.toEqual(user2?.name)
+    })
+
+    it('should not use memory cache', async () => {
+      const user = await User.create({
+        name: 'John Doe',
+        role: 'admin'
+      })
+
+      const cache1 = await User.findById(user._id).cache().exec()
+      await User.updateOne({ _id: user._id }, { name: 'John Doe 2' })
+      await cache.clear()
+      const cache2 = await User.findById(user._id).cache().exec()
+
+      expect(cache1).not.toBeNull()
+      expect(cache2).not.toBeNull()
+      expect(cache1?._id).toEqual(cache2?._id)
+      expect(cache1?.name).not.toEqual(cache2?.name)
+    })
+
+    it('should use memory cache with custom key', async () => {
+      const user = await User.create({
+        name: 'John Doe',
+        role: 'admin'
+      })
+
+      const cache1 = await User.findById(user._id).cache('1 minute', 'test-custom-key').exec()
+      await User.updateOne({ _id: user._id }, { name: 'John Doe 2' })
+      const cache2 = await User.findById(user._id).cache('1 minute', 'test-custom-key').exec()
+
+      expect(cache1).not.toBeNull()
+      expect(cache2).not.toBeNull()
+      expect(cache1?._id).toEqual(cache2?._id)
+      expect(cache1?.name).toEqual(cache2?.name)
+    })
+
+    it('should use memory cache and clear custom key', async () => {
+      const user = await User.create({
+        name: 'John Doe',
+        role: 'admin'
+      })
+
+      const cache1 = await User.findById(user._id).cache('1 minute', 'test-custom-key-second').exec()
+      await User.updateOne({ _id: user._id }, { name: 'John Doe 2' })
+      await cache.clear('test-custom-key-second')
+      const cache2 = await User.findById(user._id).cache('1 minute', 'test-custom-key-second').exec()
+
+      expect(cache1).not.toBeNull()
+      expect(cache2).not.toBeNull()
+      expect(cache1?._id).toEqual(cache2?._id)
+      expect(cache1?.name).not.toEqual(cache2?.name)
+    })
+  })
+
+  it('should use redis cache', async () => {
+    const cacheOptions: ICacheOptions = {
+      engine: 'redis',
+      engineOptions: {
+        host: 'localhost',
+        port: 6379
+      },
+      defaultTTL: '6 minutes'
+    }
+
     const cache = CacheMongoose.init(mongoose, cacheOptions)
     expect(cache).toBeDefined()
 
@@ -35,17 +114,35 @@ describe('CacheMongoose', () => {
       role: 'admin'
     })
 
-    const cachedUser1 = await User.findById(user._id).cache().lean()
-    console.log(cachedUser1)
-
+    const cache1 = await User.findById(user._id).cache()
     await User.updateOne({ _id: user._id }, { name: 'John Doe 2' })
+    const cache2 = await User.findById(user._id).cache()
+
+    expect(cache1).not.toBeNull()
+    expect(cache2).not.toBeNull()
+    expect(cache1?._id).toEqual(cache2?._id)
+    expect(cache1?.name).not.toEqual(cache2?.name)
+
+    await User.create([
+      {
+        name: 'John Doe 3',
+        role: 'admin'
+      },
+      {
+        name: 'John Doe 4',
+        role: 'admin'
+      }
+    ])
+
+    const cache3 = await User.find({ role: 'admin' }).cache()
+    await User.updateMany({ role: 'admin' }, { name: 'John Doe 5' })
+    const cache4 = await User.find({ role: 'admin' }).cache()
 
-    const cachedUser2 = await User.findById(user._id).cache()
-    console.log(cachedUser2)
+    expect(cache3).not.toBeNull()
+    expect(cache4).not.toBeNull()
+    expect(cache3?.length).toEqual(cache4?.length)
+    expect(cache3?.[0].name).not.toEqual(cache4?.[0].name)
 
-    expect(cachedUser1).not.toBeNull()
-    expect(cachedUser2).not.toBeNull()
-    expect(cachedUser1?._id).toEqual(cachedUser2?._id)
-    expect(cachedUser1?.name).toEqual(cachedUser2?.name)
+    cache.close()
   })
 })

package/dist/cjs/interfaces/ICacheMongooseOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ICacheMongooseOptions.js","sourceRoot":"","sources":["../../../src/interfaces/ICacheMongooseOptions.ts"],"names":[],"mappings":""}

package/dist/cjs/types/interfaces/ICacheMongooseOptions.d.ts

@@ -1,10 +0,0 @@
-interface ICacheMongooseOptions {
-    engine: 'memory' | 'redis';
-    defaultTTL?: string;
-    port?: number;
-    host?: string;
-    password?: string;
-    client?: unknown;
-}
-export default ICacheMongooseOptions;
-//# sourceMappingURL=ICacheMongooseOptions.d.ts.map

package/dist/cjs/types/interfaces/ICacheMongooseOptions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ICacheMongooseOptions.d.ts","sourceRoot":"","sources":["../../../../src/interfaces/ICacheMongooseOptions.ts"],"names":[],"mappings":"AAAA,UAAU,qBAAqB;IAC7B,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAA;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,eAAe,qBAAqB,CAAA"}

package/dist/esm/interfaces/ICacheMongooseOptions.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=ICacheMongooseOptions.js.map

package/dist/esm/interfaces/ICacheMongooseOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ICacheMongooseOptions.js","sourceRoot":"","sources":["../../../src/interfaces/ICacheMongooseOptions.ts"],"names":[],"mappings":""}