@@ -12,10 +12,6 @@ import { isBrowser, isNode } from "../util";
1212export class IsomorphicFetchHttpLibrary implements HttpLibrary {
1313 public debug = false ;
1414 public zstdCompressorCallback : ZstdCompressorCallback | undefined ;
15- public enableRetry ! : boolean ;
16- public maxRetries ! : number ;
17- public backoffBase ! : number ;
18- public backoffMultiplier ! : number ;
1915
2016 public send ( request : RequestContext ) : Promise < ResponseContext > {
2117 if ( this . debug ) {
@@ -56,67 +52,59 @@ export class IsomorphicFetchHttpLibrary implements HttpLibrary {
5652 }
5753 }
5854
59- let currentAttempt = 0 ;
55+ let resultPromise : Promise < ResponseContext > ;
56+
6057 // On non-node environments, use native fetch if available.
6158 // `cross-fetch` incorrectly assumes all browsers have XHR available.
6259 // See https://github.com/lquixada/cross-fetch/issues/78
6360 // TODO: Remove once once above issue is resolved.
64- const fetchFunction = ( ! isNode && typeof fetch === "function" ) ? fetch : crossFetch ;
65-
66- const executeRequest = ( ) : Promise < ResponseContext > => {
67- return fetchFunction ( request . getUrl ( ) , {
61+ if ( ! isNode && typeof fetch === "function" ) {
62+ resultPromise = fetch ( request . getUrl ( ) , {
6863 method : method ,
6964 body : body as any ,
7065 headers : headers ,
7166 signal : request . getHttpConfig ( ) . signal ,
7267 } ) . then ( ( resp : any ) => {
73- const responseHeaders : { [ name : string ] : string } = { } ;
68+ const headers : { [ name : string ] : string } = { } ;
7469 resp . headers . forEach ( ( value : string , name : string ) => {
75- responseHeaders [ name ] = value ;
70+ headers [ name ] = value ;
7671 } ) ;
77-
78- const responseBody = {
72+
73+ const body = {
7974 text : ( ) => resp . text ( ) ,
8075 binary : ( ) => resp . buffer ( ) ,
8176 } ;
82-
83- const response = new ResponseContext ( resp . status , responseHeaders , responseBody ) ;
84-
77+ const response = new ResponseContext ( resp . status , headers , body ) ;
8578 if ( this . debug ) {
8679 this . logResponse ( response ) ;
8780 }
88-
89- if ( this . shouldRetry ( this . enableRetry , currentAttempt , this . maxRetries , response . httpStatusCode ) ) {
90- const delay = this . calculateRetryInterval ( currentAttempt , this . backoffBase , this . backoffMultiplier , headers ) ;
91- currentAttempt ++ ;
92- return this . sleep ( delay * 1000 ) . then ( ( ) => executeRequest ( ) ) ;
93- }
9481 return response ;
9582 } ) ;
96- } ;
97-
98- const resultPromise : Promise < ResponseContext > = executeRequest ( ) ;
99- return resultPromise ;
100- }
101-
102- private sleep ( milliseconds : number ) : Promise < void > {
103- return new Promise ( ( resolve ) => {
104- setTimeout ( resolve , milliseconds ) ;
105- } ) ;
106- }
107-
108- private shouldRetry ( enableRetry :boolean , currentAttempt :number , maxRetries :number , responseCode :number ) :boolean {
109- return ( responseCode == 429 || responseCode >= 500 ) && maxRetries > currentAttempt && enableRetry
110- }
111-
112- private calculateRetryInterval ( currentAttempt :number , backoffBase :number , backoffMultiplier :number , headers : { [ name : string ] : string } ) : number {
113- if ( "x-ratelimit-reset" in headers ) {
114- const rateLimitHeaderString = headers [ "x-ratelimit-reset" ]
115- const retryIntervalFromHeader = parseInt ( rateLimitHeaderString , 10 ) ;
116- return retryIntervalFromHeader
11783 } else {
118- return ( backoffMultiplier ** currentAttempt ) * backoffBase
84+ resultPromise = crossFetch ( request . getUrl ( ) , {
85+ method : method ,
86+ body : body as any ,
87+ headers : headers ,
88+ signal : request . getHttpConfig ( ) . signal ,
89+ } ) . then ( ( resp : any ) => {
90+ const headers : { [ name : string ] : string } = { } ;
91+ resp . headers . forEach ( ( value : string , name : string ) => {
92+ headers [ name ] = value ;
93+ } ) ;
94+
95+ const body = {
96+ text : ( ) => resp . text ( ) ,
97+ binary : ( ) => resp . buffer ( ) ,
98+ } ;
99+ const response = new ResponseContext ( resp . status , headers , body ) ;
100+ if ( this . debug ) {
101+ this . logResponse ( response ) ;
102+ }
103+ return response ;
104+ } ) ;
119105 }
106+
107+ return resultPromise ;
120108 }
121109
122110 private logRequest ( request : RequestContext ) : void {
0 commit comments