@pi-r/redis 0.6.3 → 0.6.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2024 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

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

package/client/index.d.ts

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

package/client/index.js

@@ -21,6 +21,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 = {});
     if (!poolKey) {
@@ -40,7 +41,7 @@ async function getClient(db, options, poolKey) {
     });
 }
 function removePoolProperties(options) {
-    if (!options.uuidKey && ('socket' in options || 'isolationPoolOptions' in options)) {
+    if (!options.uuidKey && ('socket' in options || 'isolationPoolOptions' in options) && POOL_ACTIVE.has(options)) {
         return { ...options, socket: options.socket?.tls ? { tls: true } : undefined, isolationPoolOptions: undefined };
     }
     return options;
@@ -55,7 +56,7 @@ async function setCredential(item) {
         client.database = database;
     }
     if (credential) {
-        const auth = (0, util_1.parseServerAuth)(credential, 6379 /* VALUES.PORT */);
+        const auth = (0, util_1.parseServerAuth)(credential, 6379);
         if (!client.database) {
             if ('database' in credential) {
                 const value = credential.database;
@@ -68,7 +69,7 @@ async function setCredential(item) {
                 client.database = database;
             }
         }
-        uri || (uri = (auth.protocol || 'redis:') + '//' + (auth.server || 'localhost:' + (auth.port ? auth.port : 6379 /* VALUES.PORT */)));
+        uri || (uri = (auth.protocol || 'redis:') + '//' + (auth.server || 'localhost:' + (auth.port ? auth.port : 6379)));
         username || (username = auth.username);
         password || (password = auth.password);
     }
@@ -76,7 +77,7 @@ async function setCredential(item) {
         delete item.credential;
     }
     if (!uri) {
-        throw (0, types_1.errorMessage)("redis" /* STRINGS.MODULE_NAME */, 'Not defined - uri');
+        throw (0, types_1.errorMessage)("redis", 'Not defined - uri');
     }
     if (client.socket?.tls) {
         this.readTLSConfig(client.socket);
@@ -108,7 +109,7 @@ async function setCredential(item) {
             return;
         }
     }
-    const config = this.getPoolConfig("redis" /* STRINGS.MODULE_NAME */, password);
+    const config = this.getPoolConfig("redis", password);
     const poolOptions = client.isolationPoolOptions || (client.isolationPoolOptions = {});
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout } = config;
@@ -176,18 +177,19 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("redis" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("redis", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     let redisClient, redisCredential, redisCache = 0, onceCredential = connectOnce ? batch[0].options?.client : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         let client;
         if (item.usePool) {
             const pool = DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential), ...connectOnce ? [item, batch[0]] : [item]);
             if (pool) {
                 client = pool.client;
                 pool.connected = true;
+                POOL_ACTIVE.add(credential);
             }
         }
         if (!client) {
@@ -203,7 +205,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             redisClient = client;
             redisCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     if (this.host?.username) {
@@ -213,7 +215,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const item = batch[i];
         const { source, uri, key, format = 'HASH', search, aggregate, update, options: clientOptions = {}, cacheObjectKey, ignoreCache } = item;
         let credential = (redisCredential || onceCredential), error;
-        if (!credential && !(0, types_1.isPlainObject)(credential = clientOptions.client) && (error = (0, types_1.errorMessage)(source, "Invalid credentials" /* ERR_DB.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" /* ERR_DB.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", uri))) {
             ++redisCache;
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
@@ -230,10 +232,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
+        item.transactionState = 1;
         const command = (0, types_1.isPlainObject)(clientOptions.command) ? redis.commandOptions(clientOptions.command) : null;
         const uuidKey = (credential.uuidKey || (credential.uuidKey = (onceCredential ? batch[0] : item).credential?.uuidKey));
-        const targetObject = typeof checkObject === 'string' ? this.hasCoerce("redis" /* STRINGS.MODULE_NAME */, 'options', uuidKey) && (0, types_1.asFunction)(checkObject) : checkObject;
+        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;
         if (caching && ignoreCache !== true) {
@@ -261,7 +263,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = rows;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     continue;
                 }
                 if (!ignoreCache && outCacheMiss) {
@@ -296,8 +298,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 return;
                             }
                             const has = (n) => typeof n === 'number' && n > 0;
-                            const failKey = () => failed((0, types_1.errorMessage)(f, "Invalid key" /* ERR_DB.KEY */, Db.asString(k) || "Unknown" /* ERR_MESSAGE.UNKNOWN */));
-                            const failValue = () => failed((0, types_1.errorMessage)(f, "Invalid value" /* ERR_DB.VALUE */, Db.asString(v) || "Unknown" /* ERR_MESSAGE.UNKNOWN */));
+                            const failKey = () => failed((0, types_1.errorMessage)(f, "Invalid key", Db.asString(k) || "Unknown"));
+                            const failValue = () => failed((0, types_1.errorMessage)(f, "Invalid value", Db.asString(v) || "Unknown"));
                             const commandSet = (0, types_1.isPlainObject)(setOptions.command) && redis.commandOptions(setOptions.command);
                             let pending, codeMin = 0, EX, PX, EXAT, PXAT, KEEPTTL;
                             if (f === 'JSON') {
@@ -305,7 +307,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                     failKey();
                                     return;
                                 }
-                                if (this.hasCoerce("redis" /* STRINGS.MODULE_NAME */, 'options', uuidKey)) {
+                                if (this.hasCoerce("redis", 'options', uuidKey)) {
                                     if ((0, types_1.isString)(v) && v.startsWith('new')) {
                                         ({ outV: v } = (0, types_1.coerceObject)({ outV: v }));
                                     }
@@ -489,7 +491,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                                 success(target);
                                             }
                                             else {
-                                                failed((0, types_1.errorMessage)(f, "Invalid value" /* ERR_DB.VALUE */, has(EX) ? 'EX: ' + EX : has(PX) ? 'PX: ' + PX : has(EXAT) ? 'EXAT: ' + EX : 'PXAT: ' + PXAT));
+                                                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));
@@ -545,7 +547,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 /* LOG_TYPE.DB */, fatal: false }));
+                            client.ft.dropIndex(idx).catch(err => this.writeFail([`Unable to drop ${target === search ? 'search' : 'aggregate'} index`, idx], err, { type: 65536, fatal: false }));
                         }
                     }
                 }
@@ -591,16 +593,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     rows = (targetObject ? targetObject(item, data) : data);
                 }
                 if (rows === undefined) {
-                    throw (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */);
+                    throw (0, types_1.errorMessage)(source, "Missing database query");
                 }
-                this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                this.add(item, 4);
                 resolve(this.setQueryResult(source, removePoolProperties(redisCredential || credential), queryString, rows, cacheValue));
             }
             catch (err) {
                 if (err instanceof Error) {
                     switch (err.message) {
-                        case "The client is closed" /* STRINGS.ERR_CLIENT_CLOSE */:
-                        case "Disconnects client" /* STRINGS.ERR_CLIENT_DISCONNECT */: {
+                        case "The client is closed":
+                        case "Disconnects client": {
                             const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential));
                             if (pool) {
                                 await pool.detach(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "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.3",
-    "@e-mc/types": "^0.8.3",
-    "redis": "^4.6.12"
+    "@e-mc/db": "^0.8.6",
+    "@e-mc/types": "^0.8.6",
+    "redis": "^4.6.13"
   }
 }