@xnestjs/ioredis 0.2.0 → 0.3.0

package/cjs/redis-client.d.ts

@@ -1,10 +1,42 @@
 import Redis, { Cluster } from 'ioredis';
-import { RedisLock } from './redis-lock.js';
-export interface RedisClient extends Redis, RedisLock {
+export interface LockOptions {
+    expire?: number;
+    retryInterval?: number;
+    maxRetries?: number;
 }
-export interface RedisCluster extends Cluster, RedisLock {
-}
-export declare class RedisClient extends Redis {
-}
-export declare class RedisCluster extends Cluster {
+export declare class RedisClient {
+    readonly isCluster: boolean;
+    cluster?: Cluster;
+    standalone?: Redis;
+    constructor(args: Pick<RedisClient, 'isCluster' | 'cluster' | 'standalone'>);
+    get redis(): Redis | Cluster;
+    lockPrefix?: string;
+    /**
+     * Try to lock once
+     * @param {string} name redis-lock name
+     * @param {number} [expire] milliseconds, TTL for the redis key
+     * @returns {boolean} true: success, false: failed
+     */
+    tryLock(name: any, expire: any): Promise<boolean>;
+    /**
+     * lock, automatically retrying if failed
+     * @param {string} name redis-lock name
+     * @param {object} [options] Options
+     * @param {number} [options.expire=60000] TTL
+     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
+     * @param {number} [options.maxRetries=10] max times to retry
+     */
+    lock(name: string, options?: LockOptions): Promise<void>;
+    /**
+     * Unlock a redis-lock by name
+     * @param {string} name redis-lock name
+     */
+    unlock(name: any): Promise<void>;
+    /**
+     * Set TTL for a redis-lock
+     * @param {string} name redis-lock name
+     * @param {number} milliseconds TTL
+     */
+    setLockTTL(name: any, milliseconds: any): Promise<boolean>;
+    private _getLockKey;
 }

package/cjs/redis-client.js

@@ -1,15 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisCluster = exports.RedisClient = void 0;
-const tslib_1 = require("tslib");
-const ioredis_1 = tslib_1.__importStar(require("ioredis"));
-const redis_lock_js_1 = require("./redis-lock.js");
-class RedisClient extends ioredis_1.default {
+exports.RedisClient = void 0;
+const putil_varhelpers_1 = require("putil-varhelpers");
+class RedisClient {
+    constructor(args) {
+        Object.assign(this, args);
+    }
+    get redis() {
+        return (this.cluster || this.standalone);
+    }
+    /**
+     * Try to lock once
+     * @param {string} name redis-lock name
+     * @param {number} [expire] milliseconds, TTL for the redis key
+     * @returns {boolean} true: success, false: failed
+     */
+    async tryLock(name, expire) {
+        const result = await this.redis.set(this._getLockKey(name), '_lock_', 'PX', expire, 'NX');
+        return result !== null;
+    }
+    /**
+     * lock, automatically retrying if failed
+     * @param {string} name redis-lock name
+     * @param {object} [options] Options
+     * @param {number} [options.expire=60000] TTL
+     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
+     * @param {number} [options.maxRetries=10] max times to retry
+     */
+    async lock(name, options) {
+        const expire = (0, putil_varhelpers_1.toNumberDef)(options?.expire, 60000);
+        const retryInterval = (0, putil_varhelpers_1.toNumberDef)(options?.retryInterval, 100);
+        const maxRetries = (0, putil_varhelpers_1.toNumberDef)(options?.maxRetries, 10);
+        let retryTimes = 0;
+        // eslint-disable-next-line no-constant-condition
+        while (1) {
+            if (await this.tryLock(name, expire)) {
+                break;
+            }
+            else {
+                await sleepAsync(retryInterval);
+                if (retryTimes >= maxRetries) {
+                    throw new Error(`Redis lock "${name}" timed out`);
+                }
+                retryTimes++;
+            }
+        }
+    }
+    /**
+     * Unlock a redis-lock by name
+     * @param {string} name redis-lock name
+     */
+    async unlock(name) {
+        const s = 'if redis.call(\'get\', KEYS[1]) == ARGV[1] then return redis.call(\'del\', KEYS[1]) else return 0 end';
+        await this.redis.eval(s, 1, this._getLockKey(name), '_lock_');
+    }
+    /**
+     * Set TTL for a redis-lock
+     * @param {string} name redis-lock name
+     * @param {number} milliseconds TTL
+     */
+    async setLockTTL(name, milliseconds) {
+        const result = await this.redis.pexpire(this._getLockKey(name), milliseconds);
+        return !!result;
+    }
+    _getLockKey(name) {
+        return (this.lockPrefix || 'lock:') + name;
+    }
 }
 exports.RedisClient = RedisClient;
-class RedisCluster extends ioredis_1.Cluster {
+async function sleepAsync(ms) {
+    return new Promise(resolve => setTimeout(resolve, Number(ms)));
 }
-exports.RedisCluster = RedisCluster;
-Object.assign(RedisClient.prototype, redis_lock_js_1.RedisLock.prototype);
-Object.assign(RedisCluster.prototype, redis_lock_js_1.RedisLock.prototype);
 //# sourceMappingURL=redis-client.js.map

package/cjs/redis-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-client.ts"],"names":[],"mappings":";;;;AAAA,2DAAyC;AACzC,mDAA4C;AAQ5C,MAAa,WAAY,SAAQ,iBAAK;CACrC;AADD,kCACC;AAED,MAAa,YAAa,SAAQ,iBAAO;CACxC;AADD,oCACC;AAED,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,yBAAS,CAAC,SAAS,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,yBAAS,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-client.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAQ/C,MAAa,WAAW;IAKtB,YAAY,IAA+D;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAsB,CAAC;IAChE,CAAC;IAID;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1F,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAAqB;QACnD,MAAM,MAAM,GAAG,IAAA,8BAAW,EAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,IAAA,8BAAW,EAAC,OAAO,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAA,8BAAW,EAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAExD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,iDAAiD;QACjD,OAAO,CAAC,EAAE;YACR,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACpC,MAAM;aACP;iBAAM;gBACL,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;gBAChC,IAAI,UAAU,IAAI,UAAU,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,aAAa,CAAC,CAAC;iBACnD;gBACD,UAAU,EAAE,CAAC;aACd;SACF;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,IAAI;QACtB,MAAM,CAAC,GAAG,uGAAuG,CAAC;QAClH,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EACtB,YAAY,CACf,CAAC;QACF,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IAEO,WAAW,CAAC,IAAI;QACtB,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;CAEF;AAhFD,kCAgFC;AAED,KAAK,UAAU,UAAU,CAAC,EAAU;IAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}

package/cjs/redis-core.module.d.ts

@@ -5,11 +5,8 @@ export declare class RedisCoreModule implements OnApplicationShutdown {
     private readonly options;
     private readonly moduleRef;
     constructor(options: RedisClientOptions | RedisClusterOptions, moduleRef: ModuleRef);
-    static registerClient(options?: RedisClientOptions): DynamicModule;
-    static registerClientAsync(asyncOptions: RedisClientAsyncOptions): DynamicModule;
-    static registerCluster(options: RedisClusterOptions): DynamicModule;
-    static registerClusterAsync(asyncOptions: RedisClusterAsyncOptions): DynamicModule;
+    static forRoot(options: RedisClientOptions | RedisClusterOptions): DynamicModule;
+    static forRootAsync(asyncOptions: RedisClientAsyncOptions | RedisClusterAsyncOptions): DynamicModule;
     private static _createClient;
-    private static _createCluster;
     onApplicationShutdown(): Promise<void>;
 }

package/cjs/redis-core.module.js

@@ -4,22 +4,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisCoreModule = void 0;
 const tslib_1 = require("tslib");
 const crypto = tslib_1.__importStar(require("crypto"));
+const ioredis_1 = tslib_1.__importStar(require("ioredis"));
 const common_1 = require("@nestjs/common");
 const core_1 = require("@nestjs/core");
 const redis_constants_js_1 = require("./redis.constants.js");
 const redis_client_js_1 = require("./redis-client.js");
+const utils_js_1 = require("./utils.js");
 let RedisCoreModule = exports.RedisCoreModule = RedisCoreModule_1 = class RedisCoreModule {
     constructor(options, moduleRef) {
         this.options = options;
         this.moduleRef = moduleRef;
     }
-    static registerClient(options = {}) {
+    static forRoot(options) {
         const optionsProvider = {
             provide: redis_constants_js_1.IOREDIS_MODULE_OPTIONS,
             useValue: options
         };
+        const token = options.token || redis_client_js_1.RedisClient;
         const connectionProvider = {
-            provide: options.token || redis_client_js_1.RedisClient,
+            provide: token,
             useFactory: () => this._createClient(options)
         };
         return {
@@ -28,11 +31,12 @@ let RedisCoreModule = exports.RedisCoreModule = RedisCoreModule_1 = class RedisC
             exports: [connectionProvider]
         };
     }
-    static registerClientAsync(asyncOptions) {
+    static forRootAsync(asyncOptions) {
         if (!asyncOptions.useFactory)
             throw new Error('Invalid configuration. Must provide "useFactory"');
+        const token = asyncOptions.token || redis_client_js_1.RedisClient;
         const connectionProvider = {
-            provide: asyncOptions.token || redis_client_js_1.RedisClient,
+            provide: token,
             inject: [redis_constants_js_1.IOREDIS_MODULE_OPTIONS],
             useFactory: async (moduleOptions) => {
                 return this._createClient(moduleOptions);
@@ -56,113 +60,64 @@ let RedisCoreModule = exports.RedisCoreModule = RedisCoreModule_1 = class RedisC
             exports: [connectionProvider]
         };
     }
-    static registerCluster(options) {
-        const optionsProvider = {
-            provide: redis_constants_js_1.IOREDIS_MODULE_OPTIONS,
-            useValue: options
-        };
-        const connectionProvider = {
-            provide: options.token || redis_client_js_1.RedisCluster,
-            useFactory: () => this._createCluster(options)
-        };
-        return {
-            module: RedisCoreModule_1,
-            providers: [connectionProvider, optionsProvider],
-            exports: [connectionProvider]
-        };
-    }
-    static registerClusterAsync(asyncOptions) {
-        if (!asyncOptions.useFactory)
-            throw new Error('Invalid configuration. Must provide "useFactory"');
-        const connectionProvider = {
-            provide: asyncOptions.token || redis_client_js_1.RedisCluster,
-            inject: [redis_constants_js_1.IOREDIS_MODULE_OPTIONS],
-            useFactory: async (moduleOptions) => {
-                return this._createCluster(moduleOptions);
-            }
-        };
-        return {
-            module: RedisCoreModule_1,
-            imports: asyncOptions.imports,
-            providers: [
-                {
-                    provide: redis_constants_js_1.IOREDIS_MODULE_OPTIONS,
-                    useFactory: asyncOptions.useFactory,
-                    inject: asyncOptions.inject || []
-                },
-                connectionProvider,
-                {
-                    provide: redis_constants_js_1.IOREDIS_MODULE_TOKEN,
-                    useValue: crypto.randomUUID()
-                }
-            ],
-            exports: [connectionProvider]
-        };
-    }
     static async _createClient(options) {
-        if (options.host && options.host.includes('://')) {
-            const url = new URL(options.host);
-            options.host = url.hostname;
-            if (url.port)
-                options.port = parseInt(url.port, 10);
-            if (url.username)
-                options.username = url.username;
-            if (url.password)
-                options.password = url.password;
-            if (url.protocol === 'rediss:') { // @ts-ignore
-                options.tls = true;
-            }
-            const db = parseInt(url.pathname.substring(1), 10);
-            if (db > 0)
-                options.db = db;
+        if (options.host && options.nodes)
+            throw new TypeError(`You should set either "host" or "nodes", not both`);
+        const isCluster = (0, utils_js_1.isClusterOptions)(options);
+        let client;
+        if (isCluster) {
+            const clusterOptions = {
+                ...options
+            };
+            delete clusterOptions.name;
+            delete clusterOptions.nodes;
+            const cluster = new ioredis_1.Cluster(options.nodes, clusterOptions);
+            client = new redis_client_js_1.RedisClient({
+                isCluster,
+                cluster
+            });
         }
-        const client = new redis_client_js_1.RedisClient(options);
-        if (!options.lazyConnect) {
-            await new Promise((resolve, reject) => {
-                client.once('ready', () => {
-                    client.removeListener('error', reject);
-                    resolve();
-                });
-                client.once('error', (e) => {
-                    client.removeListener('ready', resolve);
-                    reject(e);
-                });
+        else {
+            if (options.host && options.host.includes('://')) {
+                const url = new URL(options.host);
+                options.host = url.hostname;
+                if (url.port)
+                    options.port = parseInt(url.port, 10);
+                if (url.username)
+                    options.username = url.username;
+                if (url.password)
+                    options.password = url.password;
+                if (url.protocol === 'rediss:') { // @ts-ignore
+                    options.tls = true;
+                }
+                const db = parseInt(url.pathname.substring(1), 10);
+                if (db > 0)
+                    options.db = db;
+            }
+            const standalone = new ioredis_1.default(options);
+            client = new redis_client_js_1.RedisClient({
+                isCluster,
+                standalone
             });
         }
-        return client;
-    }
-    static async _createCluster(options) {
-        const clusterOptions = {
-            ...options
-        };
-        delete clusterOptions.name;
-        delete clusterOptions.nodes;
-        const cluster = new redis_client_js_1.RedisCluster(options.nodes, clusterOptions);
         if (!options.lazyConnect) {
             await new Promise((resolve, reject) => {
-                cluster.once('ready', () => {
-                    cluster.removeListener('error', reject);
+                client.redis.once('ready', () => {
+                    client.redis.removeListener('error', reject);
                     resolve();
                 });
-                cluster.once('error', (e) => {
-                    cluster.removeListener('ready', resolve);
+                client.redis.once('error', (e) => {
+                    client.redis.removeListener('ready', resolve);
                     reject(e);
                 });
             });
         }
-        return cluster;
+        return client;
     }
     async onApplicationShutdown() {
         try {
             const client = this.moduleRef.get(this.options.token || redis_client_js_1.RedisClient);
-            await client.quit();
-        }
-        catch {
-            //
-        }
-        try {
-            const cluster = this.moduleRef.get(this.options.token || redis_client_js_1.RedisCluster);
-            await cluster.quit();
+            await client.redis.quit();
         }
         catch {
             //

package/cjs/redis-core.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-core.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-core.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redis-core.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-core.module.ts"],"names":[],"mappings":"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"}

package/cjs/redis.interface.d.ts

@@ -8,20 +8,20 @@ export interface RedisClientOptions extends RedisOptions {
      */
     token?: any;
 }
-export interface RedisClientAsyncOptions extends Pick<ModuleMetadata, 'imports'> {
+export interface RedisClusterOptions extends ClusterOptions {
     /**
      * Injection token
      */
     token?: any;
-    useFactory?: (...args: any[]) => Promise<RedisClientOptions> | RedisClientOptions;
-    inject?: any[];
+    nodes: ClusterNode[];
 }
-export interface RedisClusterOptions extends ClusterOptions {
+export interface RedisClientAsyncOptions extends Pick<ModuleMetadata, 'imports'> {
     /**
      * Injection token
      */
     token?: any;
-    nodes: ClusterNode[];
+    useFactory?: (...args: any[]) => Promise<RedisClientOptions> | RedisClientOptions;
+    inject?: any[];
 }
 export interface RedisClusterAsyncOptions extends Pick<ModuleMetadata, 'imports'> {
     /**

package/cjs/redis.module.d.ts

@@ -1,8 +1,6 @@
 import { DynamicModule } from '@nestjs/common';
 import { RedisClientAsyncOptions, RedisClientOptions, RedisClusterAsyncOptions, RedisClusterOptions } from './redis.interface.js';
 export declare class RedisModule {
-    static registerClient(options: RedisClientOptions): DynamicModule;
-    static registerClientAsync(options: RedisClientAsyncOptions): DynamicModule;
-    static registerCluster(options: RedisClusterOptions): DynamicModule;
-    static registerClusterAsync(options: RedisClusterAsyncOptions): DynamicModule;
+    static forRoot(options: RedisClientOptions | RedisClusterOptions): DynamicModule;
+    static forRootAsync(options: RedisClientAsyncOptions | RedisClusterAsyncOptions): DynamicModule;
 }

package/cjs/redis.module.js

@@ -6,28 +6,16 @@ const tslib_1 = require("tslib");
 const common_1 = require("@nestjs/common");
 const redis_core_module_js_1 = require("./redis-core.module.js");
 let RedisModule = exports.RedisModule = RedisModule_1 = class RedisModule {
-    static registerClient(options) {
+    static forRoot(options) {
         return {
             module: RedisModule_1,
-            imports: [redis_core_module_js_1.RedisCoreModule.registerClient(options)]
+            imports: [redis_core_module_js_1.RedisCoreModule.forRoot(options)]
         };
     }
-    static registerClientAsync(options) {
+    static forRootAsync(options) {
         return {
             module: RedisModule_1,
-            imports: [redis_core_module_js_1.RedisCoreModule.registerClientAsync(options)]
-        };
-    }
-    static registerCluster(options) {
-        return {
-            module: RedisModule_1,
-            imports: [redis_core_module_js_1.RedisCoreModule.registerCluster(options)]
-        };
-    }
-    static registerClusterAsync(options) {
-        return {
-            module: RedisModule_1,
-            imports: [redis_core_module_js_1.RedisCoreModule.registerClusterAsync(options)]
+            imports: [redis_core_module_js_1.RedisCoreModule.forRootAsync(options)]
         };
     }
 };

package/cjs/redis.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AAOvD,iEAAyD;AAGlD,IAAM,WAAW,yCAAjB,MAAM,WAAW;IACtB,MAAM,CAAC,cAAc,CAAC,OAA2B;QAC/C,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,sCAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACnD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,OAAgC;QACzD,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,sCAAe,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;SACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,OAA4B;QACjD,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,sCAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACpD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,OAAiC;QAC3D,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,sCAAe,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;SACzD,CAAC;IACJ,CAAC;CACF,CAAA;sBA5BY,WAAW;IADvB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,WAAW,CA4BvB"}
+{"version":3,"file":"redis.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AAOvD,iEAAyD;AAGlD,IAAM,WAAW,yCAAjB,MAAM,WAAW;IACtB,MAAM,CAAC,OAAO,CAAC,OAAiD;QAC9D,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,sCAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,OAA2D;QAC7E,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,sCAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACjD,CAAC;IACJ,CAAC;CAEF,CAAA;sBAfY,WAAW;IADvB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,WAAW,CAevB"}

package/cjs/utils.d.ts

@@ -0,0 +1,2 @@
+import { RedisClusterOptions } from './redis.interface.js';
+export declare function isClusterOptions(options: any): options is RedisClusterOptions;

package/cjs/utils.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isClusterOptions = void 0;
+function isClusterOptions(options) {
+    return options && typeof options === 'object' && Array.isArray(options.nodes);
+}
+exports.isClusterOptions = isClusterOptions;
+//# sourceMappingURL=utils.js.map

package/cjs/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../packages/ioredis/src/utils.ts"],"names":[],"mappings":";;;AAEA,SAAgB,gBAAgB,CAAC,OAAO;IACtC,OAAO,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAFD,4CAEC"}

package/esm/redis-client.js

@@ -1,9 +1,70 @@
-import Redis, { Cluster } from 'ioredis';
-import { RedisLock } from './redis-lock.js';
-export class RedisClient extends Redis {
+import { toNumberDef } from 'putil-varhelpers';
+export class RedisClient {
+    constructor(args) {
+        Object.assign(this, args);
+    }
+    get redis() {
+        return (this.cluster || this.standalone);
+    }
+    /**
+     * Try to lock once
+     * @param {string} name redis-lock name
+     * @param {number} [expire] milliseconds, TTL for the redis key
+     * @returns {boolean} true: success, false: failed
+     */
+    async tryLock(name, expire) {
+        const result = await this.redis.set(this._getLockKey(name), '_lock_', 'PX', expire, 'NX');
+        return result !== null;
+    }
+    /**
+     * lock, automatically retrying if failed
+     * @param {string} name redis-lock name
+     * @param {object} [options] Options
+     * @param {number} [options.expire=60000] TTL
+     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
+     * @param {number} [options.maxRetries=10] max times to retry
+     */
+    async lock(name, options) {
+        const expire = toNumberDef(options?.expire, 60000);
+        const retryInterval = toNumberDef(options?.retryInterval, 100);
+        const maxRetries = toNumberDef(options?.maxRetries, 10);
+        let retryTimes = 0;
+        // eslint-disable-next-line no-constant-condition
+        while (1) {
+            if (await this.tryLock(name, expire)) {
+                break;
+            }
+            else {
+                await sleepAsync(retryInterval);
+                if (retryTimes >= maxRetries) {
+                    throw new Error(`Redis lock "${name}" timed out`);
+                }
+                retryTimes++;
+            }
+        }
+    }
+    /**
+     * Unlock a redis-lock by name
+     * @param {string} name redis-lock name
+     */
+    async unlock(name) {
+        const s = 'if redis.call(\'get\', KEYS[1]) == ARGV[1] then return redis.call(\'del\', KEYS[1]) else return 0 end';
+        await this.redis.eval(s, 1, this._getLockKey(name), '_lock_');
+    }
+    /**
+     * Set TTL for a redis-lock
+     * @param {string} name redis-lock name
+     * @param {number} milliseconds TTL
+     */
+    async setLockTTL(name, milliseconds) {
+        const result = await this.redis.pexpire(this._getLockKey(name), milliseconds);
+        return !!result;
+    }
+    _getLockKey(name) {
+        return (this.lockPrefix || 'lock:') + name;
+    }
 }
-export class RedisCluster extends Cluster {
+async function sleepAsync(ms) {
+    return new Promise(resolve => setTimeout(resolve, Number(ms)));
 }
-Object.assign(RedisClient.prototype, RedisLock.prototype);
-Object.assign(RedisCluster.prototype, RedisLock.prototype);
 //# sourceMappingURL=redis-client.js.map

package/esm/redis-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQ5C,MAAM,OAAO,WAAY,SAAQ,KAAK;CACrC;AAED,MAAM,OAAO,YAAa,SAAQ,OAAO;CACxC;AAED,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"redis-client.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAQ/C,MAAM,OAAO,WAAW;IAKtB,YAAY,IAA+D;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,UAAU,CAAsB,CAAC;IAChE,CAAC;IAID;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM;QAC/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QAC1F,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAAqB;QACnD,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAExD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,iDAAiD;QACjD,OAAO,CAAC,EAAE;YACR,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACpC,MAAM;aACP;iBAAM;gBACL,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;gBAChC,IAAI,UAAU,IAAI,UAAU,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,aAAa,CAAC,CAAC;iBACnD;gBACD,UAAU,EAAE,CAAC;aACd;SACF;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAC,IAAI;QACtB,MAAM,CAAC,GAAG,uGAAuG,CAAC;QAClH,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAChE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY;QACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CACnC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EACtB,YAAY,CACf,CAAC;QACF,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IAEO,WAAW,CAAC,IAAI;QACtB,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;CAEF;AAED,KAAK,UAAU,UAAU,CAAC,EAAU;IAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}

package/esm/redis-core.module.js

@@ -1,22 +1,25 @@
 var RedisCoreModule_1;
 import { __decorate, __metadata, __param } from "tslib";
 import * as crypto from 'crypto';
+import Redis, { Cluster } from 'ioredis';
 import { Global, Inject, Module, } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { IOREDIS_MODULE_OPTIONS, IOREDIS_MODULE_TOKEN } from './redis.constants.js';
-import { RedisClient, RedisCluster } from './redis-client.js';
+import { RedisClient } from './redis-client.js';
+import { isClusterOptions } from './utils.js';
 export let RedisCoreModule = RedisCoreModule_1 = class RedisCoreModule {
     constructor(options, moduleRef) {
         this.options = options;
         this.moduleRef = moduleRef;
     }
-    static registerClient(options = {}) {
+    static forRoot(options) {
         const optionsProvider = {
             provide: IOREDIS_MODULE_OPTIONS,
             useValue: options
         };
+        const token = options.token || RedisClient;
         const connectionProvider = {
-            provide: options.token || RedisClient,
+            provide: token,
             useFactory: () => this._createClient(options)
         };
         return {
@@ -25,11 +28,12 @@ export let RedisCoreModule = RedisCoreModule_1 = class RedisCoreModule {
             exports: [connectionProvider]
         };
     }
-    static registerClientAsync(asyncOptions) {
+    static forRootAsync(asyncOptions) {
         if (!asyncOptions.useFactory)
             throw new Error('Invalid configuration. Must provide "useFactory"');
+        const token = asyncOptions.token || RedisClient;
         const connectionProvider = {
-            provide: asyncOptions.token || RedisClient,
+            provide: token,
             inject: [IOREDIS_MODULE_OPTIONS],
             useFactory: async (moduleOptions) => {
                 return this._createClient(moduleOptions);
@@ -53,113 +57,64 @@ export let RedisCoreModule = RedisCoreModule_1 = class RedisCoreModule {
             exports: [connectionProvider]
         };
     }
-    static registerCluster(options) {
-        const optionsProvider = {
-            provide: IOREDIS_MODULE_OPTIONS,
-            useValue: options
-        };
-        const connectionProvider = {
-            provide: options.token || RedisCluster,
-            useFactory: () => this._createCluster(options)
-        };
-        return {
-            module: RedisCoreModule_1,
-            providers: [connectionProvider, optionsProvider],
-            exports: [connectionProvider]
-        };
-    }
-    static registerClusterAsync(asyncOptions) {
-        if (!asyncOptions.useFactory)
-            throw new Error('Invalid configuration. Must provide "useFactory"');
-        const connectionProvider = {
-            provide: asyncOptions.token || RedisCluster,
-            inject: [IOREDIS_MODULE_OPTIONS],
-            useFactory: async (moduleOptions) => {
-                return this._createCluster(moduleOptions);
-            }
-        };
-        return {
-            module: RedisCoreModule_1,
-            imports: asyncOptions.imports,
-            providers: [
-                {
-                    provide: IOREDIS_MODULE_OPTIONS,
-                    useFactory: asyncOptions.useFactory,
-                    inject: asyncOptions.inject || []
-                },
-                connectionProvider,
-                {
-                    provide: IOREDIS_MODULE_TOKEN,
-                    useValue: crypto.randomUUID()
-                }
-            ],
-            exports: [connectionProvider]
-        };
-    }
     static async _createClient(options) {
-        if (options.host && options.host.includes('://')) {
-            const url = new URL(options.host);
-            options.host = url.hostname;
-            if (url.port)
-                options.port = parseInt(url.port, 10);
-            if (url.username)
-                options.username = url.username;
-            if (url.password)
-                options.password = url.password;
-            if (url.protocol === 'rediss:') { // @ts-ignore
-                options.tls = true;
-            }
-            const db = parseInt(url.pathname.substring(1), 10);
-            if (db > 0)
-                options.db = db;
+        if (options.host && options.nodes)
+            throw new TypeError(`You should set either "host" or "nodes", not both`);
+        const isCluster = isClusterOptions(options);
+        let client;
+        if (isCluster) {
+            const clusterOptions = {
+                ...options
+            };
+            delete clusterOptions.name;
+            delete clusterOptions.nodes;
+            const cluster = new Cluster(options.nodes, clusterOptions);
+            client = new RedisClient({
+                isCluster,
+                cluster
+            });
         }
-        const client = new RedisClient(options);
-        if (!options.lazyConnect) {
-            await new Promise((resolve, reject) => {
-                client.once('ready', () => {
-                    client.removeListener('error', reject);
-                    resolve();
-                });
-                client.once('error', (e) => {
-                    client.removeListener('ready', resolve);
-                    reject(e);
-                });
+        else {
+            if (options.host && options.host.includes('://')) {
+                const url = new URL(options.host);
+                options.host = url.hostname;
+                if (url.port)
+                    options.port = parseInt(url.port, 10);
+                if (url.username)
+                    options.username = url.username;
+                if (url.password)
+                    options.password = url.password;
+                if (url.protocol === 'rediss:') { // @ts-ignore
+                    options.tls = true;
+                }
+                const db = parseInt(url.pathname.substring(1), 10);
+                if (db > 0)
+                    options.db = db;
+            }
+            const standalone = new Redis(options);
+            client = new RedisClient({
+                isCluster,
+                standalone
             });
         }
-        return client;
-    }
-    static async _createCluster(options) {
-        const clusterOptions = {
-            ...options
-        };
-        delete clusterOptions.name;
-        delete clusterOptions.nodes;
-        const cluster = new RedisCluster(options.nodes, clusterOptions);
         if (!options.lazyConnect) {
             await new Promise((resolve, reject) => {
-                cluster.once('ready', () => {
-                    cluster.removeListener('error', reject);
+                client.redis.once('ready', () => {
+                    client.redis.removeListener('error', reject);
                     resolve();
                 });
-                cluster.once('error', (e) => {
-                    cluster.removeListener('ready', resolve);
+                client.redis.once('error', (e) => {
+                    client.redis.removeListener('ready', resolve);
                     reject(e);
                 });
             });
         }
-        return cluster;
+        return client;
     }
     async onApplicationShutdown() {
         try {
             const client = this.moduleRef.get(this.options.token || RedisClient);
-            await client.quit();
-        }
-        catch {
-            //
-        }
-        try {
-            const cluster = this.moduleRef.get(this.options.token || RedisCluster);
-            await cluster.quit();
+            await client.redis.quit();
         }
         catch {
             //

package/esm/redis-core.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-core.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-core.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redis-core.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-core.module.ts"],"names":[],"mappings":"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"}

package/esm/redis.module.js

@@ -3,28 +3,16 @@ import { __decorate } from "tslib";
 import { Module } from '@nestjs/common';
 import { RedisCoreModule } from './redis-core.module.js';
 export let RedisModule = RedisModule_1 = class RedisModule {
-    static registerClient(options) {
+    static forRoot(options) {
         return {
             module: RedisModule_1,
-            imports: [RedisCoreModule.registerClient(options)]
+            imports: [RedisCoreModule.forRoot(options)]
         };
     }
-    static registerClientAsync(options) {
+    static forRootAsync(options) {
         return {
             module: RedisModule_1,
-            imports: [RedisCoreModule.registerClientAsync(options)]
-        };
-    }
-    static registerCluster(options) {
-        return {
-            module: RedisModule_1,
-            imports: [RedisCoreModule.registerCluster(options)]
-        };
-    }
-    static registerClusterAsync(options) {
-        return {
-            module: RedisModule_1,
-            imports: [RedisCoreModule.registerClusterAsync(options)]
+            imports: [RedisCoreModule.forRootAsync(options)]
         };
     }
 };

package/esm/redis.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis.module.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAOvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGlD,WAAM,WAAW,mBAAjB,MAAM,WAAW;IACtB,MAAM,CAAC,cAAc,CAAC,OAA2B;QAC/C,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;SACnD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,OAAgC;QACzD,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,eAAe,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;SACxD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,OAA4B;QACjD,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,eAAe,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACpD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,OAAiC;QAC3D,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,eAAe,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;SACzD,CAAC;IACJ,CAAC;CACF,CAAA;AA5BY,WAAW;IADvB,MAAM,CAAC,EAAE,CAAC;GACE,WAAW,CA4BvB"}
+{"version":3,"file":"redis.module.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis.module.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAOvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGlD,WAAM,WAAW,mBAAjB,MAAM,WAAW;IACtB,MAAM,CAAC,OAAO,CAAC,OAAiD;QAC9D,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,OAA2D;QAC7E,OAAO;YACL,MAAM,EAAE,aAAW;YACnB,OAAO,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;SACjD,CAAC;IACJ,CAAC;CAEF,CAAA;AAfY,WAAW;IADvB,MAAM,CAAC,EAAE,CAAC;GACE,WAAW,CAevB"}

package/esm/utils.js

@@ -0,0 +1,4 @@
+export function isClusterOptions(options) {
+    return options && typeof options === 'object' && Array.isArray(options.nodes);
+}
+//# sourceMappingURL=utils.js.map

package/esm/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../packages/ioredis/src/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,gBAAgB,CAAC,OAAO;IACtC,OAAO,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xnestjs/ioredis",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "NestJS extension library for ioredis",
   "author": "Panates",
   "license": "MIT",

package/types/redis-client.d.ts

@@ -1,10 +1,42 @@
 import Redis, { Cluster } from 'ioredis';
-import { RedisLock } from './redis-lock.js';
-export interface RedisClient extends Redis, RedisLock {
+export interface LockOptions {
+    expire?: number;
+    retryInterval?: number;
+    maxRetries?: number;
 }
-export interface RedisCluster extends Cluster, RedisLock {
-}
-export declare class RedisClient extends Redis {
-}
-export declare class RedisCluster extends Cluster {
+export declare class RedisClient {
+    readonly isCluster: boolean;
+    cluster?: Cluster;
+    standalone?: Redis;
+    constructor(args: Pick<RedisClient, 'isCluster' | 'cluster' | 'standalone'>);
+    get redis(): Redis | Cluster;
+    lockPrefix?: string;
+    /**
+     * Try to lock once
+     * @param {string} name redis-lock name
+     * @param {number} [expire] milliseconds, TTL for the redis key
+     * @returns {boolean} true: success, false: failed
+     */
+    tryLock(name: any, expire: any): Promise<boolean>;
+    /**
+     * lock, automatically retrying if failed
+     * @param {string} name redis-lock name
+     * @param {object} [options] Options
+     * @param {number} [options.expire=60000] TTL
+     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
+     * @param {number} [options.maxRetries=10] max times to retry
+     */
+    lock(name: string, options?: LockOptions): Promise<void>;
+    /**
+     * Unlock a redis-lock by name
+     * @param {string} name redis-lock name
+     */
+    unlock(name: any): Promise<void>;
+    /**
+     * Set TTL for a redis-lock
+     * @param {string} name redis-lock name
+     * @param {number} milliseconds TTL
+     */
+    setLockTTL(name: any, milliseconds: any): Promise<boolean>;
+    private _getLockKey;
 }

package/types/redis-core.module.d.ts

@@ -5,11 +5,8 @@ export declare class RedisCoreModule implements OnApplicationShutdown {
     private readonly options;
     private readonly moduleRef;
     constructor(options: RedisClientOptions | RedisClusterOptions, moduleRef: ModuleRef);
-    static registerClient(options?: RedisClientOptions): DynamicModule;
-    static registerClientAsync(asyncOptions: RedisClientAsyncOptions): DynamicModule;
-    static registerCluster(options: RedisClusterOptions): DynamicModule;
-    static registerClusterAsync(asyncOptions: RedisClusterAsyncOptions): DynamicModule;
+    static forRoot(options: RedisClientOptions | RedisClusterOptions): DynamicModule;
+    static forRootAsync(asyncOptions: RedisClientAsyncOptions | RedisClusterAsyncOptions): DynamicModule;
     private static _createClient;
-    private static _createCluster;
     onApplicationShutdown(): Promise<void>;
 }

package/types/redis.interface.d.ts

@@ -8,20 +8,20 @@ export interface RedisClientOptions extends RedisOptions {
      */
     token?: any;
 }
-export interface RedisClientAsyncOptions extends Pick<ModuleMetadata, 'imports'> {
+export interface RedisClusterOptions extends ClusterOptions {
     /**
      * Injection token
      */
     token?: any;
-    useFactory?: (...args: any[]) => Promise<RedisClientOptions> | RedisClientOptions;
-    inject?: any[];
+    nodes: ClusterNode[];
 }
-export interface RedisClusterOptions extends ClusterOptions {
+export interface RedisClientAsyncOptions extends Pick<ModuleMetadata, 'imports'> {
     /**
      * Injection token
      */
     token?: any;
-    nodes: ClusterNode[];
+    useFactory?: (...args: any[]) => Promise<RedisClientOptions> | RedisClientOptions;
+    inject?: any[];
 }
 export interface RedisClusterAsyncOptions extends Pick<ModuleMetadata, 'imports'> {
     /**

package/types/redis.module.d.ts

@@ -1,8 +1,6 @@
 import { DynamicModule } from '@nestjs/common';
 import { RedisClientAsyncOptions, RedisClientOptions, RedisClusterAsyncOptions, RedisClusterOptions } from './redis.interface.js';
 export declare class RedisModule {
-    static registerClient(options: RedisClientOptions): DynamicModule;
-    static registerClientAsync(options: RedisClientAsyncOptions): DynamicModule;
-    static registerCluster(options: RedisClusterOptions): DynamicModule;
-    static registerClusterAsync(options: RedisClusterAsyncOptions): DynamicModule;
+    static forRoot(options: RedisClientOptions | RedisClusterOptions): DynamicModule;
+    static forRootAsync(options: RedisClientAsyncOptions | RedisClusterAsyncOptions): DynamicModule;
 }

package/types/utils.d.ts

@@ -0,0 +1,2 @@
+import { RedisClusterOptions } from './redis.interface.js';
+export declare function isClusterOptions(options: any): options is RedisClusterOptions;

package/cjs/redis-lock.d.ts

@@ -1,39 +0,0 @@
-import Redis, { Cluster } from 'ioredis';
-export interface LockOptions {
-    expire?: number;
-    retryInterval?: number;
-    maxRetries?: number;
-}
-type This = RedisLock & (Redis | Cluster);
-export declare class RedisLock {
-    lockPrefix?: string;
-    /**
-     * Try to lock once
-     * @param {string} name redis-lock name
-     * @param {number} [expire] milliseconds, TTL for the redis key
-     * @returns {boolean} true: success, false: failed
-     */
-    tryLock(this: This, name: any, expire: any): Promise<boolean>;
-    /**
-     * lock, automatically retrying if failed
-     * @param {string} name redis-lock name
-     * @param {object} [options] Options
-     * @param {number} [options.expire=60000] TTL
-     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
-     * @param {number} [options.maxRetries=10] max times to retry
-     */
-    lock(this: This, name: string, options?: LockOptions): Promise<void>;
-    /**
-     * Unlock a redis-lock by name
-     * @param {string} name redis-lock name
-     */
-    unlock(this: This, name: any): Promise<void>;
-    /**
-     * Set TTL for a redis-lock
-     * @param {string} name redis-lock name
-     * @param {number} milliseconds TTL
-     */
-    setLockTTL(this: This, name: any, milliseconds: any): Promise<boolean>;
-    private _getLockKey;
-}
-export {};

package/cjs/redis-lock.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisLock = void 0;
-const putil_varhelpers_1 = require("putil-varhelpers");
-class RedisLock {
-    /**
-     * Try to lock once
-     * @param {string} name redis-lock name
-     * @param {number} [expire] milliseconds, TTL for the redis key
-     * @returns {boolean} true: success, false: failed
-     */
-    async tryLock(name, expire) {
-        const result = await this.set(this._getLockKey(name), '_lock_', 'PX', expire, 'NX');
-        return result !== null;
-    }
-    /**
-     * lock, automatically retrying if failed
-     * @param {string} name redis-lock name
-     * @param {object} [options] Options
-     * @param {number} [options.expire=60000] TTL
-     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
-     * @param {number} [options.maxRetries=10] max times to retry
-     */
-    async lock(name, options) {
-        const expire = (0, putil_varhelpers_1.toNumberDef)(options?.expire, 60000);
-        const retryInterval = (0, putil_varhelpers_1.toNumberDef)(options?.retryInterval, 100);
-        const maxRetries = (0, putil_varhelpers_1.toNumberDef)(options?.maxRetries, 10);
-        let retryTimes = 0;
-        // eslint-disable-next-line no-constant-condition
-        while (1) {
-            if (await this.tryLock(name, expire)) {
-                break;
-            }
-            else {
-                await sleepAsync(retryInterval);
-                if (retryTimes >= maxRetries) {
-                    throw new Error(`Redis lock "${name}" timed out`);
-                }
-                retryTimes++;
-            }
-        }
-    }
-    /**
-     * Unlock a redis-lock by name
-     * @param {string} name redis-lock name
-     */
-    async unlock(name) {
-        const s = 'if redis.call(\'get\', KEYS[1]) == ARGV[1] then return redis.call(\'del\', KEYS[1]) else return 0 end';
-        await this.eval(s, 1, this._getLockKey(name), '_lock_');
-    }
-    /**
-     * Set TTL for a redis-lock
-     * @param {string} name redis-lock name
-     * @param {number} milliseconds TTL
-     */
-    async setLockTTL(name, milliseconds) {
-        const result = await this.pexpire(this._getLockKey(name), milliseconds);
-        return !!result;
-    }
-    _getLockKey(name) {
-        return (this.lockPrefix || 'lock:') + name;
-    }
-}
-exports.RedisLock = RedisLock;
-async function sleepAsync(ms) {
-    return new Promise(resolve => setTimeout(resolve, Number(ms)));
-}
-//# sourceMappingURL=redis-lock.js.map

package/cjs/redis-lock.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redis-lock.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-lock.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAU/C,MAAa,SAAS;IAIpB;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAa,IAAI,EAAE,MAAM;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACpF,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,IAAI,CAAa,IAAY,EAAE,OAAqB;QAC/D,MAAM,MAAM,GAAG,IAAA,8BAAW,EAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,IAAA,8BAAW,EAAC,OAAO,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAA,8BAAW,EAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAExD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,iDAAiD;QACjD,OAAO,CAAC,EAAE;YACR,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACpC,MAAM;aACP;iBAAM;gBACL,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;gBAChC,IAAI,UAAU,IAAI,UAAU,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,aAAa,CAAC,CAAC;iBACnD;gBACD,UAAU,EAAE,CAAC;aACd;SACF;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAa,IAAI;QAClC,MAAM,CAAC,GAAG,uGAAuG,CAAC;QAClH,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,UAAU,CAAa,IAAI,EAAE,YAAY;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC;QACxE,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IAEO,WAAW,CAAC,IAAI;QACtB,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;CAEF;AAlED,8BAkEC;AAED,KAAK,UAAU,UAAU,CAAC,EAAU;IAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}

package/esm/redis-lock.js

@@ -1,64 +0,0 @@
-import { toNumberDef } from 'putil-varhelpers';
-export class RedisLock {
-    /**
-     * Try to lock once
-     * @param {string} name redis-lock name
-     * @param {number} [expire] milliseconds, TTL for the redis key
-     * @returns {boolean} true: success, false: failed
-     */
-    async tryLock(name, expire) {
-        const result = await this.set(this._getLockKey(name), '_lock_', 'PX', expire, 'NX');
-        return result !== null;
-    }
-    /**
-     * lock, automatically retrying if failed
-     * @param {string} name redis-lock name
-     * @param {object} [options] Options
-     * @param {number} [options.expire=60000] TTL
-     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
-     * @param {number} [options.maxRetries=10] max times to retry
-     */
-    async lock(name, options) {
-        const expire = toNumberDef(options?.expire, 60000);
-        const retryInterval = toNumberDef(options?.retryInterval, 100);
-        const maxRetries = toNumberDef(options?.maxRetries, 10);
-        let retryTimes = 0;
-        // eslint-disable-next-line no-constant-condition
-        while (1) {
-            if (await this.tryLock(name, expire)) {
-                break;
-            }
-            else {
-                await sleepAsync(retryInterval);
-                if (retryTimes >= maxRetries) {
-                    throw new Error(`Redis lock "${name}" timed out`);
-                }
-                retryTimes++;
-            }
-        }
-    }
-    /**
-     * Unlock a redis-lock by name
-     * @param {string} name redis-lock name
-     */
-    async unlock(name) {
-        const s = 'if redis.call(\'get\', KEYS[1]) == ARGV[1] then return redis.call(\'del\', KEYS[1]) else return 0 end';
-        await this.eval(s, 1, this._getLockKey(name), '_lock_');
-    }
-    /**
-     * Set TTL for a redis-lock
-     * @param {string} name redis-lock name
-     * @param {number} milliseconds TTL
-     */
-    async setLockTTL(name, milliseconds) {
-        const result = await this.pexpire(this._getLockKey(name), milliseconds);
-        return !!result;
-    }
-    _getLockKey(name) {
-        return (this.lockPrefix || 'lock:') + name;
-    }
-}
-async function sleepAsync(ms) {
-    return new Promise(resolve => setTimeout(resolve, Number(ms)));
-}
-//# sourceMappingURL=redis-lock.js.map

package/esm/redis-lock.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redis-lock.js","sourceRoot":"","sources":["../../../packages/ioredis/src/redis-lock.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAU/C,MAAM,OAAO,SAAS;IAIpB;;;;;OAKG;IACI,KAAK,CAAC,OAAO,CAAa,IAAI,EAAE,MAAM;QAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;QACpF,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,IAAI,CAAa,IAAY,EAAE,OAAqB;QAC/D,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QAExD,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,iDAAiD;QACjD,OAAO,CAAC,EAAE;YACR,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBACpC,MAAM;aACP;iBAAM;gBACL,MAAM,UAAU,CAAC,aAAa,CAAC,CAAC;gBAChC,IAAI,UAAU,IAAI,UAAU,EAAE;oBAC5B,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,aAAa,CAAC,CAAC;iBACnD;gBACD,UAAU,EAAE,CAAC;aACd;SACF;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM,CAAa,IAAI;QAClC,MAAM,CAAC,GAAG,uGAAuG,CAAC;QAClH,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,UAAU,CAAa,IAAI,EAAE,YAAY;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC;QACxE,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IAEO,WAAW,CAAC,IAAI;QACtB,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC;IAC7C,CAAC;CAEF;AAED,KAAK,UAAU,UAAU,CAAC,EAAU;IAClC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC"}

package/types/redis-lock.d.ts

@@ -1,39 +0,0 @@
-import Redis, { Cluster } from 'ioredis';
-export interface LockOptions {
-    expire?: number;
-    retryInterval?: number;
-    maxRetries?: number;
-}
-type This = RedisLock & (Redis | Cluster);
-export declare class RedisLock {
-    lockPrefix?: string;
-    /**
-     * Try to lock once
-     * @param {string} name redis-lock name
-     * @param {number} [expire] milliseconds, TTL for the redis key
-     * @returns {boolean} true: success, false: failed
-     */
-    tryLock(this: This, name: any, expire: any): Promise<boolean>;
-    /**
-     * lock, automatically retrying if failed
-     * @param {string} name redis-lock name
-     * @param {object} [options] Options
-     * @param {number} [options.expire=60000] TTL
-     * @param {number} [options.retryInterval=100] milliseconds, the interval to retry if failed
-     * @param {number} [options.maxRetries=10] max times to retry
-     */
-    lock(this: This, name: string, options?: LockOptions): Promise<void>;
-    /**
-     * Unlock a redis-lock by name
-     * @param {string} name redis-lock name
-     */
-    unlock(this: This, name: any): Promise<void>;
-    /**
-     * Set TTL for a redis-lock
-     * @param {string} name redis-lock name
-     * @param {number} milliseconds TTL
-     */
-    setLockTTL(this: This, name: any, milliseconds: any): Promise<boolean>;
-    private _getLockKey;
-}
-export {};