@digitalwalletcorp/redis-pooling 1.0.1 → 1.1.1

package/README.md

@@ -10,10 +10,10 @@ Designed for both server-side Node.js applications and cron-style background job
 * **Connection Pooling**: Efficiently manage multiple Redis connections with `min` and `max` pool size configuration.
 * **Safe Acquire/Release**: Guaranteed handling of Redis client lifecycle with optional database selection (`SELECT dbIndex`).
 * **Custom Utilities**: Built-in helper methods like `getKeys(pattern)` and `deleteKeys(pattern)` for convenient Redis key operations.
-* **Connection Validation**: PING-based validation before borrowing from the pool.
+* **Connection Validation**: PING-based validation with timeout before borrowing from the pool.
 * **TLS Support**: Optional TLS configuration for secure Redis connections.
 
-#### 📦 Instllation
+#### 📦 Installation
 
 ```bash
 npm install @digitalwalletcorp/redis-pooling
@@ -28,15 +28,13 @@ yarn add @digitalwalletcorp/redis-pooling
 This pattern is ideal for short-lived Node.js scripts, such as cron jobs, where a pool is created, used, and destroyed within a single run.
 
 ```typescript
-import { createRedisPool } from '@digitalwalletcorp/redis-pooling';
+import { RedisPool } from '@digitalwalletcorp/redis-pooling';
 
-const redisPool = createRedisPool({
+const redisPool = new RedisPool({
   url: 'redis://localhost:6379',
-  db: 0,
+  dbIndex: 0,
   max: 10,
-  min: 2,
-  connectTimeout: 5000,
-  enableTls: false
+  min: 2
 });
 
 async function main() {
@@ -60,15 +58,13 @@ For long-running web applications, a singleton Redis pool ensures efficient reus
 
 `@/server/singleton/redis-pooling`
 ```typescript
-import { createRedisPool } from '@digitalwalletcorp/redis-pooling';
+import { RedisPool } from '@digitalwalletcorp/redis-pooling';
 
-export const redisPool = createRedisPool({
+export const redisPool = new RedisPool({
   url: 'redis://localhost:6379',
-  db: 0,
+  dbIndex: 0,
   max: 20,
-  min: 5,
-  connectTimeout: 5000,
-  enableTls: false
+  min: 5
 });
 ```
 
@@ -89,7 +85,7 @@ async function handleRequest() {
 
 ##### Example 3: Using Custom Methods (`getKeys`, `deleteKeys`)
 
-`ManagedRedisClient` extends the standard `ioredis` client with convenient helper methods.
+`RedisClient` extends the standard `ioredis` client with convenient helper methods.
 `getKeys` and `deleteKeys` use `SCAN` and `UNLINK` internally to avoid blocking Redis with large datasets (unlike `KEYS`).
 All other standard Redis commands remain available.
 
@@ -105,8 +101,10 @@ async function manageCache() {
     console.log('Matching keys:', keys);
 
     // Delete all matching keys using UNLINK
-    const deleted = await client.deleteKeys('cache:*');
-    console.log(`Deleted ${deleted} keys`);
+    const delResults = await client.deleteKeys('cache:*');
+    const succeeded = delResults.filter(a => a.status === 'fulfilled');
+    const delCount = succeeded.reduce((acc, cur) => acc + (cur as PromiseFulfilledResult<number>).value, 0);
+    console.log(`Deleted ${delCount} keys`);
   } finally {
     await redisPool.release(client);
   }
@@ -115,35 +113,59 @@ async function manageCache() {
 
 #### 📚 API Reference
 
-##### `createRedisPool(config: RedisConfig): ManagedRedisPool`
+##### `new RedisPool(config: RedisConfig)`
 
-Creates a managed Redis pool.
+Creates a Redis connection pool.
 
 | Property         | Type    | Default  | Description                            |
 | ---------------- | ------- | -------- | -------------------------------------- |
 | `url`            | string  | required | Redis connection URL.                  |
-| `db`             | number  | 0        | Default Redis database index.          |
-| `connectTimeout` | number  | 5000     | Connection timeout in milliseconds.    |
+| `dbIndex`        | number  | 0        | Default Redis database index.          |
 | `max`            | number  | 10       | Maximum number of clients in the pool. |
 | `min`            | number  | 0        | Minimum number of clients in the pool. |
+| `connectTimeout` | number  | 5000     | Connection timeout in milliseconds.    |
+| `testOnBorrow`   | boolean | true     | Enable connection validate on borrow.  |
 | `enableTls`      | boolean | false    | Enable TLS for Redis connection.       |
 
-##### `ManagedRedisPool` Methods
+##### `RedisPool` Methods
 
 | Method                                | Signature                     | Description                                                                            |
 | ------------------------------------- | ----------------------------- | -------------------------------------------------------------------------------------- |
-| `acquire(dbIndex?: number)`           | `Promise<ManagedRedisClient>` | Acquire a Redis client from the pool. Optionally switch to a different database index. |
-| `release(client: ManagedRedisClient)` | `Promise<void>`               | Release the Redis client back to the pool.                                             |
-| `destroy()`                           | `Promise<void>`               | Drain and clear all connections in the pool.                                           |
+| `acquire(dbIndex?: number)`           | `Promise<RedisClient>` | Acquire a Redis client from the pool. Optionally switch to a different database index. |
+| `release(client: RedisClient)`        | `Promise<void>`        | Release the Redis client back to the pool.                                             |
+| `destroy()`                           | `Promise<void>`        | Drain and clear all connections in the pool.                                           |
 
-##### `ManagedRedisClient` Methods
+##### `RedisClient` Methods
 
 Extends the standard `ioredis` `Redis` client with additional helpers:
 
 | Method                        | Signature           | Description                                                                                     |
 | ----------------------------- | ------------------- | ----------------------------------------------------------------------------------------------- |
 | `getKeys(pattern: string)`    | `Promise<string[]>` | Scan and return all keys matching a pattern.                                                    |
-| `deleteKeys(pattern: string)` | `Promise<number>`   | Scan and delete all keys matching a pattern using `UNLINK`. Returns the number of deleted keys. |
+| `deleteKeys(pattern: string)` | `Promise<PromiseSettledResult<number>[]>`   | Scan and delete all keys matching a pattern using `UNLINK`. Returns an array of results, one for each batch processed by `UNLINK`. Each result contains the number of keys deleted in that batch. |
+
+#### 🗄 Database Index Handling
+
+This library provides a Redis connection pool capable of managing Redis clients
+connected to different database indexes (`SELECT db`).
+
+**Calling `acquire(dbIndex)`:**
+
+> When `dbIndex` is specified, the acquired client will be connected to the specified database index.
+
+**Calling `acquire()` without `dbIndex`:**
+> When `dbIndex` is not specified, the acquired client will be connected to the default database index configured when the pool was created via **createRedisPool({ dbIndex })**.
+
+```typescript
+// The default db index: 2
+const pool = new RedisPool({ url, dbIndex: 2 });
+
+// With dbIndex: connected to DB 1
+const client1 = await pool.acquire(1);
+
+// Without dbIndex: connected to DB 2 (default)
+const client2 = await pool.acquire();
+```
 
 ---
 #### 💡 Notes

package/lib/redis-pooling.d.ts

@@ -1,27 +1,43 @@
 import { Redis } from 'ioredis';
 export interface RedisConfig {
     url: string;
-    db?: number;
+    dbIndex?: number;
     connectTimeout?: number;
     max?: number;
     min?: number;
     testOnBorrow?: boolean;
     enableTls?: boolean;
 }
-export interface ManagedRedisPool {
-    acquire(dbIndex?: number): Promise<ManagedRedisClient>;
-    release(client?: Redis): Promise<void>;
-    destroy(timeoutMs?: number): Promise<void>;
-}
-export interface ManagedRedisClient extends Redis {
+export interface RedisClient extends Redis {
     getKeys(pattern: string): Promise<string[]>;
-    deleteKeys(pattern: string): Promise<number>;
+    deleteKeys(pattern: string): Promise<PromiseSettledResult<number>[]>;
     _originalDbIndex?: number;
 }
-/**
- * Redisコネクションプーリングを生成する
- *
- * @param {RedisConfig} config
- * @returns {ManagedRedisPool}
- */
-export declare const createRedisPool: (config: RedisConfig) => ManagedRedisPool;
+export declare class RedisPool {
+    private readonly url;
+    private readonly db;
+    private readonly connectTimeout;
+    private readonly max;
+    private readonly min;
+    private readonly testOnBorrow;
+    private readonly tls?;
+    private readonly poolMap;
+    private initialized;
+    private readonly debug;
+    constructor(config: RedisConfig, options?: {
+        debug?: boolean;
+    });
+    acquire(dbIndex?: number): Promise<RedisClient>;
+    release(client?: RedisClient): Promise<void>;
+    destroy(timeoutMs?: number): Promise<void>;
+    /**
+     * 初めてacquireが呼ばれた時に、指定された接続情報で接続できるかチェックする
+     *
+     * @param {number} dbIndex
+     */
+    private checkConnectivity;
+    private ping;
+    debugLog(...args: any[]): void;
+    private getPool;
+    private createSingleDbPool;
+}

package/lib/redis-pooling.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRedisPool = void 0;
+exports.RedisPool = void 0;
 const ioredis_1 = require("ioredis");
 const genericPool = __importStar(require("generic-pool"));
 const logHeader = '[RedisPooling]';
@@ -41,56 +41,188 @@ const DEFAULT_CONNECT_TIMEOUT = 5000;
 const DEFAULT_MAX_POOLING_SIZE = 10;
 const DEFAULT_MIN_POOLING_SIZE = 0;
 const REDIS_PING_TIMEOUT_MS = 3000; // 3秒
-/**
- * Redisコネクションプーリングを生成する
- *
- * @param {RedisConfig} config
- * @returns {ManagedRedisPool}
- */
-const createRedisPool = (config) => {
-    const url = config.url;
-    const db = config.db ?? 0;
-    const connectTimeout = config.connectTimeout ?? DEFAULT_CONNECT_TIMEOUT;
-    const max = config.max ?? DEFAULT_MAX_POOLING_SIZE;
-    const min = config.min ?? DEFAULT_MIN_POOLING_SIZE;
-    const testOnBorrow = config.testOnBorrow ?? true;
-    if (!url) {
-        throw new Error(`${logHeader} Redis connection url is required.`);
+class RedisPool {
+    url;
+    db;
+    connectTimeout;
+    max;
+    min;
+    testOnBorrow;
+    tls;
+    poolMap = new Map();
+    initialized = false;
+    debug;
+    constructor(config, options) {
+        if (!config.url) {
+            throw new Error(`${logHeader} Redis connection url is required.`);
+        }
+        this.url = config.url;
+        this.db = config.dbIndex ?? 0;
+        this.connectTimeout = config.connectTimeout ?? DEFAULT_CONNECT_TIMEOUT;
+        this.max = config.max ?? DEFAULT_MAX_POOLING_SIZE;
+        this.min = config.min ?? DEFAULT_MIN_POOLING_SIZE;
+        this.testOnBorrow = config.testOnBorrow ?? true;
+        this.tls = config.enableTls ? { rejectUnauthorized: false } : undefined;
+        this.debug = options?.debug ?? false;
     }
-    // dbIndexごとのプール管理
-    const poolMap = new Map();
-    const createSingleDbPool = (dbIndex) => {
+    async acquire(dbIndex) {
+        if (!this.initialized) {
+            // 初回acquire呼び出し時のみ接続チェックを行う
+            // ホスト不正やパスワード不正による接続不可等を検知する
+            // ※ generic-poolのfactoryの方に入ってしまうとエラーを呼び出し元に伝播させることが難しいため、プールとは別の接続でチェックする
+            await this.checkConnectivity(dbIndex ?? this.db);
+            this.initialized = true;
+        }
+        const index = dbIndex ?? this.db;
+        const pool = this.getPool(index);
+        try {
+            const client = await pool.acquire();
+            this.debugLog(logHeader, `Redis client ${index} has been acquired.`);
+            return client;
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+    async release(client) {
+        if (client) {
+            const dbIndex = client._originalDbIndex ?? this.db;
+            const pool = this.poolMap.get(dbIndex);
+            if (!pool) {
+                return;
+            }
+            let needDestroy = false;
+            switch (true) {
+                case client.status === 'end':
+                case client.status === 'close':
+                    // Redisクライアントの状態が再利用できない場合はプールから破棄
+                    needDestroy = true;
+                    break;
+                case client.status === 'ready':
+                    try {
+                        // 元のDBインデックスに戻す
+                        await client.select(dbIndex);
+                    }
+                    catch (error) {
+                        // selectに失敗する→Redisクライアントが不正な状態にあると判断できるのでプールから破棄
+                        needDestroy = true;
+                    }
+                    break;
+                default:
+            }
+            if (needDestroy) {
+                // Redisクライアントの破棄
+                await pool.destroy(client);
+                this.debugLog(logHeader, `Redis client ${dbIndex} destroyed due to invalid status.`);
+            }
+            else {
+                // Redisクライアントの返却
+                await pool.release(client);
+                this.debugLog(logHeader, `Redis client ${dbIndex} released.`);
+            }
+        }
+    }
+    async destroy(timeoutMs = 5000) {
+        for (const [dbIndex, pool] of this.poolMap.entries()) {
+            this.debugLog(logHeader, `Destroying Redis pool for DB index ${dbIndex}...`);
+            await Promise.race([
+                (async () => {
+                    await pool.drain();
+                    await pool.clear();
+                })(),
+                new Promise((_, reject) => {
+                    setTimeout(() => reject(new Error(`${logHeader} Timeout while draining Redis pool for DB index ${dbIndex}`)), timeoutMs);
+                })
+            ]);
+            this.debugLog(logHeader, `Redis pool for DB index ${dbIndex} destroyed.`);
+            this.poolMap.delete(dbIndex);
+        }
+    }
+    /**
+     * 初めてacquireが呼ばれた時に、指定された接続情報で接続できるかチェックする
+     *
+     * @param {number} dbIndex
+     */
+    async checkConnectivity(dbIndex) {
+        const client = new ioredis_1.Redis(this.url, {
+            db: dbIndex,
+            retryStrategy: () => null, // 再接続無効
+            reconnectOnError: () => false, // 再接続無効
+            connectTimeout: this.connectTimeout,
+            tls: this.tls,
+        });
+        return new Promise((resolve, reject) => {
+            const cleanup = () => {
+                client.quit().catch(() => client.disconnect());
+            };
+            client.once('ready', () => {
+                cleanup();
+                resolve();
+            });
+            client.once('error', (error) => {
+                cleanup();
+                reject(error);
+            });
+        });
+    }
+    async ping(client) {
+        try {
+            this.debugLog(logHeader, 'start validate');
+            const timeout = new Promise((_, reject) => {
+                setTimeout(() => reject(new Error(`Redis PING timeout after ${REDIS_PING_TIMEOUT_MS}ms`)), REDIS_PING_TIMEOUT_MS);
+            });
+            await Promise.race([
+                client.ping(),
+                timeout
+            ]);
+            this.debugLog(logHeader, 'ping succeeded');
+            return client.status === 'ready';
+        }
+        catch (error) {
+            this.debugLog(logHeader, 'ping failed');
+            return false;
+        }
+    }
+    debugLog(...args) {
+        if (this.debug) {
+            console.debug(...args);
+        }
+    }
+    getPool(dbIndex) {
+        let pool = this.poolMap.get(dbIndex);
+        if (!pool) {
+            pool = this.createSingleDbPool(dbIndex);
+            this.poolMap.set(dbIndex, pool);
+        }
+        return pool;
+    }
+    createSingleDbPool(dbIndex) {
         const factory = {
             create: async () => {
-                let client;
-                try {
-                    client = new ioredis_1.Redis(url, {
-                        db: dbIndex,
-                        connectTimeout: connectTimeout,
-                        keepAlive: 1,
-                        enableOfflineQueue: true,
-                        tls: config.enableTls ? { rejectUnauthorized: false } : undefined,
-                        retryStrategy: (times) => {
-                            const delay = Math.min(times * 50, 1000);
-                            if (process.env.NODE_ENV !== 'test') {
-                                console.debug(logHeader, `retry strategy called ${times} times. delaying ${delay}ms`);
-                            }
-                            return delay;
-                        },
-                        reconnectOnError: (error) => {
-                            process.emitWarning(`${logHeader} detected error (on reconnect). ${error.message}`);
-                            return true;
+                const client = new ioredis_1.Redis(this.url, {
+                    db: dbIndex,
+                    connectTimeout: this.connectTimeout,
+                    keepAlive: 1,
+                    enableOfflineQueue: true,
+                    tls: this.tls,
+                    retryStrategy: (times) => {
+                        const delay = Math.min(times * 50, 1000);
+                        if (process.env.NODE_ENV !== 'test') {
+                            this.debugLog(logHeader, `retry strategy called ${times} times. delaying ${delay}ms`);
                         }
-                    });
-                }
-                catch (error) {
-                    console.error(error);
-                    throw error;
-                }
+                        return delay;
+                    },
+                    reconnectOnError: (error) => {
+                        process.emitWarning(`${logHeader} detected error (on reconnectOnError). ${error.message}`);
+                        return true;
+                    }
+                });
                 client._originalDbIndex = dbIndex;
                 client.on('error', error => {
                     process.emitWarning(`${logHeader} detected error (on error). ${error.message}`);
                 });
+                // カスタムメソッド内の処理でthis.debugLogなどが参照できなくなるため、poolのインスタンスを変数キャプチャする
+                const poolInstance = this;
                 // カスタムメソッド START
                 /**
                  * 指定されたパターンに一致するキーを Redis から全て取得する
@@ -112,19 +244,29 @@ const createRedisPool = (config) => {
                         });
                         stream.on('end', () => resolve(allKeys));
                         stream.on('error', (err) => {
-                            console.error(logHeader, `Error during getKeys scan for pattern '${pattern}'.`, err);
                             reject(err);
                         });
                     });
                 };
                 /**
                  * 指定されたパターンに一致するキーを Redis から全て削除する (UNLINKを使用)
+                 * 返却値の配列サイズはscanStreamが'data'を受信した回数で、この受信したデータで削除された件数がvalueに設定されている。
+                 *
+                 * [
+                 *   { status: 'fulfilled', value: 100 }, // 1バッチ目で100件削除
+                 *   { status: 'fulfilled', value: 80 } // 2バッチ目で80件削除
+                 * ]
+                 *
+                 *  成功した件数は以下のようにして取得可能
+                 *
+                 * const delResults = await redisClient.deleteKeys('pattern');
+                 * const delCount = delResults.filter(a => a.status === 'fulfilled')
+                 *   .reduce((acc, cur) => acc + (cur as PromiseFulfilledResult<number>).value, 0);
                  *
                  * @param {string} pattern
-                 * @returns {Promise<number>}
+                 * @returns {Promise<PromiseSettledResult<number>>}
                  */
                 client.deleteKeys = async function (pattern) {
-                    let deletedCount = 0;
                     const stream = this.scanStream({
                         match: pattern,
                         count: 1000 // 1度にスキャンする件数
@@ -134,24 +276,17 @@ const createRedisPool = (config) => {
                         stream.on('data', async (keys) => {
                             if (keys.length) {
                                 tasks.push((async () => {
-                                    try {
-                                        // UNLINK を使用し、現在のインスタンス (this) で実行
-                                        const unlinkResult = await this.unlink(...keys);
-                                        deletedCount += unlinkResult;
-                                        console.debug(logHeader, `Deleted ${unlinkResult} keys in a batch for pattern '${pattern}'. Total: ${deletedCount}`);
-                                    }
-                                    catch (error) {
-                                        process.emitWarning(`${logHeader} Error during UNLINK for pattern '${pattern}'. ${error.message}`);
-                                    }
+                                    // UNLINK を使用し、現在のインスタンス (this) で実行
+                                    const unlinkResult = await this.unlink(...keys);
+                                    return unlinkResult;
                                 })());
                             }
                         });
                         stream.on('end', async () => {
-                            await Promise.all(tasks);
-                            resolve(deletedCount);
+                            const results = await Promise.allSettled(tasks);
+                            resolve(results);
                         });
                         stream.on('error', (err) => {
-                            console.error(logHeader, `Error during deleteKeys scan for pattern '${pattern}'.`, err);
                             reject(err);
                         });
                     });
@@ -180,108 +315,23 @@ const createRedisPool = (config) => {
             destroy: async (client) => {
                 try {
                     await client.quit();
-                    console.debug(logHeader, 'client quit');
+                    this.debugLog(logHeader, 'client quit');
                 }
                 catch (error) {
                     client.disconnect();
-                    console.debug(logHeader, 'client disconnected');
+                    this.debugLog(logHeader, 'client disconnected');
                 }
             },
             validate: async (client) => {
-                try {
-                    console.debug(logHeader, 'start validate');
-                    const timeout = new Promise((_, reject) => {
-                        setTimeout(() => reject(new Error(`Redis PING timeout after ${REDIS_PING_TIMEOUT_MS}ms`)), REDIS_PING_TIMEOUT_MS);
-                    });
-                    await Promise.race([
-                        client.ping(),
-                        timeout
-                    ]);
-                    console.debug(logHeader, 'ping succeeded');
-                    return client.status === 'ready';
-                }
-                catch (error) {
-                    console.debug(logHeader, 'ping failed');
-                    return false;
-                }
+                return await this.ping(client);
             }
         };
         return genericPool.createPool(factory, {
-            max,
-            min,
-            testOnBorrow
+            max: this.max,
+            min: this.min,
+            testOnBorrow: this.testOnBorrow
         });
-    };
-    const getPool = (dbIndex) => {
-        let pool = poolMap.get(dbIndex);
-        if (!pool) {
-            pool = createSingleDbPool(dbIndex);
-            poolMap.set(dbIndex, pool);
-        }
-        return pool;
-    };
-    return {
-        acquire: async (dbIndex) => {
-            const index = dbIndex ?? 0;
-            const pool = getPool(index);
-            const client = await pool.acquire();
-            console.debug(logHeader, `Redis client ${index} has been acquired.`);
-            return client;
-        },
-        release: async (client) => {
-            if (client) {
-                const dbIndex = client._originalDbIndex ?? db;
-                let needDestroy = false;
-                switch (true) {
-                    case client.status === 'end':
-                    case client.status === 'close':
-                        // Redisクライアントの状態が再利用できない場合はプールから破棄
-                        needDestroy = true;
-                        break;
-                    case client.status === 'ready':
-                        try {
-                            // 元のDBインデックスに戻す
-                            await client.select(dbIndex);
-                        }
-                        catch (error) {
-                            // selectに失敗する→Redisクライアントが不正な状態にあると判断できるのでプールから破棄
-                            needDestroy = true;
-                        }
-                        break;
-                    default:
-                }
-                const pool = poolMap.get(dbIndex);
-                if (pool) {
-                    if (needDestroy) {
-                        // Redisクライアントの破棄
-                        await pool.destroy(client);
-                        console.debug(logHeader, `Redis client ${dbIndex} destroyed due to invalid status.`);
-                    }
-                    else {
-                        // Redisクライアントの返却
-                        await pool.release(client);
-                        console.debug(logHeader, `Redis client ${dbIndex} released.`);
-                    }
-                }
-            }
-        },
-        destroy: async (timeoutMs = 5000) => {
-            for (const [dbIndex, pool] of poolMap.entries()) {
-                console.debug(logHeader, `Destroying Redis pool for DB index ${dbIndex}...`);
-                await Promise.race([
-                    (async () => {
-                        await pool.drain();
-                        await pool.clear();
-                    })(),
-                    new Promise((_, reject) => {
-                        setTimeout(() => reject(new Error(`${logHeader} Timeout while draining Redis pool for DB index ${dbIndex}`)), timeoutMs);
-                    })
-                ]);
-                console.debug(logHeader, `Redis pool for DB index ${dbIndex} destroyed.`);
-                poolMap.delete(dbIndex);
-            }
-        }
-    };
-};
-exports.createRedisPool = createRedisPool;
+    }
+}
+exports.RedisPool = RedisPool;
 //# sourceMappingURL=redis-pooling.js.map

package/lib/redis-pooling.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-pooling.js","sourceRoot":"","sources":["../src/redis-pooling.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"redis-pooling.js","sourceRoot":"","sources":["../src/redis-pooling.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAgC;AAChC,0DAA4C;AAkB5C,MAAM,SAAS,GAAG,gBAAgB,CAAC;AACnC,MAAM,uBAAuB,GAAG,IAAI,CAAC;AACrC,MAAM,wBAAwB,GAAG,EAAE,CAAC;AACpC,MAAM,wBAAwB,GAAG,CAAC,CAAC;AACnC,MAAM,qBAAqB,GAAG,IAAI,CAAC,CAAC,KAAK;AAEzC,MAAa,SAAS;IAEH,GAAG,CAAS;IACZ,EAAE,CAAS;IACX,cAAc,CAAS;IACvB,GAAG,CAAS;IACZ,GAAG,CAAS;IACZ,YAAY,CAAU;IACtB,GAAG,CAAiC;IAEpC,OAAO,GAAG,IAAI,GAAG,EAAyC,CAAC;IACpE,WAAW,GAAG,KAAK,CAAC;IACX,KAAK,CAAU;IAEhC,YAAY,MAAmB,EAAE,OAEhC;QACC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,GAAG,SAAS,oCAAoC,CAAC,CAAC;QACpE,CAAC;QAED,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,uBAAuB,CAAC;QACvE,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,wBAAwB,CAAC;QAClD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,wBAAwB,CAAC;QAClD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC;QAChD,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAExE,IAAI,CAAC,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,KAAK,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAgB;QACnC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,4BAA4B;YAC5B,6BAA6B;YAC7B,2EAA2E;YAC3E,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAEpC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,KAAK,qBAAqB,CAAC,CAAC;YACrE,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,MAAoB;QACvC,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,IAAI,IAAI,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACvC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YACD,IAAI,WAAW,GAAG,KAAK,CAAC;YACxB,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,MAAM,CAAC,MAAM,KAAK,KAAK,CAAC;gBAC7B,KAAK,MAAM,CAAC,MAAM,KAAK,OAAO;oBAC5B,mCAAmC;oBACnC,WAAW,GAAG,IAAI,CAAC;oBACnB,MAAM;gBACR,KAAK,MAAM,CAAC,MAAM,KAAK,OAAO;oBAC5B,IAAI,CAAC;wBACH,gBAAgB;wBAChB,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC/B,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,kDAAkD;wBAClD,WAAW,GAAG,IAAI,CAAC;oBACrB,CAAC;oBACD,MAAM;gBACR,QAAQ;YACV,CAAC;YACD,IAAI,WAAW,EAAE,CAAC;gBAChB,iBAAiB;gBACjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,OAAO,mCAAmC,CAAC,CAAC;YACvF,CAAC;iBAAM,CAAC;gBACN,iBAAiB;gBACjB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,OAAO,YAAY,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI;QACnC,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,sCAAsC,OAAO,KAAK,CAAC,CAAC;YAC7E,MAAM,OAAO,CAAC,IAAI,CAAC;gBACjB,CAAC,KAAK,IAAI,EAAE;oBACV,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;oBACnB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;gBACrB,CAAC,CAAC,EAAE;gBACJ,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;oBAC9B,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,SAAS,mDAAmD,OAAO,EAAE,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;gBAC3H,CAAC,CAAC;aACH,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,2BAA2B,OAAO,aAAa,CAAC,CAAC;YAC1E,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,iBAAiB,CAAC,OAAe;QAC7C,MAAM,MAAM,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YACjC,EAAE,EAAE,OAAO;YACX,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,EAAM,QAAQ;YACvC,gBAAgB,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,QAAQ;YACvC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,GAAG,EAAE,IAAI,CAAC,GAAG;SACd,CAAC,CAAC;QAEH,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,OAAO,GAAG,GAAG,EAAE;gBACnB,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;YACjD,CAAC,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;gBACxB,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC7B,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,MAAa;QAC9B,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YAC3C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBAC9C,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,4BAA4B,qBAAqB,IAAI,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;YACpH,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,IAAI,CAAC;gBACjB,MAAM,CAAC,IAAI,EAAE;gBACb,OAAO;aACR,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;YAC3C,OAAO,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC;QACnC,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEM,QAAQ,CAAC,GAAG,IAAW;QAC5B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAEO,OAAO,CAAC,OAAe;QAC7B,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,kBAAkB,CAAC,OAAe;QACxC,MAAM,OAAO,GAAqC;YAChD,MAAM,EAAE,KAAK,IAA0B,EAAE;gBACvC,MAAM,MAAM,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,EAAE;oBACjC,EAAE,EAAE,OAAO;oBACX,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,SAAS,EAAE,CAAC;oBACZ,kBAAkB,EAAE,IAAI;oBACxB,GAAG,EAAE,IAAI,CAAC,GAAG;oBACb,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;wBACvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;wBACzC,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;4BACpC,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,yBAAyB,KAAK,oBAAoB,KAAK,IAAI,CAAC,CAAC;wBACxF,CAAC;wBACD,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;wBAC1B,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,0CAA0C,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;wBAC3F,OAAO,IAAI,CAAC;oBACd,CAAC;iBACF,CAAgB,CAAC;gBAElB,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAC;gBAClC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;oBACzB,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,+BAA+B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClF,CAAC,CAAC,CAAC;gBAEH,gEAAgE;gBAChE,MAAM,YAAY,GAAG,IAAI,CAAC;gBAE1B,iBAAiB;gBAEjB;;;;;mBAKG;gBACH,MAAM,CAAC,OAAO,GAAG,KAAK,WAAU,OAAe;oBAC7C,MAAM,OAAO,GAAa,EAAE,CAAC;oBAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;wBAC7B,KAAK,EAAE,OAAO;wBACd,KAAK,EAAE,IAAI,CAAC,kDAAkD;qBAC/D,CAAC,CAAC;oBAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBACrC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE;4BACnC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gCAChB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;4BACxB,CAAC;wBACH,CAAC,CAAC,CAAC;wBACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;wBACzC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;4BAChC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACd,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC;gBACF;;;;;;;;;;;;;;;;;mBAiBG;gBACH,MAAM,CAAC,UAAU,GAAG,KAAK,WAAU,OAAe;oBAChD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;wBAC7B,KAAK,EAAE,OAAO;wBACd,KAAK,EAAE,IAAI,CAAC,cAAc;qBAC3B,CAAC,CAAC;oBAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;wBACrC,MAAM,KAAK,GAAsB,EAAE,CAAC;wBACpC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,IAAc,EAAE,EAAE;4BACzC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gCAChB,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;oCACrB,mCAAmC;oCACnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;oCAChD,OAAO,YAAY,CAAC;gCACtB,CAAC,CAAC,EAAE,CAAC,CAAC;4BACR,CAAC;wBACH,CAAC,CAAC,CAAC;wBACH,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;4BAC1B,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;4BAChD,OAAO,CAAC,OAAO,CAAC,CAAC;wBACnB,CAAC,CAAC,CAAC;wBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;4BAChC,MAAM,CAAC,GAAG,CAAC,CAAC;wBACd,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC;gBACF,eAAe;gBAEf,qCAAqC;gBACrC,iCAAiC;gBACjC,iDAAiD;gBACjD,4BAA4B;gBAC5B,iBAAiB;gBACjB,iBAAiB;gBACjB,OAAO;gBACP,wCAAwC;gBACxC,iBAAiB;gBACjB,qBAAqB;gBACrB,OAAO;gBACP,4BAA4B;gBAC5B,oCAAoC;gBACpC,oCAAoC;gBACpC,OAAO;gBACP,mCAAmC;gBACnC,mCAAmC;gBACnC,MAAM;gBAEN,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,MAAa,EAAE,EAAE;gBAC/B,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBAC1C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,UAAU,EAAE,CAAC;oBACpB,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;YACD,QAAQ,EAAE,KAAK,EAAE,MAAa,EAAE,EAAE;gBAChC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC;SACF,CAAC;QAEF,OAAO,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE;YACrC,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF;AA3TD,8BA2TC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitalwalletcorp/redis-pooling",
-  "version": "1.0.1",
+  "version": "1.1.1",
   "description": "This is a library for redis connection pooling",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/redis-pooling.ts

@@ -3,7 +3,7 @@ import * as genericPool from 'generic-pool';
 
 export interface RedisConfig {
   url: string;
-  db?: number;
+  dbIndex?: number;
   connectTimeout?: number;
   max?: number;
   min?: number;
@@ -11,15 +11,9 @@ export interface RedisConfig {
   enableTls?: boolean;
 }
 
-export interface ManagedRedisPool {
-  acquire(dbIndex?: number): Promise<ManagedRedisClient>;
-  release(client?: Redis): Promise<void>;
-  destroy(timeoutMs?: number): Promise<void>;
-}
-
-export interface ManagedRedisClient extends Redis {
+export interface RedisClient extends Redis {
   getKeys(pattern: string): Promise<string[]>;
-  deleteKeys(pattern: string): Promise<number>;
+  deleteKeys(pattern: string): Promise<PromiseSettledResult<number>[]>;
   _originalDbIndex?: number; // 内部状態管理用変数
 }
 
@@ -29,61 +23,207 @@ const DEFAULT_MAX_POOLING_SIZE = 10;
 const DEFAULT_MIN_POOLING_SIZE = 0;
 const REDIS_PING_TIMEOUT_MS = 3000; // 3秒
 
-/**
- * Redisコネクションプーリングを生成する
- *
- * @param {RedisConfig} config
- * @returns {ManagedRedisPool}
- */
-export const createRedisPool = (config: RedisConfig): ManagedRedisPool => {
+export class RedisPool {
+
+  private readonly url: string;
+  private readonly db: number;
+  private readonly connectTimeout: number;
+  private readonly max: number;
+  private readonly min: number;
+  private readonly testOnBorrow: boolean;
+  private readonly tls?: { rejectUnauthorized: false };
 
-  const url = config.url;
-  const db = config.db ?? 0;
-  const connectTimeout = config.connectTimeout ?? DEFAULT_CONNECT_TIMEOUT;
-  const max = config.max ?? DEFAULT_MAX_POOLING_SIZE;
-  const min = config.min ?? DEFAULT_MIN_POOLING_SIZE;
-  const testOnBorrow = config.testOnBorrow ?? true;
+  private readonly poolMap = new Map<number, genericPool.Pool<RedisClient>>();
+  private initialized = false;
+  private readonly debug: boolean;
+
+  constructor(config: RedisConfig, options?: {
+    debug?: boolean;
+  }) {
+    if (!config.url) {
+      throw new Error(`${logHeader} Redis connection url is required.`);
+    }
 
-  if (!url) {
-    throw new Error(`${logHeader} Redis connection url is required.`);
+    this.url = config.url;
+    this.db = config.dbIndex ?? 0;
+    this.connectTimeout = config.connectTimeout ?? DEFAULT_CONNECT_TIMEOUT;
+    this.max = config.max ?? DEFAULT_MAX_POOLING_SIZE;
+    this.min = config.min ?? DEFAULT_MIN_POOLING_SIZE;
+    this.testOnBorrow = config.testOnBorrow ?? true;
+    this.tls = config.enableTls ? { rejectUnauthorized: false } : undefined;
+
+    this.debug = options?.debug ?? false;
   }
 
-  // dbIndexごとのプール管理
-  const poolMap = new Map<number, genericPool.Pool<ManagedRedisClient>>();
+  public async acquire(dbIndex?: number): Promise<RedisClient> {
+    if (!this.initialized) {
+      // 初回acquire呼び出し時のみ接続チェックを行う
+      // ホスト不正やパスワード不正による接続不可等を検知する
+      // ※ generic-poolのfactoryの方に入ってしまうとエラーを呼び出し元に伝播させることが難しいため、プールとは別の接続でチェックする
+      await this.checkConnectivity(dbIndex ?? this.db);
+      this.initialized = true;
+    }
 
-  const createSingleDbPool = (dbIndex: number): genericPool.Pool<ManagedRedisClient> => {
-    const factory: genericPool.Factory<ManagedRedisClient> = {
-      create: async (): Promise<ManagedRedisClient> => {
-        let client;
-        try {
-          client = new Redis(url, {
-            db: dbIndex,
-            connectTimeout: connectTimeout,
-            keepAlive: 1,
-            enableOfflineQueue: true,
-            tls: config.enableTls ? { rejectUnauthorized: false } : undefined,
-            retryStrategy: (times) => {
-              const delay = Math.min(times * 50, 1000);
-              if (process.env.NODE_ENV !== 'test') {
-                console.debug(logHeader, `retry strategy called ${times} times. delaying ${delay}ms`);
-              }
-              return delay;
-            },
-            reconnectOnError: (error) => {
-              process.emitWarning(`${logHeader} detected error (on reconnect). ${error.message}`);
-              return true;
+    const index = dbIndex ?? this.db;
+    const pool = this.getPool(index);
+    try {
+      const client = await pool.acquire();
+
+      this.debugLog(logHeader, `Redis client ${index} has been acquired.`);
+      return client;
+    } catch (error) {
+      throw error;
+    }
+  }
+
+  public async release(client?: RedisClient): Promise<void> {
+    if (client) {
+      const dbIndex = client._originalDbIndex ?? this.db;
+      const pool = this.poolMap.get(dbIndex);
+      if (!pool) {
+        return;
+      }
+      let needDestroy = false;
+      switch (true) {
+        case client.status === 'end':
+        case client.status === 'close':
+          // Redisクライアントの状態が再利用できない場合はプールから破棄
+          needDestroy = true;
+          break;
+        case client.status === 'ready':
+          try {
+            // 元のDBインデックスに戻す
+            await client.select(dbIndex);
+          } catch (error) {
+            // selectに失敗する→Redisクライアントが不正な状態にあると判断できるのでプールから破棄
+            needDestroy = true;
+          }
+          break;
+        default:
+      }
+      if (needDestroy) {
+        // Redisクライアントの破棄
+        await pool.destroy(client);
+        this.debugLog(logHeader, `Redis client ${dbIndex} destroyed due to invalid status.`);
+      } else {
+        // Redisクライアントの返却
+        await pool.release(client);
+        this.debugLog(logHeader, `Redis client ${dbIndex} released.`);
+      }
+    }
+  }
+
+  public async destroy(timeoutMs = 5000): Promise<void> {
+    for (const [dbIndex, pool] of this.poolMap.entries()) {
+      this.debugLog(logHeader, `Destroying Redis pool for DB index ${dbIndex}...`);
+      await Promise.race([
+        (async () => {
+          await pool.drain();
+          await pool.clear();
+        })(),
+        new Promise<void>((_, reject) => {
+          setTimeout(() => reject(new Error(`${logHeader} Timeout while draining Redis pool for DB index ${dbIndex}`)), timeoutMs);
+        })
+      ]);
+      this.debugLog(logHeader, `Redis pool for DB index ${dbIndex} destroyed.`);
+      this.poolMap.delete(dbIndex);
+    }
+  }
+
+  /**
+   * 初めてacquireが呼ばれた時に、指定された接続情報で接続できるかチェックする
+   *
+   * @param {number} dbIndex
+   */
+  private async checkConnectivity(dbIndex: number): Promise<void> {
+    const client = new Redis(this.url, {
+      db: dbIndex,
+      retryStrategy: () => null,     // 再接続無効
+      reconnectOnError: () => false, // 再接続無効
+      connectTimeout: this.connectTimeout,
+      tls: this.tls,
+    });
+
+    return new Promise<void>((resolve, reject) => {
+      const cleanup = () => {
+        client.quit().catch(() => client.disconnect());
+      };
+
+      client.once('ready', () => {
+        cleanup();
+        resolve();
+      });
+
+      client.once('error', (error) => {
+        cleanup();
+        reject(error);
+      });
+    });
+  }
+
+  private async ping(client: Redis): Promise<boolean> {
+    try {
+      this.debugLog(logHeader, 'start validate');
+      const timeout = new Promise<void>((_, reject) => {
+        setTimeout(() => reject(new Error(`Redis PING timeout after ${REDIS_PING_TIMEOUT_MS}ms`)), REDIS_PING_TIMEOUT_MS);
+      });
+      await Promise.race([
+        client.ping(),
+        timeout
+      ]);
+      this.debugLog(logHeader, 'ping succeeded');
+      return client.status === 'ready';
+    } catch (error: any) {
+      this.debugLog(logHeader, 'ping failed');
+      return false;
+    }
+  }
+
+  public debugLog(...args: any[]): void {
+    if (this.debug) {
+      console.debug(...args);
+    }
+  }
+
+  private getPool(dbIndex: number): genericPool.Pool<RedisClient> {
+    let pool = this.poolMap.get(dbIndex);
+    if (!pool) {
+      pool = this.createSingleDbPool(dbIndex);
+      this.poolMap.set(dbIndex, pool);
+    }
+    return pool;
+  }
+
+  private createSingleDbPool(dbIndex: number): genericPool.Pool<RedisClient> {
+    const factory: genericPool.Factory<RedisClient> = {
+      create: async (): Promise<RedisClient> => {
+        const client = new Redis(this.url, {
+          db: dbIndex,
+          connectTimeout: this.connectTimeout,
+          keepAlive: 1,
+          enableOfflineQueue: true,
+          tls: this.tls,
+          retryStrategy: (times) => {
+            const delay = Math.min(times * 50, 1000);
+            if (process.env.NODE_ENV !== 'test') {
+              this.debugLog(logHeader, `retry strategy called ${times} times. delaying ${delay}ms`);
             }
-          }) as ManagedRedisClient;
-        } catch (error) {
-          console.error(error);
-          throw error;
-        }
+            return delay;
+          },
+          reconnectOnError: (error) => {
+            process.emitWarning(`${logHeader} detected error (on reconnectOnError). ${error.message}`);
+            return true;
+          }
+        }) as RedisClient;
 
         client._originalDbIndex = dbIndex;
         client.on('error', error => {
           process.emitWarning(`${logHeader} detected error (on error). ${error.message}`);
         });
 
+        // カスタムメソッド内の処理でthis.debugLogなどが参照できなくなるため、poolのインスタンスを変数キャプチャする
+        const poolInstance = this;
+
         // カスタムメソッド START
 
         /**
@@ -107,46 +247,50 @@ export const createRedisPool = (config: RedisConfig): ManagedRedisPool => {
             });
             stream.on('end', () => resolve(allKeys));
             stream.on('error', (err: Error) => {
-              console.error(logHeader, `Error during getKeys scan for pattern '${pattern}'.`, err);
               reject(err);
             });
           });
         };
         /**
          * 指定されたパターンに一致するキーを Redis から全て削除する (UNLINKを使用)
+         * 返却値の配列サイズはscanStreamが'data'を受信した回数で、この受信したデータで削除された件数がvalueに設定されている。
+         *
+         * [
+         *   { status: 'fulfilled', value: 100 }, // 1バッチ目で100件削除
+         *   { status: 'fulfilled', value: 80 } // 2バッチ目で80件削除
+         * ]
+         *
+         *  成功した件数は以下のようにして取得可能
+         *
+         * const delResults = await redisClient.deleteKeys('pattern');
+         * const delCount = delResults.filter(a => a.status === 'fulfilled')
+         *   .reduce((acc, cur) => acc + (cur as PromiseFulfilledResult<number>).value, 0);
          *
          * @param {string} pattern
-         * @returns {Promise<number>}
+         * @returns {Promise<PromiseSettledResult<number>>}
          */
-        client.deleteKeys = async function(pattern: string): Promise<number> {
-          let deletedCount = 0;
+        client.deleteKeys = async function(pattern: string): Promise<PromiseSettledResult<number>[]> {
           const stream = this.scanStream({
             match: pattern,
             count: 1000 // 1度にスキャンする件数
           });
 
           return new Promise((resolve, reject) => {
-            const tasks: Promise<void>[] = [];
+            const tasks: Promise<number>[] = [];
             stream.on('data', async (keys: string[]) => {
               if (keys.length) {
                 tasks.push((async () => {
-                  try {
-                    // UNLINK を使用し、現在のインスタンス (this) で実行
-                    const unlinkResult = await this.unlink(...keys);
-                    deletedCount += unlinkResult;
-                    console.debug(logHeader, `Deleted ${unlinkResult} keys in a batch for pattern '${pattern}'. Total: ${deletedCount}`);
-                  } catch (error: any) {
-                    process.emitWarning(`${logHeader} Error during UNLINK for pattern '${pattern}'. ${error.message}`);
-                  }
+                  // UNLINK を使用し、現在のインスタンス (this) で実行
+                  const unlinkResult = await this.unlink(...keys);
+                  return unlinkResult;
                 })());
               }
             });
             stream.on('end', async () => {
-              await Promise.all(tasks);
-              resolve(deletedCount);
+              const results = await Promise.allSettled(tasks);
+              resolve(results);
             });
             stream.on('error', (err: Error) => {
-              console.error(logHeader, `Error during deleteKeys scan for pattern '${pattern}'.`, err);
               reject(err);
             });
           });
@@ -177,105 +321,21 @@ export const createRedisPool = (config: RedisConfig): ManagedRedisPool => {
       destroy: async (client: Redis) => {
         try {
           await client.quit();
-          console.debug(logHeader, 'client quit');
+          this.debugLog(logHeader, 'client quit');
         } catch (error) {
           client.disconnect();
-          console.debug(logHeader, 'client disconnected');
+          this.debugLog(logHeader, 'client disconnected');
         }
       },
       validate: async (client: Redis) => {
-        try {
-          console.debug(logHeader, 'start validate');
-          const timeout = new Promise<void>((_, reject) => {
-            setTimeout(() => reject(new Error(`Redis PING timeout after ${REDIS_PING_TIMEOUT_MS}ms`)), REDIS_PING_TIMEOUT_MS);
-          });
-          await Promise.race([
-            client.ping(),
-            timeout
-          ]);
-          console.debug(logHeader, 'ping succeeded');
-          return client.status === 'ready';
-        } catch (error) {
-          console.debug(logHeader, 'ping failed');
-          return false;
-        }
+        return await this.ping(client);
       }
     };
 
     return genericPool.createPool(factory, {
-      max,
-      min,
-      testOnBorrow
+      max: this.max,
+      min: this.min,
+      testOnBorrow: this.testOnBorrow
     });
-  };
-
-  const getPool = (dbIndex: number) => {
-    let pool = poolMap.get(dbIndex);
-    if (!pool) {
-      pool = createSingleDbPool(dbIndex);
-      poolMap.set(dbIndex, pool);
-    }
-    return pool;
-  };
-
-  return {
-    acquire: async (dbIndex?: number): Promise<ManagedRedisClient> => {
-      const index = dbIndex ?? 0;
-      const pool = getPool(index);
-      const client = await pool.acquire();
-      console.debug(logHeader, `Redis client ${index} has been acquired.`);
-      return client;
-    },
-    release: async (client?: ManagedRedisClient): Promise<void> => {
-      if (client) {
-        const dbIndex = client._originalDbIndex ?? db;
-        let needDestroy = false;
-        switch (true) {
-          case client.status === 'end':
-          case client.status === 'close':
-            // Redisクライアントの状態が再利用できない場合はプールから破棄
-            needDestroy = true;
-            break;
-          case client.status === 'ready':
-            try {
-              // 元のDBインデックスに戻す
-              await client.select(dbIndex);
-            } catch (error) {
-              // selectに失敗する→Redisクライアントが不正な状態にあると判断できるのでプールから破棄
-              needDestroy = true;
-            }
-            break;
-          default:
-        }
-        const pool = poolMap.get(dbIndex);
-        if (pool) {
-          if (needDestroy) {
-            // Redisクライアントの破棄
-            await pool.destroy(client);
-            console.debug(logHeader, `Redis client ${dbIndex} destroyed due to invalid status.`);
-          } else {
-            // Redisクライアントの返却
-            await pool.release(client);
-            console.debug(logHeader, `Redis client ${dbIndex} released.`);
-          }
-        }
-      }
-    },
-    destroy: async (timeoutMs = 5000): Promise<void> => {
-      for (const [dbIndex, pool] of poolMap.entries()) {
-        console.debug(logHeader, `Destroying Redis pool for DB index ${dbIndex}...`);
-        await Promise.race([
-          (async () => {
-            await pool.drain();
-            await pool.clear();
-          })(),
-          new Promise<void>((_, reject) => {
-            setTimeout(() => reject(new Error(`${logHeader} Timeout while draining Redis pool for DB index ${dbIndex}`)), timeoutMs);
-          })
-        ]);
-        console.debug(logHeader, `Redis pool for DB index ${dbIndex} destroyed.`);
-        poolMap.delete(dbIndex);
-      }
-    }
   }
-};
+}