@sipgate/integration-bridge 0.12.12 → 0.12.14
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.
|
@@ -30,22 +30,25 @@ class StorageCache {
|
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
31
|
try {
|
|
32
32
|
const cacheItemState = yield this.storage.get(this.getCacheItemKey(key));
|
|
33
|
+
const value = yield this.storage.get(key);
|
|
33
34
|
if (cacheItemState &&
|
|
34
35
|
cacheItemState.state === cache_item_state_model_1.CacheItemStateType.FETCHING) {
|
|
35
36
|
this.log(`${[
|
|
36
37
|
(0, anonymize_key_1.anonymizeKey)(key),
|
|
37
38
|
]} Not refreshing for because fetching is already in progress.`);
|
|
39
|
+
// if we have old contacts saved in cache we return them instead
|
|
40
|
+
if (value && value.length > 0)
|
|
41
|
+
return value;
|
|
38
42
|
return cacheItemState;
|
|
39
43
|
}
|
|
40
|
-
const value = yield this.storage.get(key);
|
|
41
44
|
if (value) {
|
|
42
|
-
this.log(
|
|
45
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Found match for key in cache.`);
|
|
43
46
|
const now = new Date().getTime();
|
|
44
47
|
const isValueStale = Boolean(!cacheItemState ||
|
|
45
48
|
(cacheItemState.state === cache_item_state_model_1.CacheItemStateType.CACHED &&
|
|
46
49
|
now > cacheItemState.updated + this.cacheRefreshIntervalMs));
|
|
47
50
|
if (getFreshValue && isValueStale) {
|
|
48
|
-
this.log(
|
|
51
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] value was stale, fetching fresh contacts`);
|
|
49
52
|
// we don't return the fresh value here because we don't want to wait on the result.
|
|
50
53
|
// We return the old value instead, the fresh value is returned the next time it is requested
|
|
51
54
|
this.getRefreshed(key, getFreshValue).catch((error) => {
|
|
@@ -58,40 +61,40 @@ class StorageCache {
|
|
|
58
61
|
}
|
|
59
62
|
}
|
|
60
63
|
catch (e) {
|
|
61
|
-
this.logErr(
|
|
64
|
+
this.logErr(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Unable to get cache".`, e);
|
|
62
65
|
}
|
|
63
66
|
if (!getFreshValue) {
|
|
64
67
|
return [];
|
|
65
68
|
}
|
|
66
|
-
this.log(
|
|
69
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Found no match in cache. Getting fresh value.`);
|
|
67
70
|
return this.getRefreshed(key, getFreshValue);
|
|
68
71
|
});
|
|
69
72
|
}
|
|
70
73
|
set(key, value) {
|
|
71
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
-
this.log(
|
|
75
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Saving ${value.length} contacts to cache.`);
|
|
73
76
|
try {
|
|
74
77
|
yield this.storage.set(key, value);
|
|
75
78
|
}
|
|
76
79
|
catch (e) {
|
|
77
|
-
this.logErr(
|
|
80
|
+
this.logErr(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Unable to set cache.`, e);
|
|
78
81
|
}
|
|
79
82
|
});
|
|
80
83
|
}
|
|
81
84
|
delete(key) {
|
|
82
85
|
return __awaiter(this, void 0, void 0, function* () {
|
|
83
|
-
this.log(
|
|
86
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Removing contacts from cache.`);
|
|
84
87
|
try {
|
|
85
88
|
yield this.storage.delete(key);
|
|
86
89
|
}
|
|
87
90
|
catch (e) {
|
|
88
|
-
this.logErr(
|
|
91
|
+
this.logErr(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Unable to delete cache`, e);
|
|
89
92
|
}
|
|
90
93
|
});
|
|
91
94
|
}
|
|
92
95
|
getRefreshed(key, getFreshValue) {
|
|
93
96
|
return __awaiter(this, void 0, void 0, function* () {
|
|
94
|
-
this.log(
|
|
97
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Refreshing value…`);
|
|
95
98
|
yield this.storage.set(this.getCacheItemKey(key), {
|
|
96
99
|
state: cache_item_state_model_1.CacheItemStateType.FETCHING,
|
|
97
100
|
}, CACHE_STATE_TTL);
|
|
@@ -103,7 +106,7 @@ class StorageCache {
|
|
|
103
106
|
return freshValue;
|
|
104
107
|
}
|
|
105
108
|
catch (error) {
|
|
106
|
-
this.log(
|
|
109
|
+
this.log(`[${(0, anonymize_key_1.anonymizeKey)(key)}] Error while refreshing value`, error);
|
|
107
110
|
throw error;
|
|
108
111
|
}
|
|
109
112
|
finally {
|
|
@@ -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;
|
|
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;gBAErD,IACE,cAAc;oBACd,cAAc,CAAC,KAAK,KAAK,2CAAkB,CAAC,QAAQ,EACpD;oBACA,IAAI,CAAC,GAAG,CACN,GAAG;wBACD,IAAA,4BAAY,EAAC,GAAG,CAAC;qBAClB,8DAA8D,CAChE,CAAC;oBAEF,gEAAgE;oBAChE,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;wBAAE,OAAO,KAAK,CAAC;oBAE5C,OAAO,cAAc,CAAC;iBACvB;gBAED,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,GAAG,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;oBAEjE,MAAM,GAAG,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;oBAEzC,MAAM,YAAY,GAAY,OAAO,CACnC,CAAC,cAAc;wBACb,CAAC,cAAc,CAAC,KAAK,KAAK,2CAAkB,CAAC,MAAM;4BACjD,GAAG,GAAG,cAAc,CAAC,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,CAChE,CAAC;oBAEF,IAAI,aAAa,IAAI,YAAY,EAAE;wBACjC,IAAI,CAAC,GAAG,CACN,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,4CAA4C,CAClE,CAAC;wBACF,oFAAoF;wBACpF,6FAA6F;wBAC7F,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;4BACpD,IAAI,CAAC,MAAM,CACT,GAAG;gCACD,IAAA,4BAAY,EAAC,GAAG,CAAC;6BAClB,0CAA0C,KAAK,EAAE,CACnD,CAAC;wBACJ,CAAC,CAAC,CAAC;qBACJ;oBAED,OAAO,KAAK,CAAC;iBACd;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;aAChE;YAED,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,EAAE,CAAC;aACX;YAED,IAAI,CAAC,GAAG,CACN,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,iDAAiD,CACvE,CAAC;YACF,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC/C,CAAC;KAAA;IAEY,GAAG,CAAC,GAAW,EAAE,KAAgB;;YAC5C,IAAI,CAAC,GAAG,CACN,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,YAAY,KAAK,CAAC,MAAM,qBAAqB,CACnE,CAAC;YACF,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACpC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;aAC/D;QACH,CAAC;KAAA;IAEY,MAAM,CAAC,GAAW;;YAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;YACjE,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aAChC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC,CAAC,CAAC;aACjE;QACH,CAAC;KAAA;IAEa,YAAY,CACxB,GAAW,EACX,aAAkD;;YAElD,IAAI,CAAC,GAAG,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAErD,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CACpB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EACzB;gBACE,KAAK,EAAE,2CAAkB,CAAC,QAAQ;aACnC,EACD,eAAe,CAChB,CAAC;YAEF,IAAI;gBACF,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,CAAC;gBAE5C,IAAI,UAAU,EAAE;oBACd,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;iBACjC;gBAED,OAAO,UAAU,CAAC;aACnB;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,GAAG,CAAC,IAAI,IAAA,4BAAY,EAAC,GAAG,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;gBACvE,MAAM,KAAK,CAAC;aACb;oBAAS;gBACR,mFAAmF;gBACnF,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAiB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE;oBAChE,KAAK,EAAE,2CAAkB,CAAC,MAAM;oBAChC,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;iBAC9B,CAAC,CAAC;aACJ;QACH,CAAC;KAAA;IAEO,eAAe,CAAC,GAAW;QACjC,OAAO,GAAG,kBAAkB,GAAG,GAAG,EAAE,CAAC;IACvC,CAAC;IAEO,GAAG,CAAC,GAAG,IAAS;QACtB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC;IAEO,MAAM,CAAC,GAAG,IAAS;QACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAEO,mBAAmB,CAAC,GAAG,IAAS;QACtC,OAAO,GAAG,UAAU,IAAI,IAAI;aACzB,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,IAAa,EAAE,EAAE,CACrB,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACvD;aACA,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACjB,CAAC;CACF;AAlKD,oCAkKC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.anonymizeKey = void 0;
|
|
4
4
|
const ANONYMIZED_KEY_LENGTH = 10;
|
|
5
5
|
function anonymizeKey(key) {
|
|
6
|
-
return
|
|
6
|
+
return `***${key.slice(key.length - ANONYMIZED_KEY_LENGTH)}`;
|
|
7
7
|
}
|
|
8
8
|
exports.anonymizeKey = anonymizeKey;
|
|
9
9
|
//# sourceMappingURL=anonymize-key.js.map
|