From fcd74e8048362fcf8284871ee067099e8de28a89 Mon Sep 17 00:00:00 2001
From: Zed <zedeus@pm.me>
Date: Sat, 2 Sep 2023 08:15:58 +0200
Subject: [PATCH] Retry rate limited requests with different account

---
 src/apiutils.nim | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/apiutils.nim b/src/apiutils.nim
index 0b1db26..9ac101e 100644
--- a/src/apiutils.nim
+++ b/src/apiutils.nim
@@ -120,28 +120,38 @@ template fetchImpl(result, fetchBody) {.dirty.} =
   except OSError as e:
     raise e
   except Exception as e:
-    echo "error: ", e.name, ", msg: ", e.msg, ", accountId: ", account.id, ", url: ", url
+    let id = if account.isNil: "null" else: account.id
+    echo "error: ", e.name, ", msg: ", e.msg, ", accountId: ", id, ", url: ", url
     raise rateLimitError()
   finally:
     release(account)
 
-proc fetch*(url: Uri; api: Api): Future[JsonNode] {.async.} =
-  var body: string
-  fetchImpl body:
-    if body.startsWith('{') or body.startsWith('['):
-      result = parseJson(body)
-    else:
-      echo resp.status, ": ", body, " --- url: ", url
-      result = newJNull()
+template retry(bod) =
+  try:
+    bod
+  except RateLimitError:
+    echo "[accounts] Rate limited, retrying ", api, " request..."
+    bod
 
-    let error = result.getError
-    if error in {expiredToken, badToken}:
-      echo "fetchBody error: ", error
-      invalidate(account)
-      raise rateLimitError()
+proc fetch*(url: Uri; api: Api): Future[JsonNode] {.async.} =
+  retry:
+    var body: string
+    fetchImpl body:
+      if body.startsWith('{') or body.startsWith('['):
+        result = parseJson(body)
+      else:
+        echo resp.status, ": ", body, " --- url: ", url
+        result = newJNull()
+
+      let error = result.getError
+      if error in {expiredToken, badToken}:
+        echo "fetchBody error: ", error
+        invalidate(account)
+        raise rateLimitError()
 
 proc fetchRaw*(url: Uri; api: Api): Future[string] {.async.} =
-  fetchImpl result:
-    if not (result.startsWith('{') or result.startsWith('[')):
-      echo resp.status, ": ", result, " --- url: ", url
-      result.setLen(0)
+  retry:
+    fetchImpl result:
+      if not (result.startsWith('{') or result.startsWith('[')):
+        echo resp.status, ": ", result, " --- url: ", url
+        result.setLen(0)