Fix the individual request rate-limit (#694)

* Fix the individual request rate-limit This fixes the first problem raised in #693 --------- Signed-off-by: nexy7574 <[email protected]> Co-authored-by: Gnuxie <[email protected]>
the-draupnir-project · Jan 19, 2025 · 0e2f81e · 0e2f81e
1 parent 2300b1e
commit 0e2f81e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/utils.ts b/src/utils.ts
@@ -492,14 +492,18 @@ function patchMatrixClientForRetry() {
         return cb(...result);
       } catch (err) {
         // Need to retry.
-        let retryAfterMs = attempt * attempt * REQUEST_RETRY_BASE_DURATION_MS;
-        if ("retry_after_ms" in err) {
-          try {
-            retryAfterMs = Number.parseInt(err.retry_after_ms, 10);
-          } catch (ex) {
-            // Use default value.
+        const retryAfterMs = (() => {
+          if (err instanceof MatrixError && err.retryAfterMs !== undefined) {
+            return err.retryAfterMs;
+          } else {
+            LogService.error(
+              "Draupnir.client",
+              "Unable to extract retry_after_ms from error, using fallback to create retry duration",
+              err
+            );
+            return attempt * attempt * REQUEST_RETRY_BASE_DURATION_MS;
           }
-        }
+        })();
         LogService.debug(
           "Draupnir.client",
           `Waiting ${retryAfterMs}ms before retrying ${params.method} ${params.uri}`