@sinch/sdk-client 1.5.0 → 1.6.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/dist/api/api-client-options-helper.d.ts +3 -3
- package/dist/api/api-client-options-helper.js +41 -11
- package/dist/api/api-client-options-helper.js.map +1 -1
- package/dist/api/api-client-options.d.ts +7 -2
- package/dist/api/api-client.d.ts +3 -1
- package/dist/api/api-client.js +4 -0
- package/dist/api/api-client.js.map +1 -1
- package/dist/api/api-errors.js.map +1 -1
- package/dist/client/api-client-helpers.js.map +1 -1
- package/dist/client/api-client-pagination-helper.js +24 -0
- package/dist/client/api-client-pagination-helper.js.map +1 -1
- package/dist/client/api-fetch-client.d.ts +3 -1
- package/dist/client/api-fetch-client.js +58 -50
- package/dist/client/api-fetch-client.js.map +1 -1
- package/dist/client/lazy-api-client.js.map +1 -1
- package/dist/client/retry-policy.d.ts +33 -0
- package/dist/client/retry-policy.js +112 -0
- package/dist/client/retry-policy.js.map +1 -0
- package/dist/domain/domain-helper.d.ts +3 -2
- package/dist/domain/domain-helper.js +4 -3
- package/dist/domain/domain-helper.js.map +1 -1
- package/dist/domain/domain-interface.d.ts +88 -9
- package/dist/domain/domain-interface.js +35 -3
- package/dist/domain/domain-interface.js.map +1 -1
- package/dist/http/fetch/fetch-http-content-parser.d.ts +13 -0
- package/dist/http/fetch/fetch-http-content-parser.js +65 -0
- package/dist/http/fetch/fetch-http-content-parser.js.map +1 -0
- package/dist/http/fetch/fetch-http-headers.d.ts +4 -0
- package/dist/http/fetch/fetch-http-headers.js +37 -0
- package/dist/http/fetch/fetch-http-headers.js.map +1 -0
- package/dist/http/fetch/fetch-http-request-mapper.d.ts +8 -0
- package/dist/http/fetch/fetch-http-request-mapper.js +31 -0
- package/dist/http/fetch/fetch-http-request-mapper.js.map +1 -0
- package/dist/http/fetch/fetch-http-response.d.ts +3 -0
- package/dist/http/fetch/fetch-http-response.js +10 -0
- package/dist/http/fetch/fetch-http-response.js.map +1 -0
- package/dist/http/fetch/fetch-http-transport.d.ts +11 -0
- package/dist/http/fetch/fetch-http-transport.js +44 -0
- package/dist/http/fetch/fetch-http-transport.js.map +1 -0
- package/dist/http/fetch/index.d.ts +5 -0
- package/dist/http/fetch/index.js +15 -0
- package/dist/http/fetch/index.js.map +1 -0
- package/dist/http/http-content-parser.d.ts +13 -0
- package/dist/http/http-content-parser.js +3 -0
- package/dist/http/http-content-parser.js.map +1 -0
- package/dist/http/http-headers.d.ts +16 -0
- package/dist/http/http-headers.js +63 -0
- package/dist/http/http-headers.js.map +1 -0
- package/dist/http/http-method.d.ts +10 -0
- package/dist/http/http-method.js +26 -0
- package/dist/http/http-method.js.map +1 -0
- package/dist/http/http-request.d.ts +27 -0
- package/dist/http/http-request.js +19 -0
- package/dist/http/http-request.js.map +1 -0
- package/dist/http/http-response.d.ts +12 -0
- package/dist/http/http-response.js +16 -0
- package/dist/http/http-response.js.map +1 -0
- package/dist/http/http-transport.d.ts +15 -0
- package/dist/http/http-transport.js +3 -0
- package/dist/http/http-transport.js.map +1 -0
- package/dist/http/index.d.ts +6 -0
- package/dist/http/index.js +13 -0
- package/dist/http/index.js.map +1 -0
- package/dist/logger/logger.js +11 -3
- package/dist/logger/logger.js.map +1 -1
- package/dist/logger/sinch-logger.d.ts +1 -1
- package/dist/logger/sinch-logger.js +1 -1
- package/dist/logger/sinch-logger.js.map +1 -1
- package/dist/plugins/additional-headers/additional-headers.request.js.map +1 -1
- package/dist/plugins/api-token/api-token.request.js.map +1 -1
- package/dist/plugins/basicAuthentication/basic-authentication.request.js.map +1 -1
- package/dist/plugins/core/index.d.ts +1 -1
- package/dist/plugins/core/index.js +1 -0
- package/dist/plugins/core/index.js.map +1 -1
- package/dist/plugins/core/request-plugin.js.map +1 -1
- package/dist/plugins/exception/exception.response.js.map +1 -1
- package/dist/plugins/oauth2/oauth2-api.js.map +1 -1
- package/dist/plugins/oauth2/oauth2-token.request.d.ts +2 -6
- package/dist/plugins/oauth2/oauth2-token.request.js +24 -77
- package/dist/plugins/oauth2/oauth2-token.request.js.map +1 -1
- package/dist/plugins/signing/signing.request.js.map +1 -1
- package/dist/plugins/version/version.request.js.map +1 -1
- package/dist/plugins/x-timestamp/x-timestamp.request.js.map +1 -1
- package/dist/utils/authorization.helper.js.map +1 -1
- package/dist/utils/date.js.map +1 -1
- package/dist/utils/text-to-hex.js.map +1 -1
- package/package.json +6 -3
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { ApiPlugins, MailgunCredentials, SinchClientParameters, WithLogger } from '../domain';
|
|
1
|
+
import { ApiPlugins, MailgunCredentials, SinchClientParameters, TransportSettings, WithLogger, WithRetryPolicy } from '../domain';
|
|
2
2
|
import { ApiClientOptions } from './api-client-options';
|
|
3
3
|
/** @internal */
|
|
4
4
|
export declare const buildOAuth2ApiClientOptions: (params: SinchClientParameters, apiName: string) => ApiClientOptions;
|
|
5
|
-
/** @internal */
|
|
6
|
-
export declare const buildMailgunApiClientOptions: (params: Partial<MailgunCredentials & ApiPlugins & WithLogger>) => ApiClientOptions;
|
|
5
|
+
/** @internal @deprecated */
|
|
6
|
+
export declare const buildMailgunApiClientOptions: (params: Partial<MailgunCredentials & ApiPlugins & WithLogger & WithRetryPolicy & TransportSettings>) => ApiClientOptions;
|
|
7
7
|
/** @internal */
|
|
8
8
|
export declare const buildApplicationSignedApiClientOptions: (params: SinchClientParameters, apiName: string) => ApiClientOptions;
|
|
9
9
|
/** @internal */
|
|
@@ -1,28 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildFlexibleOAuth2OrApiTokenApiClientOptions = exports.buildApplicationSignedApiClientOptions = exports.buildMailgunApiClientOptions = exports.buildOAuth2ApiClientOptions = void 0;
|
|
4
|
+
const domain_1 = require("../domain");
|
|
4
5
|
const plugins_1 = require("../plugins");
|
|
5
6
|
const logger_1 = require("../logger");
|
|
7
|
+
const retry_policy_1 = require("../client/retry-policy");
|
|
6
8
|
const resolveParamsLogger = (params) => (0, logger_1.resolveLogger)(params.logger);
|
|
9
|
+
const applyRetryConfig = (apiClientOptions, params) => {
|
|
10
|
+
const retry = (0, retry_policy_1.resolveRetryConfig)(params);
|
|
11
|
+
apiClientOptions.retryPolicy = retry.retryPolicy;
|
|
12
|
+
apiClientOptions.maxRetryCount = retry.maxRetryCount;
|
|
13
|
+
apiClientOptions.exponentialBackoff = retry.exponentialBackoff;
|
|
14
|
+
};
|
|
15
|
+
const getAuthPlugins = (params, logger, timeoutSeconds) => {
|
|
16
|
+
if (!(params.useSinchAuth ?? true)) {
|
|
17
|
+
return [];
|
|
18
|
+
}
|
|
19
|
+
return [
|
|
20
|
+
new plugins_1.Oauth2TokenRequest(params.keyId, params.keySecret, params.authHostname, logger, timeoutSeconds, params),
|
|
21
|
+
];
|
|
22
|
+
};
|
|
23
|
+
const assertOAuth2Credentials = (params, apiName) => {
|
|
24
|
+
const useSinchAuth = params.useSinchAuth ?? true;
|
|
25
|
+
if (!params.projectId || (useSinchAuth && (!params.keyId || !params.keySecret))) {
|
|
26
|
+
throw new Error(useSinchAuth
|
|
27
|
+
? `Invalid configuration for the ${apiName} API: "projectId", "keyId" and "keySecret" values must be provided`
|
|
28
|
+
: `Invalid configuration for the ${apiName} API: "projectId" must be provided`);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
7
31
|
/** @internal */
|
|
8
32
|
const buildOAuth2ApiClientOptions = (params, apiName) => {
|
|
9
|
-
|
|
10
|
-
throw new Error(`Invalid configuration for the ${apiName} API: "projectId", "keyId" and "keySecret" values must be provided`);
|
|
11
|
-
}
|
|
33
|
+
assertOAuth2Credentials(params, apiName);
|
|
12
34
|
const logger = resolveParamsLogger(params);
|
|
35
|
+
const timeoutSeconds = (0, domain_1.resolveTimeoutSeconds)(params.timeoutSeconds);
|
|
13
36
|
const apiClientOptions = {
|
|
14
37
|
projectId: params.projectId,
|
|
15
|
-
requestPlugins:
|
|
16
|
-
new plugins_1.Oauth2TokenRequest(params.keyId, params.keySecret, params.authHostname, logger),
|
|
17
|
-
],
|
|
38
|
+
requestPlugins: getAuthPlugins(params, logger, timeoutSeconds),
|
|
18
39
|
useServicePlanId: false,
|
|
19
40
|
logger,
|
|
41
|
+
timeoutSeconds,
|
|
20
42
|
};
|
|
43
|
+
applyRetryConfig(apiClientOptions, params);
|
|
21
44
|
addPlugins(apiClientOptions, params);
|
|
22
45
|
return apiClientOptions;
|
|
23
46
|
};
|
|
24
47
|
exports.buildOAuth2ApiClientOptions = buildOAuth2ApiClientOptions;
|
|
25
|
-
/** @internal */
|
|
48
|
+
/** @internal @deprecated */
|
|
26
49
|
const buildMailgunApiClientOptions = (params) => {
|
|
27
50
|
if (!params.mailgunApiKey) {
|
|
28
51
|
throw new Error('Invalid configuration for the Mailgun API: the "mailgunApiKey" must be provided');
|
|
@@ -33,7 +56,9 @@ const buildMailgunApiClientOptions = (params) => {
|
|
|
33
56
|
new plugins_1.BasicAuthenticationRequest('api', params.mailgunApiKey),
|
|
34
57
|
],
|
|
35
58
|
logger,
|
|
59
|
+
timeoutSeconds: (0, domain_1.resolveTimeoutSeconds)(params.timeoutSeconds),
|
|
36
60
|
};
|
|
61
|
+
applyRetryConfig(apiClientOptions, params);
|
|
37
62
|
addPlugins(apiClientOptions, params);
|
|
38
63
|
return apiClientOptions;
|
|
39
64
|
};
|
|
@@ -50,7 +75,9 @@ const buildApplicationSignedApiClientOptions = (params, apiName) => {
|
|
|
50
75
|
new plugins_1.SigningRequest(params.applicationKey, params.applicationSecret),
|
|
51
76
|
],
|
|
52
77
|
logger,
|
|
78
|
+
timeoutSeconds: (0, domain_1.resolveTimeoutSeconds)(params.timeoutSeconds),
|
|
53
79
|
};
|
|
80
|
+
applyRetryConfig(apiClientOptions, params);
|
|
54
81
|
addPlugins(apiClientOptions, params);
|
|
55
82
|
return apiClientOptions;
|
|
56
83
|
};
|
|
@@ -58,6 +85,8 @@ exports.buildApplicationSignedApiClientOptions = buildApplicationSignedApiClient
|
|
|
58
85
|
/** @internal */
|
|
59
86
|
const buildFlexibleOAuth2OrApiTokenApiClientOptions = (params) => {
|
|
60
87
|
const logger = resolveParamsLogger(params);
|
|
88
|
+
const timeoutSeconds = (0, domain_1.resolveTimeoutSeconds)(params.timeoutSeconds);
|
|
89
|
+
const useSinchAuth = params.useSinchAuth ?? true;
|
|
61
90
|
let apiClientOptions;
|
|
62
91
|
if (params.servicePlanId && params.apiToken) {
|
|
63
92
|
apiClientOptions = {
|
|
@@ -65,24 +94,25 @@ const buildFlexibleOAuth2OrApiTokenApiClientOptions = (params) => {
|
|
|
65
94
|
requestPlugins: [new plugins_1.ApiTokenRequest(params.apiToken)],
|
|
66
95
|
useServicePlanId: true,
|
|
67
96
|
logger,
|
|
97
|
+
timeoutSeconds,
|
|
68
98
|
};
|
|
69
99
|
if (params.projectId || params.keyId || params.keySecret) {
|
|
70
100
|
logger.warn('As the servicePlanId and the apiToken are provided, all other credentials will be disregarded.');
|
|
71
101
|
}
|
|
72
102
|
}
|
|
73
|
-
else if (params.projectId && params.keyId && params.keySecret) {
|
|
103
|
+
else if (params.projectId && (!useSinchAuth || (params.keyId && params.keySecret))) {
|
|
74
104
|
apiClientOptions = {
|
|
75
105
|
projectId: params.projectId,
|
|
76
|
-
requestPlugins:
|
|
77
|
-
new plugins_1.Oauth2TokenRequest(params.keyId, params.keySecret, params.authHostname, logger),
|
|
78
|
-
],
|
|
106
|
+
requestPlugins: getAuthPlugins(params, logger, timeoutSeconds),
|
|
79
107
|
useServicePlanId: false,
|
|
80
108
|
logger,
|
|
109
|
+
timeoutSeconds,
|
|
81
110
|
};
|
|
82
111
|
}
|
|
83
112
|
if (!apiClientOptions) {
|
|
84
113
|
throw new Error('Invalid parameters for the SMS API: check your configuration');
|
|
85
114
|
}
|
|
115
|
+
applyRetryConfig(apiClientOptions, params);
|
|
86
116
|
addPlugins(apiClientOptions, params);
|
|
87
117
|
return apiClientOptions;
|
|
88
118
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client-options-helper.js","sourceRoot":"","sources":["../../src/api/api-client-options-helper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"api-client-options-helper.js","sourceRoot":"","sources":["../../src/api/api-client-options-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RequestPlugin } from '../plugins/core/request-plugin';
|
|
2
2
|
import { ResponsePlugin } from '../plugins/core/response-plugin';
|
|
3
|
-
import { WithLogger } from '../domain';
|
|
3
|
+
import { WithLogger, WithRetryPolicy } from '../domain';
|
|
4
4
|
interface BaseApiClientOptions {
|
|
5
5
|
/**
|
|
6
6
|
* ID of the umbrella project containing the access keys
|
|
@@ -24,8 +24,13 @@ interface BaseApiClientOptions {
|
|
|
24
24
|
* @default false
|
|
25
25
|
*/
|
|
26
26
|
useServicePlanId?: boolean;
|
|
27
|
+
/**
|
|
28
|
+
* Request/connection timeout in seconds for HTTP I/O.
|
|
29
|
+
* @default 60
|
|
30
|
+
*/
|
|
31
|
+
timeoutSeconds?: number;
|
|
27
32
|
}
|
|
28
33
|
/** @internal */
|
|
29
|
-
export interface ApiClientOptions extends Partial<BaseApiClientOptions>, WithLogger {
|
|
34
|
+
export interface ApiClientOptions extends Partial<BaseApiClientOptions>, WithLogger, WithRetryPolicy {
|
|
30
35
|
}
|
|
31
36
|
export {};
|
package/dist/api/api-client.d.ts
CHANGED
|
@@ -12,7 +12,9 @@ export declare enum PaginationEnum {
|
|
|
12
12
|
/** used by the Elastic SIP Trunking API */
|
|
13
13
|
PAGE2 = 4,
|
|
14
14
|
/** used by the Fax API */
|
|
15
|
-
PAGE3 = 5
|
|
15
|
+
PAGE3 = 5,
|
|
16
|
+
/** used by Voice API v2 — follow `links.next` */
|
|
17
|
+
PAGE_LINK = 6
|
|
16
18
|
}
|
|
17
19
|
export interface ApiListPromise<T> extends Promise<PageResult<T>>, AsyncIterableIterator<T> {
|
|
18
20
|
}
|
package/dist/api/api-client.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ApiClient = exports.PaginationEnum = void 0;
|
|
4
|
+
const domain_1 = require("../domain");
|
|
4
5
|
const node_fetch_1 = require("node-fetch");
|
|
5
6
|
/** @internal */
|
|
6
7
|
var PaginationEnum;
|
|
@@ -16,6 +17,8 @@ var PaginationEnum;
|
|
|
16
17
|
PaginationEnum[PaginationEnum["PAGE2"] = 4] = "PAGE2";
|
|
17
18
|
/** used by the Fax API */
|
|
18
19
|
PaginationEnum[PaginationEnum["PAGE3"] = 5] = "PAGE3";
|
|
20
|
+
/** used by Voice API v2 — follow `links.next` */
|
|
21
|
+
PaginationEnum[PaginationEnum["PAGE_LINK"] = 6] = "PAGE_LINK";
|
|
19
22
|
})(PaginationEnum || (exports.PaginationEnum = PaginationEnum = {}));
|
|
20
23
|
/**
|
|
21
24
|
* API Client used to call the server
|
|
@@ -83,6 +86,7 @@ class ApiClient {
|
|
|
83
86
|
queryParams: filterUndefinedValues(queryParams),
|
|
84
87
|
hostname: url,
|
|
85
88
|
path,
|
|
89
|
+
timeout: (this.apiClientOptions.timeoutSeconds ?? domain_1.DEFAULT_TIMEOUT_SECONDS) * 1000,
|
|
86
90
|
};
|
|
87
91
|
let opts = options;
|
|
88
92
|
if (this.apiClientOptions.requestPlugins) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/api/api-client.ts"],"names":[],"mappings":";;;AAEA,2CAAqC;AAErC,gBAAgB;AAChB,IAAY,
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/api/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-errors.js","sourceRoot":"","sources":["../../src/api/api-errors.ts"],"names":[],"mappings":";;;AAYA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"api-errors.js","sourceRoot":"","sources":["../../src/api/api-errors.ts"],"names":[],"mappings":";;;AAYA;;GAEG;AACH,kBAA0B,SAAQ,KAAK;IACrC,YAAY,OAAe,EAAE,YAA0B;QACrD,MAAM,OAAO,GAAG,YAAY,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzD,KAAK,CACH,aAAa,YAAY,CAAC,OAAO,IAAI,SAAS;wBAC5B,YAAY,CAAC,WAAW,IAAI,SAAS;oBACzC,OAAO,sBAAsB,OAAO,EAAE,CACrD,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,SAAS,CAAC,GAA8B;QACrD,MAAM,UAAU,GAAG,cAAc,CAAC;QAClC,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACvD,CAAC;CAEF;;AAED;;GAEG;AACH,wBAAmC,SAAQ,YAAY;IAgBrD,YACE,OAAe,EACf,UAAkB,EAClB,YAA0B,EAC1B,IAAQ,EACR,eAA2C;QAE3C,KAAK,CAAC,YAAY,UAAU,KAAK,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;QAC1D,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;CACF;;AAED;;GAEG;AACH,gBAAgB;AAChB,wBAAgC,SAAQ,YAAY;IAElD,YAAY,OAAe,EAAE,YAA0B;QACrD,KAAK,CAAC,oBAAoB,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;IACrD,CAAC;CACF;;AAED;;GAEG;AACH,gBAAgB;AAChB,4BAAoC,SAAQ,kBAA0B;IACpE,YACE,OAAe,EACf,UAAkB,EAClB,YAA0B,EAC1B,WAAoB;QAEpB,KAAK,CACH,+BAA+B,OAAO,EAAE,EACxC,UAAU,EACV,YAAY,EACZ,WAAW,CACZ,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client-helpers.js","sourceRoot":"","sources":["../../src/client/api-client-helpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-client-helpers.js","sourceRoot":"","sources":["../../src/client/api-client-helpers.ts"],"names":[],"mappings":";;;;AAAA,mEAIwC;AAExC,kDAA+D;AAG/D;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,KAAK,EACrC,iBAAsE,EACtE,YAA0B,EAC1B,cAA2C,EAC3C,UAAmB,EACM,EAAE;IAC3B,MAAM,YAAY,GAAG,cAAc,EAAE,IAAI,CACvC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,kCAAiB,CAAC,oBAAoB,CACxE,CAAC;IACF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,yBAAY,CACpB,gHAAgH,EAChH,YAAY,CACb,CAAC;IACJ,CAAC;IACA,YAAmC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAClE,OAAO,YAAY,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;AACzE,CAAC,CAAC;AAjBW,QAAA,kBAAkB,GAAlB,kBAAkB,CAiB7B;AAEF,2BACE,iBAAoC;IAEpC,OAAO;QACL,OAAO,EAAE,iBAAiB,CAAC,OAAO;QAClC,WAAW,EAAE,iBAAiB,CAAC,WAAW;QAC1C,GAAG,EAAE,iBAAiB,CAAC,GAAG;KAC3B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAAC,KAAU,EAAO,EAAE;IAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,qCAAqC;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,QAAA,WAAW,EAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACvD,wCAAwC;QACxC,MAAM,MAAM,GAAQ,EAAE,CAAC;QACvB,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBACrD,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,QAAA,WAAW,EAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;SAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,qCAAqC;QACrC,OAAO,IAAI,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,2BAA2B;QAC3B,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AApBW,QAAA,WAAW,GAAX,WAAW,CAoBtB;AAEF,MAAM,YAAY,GAAG,CAAC,KAAU,EAAW,EAAE;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7B,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,cAAsB,EAAU,EAAE;IAC9D,6CAA6C;IAC7C,MAAM,aAAa,GAAG,kCAAkC,CAAC;IACzD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACxC,MAAM,wBAAwB,GAAG,cAAc,CAAC;QAChD,iGAAiG;QACjG,IAAI,wBAAwB,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YAClD,cAAc,GAAG,cAAc,GAAG,KAAK,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,cAAc,GAAG,GAAG,CAAC;QACxC,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC"}
|
|
@@ -58,6 +58,9 @@ class SinchIterator {
|
|
|
58
58
|
};
|
|
59
59
|
return updateQueryParamsAndSendRequest(this.apiClient, newParams, requestOptions, this.paginatedOperationProperties);
|
|
60
60
|
}
|
|
61
|
+
if (this.paginatedOperationProperties.pagination === api_client_1.PaginationEnum.PAGE_LINK) {
|
|
62
|
+
return followLinkAndSendRequest(this.apiClient, pageResult.nextPageValue, requestOptions, this.paginatedOperationProperties);
|
|
63
|
+
}
|
|
61
64
|
throw new Error(`The operationId "${this.paginatedOperationProperties.operationId}" must define a pagination model`);
|
|
62
65
|
}
|
|
63
66
|
next() {
|
|
@@ -66,6 +69,15 @@ class SinchIterator {
|
|
|
66
69
|
})();
|
|
67
70
|
}
|
|
68
71
|
}
|
|
72
|
+
const followLinkAndSendRequest = (apiClient, nextPageValue, requestOptions, paginatedApiProperties) => {
|
|
73
|
+
const nextLink = JSON.parse(nextPageValue);
|
|
74
|
+
const nextUrl = new URL(nextLink, requestOptions.hostname);
|
|
75
|
+
return apiClient.processCallWithPagination({
|
|
76
|
+
url: nextUrl.toString(),
|
|
77
|
+
requestOptions,
|
|
78
|
+
...paginatedApiProperties,
|
|
79
|
+
});
|
|
80
|
+
};
|
|
69
81
|
const updateQueryParamsAndSendRequest = (apiClient, newParams, requestOptions, paginatedApiProperties) => {
|
|
70
82
|
const newQueryParams = {
|
|
71
83
|
...requestOptions.queryParams,
|
|
@@ -118,6 +130,12 @@ const createIteratorMethodsForPagination = (apiClient, requestOptionsPromise, fi
|
|
|
118
130
|
};
|
|
119
131
|
exports.createIteratorMethodsForPagination = createIteratorMethodsForPagination;
|
|
120
132
|
const createNextPageMethod = (apiClient, context, requestOptions, nextPageValue) => {
|
|
133
|
+
if (context.pagination === api_client_1.PaginationEnum.PAGE_LINK) {
|
|
134
|
+
const pageResultPromise = followLinkAndSendRequest(apiClient, nextPageValue, requestOptions, context);
|
|
135
|
+
const requestOptionsPromise = Promise.resolve(requestOptions);
|
|
136
|
+
Object.assign(pageResultPromise, (0, exports.createIteratorMethodsForPagination)(apiClient, requestOptionsPromise, pageResultPromise, context));
|
|
137
|
+
return pageResultPromise;
|
|
138
|
+
}
|
|
121
139
|
let newParams;
|
|
122
140
|
switch (context.pagination) {
|
|
123
141
|
case api_client_1.PaginationEnum.TOKEN:
|
|
@@ -171,6 +189,9 @@ function hasMore(response, context) {
|
|
|
171
189
|
if (context.pagination === api_client_1.PaginationEnum.PAGE3) {
|
|
172
190
|
return response.page < response.totalPages;
|
|
173
191
|
}
|
|
192
|
+
if (context.pagination === api_client_1.PaginationEnum.PAGE_LINK) {
|
|
193
|
+
return !!response.links.next;
|
|
194
|
+
}
|
|
174
195
|
throw new Error(`The operation ${context.operationId} is not meant to be paginated.`);
|
|
175
196
|
}
|
|
176
197
|
function calculateNextPage(response, context) {
|
|
@@ -195,6 +216,9 @@ function calculateNextPage(response, context) {
|
|
|
195
216
|
const nextPage = currentPage + 1;
|
|
196
217
|
return nextPage.toString();
|
|
197
218
|
}
|
|
219
|
+
if (context.pagination === api_client_1.PaginationEnum.PAGE_LINK) {
|
|
220
|
+
return response.links.next ?? '';
|
|
221
|
+
}
|
|
198
222
|
throw new Error(`The operation ${context.operationId} is not meant to be paginated.`);
|
|
199
223
|
}
|
|
200
224
|
function buildPaginationContext(props) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client-pagination-helper.js","sourceRoot":"","sources":["../../src/client/api-client-pagination-helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"api-client-pagination-helper.js","sourceRoot":"","sources":["../../src/client/api-client-pagination-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { ApiClient, ApiCallParameters, ApiCallParametersWithPagination, PageResu
|
|
|
2
2
|
import { ApiClientOptions } from '../api/api-client-options';
|
|
3
3
|
/** Client to process the call to the API using Fetch API */
|
|
4
4
|
export declare class ApiFetchClient extends ApiClient {
|
|
5
|
+
private readonly httpTransport;
|
|
5
6
|
/**
|
|
6
7
|
* Initialize your API Client instance with the provided configuration options.
|
|
7
8
|
* Default request plugins: VersionRequest
|
|
@@ -24,11 +25,12 @@ export declare class ApiFetchClient extends ApiClient {
|
|
|
24
25
|
private processFileResponse;
|
|
25
26
|
private processCSVResponse;
|
|
26
27
|
/**
|
|
27
|
-
* Handle fetch request with token refresh
|
|
28
|
+
* Handle fetch request with token refresh and retry.
|
|
28
29
|
* @param {ApiCallParameters} apiCallParameters
|
|
29
30
|
* @param {ErrorContext} errorContext
|
|
30
31
|
*/
|
|
31
32
|
private sinchFetch;
|
|
33
|
+
private send;
|
|
32
34
|
private isTokenExpired;
|
|
33
35
|
private applyResponsePlugins;
|
|
34
36
|
private loadResponsePlugins;
|
|
@@ -1,18 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.ApiFetchClient = void 0;
|
|
7
4
|
const version_1 = require("../plugins/version");
|
|
8
5
|
const exception_1 = require("../plugins/exception");
|
|
9
6
|
const api_client_1 = require("../api/api-client");
|
|
10
7
|
const api_errors_1 = require("../api/api-errors");
|
|
11
|
-
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
12
8
|
const api_client_helpers_1 = require("./api-client-helpers");
|
|
13
9
|
const logger_1 = require("../logger");
|
|
14
|
-
const
|
|
10
|
+
const domain_1 = require("../domain");
|
|
11
|
+
const fetch_1 = require("../http/fetch");
|
|
15
12
|
const api_client_pagination_helper_1 = require("./api-client-pagination-helper");
|
|
13
|
+
const retry_policy_1 = require("./retry-policy");
|
|
16
14
|
/** Client to process the call to the API using Fetch API */
|
|
17
15
|
class ApiFetchClient extends api_client_1.ApiClient {
|
|
18
16
|
/**
|
|
@@ -23,12 +21,15 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
23
21
|
* @param {ApiClientOptions} options - Configuration options for the API Client.
|
|
24
22
|
*/
|
|
25
23
|
constructor(options) {
|
|
26
|
-
const logger =
|
|
27
|
-
|
|
28
|
-
: (0, logger_1.resolveLogger)(options.logger);
|
|
24
|
+
const logger = (0, logger_1.resolveLogger)(options.logger);
|
|
25
|
+
const retry = (0, retry_policy_1.resolveRetryConfig)(options);
|
|
29
26
|
const resolvedOptions = {
|
|
30
27
|
...options,
|
|
31
28
|
logger,
|
|
29
|
+
timeoutSeconds: (0, domain_1.resolveTimeoutSeconds)(options.timeoutSeconds),
|
|
30
|
+
retryPolicy: retry.retryPolicy,
|
|
31
|
+
maxRetryCount: retry.maxRetryCount,
|
|
32
|
+
exponentialBackoff: retry.exponentialBackoff,
|
|
32
33
|
};
|
|
33
34
|
super({
|
|
34
35
|
...resolvedOptions,
|
|
@@ -38,6 +39,7 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
38
39
|
...(resolvedOptions.responsePlugins || []),
|
|
39
40
|
],
|
|
40
41
|
});
|
|
42
|
+
this.httpTransport = new fetch_1.FetchHttpTransport();
|
|
41
43
|
}
|
|
42
44
|
/** @inheritdoc */
|
|
43
45
|
async processCall(apiCallParameters) {
|
|
@@ -63,10 +65,11 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
63
65
|
async executeRequest(apiCallParameters, isFileDownload = false) {
|
|
64
66
|
const errorContext = (0, api_client_helpers_1.buildErrorContext)(apiCallParameters);
|
|
65
67
|
try {
|
|
66
|
-
const
|
|
67
|
-
const body = isFileDownload ? undefined : await
|
|
68
|
+
const httpResponse = await this.sinchFetch(apiCallParameters, errorContext);
|
|
69
|
+
const body = isFileDownload ? undefined : await httpResponse.content.asString();
|
|
68
70
|
return {
|
|
69
|
-
|
|
71
|
+
httpResponse,
|
|
72
|
+
response: this.httpTransport.getNativeResponse(httpResponse),
|
|
70
73
|
body,
|
|
71
74
|
apiCallParameters,
|
|
72
75
|
errorContext,
|
|
@@ -97,47 +100,66 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
97
100
|
return { result, exception, responseContext: context };
|
|
98
101
|
}
|
|
99
102
|
async processFileResponse(context) {
|
|
100
|
-
if (!context.response
|
|
101
|
-
throw this.buildFetchError(new Error(
|
|
103
|
+
if (!context.response.ok) {
|
|
104
|
+
throw this.buildFetchError(new Error(`HTTP ${context.httpResponse.status}`), context.errorContext);
|
|
102
105
|
}
|
|
103
|
-
const buffer = await context.
|
|
104
|
-
const fileName = this.extractFileName(context.
|
|
106
|
+
const buffer = await context.httpResponse.content.asBytes();
|
|
107
|
+
const fileName = this.extractFileName(context.httpResponse.headers, 'pdf');
|
|
105
108
|
if (!buffer || !fileName) {
|
|
106
109
|
throw new Error('An error occurred while downloading the file');
|
|
107
110
|
}
|
|
108
111
|
return { fileName, buffer };
|
|
109
112
|
}
|
|
110
113
|
async processCSVResponse(context) {
|
|
111
|
-
if (!context.response
|
|
112
|
-
throw this.buildFetchError(new Error(
|
|
114
|
+
if (!context.response.ok) {
|
|
115
|
+
throw this.buildFetchError(new Error(`HTTP ${context.httpResponse.status}`), context.errorContext);
|
|
113
116
|
}
|
|
114
|
-
const responseText = await context.
|
|
115
|
-
const fileName = this.extractFileName(context.
|
|
117
|
+
const responseText = await context.httpResponse.content.asString();
|
|
118
|
+
const fileName = this.extractFileName(context.httpResponse.headers, 'csv');
|
|
116
119
|
if (!responseText || !fileName) {
|
|
117
120
|
throw new Error('An error occurred while downloading the file');
|
|
118
121
|
}
|
|
119
122
|
return { fileName, data: responseText };
|
|
120
123
|
}
|
|
121
124
|
/**
|
|
122
|
-
* Handle fetch request with token refresh
|
|
125
|
+
* Handle fetch request with token refresh and retry.
|
|
123
126
|
* @param {ApiCallParameters} apiCallParameters
|
|
124
127
|
* @param {ErrorContext} errorContext
|
|
125
128
|
*/
|
|
126
129
|
async sinchFetch(apiCallParameters, errorContext) {
|
|
127
|
-
|
|
128
|
-
|
|
130
|
+
const retryConfig = (0, retry_policy_1.resolveRetryConfig)(this.apiClientOptions);
|
|
131
|
+
let requestOptions = apiCallParameters.requestOptions;
|
|
132
|
+
let httpRequest = (0, fetch_1.toHttpRequest)(apiCallParameters, requestOptions);
|
|
133
|
+
let httpResponse = await this.send(httpRequest, requestOptions.timeout);
|
|
134
|
+
if (this.isTokenExpired(httpResponse)) {
|
|
129
135
|
// Capture the JWT used by the failing request so the OAuth2 plugin can
|
|
130
136
|
// refuse to clear a cached token that has since been refreshed by another caller.
|
|
131
|
-
const failingAuth =
|
|
132
|
-
const failingJwt = failingAuth.startsWith('Bearer ')
|
|
133
|
-
|
|
134
|
-
|
|
137
|
+
const failingAuth = httpRequest.headers.getAll('Authorization')[0] || '';
|
|
138
|
+
const failingJwt = failingAuth.startsWith('Bearer ')
|
|
139
|
+
? failingAuth.slice('Bearer '.length)
|
|
140
|
+
: undefined;
|
|
141
|
+
this.httpTransport.release(httpResponse);
|
|
142
|
+
requestOptions = await (0, api_client_helpers_1.manageExpiredToken)(apiCallParameters, errorContext, this.apiClientOptions.requestPlugins, failingJwt);
|
|
143
|
+
httpRequest = (0, fetch_1.toHttpRequest)(apiCallParameters, requestOptions);
|
|
144
|
+
httpResponse = await this.send(httpRequest, requestOptions.timeout);
|
|
135
145
|
}
|
|
136
|
-
|
|
146
|
+
for (let attempt = 0;; attempt++) {
|
|
147
|
+
const retryAfterMs = (0, retry_policy_1.parseRetryAfterMs)(httpResponse.headers.getAll('retry-after')[0]);
|
|
148
|
+
if (!(0, retry_policy_1.shouldRetryRateLimit)(httpResponse.status, attempt, retryConfig, retryAfterMs)) {
|
|
149
|
+
break;
|
|
150
|
+
}
|
|
151
|
+
await (0, retry_policy_1.sleep)((0, retry_policy_1.computeRateLimitBackoffMs)(attempt, retryConfig, retryAfterMs));
|
|
152
|
+
this.httpTransport.release(httpResponse);
|
|
153
|
+
httpResponse = await this.send(httpRequest, requestOptions.timeout);
|
|
154
|
+
}
|
|
155
|
+
return httpResponse;
|
|
137
156
|
}
|
|
138
|
-
|
|
139
|
-
return
|
|
140
|
-
|
|
157
|
+
send(request, timeout) {
|
|
158
|
+
return this.httpTransport.send(request, { timeout });
|
|
159
|
+
}
|
|
160
|
+
isTokenExpired(httpResponse) {
|
|
161
|
+
return httpResponse.status === 401
|
|
162
|
+
&& httpResponse.headers.getAll('www-authenticate')[0]?.includes('expired') === true;
|
|
141
163
|
}
|
|
142
164
|
async applyResponsePlugins(context) {
|
|
143
165
|
const plugins = this.loadResponsePlugins(this.apiClientOptions.responsePlugins, context.responseContext);
|
|
@@ -168,31 +190,17 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
168
190
|
};
|
|
169
191
|
}
|
|
170
192
|
logFailedResponse(context) {
|
|
171
|
-
if (!context.response
|
|
193
|
+
if (!context.response.ok) {
|
|
172
194
|
const { apiCallParameters } = context;
|
|
173
|
-
this.apiClientOptions.logger.debug(() => `[${apiCallParameters.apiName}][${apiCallParameters.operationId}][${context.
|
|
195
|
+
this.apiClientOptions.logger.debug(() => `[${apiCallParameters.apiName}][${apiCallParameters.operationId}][${context.httpResponse.status}]\n`
|
|
174
196
|
+ `HTTP method: ${apiCallParameters.requestOptions.method}\n`
|
|
175
197
|
+ `URL: ${apiCallParameters.url}\n`
|
|
176
|
-
+ `Response Headers: ${this.formatResponseHeaders(context.
|
|
198
|
+
+ `Response Headers: ${this.formatResponseHeaders(context.httpResponse.headers)}`);
|
|
177
199
|
}
|
|
178
200
|
}
|
|
179
201
|
formatResponseHeaders(headers) {
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
}
|
|
183
|
-
return Object.entries(Object.fromEntries(headers.entries()))
|
|
184
|
-
.map(([key, value]) => {
|
|
185
|
-
if (value === undefined) {
|
|
186
|
-
return `${key}=undefined`;
|
|
187
|
-
}
|
|
188
|
-
if (value === null) {
|
|
189
|
-
return `${key}=null`;
|
|
190
|
-
}
|
|
191
|
-
if (typeof value === 'object') {
|
|
192
|
-
return `${key}=${JSON.stringify(value)}`;
|
|
193
|
-
}
|
|
194
|
-
return `${key}=${String(value)}`;
|
|
195
|
-
})
|
|
202
|
+
return [...headers.entries()]
|
|
203
|
+
.map(([key, value]) => `${key}=${String(value)}`)
|
|
196
204
|
.join(', ');
|
|
197
205
|
}
|
|
198
206
|
buildFetchError(error, errorContext) {
|
|
@@ -204,7 +212,7 @@ class ApiFetchClient extends api_client_1.ApiClient {
|
|
|
204
212
|
}
|
|
205
213
|
}
|
|
206
214
|
extractFileName(headers, extension) {
|
|
207
|
-
const contentDisposition = headers.
|
|
215
|
+
const contentDisposition = headers.getAll('content-disposition')[0];
|
|
208
216
|
let fileName = 'default-name.' + extension;
|
|
209
217
|
if (contentDisposition) {
|
|
210
218
|
// Support both quoted and unquoted filenames
|