@zetra/citrineos-util 1.8.3-fork.93 → 1.8.3-fork.95
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/dist/cache/redis.js +16 -19
- package/dist/cache/redis.js.map +1 -1
- package/package.json +3 -3
package/dist/cache/redis.js
CHANGED
|
@@ -37,28 +37,30 @@ export class RedisCache {
|
|
|
37
37
|
return new Promise((resolve) => {
|
|
38
38
|
// Create a Redis subscriber to listen for operations affecting the key
|
|
39
39
|
const subscriber = createClient();
|
|
40
|
+
let closed = false;
|
|
41
|
+
// Cancel the fallback timer and close the subscriber, exactly once
|
|
42
|
+
const cleanup = () => {
|
|
43
|
+
if (closed)
|
|
44
|
+
return;
|
|
45
|
+
closed = true;
|
|
46
|
+
if (timer)
|
|
47
|
+
clearTimeout(timer);
|
|
48
|
+
subscriber.quit().catch((error) => {
|
|
49
|
+
console.log('Error quitting subscriber', error);
|
|
50
|
+
});
|
|
51
|
+
};
|
|
40
52
|
// Channel: Key-space, message: the name of the event, which is the command executed on the key
|
|
41
53
|
subscriber
|
|
42
54
|
.subscribe(`__keyspace@0__:${key}`, (channel, message) => {
|
|
43
55
|
switch (message) {
|
|
44
56
|
case 'set':
|
|
45
57
|
resolve(this.get(key, namespace, classConstructor));
|
|
46
|
-
|
|
47
|
-
.quit()
|
|
48
|
-
.then()
|
|
49
|
-
.catch((error) => {
|
|
50
|
-
console.log('Error quitting subscriber', error);
|
|
51
|
-
});
|
|
58
|
+
cleanup();
|
|
52
59
|
break;
|
|
53
60
|
case 'del':
|
|
54
61
|
case 'expire':
|
|
55
62
|
resolve(null);
|
|
56
|
-
|
|
57
|
-
.quit()
|
|
58
|
-
.then()
|
|
59
|
-
.catch((error) => {
|
|
60
|
-
console.log('Error quitting subscriber', error);
|
|
61
|
-
});
|
|
63
|
+
cleanup();
|
|
62
64
|
break;
|
|
63
65
|
default:
|
|
64
66
|
// Do nothing
|
|
@@ -69,14 +71,9 @@ export class RedisCache {
|
|
|
69
71
|
.catch((error) => {
|
|
70
72
|
console.log('Error creating Redis subscriber', error);
|
|
71
73
|
});
|
|
72
|
-
setTimeout(() => {
|
|
74
|
+
const timer = setTimeout(() => {
|
|
73
75
|
resolve(this.get(key, namespace, classConstructor));
|
|
74
|
-
|
|
75
|
-
.quit()
|
|
76
|
-
.then()
|
|
77
|
-
.catch((error) => {
|
|
78
|
-
console.log('Error closing Redis subscriber', error);
|
|
79
|
-
});
|
|
76
|
+
cleanup();
|
|
80
77
|
}, waitSeconds * 1000);
|
|
81
78
|
});
|
|
82
79
|
}
|
package/dist/cache/redis.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAItC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAQpD,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErC;;GAEG;AACH,MAAM,OAAO,UAAU;IACb,OAAO,CAA8D;IAE7E,YAAY,aAAkC;QAC5C,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC;QAC5E,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,OAAO;aACT,OAAO,EAAE;aACT,IAAI,EAAE;aACN,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,GAAW,EAAE,SAAkB;QACpC,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC;QACnC,GAAG,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,GAAW,EAAE,SAA8B;QAChD,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC;QACnC,GAAG,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,QAAQ,CACN,GAAW,EACX,WAAmB,EACnB,SAA8B,EAC9B,gBAA0D;QAE1D,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC;QACnC,GAAG,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;QAE5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,uEAAuE;YACvE,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;YAClC
|
|
1
|
+
{"version":3,"file":"redis.js","sourceRoot":"","sources":["../../src/cache/redis.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zetra/citrineos-util",
|
|
3
|
-
"version": "1.8.3-fork.
|
|
3
|
+
"version": "1.8.3-fork.95",
|
|
4
4
|
"description": "The OCPP util module which supplies helpful utilities like cache and queue connectors, etc.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"@types/jsrsasign": "10.5.14"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@zetra/citrineos-base": "1.8.3-fork.
|
|
28
|
-
"@zetra/citrineos-data": "1.8.3-fork.
|
|
27
|
+
"@zetra/citrineos-base": "1.8.3-fork.95",
|
|
28
|
+
"@zetra/citrineos-data": "1.8.3-fork.95",
|
|
29
29
|
"@fastify/swagger": "9.4.0",
|
|
30
30
|
"@fastify/swagger-ui": "5.2.0",
|
|
31
31
|
"@google-cloud/storage": "7.18.0",
|