oci-common 2.20.0 → 2.24.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/lib/circuit-breaker.js +2 -2
- package/lib/circuit-breaker.js.map +1 -1
- package/lib/client-configuration.d.ts +4 -1
- package/lib/http.d.ts +4 -1
- package/lib/http.js +24 -21
- package/lib/http.js.map +1 -1
- package/package.json +1 -1
package/lib/circuit-breaker.js
CHANGED
|
@@ -16,11 +16,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
const helper_1 = require("./helper");
|
|
17
17
|
const retrier_1 = require("./retrier");
|
|
18
18
|
const Breaker = require("opossum");
|
|
19
|
-
function FetchWrapper(req) {
|
|
19
|
+
function FetchWrapper(req, options) {
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
|
22
22
|
try {
|
|
23
|
-
const response = yield fetch(req);
|
|
23
|
+
const response = yield fetch(req, options);
|
|
24
24
|
if (response.status && response.status >= 200 && response.status <= 299) {
|
|
25
25
|
resolve({ response });
|
|
26
26
|
}
|
|
@@ -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;;
|
|
1
|
+
{"version":3,"file":"circuit-breaker.js","sourceRoot":"","sources":["../../../../lib/circuit-breaker.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,9 @@ export interface ClientConfiguration {
|
|
|
14
14
|
* this also affects UploadManager operations
|
|
15
15
|
* For all requests with binary/stream bodies, retry attempts will not be made
|
|
16
16
|
*/
|
|
17
|
-
|
|
17
|
+
retryConfiguration?: RetryConfiguration;
|
|
18
18
|
circuitBreaker?: CircuitBreaker;
|
|
19
|
+
httpOptions?: {
|
|
20
|
+
[key: string]: any;
|
|
21
|
+
};
|
|
19
22
|
}
|
package/lib/http.d.ts
CHANGED
|
@@ -12,7 +12,10 @@ export interface HttpClient {
|
|
|
12
12
|
export declare class FetchHttpClient implements HttpClient {
|
|
13
13
|
private readonly signer;
|
|
14
14
|
private circuitBreaker;
|
|
15
|
-
|
|
15
|
+
private httpOptions;
|
|
16
|
+
constructor(signer: RequestSigner | null, circuitBreaker?: typeof Breaker, httpOptions?: {
|
|
17
|
+
[key: string]: any;
|
|
18
|
+
} | undefined);
|
|
16
19
|
send(req: HttpRequest, forceExcludeBody?: boolean): Promise<Response>;
|
|
17
20
|
}
|
|
18
21
|
export {};
|
package/lib/http.js
CHANGED
|
@@ -39,12 +39,15 @@ const helper_1 = require("./helper");
|
|
|
39
39
|
const Breaker = require("opossum");
|
|
40
40
|
promise.polyfill();
|
|
41
41
|
class FetchHttpClient {
|
|
42
|
-
constructor(signer, circuitBreaker) {
|
|
42
|
+
constructor(signer, circuitBreaker, httpOptions) {
|
|
43
43
|
this.signer = signer;
|
|
44
44
|
this.circuitBreaker = null;
|
|
45
|
+
this.httpOptions = undefined;
|
|
45
46
|
if (circuitBreaker) {
|
|
46
47
|
this.circuitBreaker = circuitBreaker;
|
|
47
48
|
}
|
|
49
|
+
if (httpOptions)
|
|
50
|
+
this.httpOptions = httpOptions;
|
|
48
51
|
}
|
|
49
52
|
send(req, forceExcludeBody = false) {
|
|
50
53
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -64,29 +67,29 @@ class FetchHttpClient {
|
|
|
64
67
|
headers: req.headers,
|
|
65
68
|
body: body.requestBody
|
|
66
69
|
});
|
|
70
|
+
// Need to convert to type RequestInit for Fetch() type compatibility
|
|
71
|
+
let options = this.httpOptions;
|
|
67
72
|
if (this.circuitBreaker) {
|
|
68
|
-
return
|
|
69
|
-
.fire(request)
|
|
70
|
-
.
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
73
|
+
return options
|
|
74
|
+
? this.circuitBreaker.fire(request, options)
|
|
75
|
+
: this.circuitBreaker
|
|
76
|
+
.fire(request)
|
|
77
|
+
.then((e) => {
|
|
78
|
+
return e.response ? e.response : e;
|
|
79
|
+
})
|
|
80
|
+
.catch((e) => {
|
|
81
|
+
if (e.response) {
|
|
82
|
+
// If error contains response field, it is an actual server error, return it.
|
|
83
|
+
return e.response;
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
// These are client side error. Throw exception.
|
|
87
|
+
throw e;
|
|
88
|
+
}
|
|
89
|
+
});
|
|
83
90
|
}
|
|
84
91
|
else {
|
|
85
|
-
return fetch(
|
|
86
|
-
method: req.method,
|
|
87
|
-
headers: req.headers,
|
|
88
|
-
body: body.requestBody
|
|
89
|
-
}));
|
|
92
|
+
return options ? fetch(request, options) : fetch(request);
|
|
90
93
|
}
|
|
91
94
|
});
|
|
92
95
|
}
|
package/lib/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../lib/http.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,qDAAuC;AACvC,4BAA0B;AAG1B,qCAA+C;AAC/C,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../lib/http.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,qDAAuC;AACvC,4BAA0B;AAG1B,qCAA+C;AAC/C,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,OAAO,CAAC,QAAQ,EAAE,CAAC;AAMnB,MAAa,eAAe;IAI1B,YACmB,MAA4B,EAC7C,cAA+B,EAC/B,WAAgD;QAF/B,WAAM,GAAN,MAAM,CAAsB;QAJvC,mBAAc,GAAI,IAAkC,CAAC;QACrD,gBAAW,GAAuC,SAAS,CAAC;QAOlE,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;SACtC;QAED,IAAI,WAAW;YAAE,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAClD,CAAC;IAEY,IAAI,CAAC,GAAgB,EAAE,mBAA4B,KAAK;;YACnE,mBAAmB;YACnB,MAAM,IAAI,GAAG,4BAAmB,CAAC,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YAC7D,eAAe;YACf,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAC/B;oBACE,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,IAAI,EAAE,IAAI,CAAC,UAAU;iBACtB,EACD,gBAAgB,CACjB,CAAC;aACH;YACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE;gBACnC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,IAAI,EAAE,IAAI,CAAC,WAAW;aACvB,CAAC,CAAC;YAEH,qEAAqE;YACrE,IAAI,OAAO,GAAiB,IAAI,CAAC,WAAsC,CAAC;YAExE,IAAI,IAAI,CAAC,cAAc,EAAE;gBACvB,OAAO,OAAO;oBACZ,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC;oBAC5C,CAAC,CAAC,IAAI,CAAC,cAAc;yBAChB,IAAI,CAAC,OAAO,CAAC;yBACb,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE;wBACf,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrC,CAAC,CAAC;yBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;wBAChB,IAAI,CAAC,CAAC,QAAQ,EAAE;4BACd,6EAA6E;4BAC7E,OAAO,CAAC,CAAC,QAAQ,CAAC;yBACnB;6BAAM;4BACL,gDAAgD;4BAChD,MAAM,CAAC,CAAC;yBACT;oBACH,CAAC,CAAC,CAAC;aACV;iBAAM;gBACL,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC3D;QACH,CAAC;KAAA;CACF;AA7DD,0CA6DC"}
|