suzanne.soy/wiki.gruntnetwork.com--zimmer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pooledRequest fix

Browse Source
This commit is contained in:
v 2018-09-03 17:42:39 +03:00
parent d05b6c16c5
commit 5c0178b2f2
1 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
wikizimmer.js
View File

@ -136,78 +136,74 @@ function pooledRequest( request, referenceUri, maxTokens = 1, interval = 10 ) {
}
pause ( query ) {
if ( this.timer ) {
clearTimeout( this.timer )
}
if ( this.supressTimer ) {
clearTimeout( this.supressTimer )
}
clearTimeout( this.timer )
this.timer = null
clearTimeout( this.supressTimer )
this.supressTimer = setTimeout(
() => ( this.supressTimer = false, this.reshedule()),
query.retries * this.supressTimeout
)
if ( ! query.external ) {
this.interval = this.interval * 2
}
}
release () {
this.tokenCounter --
this.run()
}
retry ( query, error ) {
this.pause( query )
if ( ++ query.retries <= ( query.external ? retryExternal : retryLimit )) {
this.queue.push( query )
} else {
query.reject( error )
}
}
acquire () {
let query
if ( this.timer || this.supressTimer || this.tokenCounter >= maxTokens || ! ( query = this.queue.shift()))
const retryCause = retryStatusCodes.includes( error.statusCode ) ? error.statusCode :
error.cause && retryErrorCodes.includes( error.cause.code ) ? error.cause.code : false
const maxRetries = query.external ? retryExternal : retryLimit
if ( ! retryCause || query.retries > maxRetries)
return false
this.tokenCounter ++
return query
if ( query.retries > maxRetries / 2 ) {
this.interval = this.interval * 2
}
query.retries ++
log( 'retry request', query.retries, this.interval, error.name, retryCause, error.options.uri || error.options.url ) // , query )
this.queue.push( query )
this.pause( query )
return true
}
submit ( query ) {
this.tokenCounter ++
return request( query )
.catch( error => {
const retryCause = retryStatusCodes.includes( error.statusCode ) ? error.statusCode :
error.cause && retryErrorCodes.includes( error.cause.code ) ? error.cause.code : false
if ( retryCause ) {
log( 'retry request', interval, error.name, retryCause, error.options.uri || error.options.url ) // , query )
this.retry( query, error )
return
}
warning( 'HTTP error', error.cause && error.cause.code || error.statusCode, error.options.uri || error.options.url ) // , error.error && error.error.toString().trim())
query.reject( error )
return
})
.then( reply => {
this.release()
return reply ? query.resolve( reply ) : query.reject( )
this.tokenCounter --
if ( reply )
query.resolve( reply )
else
query.reject( )
this.reshedule()
})
.catch( error => {
this.tokenCounter --
if ( ! this.retry( query, error )) {
warning( 'HTTP error', error.cause && error.cause.code || error.statusCode, error.options.uri || error.options.url )
query.reject( error )
this.reshedule()
}
})
}
run () {
let query = this.acquire()
if ( this.timer || this.supressTimer || this.tokenCounter >= maxTokens )
return
const query = this.queue.shift()
if ( query ) {
//~ if ( query.retries > 0 )
//~ debugger
this.submit( query )
this.reshedule()
}
}
append ( query, priority ) {
append ( query ) {
return new Promise(( resolve, reject ) => {
query.resolve = resolve
query.reject = reject
query.retries = 0
if ( priority )
if ( query.priority )
this.queue.unshift( query )
else
this.queue.push( query )
@ -244,14 +240,16 @@ function pooledRequest( request, referenceUri, maxTokens = 1, interval = 10 ) {
return query
}
return function ( query, priority = false ) {
return function ( query, queueId ) {
processOptions( query )
let queue = hostQueues[ query.host ]
if ( ! queueId )
queueId = query.host
let queue = hostQueues[ queueId ]
if ( ! queue ) {
queue = new Queue
hostQueues[ query.host ] = queue
hostQueues[ queueId ] = queue
}
return queue.append( query , priority )
return queue.append( query )
}
}