@thisisagile/easy 12.19.13 → 12.19.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/http/RequestOptions.d.ts +3 -1
- package/dist/http/RequestOptions.js +4 -0
- package/dist/http/RequestOptions.js.map +1 -1
- package/dist/services/AxiosProvider.js +1 -0
- package/dist/services/AxiosProvider.js.map +1 -1
- package/dist/types/Text.d.ts +1 -1
- package/dist/types/Text.js +1 -1
- package/dist/types/Text.js.map +1 -1
- package/package.json +2 -2
- package/src/http/RequestOptions.ts +7 -2
- package/src/services/AxiosProvider.ts +22 -5
- package/src/types/Text.ts +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Enum, Id, PageOptions, Text } from '../types';
|
|
1
|
+
import { CacheAge, Enum, Id, PageOptions, Text } from '../types';
|
|
2
2
|
import { ContentType } from './ContentType';
|
|
3
3
|
export declare const toPageOptions: (options?: RequestOptions | PageOptions) => PageOptions | undefined;
|
|
4
4
|
export declare class RequestOptions extends Enum {
|
|
@@ -10,6 +10,7 @@ export declare class RequestOptions extends Enum {
|
|
|
10
10
|
requestOptions: {
|
|
11
11
|
maxRedirects?: number;
|
|
12
12
|
validateStatus?: (status: number) => boolean;
|
|
13
|
+
timeout?: CacheAge;
|
|
13
14
|
};
|
|
14
15
|
constructor(type?: ContentType, headers?: {
|
|
15
16
|
[key: string]: any;
|
|
@@ -29,5 +30,6 @@ export declare class RequestOptions extends Enum {
|
|
|
29
30
|
basic: (username: Text, password: Text) => this;
|
|
30
31
|
maxRedirects: (max?: number) => this;
|
|
31
32
|
validateStatus: (validate?: ((status: number) => boolean) | undefined) => this;
|
|
33
|
+
timeout: (t?: CacheAge) => this;
|
|
32
34
|
}
|
|
33
35
|
export declare const isRequestOptions: (o?: unknown) => o is RequestOptions;
|
|
@@ -37,6 +37,10 @@ class RequestOptions extends types_1.Enum {
|
|
|
37
37
|
this.requestOptions.validateStatus = validate;
|
|
38
38
|
return this;
|
|
39
39
|
};
|
|
40
|
+
this.timeout = (t) => {
|
|
41
|
+
this.requestOptions.timeout = t;
|
|
42
|
+
return this;
|
|
43
|
+
};
|
|
40
44
|
this.headers['Content-Type'] = type.id;
|
|
41
45
|
this.headers[HttpHeader_1.HttpHeader.Correlation] = types_1.ctx.request.correlationId ?? (0, types_1.toUuid)();
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RequestOptions.js","sourceRoot":"","sources":["../../src/http/RequestOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ class AxiosProvider {
|
|
|
23
23
|
headers: uri.isInternal && (0, types_1.isEmpty)(options.headers.Authorization) ? options.bearer(types_1.ctx.request.jwt).headers : options.headers,
|
|
24
24
|
data: options.type.encode(body),
|
|
25
25
|
maxRedirects: options.requestOptions.maxRedirects,
|
|
26
|
+
...(options.requestOptions.timeout && { timeout: types_1.cacheAge.toMilliseconds(options?.requestOptions.timeout) }),
|
|
26
27
|
...(options.requestOptions.validateStatus && { validateStatus: options.requestOptions.validateStatus }),
|
|
27
28
|
})
|
|
28
29
|
.then(r => (0, http_1.toResponse)(r.status, transform(r.data), r.headers))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../src/services/AxiosProvider.ts"],"names":[],"mappings":"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"}
|
package/dist/types/Text.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export declare type Text = {
|
|
|
6
6
|
export declare const isText: (t?: unknown) => t is Text;
|
|
7
7
|
export declare const asString: (t?: unknown, alt?: Get<Text>) => string;
|
|
8
8
|
export declare const replaceAll: (origin: Text, search: Text, replace?: Text) => string;
|
|
9
|
-
export declare const kebab: (s
|
|
9
|
+
export declare const kebab: (s?: string) => string;
|
|
10
10
|
export declare class ToText implements Text {
|
|
11
11
|
readonly subject: string;
|
|
12
12
|
constructor(subject: string);
|
package/dist/types/Text.js
CHANGED
|
@@ -13,7 +13,7 @@ const asString = (t, alt = '') => ((0, exports.isText)(t) ? t : (0, Get_1.ofGet)
|
|
|
13
13
|
exports.asString = asString;
|
|
14
14
|
const replaceAll = (origin, search, replace = '') => (0, exports.asString)(origin).split((0, exports.asString)(search)).join((0, exports.asString)(replace));
|
|
15
15
|
exports.replaceAll = replaceAll;
|
|
16
|
-
const kebab = (s) => s
|
|
16
|
+
const kebab = (s = '') => s
|
|
17
17
|
.replace(/[^a-z\d]+/gi, '-')
|
|
18
18
|
.replace(/-$/, '')
|
|
19
19
|
.replace(/^-/, '')
|
package/dist/types/Text.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../../src/types/Text.ts"],"names":[],"mappings":";;;AAAA,6BAAsD;AACtD,+CAAuC;AACvC,yCAAsC;AACtC,iCAAgC;AAChC,+BAAmC;AACnC,iCAAgC;AAKzB,MAAM,MAAM,GAAG,CAAC,CAAW,EAAa,EAAE,CAAC,IAAA,cAAS,EAAC,CAAC,CAAC,IAAI,IAAA,aAAM,EAAe,CAAS,CAAC,QAAQ,CAAC,CAAC;AAA9F,QAAA,MAAM,UAAwF;AAEpG,MAAM,QAAQ,GAAG,CAAC,CAAW,EAAE,MAAiB,EAAE,EAAU,EAAE,CAAC,CAAC,IAAA,cAAM,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,WAAK,EAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AAAjG,QAAA,QAAQ,YAAyF;AAEvG,MAAM,UAAU,GAAG,CAAC,MAAY,EAAE,MAAY,EAAE,UAAgB,EAAE,EAAU,EAAE,CAAC,IAAA,gBAAQ,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAA,gBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAC,CAAC;AAA1I,QAAA,UAAU,cAAgI;AAEhJ,MAAM,KAAK,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"Text.js","sourceRoot":"","sources":["../../src/types/Text.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy",
|
|
3
|
-
"version": "12.19.
|
|
3
|
+
"version": "12.19.15",
|
|
4
4
|
"description": "Straightforward library for building domain-driven microservice architectures",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "12.19.
|
|
34
|
+
"@thisisagile/easy-test": "12.19.15",
|
|
35
35
|
"@types/form-urlencoded": "^4.4.0",
|
|
36
36
|
"@types/jsonwebtoken": "^8.5.9",
|
|
37
37
|
"@types/luxon": "3.1.0",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ctx, Enum, Id, isDefined, isNotEmpty, on, PageOptions, Text, toUuid } from '../types';
|
|
1
|
+
import { CacheAge, ctx, Enum, Id, isDefined, isNotEmpty, on, PageOptions, Text, toUuid } from '../types';
|
|
2
2
|
import { HttpHeader } from './HttpHeader';
|
|
3
3
|
import { ContentType } from './ContentType';
|
|
4
4
|
|
|
@@ -6,7 +6,7 @@ export const toPageOptions = (options?: RequestOptions | PageOptions): PageOptio
|
|
|
6
6
|
options instanceof RequestOptions ? options.pageOptions : options;
|
|
7
7
|
|
|
8
8
|
export class RequestOptions extends Enum {
|
|
9
|
-
public requestOptions: { maxRedirects?: number; validateStatus?: (status: number) => boolean } = {};
|
|
9
|
+
public requestOptions: { maxRedirects?: number; validateStatus?: (status: number) => boolean; timeout?: CacheAge } = {};
|
|
10
10
|
|
|
11
11
|
constructor(readonly type: ContentType = ContentType.Json, readonly headers: { [key: string]: any } = {}, public pageOptions?: PageOptions) {
|
|
12
12
|
super(type.name);
|
|
@@ -67,6 +67,11 @@ export class RequestOptions extends Enum {
|
|
|
67
67
|
this.requestOptions.validateStatus = validate;
|
|
68
68
|
return this;
|
|
69
69
|
};
|
|
70
|
+
|
|
71
|
+
timeout = (t?: CacheAge): this => {
|
|
72
|
+
this.requestOptions.timeout = t;
|
|
73
|
+
return this;
|
|
74
|
+
};
|
|
70
75
|
}
|
|
71
76
|
|
|
72
77
|
export const isRequestOptions = (o?: unknown): o is RequestOptions => isDefined(o) && o instanceof RequestOptions;
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
import axios, { AxiosError, AxiosInstance, AxiosResponse, Method } from 'axios';
|
|
2
|
-
import {
|
|
3
|
-
|
|
2
|
+
import {
|
|
3
|
+
HttpStatus,
|
|
4
|
+
HttpVerb,
|
|
5
|
+
isRestResult,
|
|
6
|
+
Request,
|
|
7
|
+
RequestOptions,
|
|
8
|
+
RequestProvider,
|
|
9
|
+
Response,
|
|
10
|
+
toResponse
|
|
11
|
+
} from '../http';
|
|
12
|
+
import { cacheAge, choose, ctx, isDefined, isEmpty, toResult, Uri } from '../types';
|
|
4
13
|
|
|
5
14
|
const isResponse = (a: unknown): a is { response: AxiosResponse } => isDefined((a as any)?.response);
|
|
6
15
|
const isRequest = (a: unknown): a is { request: any } => isDefined((a as any)?.request);
|
|
@@ -14,17 +23,25 @@ const asResponse = (uri: Uri, verb: HttpVerb, error: AxiosError): Response =>
|
|
|
14
23
|
.else(e => toResponse(HttpStatus.InternalServerError, toResult(e.message, uri.path, uri)));
|
|
15
24
|
|
|
16
25
|
export class AxiosProvider implements RequestProvider {
|
|
17
|
-
constructor(readonly ai: AxiosInstance = axios) {
|
|
26
|
+
constructor(readonly ai: AxiosInstance = axios) {
|
|
27
|
+
}
|
|
18
28
|
|
|
19
|
-
execute = ({
|
|
29
|
+
execute = ({
|
|
30
|
+
uri,
|
|
31
|
+
verb,
|
|
32
|
+
body,
|
|
33
|
+
transform = (r: any) => r,
|
|
34
|
+
transformError = (r: any) => r,
|
|
35
|
+
options = RequestOptions.Json
|
|
36
|
+
}: Request): Promise<Response> =>
|
|
20
37
|
this.ai
|
|
21
38
|
.request({
|
|
22
39
|
url: uri.toString(),
|
|
23
40
|
method: verb.toString() as Method,
|
|
24
41
|
headers: uri.isInternal && isEmpty(options.headers.Authorization) ? options.bearer(ctx.request.jwt).headers : options.headers,
|
|
25
42
|
data: options.type.encode(body),
|
|
26
|
-
|
|
27
43
|
maxRedirects: options.requestOptions.maxRedirects,
|
|
44
|
+
...(options.requestOptions.timeout && { timeout: cacheAge.toMilliseconds(options?.requestOptions.timeout) }),
|
|
28
45
|
...(options.requestOptions.validateStatus && { validateStatus: options.requestOptions.validateStatus }),
|
|
29
46
|
})
|
|
30
47
|
.then(r => toResponse(r.status, transform(r.data), r.headers))
|
package/src/types/Text.ts
CHANGED
|
@@ -14,7 +14,7 @@ export const asString = (t?: unknown, alt: Get<Text> = ''): string => (isText(t)
|
|
|
14
14
|
|
|
15
15
|
export const replaceAll = (origin: Text, search: Text, replace: Text = ''): string => asString(origin).split(asString(search)).join(asString(replace));
|
|
16
16
|
|
|
17
|
-
export const kebab = (s
|
|
17
|
+
export const kebab = (s = ''): string =>
|
|
18
18
|
s
|
|
19
19
|
.replace(/[^a-z\d]+/gi, '-')
|
|
20
20
|
.replace(/-$/, '')
|