This repository has been archived by the owner on Jan 15, 2021. It is now read-only.
Add timeout for fetching tokens #1644
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Velenir
suggested changes
Nov 30, 2020
src/utils/miscellaneous.ts
Outdated
Comment on lines
222
to
229
| return new Promise((resolve, rejects) => | ||
| setTimeout(() => { | ||
| if (result) { | ||
| resolve(result) | ||
| } else { | ||
| rejects(new Error(timeoutMsg)) | ||
| } | ||
| }, time), |
There was a problem hiding this comment.
We already have delay() util to do that
src/utils/miscellaneous.ts
Outdated
| timeoutErrorMsg?: string | ||
| } | ||
|
|
||
| export function timeout<T>(params: TimeoutParams<T>): Promise<T> { |
There was a problem hiding this comment.
Types are not exactly correct. You intentionally throw (return rejected Promise) for some T. Typescript can detect that if you do an overload type, for example
src/hooks/useTokenBalances.ts
Outdated
| fetchBalancesForToken(token, userAddress, contractAddress, networkId) | ||
| .then((balance) => { | ||
| const balancePromises: Promise<TokenBalanceDetails | null>[] = tokens.map((token) => { | ||
| const timeoutPromise = timeout<TokenBalanceDetails | null>({ |
There was a problem hiding this comment.
But this isn't Promise<TokenBalanceDetails | null>, this is Promise<never> as it will throw, always.
src/hooks/useTokenBalances.ts
Outdated
| const balances = await Promise.all(balancePromises) | ||
|
|
||
| // TODO: Would be better to show the errored tokens in error state | ||
| return balances.filter(Boolean) as TokenBalanceDetails[] |
There was a problem hiding this comment.
We don't have to cast if we use a type-guard predicate notEmpty, which you made precisely for these cases, didn't you?
src/hooks/useTokenBalances.ts
Outdated
| logDebug('Using cached value for', token, userAddress, contractAddress) | ||
| return cachedValue | ||
| } | ||
| const cacheKey = constructCacheKey({ token, userAddress, contractAddress, networkId }) |
There was a problem hiding this comment.
No real need to have constructCacheKey(...) in two places
* simplify type without casting * default delay() return to void * simplify timeout function logic * improve timeout types * use new timeout with automatic rejected Promise detection * construct cacheKey once only * throw proper Error
W3stside
approved these changes
Nov 30, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We've observed in two occasions now that some Metamask fails to resolve some promise for contract calls. First with the issue of SNX/sUSD proxy deprecation, yesterday with Ledger MM (not it seems it doesn't do that anymore).
When this happens, we neither get a success or an error.
Currently, if for one token, the promise is not resolved, the overall "fetch all balances" promise don't resolve either (uses
Promise.all)This PR introduces a timeout for fetching individual tokens for this extreme cases. It uses 10s, maybe it could be less. But theoretically promises should resolve one way or the other!