@pi-r/redis 0.6.5 → 0.6.7

package/client/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
 const redis = require("redis");
 const util_1 = require("@e-mc/db/util");
@@ -41,13 +40,15 @@ async function getClient(db, options, poolKey) {
     });
 }
 function removePoolProperties(options) {
+    var _a;
     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, socket: ((_a = options.socket) === null || _a === void 0 ? void 0 : _a.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 client = (0, types_1.isPlainObject)(options.client) ? options.client : options.client = {};
@@ -79,7 +80,7 @@ async function setCredential(item) {
     if (!uri) {
         throw (0, types_1.errorMessage)("redis", 'Not defined - uri');
     }
-    if (client.socket?.tls) {
+    if ((_a = client.socket) === null || _a === void 0 ? void 0 : _a.tls) {
         this.readTLSConfig(client.socket);
     }
     client.url = uri;
@@ -97,7 +98,7 @@ async function setCredential(item) {
     username = undefined;
     password = undefined;
     if ((0, types_1.isString)(usePool)) {
-        if (username = client.username || (0, util_1.parseConnectionString)(uri)?.username) {
+        if (username = client.username || ((_b = (0, util_1.parseConnectionString)(uri)) === null || _b === void 0 ? void 0 : _b.username)) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -114,22 +115,22 @@ async function setCredential(item) {
     if (config) {
         const { min, max, idle, queue_max, queue_idle, timeout } = config;
         if (min >= 0) {
-            poolOptions.min ?? (poolOptions.min = min);
+            (_c = poolOptions.min) !== null && _c !== void 0 ? _c : (poolOptions.min = min);
         }
         if (max > 0) {
-            poolOptions.max ?? (poolOptions.max = max);
+            (_d = poolOptions.max) !== null && _d !== void 0 ? _d : (poolOptions.max = max);
         }
         if (idle > 0) {
-            poolOptions.idleTimeoutMillis ?? (poolOptions.idleTimeoutMillis = idle);
+            (_e = poolOptions.idleTimeoutMillis) !== null && _e !== void 0 ? _e : (poolOptions.idleTimeoutMillis = idle);
         }
         if (queue_max >= 0) {
-            poolOptions.maxWaitingClients ?? (poolOptions.maxWaitingClients = queue_max);
+            (_f = poolOptions.maxWaitingClients) !== null && _f !== void 0 ? _f : (poolOptions.maxWaitingClients = queue_max);
         }
         if (queue_idle > 0) {
-            poolOptions.softIdleTimeoutMillis ?? (poolOptions.softIdleTimeoutMillis = queue_idle);
+            (_g = poolOptions.softIdleTimeoutMillis) !== null && _g !== void 0 ? _g : (poolOptions.softIdleTimeoutMillis = queue_idle);
         }
         if (timeout > 0) {
-            poolOptions.acquireTimeoutMillis ?? (poolOptions.acquireTimeoutMillis = timeout);
+            (_h = poolOptions.acquireTimeoutMillis) !== null && _h !== void 0 ? _h : (poolOptions.acquireTimeoutMillis = timeout);
         }
     }
     const poolKey = getPoolKey(client);
@@ -153,6 +154,7 @@ 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 [];
@@ -180,7 +182,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     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;
+    let redisClient, redisCredential, redisCache = 0, onceCredential = connectOnce ? (_a = batch[0].options) === null || _a === void 0 ? void 0 : _a.client : undefined;
     const getConnection = async (item, credential) => {
         item.transactionState = 64;
         let client;
@@ -208,7 +210,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64;
         return client;
     };
-    if (this.host?.username) {
+    if ((_b = this.host) === null || _b === void 0 ? void 0 : _b.username) {
         this.applyCommand(...batch);
     }
     for (let i = 0; i < length; ++i) {
@@ -234,7 +236,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 = (onceCredential ? batch[0] : item).credential?.uuidKey));
+        const uuidKey = (credential.uuidKey || (credential.uuidKey = (_c = (onceCredential ? batch[0] : item).credential) === null || _c === void 0 ? void 0 : _c.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;

package/package.json

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