wallet-core: round-robin waiting for long-polling

With dynamic long-poll timeout computation

1 files changed, 24 insertions, 14 deletions

diff --git a/packages/taler-wallet-core/src/withdraw.ts b/packages/taler-wallet-core/src/withdraw.ts
index 2af8807cc..7ba69d2c1 100644
--- a/packages/taler-wallet-core/src/withdraw.ts
+++ b/packages/taler-wallet-core/src/withdraw.ts
@@ -45,7 +45,6 @@ import {
   EddsaPrivateKeyString,
   ExchangeBatchWithdrawRequest,
   ExchangeListItem,
-  ExchangeTosStatus,
   ExchangeUpdateStatus,
   ExchangeWireAccount,
   ExchangeWithdrawBatchResponse,
@@ -1614,14 +1613,18 @@ async function processQueryReserve(
     `reserves/${reservePub}`,
     withdrawalGroup.exchangeBaseUrl,
   );
-  reserveUrl.searchParams.set("timeout_ms", "30000");
 
-  logger.trace(`querying reserve status via ${reserveUrl.href}`);
-
-  const resp = await wex.http.fetch(reserveUrl.href, {
-    timeout: getReserveRequestTimeout(withdrawalGroup),
-    cancellationToken: wex.cancellationToken,
-  });
+  const resp = await wex.ws.runLongpollQueueing(
+    reserveUrl.hostname,
+    async (timeoutMs) => {
+      reserveUrl.searchParams.set("timeout_ms", `${timeoutMs}`);
+      logger.trace(`querying reserve status via ${reserveUrl.href}`);
+      return await wex.http.fetch(reserveUrl.href, {
+        timeout: getReserveRequestTimeout(withdrawalGroup),
+        cancellationToken: wex.cancellationToken,
+      });
+    },
+  );
 
   logger.trace(`reserve status code: HTTP ${resp.status}`);
 
@@ -1760,12 +1763,19 @@ async function processWithdrawalGroupPendingKyc(
     `kyc-check/${kycInfo.requirementRow}/${kycInfo.paytoHash}/${userType}`,
     exchangeUrl,
   );
-  url.searchParams.set("timeout_ms", "30000");
-  logger.info(`long-polling for withdrawal KYC status via ${url.href}`);
-  const kycStatusRes = await wex.http.fetch(url.href, {
-    method: "GET",
-    cancellationToken: wex.cancellationToken,
-  });
+
+  const kycStatusRes = await wex.ws.runLongpollQueueing(
+    url.hostname,
+    async (timeoutMs) => {
+      url.searchParams.set("timeout_ms", `${timeoutMs}`);
+      logger.info(`long-polling for withdrawal KYC status via ${url.href}`);
+      return await wex.http.fetch(url.href, {
+        method: "GET",
+        cancellationToken: wex.cancellationToken,
+      });
+    },
+  );
+
   logger.info(`kyc long-polling response status: HTTP ${kycStatusRes.status}`);
   if (
     kycStatusRes.status === HttpStatusCode.Ok ||