@pi-r/redis 0.3.3 → 0.3.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Lisa Mishima
+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/client/index.js

@@ -41,13 +41,15 @@ function getClient(db, options, poolKey) {
     });
 }
 function removePoolProperties(options) {
+    var _a;
     if (!options.uuidKey && ('socket' in options || 'isolationPoolOptions' in 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 + '_' + (options.username || '') + '_' + (options.password || '') + '_' + (options.database ?? '') + '_' + (options.socket?.tls ? '1' : '0') + '_' + (options.legacyMode ? '1' : '0');
+const getPoolKey = (options) => { var _a, _b; return options.url + '_' + (options.username || '') + '_' + (options.password || '') + '_' + ((_a = options.database) !== null && _a !== void 0 ? _a : '') + '_' + (((_b = options.socket) === null || _b === void 0 ? void 0 : _b.tls) ? '1' : '0') + '_' + (options.legacyMode ? '1' : '0'); };
 async function setCredential(item) {
+    var _a, _b, _c, _d, _e, _f, _g;
     if (!REDIS_V4) {
         throw (0, types_1.errorValue)("Upgrade client to latest version", "redis" + '@' + Db.getPackageVersion("redis"));
     }
@@ -82,7 +84,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 +99,7 @@ async function setCredential(item) {
         let pool;
         username = undefined;
         password = undefined;
-        if (typeof usePool === 'string' && (username = client.username || (0, util_1.parseConnectionString)(uri)?.username)) {
+        if (typeof usePool === 'string' && (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);
@@ -111,19 +113,19 @@ async function setCredential(item) {
             if (config) {
                 const { min, max, idle, queue_max, queue_idle } = 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.acquireTimeoutMillis ?? (poolOptions.acquireTimeoutMillis = queue_idle);
+                    (_g = poolOptions.acquireTimeoutMillis) !== null && _g !== void 0 ? _g : (poolOptions.acquireTimeoutMillis = queue_idle);
                 }
             }
             try {
@@ -147,6 +149,7 @@ async function executeQuery(item, options) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(batch, options = '', outResult) {
+    var _a, _b;
     const length = batch.length;
     if (length === 0) {
         return [];
@@ -174,7 +177,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;
@@ -223,7 +226,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const uuidKey = (credential.uuidKey || (credential.uuidKey = (onceCredential ? batch[0] : item).credential?.uuidKey));
+        const uuidKey = (credential.uuidKey || (credential.uuidKey = (_b = (onceCredential ? batch[0] : item).credential) === null || _b === void 0 ? void 0 : _b.uuidKey));
         const targetObject = typeof checkObject === 'string' ? this.hasCoerce("redis", 'options', uuidKey) && (0, types_1.asFunction)(checkObject) : checkObject;
         const renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
@@ -312,11 +315,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                         const flags = setOptions.set;
                                         if (flags) {
                                             if ('NX' in flags) {
-                                                NX ?? (NX = !!flags.NX);
+                                                NX !== null && NX !== void 0 ? NX : (NX = !!flags.NX);
                                                 delete flags.NX;
                                             }
                                             if ('XX' in flags) {
-                                                XX ?? (XX = !!flags.XX);
+                                                XX !== null && XX !== void 0 ? XX : (XX = !!flags.XX);
                                                 delete flags.XX;
                                             }
                                             if ('EX' in flags) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.3.3",
+  "version": "0.3.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.6.2",
-    "@e-mc/types": "^0.6.2",
-    "redis": "^4.6.13"
+    "@e-mc/db": "^0.6.7",
+    "@e-mc/types": "^0.6.7",
+    "redis": "^4.6.15"
   }
 }