@puca/puca-core 14.8.1 → 14.8.2

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.
@@ -7,9 +7,9 @@ export declare const isInstanceOfRequestCacheService: (cache: any) => cache is R
7
7
  export declare class RequestCacheServiceImplMemory implements RequestCacheService {
8
8
  private readonly cache;
9
9
  private readonly subCache;
10
+ toJSON(): null;
10
11
  get<T>(key: string | any, fallback: () => Promise<T>): Promise<T>;
11
12
  getSubCache(path: string): RequestCacheService;
12
- private buildKeyStr;
13
13
  }
14
14
  export declare class RequestCacheServiceImplCacheV2 implements RequestCacheService {
15
15
  private readonly cacheServiceV2;
@@ -17,6 +17,8 @@ export declare class RequestCacheServiceImplCacheV2 implements RequestCacheServi
17
17
  private readonly scopePath;
18
18
  private readonly subCache;
19
19
  constructor(cacheServiceV2: CacheServiceV2, expiresInSeconds: number, scopePath: string);
20
+ toJSON(): null;
21
+ private sanitizeKey;
20
22
  get<T>(key: string | any, fallback: () => Promise<T>): Promise<T>;
21
23
  getSubCache(path: string): RequestCacheService;
22
24
  }
@@ -8,13 +8,22 @@ const isInstanceOfRequestCacheService = (cache) => {
8
8
  typeof cache.getSubCache === 'function';
9
9
  };
10
10
  exports.isInstanceOfRequestCacheService = isInstanceOfRequestCacheService;
11
+ const buildKeyStr = (key) => {
12
+ if (typeof key === 'string') {
13
+ return key;
14
+ }
15
+ return (0, crypto_1.createHash)('md5').update(JSON.stringify(key || 'void')).digest('hex');
16
+ };
11
17
  class RequestCacheServiceImplMemory {
12
18
  constructor() {
13
19
  this.cache = new Map();
14
20
  this.subCache = new Map();
15
21
  }
22
+ toJSON() {
23
+ return null;
24
+ }
16
25
  async get(key, fallback) {
17
- const keyStr = this.buildKeyStr(key);
26
+ const keyStr = buildKeyStr(key);
18
27
  const cached = this.cache.get(keyStr);
19
28
  if (cached) {
20
29
  return cached;
@@ -31,12 +40,6 @@ class RequestCacheServiceImplMemory {
31
40
  this.subCache.set(path, subCache);
32
41
  return subCache;
33
42
  }
34
- buildKeyStr(key) {
35
- if (typeof key === 'string') {
36
- return key;
37
- }
38
- return (0, crypto_1.createHash)('md5').update(JSON.stringify(key || 'void')).digest('hex');
39
- }
40
43
  }
41
44
  exports.RequestCacheServiceImplMemory = RequestCacheServiceImplMemory;
42
45
  class RequestCacheServiceImplCacheV2 {
@@ -46,8 +49,26 @@ class RequestCacheServiceImplCacheV2 {
46
49
  this.scopePath = scopePath;
47
50
  this.subCache = new Map();
48
51
  }
52
+ toJSON() {
53
+ return null;
54
+ }
55
+ sanitizeKey(key) {
56
+ if (!key || typeof key !== 'object') {
57
+ return key;
58
+ }
59
+ const user = key.user;
60
+ const isUserInstance = !!user && typeof user === 'object' && (typeof user.puca_pid === 'string' ||
61
+ typeof user.username === 'string' ||
62
+ typeof user.idRequest === 'string');
63
+ if (!isUserInstance) {
64
+ return key;
65
+ }
66
+ key.user = user.puca_pid;
67
+ return key;
68
+ }
49
69
  async get(key, fallback) {
50
- return await this.cacheServiceV2.getex(this.scopePath, key, this.expiresInSeconds, fallback);
70
+ const keyStr = buildKeyStr(this.sanitizeKey(key));
71
+ return await this.cacheServiceV2.getex(this.scopePath, keyStr, this.expiresInSeconds, fallback);
51
72
  }
52
73
  getSubCache(path) {
53
74
  if (this.subCache.has(path)) {
@@ -64,7 +85,7 @@ class RequestCacheServiceFactory {
64
85
  this.cacheServiceV2 = cacheServiceV2;
65
86
  }
66
87
  getRequestCacheService(scopePath, expiresInSeconds = 10) {
67
- const env = process.env.REQUEST_CACHE_SERVICE_IMPL || 'cachev2';
88
+ const env = process.env.REQUEST_CACHE_SERVICE_IMPL || 'memory';
68
89
  if (env.toLowerCase() === 'memory') {
69
90
  return new RequestCacheServiceImplMemory();
70
91
  }
@@ -1 +1 @@
1
- {"version":3,"file":"request-cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/request-cache.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"request-cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/request-cache.service.ts"],"names":[],"mappings":"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"}