@zetra/citrineos-util 1.8.3-fork.42 → 1.8.3-fork.44
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/memory.js +11 -3
- package/dist/cache/memory.js.map +1 -1
- package/package.json +3 -3
package/dist/cache/memory.js
CHANGED
|
@@ -52,7 +52,15 @@ export class MemoryCache {
|
|
|
52
52
|
async remove(key, namespace) {
|
|
53
53
|
namespace = namespace || 'default';
|
|
54
54
|
const namespaceKey = `${namespace}:${key}`;
|
|
55
|
-
|
|
55
|
+
if (this._timeoutMap.has(namespaceKey)) {
|
|
56
|
+
clearTimeout(this._timeoutMap.get(namespaceKey));
|
|
57
|
+
this._timeoutMap.delete(namespaceKey);
|
|
58
|
+
}
|
|
59
|
+
const deleted = this._cache.delete(namespaceKey);
|
|
60
|
+
if (deleted) {
|
|
61
|
+
this.resolveOnChange(namespaceKey, null);
|
|
62
|
+
}
|
|
63
|
+
return deleted;
|
|
56
64
|
}
|
|
57
65
|
onChange(key, waitSeconds, namespace, classConstructor) {
|
|
58
66
|
namespace = namespace || 'default';
|
|
@@ -113,7 +121,7 @@ export class MemoryCache {
|
|
|
113
121
|
}
|
|
114
122
|
if (expireSeconds) {
|
|
115
123
|
this._timeoutMap.set(namespaceKey, setTimeout(() => {
|
|
116
|
-
this.
|
|
124
|
+
void this.remove(key, namespace);
|
|
117
125
|
}, expireSeconds * 1000));
|
|
118
126
|
}
|
|
119
127
|
this.resolveOnChange(namespaceKey, value);
|
|
@@ -131,7 +139,7 @@ export class MemoryCache {
|
|
|
131
139
|
}
|
|
132
140
|
if (expireSeconds) {
|
|
133
141
|
this._timeoutMap.set(namespaceKey, setTimeout(() => {
|
|
134
|
-
this.
|
|
142
|
+
void this.remove(key, namespace);
|
|
135
143
|
}, expireSeconds * 1000));
|
|
136
144
|
}
|
|
137
145
|
this.resolveOnChange(namespaceKey, value);
|
package/dist/cache/memory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/cache/memory.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,EAAE;AACF,sCAAsC;AAItC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;GAEG;AACH,MAAM,OAAO,WAAW;IACd,MAAM,CAAsB;IAC5B,mBAAmB,CAA4C;IAC/D,0BAA0B,CAAsC;IAChE,WAAW,CAA8B;IAEjD;QACE,MAAM,kBAAkB,GAA8C,IAAI,GAAG,EAAE,CAAC;QAChF,MAAM,mBAAmB,GAAsC;YAC7D,uEAAuE;YACvE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK;gBACzB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACxD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC;oBACnF,CAAC,kBAAkB,EAAE,GAAG,CAAC,QAAQ,CAAS,CAAA,CAAC,KAAK,CAAC,CAAC;gBACpD,CAAC;gBACD,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,kEAAkE;YAClE,cAAc,CAAC,MAAM,EAAE,QAAQ;gBAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAC/D,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,CAAC;oBACtF,CAAC,kBAAkB,EAAE,GAAG,CAAC,QAAQ,CAAS,CAAA,CAAC,IAAI,CAAC,CAAC;gBACnD,CAAC;gBACD,OAAO,aAAa,CAAC;YACvB,CAAC;YACD,+DAA+D;YAC/D,GAAG,CAAC,MAAM,EAAE,QAAQ;gBAClB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAC5C,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;oBAChC,8DAA8D;oBAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5B,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;QACxD,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,0BAA0B,GAAG,IAAI,GAAG,EAAE,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,GAAW,EAAE,SAAkB;QACpC,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC;QACnC,MAAM,YAAY,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,SAAkB;QAC1C,SAAS,GAAG,SAAS,IAAI,SAAS,CAAC;QACnC,MAAM,YAAY,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/cache/memory.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.44",
|
|
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.44",
|
|
28
|
+
"@zetra/citrineos-data": "1.8.3-fork.44",
|
|
29
29
|
"@fastify/swagger": "9.4.0",
|
|
30
30
|
"@fastify/swagger-ui": "5.2.0",
|
|
31
31
|
"@google-cloud/storage": "7.18.0",
|