@pi-r/redis 0.2.8 → 0.3.2

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 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:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/redis
 
-PEP 402 - Forever
+PEP 402 - Forever Aina
 
 ## LICENSE
 

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = void 0;
+const redis = require("redis");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -105,7 +106,6 @@ async function setCredential(item) {
         }
         const poolKey = getPoolKey(client);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const db = require("redis");
             const config = this.getPoolConfig("redis", password);
             const poolOptions = client.isolationPoolOptions || (client.isolationPoolOptions = {});
             if (config) {
@@ -127,9 +127,9 @@ async function setCredential(item) {
                 }
             }
             try {
-                const redis = new RedisPool(await getClient(db, client, poolKey), poolKey, username && password ? { username, password } : undefined).add(item);
-                redis.parent = POOL_STATE;
-                redis.success = 1;
+                const target = new RedisPool(await getClient(redis, client, poolKey), poolKey, username && password ? { username, password } : undefined).add(item);
+                target.parent = POOL_STATE;
+                target.success = 1;
             }
             catch {
                 item.usePool = false;
@@ -151,7 +151,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("redis");
     let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -193,7 +192,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     (credential.isolationPoolOptions || (credential.isolationPoolOptions = {})).max = size;
                 }
             }
-            clients.push(client = await getClient(db, credential));
+            clients.push(client = await getClient(redis, credential));
         }
         if (connectOnce) {
             redisClient = client;
@@ -228,7 +227,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const targetObject = typeof checkObject === 'string' ? this.hasCoerce("redis", 'options', uuidKey) && (0, types_1.asFunction)(checkObject) : checkObject;
         const renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
-        const command = (0, types_1.isPlainObject)(clientOptions.command) ? db.commandOptions(clientOptions.command) : null;
+        const command = (0, types_1.isPlainObject)(clientOptions.command) ? redis.commandOptions(clientOptions.command) : null;
         let queryString = '', rows;
         if (caching && ignoreCache !== true || ignoreCache === false || ignoreCache === 1 || renewCache) {
             if ((0, types_1.isObject)(search)) {
@@ -290,7 +289,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             }
                             const failKey = () => failed((0, types_1.errorMessage)(f, "Invalid key", Db.asString(k) || "Unknown"));
                             const failValue = () => failed((0, types_1.errorMessage)(f, "Invalid value", Db.asString(v) || "Unknown"));
-                            const commandSet = (0, types_1.isPlainObject)(setOptions.command) && db.commandOptions(setOptions.command);
+                            const commandSet = (0, types_1.isPlainObject)(setOptions.command) && redis.commandOptions(setOptions.command);
                             let pending;
                             if ((f = f.toUpperCase()) === 'JSON') {
                                 if (typeof k !== 'string') {
@@ -451,7 +450,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     try {
                         if (target === search) {
                             const reply = await (command ? client.ft.search(command, index || idx, query, clientOptions.search) : client.ft.search(index || idx, query, clientOptions.search));
-                            rows = reply.documents.map(doc => (doc.value['__id__'] = doc.id) && doc.value);
+                            rows = reply.documents.map(doc => (doc.value.__id__ = doc.id) && doc.value);
                         }
                         else {
                             ({ results: rows } = await (command ? client.ft.aggregate(command, index || idx, query, clientOptions.aggregate) : client.ft.aggregate(index || idx, query, clientOptions.aggregate)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/redis",
-  "version": "0.2.8",
+  "version": "0.3.2",
   "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.5.4",
-    "@e-mc/types": "^0.5.4",
+    "@e-mc/db": "^0.6.1",
+    "@e-mc/types": "^0.6.1",
     "redis": "^4.6.13"
   }
 }