@pi-r/redis 0.10.0 → 0.10.2

package/client/index.d.ts

@@ -1,7 +1,7 @@
-import type { IDbSourceClient } from '@e-mc/db/types';
-
-import type { RedisDataSource } from '../types';
-
-declare const Redis: IDbSourceClient<RedisDataSource>;
-
+import type { IDbSourceClient } from '@e-mc/db/types';
+
+import type { RedisDataSource } from '../types';
+
+declare const Redis: IDbSourceClient<RedisDataSource>;
+
 export = Redis;

package/client/index.js

@@ -34,19 +34,14 @@ async function getClient(db, options, poolKey) {
     else if (typeof socket.keepAlive !== 'number') {
         socket.keepAlive = undefined;
     }
-    return new Promise((resolve, reject) => {
-        const client = db.createClient(options);
-        if (poolKey) {
-            client.on('end', () => {
-                delete POOL_STATE[poolKey];
-            });
-        }
-        client.connect()
-            .then(() => {
-            resolve(client);
-        })
-            .catch(reject);
-    });
+    const client = db.createClient(options);
+    if (poolKey) {
+        client.on('end', () => {
+            delete POOL_STATE[poolKey];
+        });
+    }
+    await client.connect();
+    return client;
 }
 async function setCredential(item) {
     const credential = this.getCredential(item);
@@ -105,22 +100,13 @@ async function setCredential(item) {
     const config = this.getPoolConfig("redis", password);
     const poolOptions = client.isolationPoolOptions ||= {};
     if (config) {
-        const { min, max, idle, queue_max, queue_idle, timeout } = config;
+        const { min, max, timeout } = config;
         if (min >= 0) {
             poolOptions.min ??= min;
         }
         if (max > 0) {
             poolOptions.max ??= max;
         }
-        if (idle > 0) {
-            poolOptions.idleTimeoutMillis ??= idle;
-        }
-        if (queue_max >= 0) {
-            poolOptions.maxWaitingClients ??= queue_max;
-        }
-        if (queue_idle > 0) {
-            poolOptions.softIdleTimeoutMillis ??= queue_idle;
-        }
         if (timeout > 0) {
             poolOptions.acquireTimeoutMillis ??= timeout;
         }
@@ -227,6 +213,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const uuidKey = credential.uuidKey ||= (onceCredential ? batch[0] : item).credential?.uuidKey;
         const targetObject = typeof checkObject === 'string' ? this.hasCoerce("redis", 'options', uuidKey) && (0, types_1.asFunction)(checkObject) : checkObject;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
+        if (command) {
+            command.signal ||= this.signal;
+        }
         let queryString = '', rows;
         if (caching && ignoreCache !== true) {
             if ((0, types_1.isObject)(search)) {
@@ -634,7 +623,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
     }
-    return this.processRows(batch, tasks, {
+    return this.processRows(batch, tasks, clients.length === 0 ? parallel : {
         parallel,
         disconnect() {
             for (const item of clients) {

package/client/pool.js

@@ -2,6 +2,7 @@
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class RedisPool extends DbPool {
+    static CACHE_IGNORE = ['modules', 'functions', 'scripts'];
     static asString(credential) {
         if (credential.url) {
             return JSON.stringify(credential);
@@ -9,6 +10,9 @@ class RedisPool extends DbPool {
         return super.asString(credential);
     }
     static sanitize(credential) {
+        if (!this.canCache(credential)) {
+            return;
+        }
         if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
             return credential;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "Redis client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.12.0",
-    "@e-mc/types": "^0.12.0",
-    "redis": "^4.7.0"
+    "@e-mc/db": "^0.12.5",
+    "@e-mc/types": "^0.12.5",
+    "redis": "^4.7.1"
   }
 }

package/types/index.d.ts

@@ -4,7 +4,6 @@ import type { IdentifierAction } from '@e-mc/types/lib/core';
 import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
 import type { AuthValue } from '@e-mc/types/lib/http';
 
-import type { RedisClientOptions } from '@redis/client';
 import type { RedisJSON } from '@redis/json/dist/commands';
 import type { ClientCommandOptions } from '@redis/client/dist/lib/client';
 import type { RedisCommandArgument } from '@redis/client/dist/lib/commands';
@@ -12,7 +11,7 @@ import type { CommandOptions } from '@redis/client/dist/lib/command-options';
 import type { AggregateOptions } from '@redis/search/dist/commands/AGGREGATE';
 import type { HScanTuple } from '@redis/client/dist/lib/commands/HSCAN';
 import type { ScanOptions } from '@redis/client/dist/lib/commands/generic-transformers';
-import type { RediSearchSchema, SearchOptions, SetOptions } from 'redis';
+import type { RediSearchSchema, RedisClientOptions, SearchOptions, SetOptions } from 'redis';
 
 export interface RedisDataSource extends DbDataSource<string, PlainObject, RedisSetValue | RedisSetValue[] | RedisJSONValue | RedisJSONValue[], RedisCredential, string>, CascadeAction, AuthValue {
     source: "redis";