@pi-r/redis 0.8.3 → 0.9.0

package/LICENSE

@@ -1,7 +1,7 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -4,4 +4,4 @@ https://e-mc.readthedocs.io/en/latest/db/redis.html
 
 ### LICENSE
 
-MIT
+MIT

package/client/index.js

@@ -5,10 +5,10 @@ exports.executeQuery = executeQuery;
 exports.executeBatchQuery = executeBatchQuery;
 exports.checkTimeout = checkTimeout;
 const redis = require("redis");
-const crypto_1 = require("crypto");
+const node_crypto_1 = require("node:crypto");
 const Db = require("@e-mc/db");
-const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
+const util_1 = require("@e-mc/db/util");
 const DbPool = require("@pi-r/redis/client/pool");
 const POOL_STATE = {};
 async function doScan(client, key, index, cursor = [0], iterations = [Infinity], options) {
@@ -41,9 +41,11 @@ async function getClient(db, options, poolKey) {
                 delete POOL_STATE[poolKey];
             });
         }
-        client.connect().then(() => {
+        client.connect()
+            .then(() => {
             resolve(client);
-        }).catch((err) => {
+        })
+            .catch((err) => {
             reject(err);
         });
     });
@@ -223,7 +225,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 ||= (onceCredential ? batch[0] : item).credential?.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;
@@ -523,7 +525,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     const { query = '', schema, index } = target;
                     let idx = '';
                     if ((0, types_1.isObject)(schema)) {
-                        idx = index || (0, crypto_1.randomUUID)();
+                        idx = index || (0, node_crypto_1.randomUUID)();
                         await (command ? client.ft.create(command, idx, schema, target.options) : client.ft.create(idx, schema, target.options));
                     }
                     try {
@@ -536,6 +538,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                     }
                     catch (err) {
+                        this.addLog(this.statusType.WARN, err, this.moduleName, target === search ? 'FT.SEARCH' : 'FT.AGGREGATE');
                         if (err instanceof Error) {
                             throw err;
                         }
@@ -585,7 +588,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                                 break;
                             default:
                                 if (item.field) {
-                                    data = client.hGet(...command ? [command, key, item.field] : [key, item.field]);
+                                    data = await client.hGet(...command ? [command, key, item.field] : [key, item.field]);
                                 }
                                 else {
                                     data = await client.hGetAll(...command ? [command, key] : [key]);

package/client/pool.d.ts

@@ -1,9 +1,9 @@
-import type { DbPoolConstructor } from '@e-mc/types/lib/db';
-
-import type { DbPoolCredential, RedisDataSource } from '../types';
-
-import type { RedisClientType } from 'redis';
-
-declare const RedisPool: DbPoolConstructor<RedisDataSource, RedisClientType, RedisClientType, DbPoolCredential>;
-
+import type { DbPoolConstructor } from '@e-mc/types/lib/db';
+
+import type { DbPoolCredential, RedisDataSource } from '../types';
+
+import type { RedisClientType } from 'redis';
+
+declare const RedisPool: DbPoolConstructor<RedisDataSource, RedisClientType, RedisClientType, DbPoolCredential>;
+
 export = RedisPool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "description": "Redis client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -14,15 +14,14 @@
   },
   "keywords": [
     "squared",
-    "e-mc",
-    "squared-functions"
+    "e-mc"
   ],
   "author": "An Pham <anpham6@gmail.com>",
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.10.3",
-    "@e-mc/types": "^0.10.3",
+    "@e-mc/db": "^0.11.0",
+    "@e-mc/types": "^0.11.0",
     "redis": "^4.7.0"
   }
 }

package/types/index.d.ts

@@ -2,6 +2,7 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 import type { IdentifierAction } from '@e-mc/types/lib/core';
 import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
+import type { AuthValue } from '@e-mc/types/lib/http';
 
 import type { ClientCommandOptions } from '@redis/client/dist/lib/client';
 import type { RedisCommandArgument } from '@redis/client/dist/lib/commands';
@@ -13,16 +14,16 @@ import type { HScanTuple } from '@redis//client/dist/lib/commands/HSCAN';
 import type { ScanOptions } from '@redis/client/dist/lib/commands/generic-transformers';
 import type { RediSearchSchema, SearchOptions, SetOptions } from 'redis';
 
-export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, RedisCredential, string>, CascadeAction, AuthValue {
+export interface RedisDataSource extends DbDataSource<string, PlainObject, RedisSetValue | RedisSetValue[] | RedisJSONValue | RedisJSONValue[], RedisCredential, string>, CascadeAction, AuthValue {
     source: "redis";
-    key?: ArrayOf<RedisCommandArgument>;
+    key?: RedisCommandArgument | RedisCommandArgument[];
     field?: RedisCommandArgument;
     path?: string;
     format?: RedisFormat | "HKEYS" | "HVALS" | "HSCAN";
     search?: RedisQuery;
     aggregate?: RedisQuery;
-    cursor?: ArrayOf<number>;
-    iterations?: ArrayOf<number>;
+    cursor?: number | number[];
+    iterations?: number | number[];
     options?: {
         client?: RedisClientOptions;
         command?: RedisCommandOptions;
@@ -59,7 +60,7 @@ export interface RedisSetValue extends RedisCommand<"HASH", RedisCommandArgument
     KEEPTTL?: boolean;
 }
 
-export interface RedisJSONValue extends RedisCommand<"JSON", string, ArrayOf<RedisJSON>> {
+export interface RedisJSONValue extends RedisCommand<"JSON", string, RedisJSON | RedisJSON[]> {
     command?: RedisCommandJSON;
     path?: string;
     start?: number | string;