@pi-r/redis 0.2.13 → 0.2.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/index.js +6 -5
- package/package.json +3 -3
- package/client/pool.js +0 -36
package/client/index.js
CHANGED
|
@@ -155,9 +155,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
155
155
|
return [];
|
|
156
156
|
}
|
|
157
157
|
const db = require("redis");
|
|
158
|
-
let parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss;
|
|
158
|
+
let parallel, checkObject, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss;
|
|
159
159
|
if ((0, types_1.isPlainObject)(options)) {
|
|
160
|
-
({ parallel, checkObject, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
|
|
160
|
+
({ parallel, checkObject, connectOnce, errorQuery, errorAsEmpty, sessionKey, outCacheMiss } = options);
|
|
161
161
|
}
|
|
162
162
|
else {
|
|
163
163
|
if (typeof options === 'string') {
|
|
@@ -249,7 +249,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
249
249
|
if (queryString) {
|
|
250
250
|
queryString += '_' + format;
|
|
251
251
|
}
|
|
252
|
-
if (ignoreCache !== 1) {
|
|
252
|
+
if (ignoreCache !== 1 && !update) {
|
|
253
253
|
if (rows = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue)) {
|
|
254
254
|
++redisCache;
|
|
255
255
|
if (parallel) {
|
|
@@ -549,8 +549,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
549
549
|
}
|
|
550
550
|
}
|
|
551
551
|
return this.processRows(batch, tasks, {
|
|
552
|
-
|
|
553
|
-
|
|
552
|
+
parallel,
|
|
553
|
+
errorAsEmpty,
|
|
554
|
+
disconnect: () => clients.forEach(item => item.disconnect())
|
|
554
555
|
}, outResult);
|
|
555
556
|
}
|
|
556
557
|
exports.executeBatchQuery = executeBatchQuery;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pi-r/redis",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.15",
|
|
4
4
|
"description": "Redis client driver for E-mc.",
|
|
5
5
|
"main": "client/index.js",
|
|
6
6
|
"types": "client/index.d.ts",
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
"license": "MIT",
|
|
22
22
|
"homepage": "https://github.com/anpham6/pi-r#readme",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@e-mc/db": "^0.5.
|
|
25
|
-
"@e-mc/types": "^0.5.
|
|
24
|
+
"@e-mc/db": "^0.5.23",
|
|
25
|
+
"@e-mc/types": "^0.5.23",
|
|
26
26
|
"redis": "^4.6.15"
|
|
27
27
|
}
|
|
28
28
|
}
|
package/client/pool.js
DELETED
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
const DbPool = require('@e-mc/db/pool');
|
|
3
|
-
const POOL_ACTIVE = new WeakSet();
|
|
4
|
-
class RedisPool extends DbPool {
|
|
5
|
-
static asString(credential) {
|
|
6
|
-
if (credential.url) {
|
|
7
|
-
return JSON.stringify(credential);
|
|
8
|
-
}
|
|
9
|
-
return super.asString(credential);
|
|
10
|
-
}
|
|
11
|
-
static sanitize(credential) {
|
|
12
|
-
if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
|
|
13
|
-
return credential;
|
|
14
|
-
}
|
|
15
|
-
if ('socket' in credential || 'isolationPoolOptions' in credential) {
|
|
16
|
-
return { ...credential, socket: credential.socket?.tls ? { tls: true } : undefined, isolationPoolOptions: undefined };
|
|
17
|
-
}
|
|
18
|
-
return credential;
|
|
19
|
-
}
|
|
20
|
-
async getConnection(credential) {
|
|
21
|
-
if (credential) {
|
|
22
|
-
POOL_ACTIVE.add(credential);
|
|
23
|
-
}
|
|
24
|
-
return this.client;
|
|
25
|
-
}
|
|
26
|
-
async close() {
|
|
27
|
-
return this.client.disconnect();
|
|
28
|
-
}
|
|
29
|
-
isEmpty() {
|
|
30
|
-
return this.closed;
|
|
31
|
-
}
|
|
32
|
-
get closed() {
|
|
33
|
-
return !this.client.isOpen;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
module.exports = RedisPool;
|