@pi-r/redis 0.8.5 → 0.8.6

package/client/index.js

@@ -202,7 +202,7 @@ 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, uri, key, search, aggregate, update, 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))) {
             ++redisCache;
@@ -226,6 +226,7 @@ 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 };
+        const format = (key ? item.format?.toUpperCase() || 'HASH' : undefined);
         let queryString = '', rows;
         if (caching && ignoreCache !== true) {
             if ((0, types_1.isObject)(search)) {
@@ -234,17 +235,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
             else if ((0, types_1.isObject)(aggregate)) {
                 queryString = Db.asString(aggregate, true);
             }
-            else if (!targetObject) {
-                queryString = Db.asString(key, true);
-            }
-            else if (cacheObjectKey) {
-                queryString = Db.asString(key, true) + '_' + targetObject.toString() + cacheObjectKey;
-            }
-            if (queryString) {
-                queryString += '_' + format;
+            else if (key) {
+                queryString = Db.asString(key, true) + '_' + format;
+                if (targetObject && typeof item.cacheObjectKey === 'string') {
+                    queryString += '_' + targetObject.toString() + item.cacheObjectKey;
+                }
             }
-            if (ignoreCache !== 1) {
-                if (rows = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue)) {
+            if (ignoreCache !== 1 && !update) {
+                if (rows = this.getQueryResult(source, DbPool.sanitize(redisCredential || credential), queryString, cacheValue)) {
                     ++redisCache;
                     if (parallel) {
                         tasks[i] = Promise.resolve(rows);
@@ -444,7 +442,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             }
                             if (pending) {
                                 pending.then(async (code) => {
-                                    if (code === undefined || code === null || code !== -Infinity && (0, types_1.isString)(code) && code !== 'OK' || typeof code === 'number' && code <= codeMin || Array.isArray(code) && code.every(resp => resp === null || typeof resp === 'number' && resp <= codeMin)) {
+                                    if (code === undefined || code === null || (0, types_1.isString)(code) && code !== 'OK' && codeMin !== -Infinity || typeof code === 'number' && code <= codeMin || Array.isArray(code) && code.every(resp => resp === null || typeof resp === 'number' && resp <= codeMin)) {
                                         failValue();
                                         return;
                                     }
@@ -551,7 +549,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 else if (key) {
                     let data;
                     if (Array.isArray(key)) {
-                        switch (format.toUpperCase()) {
+                        switch (format) {
                             case 'HKEYS':
                                 data = await Promise.all(key.map(async (k) => client.hKeys(...command ? [command, k] : [k])));
                                 break;
@@ -570,7 +568,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                     }
                     else {
-                        switch (format.toUpperCase()) {
+                        switch (format) {
                             case 'HKEYS':
                                 data = await client.hKeys(...command ? [command, key] : [key]);
                                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "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.10.20",
-    "@e-mc/types": "^0.10.20",
+    "@e-mc/db": "^0.10.21",
+    "@e-mc/types": "^0.10.21",
     "redis": "^4.7.0"
   }
 }