@pi-r/redis 0.6.2 → 0.6.4

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

@@ -6,7 +6,6 @@ const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
 const DbPool = require('@e-mc/db/pool');
-const REDIS_V4 = Db.checkSemVer("redis" /* STRINGS.MODULE_NAME */, 4);
 class RedisPool extends DbPool {
     async getConnection() {
         return this.client;
@@ -22,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) {
@@ -41,16 +41,13 @@ 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;
 }
 const getPoolKey = (options) => options.url && JSON.stringify(options);
 async function setCredential(item) {
-    if (!REDIS_V4) {
-        throw (0, types_1.errorValue)("Upgrade client to latest version" /* ERR_DB.UPGRADE */, "redis" /* STRINGS.MODULE_NAME */ + '@' + Db.getPackageVersion("redis" /* STRINGS.MODULE_NAME */));
-    }
     const credential = this.getCredential(item);
     const options = item.options || (item.options = {});
     const client = (0, types_1.isPlainObject)(options.client) ? options.client : options.client = {};
@@ -192,6 +189,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             if (pool) {
                 client = pool.client;
                 pool.connected = true;
+                POOL_ACTIVE.add(credential);
             }
         }
         if (!client) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Redis client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/redis"
   },
   "keywords": [
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.2",
-    "@e-mc/types": "^0.8.2",
-    "redis": "^4.6.12"
+    "@e-mc/db": "^0.8.4",
+    "@e-mc/types": "^0.8.4",
+    "redis": "^4.6.13"
   }
 }

package/types/index.d.ts

@@ -7,7 +7,7 @@ import type { ClientCommandOptions } from '@redis/client/dist/lib/client';
 import type { RedisClientOptions } from '@redis/client';
 import type { RedisCommandArgument } from '@redis/client/dist/lib/commands';
 import type { RedisJSON } from '@redis/json/dist/commands';
-import type { AggregateOptions, RediSearchSchema, SearchOptions, SetOptions } from 'redis';
+import type { RediSearchSchema, SearchOptions, SetOptions } from 'redis';
 
 export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, string | RedisCredential, string>, AuthValue, CascadeAction {
     source: "redis";
@@ -22,7 +22,7 @@ export interface RedisDataSource extends DbDataSource<string, PlainObject, Array
         command?: RedisCommandOptions;
         get?: PlainObject;
         search?: SearchOptions;
-        aggregate?: AggregateOptions;
+        aggregate?: PlainObject;
     };
     database?: number;
 }