@trunkrs/common 1.6.3 → 1.6.6
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/package.json
CHANGED
|
@@ -8,7 +8,10 @@ const errors_1 = require("../../models/errors");
|
|
|
8
8
|
const defaultTimeout = 3000;
|
|
9
9
|
class AxiosClient {
|
|
10
10
|
constructor() {
|
|
11
|
-
this.axiosClient = axios_1.default.create(
|
|
11
|
+
this.axiosClient = axios_1.default.create({
|
|
12
|
+
httpAgent: new (require('http').Agent)(),
|
|
13
|
+
httpsAgent: new (require('https').Agent)(),
|
|
14
|
+
});
|
|
12
15
|
}
|
|
13
16
|
static createError(error, request) {
|
|
14
17
|
var _a, _b, _c;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosClient.js","sourceRoot":"","sources":["../../../services/client/AxiosClient.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"AxiosClient.js","sourceRoot":"","sources":["../../../services/client/AxiosClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,9 @@ import { RedisClientType } from 'redis';
|
|
|
2
2
|
import SetOptions from './types/SetOptions';
|
|
3
3
|
declare class RedisClient {
|
|
4
4
|
private readonly client;
|
|
5
|
+
private needsConnectionCounter;
|
|
6
|
+
private connect;
|
|
7
|
+
private disconnect;
|
|
5
8
|
constructor(client: RedisClientType);
|
|
6
9
|
set(key: string, value: string, options?: SetOptions): Promise<void>;
|
|
7
10
|
get(key: string): Promise<string | null>;
|
|
@@ -3,28 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
class RedisClient {
|
|
4
4
|
constructor(client) {
|
|
5
5
|
this.client = client;
|
|
6
|
+
this.needsConnectionCounter = 0;
|
|
7
|
+
}
|
|
8
|
+
async connect() {
|
|
9
|
+
this.needsConnectionCounter += 1;
|
|
10
|
+
if (this.needsConnectionCounter === 1) {
|
|
11
|
+
await this.client.connect();
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
async disconnect() {
|
|
15
|
+
this.needsConnectionCounter -= 1;
|
|
16
|
+
if (!this.needsConnectionCounter) {
|
|
17
|
+
await this.client.disconnect();
|
|
18
|
+
}
|
|
6
19
|
}
|
|
7
20
|
async set(key, value, options) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
21
|
+
try {
|
|
22
|
+
await this.connect();
|
|
23
|
+
const commandOptions = {};
|
|
24
|
+
if (options === null || options === void 0 ? void 0 : options.expiresAt) {
|
|
25
|
+
Object.assign(commandOptions, {
|
|
26
|
+
PXAT: options.expiresAt.getTime(),
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
if (options === null || options === void 0 ? void 0 : options.setCondition) {
|
|
30
|
+
Object.assign(commandOptions, {
|
|
31
|
+
[options.setCondition]: true,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
await this.client.set(key, value, commandOptions);
|
|
13
35
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
[options.setCondition]: true,
|
|
17
|
-
});
|
|
36
|
+
finally {
|
|
37
|
+
await this.disconnect();
|
|
18
38
|
}
|
|
19
|
-
await this.client.connect();
|
|
20
|
-
await this.client.set(key, value, commandOptions);
|
|
21
|
-
await this.client.disconnect();
|
|
22
39
|
}
|
|
23
40
|
async get(key) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
41
|
+
try {
|
|
42
|
+
await this.connect();
|
|
43
|
+
const item = await this.client.get(key);
|
|
44
|
+
return item;
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
await this.disconnect();
|
|
48
|
+
}
|
|
28
49
|
}
|
|
29
50
|
async getOrSet(key, factory, setOptions) {
|
|
30
51
|
let value = await this.get(key);
|
|
@@ -35,14 +56,22 @@ class RedisClient {
|
|
|
35
56
|
return value;
|
|
36
57
|
}
|
|
37
58
|
async delete(...keys) {
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
59
|
+
try {
|
|
60
|
+
await this.connect();
|
|
61
|
+
await this.client.del(keys);
|
|
62
|
+
}
|
|
63
|
+
finally {
|
|
64
|
+
await this.disconnect();
|
|
65
|
+
}
|
|
41
66
|
}
|
|
42
67
|
async clear() {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
68
|
+
try {
|
|
69
|
+
await this.connect();
|
|
70
|
+
await this.client.FLUSHALL();
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
await this.disconnect();
|
|
74
|
+
}
|
|
46
75
|
}
|
|
47
76
|
}
|
|
48
77
|
exports.default = RedisClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisClient.js","sourceRoot":"","sources":["../../../services/redis/RedisClient.ts"],"names":[],"mappings":";;AAIA,MAAM,WAAW;
|
|
1
|
+
{"version":3,"file":"RedisClient.js","sourceRoot":"","sources":["../../../services/redis/RedisClient.ts"],"names":[],"mappings":";;AAIA,MAAM,WAAW;IAmBf,YAAoC,MAAuB;QAAvB,WAAM,GAAN,MAAM,CAAiB;QAlBnD,2BAAsB,GAAG,CAAC,CAAA;IAkB4B,CAAC;IAhBvD,KAAK,CAAC,OAAO;QACnB,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAA;QAEhC,IAAI,IAAI,CAAC,sBAAsB,KAAK,CAAC,EAAE;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;SAC5B;IACH,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAA;QAEhC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAChC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAA;SAC/B;IACH,CAAC;IAWM,KAAK,CAAC,GAAG,CACd,GAAW,EACX,KAAa,EACb,OAAoB;QAEpB,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YACpB,MAAM,cAAc,GAAG,EAAE,CAAA;YAEzB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,EAAE;gBACtB,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE;oBAE5B,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE;iBAClC,CAAC,CAAA;aACH;YAED,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,EAAE;gBACzB,MAAM,CAAC,MAAM,CAAC,cAAc,EAAE;oBAC5B,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI;iBAC7B,CAAC,CAAA;aACH;YAED,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,cAAc,CAAC,CAAA;SAClD;gBAAS;YACR,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;SACxB;IACH,CAAC;IAQM,KAAK,CAAC,GAAG,CAAC,GAAW;QAC1B,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YAEpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACvC,OAAO,IAAI,CAAA;SACZ;gBAAS;YACR,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;SACxB;IACH,CAAC;IAWM,KAAK,CAAC,QAAQ,CACnB,GAAW,EACX,OAA8B,EAC9B,UAAuB;QAEvB,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE/B,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,MAAM,OAAO,EAAE,CAAA;YAEvB,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAA;SACvC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAOM,KAAK,CAAC,MAAM,CAAC,GAAG,IAAc;QACnC,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YACpB,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;SAC5B;gBAAS;YACR,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;SACxB;IACH,CAAC;IAMM,KAAK,CAAC,KAAK;QAChB,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAA;YACpB,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAA;SAC7B;gBAAS;YACR,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;SACxB;IACH,CAAC;CACF;AAED,kBAAe,WAAW,CAAA"}
|