@pi-r/redis 0.6.1 → 0.6.3

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/redis
 
+https://e-mc.readthedocs.io/en/latest/db/redis.html
+
 ### LICENSE
 
 MIT

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;
@@ -46,11 +45,8 @@ function removePoolProperties(options) {
     }
     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) => 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 = {};
@@ -99,18 +95,19 @@ async function setCredential(item) {
     let pool;
     username = undefined;
     password = undefined;
-    if (typeof usePool === 'string' && (username = client.username || (0, util_1.parseConnectionString)(uri)?.username)) {
-        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-        if (pool) {
-            pool.add(item, password);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = client.username || (0, util_1.parseConnectionString)(uri)?.username) {
+            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+            if (pool) {
+                pool.add(item, password);
+                return;
+            }
+        }
+        if (!password) {
+            item.usePool = '';
             return;
         }
     }
-    const poolKey = getPoolKey(client);
-    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
-        pool.add(item);
-        return;
-    }
     const config = this.getPoolConfig("redis" /* STRINGS.MODULE_NAME */, password);
     const poolOptions = client.isolationPoolOptions || (client.isolationPoolOptions = {});
     if (config) {
@@ -134,6 +131,11 @@ async function setCredential(item) {
             poolOptions.acquireTimeoutMillis ?? (poolOptions.acquireTimeoutMillis = timeout);
         }
     }
+    const poolKey = getPoolKey(client);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     try {
         const target = new RedisPool(await getClient(redis, client, poolKey), poolKey, username && password ? { username, password } : undefined).add(item);
         target.parent = POOL_STATE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "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.1",
-    "@e-mc/types": "^0.8.1",
+    "@e-mc/db": "^0.8.3",
+    "@e-mc/types": "^0.8.3",
     "redis": "^4.6.12"
   }
 }

package/types/index.d.ts

@@ -1,15 +1,15 @@
 import type { DbDataSource } from '@e-mc/types/lib/squared';
 
-import type { CascadeAction, ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
+import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
 
 import type { CommandOptions } from '@redis/client/dist/lib/command-options';
-import type { ClientCommandOptions, JMSetItem } from '@redis/client/dist/lib/client';
+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>, CascadeAction, AuthValue {
+export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, string | RedisCredential, string>, AuthValue, CascadeAction {
     source: "redis";
     key?: ArrayOf<RedisCommandArgument>;
     field?: RedisCommandArgument;
@@ -22,7 +22,7 @@ export interface RedisDataSource extends DbDataSource<string, PlainObject, Array
         command?: RedisCommandOptions;
         get?: PlainObject;
         search?: SearchOptions;
-        aggregate?: AggregateOptions;
+        aggregate?: PlainObject;
     };
     database?: number;
 }