@puca/puca-core 9.15.4 → 9.16.0
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.
|
@@ -41,7 +41,10 @@ export interface CrudControllerEspecificationEnvironmentDetails {
|
|
|
41
41
|
defaultLabel?: string;
|
|
42
42
|
enumValues?: {
|
|
43
43
|
items: string[];
|
|
44
|
-
}
|
|
44
|
+
} | {
|
|
45
|
+
label: string;
|
|
46
|
+
value: string;
|
|
47
|
+
}[];
|
|
45
48
|
required?: string;
|
|
46
49
|
validate?: string;
|
|
47
50
|
readonly?: string;
|
|
@@ -5,6 +5,7 @@ export declare class CacheService<K, R> {
|
|
|
5
5
|
private readonly fetch;
|
|
6
6
|
private readonly lifetimeInSeconds;
|
|
7
7
|
private readonly envConfigService;
|
|
8
|
+
private readonly logger;
|
|
8
9
|
private readonly prefix;
|
|
9
10
|
private readonly memoryCache;
|
|
10
11
|
constructor(name: string, redisManagerService: RedisManagerService, fetch: (keyObj: K) => Promise<R>, lifetimeInSeconds: number, envConfigService: EnvConfigService);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CacheServiceFactory = exports.CacheService = void 0;
|
|
4
|
-
const _ = require("lodash");
|
|
5
4
|
const crypto_1 = require("crypto");
|
|
5
|
+
const logger_1 = require("../../core/services/logger");
|
|
6
6
|
class CacheService {
|
|
7
7
|
constructor(name, redisManagerService, fetch, lifetimeInSeconds, envConfigService) {
|
|
8
8
|
this.redisManagerService = redisManagerService;
|
|
@@ -11,14 +11,7 @@ class CacheService {
|
|
|
11
11
|
this.envConfigService = envConfigService;
|
|
12
12
|
this.memoryCache = new Map();
|
|
13
13
|
this.prefix = `cache-${name}`;
|
|
14
|
-
|
|
15
|
-
const now = new Date();
|
|
16
|
-
for (const [keyStr, { expires }] of this.memoryCache.entries()) {
|
|
17
|
-
if (expires < now) {
|
|
18
|
-
this.memoryCache.delete(keyStr);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
});
|
|
14
|
+
this.logger = new logger_1.Logger(CacheService.name + '-' + name);
|
|
22
15
|
const redisClient = this.redisManagerService.get();
|
|
23
16
|
const subscriber = redisClient.duplicate();
|
|
24
17
|
subscriber.on("message", (channel, message) => {
|
|
@@ -64,22 +57,51 @@ class CacheService {
|
|
|
64
57
|
return await this.fetch(keyObj);
|
|
65
58
|
}
|
|
66
59
|
const keyStr = this.buildKeyStr(keyObj);
|
|
67
|
-
|
|
60
|
+
const redisGet = async () => {
|
|
61
|
+
const data = await this.redisGet(keyStr, keyObj);
|
|
62
|
+
this.memoryCache.set(keyStr, {
|
|
63
|
+
data,
|
|
64
|
+
expires: new Date(Date.now() + this.lifetimeInSeconds * 1000)
|
|
65
|
+
});
|
|
66
|
+
return data;
|
|
67
|
+
};
|
|
68
|
+
const sanitaze = async (data) => {
|
|
69
|
+
while (data === 'loading') {
|
|
70
|
+
await new Promise(resolve => setTimeout(resolve, 50));
|
|
71
|
+
}
|
|
72
|
+
if (data === '<<empty>>') {
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
return data;
|
|
76
|
+
};
|
|
77
|
+
const memoryCache = this.memoryCache.get(keyStr);
|
|
68
78
|
if (memoryCache) {
|
|
69
79
|
if (memoryCache.expires > new Date()) {
|
|
70
|
-
return memoryCache.data;
|
|
80
|
+
return await sanitaze(memoryCache.data);
|
|
71
81
|
}
|
|
72
82
|
else {
|
|
73
|
-
|
|
74
|
-
|
|
83
|
+
memoryCache.expires = new Date(Date.now() + this.lifetimeInSeconds * 1000);
|
|
84
|
+
redisGet()
|
|
85
|
+
.catch((e) => {
|
|
86
|
+
this.logger.error(e);
|
|
87
|
+
});
|
|
88
|
+
return await sanitaze(memoryCache.data);
|
|
75
89
|
}
|
|
76
90
|
}
|
|
77
|
-
|
|
78
|
-
|
|
91
|
+
else {
|
|
92
|
+
this.memoryCache.set(keyStr, {
|
|
93
|
+
data: 'loading',
|
|
94
|
+
expires: new Date(Date.now() + this.lifetimeInSeconds * 1000)
|
|
95
|
+
});
|
|
96
|
+
try {
|
|
97
|
+
const result = await redisGet();
|
|
98
|
+
return await sanitaze(result);
|
|
99
|
+
}
|
|
100
|
+
catch (e) {
|
|
101
|
+
this.memoryCache.delete(keyStr);
|
|
102
|
+
throw e;
|
|
103
|
+
}
|
|
79
104
|
}
|
|
80
|
-
const data = await this.redisGet(keyStr, keyObj);
|
|
81
|
-
this.memoryCache.set(keyStr, { data, expires: new Date(Date.now() + this.lifetimeInSeconds * 1000) });
|
|
82
|
-
return data;
|
|
83
105
|
}
|
|
84
106
|
redisGet(keyStr, keyObj) {
|
|
85
107
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":"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"}
|