@pi-r/redis 0.6.7 → 0.7.1

package/README.md

@@ -1,10 +1,7 @@
-# @pi-r/redis
+### @pi-r/redis
 
-## Documentation
+https://e-mc.readthedocs.io/en/latest/db/redis.html
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/db/redis.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.js

@@ -22,7 +22,7 @@ class RedisPool extends DbPool {
 const POOL_STATE = {};
 const POOL_ACTIVE = new WeakSet();
 async function getClient(db, options, poolKey) {
-    const socket = options.socket || (options.socket = {});
+    const socket = options.socket ||= {};
     if (!poolKey) {
         socket.keepAlive = false;
     }
@@ -36,21 +36,19 @@ async function getClient(db, options, poolKey) {
                 delete POOL_STATE[poolKey];
             });
         }
-        client.connect().then(() => resolve(client)).catch(err => reject(err));
+        client.connect().then(() => resolve(client)).catch((err) => reject(err));
     });
 }
 function removePoolProperties(options) {
-    var _a;
     if (!options.uuidKey && ('socket' in options || 'isolationPoolOptions' in options) && POOL_ACTIVE.has(options)) {
-        return { ...options, socket: ((_a = options.socket) === null || _a === void 0 ? void 0 : _a.tls) ? { tls: true } : undefined, isolationPoolOptions: undefined };
+        return { ...options, socket: options.socket?.tls ? { tls: true } : undefined, isolationPoolOptions: undefined };
     }
     return options;
 }
 const getPoolKey = (options) => options.url && JSON.stringify(options);
 async function setCredential(item) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const credential = this.getCredential(item);
-    const options = item.options || (item.options = {});
+    const options = item.options ||= {};
     const client = (0, types_1.isPlainObject)(options.client) ? options.client : options.client = {};
     let { uri, username, password, database = 0 } = item;
     if (database > 0) {
@@ -58,21 +56,12 @@ async function setCredential(item) {
     }
     if (credential) {
         const auth = (0, util_1.parseServerAuth)(credential, 6379);
-        if (!client.database) {
-            if ('database' in credential) {
-                const value = credential.database;
-                if (+value > 0) {
-                    database = +value;
-                }
-                delete credential.database;
-            }
-            if (database > 0) {
-                client.database = database;
-            }
+        if (auth.database && (database = +auth.database) > 0) {
+            client.database ||= database;
         }
-        uri || (uri = (auth.protocol || 'redis:') + '//' + (auth.server || 'localhost:' + (auth.port ? auth.port : 6379)));
-        username || (username = auth.username);
-        password || (password = auth.password);
+        uri ||= (auth.protocol || 'redis:') + '//' + (auth.server || 'localhost:' + (auth.port ? auth.port : 6379));
+        username ||= auth.username;
+        password ||= auth.password;
     }
     else {
         delete item.credential;
@@ -80,7 +69,7 @@ async function setCredential(item) {
     if (!uri) {
         throw (0, types_1.errorMessage)("redis", 'Not defined - uri');
     }
-    if ((_a = client.socket) === null || _a === void 0 ? void 0 : _a.tls) {
+    if (client.socket?.tls) {
         this.readTLSConfig(client.socket);
     }
     client.url = uri;
@@ -98,7 +87,7 @@ async function setCredential(item) {
     username = undefined;
     password = undefined;
     if ((0, types_1.isString)(usePool)) {
-        if (username = client.username || ((_b = (0, util_1.parseConnectionString)(uri)) === null || _b === void 0 ? void 0 : _b.username)) {
+        if (username = client.username || (0, util_1.parseConnectionString)(uri)?.username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -111,26 +100,26 @@ async function setCredential(item) {
         }
     }
     const config = this.getPoolConfig("redis", password);
-    const poolOptions = client.isolationPoolOptions || (client.isolationPoolOptions = {});
+    const poolOptions = client.isolationPoolOptions ||= {};
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout } = config;
         if (min >= 0) {
-            (_c = poolOptions.min) !== null && _c !== void 0 ? _c : (poolOptions.min = min);
+            poolOptions.min ??= min;
         }
         if (max > 0) {
-            (_d = poolOptions.max) !== null && _d !== void 0 ? _d : (poolOptions.max = max);
+            poolOptions.max ??= max;
         }
         if (idle > 0) {
-            (_e = poolOptions.idleTimeoutMillis) !== null && _e !== void 0 ? _e : (poolOptions.idleTimeoutMillis = idle);
+            poolOptions.idleTimeoutMillis ??= idle;
         }
         if (queue_max >= 0) {
-            (_f = poolOptions.maxWaitingClients) !== null && _f !== void 0 ? _f : (poolOptions.maxWaitingClients = queue_max);
+            poolOptions.maxWaitingClients ??= queue_max;
         }
         if (queue_idle > 0) {
-            (_g = poolOptions.softIdleTimeoutMillis) !== null && _g !== void 0 ? _g : (poolOptions.softIdleTimeoutMillis = queue_idle);
+            poolOptions.softIdleTimeoutMillis ??= queue_idle;
         }
         if (timeout > 0) {
-            (_h = poolOptions.acquireTimeoutMillis) !== null && _h !== void 0 ? _h : (poolOptions.acquireTimeoutMillis = timeout);
+            poolOptions.acquireTimeoutMillis ??= timeout;
         }
     }
     const poolKey = getPoolKey(client);
@@ -154,7 +143,6 @@ async function executeQuery(item, options) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(batch, options = '', outResult) {
-    var _a, _b, _c;
     const length = batch.length;
     if (length === 0) {
         return [];
@@ -177,12 +165,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
         parallel = !batch.some(item => item.parallel === false);
     }
     if (!parallel) {
-        outResult || (outResult = new Array(length));
+        outResult ||= new Array(length);
     }
     const caching = this.hasCache("redis", sessionKey);
     const tasks = new Array(length);
     const clients = [];
-    let redisClient, redisCredential, redisCache = 0, onceCredential = connectOnce ? (_a = batch[0].options) === null || _a === void 0 ? void 0 : _a.client : undefined;
+    let redisClient, redisCredential, redisCache = 0, onceCredential = connectOnce ? batch[0].options?.client : undefined;
     const getConnection = async (item, credential) => {
         item.transactionState = 64;
         let client;
@@ -198,7 +186,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             if (connectOnce && parallel) {
                 const size = length - redisCache;
                 if (size > 1) {
-                    (credential.isolationPoolOptions || (credential.isolationPoolOptions = {})).max = size;
+                    (credential.isolationPoolOptions ||= {}).max = size;
                 }
             }
             clients.push(client = await getClient(redis, credential));
@@ -210,7 +198,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64;
         return client;
     };
-    if ((_b = this.host) === null || _b === void 0 ? void 0 : _b.username) {
+    if (this.host?.username) {
         this.applyCommand(...batch);
     }
     for (let i = 0; i < length; ++i) {
@@ -236,7 +224,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
         item.transactionState = 1;
         const command = (0, types_1.isPlainObject)(clientOptions.command) ? redis.commandOptions(clientOptions.command) : null;
-        const uuidKey = (credential.uuidKey || (credential.uuidKey = (_c = (onceCredential ? batch[0] : item).credential) === null || _c === void 0 ? void 0 : _c.uuidKey));
+        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 };
         let queryString = '', rows;
@@ -309,10 +297,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                     failKey();
                                     return;
                                 }
-                                if (this.hasCoerce("redis", 'options', uuidKey)) {
-                                    if ((0, types_1.isString)(v) && v.startsWith('new')) {
-                                        ({ outV: v } = (0, types_1.coerceObject)({ outV: v }));
-                                    }
+                                if (this.hasCoerce("redis", 'options', uuidKey) && (0, types_1.isString)(v) && v.startsWith('new')) {
+                                    ({ outV: v } = (0, types_1.coerceObject)({ outV: v }));
                                 }
                                 let { path = '$', command: cmd, start, stop, index } = target;
                                 const name = ((0, types_1.isString)(cmd) ? cmd.toUpperCase() : 'SET');
@@ -352,8 +338,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                         const data = (Array.isArray(v) ? v : [v])
                                             .filter((m) => m.value !== undefined)
                                             .map((m) => {
-                                            m.key || (m.key = k);
-                                            m.path || (m.path = path);
+                                            m.key ||= k;
+                                            m.path ||= path;
                                             return m;
                                         });
                                         if (data.length) {
@@ -478,7 +464,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                             }
                                         }
                                         if (ttl) {
-                                            PX = await client.pTTL(k).catch(err => {
+                                            PX = await client.pTTL(k).catch((err) => {
                                                 failed(err);
                                                 return 0;
                                             });
@@ -496,13 +482,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((err) => failed(err));
                                     }
                                     else {
                                         success(target);
                                     }
                                 })
-                                    .catch(err => failed(err));
+                                    .catch((err) => failed(err));
                             }
                             else {
                                 failValue();
@@ -518,7 +504,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             }
                         }
                     })
-                        .catch(err => {
+                        .catch((err) => {
                         if (this.handleFail(err, item, { errorQuery, commandType })) {
                             reject(err);
                         }
@@ -549,7 +535,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     }
                     finally {
                         if (idx && idx !== index) {
-                            client.ft.dropIndex(idx).catch(err => this.writeFail([`Unable to drop ${target === search ? 'search' : 'aggregate'} index`, idx], err, { type: 65536, fatal: false }));
+                            client.ft.dropIndex(idx).catch((err) => this.writeFail([`Unable to drop ${target === search ? 'search' : 'aggregate'} index`, idx], err, { type: 65536, fatal: false }));
                         }
                     }
                 }
@@ -632,7 +618,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         }
     }
     return this.processRows(batch, tasks, {
-        disconnect: () => clients.forEach(async (item) => item.disconnect()),
+        disconnect: () => clients.forEach(item => {
+            item.disconnect();
+        }),
         parallel
     }, outResult);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.6.7",
+  "version": "0.7.1",
   "description": "Redis client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.8",
-    "@e-mc/types": "^0.8.8",
-    "redis": "^4.6.13"
+    "@e-mc/db": "^0.9.2",
+    "@e-mc/types": "^0.9.2",
+    "redis": "^4.6.14"
   }
 }

package/types/index.d.ts

@@ -9,7 +9,7 @@ import type { RedisCommandArgument } from '@redis/client/dist/lib/commands';
 import type { RedisJSON } from '@redis/json/dist/commands';
 import type { RediSearchSchema, SearchOptions, SetOptions } from 'redis';
 
-export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, string | RedisCredential, string>, AuthValue, CascadeAction {
+export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, RedisCredential, string>, CascadeAction, AuthValue {
     source: "redis";
     key?: ArrayOf<RedisCommandArgument>;
     field?: RedisCommandArgument;
@@ -55,9 +55,9 @@ export interface RedisSetValue extends RedisCommand<"HASH", RedisCommandArgument
 export interface RedisJSONValue extends RedisCommand<"JSON", string, ArrayOf<RedisJSON>> {
     command?: RedisCommandJSON;
     path?: string;
-    start?: NumString;
-    stop?: NumString;
-    index?: NumString;
+    start?: number | string;
+    stop?: number | string;
+    index?: number | string;
 }
 
 export interface RedisQuery {
@@ -78,6 +78,6 @@ export type RedisCommandJSON = "ARRAPPEND" | "ARRINDEX" | "ARRINSERT" | "ARRPOP"
 export type RedisExpireCondition = "NX" | "XX" | "GT" | "LT";
 export type RedisCommandValue = RedisCommandArgument | number;
 export type RedisCommandOptions = CommandOptions<ClientCommandOptions>;
-export type RedisHSETObject = Record<NumString, RedisCommandValue>;
+export type RedisHSETObject = Record<number | string, RedisCommandValue>;
 
 export type { RedisCommandArgument, RedisJSON };