@aifabrix/miso-client 3.5.0 → 3.8.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.
- package/CHANGELOG.md +240 -0
- package/dist/api/auth-cache.api.d.ts.map +1 -1
- package/dist/api/auth-cache.api.js +27 -5
- package/dist/api/auth-cache.api.js.map +1 -1
- package/dist/api/auth-login.api.d.ts.map +1 -1
- package/dist/api/auth-login.api.js +49 -6
- package/dist/api/auth-login.api.js.map +1 -1
- package/dist/api/auth-token.api.d.ts.map +1 -1
- package/dist/api/auth-token.api.js +99 -7
- package/dist/api/auth-token.api.js.map +1 -1
- package/dist/api/auth-user.api.d.ts.map +1 -1
- package/dist/api/auth-user.api.js +22 -4
- package/dist/api/auth-user.api.js.map +1 -1
- package/dist/api/auth.api.d.ts +2 -9
- package/dist/api/auth.api.d.ts.map +1 -1
- package/dist/api/auth.api.js +1 -66
- package/dist/api/auth.api.js.map +1 -1
- package/dist/api/logs-create.api.d.ts.map +1 -1
- package/dist/api/logs-create.api.js +57 -4
- package/dist/api/logs-create.api.js.map +1 -1
- package/dist/api/logs-export.api.d.ts.map +1 -1
- package/dist/api/logs-export.api.js +7 -1
- package/dist/api/logs-export.api.js.map +1 -1
- package/dist/api/logs-list.api.d.ts.map +1 -1
- package/dist/api/logs-list.api.js +32 -6
- package/dist/api/logs-list.api.js.map +1 -1
- package/dist/api/logs-stats.api.d.ts.map +1 -1
- package/dist/api/logs-stats.api.js +22 -4
- package/dist/api/logs-stats.api.js.map +1 -1
- package/dist/api/permissions.api.d.ts +2 -1
- package/dist/api/permissions.api.d.ts.map +1 -1
- package/dist/api/permissions.api.js +16 -5
- package/dist/api/permissions.api.js.map +1 -1
- package/dist/api/roles.api.d.ts +2 -1
- package/dist/api/roles.api.d.ts.map +1 -1
- package/dist/api/roles.api.js +16 -5
- package/dist/api/roles.api.js.map +1 -1
- package/dist/api/types/logs.types.d.ts +44 -7
- package/dist/api/types/logs.types.d.ts.map +1 -1
- package/dist/express/client-token-endpoint.d.ts.map +1 -1
- package/dist/express/client-token-endpoint.js +42 -5
- package/dist/express/client-token-endpoint.js.map +1 -1
- package/dist/express/error-handler.d.ts.map +1 -1
- package/dist/express/error-handler.js +32 -8
- package/dist/express/error-handler.js.map +1 -1
- package/dist/express/index.d.ts +1 -0
- package/dist/express/index.d.ts.map +1 -1
- package/dist/express/index.js +4 -1
- package/dist/express/index.js.map +1 -1
- package/dist/express/logger-context.middleware.d.ts +46 -0
- package/dist/express/logger-context.middleware.d.ts.map +1 -0
- package/dist/express/logger-context.middleware.js +99 -0
- package/dist/express/logger-context.middleware.js.map +1 -0
- package/dist/index.d.ts +6 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +16 -5
- package/dist/index.js.map +1 -1
- package/dist/services/auth.service.d.ts.map +1 -1
- package/dist/services/auth.service.js +97 -8
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/browser-permission.service.d.ts +5 -0
- package/dist/services/browser-permission.service.d.ts.map +1 -1
- package/dist/services/browser-permission.service.js +39 -2
- package/dist/services/browser-permission.service.js.map +1 -1
- package/dist/services/browser-role.service.d.ts +5 -0
- package/dist/services/browser-role.service.d.ts.map +1 -1
- package/dist/services/browser-role.service.js +45 -2
- package/dist/services/browser-role.service.js.map +1 -1
- package/dist/services/logger/index.d.ts +10 -0
- package/dist/services/logger/index.d.ts.map +1 -0
- package/dist/services/logger/index.js +22 -0
- package/dist/services/logger/index.js.map +1 -0
- package/dist/services/logger/logger-chain.d.ts +90 -0
- package/dist/services/logger/logger-chain.d.ts.map +1 -0
- package/dist/services/logger/logger-chain.js +169 -0
- package/dist/services/logger/logger-chain.js.map +1 -0
- package/dist/services/logger/logger-context-storage.d.ts +73 -0
- package/dist/services/logger/logger-context-storage.d.ts.map +1 -0
- package/dist/services/logger/logger-context-storage.js +86 -0
- package/dist/services/logger/logger-context-storage.js.map +1 -0
- package/dist/services/logger/logger-context.d.ts +85 -0
- package/dist/services/logger/logger-context.d.ts.map +1 -0
- package/dist/services/logger/logger-context.js +192 -0
- package/dist/services/logger/logger-context.js.map +1 -0
- package/dist/services/{logger.service.d.ts → logger/logger.service.d.ts} +59 -72
- package/dist/services/logger/logger.service.d.ts.map +1 -0
- package/dist/services/logger/logger.service.js +403 -0
- package/dist/services/logger/logger.service.js.map +1 -0
- package/dist/services/logger/unified-logger.factory.d.ts +87 -0
- package/dist/services/logger/unified-logger.factory.d.ts.map +1 -0
- package/dist/services/logger/unified-logger.factory.js +120 -0
- package/dist/services/logger/unified-logger.factory.js.map +1 -0
- package/dist/services/logger/unified-logger.service.d.ts +89 -0
- package/dist/services/logger/unified-logger.service.d.ts.map +1 -0
- package/dist/services/logger/unified-logger.service.js +178 -0
- package/dist/services/logger/unified-logger.service.js.map +1 -0
- package/dist/services/permission.service.d.ts +5 -0
- package/dist/services/permission.service.d.ts.map +1 -1
- package/dist/services/permission.service.js +42 -2
- package/dist/services/permission.service.js.map +1 -1
- package/dist/services/role.service.d.ts +5 -0
- package/dist/services/role.service.d.ts.map +1 -1
- package/dist/services/role.service.js +42 -2
- package/dist/services/role.service.js.map +1 -1
- package/dist/types/filter.types.d.ts +6 -6
- package/dist/types/filter.types.d.ts.map +1 -1
- package/dist/types/filter.types.js +14 -5
- package/dist/types/filter.types.js.map +1 -1
- package/dist/utils/console-logger.d.ts +21 -0
- package/dist/utils/console-logger.d.ts.map +1 -0
- package/dist/utils/console-logger.js +58 -0
- package/dist/utils/console-logger.js.map +1 -0
- package/dist/utils/controller-url-resolver.d.ts.map +1 -1
- package/dist/utils/controller-url-resolver.js +5 -0
- package/dist/utils/controller-url-resolver.js.map +1 -1
- package/dist/utils/data-client-auth.d.ts.map +1 -1
- package/dist/utils/data-client-auth.js +34 -2
- package/dist/utils/data-client-auth.js.map +1 -1
- package/dist/utils/data-client-auto-init.d.ts.map +1 -1
- package/dist/utils/data-client-auto-init.js +59 -3
- package/dist/utils/data-client-auto-init.js.map +1 -1
- package/dist/utils/data-client-request.d.ts.map +1 -1
- package/dist/utils/data-client-request.js +78 -2
- package/dist/utils/data-client-request.js.map +1 -1
- package/dist/utils/data-client.d.ts.map +1 -1
- package/dist/utils/data-client.js +10 -7
- package/dist/utils/data-client.js.map +1 -1
- package/dist/utils/environment-token.d.ts.map +1 -1
- package/dist/utils/environment-token.js +37 -57
- package/dist/utils/environment-token.js.map +1 -1
- package/dist/utils/error-extractor.d.ts +52 -0
- package/dist/utils/error-extractor.d.ts.map +1 -0
- package/dist/utils/error-extractor.js +136 -0
- package/dist/utils/error-extractor.js.map +1 -0
- package/dist/utils/filter.utils.d.ts +115 -3
- package/dist/utils/filter.utils.d.ts.map +1 -1
- package/dist/utils/filter.utils.js +298 -27
- package/dist/utils/filter.utils.js.map +1 -1
- package/dist/utils/http-client-audit.d.ts +1 -1
- package/dist/utils/http-client-audit.d.ts.map +1 -1
- package/dist/utils/http-client.d.ts +1 -1
- package/dist/utils/http-client.d.ts.map +1 -1
- package/dist/utils/internal-http-client.d.ts +4 -0
- package/dist/utils/internal-http-client.d.ts.map +1 -1
- package/dist/utils/internal-http-client.js +190 -11
- package/dist/utils/internal-http-client.js.map +1 -1
- package/dist/utils/response-validator.d.ts.map +1 -1
- package/dist/utils/response-validator.js +2 -4
- package/dist/utils/response-validator.js.map +1 -1
- package/dist/utils/token-utils.d.ts.map +1 -1
- package/dist/utils/token-utils.js +75 -4
- package/dist/utils/token-utils.js.map +1 -1
- package/package.json +2 -1
- package/dist/services/logger.service.d.ts.map +0 -1
- package/dist/services/logger.service.js +0 -488
- package/dist/services/logger.service.js.map +0 -1
|
@@ -60,9 +60,41 @@ class InternalHttpClient {
|
|
|
60
60
|
: config.clientTokenExpiresAt;
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
+
// Force IPv4 and set connection timeout for main axios instance
|
|
64
|
+
const controllerUrl = (0, controller_url_resolver_1.resolveControllerUrl)(config);
|
|
65
|
+
const isHttps = controllerUrl.startsWith("https://");
|
|
66
|
+
let httpAgent;
|
|
67
|
+
let httpsAgent;
|
|
68
|
+
if (typeof globalThis.window === "undefined") {
|
|
69
|
+
// Node.js environment - use agents with timeout
|
|
70
|
+
// Use connectTimeout for connection timeout and timeout for socket timeout
|
|
71
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
72
|
+
const http = require("http");
|
|
73
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
74
|
+
const https = require("https");
|
|
75
|
+
const requestTimeout = 30000; // Default timeout
|
|
76
|
+
// timeout: timeout for socket inactivity (should match request timeout)
|
|
77
|
+
// For faster connection failures, we rely on Promise.race timeout wrapper
|
|
78
|
+
httpAgent = !isHttps
|
|
79
|
+
? new http.Agent({
|
|
80
|
+
family: 4,
|
|
81
|
+
timeout: requestTimeout,
|
|
82
|
+
keepAlive: false // Disable keep-alive to ensure timeout works
|
|
83
|
+
})
|
|
84
|
+
: undefined;
|
|
85
|
+
httpsAgent = isHttps
|
|
86
|
+
? new https.Agent({
|
|
87
|
+
family: 4,
|
|
88
|
+
timeout: requestTimeout,
|
|
89
|
+
keepAlive: false // Disable keep-alive to ensure timeout works
|
|
90
|
+
})
|
|
91
|
+
: undefined;
|
|
92
|
+
}
|
|
63
93
|
this.axios = axios_1.default.create({
|
|
64
|
-
baseURL:
|
|
65
|
-
timeout: 30000,
|
|
94
|
+
baseURL: controllerUrl,
|
|
95
|
+
timeout: 30000, // Default timeout
|
|
96
|
+
httpAgent,
|
|
97
|
+
httpsAgent,
|
|
66
98
|
headers: {
|
|
67
99
|
"Content-Type": "application/json",
|
|
68
100
|
},
|
|
@@ -168,6 +200,16 @@ class InternalHttpClient {
|
|
|
168
200
|
throw error;
|
|
169
201
|
}
|
|
170
202
|
}
|
|
203
|
+
/**
|
|
204
|
+
* Merge two AbortSignals into one
|
|
205
|
+
*/
|
|
206
|
+
mergeAbortSignals(signal1, signal2) {
|
|
207
|
+
const controller = new AbortController();
|
|
208
|
+
const abort = () => controller.abort();
|
|
209
|
+
signal1.addEventListener("abort", abort);
|
|
210
|
+
signal2.addEventListener("abort", abort);
|
|
211
|
+
return controller.signal;
|
|
212
|
+
}
|
|
171
213
|
/**
|
|
172
214
|
* Generate unique correlation ID for request tracking
|
|
173
215
|
*/
|
|
@@ -187,21 +229,59 @@ class InternalHttpClient {
|
|
|
187
229
|
const correlationId = this.generateCorrelationId();
|
|
188
230
|
const clientId = this.config.clientId;
|
|
189
231
|
try {
|
|
232
|
+
// Use default timeout of 30 seconds
|
|
233
|
+
const requestTimeout = 30000;
|
|
234
|
+
// Create AbortController for connection timeout
|
|
235
|
+
const controller = new AbortController();
|
|
236
|
+
const timeoutId = setTimeout(() => {
|
|
237
|
+
controller.abort();
|
|
238
|
+
}, requestTimeout);
|
|
239
|
+
// Force IPv4 to avoid IPv6 connection issues and set connection timeout
|
|
240
|
+
const http = await Promise.resolve().then(() => __importStar(require("http")));
|
|
241
|
+
const https = await Promise.resolve().then(() => __importStar(require("https")));
|
|
242
|
+
const controllerUrl = (0, controller_url_resolver_1.resolveControllerUrl)(this.config);
|
|
243
|
+
const isHttps = controllerUrl.startsWith("https://");
|
|
244
|
+
const httpAgent = isHttps
|
|
245
|
+
? new https.Agent({ family: 4, timeout: requestTimeout })
|
|
246
|
+
: new http.Agent({ family: 4, timeout: requestTimeout });
|
|
190
247
|
// Create a temporary axios instance without interceptors to avoid recursion
|
|
191
248
|
const tempAxios = axios_1.default.create({
|
|
192
|
-
baseURL:
|
|
193
|
-
timeout:
|
|
249
|
+
baseURL: controllerUrl,
|
|
250
|
+
timeout: requestTimeout,
|
|
251
|
+
signal: controller.signal, // Abort signal for connection timeout
|
|
252
|
+
httpAgent: !isHttps ? httpAgent : undefined,
|
|
253
|
+
httpsAgent: isHttps ? httpAgent : undefined,
|
|
194
254
|
headers: {
|
|
195
255
|
"Content-Type": "application/json",
|
|
196
256
|
"x-client-id": this.config.clientId,
|
|
197
257
|
"x-client-secret": this.config.clientSecret,
|
|
198
258
|
},
|
|
199
259
|
});
|
|
200
|
-
|
|
260
|
+
// Wrap in Promise.race to ensure timeout even if axios hangs
|
|
261
|
+
const axiosPromise = tempAxios.post("/api/v1/auth/token");
|
|
262
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
263
|
+
setTimeout(() => {
|
|
264
|
+
reject(new Error(`Request timeout after ${requestTimeout}ms`));
|
|
265
|
+
}, requestTimeout);
|
|
266
|
+
});
|
|
267
|
+
let response;
|
|
268
|
+
try {
|
|
269
|
+
response = await Promise.race([axiosPromise, timeoutPromise]);
|
|
270
|
+
clearTimeout(timeoutId); // Clear timeout on success
|
|
271
|
+
}
|
|
272
|
+
catch (requestError) {
|
|
273
|
+
clearTimeout(timeoutId); // Clear timeout on error
|
|
274
|
+
throw requestError; // Re-throw to be handled by outer catch
|
|
275
|
+
}
|
|
201
276
|
// Handle both nested (new) and flat (old) response formats
|
|
202
277
|
const token = response.data.data?.token || response.data.token;
|
|
203
278
|
const expiresIn = response.data.data?.expiresIn || response.data.expiresIn;
|
|
204
|
-
|
|
279
|
+
// Accept response if:
|
|
280
|
+
// 1. Has success: true AND token (old format)
|
|
281
|
+
// 2. Has token AND status is 2xx (new format without success field)
|
|
282
|
+
const hasSuccess = response.data.success === true;
|
|
283
|
+
const hasValidStatus = response.status >= 200 && response.status < 300;
|
|
284
|
+
if (token && (hasSuccess || hasValidStatus)) {
|
|
205
285
|
this.clientToken = token;
|
|
206
286
|
// Set expiration with 30 second buffer before actual expiration
|
|
207
287
|
if (expiresIn) {
|
|
@@ -233,8 +313,11 @@ class InternalHttpClient {
|
|
|
233
313
|
}
|
|
234
314
|
}
|
|
235
315
|
else if (error.request) {
|
|
236
|
-
|
|
316
|
+
// Don't stringify error.request - it contains circular references (Socket -> ClientRequest -> Socket)
|
|
317
|
+
// Instead, just include the error message and code
|
|
318
|
+
responseDetails.push(`request: [Request object - contains circular references]`);
|
|
237
319
|
responseDetails.push(`message: ${error.message}`);
|
|
320
|
+
responseDetails.push(`code: ${error.code || "N/A"}`);
|
|
238
321
|
}
|
|
239
322
|
else {
|
|
240
323
|
responseDetails.push(`message: ${error.message}`);
|
|
@@ -276,6 +359,14 @@ class InternalHttpClient {
|
|
|
276
359
|
}
|
|
277
360
|
// Default to enabled (true) if not explicitly set
|
|
278
361
|
// validateResponses can be true | undefined (defaults to true in development)
|
|
362
|
+
// Skip validation for validate token endpoint - it may return different formats
|
|
363
|
+
// depending on controller version
|
|
364
|
+
if (url.includes('/api/v1/auth/validate') || url.includes('/api/auth/validate')) {
|
|
365
|
+
// Allow responses with just {data: {...}} format for backward compatibility
|
|
366
|
+
if (data && typeof data === 'object' && 'data' in data) {
|
|
367
|
+
return true;
|
|
368
|
+
}
|
|
369
|
+
}
|
|
279
370
|
// Determine response type and validate accordingly
|
|
280
371
|
const responseType = (0, response_validator_1.getResponseType)(data);
|
|
281
372
|
if (responseType === "unknown") {
|
|
@@ -381,13 +472,35 @@ class InternalHttpClient {
|
|
|
381
472
|
return this.axios;
|
|
382
473
|
}
|
|
383
474
|
async get(url, config) {
|
|
475
|
+
const requestTimeout = 30000; // Default timeout
|
|
476
|
+
// Create AbortController to cancel request on timeout
|
|
477
|
+
const controller = new AbortController();
|
|
478
|
+
const timeoutId = setTimeout(() => {
|
|
479
|
+
controller.abort();
|
|
480
|
+
}, requestTimeout);
|
|
481
|
+
// Merge abort signal with existing config
|
|
482
|
+
const requestConfig = {
|
|
483
|
+
...config,
|
|
484
|
+
signal: config?.signal
|
|
485
|
+
? this.mergeAbortSignals(controller.signal, config.signal)
|
|
486
|
+
: controller.signal,
|
|
487
|
+
};
|
|
488
|
+
// Wrap in Promise.race to ensure timeout even if axios hangs
|
|
489
|
+
const axiosPromise = this.axios.get(url, requestConfig);
|
|
490
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
491
|
+
setTimeout(() => {
|
|
492
|
+
reject(new Error(`Request timeout after ${requestTimeout}ms`));
|
|
493
|
+
}, requestTimeout);
|
|
494
|
+
});
|
|
384
495
|
try {
|
|
385
|
-
const response = await
|
|
496
|
+
const response = await Promise.race([axiosPromise, timeoutPromise]);
|
|
497
|
+
clearTimeout(timeoutId);
|
|
386
498
|
const requestUrl = response.config?.url || url;
|
|
387
499
|
this.validateResponse(response.data, requestUrl);
|
|
388
500
|
return response.data;
|
|
389
501
|
}
|
|
390
502
|
catch (error) {
|
|
503
|
+
clearTimeout(timeoutId);
|
|
391
504
|
if (this.isAxiosError(error)) {
|
|
392
505
|
const requestUrl = error.config?.url || url;
|
|
393
506
|
throw this.createMisoClientError(error, requestUrl);
|
|
@@ -396,13 +509,35 @@ class InternalHttpClient {
|
|
|
396
509
|
}
|
|
397
510
|
}
|
|
398
511
|
async post(url, data, config) {
|
|
512
|
+
const requestTimeout = 30000; // Default timeout
|
|
513
|
+
// Create AbortController to cancel request on timeout
|
|
514
|
+
const controller = new AbortController();
|
|
515
|
+
const timeoutId = setTimeout(() => {
|
|
516
|
+
controller.abort();
|
|
517
|
+
}, requestTimeout);
|
|
518
|
+
// Merge abort signal with existing config
|
|
519
|
+
const requestConfig = {
|
|
520
|
+
...config,
|
|
521
|
+
signal: config?.signal
|
|
522
|
+
? this.mergeAbortSignals(controller.signal, config.signal)
|
|
523
|
+
: controller.signal,
|
|
524
|
+
};
|
|
525
|
+
// Wrap in Promise.race to ensure timeout even if axios hangs
|
|
526
|
+
const axiosPromise = this.axios.post(url, data, requestConfig);
|
|
527
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
528
|
+
setTimeout(() => {
|
|
529
|
+
reject(new Error(`Request timeout after ${requestTimeout}ms`));
|
|
530
|
+
}, requestTimeout);
|
|
531
|
+
});
|
|
399
532
|
try {
|
|
400
|
-
const response = await
|
|
533
|
+
const response = await Promise.race([axiosPromise, timeoutPromise]);
|
|
534
|
+
clearTimeout(timeoutId);
|
|
401
535
|
const requestUrl = response.config?.url || url;
|
|
402
536
|
this.validateResponse(response.data, requestUrl);
|
|
403
537
|
return response.data;
|
|
404
538
|
}
|
|
405
539
|
catch (error) {
|
|
540
|
+
clearTimeout(timeoutId);
|
|
406
541
|
if (this.isAxiosError(error)) {
|
|
407
542
|
const requestUrl = error.config?.url || url;
|
|
408
543
|
throw this.createMisoClientError(error, requestUrl);
|
|
@@ -411,13 +546,35 @@ class InternalHttpClient {
|
|
|
411
546
|
}
|
|
412
547
|
}
|
|
413
548
|
async put(url, data, config) {
|
|
549
|
+
const requestTimeout = 30000; // Default timeout
|
|
550
|
+
// Create AbortController to cancel request on timeout
|
|
551
|
+
const controller = new AbortController();
|
|
552
|
+
const timeoutId = setTimeout(() => {
|
|
553
|
+
controller.abort();
|
|
554
|
+
}, requestTimeout);
|
|
555
|
+
// Merge abort signal with existing config
|
|
556
|
+
const requestConfig = {
|
|
557
|
+
...config,
|
|
558
|
+
signal: config?.signal
|
|
559
|
+
? this.mergeAbortSignals(controller.signal, config.signal)
|
|
560
|
+
: controller.signal,
|
|
561
|
+
};
|
|
562
|
+
// Wrap in Promise.race to ensure timeout even if axios hangs
|
|
563
|
+
const axiosPromise = this.axios.put(url, data, requestConfig);
|
|
564
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
565
|
+
setTimeout(() => {
|
|
566
|
+
reject(new Error(`Request timeout after ${requestTimeout}ms`));
|
|
567
|
+
}, requestTimeout);
|
|
568
|
+
});
|
|
414
569
|
try {
|
|
415
|
-
const response = await
|
|
570
|
+
const response = await Promise.race([axiosPromise, timeoutPromise]);
|
|
571
|
+
clearTimeout(timeoutId);
|
|
416
572
|
const requestUrl = response.config?.url || url;
|
|
417
573
|
this.validateResponse(response.data, requestUrl);
|
|
418
574
|
return response.data;
|
|
419
575
|
}
|
|
420
576
|
catch (error) {
|
|
577
|
+
clearTimeout(timeoutId);
|
|
421
578
|
if (this.isAxiosError(error)) {
|
|
422
579
|
const requestUrl = error.config?.url || url;
|
|
423
580
|
throw this.createMisoClientError(error, requestUrl);
|
|
@@ -426,13 +583,35 @@ class InternalHttpClient {
|
|
|
426
583
|
}
|
|
427
584
|
}
|
|
428
585
|
async delete(url, config) {
|
|
586
|
+
const requestTimeout = 30000; // Default timeout
|
|
587
|
+
// Create AbortController to cancel request on timeout
|
|
588
|
+
const controller = new AbortController();
|
|
589
|
+
const timeoutId = setTimeout(() => {
|
|
590
|
+
controller.abort();
|
|
591
|
+
}, requestTimeout);
|
|
592
|
+
// Merge abort signal with existing config
|
|
593
|
+
const requestConfig = {
|
|
594
|
+
...config,
|
|
595
|
+
signal: config?.signal
|
|
596
|
+
? this.mergeAbortSignals(controller.signal, config.signal)
|
|
597
|
+
: controller.signal,
|
|
598
|
+
};
|
|
599
|
+
// Wrap in Promise.race to ensure timeout even if axios hangs
|
|
600
|
+
const axiosPromise = this.axios.delete(url, requestConfig);
|
|
601
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
602
|
+
setTimeout(() => {
|
|
603
|
+
reject(new Error(`Request timeout after ${requestTimeout}ms`));
|
|
604
|
+
}, requestTimeout);
|
|
605
|
+
});
|
|
429
606
|
try {
|
|
430
|
-
const response = await
|
|
607
|
+
const response = await Promise.race([axiosPromise, timeoutPromise]);
|
|
608
|
+
clearTimeout(timeoutId);
|
|
431
609
|
const requestUrl = response.config?.url || url;
|
|
432
610
|
this.validateResponse(response.data, requestUrl);
|
|
433
611
|
return response.data;
|
|
434
612
|
}
|
|
435
613
|
catch (error) {
|
|
614
|
+
clearTimeout(timeoutId);
|
|
436
615
|
if (this.isAxiosError(error)) {
|
|
437
616
|
const requestUrl = error.config?.url || url;
|
|
438
617
|
throw this.createMisoClientError(error, requestUrl);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-http-client.js","sourceRoot":"","sources":["../../src/utils/internal-http-client.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"internal-http-client.js","sourceRoot":"","sources":["../../src/utils/internal-http-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response-validator.d.ts","sourceRoot":"","sources":["../../src/utils/response-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,OAAO;IAC5C,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,IAAI,EAAE;QACJ,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,GAAG,OAAO,EACjD,IAAI,EAAE,OAAO,GACZ,IAAI,IAAI,eAAe,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"response-validator.d.ts","sourceRoot":"","sources":["../../src/utils/response-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,OAAO;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,CAAC,GAAG,OAAO;IAC5C,IAAI,EAAE,CAAC,EAAE,CAAC;IACV,IAAI,EAAE;QACJ,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,KAAK,CAAC,EAAE;QACN,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,CAAC,GAAG,OAAO,EACjD,IAAI,EAAE,OAAO,GACZ,IAAI,IAAI,eAAe,CAAC,CAAC,CAAC,CAyB5B;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,GAAG,OAAO,EACnD,IAAI,EAAE,OAAO,GACZ,IAAI,IAAI,iBAAiB,CAAC,CAAC,CAAC,CAkE9B;AAED;;;;;GAKG;AACH,OAAO,EAAE,eAAe,IAAI,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAEjF;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,OAAO,GACZ,SAAS,GAAG,WAAW,GAAG,SAAS,CAUrC"}
|
|
@@ -27,10 +27,8 @@ function validateSuccessResponse(data) {
|
|
|
27
27
|
return false;
|
|
28
28
|
}
|
|
29
29
|
// data and message are optional, but if present must be correct types
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return true;
|
|
33
|
-
}
|
|
30
|
+
// data can be null, undefined, or any value - all are valid
|
|
31
|
+
// No need to validate data type since it can be anything (null, object, array, string, number, boolean)
|
|
34
32
|
if (obj.message !== undefined && typeof obj.message !== "string") {
|
|
35
33
|
return false;
|
|
36
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"response-validator.js","sourceRoot":"","sources":["../../src/utils/response-validator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAqCH,
|
|
1
|
+
{"version":3,"file":"response-validator.js","sourceRoot":"","sources":["../../src/utils/response-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-utils.d.ts","sourceRoot":"","sources":["../../src/utils/token-utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"token-utils.d.ts","sourceRoot":"","sources":["../../src/utils/token-utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAyCD;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,GAClB,eAAe,CA6EjB"}
|
|
@@ -9,6 +9,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.extractClientTokenInfo = extractClientTokenInfo;
|
|
11
11
|
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
12
|
+
const data_client_utils_1 = require("./data-client-utils");
|
|
13
|
+
/**
|
|
14
|
+
* Decode JWT token payload (browser-safe)
|
|
15
|
+
* Uses manual base64 decoding in browser, jwt.decode() in Node.js
|
|
16
|
+
*/
|
|
17
|
+
function decodeJWT(token) {
|
|
18
|
+
if ((0, data_client_utils_1.isBrowser)()) {
|
|
19
|
+
// Browser: use manual base64 decoding
|
|
20
|
+
try {
|
|
21
|
+
const parts = token.split('.');
|
|
22
|
+
if (parts.length !== 3) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
// Decode payload (handle base64url encoding)
|
|
26
|
+
let payloadStr = parts[1];
|
|
27
|
+
// Add padding if needed
|
|
28
|
+
while (payloadStr.length % 4) {
|
|
29
|
+
payloadStr += '=';
|
|
30
|
+
}
|
|
31
|
+
// Replace URL-safe characters
|
|
32
|
+
payloadStr = payloadStr.replace(/-/g, '+').replace(/_/g, '/');
|
|
33
|
+
const decoded = JSON.parse(atob(payloadStr));
|
|
34
|
+
return decoded;
|
|
35
|
+
}
|
|
36
|
+
catch (error) {
|
|
37
|
+
console.warn("[decodeJWT] Browser decode failed:", error);
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
// Node.js: use jsonwebtoken library
|
|
43
|
+
try {
|
|
44
|
+
return jsonwebtoken_1.default.decode(token);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
console.warn("[decodeJWT] Node.js decode failed:", error);
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
12
52
|
/**
|
|
13
53
|
* Extract client token information from JWT token
|
|
14
54
|
* Decodes the token without verification (no secret available)
|
|
@@ -20,9 +60,9 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
|
20
60
|
function extractClientTokenInfo(clientToken) {
|
|
21
61
|
try {
|
|
22
62
|
// Decode token without verification (we don't have the secret)
|
|
23
|
-
const decoded =
|
|
63
|
+
const decoded = decodeJWT(clientToken);
|
|
24
64
|
if (!decoded || typeof decoded !== "object") {
|
|
25
|
-
console.warn("Failed to decode client token: Invalid token format");
|
|
65
|
+
console.warn("[extractClientTokenInfo] Failed to decode client token: Invalid token format");
|
|
26
66
|
return {};
|
|
27
67
|
}
|
|
28
68
|
// Extract fields with fallback support
|
|
@@ -34,13 +74,16 @@ function extractClientTokenInfo(clientToken) {
|
|
|
34
74
|
else if (decoded.app && typeof decoded.app === "string") {
|
|
35
75
|
info.application = decoded.app;
|
|
36
76
|
}
|
|
37
|
-
// environment or env
|
|
77
|
+
// environment or env or environmentKey (controller uses environmentKey)
|
|
38
78
|
if (decoded.environment && typeof decoded.environment === "string") {
|
|
39
79
|
info.environment = decoded.environment;
|
|
40
80
|
}
|
|
41
81
|
else if (decoded.env && typeof decoded.env === "string") {
|
|
42
82
|
info.environment = decoded.env;
|
|
43
83
|
}
|
|
84
|
+
else if (decoded.environmentKey && typeof decoded.environmentKey === "string") {
|
|
85
|
+
info.environment = decoded.environmentKey;
|
|
86
|
+
}
|
|
44
87
|
// applicationId or app_id
|
|
45
88
|
if (decoded.applicationId && typeof decoded.applicationId === "string") {
|
|
46
89
|
info.applicationId = decoded.applicationId;
|
|
@@ -55,10 +98,38 @@ function extractClientTokenInfo(clientToken) {
|
|
|
55
98
|
else if (decoded.client_id && typeof decoded.client_id === "string") {
|
|
56
99
|
info.clientId = decoded.client_id;
|
|
57
100
|
}
|
|
101
|
+
// Always log available fields for debugging (even if we found some)
|
|
102
|
+
if (Object.keys(info).length === 0) {
|
|
103
|
+
console.log("[extractClientTokenInfo] No standard fields found in token payload");
|
|
104
|
+
console.log("[extractClientTokenInfo] Available fields:", Object.keys(decoded));
|
|
105
|
+
console.log("[extractClientTokenInfo] Full payload:", JSON.stringify(decoded, null, 2));
|
|
106
|
+
// Try to extract any useful information from common JWT fields
|
|
107
|
+
// This helps with debugging even if standard fields aren't present
|
|
108
|
+
if (decoded.iss) {
|
|
109
|
+
console.log("[extractClientTokenInfo] Token issuer (iss):", decoded.iss);
|
|
110
|
+
}
|
|
111
|
+
if (decoded.sub) {
|
|
112
|
+
console.log("[extractClientTokenInfo] Token subject (sub):", decoded.sub);
|
|
113
|
+
}
|
|
114
|
+
if (decoded.aud) {
|
|
115
|
+
console.log("[extractClientTokenInfo] Token audience (aud):", decoded.aud);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
console.log("[extractClientTokenInfo] Successfully extracted token info:", info);
|
|
120
|
+
// Still log all available fields to help debug missing environment
|
|
121
|
+
if (!info.environment) {
|
|
122
|
+
console.log("[extractClientTokenInfo] Environment not found. Available payload fields:", Object.keys(decoded));
|
|
123
|
+
console.log("[extractClientTokenInfo] Full payload:", JSON.stringify(decoded, null, 2));
|
|
124
|
+
}
|
|
125
|
+
}
|
|
58
126
|
return info;
|
|
59
127
|
}
|
|
60
128
|
catch (error) {
|
|
61
|
-
console.warn("Failed to decode client token:", error);
|
|
129
|
+
console.warn("[extractClientTokenInfo] Failed to decode client token:", error);
|
|
130
|
+
if (error instanceof Error) {
|
|
131
|
+
console.warn("[extractClientTokenInfo] Error details:", error.message, error.stack);
|
|
132
|
+
}
|
|
62
133
|
return {};
|
|
63
134
|
}
|
|
64
135
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-utils.js","sourceRoot":"","sources":["../../src/utils/token-utils.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;
|
|
1
|
+
{"version":3,"file":"token-utils.js","sourceRoot":"","sources":["../../src/utils/token-utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aifabrix/miso-client",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.8.0",
|
|
4
4
|
"description": "AI Fabrix Client SDK - Authentication, authorization, logging, and Express.js utilities",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
"test:coverage": "node --unhandled-rejections=warn -r ./tests/setup-rejection-handler.js node_modules/jest/bin/jest.js --coverage",
|
|
19
19
|
"test:no-coverage": "node --unhandled-rejections=warn -r ./tests/setup-rejection-handler.js node_modules/jest/bin/jest.js --no-coverage",
|
|
20
20
|
"test:integration": "ts-node test_integration.ts",
|
|
21
|
+
"test:integration:api": "node --unhandled-rejections=warn node_modules/jest/bin/jest.js tests/integration/api-endpoints.integration.test.ts --maxWorkers=50% --testPathIgnorePatterns=/node_modules/",
|
|
21
22
|
"lint": "eslint 'src/**/*.ts' --max-warnings 0 --ignore-pattern '**/*.d.ts'",
|
|
22
23
|
"lint:fix": "eslint 'src/**/*.ts' --fix --ignore-pattern '**/*.d.ts'",
|
|
23
24
|
"prepublishOnly": "npm run build"
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"logger.service.d.ts","sourceRoot":"","sources":["../../src/services/logger.service.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,MAAM,WAAW,oBAAoB;IACnC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAG3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IAGxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,aAAc,SAAQ,YAAY;IAC7C,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAC,CAAY;IAC9B,OAAO,CAAC,KAAK,CAAe;IAC5B,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,kBAAkB,CAAK;IAC/B,OAAO,CAAC,aAAa,CAA8B;IAEnD,OAAO,CAAC,mBAAmB,CAAK;IAChC,OAAO,CAAC,wBAAwB,CAAuB;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAK;IACzC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAS;gBAExC,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY;IAqBvD;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQxC;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIlC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAkCzB;;OAEG;IACH,OAAO,CAAC,eAAe;IAyBvB;;OAEG;IACG,KAAK,CACT,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIhB;;OAEG;IACG,KAAK,CACT,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAehB;;OAEG;IACG,IAAI,CACR,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAIhB;;OAEG;IACG,KAAK,CACT,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,IAAI,CAAC;IAMhB;;OAEG;YACW,GAAG;IAmLjB;;OAEG;IACH,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,WAAW;IAI1D,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAIrC,cAAc,IAAI,WAAW;IAI7B;;;;;;;;;;;OAWG;IACH,UAAU,CAAC,GAAG,EAAE,OAAO,GAAG,WAAW;CAGtC;AAED;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,OAAO,CAAuB;gBAGpC,MAAM,EAAE,aAAa,EACrB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACrC,OAAO,GAAE,oBAAyB;IAOpC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,WAAW;IAKpD,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW;IAKpC,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW;IAKlD,cAAc,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW;IAKlD,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW;IAKrC,cAAc,IAAI,WAAW;IAK7B;;;;;;;;;;;;;;;;;OAiBG;IACH,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,GAAG,WAAW;IAU/D;;;;;;;;;;;;;OAaG;IACH,qBAAqB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,WAAW;IAMlF;;;;;;;;;;;;;;OAcG;IACH,kBAAkB,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,WAAW;IAOjG;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,WAAW;IAwChC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAG7D"}
|