diff options
author | Florian Dold <florian.dold@gmail.com> | 2020-08-20 16:27:20 +0530 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2020-08-20 16:27:20 +0530 |
commit | 421e613f92b80c81c856d6b074aa160e80e38e3d (patch) | |
tree | 7284e8b856986de3ee4ca1362fa9b52ce1e22de1 /packages/taler-wallet-core/src/operations | |
parent | ddf9171c5becb3bb1aebdd3e1a298644f62ed090 (diff) | |
download | wallet-core-421e613f92b80c81c856d6b074aa160e80e38e3d.tar.gz wallet-core-421e613f92b80c81c856d6b074aa160e80e38e3d.tar.bz2 wallet-core-421e613f92b80c81c856d6b074aa160e80e38e3d.zip |
throttling diagnostics and request timeouts
Diffstat (limited to 'packages/taler-wallet-core/src/operations')
5 files changed, 89 insertions, 28 deletions
diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index d40dd7883..3b7f62fe9 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -43,7 +43,7 @@ import { WALLET_CACHE_BREAKER_CLIENT_VERSION, WALLET_EXCHANGE_PROTOCOL_VERSION, } from "./versions"; -import { getTimestampNow } from "../util/time"; +import { getTimestampNow, Duration } from "../util/time"; import { compare } from "../util/libtoolVersion"; import { createRecoupGroup, processRecoupGroup } from "./recoup"; import { TalerErrorCode } from "../TalerErrorCode"; @@ -96,6 +96,10 @@ async function setExchangeError( await ws.db.mutate(Stores.exchanges, baseUrl, mut); } +function getExchangeRequestTimeout(e: ExchangeRecord): Duration { + return { d_ms: 5000 }; +} + /** * Fetch the exchange's /keys and update our database accordingly. * @@ -117,7 +121,9 @@ async function updateExchangeWithKeys( const keysUrl = new URL("keys", baseUrl); keysUrl.searchParams.set("cacheBreaker", WALLET_CACHE_BREAKER_CLIENT_VERSION); - const resp = await ws.http.get(keysUrl.href); + const resp = await ws.http.get(keysUrl.href, { + timeout: getExchangeRequestTimeout(existingExchangeRecord), + }); const exchangeKeysJson = await readSuccessResponseJsonOrThrow( resp, codecForExchangeKeysJson(), @@ -303,7 +309,10 @@ async function updateExchangeWithTermsOfService( Accept: "text/plain", }; - const resp = await ws.http.get(reqUrl.href, { headers }); + const resp = await ws.http.get(reqUrl.href, { + headers, + timeout: getExchangeRequestTimeout(exchange), + }); const tosText = await readSuccessResponseTextOrThrow(resp); const tosEtag = resp.headers.get("etag") || undefined; @@ -361,7 +370,9 @@ async function updateExchangeWithWireInfo( const reqUrl = new URL("wire", exchangeBaseUrl); reqUrl.searchParams.set("cacheBreaker", WALLET_CACHE_BREAKER_CLIENT_VERSION); - const resp = await ws.http.get(reqUrl.href); + const resp = await ws.http.get(reqUrl.href, { + timeout: getExchangeRequestTimeout(exchange), + }); const wireInfo = await readSuccessResponseJsonOrThrow( resp, codecForExchangeWireJson(), diff --git a/packages/taler-wallet-core/src/operations/pay.ts b/packages/taler-wallet-core/src/operations/pay.ts index 565fe9c66..f20632344 100644 --- a/packages/taler-wallet-core/src/operations/pay.ts +++ b/packages/taler-wallet-core/src/operations/pay.ts @@ -35,6 +35,7 @@ import { updateRetryInfoTimeout, PayEventRecord, WalletContractData, + getRetryDuration, } from "../types/dbTypes"; import { NotificationType } from "../types/notifications"; import { @@ -58,7 +59,13 @@ import { parsePayUri } from "../util/taleruri"; import { guardOperationException, OperationFailedError } from "./errors"; import { createRefreshGroup, getTotalRefreshCost } from "./refresh"; import { InternalWalletState, EXCHANGE_COINS_LOCK } from "./state"; -import { getTimestampNow, timestampAddDuration } from "../util/time"; +import { + getTimestampNow, + timestampAddDuration, + Duration, + durationMax, + durationMin, +} from "../util/time"; import { strcmp, canonicalJson } from "../util/helpers"; import { readSuccessResponseJsonOrThrow, @@ -588,6 +595,17 @@ async function resetDownloadProposalRetry( }); } +function getProposalRequestTimeout(proposal: ProposalRecord): Duration { + return durationMax( + { d_ms: 60000 }, + durationMin({ d_ms: 5000 }, getRetryDuration(proposal.retryInfo)), + ); +} + +function getPurchaseRequestTimeout(purchase: PurchaseRecord): Duration { + return { d_ms: 5000 }; +} + async function processDownloadProposalImpl( ws: InternalWalletState, proposalId: string, @@ -620,7 +638,9 @@ async function processDownloadProposalImpl( requestBody.token = proposal.claimToken; } - const resp = await ws.http.postJson(orderClaimUrl, requestBody); + const resp = await ws.http.postJson(orderClaimUrl, requestBody, { + timeout: getProposalRequestTimeout(proposal), + }); const proposalResp = await readSuccessResponseJsonOrThrow( resp, codecForProposal(), @@ -886,7 +906,9 @@ export async function submitPay( logger.trace("making pay request", JSON.stringify(reqBody, undefined, 2)); const resp = await ws.runSequentialized([EXCHANGE_COINS_LOCK], () => - ws.http.postJson(payUrl, reqBody), + ws.http.postJson(payUrl, reqBody, { + timeout: getPurchaseRequestTimeout(purchase), + }), ); const merchantResp = await readSuccessResponseJsonOrThrow( diff --git a/packages/taler-wallet-core/src/operations/recoup.ts b/packages/taler-wallet-core/src/operations/recoup.ts index f855a28cb..ba02f72f8 100644 --- a/packages/taler-wallet-core/src/operations/recoup.ts +++ b/packages/taler-wallet-core/src/operations/recoup.ts @@ -40,7 +40,7 @@ import { import { codecForRecoupConfirmation } from "../types/talerTypes"; import { NotificationType } from "../types/notifications"; -import { forceQueryReserve } from "./reserves"; +import { forceQueryReserve, getReserveRequestTimeout } from "./reserves"; import { Amounts } from "../util/amounts"; import { createRefreshGroup, processRefreshGroup } from "./refresh"; @@ -154,7 +154,9 @@ async function recoupWithdrawCoin( const recoupRequest = await ws.cryptoApi.createRecoupRequest(coin); const reqUrl = new URL(`/coins/${coin.coinPub}/recoup`, coin.exchangeBaseUrl); - const resp = await ws.http.postJson(reqUrl.href, recoupRequest); + const resp = await ws.http.postJson(reqUrl.href, recoupRequest, { + timeout: getReserveRequestTimeout(reserve), + }); const recoupConfirmation = await readSuccessResponseJsonOrThrow( resp, codecForRecoupConfirmation(), diff --git a/packages/taler-wallet-core/src/operations/refresh.ts b/packages/taler-wallet-core/src/operations/refresh.ts index 430675328..89cc3af43 100644 --- a/packages/taler-wallet-core/src/operations/refresh.ts +++ b/packages/taler-wallet-core/src/operations/refresh.ts @@ -42,7 +42,7 @@ import { import { guardOperationException } from "./errors"; import { NotificationType } from "../types/notifications"; import { getRandomBytes, encodeCrock } from "../crypto/talerCrypto"; -import { getTimestampNow } from "../util/time"; +import { getTimestampNow, Duration } from "../util/time"; import { readSuccessResponseJsonOrThrow, HttpResponse } from "../util/http"; import { codecForExchangeMeltResponse, @@ -211,6 +211,10 @@ async function refreshCreateSession( ws.notify({ type: NotificationType.RefreshStarted }); } +function getRefreshRequestTimeout(rg: RefreshGroupRecord): Duration { + return { d_ms: 5000 }; +} + async function refreshMelt( ws: InternalWalletState, refreshGroupId: string, @@ -249,12 +253,11 @@ async function refreshMelt( }; logger.trace(`melt request for coin:`, meltReq); - const resp = await ws.runSequentialized( - [EXCHANGE_COINS_LOCK], - async () => { - return await ws.http.postJson(reqUrl.href, meltReq); - }, - ); + const resp = await ws.runSequentialized([EXCHANGE_COINS_LOCK], async () => { + return await ws.http.postJson(reqUrl.href, meltReq, { + timeout: getRefreshRequestTimeout(refreshGroup), + }); + }); const meltResponse = await readSuccessResponseJsonOrThrow( resp, @@ -346,12 +349,11 @@ async function refreshReveal( refreshSession.exchangeBaseUrl, ); - const resp = await ws.runSequentialized( - [EXCHANGE_COINS_LOCK], - async () => { - return await ws.http.postJson(reqUrl.href, req); - }, - ); + const resp = await ws.runSequentialized([EXCHANGE_COINS_LOCK], async () => { + return await ws.http.postJson(reqUrl.href, req, { + timeout: getRefreshRequestTimeout(refreshGroup), + }); + }); const reveal = await readSuccessResponseJsonOrThrow( resp, diff --git a/packages/taler-wallet-core/src/operations/reserves.ts b/packages/taler-wallet-core/src/operations/reserves.ts index 8adaeea81..fda3c4bcb 100644 --- a/packages/taler-wallet-core/src/operations/reserves.ts +++ b/packages/taler-wallet-core/src/operations/reserves.ts @@ -35,6 +35,7 @@ import { WithdrawalSourceType, ReserveHistoryRecord, ReserveBankInfo, + getRetryDuration, } from "../types/dbTypes"; import { Logger } from "../util/logging"; import { Amounts } from "../util/amounts"; @@ -64,7 +65,12 @@ import { } from "./errors"; import { NotificationType } from "../types/notifications"; import { codecForReserveStatus } from "../types/ReserveStatus"; -import { getTimestampNow } from "../util/time"; +import { + getTimestampNow, + Duration, + durationMin, + durationMax, +} from "../util/time"; import { reconcileReserveHistory, summarizeReserveHistory, @@ -331,10 +337,16 @@ async function registerReserveWithBank( return; } const bankStatusUrl = bankInfo.statusUrl; - const httpResp = await ws.http.postJson(bankStatusUrl, { - reserve_pub: reservePub, - selected_exchange: bankInfo.exchangePaytoUri, - }); + const httpResp = await ws.http.postJson( + bankStatusUrl, + { + reserve_pub: reservePub, + selected_exchange: bankInfo.exchangePaytoUri, + }, + { + timeout: getReserveRequestTimeout(reserve), + }, + ); await readSuccessResponseJsonOrThrow( httpResp, codecForBankWithdrawalOperationPostResponse(), @@ -371,6 +383,13 @@ async function processReserveBankStatus( ); } +export function getReserveRequestTimeout(r: ReserveRecord): Duration { + return durationMax( + { d_ms: 60000 }, + durationMin({ d_ms: 5000 }, getRetryDuration(r.retryInfo)), + ); +} + async function processReserveBankStatusImpl( ws: InternalWalletState, reservePub: string, @@ -388,7 +407,9 @@ async function processReserveBankStatusImpl( return; } - const statusResp = await ws.http.get(bankStatusUrl); + const statusResp = await ws.http.get(bankStatusUrl, { + timeout: getReserveRequestTimeout(reserve), + }); const status = await readSuccessResponseJsonOrThrow( statusResp, codecForWithdrawOperationStatusResponse(), @@ -501,6 +522,9 @@ async function updateReserve( const resp = await ws.http.get( new URL(`reserves/${reservePub}`, reserve.exchangeBaseUrl).href, + { + timeout: getReserveRequestTimeout(reserve), + }, ); const result = await readSuccessResponseJsonOrErrorCode( |