@aifabrix/miso-client 4.3.1 → 4.4.1
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 +1253 -1215
- package/README.md +22 -23
- package/dist/api/applications.api.d.ts +42 -0
- package/dist/api/applications.api.d.ts.map +1 -0
- package/dist/api/applications.api.js +91 -0
- package/dist/api/applications.api.js.map +1 -0
- package/dist/api/index.d.ts +5 -0
- package/dist/api/index.d.ts.map +1 -1
- package/dist/api/index.js +2 -0
- package/dist/api/index.js.map +1 -1
- package/dist/api/types/applications.types.d.ts +58 -0
- package/dist/api/types/applications.types.d.ts.map +1 -0
- package/dist/api/types/applications.types.js +7 -0
- package/dist/api/types/applications.types.js.map +1 -0
- package/dist/api/types/encryption.types.d.ts +2 -2
- package/dist/api/types/encryption.types.d.ts.map +1 -1
- package/dist/express/client-token-endpoint.d.ts +2 -2
- package/dist/express/client-token-endpoint.d.ts.map +1 -1
- package/dist/express/client-token-endpoint.js +21 -3
- package/dist/express/client-token-endpoint.js.map +1 -1
- package/dist/express/error-handler.d.ts +8 -1
- package/dist/express/error-handler.d.ts.map +1 -1
- package/dist/express/error-handler.js +8 -1
- package/dist/express/error-handler.js.map +1 -1
- package/dist/express/error-response.d.ts +16 -4
- package/dist/express/error-response.d.ts.map +1 -1
- package/dist/express/error-response.js +16 -4
- package/dist/express/error-response.js.map +1 -1
- package/dist/express/error-types.d.ts +13 -0
- package/dist/express/error-types.d.ts.map +1 -1
- package/dist/express/error-types.js +13 -0
- package/dist/express/error-types.js.map +1 -1
- package/dist/express/index.d.ts +8 -4
- package/dist/express/index.d.ts.map +1 -1
- package/dist/express/index.js.map +1 -1
- package/dist/express/logger-context.middleware.d.ts +8 -4
- package/dist/express/logger-context.middleware.d.ts.map +1 -1
- package/dist/express/logger-context.middleware.js +9 -4
- package/dist/express/logger-context.middleware.js.map +1 -1
- package/dist/express/response-middleware.d.ts +4 -0
- package/dist/express/response-middleware.d.ts.map +1 -1
- package/dist/express/response-middleware.js +4 -0
- package/dist/express/response-middleware.js.map +1 -1
- package/dist/index.d.ts +207 -34
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +214 -36
- package/dist/index.js.map +1 -1
- package/dist/services/application-context.service.d.ts +0 -1
- package/dist/services/application-context.service.d.ts.map +1 -1
- package/dist/services/application-context.service.js +12 -7
- package/dist/services/application-context.service.js.map +1 -1
- package/dist/services/auth-cache-helpers.d.ts +22 -0
- package/dist/services/auth-cache-helpers.d.ts.map +1 -0
- package/dist/services/auth-cache-helpers.js +85 -0
- package/dist/services/auth-cache-helpers.js.map +1 -0
- package/dist/services/auth-environment-token.d.ts +20 -0
- package/dist/services/auth-environment-token.d.ts.map +1 -0
- package/dist/services/auth-environment-token.js +94 -0
- package/dist/services/auth-environment-token.js.map +1 -0
- package/dist/services/auth-error-handler.d.ts.map +1 -1
- package/dist/services/auth-error-handler.js +1 -1
- package/dist/services/auth-error-handler.js.map +1 -1
- package/dist/services/auth.service.d.ts +16 -28
- package/dist/services/auth.service.d.ts.map +1 -1
- package/dist/services/auth.service.js +112 -208
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/browser-permission.service.d.ts +3 -1
- package/dist/services/browser-permission.service.d.ts.map +1 -1
- package/dist/services/browser-permission.service.js +44 -9
- package/dist/services/browser-permission.service.js.map +1 -1
- package/dist/services/browser-role.service.d.ts +3 -1
- package/dist/services/browser-role.service.d.ts.map +1 -1
- package/dist/services/browser-role.service.js +44 -9
- package/dist/services/browser-role.service.js.map +1 -1
- package/dist/services/cache.service.d.ts.map +1 -1
- package/dist/services/cache.service.js +8 -2
- package/dist/services/cache.service.js.map +1 -1
- package/dist/services/encryption.service.d.ts +1 -1
- package/dist/services/encryption.service.js +2 -2
- package/dist/services/encryption.service.js.map +1 -1
- package/dist/services/logger/index.d.ts +6 -4
- package/dist/services/logger/index.d.ts.map +1 -1
- package/dist/services/logger/index.js +1 -4
- package/dist/services/logger/index.js.map +1 -1
- package/dist/services/logger/logger-chain.d.ts +18 -8
- package/dist/services/logger/logger-chain.d.ts.map +1 -1
- package/dist/services/logger/logger-chain.js +35 -41
- package/dist/services/logger/logger-chain.js.map +1 -1
- package/dist/services/logger/logger-context-storage.d.ts +2 -0
- package/dist/services/logger/logger-context-storage.d.ts.map +1 -1
- package/dist/services/logger/logger-context-storage.js.map +1 -1
- package/dist/services/logger/logger-context.d.ts +0 -22
- package/dist/services/logger/logger-context.d.ts.map +1 -1
- package/dist/services/logger/logger-context.js +2 -50
- package/dist/services/logger/logger-context.js.map +1 -1
- package/dist/services/logger/logger.service.d.ts +37 -14
- package/dist/services/logger/logger.service.d.ts.map +1 -1
- package/dist/services/logger/logger.service.js +157 -133
- package/dist/services/logger/logger.service.js.map +1 -1
- package/dist/services/logger/unified-logger.service.d.ts.map +1 -1
- package/dist/services/logger/unified-logger.service.js +2 -34
- package/dist/services/logger/unified-logger.service.js.map +1 -1
- package/dist/services/permission.service.d.ts +12 -5
- package/dist/services/permission.service.d.ts.map +1 -1
- package/dist/services/permission.service.js +50 -10
- package/dist/services/permission.service.js.map +1 -1
- package/dist/services/redis.service.d.ts +29 -0
- package/dist/services/redis.service.d.ts.map +1 -1
- package/dist/services/redis.service.js +48 -5
- package/dist/services/redis.service.js.map +1 -1
- package/dist/services/role.service.d.ts +12 -5
- package/dist/services/role.service.d.ts.map +1 -1
- package/dist/services/role.service.js +38 -9
- package/dist/services/role.service.js.map +1 -1
- package/dist/services/token-validation.service.d.ts +30 -0
- package/dist/services/token-validation.service.d.ts.map +1 -1
- package/dist/services/token-validation.service.js +30 -0
- package/dist/services/token-validation.service.js.map +1 -1
- package/dist/types/config.types.d.ts +38 -1
- package/dist/types/config.types.d.ts.map +1 -1
- package/dist/types/config.types.js.map +1 -1
- package/dist/utils/audit-log-queue.d.ts.map +1 -1
- package/dist/utils/audit-log-queue.js +3 -0
- package/dist/utils/audit-log-queue.js.map +1 -1
- package/dist/utils/client-token-manager.d.ts.map +1 -1
- package/dist/utils/client-token-manager.js +9 -1
- package/dist/utils/client-token-manager.js.map +1 -1
- package/dist/utils/config-loader.d.ts +3 -1
- package/dist/utils/config-loader.d.ts.map +1 -1
- package/dist/utils/config-loader.js +5 -3
- package/dist/utils/config-loader.js.map +1 -1
- package/dist/utils/data-client-audit.d.ts.map +1 -1
- package/dist/utils/data-client-audit.js +15 -2
- package/dist/utils/data-client-audit.js.map +1 -1
- package/dist/utils/data-client-auth.d.ts.map +1 -1
- package/dist/utils/data-client-auth.js +17 -9
- 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 +110 -119
- package/dist/utils/data-client-auto-init.js.map +1 -1
- package/dist/utils/data-client-request.d.ts +0 -3
- package/dist/utils/data-client-request.d.ts.map +1 -1
- package/dist/utils/data-client-request.js +148 -97
- package/dist/utils/data-client-request.js.map +1 -1
- package/dist/utils/data-client-response.d.ts.map +1 -1
- package/dist/utils/data-client-response.js +93 -63
- package/dist/utils/data-client-response.js.map +1 -1
- package/dist/utils/data-client-utils.d.ts +2 -1
- package/dist/utils/data-client-utils.d.ts.map +1 -1
- package/dist/utils/data-client-utils.js +2 -1
- package/dist/utils/data-client-utils.js.map +1 -1
- package/dist/utils/data-client.d.ts.map +1 -1
- package/dist/utils/data-client.js +4 -1
- package/dist/utils/data-client.js.map +1 -1
- package/dist/utils/data-masker.d.ts +3 -0
- package/dist/utils/data-masker.d.ts.map +1 -1
- package/dist/utils/data-masker.js +3 -0
- package/dist/utils/data-masker.js.map +1 -1
- package/dist/utils/filter-schema.utils.d.ts.map +1 -1
- package/dist/utils/filter-schema.utils.js +64 -46
- package/dist/utils/filter-schema.utils.js.map +1 -1
- package/dist/utils/filter.utils.d.ts.map +1 -1
- package/dist/utils/filter.utils.js +59 -75
- package/dist/utils/filter.utils.js.map +1 -1
- package/dist/utils/http-client-audit.d.ts.map +1 -1
- package/dist/utils/http-client-audit.js +31 -19
- package/dist/utils/http-client-audit.js.map +1 -1
- package/dist/utils/http-client-metadata.d.ts +2 -1
- package/dist/utils/http-client-metadata.d.ts.map +1 -1
- package/dist/utils/http-client-metadata.js +2 -1
- package/dist/utils/http-client-metadata.js.map +1 -1
- package/dist/utils/internal-http-client.d.ts.map +1 -1
- package/dist/utils/internal-http-client.js +13 -7
- package/dist/utils/internal-http-client.js.map +1 -1
- package/package.json +86 -84
|
@@ -278,29 +278,10 @@ function compileFilter(filters, schema, logic = "and") {
|
|
|
278
278
|
const params = [];
|
|
279
279
|
const clauses = [];
|
|
280
280
|
for (const filter of filters) {
|
|
281
|
-
const
|
|
282
|
-
if (!fieldDef) {
|
|
283
|
-
throw new Error(`Unknown field '${filter.field}' in schema '${schema.resource}'`);
|
|
284
|
-
}
|
|
285
|
-
const column = fieldDef.column;
|
|
286
|
-
let value = filter.value;
|
|
287
|
-
// Coerce value based on field type
|
|
288
|
-
try {
|
|
289
|
-
value = coerceValue(value, fieldDef);
|
|
290
|
-
}
|
|
291
|
-
catch {
|
|
292
|
-
// If coercion fails, use original value (validation should catch type errors)
|
|
293
|
-
}
|
|
294
|
-
// Handle contains operator - wrap value with %
|
|
295
|
-
if (filter.op === "contains" && typeof value === "string") {
|
|
296
|
-
value = `%${value}%`;
|
|
297
|
-
}
|
|
298
|
-
const paramIndex = params.length + 1;
|
|
299
|
-
const { sql, hasParam } = operatorToSql(filter.op, column, paramIndex);
|
|
281
|
+
const { sql, hasParam, value } = buildFilterClause(filter, schema, params.length + 1);
|
|
300
282
|
clauses.push(sql);
|
|
301
|
-
if (hasParam)
|
|
283
|
+
if (hasParam)
|
|
302
284
|
params.push(value);
|
|
303
|
-
}
|
|
304
285
|
}
|
|
305
286
|
const joinOperator = logic === "or" ? " OR " : " AND ";
|
|
306
287
|
return {
|
|
@@ -308,6 +289,29 @@ function compileFilter(filters, schema, logic = "and") {
|
|
|
308
289
|
params,
|
|
309
290
|
};
|
|
310
291
|
}
|
|
292
|
+
function buildFilterClause(filter, schema, paramIndex) {
|
|
293
|
+
const fieldDef = schema.fields[filter.field];
|
|
294
|
+
if (!fieldDef) {
|
|
295
|
+
throw new Error(`Unknown field '${filter.field}' in schema '${schema.resource}'`);
|
|
296
|
+
}
|
|
297
|
+
const column = fieldDef.column;
|
|
298
|
+
const value = resolveFilterValue(filter, fieldDef);
|
|
299
|
+
const { sql, hasParam } = operatorToSql(filter.op, column, paramIndex);
|
|
300
|
+
return { sql, hasParam, value };
|
|
301
|
+
}
|
|
302
|
+
function resolveFilterValue(filter, fieldDef) {
|
|
303
|
+
let value = filter.value;
|
|
304
|
+
try {
|
|
305
|
+
value = coerceValue(value, fieldDef);
|
|
306
|
+
}
|
|
307
|
+
catch {
|
|
308
|
+
// If coercion fails, use original value (validation should catch type errors)
|
|
309
|
+
}
|
|
310
|
+
if (filter.op === "contains" && typeof value === "string") {
|
|
311
|
+
value = `%${value}%`;
|
|
312
|
+
}
|
|
313
|
+
return value;
|
|
314
|
+
}
|
|
311
315
|
/**
|
|
312
316
|
* Create a filter schema from field definitions.
|
|
313
317
|
* Convenience function for creating schemas with default operators.
|
|
@@ -337,6 +341,15 @@ function createFilterSchema(resource, fields, version) {
|
|
|
337
341
|
* @throws Error if schema format is invalid
|
|
338
342
|
*/
|
|
339
343
|
function loadFilterSchema(json) {
|
|
344
|
+
const obj = getFilterSchemaObject(json);
|
|
345
|
+
const parsedFields = parseFilterFields(obj.fields);
|
|
346
|
+
return {
|
|
347
|
+
resource: obj.resource,
|
|
348
|
+
version: typeof obj.version === "string" ? obj.version : undefined,
|
|
349
|
+
fields: parsedFields,
|
|
350
|
+
};
|
|
351
|
+
}
|
|
352
|
+
function getFilterSchemaObject(json) {
|
|
340
353
|
if (typeof json !== "object" || json === null) {
|
|
341
354
|
throw new Error("Invalid filter schema: expected object");
|
|
342
355
|
}
|
|
@@ -347,35 +360,40 @@ function loadFilterSchema(json) {
|
|
|
347
360
|
if (typeof obj.fields !== "object" || obj.fields === null) {
|
|
348
361
|
throw new Error("Invalid filter schema: missing 'fields' object");
|
|
349
362
|
}
|
|
350
|
-
|
|
363
|
+
return {
|
|
364
|
+
resource: obj.resource,
|
|
365
|
+
version: typeof obj.version === "string" ? obj.version : undefined,
|
|
366
|
+
fields: obj.fields,
|
|
367
|
+
};
|
|
368
|
+
}
|
|
369
|
+
function parseFilterFields(fields) {
|
|
351
370
|
const parsedFields = {};
|
|
352
371
|
for (const [fieldName, fieldDef] of Object.entries(fields)) {
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
}
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
enumValues: Array.isArray(def.enumValues) ? def.enumValues : undefined,
|
|
371
|
-
nullable: typeof def.nullable === "boolean" ? def.nullable : undefined,
|
|
372
|
-
description: typeof def.description === "string" ? def.description : undefined,
|
|
373
|
-
};
|
|
372
|
+
parsedFields[fieldName] = parseFilterField(fieldName, fieldDef);
|
|
373
|
+
}
|
|
374
|
+
return parsedFields;
|
|
375
|
+
}
|
|
376
|
+
function parseFilterField(fieldName, fieldDef) {
|
|
377
|
+
if (typeof fieldDef !== "object" || fieldDef === null) {
|
|
378
|
+
throw new Error(`Invalid filter schema: field '${fieldName}' must be an object`);
|
|
379
|
+
}
|
|
380
|
+
const def = fieldDef;
|
|
381
|
+
if (typeof def.column !== "string") {
|
|
382
|
+
throw new Error(`Invalid filter schema: field '${fieldName}' missing 'column'`);
|
|
383
|
+
}
|
|
384
|
+
if (typeof def.type !== "string") {
|
|
385
|
+
throw new Error(`Invalid filter schema: field '${fieldName}' missing 'type'`);
|
|
386
|
+
}
|
|
387
|
+
if (!Array.isArray(def.operators)) {
|
|
388
|
+
throw new Error(`Invalid filter schema: field '${fieldName}' missing 'operators' array`);
|
|
374
389
|
}
|
|
375
390
|
return {
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
391
|
+
column: def.column,
|
|
392
|
+
type: def.type,
|
|
393
|
+
operators: def.operators,
|
|
394
|
+
enumValues: Array.isArray(def.enumValues) ? def.enumValues : undefined,
|
|
395
|
+
nullable: typeof def.nullable === "boolean" ? def.nullable : undefined,
|
|
396
|
+
description: typeof def.description === "string" ? def.description : undefined,
|
|
379
397
|
};
|
|
380
398
|
}
|
|
381
399
|
//# sourceMappingURL=filter-schema.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-schema.utils.js","sourceRoot":"","sources":["../../src/utils/filter-schema.utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"filter-schema.utils.js","sourceRoot":"","sources":["../../src/utils/filter-schema.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.utils.d.ts","sourceRoot":"","sources":["../../src/utils/filter.utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAkB,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA+DtD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"filter.utils.d.ts","sourceRoot":"","sources":["../../src/utils/filter.utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAkB,MAAM,uBAAuB,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AA+DtD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,YAAY,EAAE,CA4BhF;AAqED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAwB7D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,IAAI,EAAE,CAAC,EAAE,EACT,OAAO,EAAE,YAAY,EAAE,GACtB,CAAC,EAAE,CAuCL;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAwBxD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAWnG;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAClD,WAAW,CAGb;AAGD,OAAO,EAAE,aAAa,EAAE,CAAC"}
|
|
@@ -94,87 +94,14 @@ function parseFilterParams(query) {
|
|
|
94
94
|
return [];
|
|
95
95
|
}
|
|
96
96
|
try {
|
|
97
|
-
// Handle object filter (JSON format)
|
|
98
97
|
if (typeof filterParam === "object" && !Array.isArray(filterParam) && filterParam !== null) {
|
|
99
98
|
return _parseJsonFilter(filterParam);
|
|
100
99
|
}
|
|
101
|
-
// Handle string filter (could be JSON or colon format)
|
|
102
100
|
if (typeof filterParam === "string") {
|
|
103
|
-
|
|
104
|
-
return [(0, filter_colon_utils_1.parseColonFilter)(filterParam)];
|
|
105
|
-
}
|
|
106
|
-
// Try JSON format
|
|
107
|
-
try {
|
|
108
|
-
const decoded = decodeURIComponent(filterParam);
|
|
109
|
-
const jsonFilter = JSON.parse(decoded);
|
|
110
|
-
if (Array.isArray(jsonFilter)) {
|
|
111
|
-
const result = [];
|
|
112
|
-
for (const item of jsonFilter) {
|
|
113
|
-
if (typeof item === "object" && item !== null) {
|
|
114
|
-
result.push(..._parseJsonFilter(item));
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
return result;
|
|
118
|
-
}
|
|
119
|
-
return _parseJsonFilter(jsonFilter);
|
|
120
|
-
}
|
|
121
|
-
catch {
|
|
122
|
-
try {
|
|
123
|
-
const jsonFilter = JSON.parse(filterParam);
|
|
124
|
-
if (Array.isArray(jsonFilter)) {
|
|
125
|
-
const result = [];
|
|
126
|
-
for (const item of jsonFilter) {
|
|
127
|
-
if (typeof item === "object" && item !== null) {
|
|
128
|
-
result.push(..._parseJsonFilter(item));
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
return result;
|
|
132
|
-
}
|
|
133
|
-
return _parseJsonFilter(jsonFilter);
|
|
134
|
-
}
|
|
135
|
-
catch {
|
|
136
|
-
if (filterParam.includes(":")) {
|
|
137
|
-
return [(0, filter_colon_utils_1.parseColonFilter)(filterParam)];
|
|
138
|
-
}
|
|
139
|
-
throw new Error(`Could not parse filter string: "${filterParam}"`);
|
|
140
|
-
}
|
|
141
|
-
}
|
|
101
|
+
return parseFilterString(filterParam);
|
|
142
102
|
}
|
|
143
|
-
// Handle array of filters (can be mixed JSON and colon format)
|
|
144
103
|
if (Array.isArray(filterParam)) {
|
|
145
|
-
|
|
146
|
-
for (const item of filterParam) {
|
|
147
|
-
if (typeof item === "string") {
|
|
148
|
-
if ((0, filter_colon_utils_1.isColonFormat)(item)) {
|
|
149
|
-
result.push((0, filter_colon_utils_1.parseColonFilter)(item));
|
|
150
|
-
}
|
|
151
|
-
else {
|
|
152
|
-
try {
|
|
153
|
-
const decoded = decodeURIComponent(item);
|
|
154
|
-
const parsed = JSON.parse(decoded);
|
|
155
|
-
result.push(..._parseJsonFilter(parsed));
|
|
156
|
-
}
|
|
157
|
-
catch {
|
|
158
|
-
try {
|
|
159
|
-
const parsed = JSON.parse(item);
|
|
160
|
-
result.push(..._parseJsonFilter(parsed));
|
|
161
|
-
}
|
|
162
|
-
catch {
|
|
163
|
-
if (item.includes(":")) {
|
|
164
|
-
result.push((0, filter_colon_utils_1.parseColonFilter)(item));
|
|
165
|
-
}
|
|
166
|
-
else {
|
|
167
|
-
throw new Error(`Could not parse filter item: "${item}"`);
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
else if (typeof item === "object" && item !== null) {
|
|
174
|
-
result.push(..._parseJsonFilter(item));
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
return result;
|
|
104
|
+
return parseFilterArray(filterParam);
|
|
178
105
|
}
|
|
179
106
|
throw new Error(`Invalid filter format. Expected object, string, or array, got ${typeof filterParam}.`);
|
|
180
107
|
}
|
|
@@ -185,6 +112,63 @@ function parseFilterParams(query) {
|
|
|
185
112
|
throw new Error(`Invalid filter format. Got: ${typeof filterParam}`);
|
|
186
113
|
}
|
|
187
114
|
}
|
|
115
|
+
function parseFilterString(filterParam) {
|
|
116
|
+
if ((0, filter_colon_utils_1.isColonFormat)(filterParam)) {
|
|
117
|
+
return [(0, filter_colon_utils_1.parseColonFilter)(filterParam)];
|
|
118
|
+
}
|
|
119
|
+
const parsed = tryParseJsonFilter(filterParam);
|
|
120
|
+
if (parsed !== null) {
|
|
121
|
+
return normalizeJsonFilter(parsed);
|
|
122
|
+
}
|
|
123
|
+
if (filterParam.includes(":")) {
|
|
124
|
+
return [(0, filter_colon_utils_1.parseColonFilter)(filterParam)];
|
|
125
|
+
}
|
|
126
|
+
throw new Error(`Could not parse filter string: "${filterParam}"`);
|
|
127
|
+
}
|
|
128
|
+
function parseFilterArray(filterParam) {
|
|
129
|
+
const result = [];
|
|
130
|
+
for (const item of filterParam) {
|
|
131
|
+
result.push(...parseFilterItem(item));
|
|
132
|
+
}
|
|
133
|
+
return result;
|
|
134
|
+
}
|
|
135
|
+
function parseFilterItem(item) {
|
|
136
|
+
if (typeof item === "string") {
|
|
137
|
+
return parseFilterString(item);
|
|
138
|
+
}
|
|
139
|
+
if (typeof item === "object" && item !== null) {
|
|
140
|
+
return _parseJsonFilter(item);
|
|
141
|
+
}
|
|
142
|
+
throw new Error(`Invalid filter item: ${typeof item}`);
|
|
143
|
+
}
|
|
144
|
+
function tryParseJsonFilter(value) {
|
|
145
|
+
try {
|
|
146
|
+
return JSON.parse(decodeURIComponent(value));
|
|
147
|
+
}
|
|
148
|
+
catch {
|
|
149
|
+
try {
|
|
150
|
+
return JSON.parse(value);
|
|
151
|
+
}
|
|
152
|
+
catch {
|
|
153
|
+
return null;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
function normalizeJsonFilter(parsed) {
|
|
158
|
+
if (Array.isArray(parsed)) {
|
|
159
|
+
const result = [];
|
|
160
|
+
for (const item of parsed) {
|
|
161
|
+
if (typeof item === "object" && item !== null) {
|
|
162
|
+
result.push(..._parseJsonFilter(item));
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return result;
|
|
166
|
+
}
|
|
167
|
+
if (typeof parsed === "object" && parsed !== null) {
|
|
168
|
+
return _parseJsonFilter(parsed);
|
|
169
|
+
}
|
|
170
|
+
throw new Error("Invalid JSON filter format");
|
|
171
|
+
}
|
|
188
172
|
/**
|
|
189
173
|
* Build query string from FilterQuery object using JSON format for filters.
|
|
190
174
|
* @param options - FilterQuery object with filters, sort, pagination, and field selection
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.utils.js","sourceRoot":"","sources":["../../src/utils/filter.utils.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAyFH,
|
|
1
|
+
{"version":3,"file":"filter.utils.js","sourceRoot":"","sources":["../../src/utils/filter.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client-audit.d.ts","sourceRoot":"","sources":["../../src/utils/http-client-audit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAA8B,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"http-client-audit.d.ts","sourceRoot":"","sources":["../../src/utils/http-client-audit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAA8B,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,iBAAiB,GAAG,IAAI,EAClC,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,IAAI,CAAC,CAyBf;AA8HD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,OAAO,EACpB,YAAY,EAAE,OAAO,GACpB;IAAE,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAiBvE"}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.logHttpRequestAudit = logHttpRequestAudit;
|
|
8
8
|
exports.calculateRequestSizes = calculateRequestSizes;
|
|
9
|
+
const logger_context_storage_1 = require("../services/logger/logger-context-storage");
|
|
9
10
|
const http_client_masking_1 = require("./http-client-masking");
|
|
10
11
|
/**
|
|
11
12
|
* Log HTTP request audit event
|
|
@@ -33,17 +34,18 @@ async function logHttpRequestAudit(metadata, error, config, logger) {
|
|
|
33
34
|
* Handle minimal audit level (metadata only, no masking)
|
|
34
35
|
*/
|
|
35
36
|
async function handleMinimalAudit(metadata, error, logger) {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
:
|
|
37
|
+
const token = metadata.userId
|
|
38
|
+
? undefined
|
|
39
|
+
: metadata.authHeader?.replace("Bearer ", "");
|
|
40
|
+
await runWithTokenContext(token, async () => {
|
|
41
|
+
await logger.audit(`http.request.${metadata.method}`, metadata.url, {
|
|
42
|
+
method: metadata.method,
|
|
43
|
+
url: metadata.fullUrl,
|
|
44
|
+
statusCode: metadata.statusCode,
|
|
45
|
+
duration: metadata.duration,
|
|
46
|
+
userId: metadata.userId || undefined,
|
|
47
|
+
error: error?.message || undefined,
|
|
48
|
+
});
|
|
47
49
|
});
|
|
48
50
|
}
|
|
49
51
|
/**
|
|
@@ -66,10 +68,11 @@ async function handleStandardOrDetailedAudit(metadata, auditLevel, auditConfig,
|
|
|
66
68
|
statusCode: metadata.statusCode,
|
|
67
69
|
userId: metadata.userId,
|
|
68
70
|
}, sizes, masked, auditLevel, error);
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
71
|
+
const token = metadata.userId
|
|
72
|
+
? undefined
|
|
73
|
+
: metadata.authHeader?.replace("Bearer ", "");
|
|
74
|
+
await runWithTokenContext(token, async () => {
|
|
75
|
+
await logger.audit(`http.request.${metadata.method}`, metadata.url, auditContext);
|
|
73
76
|
});
|
|
74
77
|
// Log debug event if debug mode enabled
|
|
75
78
|
if (config.logLevel === "debug") {
|
|
@@ -81,6 +84,14 @@ async function handleStandardOrDetailedAudit(metadata, auditLevel, auditConfig,
|
|
|
81
84
|
}
|
|
82
85
|
}
|
|
83
86
|
}
|
|
87
|
+
async function runWithTokenContext(token, handler) {
|
|
88
|
+
if (!token) {
|
|
89
|
+
await handler();
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
const contextStorage = logger_context_storage_1.LoggerContextStorage.getInstance();
|
|
93
|
+
await contextStorage.runWithContextAsync({ token }, handler);
|
|
94
|
+
}
|
|
84
95
|
/**
|
|
85
96
|
* Calculate request and response sizes
|
|
86
97
|
*/
|
|
@@ -135,10 +146,11 @@ function buildAuditContext(metadata, sizes, masked, auditLevel, error) {
|
|
|
135
146
|
async function logDebugEvent(metadata, masked, sizes, error, logger) {
|
|
136
147
|
const responseBodySnippet = prepareDebugResponseBody(masked.responseBody);
|
|
137
148
|
const debugContext = buildDebugContext(metadata, masked, sizes, responseBodySnippet, error);
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
149
|
+
const token = metadata.userId
|
|
150
|
+
? undefined
|
|
151
|
+
: metadata.authHeader?.replace("Bearer ", "");
|
|
152
|
+
await runWithTokenContext(token, async () => {
|
|
153
|
+
await logger.debug(`HTTP ${metadata.method} ${metadata.url}`, debugContext);
|
|
142
154
|
});
|
|
143
155
|
}
|
|
144
156
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client-audit.js","sourceRoot":"","sources":["../../src/utils/http-client-audit.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"http-client-audit.js","sourceRoot":"","sources":["../../src/utils/http-client-audit.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,8 @@ export interface ExtractedMetadata {
|
|
|
34
34
|
*/
|
|
35
35
|
export declare function extractRequestMetadata(response: AxiosResponse | undefined, error: AxiosError | null, config: MisoClientConfig): ExtractedMetadata | null;
|
|
36
36
|
/**
|
|
37
|
-
* Extract user ID from JWT token
|
|
37
|
+
* Extract user ID from JWT token.
|
|
38
|
+
* Checks fields in order: sub, userId, user_id, id.
|
|
38
39
|
*/
|
|
39
40
|
export declare function extractUserIdFromToken(authHeader?: string): string | null;
|
|
40
41
|
//# sourceMappingURL=http-client-metadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/http-client-metadata.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,8BACf,SAAQ,0BAA0B;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,0BAA0B,CAAC;IACnC,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,aAAa,GAAG,SAAS,EACnC,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,MAAM,EAAE,gBAAgB,GACvB,iBAAiB,GAAG,IAAI,CAoB1B;AA8ED
|
|
1
|
+
{"version":3,"file":"http-client-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/http-client-metadata.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,OAAO,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,8BACf,SAAQ,0BAA0B;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,0BAA0B,CAAC;IACnC,QAAQ,EAAE,eAAe,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,aAAa,GAAG,SAAS,EACnC,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,MAAM,EAAE,gBAAgB,GACvB,iBAAiB,GAAG,IAAI,CAoB1B;AA8ED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAezE"}
|
|
@@ -76,7 +76,8 @@ function extractResponseData(response, error) {
|
|
|
76
76
|
};
|
|
77
77
|
}
|
|
78
78
|
/**
|
|
79
|
-
* Extract user ID from JWT token
|
|
79
|
+
* Extract user ID from JWT token.
|
|
80
|
+
* Checks fields in order: sub, userId, user_id, id.
|
|
80
81
|
*/
|
|
81
82
|
function extractUserIdFromToken(authHeader) {
|
|
82
83
|
if (!authHeader || !authHeader.startsWith("Bearer ")) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client-metadata.js","sourceRoot":"","sources":["../../src/utils/http-client-metadata.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AAuCH,wDAwBC;
|
|
1
|
+
{"version":3,"file":"http-client-metadata.js","sourceRoot":"","sources":["../../src/utils/http-client-metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-http-client.d.ts","sourceRoot":"","sources":["../../src/utils/internal-http-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAc,EACZ,aAAa,EACb,kBAAkB,EAInB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAYvE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,KAAK,CAAgB;IAC7B,SAAgB,MAAM,EAAE,gBAAgB,CAAC;IACzC,OAAO,CAAC,UAAU,CAAgD;IAClE,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,gBAAgB;IAOpC,sDAAsD;IACtD,OAAO,CAAC,yBAAyB;IAYjC,0CAA0C;IAC1C,OAAO,CAAC,mBAAmB;IA0B3B,8CAA8C;IAC9C,OAAO,CAAC,iBAAiB;IA8BzB,qEAAqE;IACrE,OAAO,CAAC,cAAc;IAkBtB;;;OAGG;YACW,cAAc;IA4B5B,uDAAuD;YACzC,mBAAmB;IASjC,sCAAsC;IACtC,OAAO,CAAC,iBAAiB;IAQzB,iDAAiD;YACnC,kBAAkB;
|
|
1
|
+
{"version":3,"file":"internal-http-client.d.ts","sourceRoot":"","sources":["../../src/utils/internal-http-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAc,EACZ,aAAa,EACb,kBAAkB,EAInB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAYvE,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,KAAK,CAAgB;IAC7B,SAAgB,MAAM,EAAE,gBAAgB,CAAC;IACzC,OAAO,CAAC,UAAU,CAAgD;IAClE,OAAO,CAAC,mBAAmB,CAAgC;gBAE/C,MAAM,EAAE,gBAAgB;IAOpC,sDAAsD;IACtD,OAAO,CAAC,yBAAyB;IAYjC,0CAA0C;IAC1C,OAAO,CAAC,mBAAmB;IA0B3B,8CAA8C;IAC9C,OAAO,CAAC,iBAAiB;IA8BzB,qEAAqE;IACrE,OAAO,CAAC,cAAc;IAkBtB;;;OAGG;YACW,cAAc;IA4B5B,uDAAuD;YACzC,mBAAmB;IASjC,sCAAsC;IACtC,OAAO,CAAC,iBAAiB;IAQzB,iDAAiD;YACnC,kBAAkB;IAoChC,sDAAsD;YACxC,uBAAuB;IAiBrC,2CAA2C;YAC7B,aAAa;IAoB3B;;;OAGG;IACH,gBAAgB,IAAI,aAAa;IAIjC;;;;;OAKG;IACG,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC;IAIlE;;;;;;;;OAQG;IACG,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC;IAQnF;;;;;;;;OAQG;IACG,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC;IAQlF;;;;;OAKG;IACG,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC;IAIrE;;;;;;;OAOG;IACG,OAAO,CAAC,CAAC,EACb,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,EACzC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,CAAC,CAAC;IAIb;;;;;;;;;;;OAWG;IACG,oBAAoB,CAAC,CAAC,EAC1B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,EACzC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,EAC3B,YAAY,CAAC,EAAE,YAAY,GAC1B,OAAO,CAAC,CAAC,CAAC;IAQb;;;;;;;;;OASG;IACG,uBAAuB,CAAC,CAAC,EAC7B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,EACzC,GAAG,EAAE,MAAM,EACX,YAAY,EAAE,YAAY,EAC1B,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,CAAC,CAAC;CAId"}
|
|
@@ -146,7 +146,13 @@ class InternalHttpClient {
|
|
|
146
146
|
async executeWithTimeout(axiosFn, config) {
|
|
147
147
|
const timeout = 30000;
|
|
148
148
|
const controller = new AbortController();
|
|
149
|
-
|
|
149
|
+
let timeoutId = null;
|
|
150
|
+
const timeoutPromise = new Promise((_, reject) => {
|
|
151
|
+
timeoutId = setTimeout(() => {
|
|
152
|
+
controller.abort();
|
|
153
|
+
reject(new Error(`Request timeout after ${timeout}ms`));
|
|
154
|
+
}, timeout);
|
|
155
|
+
});
|
|
150
156
|
const requestConfig = {
|
|
151
157
|
...config,
|
|
152
158
|
signal: config?.signal
|
|
@@ -154,21 +160,21 @@ class InternalHttpClient {
|
|
|
154
160
|
: controller.signal,
|
|
155
161
|
};
|
|
156
162
|
try {
|
|
157
|
-
const response = await Promise.race([
|
|
158
|
-
axiosFn(requestConfig),
|
|
159
|
-
new Promise((_, reject) => setTimeout(() => reject(new Error(`Request timeout after ${timeout}ms`)), timeout)),
|
|
160
|
-
]);
|
|
161
|
-
clearTimeout(timeoutId);
|
|
163
|
+
const response = await Promise.race([axiosFn(requestConfig), timeoutPromise]);
|
|
162
164
|
(0, http_response_validator_1.validateHttpResponse)(response.data, response.config?.url || "", this.config);
|
|
163
165
|
return response.data;
|
|
164
166
|
}
|
|
165
167
|
catch (error) {
|
|
166
|
-
clearTimeout(timeoutId);
|
|
167
168
|
if ((0, http_error_handler_1.isAxiosError)(error)) {
|
|
168
169
|
throw (0, http_error_handler_1.createMisoClientError)(error, error.config?.url);
|
|
169
170
|
}
|
|
170
171
|
throw error;
|
|
171
172
|
}
|
|
173
|
+
finally {
|
|
174
|
+
if (timeoutId) {
|
|
175
|
+
clearTimeout(timeoutId);
|
|
176
|
+
}
|
|
177
|
+
}
|
|
172
178
|
}
|
|
173
179
|
/** Build request config with auth strategy headers */
|
|
174
180
|
async buildAuthStrategyConfig(authStrategy, baseConfig) {
|