@saltcute/cache 1.0.2 → 1.0.3
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.d.ts +1 -0
- package/dist/cache.js +15 -6
- package/dist/cache.js.map +1 -1
- package/package.json +1 -1
package/dist/cache.d.ts
CHANGED
package/dist/cache.js
CHANGED
|
@@ -6,17 +6,18 @@ const memory_cache_1 = require("memory-cache");
|
|
|
6
6
|
const redis_1 = require("redis");
|
|
7
7
|
class Cache {
|
|
8
8
|
namespace;
|
|
9
|
+
static REDIS_HOT_KEY_MEM_CACHE_TTL = 1000;
|
|
9
10
|
logger;
|
|
10
11
|
memCache;
|
|
11
12
|
redisClient;
|
|
12
13
|
isRedisAvailable = true;
|
|
13
14
|
constructor(namespace) {
|
|
14
15
|
this.namespace = namespace;
|
|
15
|
-
this.logger = logger_1.logger.child().
|
|
16
|
+
this.logger = logger_1.logger.child().withPrefix(`[${this.namespace}:cache]`);
|
|
16
17
|
this.memCache = new memory_cache_1.Cache();
|
|
17
18
|
this.redisClient = (0, redis_1.createClient)();
|
|
18
19
|
this.redisClient.on("error", async () => {
|
|
19
|
-
this.logger.error("Redis connection error, using memory-cache");
|
|
20
|
+
this.logger.error("Redis connection error, using memory-cache.");
|
|
20
21
|
this.isRedisAvailable = false;
|
|
21
22
|
this.redisClient.destroy();
|
|
22
23
|
});
|
|
@@ -34,21 +35,26 @@ class Cache {
|
|
|
34
35
|
async get(key) {
|
|
35
36
|
const memCacheValue = this.memCache.get(this.getKey(key));
|
|
36
37
|
if (!memCacheValue && this.isRedisAvailable) {
|
|
38
|
+
const redisReadBegin = performance.now();
|
|
37
39
|
const redisValue = await this.redisClient.get(this.getKey(key));
|
|
40
|
+
const redisReadLapsed = performance.now() - redisReadBegin;
|
|
38
41
|
if (redisValue) {
|
|
39
42
|
try {
|
|
40
43
|
const parsed = JSON.parse(redisValue);
|
|
41
|
-
this.memCache.put(key, parsed,
|
|
44
|
+
this.memCache.put(this.getKey(key), parsed, Cache.REDIS_HOT_KEY_MEM_CACHE_TTL);
|
|
45
|
+
this.logger.trace(`GET "${this.getKey(key)}" Redis HIT, took ${redisReadLapsed.toFixed(1)}ms.`);
|
|
42
46
|
return parsed;
|
|
43
47
|
}
|
|
44
48
|
catch {
|
|
45
|
-
|
|
49
|
+
this.logger.trace(`GET "${this.getKey(key)}" Redis INVALID, took ${redisReadLapsed.toFixed(1)}ms.`);
|
|
50
|
+
await this.redisClient.del(this.getKey(key));
|
|
46
51
|
return null;
|
|
47
52
|
}
|
|
48
53
|
}
|
|
49
54
|
}
|
|
50
|
-
else
|
|
55
|
+
else {
|
|
51
56
|
return memCacheValue;
|
|
57
|
+
}
|
|
52
58
|
}
|
|
53
59
|
/**
|
|
54
60
|
* Put a value into cache.
|
|
@@ -58,8 +64,9 @@ class Cache {
|
|
|
58
64
|
* @param ttl Cache TTL in milliseconds.
|
|
59
65
|
*/
|
|
60
66
|
async put(key, value, ttl) {
|
|
67
|
+
const putBegin = performance.now();
|
|
61
68
|
if (this.isRedisAvailable) {
|
|
62
|
-
this.memCache.put(this.getKey(key), value,
|
|
69
|
+
this.memCache.put(this.getKey(key), value, Cache.REDIS_HOT_KEY_MEM_CACHE_TTL);
|
|
63
70
|
await this.redisClient.set(this.getKey(key), JSON.stringify(value), {
|
|
64
71
|
expiration: {
|
|
65
72
|
type: "EX",
|
|
@@ -69,6 +76,8 @@ class Cache {
|
|
|
69
76
|
}
|
|
70
77
|
else
|
|
71
78
|
this.memCache.put(this.getKey(key), value, ttl);
|
|
79
|
+
const putLapsed = performance.now() - putBegin;
|
|
80
|
+
this.logger.trace(`PUT "${this.getKey(key)}", took ${putLapsed.toFixed(1)}ms.`);
|
|
72
81
|
}
|
|
73
82
|
}
|
|
74
83
|
exports.Cache = Cache;
|
package/dist/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,+CAAiD;AACjD,iCAAqC;AACrC,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}
|