oci-common 2.5.2 → 2.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/index.d.ts +2 -2
- package/index.js +2 -1
- package/index.js.map +1 -1
- package/lib/circuit-breaker.d.ts +2 -0
- package/lib/circuit-breaker.js +13 -2
- package/lib/circuit-breaker.js.map +1 -1
- package/lib/retrier.d.ts +6 -3
- package/lib/retrier.js +29 -5
- package/lib/retrier.js.map +1 -1
- package/package.json +1 -1
package/index.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ import { LOG } 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";
|
|
20
|
-
import { GenericRetrier, RetryConfiguration, NoRetryConfigurationDetails } from "./lib/retrier";
|
|
20
|
+
import { GenericRetrier, RetryConfiguration, NoRetryConfigurationDetails, OciSdkDefaultRetryConfiguration } from "./lib/retrier";
|
|
21
21
|
import { RequireOnlyOne, AuthParams } from "./lib/types";
|
|
22
22
|
import { HttpRequest } from "./lib/http-request";
|
|
23
23
|
import InstancePrincipalsAuthenticationDetailsProviderBuilder from "./lib/auth/instance-principals-authentication-detail-provider";
|
|
@@ -47,4 +47,4 @@ export import convertStringToType = helper.convertStringToType;
|
|
|
47
47
|
export import ObjectSerializer = serializer.ObjectSerializer;
|
|
48
48
|
export import byteLength = helper.byteLength;
|
|
49
49
|
export import Range = range.Range;
|
|
50
|
-
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, ConfigFileReader, InstancePrincipalsAuthenticationDetailsProviderBuilder, ResourcePrincipalAuthenticationDetailsProvider, LOG, GenericRetrier, FixedTimeDelayStrategy, MaxAttemptsTerminationStrategy, RetryConfiguration, NoRetryConfigurationDetails, BaseRequest, ClientConfiguration, Constants, CircuitBreaker, getChunk, utils };
|
|
50
|
+
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, ConfigFileReader, InstancePrincipalsAuthenticationDetailsProviderBuilder, ResourcePrincipalAuthenticationDetailsProvider, LOG, GenericRetrier, FixedTimeDelayStrategy, MaxAttemptsTerminationStrategy, RetryConfiguration, NoRetryConfigurationDetails, OciSdkDefaultRetryConfiguration, BaseRequest, ClientConfiguration, Constants, CircuitBreaker, getChunk, utils };
|
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.utils = exports.getChunk = exports.CircuitBreaker = exports.Constants = exports.NoRetryConfigurationDetails = exports.MaxAttemptsTerminationStrategy = exports.FixedTimeDelayStrategy = exports.GenericRetrier = exports.LOG = exports.ResourcePrincipalAuthenticationDetailsProvider = exports.InstancePrincipalsAuthenticationDetailsProviderBuilder = exports.ConfigFileReader = 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;
|
|
29
|
+
exports.utils = exports.getChunk = exports.CircuitBreaker = exports.Constants = exports.OciSdkDefaultRetryConfiguration = exports.NoRetryConfigurationDetails = exports.MaxAttemptsTerminationStrategy = exports.FixedTimeDelayStrategy = exports.GenericRetrier = exports.LOG = exports.ResourcePrincipalAuthenticationDetailsProvider = exports.InstancePrincipalsAuthenticationDetailsProviderBuilder = exports.ConfigFileReader = 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"));
|
|
@@ -58,6 +58,7 @@ Object.defineProperty(exports, "FixedTimeDelayStrategy", { enumerable: true, get
|
|
|
58
58
|
const retrier_1 = require("./lib/retrier");
|
|
59
59
|
Object.defineProperty(exports, "GenericRetrier", { enumerable: true, get: function () { return retrier_1.GenericRetrier; } });
|
|
60
60
|
Object.defineProperty(exports, "NoRetryConfigurationDetails", { enumerable: true, get: function () { return retrier_1.NoRetryConfigurationDetails; } });
|
|
61
|
+
Object.defineProperty(exports, "OciSdkDefaultRetryConfiguration", { enumerable: true, get: function () { return retrier_1.OciSdkDefaultRetryConfiguration; } });
|
|
61
62
|
const instance_principals_authentication_detail_provider_1 = __importDefault(require("./lib/auth/instance-principals-authentication-detail-provider"));
|
|
62
63
|
exports.InstancePrincipalsAuthenticationDetailsProviderBuilder = instance_principals_authentication_detail_provider_1.default;
|
|
63
64
|
const resource_principal_authentication_details_provider_1 = __importDefault(require("./lib/auth/resource-principal-authentication-details-provider"));
|
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;AA2GnC,sBAAK;AA1GP,yCAAsC;AAmEpC,uFAnEO,eAAM,OAmEP;AAlER,uCAAoC;AAmElC,sFAnEO,aAAK,OAmEP;AAlEP,6DAAyD;AAmEvD,gGAnEO,kCAAe,OAmEP;AAlEjB,mCAAgC;AA2F9B,oFA3FO,SAAG,OA2FP;AA1FL,gEAAwC;AAmGtC,oBAnGK,mBAAS,CAmGL;AAlGX,4EAAmD;AAmGjD,yBAnGK,yBAAc,CAmGL;AAjGhB,yCAUsB;AAuDpB,gHA9DA,wCAA+B,OA8DA;AAC/B,2GA9DA,mCAA0B,OA8DA;AAC1B,8FA9DA,sBAAa,OA8DA;AACb,+GA9DA,uCAA8B,OA8DA;AAsB9B,+GAlFA,uCAA8B,OAkFA;AAD9B,uGAhFA,+BAAsB,OAgFA;AA9ExB,2CAKuB;AAwErB,+FA5EA,wBAAc,OA4EA;AAId,4GA9EA,qCAA2B,OA8EA;AAC3B,gHA9EA,yCAA+B,OA8EA;AA1EjC,uJAAmI;AAkEjI,iEAlEK,4DAAsD,CAkEL;AAjExD,uJAA2H;AAkEzH,yDAlEK,4DAA8C,CAkEL;AA/DhD,iDAO0B;AA0CxB,gGAhDA,4BAAe,OAgDA;AAGf,uGAlDA,mCAAsB,OAkDA;AADtB,0GAhDA,sCAAyB,OAgDA;AAEzB,kGAjDA,8BAAiB,OAiDA;AACjB,yGAjDA,qCAAwB,OAiDA;AAJxB,4GA5CA,wCAA2B,OA4CA;AAzC7B,kEAAsF;AAmDpF,wHAnDO,0DAAuC,OAmDP;AAlDzC,4DAAqC;AAiEnC,mBAjEK,iBAAQ,CAiEL;AAhEV,iEAA4D;AAkD1D,iGAlDO,qCAAgB,OAkDP;AAjDlB,+DAAyE;AA4CvE,+FA5Ce,kCAAc,OA4Cf;AA3ChB,iEAA2D;AA6CzD,gGA7CO,oCAAe,OA6CP;AA3CH,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/circuit-breaker.d.ts
CHANGED
|
@@ -21,8 +21,10 @@ interface CircuitBreakerOptions {
|
|
|
21
21
|
export default class CircuitBreaker {
|
|
22
22
|
circuit: any;
|
|
23
23
|
noCircuit: boolean;
|
|
24
|
+
static get envVariableCheckForDefaultCircuitBreaker(): string | undefined;
|
|
24
25
|
static EnableGlobalCircuitBreaker: boolean;
|
|
25
26
|
static EnableDefaultCircuitBreaker: string | undefined;
|
|
27
|
+
static DefaultCircuitBreakerOverriden: boolean;
|
|
26
28
|
private static DefaultConfiguration;
|
|
27
29
|
static get defaultConfiguration(): CircuitBreakerOptions;
|
|
28
30
|
static set defaultConfiguration(circuitBreakerConfig: CircuitBreakerOptions);
|
package/lib/circuit-breaker.js
CHANGED
|
@@ -71,18 +71,29 @@ class CircuitBreaker {
|
|
|
71
71
|
console.log("circuit breaker is now in CLOSE state");
|
|
72
72
|
});
|
|
73
73
|
}
|
|
74
|
+
static get envVariableCheckForDefaultCircuitBreaker() {
|
|
75
|
+
if (process.env.OCI_SDK_DEFAULT_CIRCUITBREAKER_ENABLED === "true") {
|
|
76
|
+
CircuitBreaker.DefaultCircuitBreakerOverriden = true;
|
|
77
|
+
}
|
|
78
|
+
else if (process.env.OCI_SDK_DEFAULT_CIRCUITBREAKER_ENABLED === "false") {
|
|
79
|
+
CircuitBreaker.DefaultCircuitBreakerOverriden = true;
|
|
80
|
+
}
|
|
81
|
+
return process.env.OCI_SDK_DEFAULT_CIRCUITBREAKER_ENABLED;
|
|
82
|
+
}
|
|
74
83
|
static get defaultConfiguration() {
|
|
75
84
|
return CircuitBreaker.DefaultConfiguration;
|
|
76
85
|
}
|
|
77
86
|
static set defaultConfiguration(circuitBreakerConfig) {
|
|
78
87
|
CircuitBreaker.DefaultConfiguration = Object.assign(Object.assign({}, CircuitBreaker.DefaultConfiguration), circuitBreakerConfig);
|
|
88
|
+
CircuitBreaker.DefaultCircuitBreakerOverriden = true;
|
|
79
89
|
}
|
|
80
90
|
}
|
|
81
91
|
exports.default = CircuitBreaker;
|
|
82
92
|
CircuitBreaker.EnableGlobalCircuitBreaker = true; // Configuration to turn on/off the global circuit breaker.
|
|
83
|
-
CircuitBreaker.EnableDefaultCircuitBreaker =
|
|
93
|
+
CircuitBreaker.EnableDefaultCircuitBreaker = CircuitBreaker.envVariableCheckForDefaultCircuitBreaker;
|
|
94
|
+
CircuitBreaker.DefaultCircuitBreakerOverriden = false;
|
|
84
95
|
CircuitBreaker.DefaultConfiguration = {
|
|
85
|
-
timeout:
|
|
96
|
+
timeout: 600000,
|
|
86
97
|
errorThresholdPercentage: 80,
|
|
87
98
|
resetTimeout: 30000,
|
|
88
99
|
rollingCountTimeout: 120000,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"circuit-breaker.js","sourceRoot":"","sources":["../../../../lib/circuit-breaker.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;AAEH,qCAAgE;AAChE,uCAAkD;AAElD,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnC,SAAe,YAAY,CAAC,GAAgB;;QAC1C,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI;gBACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClC,IAAI,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE;oBACvE,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;iBACvB;qBAAM;oBACL,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACvC,MAAM,OAAO,GAAG,MAAM,wBAAe,CAAC,aAAa,CAAC,CAAC;oBACrD,MAAM,WAAW,GAAG,4BAAmB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;oBAChE,MAAM,CAAC;wBACL,QAAQ;wBACR,WAAW;qBACZ,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,8DAA8D;gBAC9D,MAAM,CAAC,CAAC,CAAC,CAAC;aACX;QACH,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAS,0BAA0B,CAAC,CAAM;IACxC,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;IACpD,+DAA+D;IAC/D,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,+BAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE;QACrF,OAAO,KAAK,CAAC;KACd;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAoBD,MAAqB,cAAc;
|
|
1
|
+
{"version":3,"file":"circuit-breaker.js","sourceRoot":"","sources":["../../../../lib/circuit-breaker.ts"],"names":[],"mappings":"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"}
|
package/lib/retrier.d.ts
CHANGED
|
@@ -29,18 +29,21 @@ export declare class DefaultRetryCondition {
|
|
|
29
29
|
static shouldBeRetried(error: OciError): boolean;
|
|
30
30
|
}
|
|
31
31
|
export declare const NoRetryConfigurationDetails: RetryConfigurationDetails;
|
|
32
|
+
export declare const OciSdkDefaultRetryConfiguration: RetryConfigurationDetails;
|
|
32
33
|
export declare class GenericRetrier {
|
|
33
34
|
private _retryConfiguration;
|
|
34
35
|
private _logger;
|
|
35
36
|
private static OPC_CLIENT_RETRIES_HEADER;
|
|
37
|
+
private static OCI_SDK_DEFAULT_RETRY_ENABLED;
|
|
36
38
|
constructor(retryConfiguration: RetryConfiguration);
|
|
39
|
+
static get envVariableCheckForDefaultRetry(): RetryConfiguration | null;
|
|
37
40
|
private static DefaultRetryConfiguration;
|
|
38
|
-
static get defaultRetryConfiguration(): RetryConfiguration;
|
|
39
|
-
static set defaultRetryConfiguration(retryConfig: RetryConfiguration);
|
|
41
|
+
static get defaultRetryConfiguration(): RetryConfiguration | null;
|
|
42
|
+
static set defaultRetryConfiguration(retryConfig: RetryConfiguration | null);
|
|
40
43
|
set logger(logger: Logger);
|
|
41
44
|
get backUpBinaryBody(): boolean;
|
|
42
45
|
get retryConfiguration(): RetryConfigurationDetails;
|
|
43
|
-
static createPreferredRetrier(clientRetryConfiguration?: RetryConfiguration, requestRetryConfiguration?: RetryConfiguration): GenericRetrier;
|
|
46
|
+
static createPreferredRetrier(clientRetryConfiguration?: RetryConfiguration, requestRetryConfiguration?: RetryConfiguration, specRetryConfiguration?: RetryConfiguration): GenericRetrier;
|
|
44
47
|
makeServiceCall(httpClient: HttpClient, request: HttpRequest, excludeBody?: boolean): Promise<Response>;
|
|
45
48
|
private static refreshRequest;
|
|
46
49
|
private addOpcClientRetryHeader;
|
package/lib/retrier.js
CHANGED
|
@@ -13,10 +13,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
});
|
|
14
14
|
};
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.GenericRetrier = exports.NoRetryConfigurationDetails = exports.DefaultRetryCondition = void 0;
|
|
16
|
+
exports.GenericRetrier = exports.OciSdkDefaultRetryConfiguration = exports.NoRetryConfigurationDetails = exports.DefaultRetryCondition = void 0;
|
|
17
17
|
const waiter_1 = require("./waiter");
|
|
18
18
|
const helper_1 = require("./helper");
|
|
19
19
|
const __1 = require("..");
|
|
20
|
+
const constants_1 = require("./constants");
|
|
20
21
|
class DefaultRetryCondition {
|
|
21
22
|
static shouldBeRetried(error) {
|
|
22
23
|
return (error.statusCode === 500 ||
|
|
@@ -40,18 +41,36 @@ DefaultRetryCondition.RETRYABLE_SERVICE_ERRORS = new Map([
|
|
|
40
41
|
]);
|
|
41
42
|
const NO_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS = 1;
|
|
42
43
|
const NO_RETRY_MAXIMUM_DELAY_IN_SECONDS = 30;
|
|
44
|
+
const OCI_SDK_DEFAULT_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS = 8;
|
|
45
|
+
const OCI_SDK_DEFAULT_RETRY_MAXIMUM_DELAY_IN_SECONDS = 30;
|
|
43
46
|
exports.NoRetryConfigurationDetails = {
|
|
44
47
|
terminationStrategy: new waiter_1.MaxAttemptsTerminationStrategy(NO_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS),
|
|
45
48
|
delayStrategy: new waiter_1.ExponentialBackoffDelayStrategyWithJitter(NO_RETRY_MAXIMUM_DELAY_IN_SECONDS),
|
|
46
49
|
retryCondition: DefaultRetryCondition.shouldBeRetried,
|
|
47
50
|
backupBinaryBody: false
|
|
48
51
|
};
|
|
52
|
+
exports.OciSdkDefaultRetryConfiguration = {
|
|
53
|
+
terminationStrategy: new waiter_1.MaxAttemptsTerminationStrategy(OCI_SDK_DEFAULT_RETRY_MAXIMUM_NUMBER_OF_ATTEMPTS),
|
|
54
|
+
delayStrategy: new waiter_1.ExponentialBackoffDelayStrategyWithJitter(OCI_SDK_DEFAULT_RETRY_MAXIMUM_DELAY_IN_SECONDS),
|
|
55
|
+
retryCondition: DefaultRetryCondition.shouldBeRetried,
|
|
56
|
+
backupBinaryBody: false
|
|
57
|
+
};
|
|
49
58
|
class GenericRetrier {
|
|
50
59
|
constructor(retryConfiguration) {
|
|
51
60
|
this._logger = undefined;
|
|
52
61
|
const preferredRetryConfig = Object.assign(Object.assign({}, exports.NoRetryConfigurationDetails), retryConfiguration);
|
|
53
62
|
this._retryConfiguration = preferredRetryConfig;
|
|
54
63
|
}
|
|
64
|
+
static get envVariableCheckForDefaultRetry() {
|
|
65
|
+
if (process.env[GenericRetrier.OCI_SDK_DEFAULT_RETRY_ENABLED] === constants_1.BooleanString.FALSE) {
|
|
66
|
+
return exports.NoRetryConfigurationDetails;
|
|
67
|
+
}
|
|
68
|
+
else if (process.env[GenericRetrier.OCI_SDK_DEFAULT_RETRY_ENABLED] === constants_1.BooleanString.TRUE) {
|
|
69
|
+
return exports.OciSdkDefaultRetryConfiguration;
|
|
70
|
+
}
|
|
71
|
+
else
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
55
74
|
static get defaultRetryConfiguration() {
|
|
56
75
|
return GenericRetrier.DefaultRetryConfiguration;
|
|
57
76
|
}
|
|
@@ -67,9 +86,13 @@ class GenericRetrier {
|
|
|
67
86
|
get retryConfiguration() {
|
|
68
87
|
return this._retryConfiguration;
|
|
69
88
|
}
|
|
70
|
-
static createPreferredRetrier(clientRetryConfiguration, requestRetryConfiguration) {
|
|
71
|
-
let retryConfigToUse = [
|
|
72
|
-
|
|
89
|
+
static createPreferredRetrier(clientRetryConfiguration, requestRetryConfiguration, specRetryConfiguration) {
|
|
90
|
+
let retryConfigToUse = [
|
|
91
|
+
requestRetryConfiguration,
|
|
92
|
+
clientRetryConfiguration,
|
|
93
|
+
GenericRetrier.defaultRetryConfiguration
|
|
94
|
+
].filter(configuration => configuration !== null && configuration !== undefined)[0];
|
|
95
|
+
retryConfigToUse = Object.assign(Object.assign({}, specRetryConfiguration), retryConfigToUse);
|
|
73
96
|
return new GenericRetrier(retryConfigToUse);
|
|
74
97
|
}
|
|
75
98
|
makeServiceCall(httpClient, request, excludeBody) {
|
|
@@ -148,5 +171,6 @@ class GenericRetrier {
|
|
|
148
171
|
}
|
|
149
172
|
exports.GenericRetrier = GenericRetrier;
|
|
150
173
|
GenericRetrier.OPC_CLIENT_RETRIES_HEADER = "opc-client-retries";
|
|
151
|
-
GenericRetrier.
|
|
174
|
+
GenericRetrier.OCI_SDK_DEFAULT_RETRY_ENABLED = "OCI_SDK_DEFAULT_RETRY_ENABLED";
|
|
175
|
+
GenericRetrier.DefaultRetryConfiguration = GenericRetrier.envVariableCheckForDefaultRetry;
|
|
152
176
|
//# sourceMappingURL=retrier.js.map
|
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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"}
|