@pi-r/redis 0.9.4 → 0.10.1

package/client/index.js

@@ -34,21 +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((err) => {
-            reject(err);
+    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);
@@ -71,7 +64,7 @@ async function setCredential(item) {
         delete item.credential;
     }
     if (!uri) {
-        throw (0, types_1.errorMessage)("redis", 'Not defined - uri');
+        throw (0, types_1.errorMessage)("redis", "Invalid credentials", 'url');
     }
     if (client.socket?.tls) {
         this.readTLSConfig(client.socket);
@@ -91,7 +84,8 @@ async function setCredential(item) {
     username = undefined;
     password = undefined;
     if ((0, types_1.isString)(usePool)) {
-        if (username = client.username || (0, util_1.parseConnectionString)(uri)?.username) {
+        username = client.username || (0, util_1.parseConnectionString)(uri)?.username;
+        if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -106,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;
         }
@@ -204,9 +189,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
-        const { source, uri, key, format = 'HASH', search, aggregate, update, options: clientOptions = {}, cacheObjectKey, ignoreCache } = item;
+        const { source, key, format = 'HASH', search, aggregate, options: clientOptions = {}, ignoreCache } = item;
         let credential = (redisCredential || onceCredential), error;
-        if (!credential && !(0, types_1.isPlainObject)(credential = clientOptions.client) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !((0, types_1.isString)(key) || (0, types_1.isArray)(key) || (0, types_1.isPlainObject)(search) && ((0, types_1.isPlainObject)(search.schema) || (0, types_1.isString)(search.query)) || (0, types_1.isPlainObject)(aggregate) && ((0, types_1.isPlainObject)(aggregate.schema) || (0, types_1.isString)(aggregate.query))) && (error = (0, types_1.errorMessage)(source, "Missing database query", uri))) {
+        if (!credential && !(0, types_1.isPlainObject)(credential = clientOptions.client) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !((0, types_1.isString)(key) || (0, types_1.isArray)(key) || (0, types_1.isPlainObject)(search) && ((0, types_1.isPlainObject)(search.schema) || (0, types_1.isString)(search.query)) || (0, types_1.isPlainObject)(aggregate) && ((0, types_1.isPlainObject)(aggregate.schema) || (0, types_1.isString)(aggregate.query))) && (error = (0, types_1.errorMessage)(source, "Missing database query", item.uri))) {
             ++redisCache;
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
@@ -228,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)) {
@@ -239,14 +227,15 @@ async function executeBatchQuery(batch, options = '', outResult) {
             else if (!targetObject) {
                 queryString = Db.asString(key, true);
             }
-            else if (cacheObjectKey) {
-                queryString = Db.asString(key, true) + '_' + targetObject.toString() + cacheObjectKey;
+            else if (item.cacheObjectKey) {
+                queryString = Db.asString(key, true) + '_' + targetObject.toString() + item.cacheObjectKey;
             }
             if (queryString) {
                 queryString += '_' + format;
             }
             if (ignoreCache !== 1) {
-                if (rows = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue)) {
+                rows = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
+                if (rows) {
                     ++redisCache;
                     if (parallel) {
                         tasks[i] = Promise.resolve(rows);
@@ -278,9 +267,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 const client = redisClient || await getConnection(item, credential);
                 const a = (arg) => typeof arg === 'string' || Buffer.isBuffer(arg) || typeof arg === 'number';
                 const b = (arg) => typeof arg === 'number' || Buffer.isBuffer(arg) ? arg.toString() : arg;
-                if (update) {
+                if (item.update) {
                     commandType = this.commandType.UPDATE;
-                    const values = (!Array.isArray(update) ? [update] : update).map(async (target) => {
+                    const values = (!Array.isArray(item.update) ? [item.update] : item.update).map(async (target) => {
                         return new Promise(async (success, failed) => {
                             let { key: k, value: v, format: f, NX, XX, options: setOptions = {} } = target;
                             f = ((0, types_1.isString)(f) ? f.toUpperCase() : 'HASH');
@@ -487,17 +476,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                                 failed((0, types_1.errorMessage)(f, "Invalid value", has(EX) ? 'EX: ' + EX : has(PX) ? 'PX: ' + PX : has(EXAT) ? 'EXAT: ' + EX : 'PXAT: ' + PXAT));
                                             }
                                         })
-                                            .catch((err) => {
-                                            failed(err);
-                                        });
+                                            .catch(failed);
                                     }
                                     else {
                                         success(target);
                                     }
                                 })
-                                    .catch((err) => {
-                                    failed(err);
-                                });
+                                    .catch(failed);
                             }
                             else {
                                 failValue();
@@ -538,7 +523,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                     }
                     catch (err) {
-                        this.addLog(this.statusType.WARN, err, this.moduleName, target === search ? 'FT.SEARCH' : 'FT.AGGREGATE');
+                        this.addLog(this.statusType.WARN, err, { source: target === search ? 'FT.SEARCH' : 'FT.AGGREGATE' });
                         if (err instanceof Error) {
                             throw err;
                         }
@@ -587,7 +572,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 data = await (clientOptions.get ? client.json.get(...command ? [command, b(key), clientOptions.get] : [b(key), clientOptions.get]) : client.json.get(...command ? [command, b(key)] : [b(key)]));
                                 break;
                             default:
-                                if (item.field) {
+                                if (Array.isArray(item.field)) {
+                                    data = await client.hmGet(...command ? [command, key, item.field] : [key, item.field]);
+                                }
+                                else if (item.field) {
                                     data = await client.hGet(...command ? [command, key, item.field] : [key, item.field]);
                                 }
                                 else {
@@ -635,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.9.4",
+  "version": "0.10.1",
   "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.11.5",
-    "@e-mc/types": "^0.11.5",
-    "redis": "^4.7.0"
+    "@e-mc/db": "^0.12.3",
+    "@e-mc/types": "^0.12.3",
+    "redis": "^4.7.1"
   }
 }

package/types/index.d.ts

@@ -4,20 +4,19 @@ 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 { RedisJSON } from '@redis/json/dist/commands';
 import type { ClientCommandOptions } from '@redis/client/dist/lib/client';
 import type { RedisCommandArgument } from '@redis/client/dist/lib/commands';
 import type { CommandOptions } from '@redis/client/dist/lib/command-options';
-import type { RedisClientOptions } from '@redis/client';
-import type { RedisJSON } from '@redis/json/dist/commands';
 import type { AggregateOptions } from '@redis/search/dist/commands/AGGREGATE';
-import type { HScanTuple } from '@redis//client/dist/lib/commands/HSCAN';
+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";
     key?: RedisCommandArgument | RedisCommandArgument[];
-    field?: RedisCommandArgument;
+    field?: RedisCommandArgument | string[];
     path?: string;
     format?: RedisFormat | "HKEYS" | "HVALS" | "HSCAN";
     search?: RedisQuery;