@sipgate/integration-bridge 0.12.17 → 0.12.18
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.
|
@@ -13,6 +13,7 @@ exports.RedisStorageAdapter = void 0;
|
|
|
13
13
|
const redis_1 = require("redis");
|
|
14
14
|
const util_1 = require("util");
|
|
15
15
|
const zlib_1 = require("zlib");
|
|
16
|
+
const util_2 = require("../../util");
|
|
16
17
|
const inflate = (0, util_1.promisify)(zlib_1.inflate);
|
|
17
18
|
const deflate = (0, util_1.promisify)(zlib_1.deflate);
|
|
18
19
|
const DEFAULT_CACHE_TTL = 60 * 60 * 24 * 30; // 30 days
|
|
@@ -23,7 +24,18 @@ class RedisStorageAdapter {
|
|
|
23
24
|
this.client.on("error", (error) => {
|
|
24
25
|
console.warn("Redis error: ", error.message);
|
|
25
26
|
});
|
|
26
|
-
this.client.
|
|
27
|
+
this.client.on("ready", () => {
|
|
28
|
+
console.info("Redis is ready.");
|
|
29
|
+
});
|
|
30
|
+
this.client.on("reconnecting", () => {
|
|
31
|
+
console.warn("Redis is reconnecting.");
|
|
32
|
+
});
|
|
33
|
+
this.client
|
|
34
|
+
.connect()
|
|
35
|
+
.then(() => {
|
|
36
|
+
console.info("Redis successfully connected.");
|
|
37
|
+
})
|
|
38
|
+
.catch((error) => {
|
|
27
39
|
console.warn("Redis connection error: ", error.message);
|
|
28
40
|
});
|
|
29
41
|
}
|
|
@@ -34,8 +46,13 @@ class RedisStorageAdapter {
|
|
|
34
46
|
if (!value) {
|
|
35
47
|
return null;
|
|
36
48
|
}
|
|
49
|
+
console.time(`${(0, util_2.anonymizeKey)(key)}-inflate-buffer-cache`);
|
|
37
50
|
const decompressed = yield inflate(Buffer.from(value, "base64"));
|
|
38
|
-
|
|
51
|
+
console.timeEnd(`${(0, util_2.anonymizeKey)(key)}-inflate-buffer-cache`);
|
|
52
|
+
console.time(`${(0, util_2.anonymizeKey)(key)}-json-parse-cache`);
|
|
53
|
+
const result = JSON.parse(decompressed.toString());
|
|
54
|
+
console.timeEnd(`${(0, util_2.anonymizeKey)(key)}-json-parse-cache`);
|
|
55
|
+
return result;
|
|
39
56
|
}
|
|
40
57
|
catch (_a) {
|
|
41
58
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-storage-adapter.js","sourceRoot":"","sources":["../../../src/cache/storage/redis-storage-adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAsD;AACtD,+BAAiC;AACjC,+BAIc;
|
|
1
|
+
{"version":3,"file":"redis-storage-adapter.js","sourceRoot":"","sources":["../../../src/cache/storage/redis-storage-adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAsD;AACtD,+BAAiC;AACjC,+BAIc;AAEd,qCAA0C;AAE1C,MAAM,OAAO,GAAG,IAAA,gBAAS,EAAoB,cAAW,CAAC,CAAC;AAC1D,MAAM,OAAO,GAAG,IAAA,gBAAS,EAAoB,cAAW,CAAC,CAAC;AAE1D,MAAM,iBAAiB,GAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,UAAU;AAE/D,MAAa,mBAAmB;IAG9B,YAAY,GAAW;QACrB,IAAI,CAAC,MAAM,GAAG,IAAA,oBAAY,EAAC,EAAE,GAAG,EAAE,CAAC,CAAC;QAEpC,OAAO,CAAC,GAAG,CAAC,sCAAsC,GAAG,EAAE,CAAC,CAAC;QAEzD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC3B,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;YAClC,OAAO,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM;aACR,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,EAAE;YACT,OAAO,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAChD,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACP,CAAC;IAEY,GAAG,CAAI,GAAW;;YAC7B,IAAI;gBACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACzC,IAAI,CAAC,KAAK,EAAE;oBACV,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,CAAC,IAAI,CAAC,GAAG,IAAA,mBAAY,EAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;gBAC1D,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACjE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAA,mBAAY,EAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;gBAE7D,OAAO,CAAC,IAAI,CAAC,GAAG,IAAA,mBAAY,EAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnD,OAAO,CAAC,OAAO,CAAC,GAAG,IAAA,mBAAY,EAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBAEzD,OAAO,MAAM,CAAC;aACf;YAAC,WAAM;gBACN,OAAO,IAAI,CAAC;aACb;QACH,CAAC;KAAA;IAEY,GAAG,CAAI,GAAW,EAAE,KAAQ,EAAE,GAAY;;YACrD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACxD,EAAE,EAAE,GAAG,aAAH,GAAG,cAAH,GAAG,GAAI,iBAAiB;aAC7B,CAAC,CAAC;QACL,CAAC;KAAA;IAEY,MAAM,CAAC,GAAW;;YAC7B,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC;KAAA;CACF;AA7DD,kDA6DC"}
|
|
@@ -29,8 +29,13 @@ class StorageCache {
|
|
|
29
29
|
get(key, getFreshValue) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
try {
|
|
32
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Trying to get Contacts from cache…`);
|
|
33
|
+
console.time(`${(0, anonymize_key_1.anonymizeKey)(key)}-get-cache-item-state`);
|
|
32
34
|
const cacheItemState = yield this.storage.get(this.getCacheItemKey(key));
|
|
35
|
+
console.timeEnd(`${(0, anonymize_key_1.anonymizeKey)(key)}-get-cache-item-state`);
|
|
36
|
+
console.time(`${(0, anonymize_key_1.anonymizeKey)(key)}-get-cache-contacts`);
|
|
33
37
|
const value = yield this.storage.get(key);
|
|
38
|
+
console.timeEnd(`${(0, anonymize_key_1.anonymizeKey)(key)}-get-cache-contacts`);
|
|
34
39
|
if (cacheItemState &&
|
|
35
40
|
cacheItemState.state === cache_item_state_model_1.CacheItemStateType.FETCHING) {
|
|
36
41
|
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Not refreshing for because fetching is already in progress.`);
|
|
@@ -42,7 +47,7 @@ class StorageCache {
|
|
|
42
47
|
return cacheItemState;
|
|
43
48
|
}
|
|
44
49
|
if (value) {
|
|
45
|
-
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Found
|
|
50
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Found contacts ${value.length} for key in cache.`);
|
|
46
51
|
const now = new Date().getTime();
|
|
47
52
|
const isValueStale = Boolean(!cacheItemState ||
|
|
48
53
|
(cacheItemState.state === cache_item_state_model_1.CacheItemStateType.CACHED &&
|
|
@@ -62,6 +67,7 @@ class StorageCache {
|
|
|
62
67
|
this.logErr(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Unable to get cache".`, e);
|
|
63
68
|
}
|
|
64
69
|
if (!getFreshValue) {
|
|
70
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] No getFreshValue function provided. Returning empty array.`);
|
|
65
71
|
return [];
|
|
66
72
|
}
|
|
67
73
|
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Found no match in cache. Getting fresh value.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6EAG0C;AAE1C,yDAAqD;AAErD,MAAM,UAAU,GAAG,SAAS,CAAC;AAC7B,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAC1C,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;AAErD,MAAa,YAAY;IAIvB,YAAY,cAA8B;QAFlC,2BAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;QAG5D,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;QAE9B,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;QAC/C,IAAI,sBAAsB,EAAE;YAC1B,IAAI,CAAC,sBAAsB;gBACzB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC;SACtD;QAED,IAAI,CAAC,GAAG,CACN,8DACE,IAAI,CAAC,sBAAsB,GAAG,IAChC,IAAI,CACL,CAAC;IACJ,CAAC;IAEY,GAAG,CACd,GAAW,EACX,aAAmD;;YAEnD,IAAI;gBACF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAC3C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAC1B,CAAC;gBACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAY,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":"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"}
|