@pi-r/redis 0.6.9 → 0.6.11
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 +2 -2
- package/package.json +3 -3
- package/client/pool.js +0 -36
package/client/index.js
CHANGED
|
@@ -256,7 +256,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
256
256
|
if (queryString) {
|
|
257
257
|
queryString += '_' + format;
|
|
258
258
|
}
|
|
259
|
-
if (ignoreCache !== 1) {
|
|
259
|
+
if (ignoreCache !== 1 && !update) {
|
|
260
260
|
if (rows = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue)) {
|
|
261
261
|
++redisCache;
|
|
262
262
|
if (parallel) {
|
|
@@ -455,7 +455,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
|
|
|
455
455
|
}
|
|
456
456
|
if (pending) {
|
|
457
457
|
pending.then(async (code) => {
|
|
458
|
-
if (code === undefined || code === null ||
|
|
458
|
+
if (code === undefined || code === null || (0, types_1.isString)(code) && code !== 'OK' && codeMin !== -Infinity || typeof code === 'number' && code <= codeMin || Array.isArray(code) && code.every(resp => resp === null || typeof resp === 'number' && resp <= codeMin)) {
|
|
459
459
|
failValue();
|
|
460
460
|
return;
|
|
461
461
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pi-r/redis",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.11",
|
|
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.8.
|
|
25
|
-
"@e-mc/types": "^0.8.
|
|
24
|
+
"@e-mc/db": "^0.8.29",
|
|
25
|
+
"@e-mc/types": "^0.8.29",
|
|
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;
|