oci-common 2.78.0 → 2.79.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/index.d.ts +2 -2
- package/index.js +2 -2
- package/index.js.map +1 -1
- package/lib/endpoint-builder.js +3 -2
- package/lib/endpoint-builder.js.map +1 -1
- package/lib/log.d.ts +14 -6
- package/lib/log.js +56 -12
- package/lib/log.js.map +1 -1
- package/lib/retrier.d.ts +0 -4
- package/lib/retrier.js +16 -25
- package/lib/retrier.js.map +1 -1
- package/package.json +1 -1
package/index.d.ts
CHANGED
|
@@ -13,7 +13,7 @@ import * as utils from "./lib/utils";
|
|
|
13
13
|
import { Region } from "./lib/region";
|
|
14
14
|
import { Realm } from "./lib/realm";
|
|
15
15
|
import { EndpointBuilder } from "./lib/endpoint-builder";
|
|
16
|
-
import {
|
|
16
|
+
import { logger } from "./lib/log";
|
|
17
17
|
import Constants from "./lib/constants";
|
|
18
18
|
import CircuitBreaker from "./lib/circuit-breaker";
|
|
19
19
|
import { DelayStrategy, TerminationStrategy, ExponentialBackoffDelayStrategy, MaxTimeTerminationStrategy, genericWaiter, genericTerminalConditionWaiter, WaiterConfiguration, MaxAttemptsTerminationStrategy, FixedTimeDelayStrategy } from "./lib/waiter";
|
|
@@ -50,4 +50,4 @@ export import convertStringToType = helper.convertStringToType;
|
|
|
50
50
|
export import ObjectSerializer = serializer.ObjectSerializer;
|
|
51
51
|
export import byteLength = helper.byteLength;
|
|
52
52
|
export import Range = range.Range;
|
|
53
|
-
export { Region, Realm, EndpointBuilder, DelayStrategy, TerminationStrategy, ExponentialBackoffDelayStrategy, MaxTimeTerminationStrategy, genericWaiter, genericTerminalConditionWaiter, WaiterConfiguration, RequireOnlyOne, AuthParams, paginateRecords, paginatedResponsesWithLimit, paginatedRecordsWithLimit, genericPaginateRecords, paginateResponses, genericPaginateResponses, Method, composeRequest, Params, composeResponse, HttpRequest, ConfigFileAuthenticationDetailsProvider, SessionAuthDetailProvider, ConfigFileReader, InstancePrincipalsAuthenticationDetailsProviderBuilder, ResourcePrincipalAuthenticationDetailsProvider,
|
|
53
|
+
export { Region, Realm, EndpointBuilder, DelayStrategy, TerminationStrategy, ExponentialBackoffDelayStrategy, MaxTimeTerminationStrategy, genericWaiter, genericTerminalConditionWaiter, WaiterConfiguration, RequireOnlyOne, AuthParams, paginateRecords, paginatedResponsesWithLimit, paginatedRecordsWithLimit, genericPaginateRecords, paginateResponses, genericPaginateResponses, Method, composeRequest, Params, composeResponse, HttpRequest, ConfigFileAuthenticationDetailsProvider, SessionAuthDetailProvider, ConfigFileReader, InstancePrincipalsAuthenticationDetailsProviderBuilder, ResourcePrincipalAuthenticationDetailsProvider, GenericRetrier, FixedTimeDelayStrategy, MaxAttemptsTerminationStrategy, RetryConfiguration, NoRetryConfigurationDetails, OciSdkDefaultRetryConfiguration, BaseRequest, ClientConfiguration, Constants, CircuitBreaker, getChunk, utils, OkeWorkloadIdentityAuthenticationDetailsProvider, developerToolConfiguration, logger };
|
package/index.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.developerToolConfiguration = exports.OkeWorkloadIdentityAuthenticationDetailsProvider = exports.utils = exports.getChunk = exports.CircuitBreaker = exports.Constants = exports.OciSdkDefaultRetryConfiguration = exports.NoRetryConfigurationDetails = exports.MaxAttemptsTerminationStrategy = exports.FixedTimeDelayStrategy = exports.GenericRetrier = exports.
|
|
29
|
+
exports.logger = exports.developerToolConfiguration = exports.OkeWorkloadIdentityAuthenticationDetailsProvider = exports.utils = exports.getChunk = exports.CircuitBreaker = exports.Constants = exports.OciSdkDefaultRetryConfiguration = exports.NoRetryConfigurationDetails = exports.MaxAttemptsTerminationStrategy = exports.FixedTimeDelayStrategy = exports.GenericRetrier = exports.ResourcePrincipalAuthenticationDetailsProvider = exports.InstancePrincipalsAuthenticationDetailsProviderBuilder = exports.ConfigFileReader = exports.SessionAuthDetailProvider = exports.ConfigFileAuthenticationDetailsProvider = exports.composeResponse = exports.composeRequest = exports.genericPaginateResponses = exports.paginateResponses = exports.genericPaginateRecords = exports.paginatedRecordsWithLimit = exports.paginatedResponsesWithLimit = exports.paginateRecords = exports.genericTerminalConditionWaiter = exports.genericWaiter = exports.MaxTimeTerminationStrategy = exports.ExponentialBackoffDelayStrategy = exports.EndpointBuilder = exports.Realm = exports.Region = exports.Range = exports.byteLength = exports.ObjectSerializer = exports.convertStringToType = exports.handleErrorBody = exports.mapContainer = exports.handleErrorResponse = exports.getStringFromResponseBody = exports.DefaultRequestSigner = exports.OciError = exports.FetchHttpClient = exports.isRegionProvider = exports.SimpleAuthenticationDetailsProvider = void 0;
|
|
30
30
|
const auth = __importStar(require("./lib/auth/auth"));
|
|
31
31
|
const error = __importStar(require("./lib/error"));
|
|
32
32
|
const signer = __importStar(require("./lib/signer"));
|
|
@@ -43,7 +43,7 @@ Object.defineProperty(exports, "Realm", { enumerable: true, get: function () { r
|
|
|
43
43
|
const endpoint_builder_1 = require("./lib/endpoint-builder");
|
|
44
44
|
Object.defineProperty(exports, "EndpointBuilder", { enumerable: true, get: function () { return endpoint_builder_1.EndpointBuilder; } });
|
|
45
45
|
const log_1 = require("./lib/log");
|
|
46
|
-
Object.defineProperty(exports, "
|
|
46
|
+
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return log_1.logger; } });
|
|
47
47
|
const constants_1 = __importDefault(require("./lib/constants"));
|
|
48
48
|
exports.Constants = constants_1.default;
|
|
49
49
|
const circuit_breaker_1 = __importDefault(require("./lib/circuit-breaker"));
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,sDAAwC;AACxC,mDAAqC;AACrC,qDAAuC;AACvC,qDAAuC;AACvC,iDAAmC;AACnC,oEAAsD;AACtD,mDAAqC;AACrC,mDAAqC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,sDAAwC;AACxC,mDAAqC;AACrC,qDAAuC;AACvC,qDAAuC;AACvC,iDAAmC;AACnC,oEAAsD;AACtD,mDAAqC;AACrC,mDAAqC;AA+GnC,sBAAK;AA9GP,yCAAsC;AAuEpC,uFAvEO,eAAM,OAuEP;AAtER,uCAAoC;AAuElC,sFAvEO,aAAK,OAuEP;AAtEP,6DAAyD;AAuEvD,gGAvEO,kCAAe,OAuEP;AAtEjB,mCAAmC;AA8GjC,uFA9GO,YAAM,OA8GP;AA7GR,gEAAwC;AAuGtC,oBAvGK,mBAAS,CAuGL;AAtGX,4EAAmD;AAuGjD,yBAvGK,yBAAc,CAuGL;AArGhB,yCAUsB;AA2DpB,gHAlEA,wCAA+B,OAkEA;AAC/B,2GAlEA,mCAA0B,OAkEA;AAC1B,8FAlEA,sBAAa,OAkEA;AACb,+GAlEA,uCAA8B,OAkEA;AAsB9B,+GAtFA,uCAA8B,OAsFA;AAD9B,uGApFA,+BAAsB,OAoFA;AAlFxB,2CAKuB;AA4ErB,+FAhFA,wBAAc,OAgFA;AAId,4GAlFA,qCAA2B,OAkFA;AAC3B,gHAlFA,yCAA+B,OAkFA;AA9EjC,uJAAmI;AAuEjI,iEAvEK,4DAAsD,CAuEL;AAtExD,uJAA2H;AAuEzH,yDAvEK,4DAA8C,CAuEL;AAtEhD,6JAAgI;AAmF9H,2DAnFK,+DAAgD,CAmFL;AAhFlD,iDAO0B;AA6CxB,gGAnDA,4BAAe,OAmDA;AAGf,uGArDA,mCAAsB,OAqDA;AADtB,0GAnDA,sCAAyB,OAmDA;AAEzB,kGApDA,8BAAiB,OAoDA;AACjB,yGApDA,qCAAwB,OAoDA;AAJxB,4GA/CA,wCAA2B,OA+CA;AA5C7B,kEAAsF;AAsDpF,wHAtDO,0DAAuC,OAsDP;AArDzC,4FAAqF;AAsDnF,0GAtDO,yDAAyB,OAsDP;AArD3B,4DAAqC;AAmEnC,mBAnEK,iBAAQ,CAmEL;AAlEV,iEAA4D;AAqD1D,iGArDO,qCAAgB,OAqDP;AApDlB,+DAAyE;AA8CvE,+FA9Ce,kCAAc,OA8Cf;AA7ChB,iEAA2D;AA+CzD,gGA/CO,oCAAe,OA+CP;AA9CjB,6FAA+E;AAkE7E,gEAA0B;AAhEd,QAAA,mCAAmC,GAAG,IAAI,CAAC,mCAAmC,CAAC;AAE/E,QAAA,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;AAGzC,QAAA,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;AAEvC,QAAA,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;AAG1B,QAAA,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC;AAEnD,QAAA,yBAAyB,GAAG,MAAM,CAAC,yBAAyB,CAAC;AAC7D,QAAA,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;AACjD,QAAA,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;AACnC,QAAA,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;AACzC,QAAA,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAC;AACjD,QAAA,gBAAgB,GAAG,UAAU,CAAC,gBAAgB,CAAC;AAC/C,QAAA,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;AAE/B,QAAA,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC"}
|
package/lib/endpoint-builder.js
CHANGED
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.EndpointBuilder = void 0;
|
|
8
8
|
const region_1 = require("./region");
|
|
9
9
|
const realm_1 = require("./realm");
|
|
10
|
+
const log_1 = require("./log");
|
|
10
11
|
class EndpointBuilder {
|
|
11
12
|
static createEndpointFromRegion(template, region, endpointServiceName, serviceEndpointTemplatePerRealm, useRealmSpecificEndpointTemplate) {
|
|
12
13
|
const regionId = region.regionId;
|
|
@@ -35,11 +36,11 @@ class EndpointBuilder {
|
|
|
35
36
|
const realmId = realm.realmId.toLowerCase();
|
|
36
37
|
if (serviceEndpointTemplatePerRealm) {
|
|
37
38
|
if (serviceEndpointTemplatePerRealm[realmId]) {
|
|
38
|
-
|
|
39
|
+
log_1.logger.info(`Using ${serviceEndpointTemplatePerRealm[realmId]} as the realm specific endpoint template`);
|
|
39
40
|
return serviceEndpointTemplatePerRealm[realmId];
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
|
-
|
|
43
|
+
log_1.logger.info(`Realm specific endpoint template for realm ${realmId} does not exist. Falling back to endpoint template : ${defaultTemplate}`);
|
|
43
44
|
return defaultTemplate;
|
|
44
45
|
}
|
|
45
46
|
static createEndpointFromRegionId(template, regionId, endpointServiceName, serviceEndpointTemplatePerRealm, useRealmSpecificEndpointTemplate) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"endpoint-builder.js","sourceRoot":"","sources":["../../../../lib/endpoint-builder.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,qCAAkC;AAClC,mCAAgC;
|
|
1
|
+
{"version":3,"file":"endpoint-builder.js","sourceRoot":"","sources":["../../../../lib/endpoint-builder.ts"],"names":[],"mappings":"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"}
|
package/lib/log.d.ts
CHANGED
|
@@ -2,17 +2,25 @@
|
|
|
2
2
|
* Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
|
|
3
3
|
* This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
|
|
4
4
|
*/
|
|
5
|
-
/**
|
|
6
|
-
* An interface defines the logger related APIs.
|
|
7
|
-
*/
|
|
8
5
|
export interface Logger {
|
|
9
|
-
|
|
6
|
+
log(message?: any, ...optionalParams: any[]): void;
|
|
10
7
|
debug(message?: any, ...optionalParams: any[]): void;
|
|
11
8
|
info(message?: any, ...optionalParams: any[]): void;
|
|
12
9
|
warn(message?: any, ...optionalParams: any[]): void;
|
|
13
10
|
error(message?: any, ...optionalParams: any[]): void;
|
|
14
11
|
trace(message?: any, ...optionalParams: any[]): void;
|
|
15
12
|
}
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
declare class DefaultSdkLogger implements Logger {
|
|
14
|
+
private static instance;
|
|
15
|
+
private _logger;
|
|
16
|
+
private constructor();
|
|
17
|
+
static getInstance(): DefaultSdkLogger;
|
|
18
|
+
log(message: string): void;
|
|
19
|
+
debug(message: string): void;
|
|
20
|
+
info(message: string): void;
|
|
21
|
+
warn(message: string): void;
|
|
22
|
+
error(message: string): void;
|
|
23
|
+
trace(message: string): void;
|
|
18
24
|
}
|
|
25
|
+
export declare const logger: DefaultSdkLogger;
|
|
26
|
+
export {};
|
package/lib/log.js
CHANGED
|
@@ -3,18 +3,62 @@
|
|
|
3
3
|
* Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
|
|
4
4
|
* This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
|
|
5
5
|
*/
|
|
6
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
7
|
+
if (k2 === undefined) k2 = k;
|
|
8
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
6
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
26
|
+
exports.logger = void 0;
|
|
27
|
+
/**
|
|
28
|
+
* An interface defines the logger related APIs.
|
|
29
|
+
*/
|
|
30
|
+
const bunyan = __importStar(require("bunyan"));
|
|
31
|
+
class DefaultSdkLogger {
|
|
32
|
+
constructor() {
|
|
33
|
+
const useBunyan = process.env.USE_BUNYAN === "true";
|
|
34
|
+
this._logger = useBunyan
|
|
35
|
+
? bunyan.createLogger({ name: "OCI TypeScript SDK default logger", level: "info" })
|
|
36
|
+
: console;
|
|
37
|
+
}
|
|
38
|
+
static getInstance() {
|
|
39
|
+
if (!DefaultSdkLogger.instance) {
|
|
40
|
+
DefaultSdkLogger.instance = new DefaultSdkLogger();
|
|
17
41
|
}
|
|
18
|
-
|
|
19
|
-
}
|
|
42
|
+
return DefaultSdkLogger.instance;
|
|
43
|
+
}
|
|
44
|
+
log(message) {
|
|
45
|
+
console.log(message);
|
|
46
|
+
}
|
|
47
|
+
debug(message) {
|
|
48
|
+
this._logger.debug(message);
|
|
49
|
+
}
|
|
50
|
+
info(message) {
|
|
51
|
+
this._logger.info(message);
|
|
52
|
+
}
|
|
53
|
+
warn(message) {
|
|
54
|
+
this._logger.warn(message);
|
|
55
|
+
}
|
|
56
|
+
error(message) {
|
|
57
|
+
this._logger.error(message);
|
|
58
|
+
}
|
|
59
|
+
trace(message) {
|
|
60
|
+
this._logger.trace(message);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
exports.logger = DefaultSdkLogger.getInstance();
|
|
20
64
|
//# sourceMappingURL=log.js.map
|
package/lib/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../lib/log.ts"],"names":[],"mappings":";AAAA;;;GAGG
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../../lib/log.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;AAEH;;GAEG;AAEH,+CAAiC;AAWjC,MAAM,gBAAgB;IAIpB;QACE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,CAAC;QACpD,IAAI,CAAC,OAAO,GAAG,SAAS;YACtB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,mCAAmC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YACnF,CAAC,CAAC,OAAO,CAAC;IACd,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YAC9B,gBAAgB,CAAC,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;SACpD;QACD,OAAO,gBAAgB,CAAC,QAAQ,CAAC;IACnC,CAAC;IAED,GAAG,CAAC,OAAe;QACjB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,CAAC,OAAe;QAClB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IACD,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,KAAK,CAAC,OAAe;QACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;CACF;AAEY,QAAA,MAAM,GAAG,gBAAgB,CAAC,WAAW,EAAE,CAAC"}
|
package/lib/retrier.d.ts
CHANGED
|
@@ -6,7 +6,6 @@ import { WaiterConfigurationDetails } from "./waiter";
|
|
|
6
6
|
import { HttpClient } from "./http";
|
|
7
7
|
import { HttpRequest } from "./http-request";
|
|
8
8
|
import { OciError } from "..";
|
|
9
|
-
import { Logger } from "./log";
|
|
10
9
|
/**
|
|
11
10
|
* This class implements the retrier
|
|
12
11
|
* NOTE : Retries are not supported for requests that have binary or stream bodies
|
|
@@ -32,7 +31,6 @@ export declare const NoRetryConfigurationDetails: RetryConfigurationDetails;
|
|
|
32
31
|
export declare const OciSdkDefaultRetryConfiguration: RetryConfigurationDetails;
|
|
33
32
|
export declare class GenericRetrier {
|
|
34
33
|
private _retryConfiguration;
|
|
35
|
-
private _logger;
|
|
36
34
|
private static OPC_CLIENT_RETRIES_HEADER;
|
|
37
35
|
private static OCI_SDK_DEFAULT_RETRY_ENABLED;
|
|
38
36
|
constructor(retryConfiguration: RetryConfiguration);
|
|
@@ -40,8 +38,6 @@ export declare class GenericRetrier {
|
|
|
40
38
|
private static DefaultRetryConfiguration;
|
|
41
39
|
static get defaultRetryConfiguration(): RetryConfiguration | null;
|
|
42
40
|
static set defaultRetryConfiguration(retryConfig: RetryConfiguration | null);
|
|
43
|
-
set logger(logger: Logger);
|
|
44
|
-
get logger(): Logger;
|
|
45
41
|
get backUpBinaryBody(): boolean;
|
|
46
42
|
get retryConfiguration(): RetryConfigurationDetails;
|
|
47
43
|
static createPreferredRetrier(clientRetryConfiguration?: RetryConfiguration, requestRetryConfiguration?: RetryConfiguration, specRetryConfiguration?: RetryConfiguration): GenericRetrier;
|
package/lib/retrier.js
CHANGED
|
@@ -17,6 +17,7 @@ exports.GenericRetrier = exports.OciSdkDefaultRetryConfiguration = exports.NoRet
|
|
|
17
17
|
const waiter_1 = require("./waiter");
|
|
18
18
|
const helper_1 = require("./helper");
|
|
19
19
|
const __1 = require("..");
|
|
20
|
+
const log_1 = require("./log");
|
|
20
21
|
const constants_1 = require("./constants");
|
|
21
22
|
const TROUBLESHOOT_URL = "https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdk_troubleshooting.htm";
|
|
22
23
|
class DefaultRetryCondition {
|
|
@@ -44,6 +45,8 @@ const NO_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS = 1;
|
|
|
44
45
|
const NO_RETRY_MAXIMUM_DELAY_IN_SECONDS = 30;
|
|
45
46
|
const OCI_SDK_DEFAULT_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS = 8;
|
|
46
47
|
const OCI_SDK_DEFAULT_RETRY_MAXIMUM_DELAY_IN_SECONDS = 30;
|
|
48
|
+
const CONTENT_TYPE_HEADER = "content-type";
|
|
49
|
+
const SERVER_SIDE_EVENT_TEXT_STREAM = "text/event-stream";
|
|
47
50
|
exports.NoRetryConfigurationDetails = {
|
|
48
51
|
terminationStrategy: new waiter_1.MaxAttemptsTerminationStrategy(NO_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS),
|
|
49
52
|
delayStrategy: new waiter_1.ExponentialBackoffDelayStrategyWithJitter(NO_RETRY_MAXIMUM_DELAY_IN_SECONDS),
|
|
@@ -58,7 +61,6 @@ exports.OciSdkDefaultRetryConfiguration = {
|
|
|
58
61
|
};
|
|
59
62
|
class GenericRetrier {
|
|
60
63
|
constructor(retryConfiguration) {
|
|
61
|
-
this._logger = undefined;
|
|
62
64
|
const preferredRetryConfig = Object.assign(Object.assign({}, exports.NoRetryConfigurationDetails), retryConfiguration);
|
|
63
65
|
this._retryConfiguration = preferredRetryConfig;
|
|
64
66
|
}
|
|
@@ -78,12 +80,6 @@ class GenericRetrier {
|
|
|
78
80
|
static set defaultRetryConfiguration(retryConfig) {
|
|
79
81
|
GenericRetrier.DefaultRetryConfiguration = Object.assign(Object.assign({}, GenericRetrier.DefaultRetryConfiguration), retryConfig);
|
|
80
82
|
}
|
|
81
|
-
set logger(logger) {
|
|
82
|
-
this._logger = logger;
|
|
83
|
-
}
|
|
84
|
-
get logger() {
|
|
85
|
-
return this._logger;
|
|
86
|
-
}
|
|
87
83
|
get backUpBinaryBody() {
|
|
88
84
|
return this.retryConfiguration.backupBinaryBody;
|
|
89
85
|
}
|
|
@@ -116,19 +112,20 @@ class GenericRetrier {
|
|
|
116
112
|
if (configuration.terminationStrategy && configuration.terminationStrategy.maxAttempts) {
|
|
117
113
|
maxAttempts = configuration.terminationStrategy.maxAttempts;
|
|
118
114
|
}
|
|
119
|
-
|
|
120
|
-
this.logger.debug(`Retry policy to use: MaximumNumberAttempts=${maxAttempts}, MaxSleepBetween=${maxDelayInSeconds}, ExponentialBackoffBase=2`);
|
|
121
|
-
}
|
|
115
|
+
log_1.logger.debug(`Retry policy to use: MaximumNumberAttempts=${maxAttempts}, MaxSleepBetween=${maxDelayInSeconds}, ExponentialBackoffBase=2`);
|
|
122
116
|
while (true) {
|
|
123
117
|
try {
|
|
124
118
|
this.addOpcClientRetryHeader(request);
|
|
125
119
|
const response = yield httpClient.send(request, excludeBody, targetService, operationName, timestamp.toISOString(), endpoint, apiReferenceLink);
|
|
126
|
-
if (response.
|
|
120
|
+
if (response.headers &&
|
|
121
|
+
response.headers.get(CONTENT_TYPE_HEADER) === SERVER_SIDE_EVENT_TEXT_STREAM) {
|
|
122
|
+
shouldBeRetried = false;
|
|
123
|
+
lastKnownError = new Error("streaming mode is currently not supported. Please use non-streaming mode for this API instead");
|
|
124
|
+
}
|
|
125
|
+
else if (response.status && response.status >= 200 && response.status <= 299) {
|
|
127
126
|
const currentTime = new Date().getTime();
|
|
128
127
|
const timeElapsed = currentTime - timestamp.getTime();
|
|
129
|
-
|
|
130
|
-
this.logger.debug(`Total Latency for this API call is: ${timeElapsed} ms`);
|
|
131
|
-
}
|
|
128
|
+
log_1.logger.debug(`Total Latency for this API call is: ${timeElapsed} ms`);
|
|
132
129
|
return response;
|
|
133
130
|
}
|
|
134
131
|
else if (response.code === "EOPENBREAKER") {
|
|
@@ -159,17 +156,13 @@ class GenericRetrier {
|
|
|
159
156
|
let timeElapsed = currentTime - timestamp.getTime();
|
|
160
157
|
if (!shouldBeRetried || !GenericRetrier.isRequestRetryable(request)) {
|
|
161
158
|
console.warn(`Request cannot be retried. Not Retrying. Exception occurred : ${lastKnownError}`);
|
|
162
|
-
|
|
163
|
-
this.logger.debug(`Total Latency for this API call is: ${timeElapsed} ms`);
|
|
164
|
-
}
|
|
159
|
+
log_1.logger.debug(`Total Latency for this API call is: ${timeElapsed} ms`);
|
|
165
160
|
throw lastKnownError;
|
|
166
161
|
}
|
|
167
162
|
else if (this.retryConfiguration.terminationStrategy.shouldTerminate(waitContext)) {
|
|
168
163
|
console.warn(`All retry attempts have exhausted. Total Attempts : ${waitContext.attemptCount +
|
|
169
164
|
1}. Last exception occurred : ${lastKnownError}`);
|
|
170
|
-
|
|
171
|
-
this.logger.debug(`Total Latency for this API call is: ${timeElapsed} ms`);
|
|
172
|
-
}
|
|
165
|
+
log_1.logger.debug(`Total Latency for this API call is: ${timeElapsed} ms`);
|
|
173
166
|
throw lastKnownError;
|
|
174
167
|
}
|
|
175
168
|
const delayTime = this.retryConfiguration.delayStrategy.delay(waitContext);
|
|
@@ -178,11 +171,9 @@ class GenericRetrier {
|
|
|
178
171
|
yield waiter_1.delay(delayTime);
|
|
179
172
|
GenericRetrier.refreshRequest(request);
|
|
180
173
|
attempt += 1;
|
|
181
|
-
|
|
182
|
-
lastKnownError
|
|
183
|
-
|
|
184
|
-
: this.logger.debug(`Code: ${lastKnownError.code}, Message: ${lastKnownError.message}, Attempt: ${attempt}`);
|
|
185
|
-
}
|
|
174
|
+
lastKnownError instanceof __1.OciError
|
|
175
|
+
? log_1.logger.debug(`Http Status Code: ${lastKnownError.statusCode}, Error Code: ${lastKnownError.serviceCode}, Attempt: ${attempt}`)
|
|
176
|
+
: log_1.logger.debug(`Code: ${lastKnownError.code}, Message: ${lastKnownError.message}, Attempt: ${attempt}`);
|
|
186
177
|
}
|
|
187
178
|
});
|
|
188
179
|
}
|
package/lib/retrier.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrier.js","sourceRoot":"","sources":["../../../../lib/retrier.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;AAGH,qCAOkB;AAIlB,qCAAgE;AAChE,0BAA8B;
|
|
1
|
+
{"version":3,"file":"retrier.js","sourceRoot":"","sources":["../../../../lib/retrier.ts"],"names":[],"mappings":"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"}
|