@heliosjs/core 1.0.5 → 1.0.7
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/README.md +15 -529
- package/dist/decorators.d.ts +3 -3
- package/dist/decorators.js +1 -1
- package/dist/decorators.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/types/core/common.d.ts +7 -7
- package/dist/types/core/error.d.ts +27 -10
- package/dist/types/core/request.d.ts +11 -11
- package/dist/types/core/response.d.ts +18 -3
- package/dist/types/core/sse.d.ts +3 -3
- package/dist/types/ws/index.d.ts +7 -7
- package/dist/utils/core/controller.d.ts +4 -4
- package/dist/utils/core/controller.js +12 -13
- package/dist/utils/core/controller.js.map +1 -1
- package/dist/utils/core/cors.d.ts +3 -5
- package/dist/utils/core/cors.js +5 -69
- package/dist/utils/core/cors.js.map +1 -1
- package/dist/utils/core/error/apperror.d.ts +2 -2
- package/dist/utils/core/error/apperror.js +1 -1
- package/dist/utils/core/error/apperror.js.map +1 -1
- package/dist/utils/core/error/base.d.ts +7 -3
- package/dist/utils/core/error/base.js +8 -4
- package/dist/utils/core/error/base.js.map +1 -1
- package/dist/utils/core/error/helpers.d.ts +1 -1
- package/dist/utils/core/error/helpers.js +1 -1
- package/dist/utils/core/error/helpers.js.map +1 -1
- package/dist/utils/core/multipart.d.ts +3 -3
- package/dist/utils/core/multipart.js +2 -1
- package/dist/utils/core/multipart.js.map +1 -1
- package/dist/utils/core/request.d.ts +5 -5
- package/dist/utils/core/request.js +2 -2
- package/dist/utils/core/request.js.map +1 -1
- package/dist/utils/core/response.d.ts +32 -10
- package/dist/utils/core/response.js +7 -7
- package/dist/utils/core/response.js.map +1 -1
- package/dist/utils/core/routeWalker.d.ts +1 -1
- package/dist/utils/core/routeWalker.js +8 -8
- package/dist/utils/core/routeWalker.js.map +1 -1
- package/dist/utils/core/sanitize.d.ts +1 -1
- package/dist/utils/core/sanitize.js +1 -1
- package/dist/utils/core/sanitize.js.map +1 -1
- package/dist/utils/shared/parsers.js +2 -2
- package/dist/utils/shared/parsers.js.map +1 -1
- package/dist/utils/shared/validate.d.ts +1 -1
- package/dist/utils/shared/validate.js +1 -0
- package/dist/utils/shared/validate.js.map +1 -1
- package/dist/utils/socket/server.d.ts +3 -3
- package/dist/utils/socket/server.js +2 -2
- package/dist/utils/socket/server.js.map +1 -1
- package/dist/utils/socket/service.d.ts +3 -3
- package/dist/utils/socket/service.js.map +1 -1
- package/dist/utils/socket/socket.js.map +1 -1
- package/package.json +4 -1
|
@@ -16,11 +16,11 @@ export declare enum ErrorCode {
|
|
|
16
16
|
}
|
|
17
17
|
export interface ErrorDetails {
|
|
18
18
|
field?: string;
|
|
19
|
-
value?:
|
|
19
|
+
value?: unknown;
|
|
20
20
|
constraint?: string;
|
|
21
|
-
[key: string]:
|
|
21
|
+
[key: string]: unknown;
|
|
22
22
|
}
|
|
23
|
-
export interface
|
|
23
|
+
export interface HeliosError extends Error {
|
|
24
24
|
code: ErrorCode;
|
|
25
25
|
status: number;
|
|
26
26
|
details?: ErrorDetails[];
|
|
@@ -30,7 +30,7 @@ export interface AppError extends Error {
|
|
|
30
30
|
method?: string;
|
|
31
31
|
toResponse(): ErrorResponse;
|
|
32
32
|
}
|
|
33
|
-
export interface IValidationError extends
|
|
33
|
+
export interface IValidationError extends HeliosError {
|
|
34
34
|
code: ErrorCode.VALIDATION_FAILED;
|
|
35
35
|
details?: ErrorDetails[];
|
|
36
36
|
}
|
|
@@ -50,7 +50,7 @@ export interface ErrorHandlerConfig {
|
|
|
50
50
|
includeStack?: boolean;
|
|
51
51
|
logErrors?: boolean;
|
|
52
52
|
logStack?: boolean;
|
|
53
|
-
customHandlers?: Record<ErrorCode, (error:
|
|
53
|
+
customHandlers?: Record<ErrorCode, (error: HeliosError) => unknown>;
|
|
54
54
|
}
|
|
55
55
|
export interface SerializedError {
|
|
56
56
|
type: 'Error' | 'HttpError' | 'AxiosError' | 'Unknown' | 'ValidationError';
|
|
@@ -58,15 +58,32 @@ export interface SerializedError {
|
|
|
58
58
|
status?: number;
|
|
59
59
|
code?: string;
|
|
60
60
|
stack?: string;
|
|
61
|
-
data?:
|
|
62
|
-
original?:
|
|
63
|
-
errors?:
|
|
61
|
+
data?: unknown;
|
|
62
|
+
original?: unknown;
|
|
63
|
+
errors?: unknown[];
|
|
64
64
|
details?: ErrorDetails[];
|
|
65
65
|
}
|
|
66
66
|
export interface ErrorHandlerConfig {
|
|
67
67
|
includeStack?: boolean;
|
|
68
68
|
logErrors?: boolean;
|
|
69
69
|
logStack?: boolean;
|
|
70
|
-
customHandlers?: Record<ErrorCode, (error:
|
|
70
|
+
customHandlers?: Record<ErrorCode, (error: HeliosError) => unknown>;
|
|
71
71
|
}
|
|
72
|
-
export type ErorrHandler = (error: Error, req: Request, response: Response) =>
|
|
72
|
+
export type ErorrHandler = (error: Error, req: Request, response: Response) => unknown;
|
|
73
|
+
type ErrorChildren = {
|
|
74
|
+
property?: string;
|
|
75
|
+
value: unknown;
|
|
76
|
+
constraints?: unknown[];
|
|
77
|
+
children?: ErrorChildren[];
|
|
78
|
+
};
|
|
79
|
+
export type ErrorObject = Partial<{
|
|
80
|
+
name: string;
|
|
81
|
+
status: number;
|
|
82
|
+
statusCode: number;
|
|
83
|
+
code: string;
|
|
84
|
+
message: string;
|
|
85
|
+
stack: string;
|
|
86
|
+
errors: ErrorChildren[];
|
|
87
|
+
details: ErrorDetails[];
|
|
88
|
+
}>;
|
|
89
|
+
export {};
|
|
@@ -16,9 +16,9 @@ export interface RequestOptions {
|
|
|
16
16
|
requestId: string;
|
|
17
17
|
stage?: string;
|
|
18
18
|
timestamp: Date;
|
|
19
|
-
raw?:
|
|
20
|
-
context?:
|
|
21
|
-
rawBody?:
|
|
19
|
+
raw?: unknown;
|
|
20
|
+
context?: unknown;
|
|
21
|
+
rawBody?: unknown;
|
|
22
22
|
event?: unknown;
|
|
23
23
|
isBase64Encoded?: boolean;
|
|
24
24
|
source: RequestSource;
|
|
@@ -30,7 +30,7 @@ export interface Request {
|
|
|
30
30
|
requestUrl: URL;
|
|
31
31
|
headers: Record<string, string | string[]>;
|
|
32
32
|
query: Record<string, string | string[]>;
|
|
33
|
-
body:
|
|
33
|
+
body: unknown;
|
|
34
34
|
params: Record<string, string>;
|
|
35
35
|
cookies: Record<string, string>;
|
|
36
36
|
sourceIp: string;
|
|
@@ -40,9 +40,9 @@ export interface Request {
|
|
|
40
40
|
timestamp: Date;
|
|
41
41
|
source: RequestSource;
|
|
42
42
|
raw: any;
|
|
43
|
-
context:
|
|
44
|
-
rawBody:
|
|
45
|
-
isBase64Encoded:
|
|
43
|
+
context: unknown;
|
|
44
|
+
rawBody: unknown;
|
|
45
|
+
isBase64Encoded: boolean;
|
|
46
46
|
startTime: number;
|
|
47
47
|
getHeader(name: string): string | string[] | undefined;
|
|
48
48
|
getCookie(name: string): string | undefined;
|
|
@@ -53,13 +53,13 @@ export interface Request {
|
|
|
53
53
|
getLambdaEvent(): unknown;
|
|
54
54
|
getLambdaContext(): unknown;
|
|
55
55
|
getHttpRequest(): IncomingHttpHeaders | undefined;
|
|
56
|
-
setState(key: string, value:
|
|
57
|
-
getState<T
|
|
58
|
-
getAllState(): Map<string,
|
|
56
|
+
setState(key: string, value: unknown): void;
|
|
57
|
+
getState<T>(key: string): T | undefined;
|
|
58
|
+
getAllState(): Map<string, unknown>;
|
|
59
59
|
isSecure(): boolean;
|
|
60
60
|
getClientIp(): string;
|
|
61
61
|
getHost(): string;
|
|
62
62
|
getFullUrl(): string;
|
|
63
63
|
clone(overrides?: Partial<RequestOptions>): Request;
|
|
64
|
-
toJSON(): Record<string,
|
|
64
|
+
toJSON(): Record<string, this>;
|
|
65
65
|
}
|
|
@@ -18,13 +18,28 @@ export interface ResponseOptions {
|
|
|
18
18
|
isBase64Encoded?: boolean;
|
|
19
19
|
encoding?: BufferEncoding;
|
|
20
20
|
}
|
|
21
|
+
export type _Raw = Partial<{
|
|
22
|
+
headersSent: boolean;
|
|
23
|
+
statusCode: number;
|
|
24
|
+
headers: {
|
|
25
|
+
[key: string]: string | string[];
|
|
26
|
+
};
|
|
27
|
+
cookies: string[];
|
|
28
|
+
end(args: unknown): unknown;
|
|
29
|
+
requestUrl: URL;
|
|
30
|
+
method: string;
|
|
31
|
+
requestId: string;
|
|
32
|
+
sourceIp: string;
|
|
33
|
+
userAgent: string;
|
|
34
|
+
startTime: number;
|
|
35
|
+
}>;
|
|
21
36
|
export interface Response {
|
|
22
37
|
headers: Record<string, string | string[]>;
|
|
23
38
|
data: any;
|
|
24
39
|
cookies: string[];
|
|
25
40
|
isBase64Encoded: boolean;
|
|
26
41
|
source: ResponseSource;
|
|
27
|
-
raw:
|
|
42
|
+
raw: _Raw;
|
|
28
43
|
headersSent: boolean;
|
|
29
44
|
ok: boolean;
|
|
30
45
|
meta: {
|
|
@@ -42,8 +57,8 @@ export interface Response {
|
|
|
42
57
|
clearCookie(name: string, options?: CookieOptions): this;
|
|
43
58
|
getCookies(): string[];
|
|
44
59
|
redirect(url: string, statusCode?: number): this;
|
|
45
|
-
end(data: unknown):
|
|
60
|
+
end(data: unknown): unknown;
|
|
46
61
|
error(data: unknown): this;
|
|
47
62
|
reset(): this;
|
|
48
|
-
toJSON(): Record<string,
|
|
63
|
+
toJSON(): Record<string, unknown>;
|
|
49
64
|
}
|
package/dist/types/core/sse.d.ts
CHANGED
|
@@ -3,19 +3,19 @@ export interface SSEClient {
|
|
|
3
3
|
id: string;
|
|
4
4
|
response: ServerResponse;
|
|
5
5
|
topics: Set<string>;
|
|
6
|
-
data: Record<string,
|
|
6
|
+
data: Record<string, unknown>;
|
|
7
7
|
connectedAt: Date;
|
|
8
8
|
}
|
|
9
9
|
export interface SSEMessage {
|
|
10
10
|
event?: string;
|
|
11
11
|
id?: string;
|
|
12
12
|
retry?: number;
|
|
13
|
-
data:
|
|
13
|
+
data: unknown;
|
|
14
14
|
}
|
|
15
15
|
export interface SSEEvent {
|
|
16
16
|
type: 'connection' | 'close';
|
|
17
17
|
client: SSEClient;
|
|
18
|
-
data?:
|
|
18
|
+
data?: unknown;
|
|
19
19
|
}
|
|
20
20
|
export interface ISSEServer {
|
|
21
21
|
createConnection(res: ServerResponse): SSEClient;
|
package/dist/types/ws/index.d.ts
CHANGED
|
@@ -4,13 +4,13 @@ export interface WebSocketEvent {
|
|
|
4
4
|
type: WebSocketHandlerType;
|
|
5
5
|
client: WebSocketClient;
|
|
6
6
|
message?: WebSocketMessage;
|
|
7
|
-
data?:
|
|
7
|
+
data?: unknown;
|
|
8
8
|
}
|
|
9
9
|
export interface WebSocketClient {
|
|
10
10
|
id: string;
|
|
11
11
|
socket: WebSocket;
|
|
12
12
|
topics: Set<string>;
|
|
13
|
-
data: Record<string,
|
|
13
|
+
data: Record<string, unknown>;
|
|
14
14
|
connectedAt: Date;
|
|
15
15
|
}
|
|
16
16
|
export interface WebSocketMessage {
|
|
@@ -27,9 +27,9 @@ export interface WebSocketStats {
|
|
|
27
27
|
}>;
|
|
28
28
|
}
|
|
29
29
|
export interface IWebSocketService {
|
|
30
|
-
sendToClient(clientId: string, message:
|
|
30
|
+
sendToClient(clientId: string, message: unknown): boolean;
|
|
31
31
|
publishToTopic(topic: string, data: any, exclude?: string[]): void;
|
|
32
|
-
broadcast(message:
|
|
32
|
+
broadcast(message: unknown, excludeClientId?: string): void;
|
|
33
33
|
getStats(): {
|
|
34
34
|
clients: number;
|
|
35
35
|
topics: Array<{
|
|
@@ -40,11 +40,11 @@ export interface IWebSocketService {
|
|
|
40
40
|
isAvailable(): boolean;
|
|
41
41
|
}
|
|
42
42
|
export interface IWebSocketServer {
|
|
43
|
-
sendToClient(clientId: string, message:
|
|
43
|
+
sendToClient(clientId: string, message: unknown): boolean;
|
|
44
44
|
publishToTopic(topic: string, data: any, exclude: string[]): void;
|
|
45
|
-
broadcast(message:
|
|
45
|
+
broadcast(message: unknown, excludeClientId?: string): void;
|
|
46
46
|
getStats(): WebSocketStats;
|
|
47
47
|
subscribeToTopic(client: WebSocketClient, topic: string): void;
|
|
48
48
|
unsubscribeFromTopic(client: WebSocketClient, topic: string): void;
|
|
49
|
-
registerControllers(controllers: any[]): void;
|
|
49
|
+
registerControllers(controllers: (new (...args: any[]) => any)[]): void;
|
|
50
50
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
|
-
import { ControllerInstance, ControllerMethods, CORSConfig, InterceptorCB, MiddlewareCB, Request, Response, SanitizerConfig } from '../../types/core';
|
|
2
|
+
import { ControllerInstance, ControllerMethods, CORSConfig, HeliosError, InterceptorCB, MiddlewareCB, Request, Response, SanitizerConfig } from '../../types/core';
|
|
3
3
|
export declare const executeControllerMethod: (controller: ControllerInstance, propertyName: string, request: Request, response: Response) => Promise<any>;
|
|
4
4
|
export declare const getControllerMethods: (controller: ControllerInstance) => ControllerMethods;
|
|
5
|
-
export declare const getAllMethods: (obj:
|
|
6
|
-
export declare const findRouteInController: (instance:
|
|
5
|
+
export declare const getAllMethods: (obj: unknown) => string[];
|
|
6
|
+
export declare const findRouteInController: (instance: ControllerInstance, path: string, route: string, method: string) => {
|
|
7
7
|
name: string;
|
|
8
8
|
pathParams: Record<string, string>;
|
|
9
9
|
priority: number;
|
|
@@ -11,7 +11,7 @@ export declare const findRouteInController: (instance: any, path: string, route:
|
|
|
11
11
|
cors?: CORSConfig;
|
|
12
12
|
sanitizers: SanitizerConfig[];
|
|
13
13
|
};
|
|
14
|
-
export declare const NextFunction: (error
|
|
14
|
+
export declare const NextFunction: (error?: HeliosError) => void;
|
|
15
15
|
export declare const getResponse: (data: {
|
|
16
16
|
controllerInstance: ControllerInstance;
|
|
17
17
|
name: string;
|
|
@@ -13,7 +13,7 @@ const sanitize_1 = require("./sanitize");
|
|
|
13
13
|
const getBodyAndMultipart = (request) => {
|
|
14
14
|
let body = request.body;
|
|
15
15
|
let multipart;
|
|
16
|
-
if (multipart_1.MultipartProcessor.isMultipart(
|
|
16
|
+
if (multipart_1.MultipartProcessor.isMultipart(request)) {
|
|
17
17
|
const { fields, files } = multipart_1.MultipartProcessor.parse({
|
|
18
18
|
body: request.rawBody || request.body,
|
|
19
19
|
headers: request.headers,
|
|
@@ -80,11 +80,14 @@ const executeControllerMethod = async (controller, propertyName, request, respon
|
|
|
80
80
|
catch (error) {
|
|
81
81
|
if (typeof error === 'string') {
|
|
82
82
|
const catched = new Error(error);
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
83
|
+
const errorData = {
|
|
84
|
+
stack: `${catched.name}: ${catched.message}\n at ${controller.constructor?.name}.${propertyName}\n${catched.stack}`,
|
|
85
|
+
original: error,
|
|
86
|
+
controller: controller.constructor?.name,
|
|
87
|
+
method: propertyName,
|
|
88
|
+
status: 500,
|
|
89
|
+
};
|
|
90
|
+
Object.assign(catched, errorData);
|
|
88
91
|
response.error(catched);
|
|
89
92
|
throw catched;
|
|
90
93
|
}
|
|
@@ -114,7 +117,7 @@ const getControllerMethods = (controller) => {
|
|
|
114
117
|
}
|
|
115
118
|
proto = Object.getPrototypeOf(proto);
|
|
116
119
|
}
|
|
117
|
-
return methods.sort((a
|
|
120
|
+
return methods.sort((a) => (a.httpMethod === core_1.HTTP_METHODS.ANY ? 1 : -1));
|
|
118
121
|
};
|
|
119
122
|
exports.getControllerMethods = getControllerMethods;
|
|
120
123
|
const getAllMethods = (obj) => {
|
|
@@ -194,12 +197,8 @@ const getResponse = async (data) => {
|
|
|
194
197
|
const propertyName = data.name;
|
|
195
198
|
const prototype = Object.getPrototypeOf(data.controllerInstance);
|
|
196
199
|
const methodOkStatus = Reflect.getMetadata(constants_1.OK_METADATA_KEY, data.controllerInstance, propertyName);
|
|
197
|
-
if (
|
|
198
|
-
|
|
199
|
-
}
|
|
200
|
-
else {
|
|
201
|
-
const classOkStatus = Reflect.getMetadata(constants_1.OK_METADATA_KEY, prototype);
|
|
202
|
-
!isError && classOkStatus && (data.response.status = classOkStatus);
|
|
200
|
+
if (!isError) {
|
|
201
|
+
data.response.status = methodOkStatus ?? Reflect.getMetadata(constants_1.OK_METADATA_KEY, prototype);
|
|
203
202
|
}
|
|
204
203
|
return appResponse;
|
|
205
204
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/utils/core/controller.ts"],"names":[],"mappings":";;;AAAA,4BAA0B;AAC1B,+CASyB;AACzB,
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/utils/core/controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { CORSConfig, Request } from '../../types/core';
|
|
2
|
-
export declare function handleCORS(req: Request, res:
|
|
1
|
+
import { CORSConfig, Request, Response } from '../../types/core';
|
|
2
|
+
export declare function handleCORS(req: Request, res: Response, config: CORSConfig): {
|
|
3
3
|
permitted: boolean;
|
|
4
4
|
continue: boolean;
|
|
5
5
|
};
|
|
6
|
-
export declare function isPreflightRequest(req:
|
|
7
|
-
export declare const getCORSConfig: (controller: any, methodName?: string) => CORSConfig | null;
|
|
8
|
-
export declare const getCORSHeaders: (req: any, config: CORSConfig) => Record<string, string>;
|
|
6
|
+
export declare function isPreflightRequest(req: Request): boolean;
|
package/dist/utils/core/cors.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getCORSHeaders = exports.getCORSConfig = void 0;
|
|
4
3
|
exports.handleCORS = handleCORS;
|
|
5
4
|
exports.isPreflightRequest = isPreflightRequest;
|
|
6
|
-
const constants_1 = require("../../constants");
|
|
7
5
|
const headers_1 = require("./headers");
|
|
8
6
|
function handleCORS(req, res, config) {
|
|
9
7
|
const origin = (0, headers_1.getOrigin)(req);
|
|
@@ -21,7 +19,7 @@ function handleCORS(req, res, config) {
|
|
|
21
19
|
return false;
|
|
22
20
|
}
|
|
23
21
|
if (origin && !isOriginAllowed()) {
|
|
24
|
-
res.
|
|
22
|
+
res.status = 403;
|
|
25
23
|
res.setHeader('Content-Type', 'application/json');
|
|
26
24
|
return { permitted: false, continue: false };
|
|
27
25
|
}
|
|
@@ -44,7 +42,7 @@ function handleCORS(req, res, config) {
|
|
|
44
42
|
if (config.maxAge) {
|
|
45
43
|
res.setHeader('Access-Control-Max-Age', config.maxAge.toString());
|
|
46
44
|
}
|
|
47
|
-
res.
|
|
45
|
+
res.status = config.optionsSuccessStatus || 204;
|
|
48
46
|
return { permitted: true, continue: false };
|
|
49
47
|
}
|
|
50
48
|
if (origin) {
|
|
@@ -59,70 +57,8 @@ function handleCORS(req, res, config) {
|
|
|
59
57
|
return { permitted: true, continue: true };
|
|
60
58
|
}
|
|
61
59
|
function isPreflightRequest(req) {
|
|
62
|
-
return (req.method === 'OPTIONS' &&
|
|
60
|
+
return !!(req.method === 'OPTIONS' &&
|
|
61
|
+
req.headers['access-control-request-method'] &&
|
|
62
|
+
req.headers.origin);
|
|
63
63
|
}
|
|
64
|
-
const getCORSConfig = (controller, methodName) => {
|
|
65
|
-
if (methodName) {
|
|
66
|
-
const methodConfig = Reflect.getMetadata(constants_1.CORS_METADATA, controller, methodName);
|
|
67
|
-
if (methodConfig) {
|
|
68
|
-
return methodConfig;
|
|
69
|
-
}
|
|
70
|
-
}
|
|
71
|
-
if (controller && controller.constructor) {
|
|
72
|
-
const classConfig = Reflect.getMetadata(constants_1.CORS_METADATA, controller.constructor.prototype);
|
|
73
|
-
if (classConfig) {
|
|
74
|
-
return classConfig;
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
return null;
|
|
78
|
-
};
|
|
79
|
-
exports.getCORSConfig = getCORSConfig;
|
|
80
|
-
const getCORSHeaders = (req, config) => {
|
|
81
|
-
const headers = {};
|
|
82
|
-
const origin = req?.headers?.origin || req?.headers?.Origin;
|
|
83
|
-
if (!origin)
|
|
84
|
-
return headers;
|
|
85
|
-
let allowedOrigin = null;
|
|
86
|
-
if (config.origin === '*') {
|
|
87
|
-
allowedOrigin = '*';
|
|
88
|
-
}
|
|
89
|
-
else if (typeof config.origin === 'string') {
|
|
90
|
-
allowedOrigin = config.origin;
|
|
91
|
-
}
|
|
92
|
-
else if (Array.isArray(config.origin)) {
|
|
93
|
-
if (config.origin.includes(origin)) {
|
|
94
|
-
allowedOrigin = origin;
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
else if (typeof config.origin === 'function') {
|
|
98
|
-
if (config.origin(origin)) {
|
|
99
|
-
allowedOrigin = origin;
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
else if (config.origin === true) {
|
|
103
|
-
allowedOrigin = origin;
|
|
104
|
-
}
|
|
105
|
-
if (allowedOrigin) {
|
|
106
|
-
headers['Access-Control-Allow-Origin'] = allowedOrigin;
|
|
107
|
-
if (config.credentials) {
|
|
108
|
-
headers['Access-Control-Allow-Credentials'] = 'true';
|
|
109
|
-
}
|
|
110
|
-
if (config.exposedHeaders?.length) {
|
|
111
|
-
headers['Access-Control-Expose-Headers'] = config.exposedHeaders.join(', ');
|
|
112
|
-
}
|
|
113
|
-
if (req.method === 'OPTIONS') {
|
|
114
|
-
if (config.methods?.length) {
|
|
115
|
-
headers['Access-Control-Allow-Methods'] = config.methods.join(', ');
|
|
116
|
-
}
|
|
117
|
-
if (config.allowedHeaders?.length) {
|
|
118
|
-
headers['Access-Control-Allow-Headers'] = config.allowedHeaders.join(', ');
|
|
119
|
-
}
|
|
120
|
-
if (config.maxAge) {
|
|
121
|
-
headers['Access-Control-Max-Age'] = config.maxAge.toString();
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
return headers;
|
|
126
|
-
};
|
|
127
|
-
exports.getCORSHeaders = getCORSHeaders;
|
|
128
64
|
//# sourceMappingURL=cors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cors.js","sourceRoot":"","sources":["../../../src/utils/core/cors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cors.js","sourceRoot":"","sources":["../../../src/utils/core/cors.ts"],"names":[],"mappings":";;AAGA,gCAgEC;AAED,gDAMC;AA1ED,uCAAsC;AAEtC,SAAgB,UAAU,CACxB,GAAY,EACZ,GAAa,EACb,MAAkB;IAElB,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,GAAG,CAAC,CAAC;IAE9B,SAAS,eAAe;QACtB,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG;YAAE,OAAO,IAAI,CAAC;QACvC,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ;YAAE,OAAO,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC;QACvE,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEtE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QACjC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QACjB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAElD,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC/C,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAC7B,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACjC,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,GAAG,CAAC,SAAS,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,GAAG,CAAC,SAAS,CAAC,wBAAwB,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,CAAC;QAED,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,oBAAoB,IAAI,GAAG,CAAC;QAChD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;QAErD,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,GAAG,CAAC,SAAS,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;YAC1B,GAAG,CAAC,SAAS,CAAC,+BAA+B,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAC7C,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAY;IAC7C,OAAO,CAAC,CAAC,CACP,GAAG,CAAC,MAAM,KAAK,SAAS;QACxB,GAAG,CAAC,OAAO,CAAC,+BAA+B,CAAC;QAC5C,GAAG,CAAC,OAAO,CAAC,MAAM,CACnB,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Meta } from '../../../types/core/common';
|
|
2
|
-
import { ErrorCode, ErrorDetails, ErrorHandlerConfig } from '../../../types/core/error';
|
|
2
|
+
import { ErrorCode, ErrorDetails, ErrorHandlerConfig, ErrorObject } from '../../../types/core/error';
|
|
3
3
|
export declare class ApplicationError {
|
|
4
4
|
private config;
|
|
5
5
|
code: ErrorCode;
|
|
@@ -10,7 +10,7 @@ export declare class ApplicationError {
|
|
|
10
10
|
requestId?: string;
|
|
11
11
|
path?: string;
|
|
12
12
|
stack?: unknown;
|
|
13
|
-
constructor(error:
|
|
13
|
+
constructor(error: ErrorObject | Error, data: {
|
|
14
14
|
meta: Meta;
|
|
15
15
|
config: ErrorHandlerConfig;
|
|
16
16
|
status?: number;
|
|
@@ -83,7 +83,7 @@ class ApplicationError {
|
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
85
|
formatValidationErrors(errors) {
|
|
86
|
-
return errors
|
|
86
|
+
return errors?.map((error) => ({
|
|
87
87
|
field: error.property,
|
|
88
88
|
value: error.value,
|
|
89
89
|
constraints: error.constraints ? Object.values(error.constraints) : [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apperror.js","sourceRoot":"","sources":["../../../../src/utils/core/error/apperror.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"apperror.js","sourceRoot":"","sources":["../../../../src/utils/core/error/apperror.ts"],"names":[],"mappings":";;;AACA,qDAMmC;AACnC,qDAAqD;AACrD,iCAAmC;AACnC,yCAA2C;AAC3C,6CAA+C;AAE/C,MAAa,gBAAgB;IACnB,MAAM,CAAqB;IACnC,IAAI,CAAY;IAChB,MAAM,CAAS;IACf,OAAO,CAAS;IAChB,OAAO,CAAkB;IACzB,SAAS,CAAO;IAChB,SAAS,CAAU;IACnB,IAAI,CAAU;IACd,KAAK,CAAW;IAEhB,YACE,KAA0B,EAC1B,IAAiE;QAEjE,IAAI,CAAC,MAAM,GAAG;YACZ,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;YACnD,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,IAAI;YACd,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;SACvB,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC;QAClD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACrF,CAAC;IAEO,cAAc,CACpB,KAAkB,EAClB,OAA+D;QAE/D,IAAI,KAAK,YAAY,gBAAS,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC3D,OAAO,IAAI,4BAAe,CAAC,OAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,IAAI,GAAG;YACX,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,QAAQ;YACjC,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC;QAEF,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;YAC9C,OAAO,IAAI,kCAAiB,CAAC,iBAAS,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;YAC9C,OAAO,IAAI,wBAAa,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,IAAI,gBAAS,CAAC,iBAAS,CAAC,cAAc,EAAE,KAAK,CAAC,OAAO,EAAE;gBAC5D,MAAM,EAAE,GAAG;gBACX,KAAK,EAAE,KAAK;gBACZ,GAAG,IAAI;aACR,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,IAAI,gBAAS,CAAC,iBAAS,CAAC,cAAc,EAAE,KAAK,EAAE;gBACpD,MAAM,EAAE,GAAG;gBACX,GAAG,IAAI;aACR,CAAC,CAAC;QACL,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAChD,MAAM,GAAG,GAAG,KAAoB,CAAC;YACjC,OAAO,IAAI,gBAAS,CACjB,GAAG,CAAC,IAAkB,IAAI,iBAAS,CAAC,cAAc,EACnD,GAAG,CAAC,OAAO,IAAI,eAAe,EAC9B;gBACE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,GAAG;gBACzB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,IAAI;aACR,CACF,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,gBAAS,CAAC,iBAAS,CAAC,cAAc,EAAE,eAAe,EAAE;YAC9D,MAAM,EAAE,GAAG;YACX,GAAG,IAAI;SACR,CAAC,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,MAA6B;QAC1D,OAAO,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7B,KAAK,EAAE,KAAK,CAAC,QAAQ;YACrB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE;YACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SAC3F,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,QAAQ,CAAC,KAAkB,EAAE,IAAU;QAC7C,MAAM,QAAQ,GAAG;YACf,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,EAAE;YACxC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACzD,EAAE,EAAE,IAAI,CAAC,QAAQ;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;QAEF,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACnD,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC/B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,MAAM;QACJ,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,IAAI;YAClB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;YACvC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC;IACJ,CAAC;CACF;AA/ID,4CA+IC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare class BaseError extends Error implements
|
|
1
|
+
import { ErrorCode, ErrorDetails, ErrorObject, ErrorResponse, HeliosError } from '../../../types/core/error';
|
|
2
|
+
export declare class BaseError extends Error implements HeliosError {
|
|
3
3
|
readonly code: ErrorCode;
|
|
4
4
|
readonly status: number;
|
|
5
5
|
readonly details?: ErrorDetails[];
|
|
@@ -7,6 +7,11 @@ export declare class BaseError extends Error implements AppError {
|
|
|
7
7
|
readonly requestId?: string;
|
|
8
8
|
readonly path?: string;
|
|
9
9
|
readonly method?: string;
|
|
10
|
+
cause?: ErrorObject;
|
|
11
|
+
name: string;
|
|
12
|
+
message: string;
|
|
13
|
+
stack?: string | undefined;
|
|
14
|
+
toResponse(): ErrorResponse;
|
|
10
15
|
constructor(code: ErrorCode, message: string, options?: {
|
|
11
16
|
status?: number;
|
|
12
17
|
details?: ErrorDetails[];
|
|
@@ -15,6 +20,5 @@ export declare class BaseError extends Error implements AppError {
|
|
|
15
20
|
method?: string;
|
|
16
21
|
cause?: Error;
|
|
17
22
|
});
|
|
18
|
-
toResponse(): ErrorResponse;
|
|
19
23
|
private getDefaultStatus;
|
|
20
24
|
}
|
|
@@ -10,9 +10,16 @@ class BaseError extends Error {
|
|
|
10
10
|
requestId;
|
|
11
11
|
path;
|
|
12
12
|
method;
|
|
13
|
+
cause;
|
|
14
|
+
name;
|
|
15
|
+
message = '';
|
|
16
|
+
stack;
|
|
17
|
+
toResponse() {
|
|
18
|
+
throw new Error('Method not implemented.');
|
|
19
|
+
}
|
|
13
20
|
constructor(code, message, options) {
|
|
14
21
|
super(message);
|
|
15
|
-
this.name = '
|
|
22
|
+
this.name = 'HeliosError';
|
|
16
23
|
this.code = code;
|
|
17
24
|
this.status = options?.status || this.getDefaultStatus(code);
|
|
18
25
|
this.details = options?.details;
|
|
@@ -25,9 +32,6 @@ class BaseError extends Error {
|
|
|
25
32
|
}
|
|
26
33
|
Error.captureStackTrace(this, this.constructor);
|
|
27
34
|
}
|
|
28
|
-
toResponse() {
|
|
29
|
-
throw new Error('Method not implemented.');
|
|
30
|
-
}
|
|
31
35
|
getDefaultStatus(code) {
|
|
32
36
|
switch (code) {
|
|
33
37
|
case error_1.ErrorCode.BAD_REQUEST:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/utils/core/error/base.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/utils/core/error/base.ts"],"names":[],"mappings":";;;AAAA,qDAMmC;AAEnC,MAAa,SAAU,SAAQ,KAAK;IAClB,IAAI,CAAY;IAChB,MAAM,CAAS;IACf,OAAO,CAAkB;IACzB,SAAS,CAAO;IAChB,SAAS,CAAU;IACnB,IAAI,CAAU;IACd,MAAM,CAAU;IAChC,KAAK,CAAe;IACpB,IAAI,CAAS;IACb,OAAO,GAAW,EAAE,CAAC;IACrB,KAAK,CAAsB;IAC3B,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,YACE,IAAe,EACf,OAAe,EACf,OAOC;QAED,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,MAAM,GAAG,OAAO,EAAE,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QACpC,IAAI,CAAC,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,OAAO,EAAE,MAAM,CAAC;QAE9B,IAAI,OAAO,EAAE,KAAK,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAEO,gBAAgB,CAAC,IAAe;QACtC,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,iBAAS,CAAC,WAAW,CAAC;YAC3B,KAAK,iBAAS,CAAC,iBAAiB;gBAC9B,OAAO,GAAG,CAAC;YACb,KAAK,iBAAS,CAAC,YAAY;gBACzB,OAAO,GAAG,CAAC;YACb,KAAK,iBAAS,CAAC,SAAS;gBACtB,OAAO,GAAG,CAAC;YACb,KAAK,iBAAS,CAAC,SAAS;gBACtB,OAAO,GAAG,CAAC;YACb,KAAK,iBAAS,CAAC,mBAAmB;gBAChC,OAAO,GAAG,CAAC;YACb,KAAK,iBAAS,CAAC,cAAc,CAAC;YAC9B,KAAK,iBAAS,CAAC,cAAc,CAAC;YAC9B;gBACE,OAAO,GAAG,CAAC;QACf,CAAC;IACH,CAAC;CACF;AA9DD,8BA8DC"}
|
|
@@ -3,6 +3,6 @@ export declare function serializeError(error: any): SerializedError;
|
|
|
3
3
|
export declare function isError(value: any): boolean;
|
|
4
4
|
export declare function getErrorType(error: any): {
|
|
5
5
|
isError: boolean;
|
|
6
|
-
type: '
|
|
6
|
+
type: 'HeliosError' | 'Error' | 'HttpError' | 'AxiosError' | 'ValidationError' | 'String' | 'Number' | 'Object' | 'Unknown' | null;
|
|
7
7
|
confidence: 'high' | 'medium' | 'low';
|
|
8
8
|
};
|
|
@@ -125,7 +125,7 @@ function getErrorType(error) {
|
|
|
125
125
|
return { isError: false, type: null, confidence: 'high' };
|
|
126
126
|
}
|
|
127
127
|
if (value?.code && typeof value.toResponse === 'function') {
|
|
128
|
-
return { isError: true, type: '
|
|
128
|
+
return { isError: true, type: 'HeliosError', confidence: 'high' };
|
|
129
129
|
}
|
|
130
130
|
if (value instanceof class_validator_1.ValidationError) {
|
|
131
131
|
return { isError: true, type: 'ValidationError', confidence: 'high' };
|