@pi-r/redis 0.7.2 → 0.7.4

package/README.md

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

package/client/index.js

@@ -162,7 +162,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         parallel = false;
     }
     else if (parallel === undefined) {
-        parallel = !batch.some(item => item.parallel === false);
+        parallel = !batch.some(item => item.parallel === false || !!item.update);
     }
     if (!parallel) {
         outResult ||= new Array(length);

package/client/pool.js

@@ -0,0 +1,36 @@
+"use strict";
+const DbPool = require('@e-mc/db/pool');
+const POOL_ACTIVE = new WeakSet();
+class RedisPool extends DbPool {
+    static asString(credential) {
+        if (credential.url) {
+            return JSON.stringify(credential);
+        }
+        return super.asString(credential);
+    }
+    static sanitize(credential) {
+        if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
+            return credential;
+        }
+        if ('socket' in credential || 'isolationPoolOptions' in credential) {
+            return { ...credential, socket: credential.socket?.tls ? { tls: true } : undefined, isolationPoolOptions: undefined };
+        }
+        return credential;
+    }
+    async getConnection(credential) {
+        if (credential) {
+            POOL_ACTIVE.add(credential);
+        }
+        return this.client;
+    }
+    async close() {
+        return this.client.disconnect();
+    }
+    isEmpty() {
+        return this.closed;
+    }
+    get closed() {
+        return !this.client.isOpen;
+    }
+}
+module.exports = RedisPool;

package/package.json

@@ -1,28 +1,28 @@
-{
-  "name": "@pi-r/redis",
-  "version": "0.7.2",
-  "description": "Redis client driver for E-mc.",
-  "main": "client/index.js",
-  "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/db/redis"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/db": "^0.9.4",
-    "@e-mc/types": "^0.9.4",
-    "redis": "^4.6.14"
-  }
-}
+{
+  "name": "@pi-r/redis",
+  "version": "0.7.4",
+  "description": "Redis client driver for E-mc.",
+  "main": "client/index.js",
+  "types": "client/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/db/redis"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/db": "^0.9.12",
+    "@e-mc/types": "^0.9.12",
+    "redis": "^4.7.0"
+  }
+}

package/types/index.d.ts

@@ -1,83 +1,83 @@
-import type { DbDataSource } from '@e-mc/types/lib/squared';
-
-import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
-
-import type { CommandOptions } from '@redis/client/dist/lib/command-options';
-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 { RediSearchSchema, SearchOptions, SetOptions } from 'redis';
-
-export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, RedisCredential, string>, CascadeAction, AuthValue {
-    source: "redis";
-    key?: ArrayOf<RedisCommandArgument>;
-    field?: RedisCommandArgument;
-    path?: string;
-    format?: RedisFormat | "HKEYS" | "HVALS";
-    search?: RedisQuery;
-    aggregate?: RedisQuery;
-    options?: {
-        client?: RedisClientOptions;
-        command?: RedisCommandOptions;
-        get?: PlainObject;
-        search?: SearchOptions;
-        aggregate?: PlainObject;
-    };
-    database?: number;
-}
-
-export type RedisCredential = ServerAuth;
-
-export interface RedisCommand<T = "HASH" | "JSON" | undefined, U = unknown, V = unknown> {
-    format: T;
-    command?: string;
-    key?: U;
-    value?: V;
-    NX?: boolean;
-    XX?: boolean;
-    options?: {
-        set?: SetOptions;
-        expire?: { [K in RedisExpireCondition]?: boolean; };
-        command?: RedisCommandOptions;
-    };
-}
-
-export interface RedisSetValue extends RedisCommand<"HASH", RedisCommandArgument, RedisCommandValue | RedisHSETObject> {
-    field?: RedisCommandValue | RedisHSETObject;
-    EX?: number;
-    PX?: number;
-    EXAT?: number;
-    PXAT?: number;
-    KEEPTTL?: boolean;
-}
-
-export interface RedisJSONValue extends RedisCommand<"JSON", string, ArrayOf<RedisJSON>> {
-    command?: RedisCommandJSON;
-    path?: string;
-    start?: number | string;
-    stop?: number | string;
-    index?: number | string;
-}
-
-export interface RedisQuery {
-    index?: string;
-    schema?: RediSearchSchema | string;
-    query?: string;
-    options?: PlainObject;
-}
-
-export interface JsonMSetItem {
-    key: RedisCommandArgument;
-    path: RedisCommandArgument;
-    value: RedisJSON;
-}
-
-export type RedisFormat = "HASH" | "JSON";
-export type RedisCommandJSON = "ARRAPPEND" | "ARRINDEX" | "ARRINSERT" | "ARRPOP" | "ARRTRIM" | "DEL" | "FORGET" | "MERGE" | "MSET" | "NUMINCRBY" | "NUMMULTBY" | "SET" | "STRAPPEND";
-export type RedisExpireCondition = "NX" | "XX" | "GT" | "LT";
-export type RedisCommandValue = RedisCommandArgument | number;
-export type RedisCommandOptions = CommandOptions<ClientCommandOptions>;
-export type RedisHSETObject = Record<number | string, RedisCommandValue>;
-
+import type { DbDataSource } from '@e-mc/types/lib/squared';
+
+import type { CascadeAction, ServerAuth } from '@e-mc/types/lib/db';
+
+import type { CommandOptions } from '@redis/client/dist/lib/command-options';
+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 { RediSearchSchema, SearchOptions, SetOptions } from 'redis';
+
+export interface RedisDataSource extends DbDataSource<string, PlainObject, ArrayOf<RedisSetValue> | ArrayOf<RedisJSONValue>, RedisCredential, string>, CascadeAction, AuthValue {
+    source: "redis";
+    key?: ArrayOf<RedisCommandArgument>;
+    field?: RedisCommandArgument;
+    path?: string;
+    format?: RedisFormat | "HKEYS" | "HVALS";
+    search?: RedisQuery;
+    aggregate?: RedisQuery;
+    options?: {
+        client?: RedisClientOptions;
+        command?: RedisCommandOptions;
+        get?: PlainObject;
+        search?: SearchOptions;
+        aggregate?: PlainObject;
+    };
+    database?: number;
+}
+
+export type RedisCredential = ServerAuth;
+
+export interface RedisCommand<T = "HASH" | "JSON" | undefined, U = unknown, V = unknown> {
+    format: T;
+    command?: string;
+    key?: U;
+    value?: V;
+    NX?: boolean;
+    XX?: boolean;
+    options?: {
+        set?: SetOptions;
+        expire?: { [K in RedisExpireCondition]?: boolean; };
+        command?: RedisCommandOptions;
+    };
+}
+
+export interface RedisSetValue extends RedisCommand<"HASH", RedisCommandArgument, RedisCommandValue | RedisHSETObject> {
+    field?: RedisCommandValue | RedisHSETObject;
+    EX?: number;
+    PX?: number;
+    EXAT?: number;
+    PXAT?: number;
+    KEEPTTL?: boolean;
+}
+
+export interface RedisJSONValue extends RedisCommand<"JSON", string, ArrayOf<RedisJSON>> {
+    command?: RedisCommandJSON;
+    path?: string;
+    start?: number | string;
+    stop?: number | string;
+    index?: number | string;
+}
+
+export interface RedisQuery {
+    index?: string;
+    schema?: RediSearchSchema | string;
+    query?: string;
+    options?: PlainObject;
+}
+
+export interface JsonMSetItem {
+    key: RedisCommandArgument;
+    path: RedisCommandArgument;
+    value: RedisJSON;
+}
+
+export type RedisFormat = "HASH" | "JSON";
+export type RedisCommandJSON = "ARRAPPEND" | "ARRINDEX" | "ARRINSERT" | "ARRPOP" | "ARRTRIM" | "DEL" | "FORGET" | "MERGE" | "MSET" | "NUMINCRBY" | "NUMMULTBY" | "SET" | "STRAPPEND";
+export type RedisExpireCondition = "NX" | "XX" | "GT" | "LT";
+export type RedisCommandValue = RedisCommandArgument | number;
+export type RedisCommandOptions = CommandOptions<ClientCommandOptions>;
+export type RedisHSETObject = Record<number | string, RedisCommandValue>;
+
 export type { RedisCommandArgument, RedisJSON };