@sipgate/integration-bridge 0.14.9 → 0.14.10
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/dist/cache/storage-cache.d.ts +0 -3
- package/dist/cache/storage-cache.js +24 -41
- package/dist/cache/storage-cache.js.map +1 -1
- package/dist/models/controller.model.js +69 -45
- package/dist/models/controller.model.js.map +1 -1
- package/dist/util/logger.util.d.ts +3 -4
- package/dist/util/logger.util.js +16 -12
- package/dist/util/logger.util.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.StorageCache = void 0;
|
|
13
13
|
const cache_item_state_model_1 = require("../models/cache-item-state.model");
|
|
14
|
-
const
|
|
15
|
-
const LOG_PREFIX =
|
|
14
|
+
const util_1 = require("../util");
|
|
15
|
+
const LOG_PREFIX = "CACHE";
|
|
16
16
|
const CACHE_STATE_PREFIX = "cache-state:";
|
|
17
17
|
const CACHE_STATE_SECONDS_TTL = 1800; // 30 minutes
|
|
18
18
|
class StorageCache {
|
|
@@ -24,125 +24,108 @@ class StorageCache {
|
|
|
24
24
|
this.cacheRefreshIntervalMs =
|
|
25
25
|
Math.max(Number(CACHE_REFRESH_INTERVAL), 1) * 1000;
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Initialized storage cache with maximum refresh interval of ${this.cacheRefreshIntervalMs / 1000}s.`);
|
|
28
28
|
}
|
|
29
29
|
get(key, getFreshValue) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const anonKey = (0, anonymize_key_1.anonymizeKey)(key);
|
|
32
31
|
try {
|
|
33
|
-
|
|
32
|
+
(0, util_1.infoLogger)(LOG_PREFIX, "Trying to get contacts from cache", key);
|
|
34
33
|
const cacheItemState = yield this.storage.get(this.getCacheItemKey(key));
|
|
35
34
|
const contacts = yield this.storage.get(key);
|
|
36
35
|
if ((cacheItemState === null || cacheItemState === void 0 ? void 0 : cacheItemState.state) === cache_item_state_model_1.CacheItemStateType.FETCHING) {
|
|
37
|
-
|
|
36
|
+
(0, util_1.infoLogger)(LOG_PREFIX, "Not refreshing contacts, because cache state is FETCHING", key);
|
|
38
37
|
// if we have old contacts saved in cache we return them instead
|
|
39
38
|
if (contacts && (contacts === null || contacts === void 0 ? void 0 : contacts.length) > 0) {
|
|
40
|
-
|
|
39
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Returning previously cached contacts (${contacts.length}), because new contacts are still being fetched`, key);
|
|
41
40
|
return contacts;
|
|
42
41
|
}
|
|
43
42
|
return cacheItemState;
|
|
44
43
|
}
|
|
45
44
|
if (contacts) {
|
|
46
|
-
|
|
45
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Found ${contacts.length} contacts in cache`, key);
|
|
47
46
|
const now = new Date().getTime();
|
|
48
47
|
const isValueStale = Boolean(!cacheItemState ||
|
|
49
48
|
(cacheItemState.state === cache_item_state_model_1.CacheItemStateType.CACHED &&
|
|
50
49
|
now > cacheItemState.timestamp + this.cacheRefreshIntervalMs));
|
|
51
50
|
if (getFreshValue && isValueStale) {
|
|
52
|
-
|
|
51
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Cached value was stale, fetching fresh contacts`, key);
|
|
53
52
|
// we don't return the fresh value here because we don't want to wait on the result.
|
|
54
53
|
// We return the old value instead, the fresh value is returned the next time it is requested
|
|
55
54
|
this.getRefreshed(key, getFreshValue).catch((error) => {
|
|
56
|
-
|
|
55
|
+
(0, util_1.errorLogger)(LOG_PREFIX, `Unable to get fresh contacts`, error);
|
|
57
56
|
});
|
|
58
57
|
}
|
|
59
58
|
return contacts;
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
61
|
catch (e) {
|
|
63
|
-
|
|
62
|
+
(0, util_1.errorLogger)(LOG_PREFIX, `Unable to get contacts from cache`, key, e);
|
|
64
63
|
}
|
|
65
64
|
if (!getFreshValue) {
|
|
66
|
-
|
|
65
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `No "getFreshValue" function provided - returning empty array`, key);
|
|
67
66
|
return [];
|
|
68
67
|
}
|
|
69
|
-
|
|
68
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Found no match in cache. Getting fresh value`, key);
|
|
70
69
|
return this.getRefreshed(key, getFreshValue);
|
|
71
70
|
});
|
|
72
71
|
}
|
|
73
72
|
set(key, contacts) {
|
|
74
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
-
|
|
76
|
-
this.log(`[${anonKey}] Saving ${contacts.length} contacts to cache`);
|
|
74
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Saving ${contacts.length} contacts to cache`, key);
|
|
77
75
|
try {
|
|
78
76
|
yield this.storage.set(key, contacts);
|
|
79
77
|
}
|
|
80
78
|
catch (e) {
|
|
81
|
-
|
|
79
|
+
(0, util_1.errorLogger)(LOG_PREFIX, `Unable to set cache`, key, e);
|
|
82
80
|
}
|
|
83
81
|
});
|
|
84
82
|
}
|
|
85
83
|
setCacheState(key, state, ttl) {
|
|
86
84
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
|
-
|
|
88
|
-
this.log(`[${anonKey}] Setting cache state to ${state}`);
|
|
85
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Setting cache state to ${state}`, key);
|
|
89
86
|
try {
|
|
90
87
|
yield this.storage.set(this.getCacheItemKey(key), {
|
|
91
88
|
timestamp: Date.now(),
|
|
92
89
|
state,
|
|
93
90
|
}, ttl);
|
|
94
91
|
}
|
|
95
|
-
catch (
|
|
96
|
-
|
|
92
|
+
catch (e) {
|
|
93
|
+
(0, util_1.errorLogger)(LOG_PREFIX, `Unable to set cache state`, key, e);
|
|
97
94
|
}
|
|
98
95
|
});
|
|
99
96
|
}
|
|
100
97
|
delete(key) {
|
|
101
98
|
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
-
|
|
103
|
-
this.log(`[${anonKey}] Removing contacts from cache`);
|
|
99
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Removing contacts from cache`, key);
|
|
104
100
|
try {
|
|
105
101
|
yield this.storage.delete(key);
|
|
106
102
|
}
|
|
107
103
|
catch (e) {
|
|
108
|
-
|
|
104
|
+
(0, util_1.errorLogger)(LOG_PREFIX, `Unable to remove contacts from cache`, key, e);
|
|
109
105
|
}
|
|
110
106
|
});
|
|
111
107
|
}
|
|
112
108
|
getRefreshed(key, getFreshValue) {
|
|
113
109
|
return __awaiter(this, void 0, void 0, function* () {
|
|
114
|
-
|
|
115
|
-
this.log(`[${anonKey}] Setting cache state to FETCHING`);
|
|
110
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Setting cache state to FETCHING`, key);
|
|
116
111
|
yield this.setCacheState(key, cache_item_state_model_1.CacheItemStateType.FETCHING, CACHE_STATE_SECONDS_TTL);
|
|
117
112
|
try {
|
|
118
113
|
const freshValue = yield getFreshValue(key);
|
|
119
114
|
yield this.set(key, freshValue);
|
|
120
|
-
|
|
115
|
+
(0, util_1.infoLogger)(LOG_PREFIX, `Setting cache state to CACHED`, key);
|
|
121
116
|
yield this.setCacheState(key, cache_item_state_model_1.CacheItemStateType.CACHED);
|
|
122
117
|
return freshValue;
|
|
123
118
|
}
|
|
124
|
-
catch (
|
|
125
|
-
|
|
119
|
+
catch (e) {
|
|
120
|
+
(0, util_1.errorLogger)(LOG_PREFIX, `Error while refreshing value`, key, e);
|
|
126
121
|
yield this.storage.delete(this.getCacheItemKey(key));
|
|
127
|
-
throw
|
|
122
|
+
throw e;
|
|
128
123
|
}
|
|
129
124
|
});
|
|
130
125
|
}
|
|
131
126
|
getCacheItemKey(key) {
|
|
132
127
|
return `${CACHE_STATE_PREFIX}${key}`;
|
|
133
128
|
}
|
|
134
|
-
log(...args) {
|
|
135
|
-
console.log(this.constructLogMessage(args));
|
|
136
|
-
}
|
|
137
|
-
logErr(...args) {
|
|
138
|
-
console.error(this.constructLogMessage(args));
|
|
139
|
-
}
|
|
140
|
-
constructLogMessage(...args) {
|
|
141
|
-
return `${LOG_PREFIX} ${args
|
|
142
|
-
.flat()
|
|
143
|
-
.map((item) => typeof item !== "string" ? JSON.stringify(item) : item)
|
|
144
|
-
.join(" ")}`;
|
|
145
|
-
}
|
|
146
129
|
}
|
|
147
130
|
exports.StorageCache = StorageCache;
|
|
148
131
|
//# sourceMappingURL=storage-cache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6EAG0C;AAE1C,
|
|
1
|
+
{"version":3,"file":"storage-cache.js","sourceRoot":"","sources":["../../src/cache/storage-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,6 @@ const ajv_1 = __importDefault(require("ajv"));
|
|
|
17
17
|
const querystring_1 = require("querystring");
|
|
18
18
|
const _1 = require(".");
|
|
19
19
|
const schemas_1 = require("../schemas");
|
|
20
|
-
const anonymize_key_1 = require("../util/anonymize-key");
|
|
21
20
|
const call_event_util_1 = require("../util/call-event.util");
|
|
22
21
|
const logger_util_1 = require("../util/logger.util");
|
|
23
22
|
const phone_number_utils_1 = require("../util/phone-number-utils");
|
|
@@ -38,15 +37,16 @@ class Controller {
|
|
|
38
37
|
getContacts(req, res, next) {
|
|
39
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
39
|
const { providerConfig } = req;
|
|
40
|
+
if (!providerConfig) {
|
|
41
|
+
throw new _1.ServerError(400, "Missing parameters");
|
|
42
|
+
}
|
|
41
43
|
try {
|
|
42
|
-
|
|
43
|
-
throw new _1.ServerError(400, "Missing parameters");
|
|
44
|
-
}
|
|
44
|
+
(0, logger_util_1.infoLogger)("getContacts", "START", providerConfig.apiKey);
|
|
45
45
|
const fetchContacts = () => __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
if (!this.adapter.getContacts) {
|
|
47
47
|
throw new _1.ServerError(501, "Fetching contacts is not implemented");
|
|
48
48
|
}
|
|
49
|
-
(0, logger_util_1.infoLogger)(`Fetching contacts…`, providerConfig);
|
|
49
|
+
(0, logger_util_1.infoLogger)("getContacts", `Fetching contacts…`, providerConfig.apiKey);
|
|
50
50
|
const fetchedContacts = yield this.adapter.getContacts(providerConfig);
|
|
51
51
|
if (!(0, validate_1.validate)(this.ajv, schemas_1.contactsSchema, fetchedContacts)) {
|
|
52
52
|
throw new _1.ServerError(500, "Invalid contacts received");
|
|
@@ -59,13 +59,13 @@ class Controller {
|
|
|
59
59
|
const timeoutPromise = new Promise((resolve) => setTimeout(() => resolve("TIMEOUT"), CONTACT_FETCH_TIMEOUT));
|
|
60
60
|
const raceResult = yield Promise.race([fetcherPromise, timeoutPromise]);
|
|
61
61
|
if (raceResult === "TIMEOUT") {
|
|
62
|
-
(0, logger_util_1.infoLogger)(`Fetching too slow, returning empty array.`, providerConfig);
|
|
62
|
+
(0, logger_util_1.infoLogger)(`Fetching too slow, returning empty array.`, providerConfig.apiKey);
|
|
63
63
|
}
|
|
64
64
|
const responseContacts = Array.isArray(raceResult)
|
|
65
65
|
? raceResult
|
|
66
66
|
: [];
|
|
67
67
|
const contactsCount = responseContacts.length;
|
|
68
|
-
(0, logger_util_1.infoLogger)(`Found ${contactsCount} cached contacts
|
|
68
|
+
(0, logger_util_1.infoLogger)("getContacts", `Found ${contactsCount} cached contacts`, providerConfig.apiKey);
|
|
69
69
|
if (!Array.isArray(raceResult) &&
|
|
70
70
|
(raceResult === "TIMEOUT" ||
|
|
71
71
|
raceResult.state === cache_item_state_model_1.CacheItemStateType.FETCHING)) {
|
|
@@ -75,6 +75,7 @@ class Controller {
|
|
|
75
75
|
const { apiKey } = yield this.adapter.getToken(req.providerConfig);
|
|
76
76
|
res.header("X-Provider-Key", apiKey);
|
|
77
77
|
}
|
|
78
|
+
(0, logger_util_1.infoLogger)("getContacts", "END", providerConfig.apiKey);
|
|
78
79
|
res.status(200).send(responseContacts);
|
|
79
80
|
}
|
|
80
81
|
catch (error) {
|
|
@@ -84,7 +85,7 @@ class Controller {
|
|
|
84
85
|
next(error);
|
|
85
86
|
return;
|
|
86
87
|
}
|
|
87
|
-
(0, logger_util_1.errorLogger)("Could not get contacts:", providerConfig, error
|
|
88
|
+
(0, logger_util_1.errorLogger)("getContacts", "Could not get contacts:", providerConfig.apiKey, error);
|
|
88
89
|
next(error);
|
|
89
90
|
}
|
|
90
91
|
});
|
|
@@ -93,17 +94,18 @@ class Controller {
|
|
|
93
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
94
95
|
const { providerConfig: { apiKey = "", locale = "" } = {} } = req;
|
|
95
96
|
try {
|
|
97
|
+
(0, logger_util_1.infoLogger)("createContact", "START", apiKey);
|
|
96
98
|
if (!this.adapter.createContact) {
|
|
97
99
|
throw new _1.ServerError(501, "Creating contacts is not implemented");
|
|
98
100
|
}
|
|
99
101
|
if (!req.providerConfig) {
|
|
100
102
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
101
103
|
}
|
|
102
|
-
|
|
104
|
+
(0, logger_util_1.infoLogger)("createContact", "Creating contact", apiKey);
|
|
103
105
|
const contact = yield this.adapter.createContact(req.providerConfig, req.body);
|
|
104
106
|
const valid = (0, validate_1.validate)(this.ajv, schemas_1.contactsSchema, [contact]);
|
|
105
107
|
if (!valid) {
|
|
106
|
-
|
|
108
|
+
(0, logger_util_1.errorLogger)("createContact", "Invalid contact provided by adapter", apiKey, this.ajv.errorsText());
|
|
107
109
|
throw new _1.ServerError(400, "Invalid contact provided by adapter");
|
|
108
110
|
}
|
|
109
111
|
const sanitizedContact = sanitizeContact(contact, locale);
|
|
@@ -118,6 +120,7 @@ class Controller {
|
|
|
118
120
|
yield this.contactCache.set(apiKey, [...contacts, sanitizedContact]);
|
|
119
121
|
}
|
|
120
122
|
}
|
|
123
|
+
(0, logger_util_1.infoLogger)("createContact", "END", apiKey);
|
|
121
124
|
}
|
|
122
125
|
catch (error) {
|
|
123
126
|
// prevent logging of refresh errors
|
|
@@ -126,7 +129,7 @@ class Controller {
|
|
|
126
129
|
next(error);
|
|
127
130
|
return;
|
|
128
131
|
}
|
|
129
|
-
|
|
132
|
+
(0, logger_util_1.errorLogger)("createContact", "Could not create contact:", apiKey, error || "Unknown");
|
|
130
133
|
next(error);
|
|
131
134
|
}
|
|
132
135
|
});
|
|
@@ -141,11 +144,11 @@ class Controller {
|
|
|
141
144
|
if (!req.providerConfig) {
|
|
142
145
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
143
146
|
}
|
|
144
|
-
|
|
147
|
+
(0, logger_util_1.infoLogger)("updateContact", "Updating contact", apiKey);
|
|
145
148
|
const contact = yield this.adapter.updateContact(req.providerConfig, req.params.id, req.body);
|
|
146
149
|
const valid = (0, validate_1.validate)(this.ajv, schemas_1.contactsSchema, [contact]);
|
|
147
150
|
if (!valid) {
|
|
148
|
-
|
|
151
|
+
(0, logger_util_1.errorLogger)("updateContact", "Invalid contact provided by adapter", apiKey, this.ajv.errorsText());
|
|
149
152
|
throw new _1.ServerError(400, "Invalid contact provided by adapter");
|
|
150
153
|
}
|
|
151
154
|
const sanitizedContact = sanitizeContact(contact, locale);
|
|
@@ -161,6 +164,7 @@ class Controller {
|
|
|
161
164
|
yield this.contactCache.set(apiKey, updatedCache);
|
|
162
165
|
}
|
|
163
166
|
}
|
|
167
|
+
(0, logger_util_1.infoLogger)("updateContacts", "END", apiKey);
|
|
164
168
|
}
|
|
165
169
|
catch (error) {
|
|
166
170
|
// prevent logging of refresh errors
|
|
@@ -169,7 +173,7 @@ class Controller {
|
|
|
169
173
|
next(error);
|
|
170
174
|
return;
|
|
171
175
|
}
|
|
172
|
-
|
|
176
|
+
(0, logger_util_1.errorLogger)("updateContact", "Could not update contact:", apiKey, error || "Unknown");
|
|
173
177
|
next(error);
|
|
174
178
|
}
|
|
175
179
|
});
|
|
@@ -178,13 +182,14 @@ class Controller {
|
|
|
178
182
|
return __awaiter(this, void 0, void 0, function* () {
|
|
179
183
|
const { providerConfig: { apiKey = "" } = {} } = req;
|
|
180
184
|
try {
|
|
185
|
+
(0, logger_util_1.infoLogger)("deleteContact", "START", apiKey);
|
|
181
186
|
if (!this.adapter.deleteContact) {
|
|
182
187
|
throw new _1.ServerError(501, "Deleting contacts is not implemented");
|
|
183
188
|
}
|
|
184
189
|
if (!req.providerConfig) {
|
|
185
190
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
186
191
|
}
|
|
187
|
-
|
|
192
|
+
(0, logger_util_1.infoLogger)("deleteContact", "Deleting contact", apiKey);
|
|
188
193
|
const contactId = req.params.id;
|
|
189
194
|
yield this.adapter.deleteContact(req.providerConfig, contactId);
|
|
190
195
|
if (this.adapter.getToken && req.providerConfig) {
|
|
@@ -199,6 +204,7 @@ class Controller {
|
|
|
199
204
|
yield this.contactCache.set(apiKey, updatedCache);
|
|
200
205
|
}
|
|
201
206
|
}
|
|
207
|
+
(0, logger_util_1.infoLogger)("deleteContact", "END", apiKey);
|
|
202
208
|
}
|
|
203
209
|
catch (error) {
|
|
204
210
|
// prevent logging of refresh errors
|
|
@@ -207,7 +213,7 @@ class Controller {
|
|
|
207
213
|
next(error);
|
|
208
214
|
return;
|
|
209
215
|
}
|
|
210
|
-
|
|
216
|
+
(0, logger_util_1.errorLogger)("deleteContact", "Could not delete contact:", apiKey, error || "Unknown");
|
|
211
217
|
next(error);
|
|
212
218
|
}
|
|
213
219
|
});
|
|
@@ -216,14 +222,15 @@ class Controller {
|
|
|
216
222
|
return __awaiter(this, void 0, void 0, function* () {
|
|
217
223
|
const { providerConfig: { apiKey = "" } = {}, query: { start, end }, } = req;
|
|
218
224
|
try {
|
|
225
|
+
(0, logger_util_1.infoLogger)("getCalendarEvents", "START", apiKey);
|
|
219
226
|
if (!this.adapter.getCalendarEvents) {
|
|
220
227
|
throw new _1.ServerError(501, "Fetching calendar events is not implemented");
|
|
221
228
|
}
|
|
222
229
|
if (!req.providerConfig) {
|
|
223
|
-
|
|
230
|
+
(0, logger_util_1.errorLogger)("getCalendarEvents", "Missing config parameters", apiKey);
|
|
224
231
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
225
232
|
}
|
|
226
|
-
|
|
233
|
+
(0, logger_util_1.infoLogger)("getCalendarEvents", "Fetching calendar events", apiKey);
|
|
227
234
|
const filter = typeof start === "string" && typeof end === "string"
|
|
228
235
|
? {
|
|
229
236
|
start: Number(start),
|
|
@@ -233,14 +240,15 @@ class Controller {
|
|
|
233
240
|
const calendarEvents = yield this.adapter.getCalendarEvents(req.providerConfig, filter);
|
|
234
241
|
const valid = (0, validate_1.validate)(this.ajv, schemas_1.calendarEventsSchema, calendarEvents);
|
|
235
242
|
if (!valid) {
|
|
236
|
-
|
|
243
|
+
(0, logger_util_1.errorLogger)("getCalendarEvents", `Invalid calendar events provided by adapter`, apiKey, this.ajv.errorsText());
|
|
237
244
|
throw new _1.ServerError(400, "Invalid calendar events provided by adapter");
|
|
238
245
|
}
|
|
239
|
-
|
|
246
|
+
(0, logger_util_1.infoLogger)("getCalendarEvents", `Found ${calendarEvents.length} events`, apiKey);
|
|
240
247
|
res.status(200).send(calendarEvents);
|
|
248
|
+
(0, logger_util_1.infoLogger)("getCalendarEvents", `END`, apiKey);
|
|
241
249
|
}
|
|
242
250
|
catch (error) {
|
|
243
|
-
|
|
251
|
+
(0, logger_util_1.errorLogger)("getCalendarEvents", `Could not get calendar events:`, apiKey, error || "Unknown");
|
|
244
252
|
next(error);
|
|
245
253
|
}
|
|
246
254
|
});
|
|
@@ -249,23 +257,25 @@ class Controller {
|
|
|
249
257
|
return __awaiter(this, void 0, void 0, function* () {
|
|
250
258
|
const { providerConfig: { apiKey = "" } = {} } = req;
|
|
251
259
|
try {
|
|
260
|
+
(0, logger_util_1.infoLogger)("createCalendarEvent", `START`, apiKey);
|
|
252
261
|
if (!this.adapter.createCalendarEvent) {
|
|
253
262
|
throw new _1.ServerError(501, "Creating calendar events is not implemented");
|
|
254
263
|
}
|
|
255
264
|
if (!req.providerConfig) {
|
|
256
265
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
257
266
|
}
|
|
258
|
-
|
|
267
|
+
(0, logger_util_1.infoLogger)("createCalendarEvent", `Creating calendar event`, apiKey);
|
|
259
268
|
const calendarEvent = yield this.adapter.createCalendarEvent(req.providerConfig, req.body);
|
|
260
269
|
const valid = (0, validate_1.validate)(this.ajv, schemas_1.calendarEventsSchema, [calendarEvent]);
|
|
261
270
|
if (!valid) {
|
|
262
|
-
|
|
271
|
+
(0, logger_util_1.errorLogger)("createCalendarEvent", "Invalid calendar event provided by adapter", apiKey, this.ajv.errorsText());
|
|
263
272
|
throw new _1.ServerError(400, "Invalid calendar event provided by adapter");
|
|
264
273
|
}
|
|
274
|
+
(0, logger_util_1.infoLogger)("createCalendarEvent", `END`, apiKey);
|
|
265
275
|
res.status(200).send(calendarEvent);
|
|
266
276
|
}
|
|
267
277
|
catch (error) {
|
|
268
|
-
|
|
278
|
+
(0, logger_util_1.errorLogger)("createCalendarEvent", "Could not create calendar event:", apiKey, error || "Unknown");
|
|
269
279
|
next(error);
|
|
270
280
|
}
|
|
271
281
|
});
|
|
@@ -274,23 +284,25 @@ class Controller {
|
|
|
274
284
|
return __awaiter(this, void 0, void 0, function* () {
|
|
275
285
|
const { providerConfig: { apiKey = "" } = {} } = req;
|
|
276
286
|
try {
|
|
287
|
+
(0, logger_util_1.infoLogger)("updateCalendarEvent", `START`, apiKey);
|
|
277
288
|
if (!this.adapter.updateCalendarEvent) {
|
|
278
289
|
throw new _1.ServerError(501, "Updating calendar events is not implemented");
|
|
279
290
|
}
|
|
280
291
|
if (!req.providerConfig) {
|
|
281
292
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
282
293
|
}
|
|
283
|
-
|
|
294
|
+
(0, logger_util_1.infoLogger)("updateCalendarEvent", `Updating calendar event`, apiKey);
|
|
284
295
|
const calendarEvent = yield this.adapter.updateCalendarEvent(req.providerConfig, req.params.id, req.body);
|
|
285
296
|
const valid = (0, validate_1.validate)(this.ajv, schemas_1.calendarEventsSchema, [calendarEvent]);
|
|
286
297
|
if (!valid) {
|
|
287
|
-
|
|
298
|
+
(0, logger_util_1.errorLogger)("updateCalendarEvent", `Invalid calendar event provided by adapter`, apiKey, this.ajv.errorsText());
|
|
288
299
|
throw new _1.ServerError(400, "Invalid calendar event provided by adapter");
|
|
289
300
|
}
|
|
301
|
+
(0, logger_util_1.infoLogger)("updateCalendarEvent", `END`, apiKey);
|
|
290
302
|
res.status(200).send(calendarEvent);
|
|
291
303
|
}
|
|
292
304
|
catch (error) {
|
|
293
|
-
|
|
305
|
+
(0, logger_util_1.errorLogger)("updateCalendarEvent", `Could not update calendar event:`, apiKey, error || "Unknown");
|
|
294
306
|
next(error);
|
|
295
307
|
}
|
|
296
308
|
});
|
|
@@ -299,18 +311,20 @@ class Controller {
|
|
|
299
311
|
return __awaiter(this, void 0, void 0, function* () {
|
|
300
312
|
const { providerConfig: { apiKey = "" } = {} } = req;
|
|
301
313
|
try {
|
|
314
|
+
(0, logger_util_1.infoLogger)("deleteCalendarEvent", `START`, apiKey);
|
|
302
315
|
if (!this.adapter.deleteCalendarEvent) {
|
|
303
316
|
throw new _1.ServerError(501, "Deleting calendar events is not implemented");
|
|
304
317
|
}
|
|
305
318
|
if (!req.providerConfig) {
|
|
306
319
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
307
320
|
}
|
|
308
|
-
|
|
321
|
+
(0, logger_util_1.infoLogger)("deleteCalendarEvent", `Deleting calendar event`, apiKey);
|
|
309
322
|
yield this.adapter.deleteCalendarEvent(req.providerConfig, req.params.id);
|
|
323
|
+
(0, logger_util_1.infoLogger)("deleteCalendarEvent", `END`, apiKey);
|
|
310
324
|
res.status(200).send();
|
|
311
325
|
}
|
|
312
326
|
catch (error) {
|
|
313
|
-
|
|
327
|
+
(0, logger_util_1.errorLogger)("deleteCalendarEvent", `Could not delete calendar event:`, apiKey, error || "Unknown");
|
|
314
328
|
next(error);
|
|
315
329
|
}
|
|
316
330
|
});
|
|
@@ -319,6 +333,7 @@ class Controller {
|
|
|
319
333
|
return __awaiter(this, void 0, void 0, function* () {
|
|
320
334
|
const { providerConfig } = req;
|
|
321
335
|
try {
|
|
336
|
+
(0, logger_util_1.infoLogger)("handleCallEvent", `START`, providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey);
|
|
322
337
|
if (!providerConfig) {
|
|
323
338
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
324
339
|
}
|
|
@@ -326,16 +341,17 @@ class Controller {
|
|
|
326
341
|
throw new _1.ServerError(501, "Handling call event is not implemented");
|
|
327
342
|
}
|
|
328
343
|
if ((0, call_event_util_1.shouldSkipCallEvent)(req.body)) {
|
|
329
|
-
(0, logger_util_1.infoLogger)(`Skipping call event for call id ${req.body.id}`, providerConfig);
|
|
344
|
+
(0, logger_util_1.infoLogger)("handleCallEvent", `Skipping call event for call id ${req.body.id}`, providerConfig.apiKey);
|
|
330
345
|
res.status(200).send("Skipping call event");
|
|
331
346
|
return;
|
|
332
347
|
}
|
|
333
|
-
(0, logger_util_1.infoLogger)(`Handling call event`, providerConfig);
|
|
348
|
+
(0, logger_util_1.infoLogger)("handleCallEvent", `Handling call event`, providerConfig.apiKey);
|
|
334
349
|
const integrationCallEventRef = yield this.adapter.handleCallEvent(providerConfig, req.body);
|
|
350
|
+
(0, logger_util_1.infoLogger)("handleCallEvent", `END`, providerConfig.apiKey);
|
|
335
351
|
res.status(200).send(integrationCallEventRef);
|
|
336
352
|
}
|
|
337
353
|
catch (error) {
|
|
338
|
-
(0, logger_util_1.errorLogger)("Could not handle call event:", providerConfig, error || "Unknown");
|
|
354
|
+
(0, logger_util_1.errorLogger)("handleCallEvent", "Could not handle call event:", providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey, error || "Unknown");
|
|
339
355
|
next(error);
|
|
340
356
|
}
|
|
341
357
|
});
|
|
@@ -344,6 +360,7 @@ class Controller {
|
|
|
344
360
|
return __awaiter(this, void 0, void 0, function* () {
|
|
345
361
|
const { providerConfig } = req;
|
|
346
362
|
try {
|
|
363
|
+
(0, logger_util_1.infoLogger)("createCallLogForEntities", `START`, providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey);
|
|
347
364
|
if (!providerConfig) {
|
|
348
365
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
349
366
|
}
|
|
@@ -351,16 +368,17 @@ class Controller {
|
|
|
351
368
|
throw new _1.ServerError(501, "Creating call log is not implemented");
|
|
352
369
|
}
|
|
353
370
|
if ((0, call_event_util_1.shouldSkipCallEvent)(req.body)) {
|
|
354
|
-
(0, logger_util_1.infoLogger)(`Skipping call log for call id ${req.body.id}`, providerConfig);
|
|
371
|
+
(0, logger_util_1.infoLogger)("createCallLogForEntities", `Skipping call log for call id ${req.body.id}`, providerConfig.apiKey);
|
|
355
372
|
res.status(200).send("Skipping call log");
|
|
356
373
|
return;
|
|
357
374
|
}
|
|
358
|
-
(0, logger_util_1.infoLogger)(`Creating call Logs…`, providerConfig);
|
|
375
|
+
(0, logger_util_1.infoLogger)("createCallLogForEntities", `Creating call Logs…`, providerConfig.apiKey);
|
|
359
376
|
const entitiesWithCallLogReferences = yield this.adapter.createCallLogsForEntities(providerConfig, req.body);
|
|
377
|
+
(0, logger_util_1.infoLogger)("createCallLogForEntities", `END`, providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey);
|
|
360
378
|
res.status(200).send(entitiesWithCallLogReferences);
|
|
361
379
|
}
|
|
362
380
|
catch (error) {
|
|
363
|
-
(0, logger_util_1.errorLogger)("Could not create call logs:", providerConfig, error || "Unknown");
|
|
381
|
+
(0, logger_util_1.errorLogger)("createCallLogForEntities", "Could not create call logs:", providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey, error || "Unknown");
|
|
364
382
|
next(error);
|
|
365
383
|
}
|
|
366
384
|
});
|
|
@@ -369,18 +387,20 @@ class Controller {
|
|
|
369
387
|
return __awaiter(this, void 0, void 0, function* () {
|
|
370
388
|
const { providerConfig: { apiKey = "" } = {} } = req;
|
|
371
389
|
try {
|
|
390
|
+
(0, logger_util_1.infoLogger)("handleConnectedEvent", `START`, apiKey);
|
|
372
391
|
if (!this.adapter.handleConnectedEvent) {
|
|
373
392
|
throw new _1.ServerError(501, "Handling connected event is not implemented");
|
|
374
393
|
}
|
|
375
394
|
if (!req.providerConfig) {
|
|
376
395
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
377
396
|
}
|
|
378
|
-
|
|
397
|
+
(0, logger_util_1.infoLogger)("handleConnectedEvent", `Handling connected event`, apiKey);
|
|
379
398
|
yield this.adapter.handleConnectedEvent(req.providerConfig);
|
|
399
|
+
(0, logger_util_1.infoLogger)("handleConnectedEvent", `END`, apiKey);
|
|
380
400
|
res.status(200).send();
|
|
381
401
|
}
|
|
382
402
|
catch (error) {
|
|
383
|
-
|
|
403
|
+
(0, logger_util_1.errorLogger)("handleConnectedEvent", `Could not handle connected event:`, apiKey, error || "Unknown");
|
|
384
404
|
next(error);
|
|
385
405
|
}
|
|
386
406
|
});
|
|
@@ -389,18 +409,20 @@ class Controller {
|
|
|
389
409
|
return __awaiter(this, void 0, void 0, function* () {
|
|
390
410
|
const { providerConfig: { apiKey = "" } = {}, body, params } = req;
|
|
391
411
|
try {
|
|
412
|
+
(0, logger_util_1.infoLogger)("updateCallEvent", `START`, apiKey);
|
|
392
413
|
if (!this.adapter.updateCallEvent) {
|
|
393
414
|
throw new _1.ServerError(501, "Updating contacts is not implemented");
|
|
394
415
|
}
|
|
395
416
|
if (!req.providerConfig) {
|
|
396
417
|
throw new _1.ServerError(400, "Missing config parameters");
|
|
397
418
|
}
|
|
398
|
-
|
|
419
|
+
(0, logger_util_1.infoLogger)("updateCallEvent", `Updating call event`, apiKey);
|
|
399
420
|
yield this.adapter.updateCallEvent(req.providerConfig, params.id, body);
|
|
421
|
+
(0, logger_util_1.infoLogger)("updateCallEvent", `END`, apiKey);
|
|
400
422
|
res.status(200).send();
|
|
401
423
|
}
|
|
402
424
|
catch (error) {
|
|
403
|
-
|
|
425
|
+
(0, logger_util_1.errorLogger)("updateCallEvent", `Could not update call event:`, apiKey, error || "Unknown");
|
|
404
426
|
next(error);
|
|
405
427
|
}
|
|
406
428
|
});
|
|
@@ -409,6 +431,7 @@ class Controller {
|
|
|
409
431
|
return __awaiter(this, void 0, void 0, function* () {
|
|
410
432
|
const { providerConfig } = req;
|
|
411
433
|
try {
|
|
434
|
+
(0, logger_util_1.infoLogger)("getEntity", `START`, providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey);
|
|
412
435
|
if (!providerConfig) {
|
|
413
436
|
throw new _1.ServerError(400, "Missing parameters");
|
|
414
437
|
}
|
|
@@ -416,11 +439,12 @@ class Controller {
|
|
|
416
439
|
throw new _1.ServerError(501, "Fetching Entity is not implemented");
|
|
417
440
|
}
|
|
418
441
|
const fetchedEntity = yield this.adapter.getEntity(providerConfig, req.params.id, req.params.type);
|
|
419
|
-
(0, logger_util_1.infoLogger)(`[${fetchedEntity}] `, providerConfig);
|
|
442
|
+
(0, logger_util_1.infoLogger)("getEntity", `[${fetchedEntity}] `, providerConfig.apiKey);
|
|
443
|
+
(0, logger_util_1.infoLogger)("getEntity", `END`, providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey);
|
|
420
444
|
res.status(200).send(fetchedEntity);
|
|
421
445
|
}
|
|
422
446
|
catch (error) {
|
|
423
|
-
(0, logger_util_1.errorLogger)("Could not get entity:", providerConfig, error);
|
|
447
|
+
(0, logger_util_1.errorLogger)("getEntity", "Could not get entity:", providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.apiKey, error);
|
|
424
448
|
next(error);
|
|
425
449
|
}
|
|
426
450
|
});
|
|
@@ -434,7 +458,7 @@ class Controller {
|
|
|
434
458
|
res.sendStatus(200);
|
|
435
459
|
}
|
|
436
460
|
catch (error) {
|
|
437
|
-
|
|
461
|
+
(0, logger_util_1.errorLogger)("getHealth", "Health check failed:", "", error || "Unknown");
|
|
438
462
|
next(error || "Internal Server Error");
|
|
439
463
|
}
|
|
440
464
|
});
|
|
@@ -449,7 +473,7 @@ class Controller {
|
|
|
449
473
|
res.status(200).send({ redirectUrl });
|
|
450
474
|
}
|
|
451
475
|
catch (error) {
|
|
452
|
-
|
|
476
|
+
(0, logger_util_1.errorLogger)("oAuth2Redirect", "Could not get OAuth2 redirect URL:", "", error || "Unknown");
|
|
453
477
|
next(error);
|
|
454
478
|
}
|
|
455
479
|
});
|
|
@@ -458,7 +482,7 @@ class Controller {
|
|
|
458
482
|
return __awaiter(this, void 0, void 0, function* () {
|
|
459
483
|
let { OAUTH2_REDIRECT_URL: redirectUrl, OAUTH2_IDENTIFIER: oAuth2Identifier = "UNKNOWN", } = process.env;
|
|
460
484
|
if (!redirectUrl) {
|
|
461
|
-
|
|
485
|
+
(0, logger_util_1.errorLogger)("oAuth2Callback", "OAuth2 Redirect URL not configured!", "");
|
|
462
486
|
res.status(500).send("OAuth2 Redirect URL not configured!");
|
|
463
487
|
return;
|
|
464
488
|
}
|
|
@@ -475,7 +499,7 @@ class Controller {
|
|
|
475
499
|
res.redirect(`${redirectUrl}?${params}`);
|
|
476
500
|
}
|
|
477
501
|
catch (error) {
|
|
478
|
-
|
|
502
|
+
(0, logger_util_1.errorLogger)("oAuth2Callback", "Unable to save OAuth2 token:", "", error || "Unknown");
|
|
479
503
|
res.redirect(redirectUrl);
|
|
480
504
|
}
|
|
481
505
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.model.js","sourceRoot":"","sources":["../../src/models/controller.model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"controller.model.js","sourceRoot":"","sources":["../../src/models/controller.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
export declare const
|
|
3
|
-
export declare const
|
|
4
|
-
export declare const warnLogger: (message: string, config?: Config, ...args: unknown[]) => void;
|
|
1
|
+
export declare const infoLogger: (source: string, message: string, apiKey?: string, ...args: unknown[]) => void;
|
|
2
|
+
export declare const errorLogger: (source: string, message: string, apiKey?: string, ...args: unknown[]) => void;
|
|
3
|
+
export declare const warnLogger: (source: string, message: string, apiKey?: string, ...args: unknown[]) => void;
|
package/dist/util/logger.util.js
CHANGED
|
@@ -2,34 +2,38 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.warnLogger = exports.errorLogger = exports.infoLogger = void 0;
|
|
4
4
|
const anonymize_key_1 = require("./anonymize-key");
|
|
5
|
-
const infoLogger = (message,
|
|
5
|
+
const infoLogger = (source, message, apiKey, ...args) => {
|
|
6
6
|
// eslint-disable-next-line no-console
|
|
7
|
-
if (
|
|
8
|
-
console.log(
|
|
7
|
+
if (apiKey) {
|
|
8
|
+
console.log(constructLogMessage(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}]`, `[${source.toUpperCase()}]`, message, args));
|
|
9
9
|
}
|
|
10
10
|
else {
|
|
11
|
-
console.log(message, args
|
|
11
|
+
console.log(constructLogMessage(`[${source.toUpperCase()}]`, message, args));
|
|
12
12
|
}
|
|
13
13
|
};
|
|
14
14
|
exports.infoLogger = infoLogger;
|
|
15
|
-
const errorLogger = (message,
|
|
15
|
+
const errorLogger = (source, message, apiKey, ...args) => {
|
|
16
16
|
// eslint-disable-next-line no-console
|
|
17
|
-
if (
|
|
18
|
-
console.error(`[${(0, anonymize_key_1.anonymizeKey)(
|
|
17
|
+
if (apiKey) {
|
|
18
|
+
console.error(constructLogMessage(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}]`, `[${source.toUpperCase()}]`, message, args));
|
|
19
19
|
}
|
|
20
20
|
else {
|
|
21
|
-
console.error(message, args
|
|
21
|
+
console.error(constructLogMessage(`[${source.toUpperCase()}]`, message, args));
|
|
22
22
|
}
|
|
23
23
|
};
|
|
24
24
|
exports.errorLogger = errorLogger;
|
|
25
|
-
const warnLogger = (message,
|
|
25
|
+
const warnLogger = (source, message, apiKey, ...args) => {
|
|
26
26
|
// eslint-disable-next-line no-console
|
|
27
|
-
if (
|
|
28
|
-
console.warn(`[${(0, anonymize_key_1.anonymizeKey)(
|
|
27
|
+
if (apiKey) {
|
|
28
|
+
console.warn(constructLogMessage(`[${(0, anonymize_key_1.anonymizeKey)(apiKey)}]`, `[${source.toUpperCase()}]`, message, args));
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
console.warn(message, args
|
|
31
|
+
console.warn(constructLogMessage(`[${source.toUpperCase()}]`, message, args));
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
exports.warnLogger = warnLogger;
|
|
35
|
+
const constructLogMessage = (...args) => `${args
|
|
36
|
+
.flat()
|
|
37
|
+
.map((item) => typeof item !== "string" ? JSON.stringify(item) : item)
|
|
38
|
+
.join(" ")}`;
|
|
35
39
|
//# sourceMappingURL=logger.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.util.js","sourceRoot":"","sources":["../../src/util/logger.util.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;
|
|
1
|
+
{"version":3,"file":"logger.util.js","sourceRoot":"","sources":["../../src/util/logger.util.ts"],"names":[],"mappings":";;;AAAA,mDAA+C;AAExC,MAAM,UAAU,GAAG,CACxB,MAAc,EACd,OAAe,EACf,MAAe,EACf,GAAG,IAAe,EACZ,EAAE;IACR,sCAAsC;IACtC,IAAI,MAAM,EAAE;QACV,OAAO,CAAC,GAAG,CACT,mBAAmB,CACjB,IAAI,IAAA,4BAAY,EAAC,MAAM,CAAC,GAAG,EAC3B,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAC3B,OAAO,EACP,IAAI,CACL,CACF,CAAC;KACH;SAAM;QACL,OAAO,CAAC,GAAG,CACT,mBAAmB,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAChE,CAAC;KACH;AACH,CAAC,CAAC;AArBW,QAAA,UAAU,cAqBrB;AAEK,MAAM,WAAW,GAAG,CACzB,MAAc,EACd,OAAe,EACf,MAAe,EACf,GAAG,IAAe,EACZ,EAAE;IACR,sCAAsC;IACtC,IAAI,MAAM,EAAE;QACV,OAAO,CAAC,KAAK,CACX,mBAAmB,CACjB,IAAI,IAAA,4BAAY,EAAC,MAAM,CAAC,GAAG,EAC3B,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAC3B,OAAO,EACP,IAAI,CACL,CACF,CAAC;KACH;SAAM;QACL,OAAO,CAAC,KAAK,CACX,mBAAmB,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAChE,CAAC;KACH;AACH,CAAC,CAAC;AArBW,QAAA,WAAW,eAqBtB;AAEK,MAAM,UAAU,GAAG,CACxB,MAAc,EACd,OAAe,EACf,MAAe,EACf,GAAG,IAAe,EACZ,EAAE;IACR,sCAAsC;IACtC,IAAI,MAAM,EAAE;QACV,OAAO,CAAC,IAAI,CACV,mBAAmB,CACjB,IAAI,IAAA,4BAAY,EAAC,MAAM,CAAC,GAAG,EAC3B,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAC3B,OAAO,EACP,IAAI,CACL,CACF,CAAC;KACH;SAAM;QACL,OAAO,CAAC,IAAI,CACV,mBAAmB,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAChE,CAAC;KACH;AACH,CAAC,CAAC;AArBW,QAAA,UAAU,cAqBrB;AAEF,MAAM,mBAAmB,GAAG,CAAC,GAAG,IAAe,EAAU,EAAE,CACzD,GAAG,IAAI;KACJ,IAAI,EAAE;KACN,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;KACA,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC"}
|