@trunkrs/common 1.4.29 → 1.4.33
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/package.json
CHANGED
package/utils/caching/S3Cache.js
CHANGED
|
@@ -11,7 +11,7 @@ class S3Cache extends Cache_1.default {
|
|
|
11
11
|
this.serializer = serializer;
|
|
12
12
|
this.bucketArn = bucketArn;
|
|
13
13
|
this.keyPrefix = keyPrefix;
|
|
14
|
-
this.expirationTagName = '
|
|
14
|
+
this.expirationTagName = 'cache-expiration';
|
|
15
15
|
this.s3Client = new aws_sdk_1.S3();
|
|
16
16
|
}
|
|
17
17
|
getFullKey(key) {
|
|
@@ -27,8 +27,12 @@ class S3Cache extends Cache_1.default {
|
|
|
27
27
|
.promise();
|
|
28
28
|
console.log(JSON.stringify(meta.Metadata, null, 2));
|
|
29
29
|
const { [this.expirationTagName]: expiration } = meta.Metadata;
|
|
30
|
+
console.log('expiration: ', new Date(Number(expiration)));
|
|
31
|
+
console.log('is valid item:', this.isValidItem({
|
|
32
|
+
expiration: new Date(Number(expiration)),
|
|
33
|
+
}));
|
|
30
34
|
return this.isValidItem({
|
|
31
|
-
expiration: new Date(expiration),
|
|
35
|
+
expiration: new Date(Number(expiration)),
|
|
32
36
|
});
|
|
33
37
|
}
|
|
34
38
|
catch (error) {
|
|
@@ -63,11 +67,13 @@ class S3Cache extends Cache_1.default {
|
|
|
63
67
|
Key: this.getFullKey(key),
|
|
64
68
|
})
|
|
65
69
|
.promise();
|
|
70
|
+
console.log('deserializing');
|
|
66
71
|
return this.serializer.deserialize(object.Body);
|
|
67
72
|
}
|
|
68
73
|
async getOrAdd(key, factory) {
|
|
69
74
|
const value = await this.get(key);
|
|
70
75
|
if (value) {
|
|
76
|
+
console.log('found the value: ', value);
|
|
71
77
|
return value;
|
|
72
78
|
}
|
|
73
79
|
const newValue = await factory();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Cache.js","sourceRoot":"","sources":["../../../utils/caching/S3Cache.ts"],"names":[],"mappings":";;;;;AAAA,qCAAsC;AAItC,oDAA0C;AAE1C,MAAM,OAAQ,SAAQ,eAAK;IAKzB,YACmB,UAAsB,EACtB,SAAiB,EACjB,YAAoB,QAAQ,EAC7C,gBAAgB,GAAG,CAAC;QAEpB,KAAK,CAAC,gBAAgB,CAAC,CAAA;QALN,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAQ;QACjB,cAAS,GAAT,SAAS,CAAmB;QAP9B,sBAAiB,GAAG,
|
|
1
|
+
{"version":3,"file":"S3Cache.js","sourceRoot":"","sources":["../../../utils/caching/S3Cache.ts"],"names":[],"mappings":"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"}
|