aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Simpler/correct-er tryAndWait()

Browse source
This commit is contained in:
Daniel Lugo 2021-07-21 16:58:44 -04:00
parent e236cafe05
commit 9d769405cd
1 changed files with 11 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

59
services/gunDB/contact-api/utils/index.js
View file

@ -101,7 +101,6 @@ const timeout2 = promise => {
* @returns {Promise<T>}
*/
const tryAndWait = async (promGen, shouldRetry = () => false) => {
/* eslint-disable no-empty */
/* eslint-disable init-declarations */
// If hang stop at 10, wait 3, retry, if hang stop at 5, reinstate, warm for
@ -118,28 +117,15 @@ const tryAndWait = async (promGen, shouldRetry = () => false) => {
)
)
if (shouldRetry(resolvedValue)) {
logger.info(
'force retrying' /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()} \n resolvedValue: ${resolvedValue}, type: ${typeof resolvedValue}`
*/
)
} else {
if (!shouldRetry(resolvedValue)) {
return resolvedValue
}
} catch (e) {
console.log(e)
if (e.message === Constants.ErrorCode.NOT_AUTH) {
if (e.message !== Constants.ErrorCode.TIMEOUT_ERR) {
throw e
}
}
logger.info(
`\n retrying \n` /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()}`
*/
)
await delay(200)
try {
@ -150,28 +136,15 @@ const tryAndWait = async (promGen, shouldRetry = () => false) => {
)
)
if (shouldRetry(resolvedValue)) {
logger.info(
'force retrying' /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()} \n resolvedValue: ${resolvedValue}, type: ${typeof resolvedValue}`
*/
)
} else {
if (!shouldRetry(resolvedValue)) {
return resolvedValue
}
} catch (e) {
console.log(e)
if (e.message === Constants.ErrorCode.NOT_AUTH) {
if (e.message !== Constants.ErrorCode.TIMEOUT_ERR) {
throw e
}
}
logger.info(
`\n retrying \n` /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()}`
*/
)
await delay(3000)
try {
@ -182,32 +155,22 @@ const tryAndWait = async (promGen, shouldRetry = () => false) => {
)
)
if (shouldRetry(resolvedValue)) {
logger.info(
'force retrying' /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()} \n resolvedValue: ${resolvedValue}, type: ${typeof resolvedValue}`
*/
)
} else {
if (!shouldRetry(resolvedValue)) {
return resolvedValue
}
} catch (e) {
console.log(e)
if (e.message === Constants.ErrorCode.NOT_AUTH) {
if (e.message !== Constants.ErrorCode.TIMEOUT_ERR) {
throw e
}
}
logger.info(
`\n NOT recreating a fresh gun but retrying one last time \n` /* +
` args: ${promGen.toString()} -- ${shouldRetry.toString()}`
*/
return timeout10(
promGen(
require('../../Mediator/index').getGun(),
require('../../Mediator/index').getUser()
)
)
const { gun, user } = require('../../Mediator/index').freshGun()
return timeout10(promGen(gun, user))
/* eslint-enable no-empty */
/* eslint-enable init-declarations */
}