@scallop-io/sui-scallop-sdk 1.4.1-alpha.1 → 1.4.11

package/src/utils/tokenBucket.ts

@@ -16,11 +16,14 @@ class TokenBucket {
   refill() {
     const now = Date.now();
     const elapsed = now - this.lastRefill;
-    if (elapsed > this.interval) {
+
+    if (elapsed >= this.interval) {
       const tokensToAdd =
         Math.floor(elapsed / this.interval) * this.tokensPerInterval;
       this.tokens = Math.min(this.tokens + tokensToAdd, this.tokensPerInterval);
-      this.lastRefill = now;
+
+      // Update lastRefill to reflect the exact time of the last "refill"
+      this.lastRefill += Math.floor(elapsed / this.interval) * this.interval;
     }
   }
 
@@ -45,35 +48,12 @@ const callWithRateLimit = async <T>(
 
   const tryRequest = async (): Promise<T | null> => {
     if (tokenBucket.removeTokens(1)) {
-      try {
-        const result = await fn();
-
-        // Check if the result is an object with status code (assuming the response has a status property)
-        if (result && (result as any).status === 429) {
-          throw new Error('Unexpected status code: 429');
-        }
-
-        return result;
-      } catch (error: any) {
-        if (
-          error.message === 'Unexpected status code: 429' &&
-          retries < maxRetries
-        ) {
-          retries++;
-          const delay = retryDelayInMs * Math.pow(backoffFactor, retries);
-          // console.warn(`429 encountered, retrying in ${delay} ms`);
-          await new Promise((resolve) => setTimeout(resolve, delay));
-          return tryRequest();
-        } else {
-          // console.error(error);
-          console.error('An error occurred:', error.message);
-          return null;
-        }
-      }
+      const result = await fn();
+      return result;
     } else if (retries < maxRetries) {
       retries++;
       const delay = retryDelayInMs * Math.pow(backoffFactor, retries);
-      // console.warn(`Rate limit exceeded, retrying in ${delay} ms`);
+      console.error(`Rate limit exceeded, retrying in ${delay} ms`);
       await new Promise((resolve) => setTimeout(resolve, delay));
       return tryRequest();
     } else {

package/src/test.ts

@@ -1,20 +0,0 @@
-// import { ScallopQuery } from './models';
-
-// const main = async () => {
-//   try {
-//     const query = new ScallopQuery({
-//       walletAddress:
-//         '0x61819c99588108d9f7710047e6ad8f2da598de8e98a26ea62bd7ad9847f5329c',
-//     });
-//     await query.init();
-
-//     const res = await query.getAllCoinPrices();
-//     console.dir(res, { depth: null });
-//   } catch (e) {
-//     console.error(e);
-//   } finally {
-//     process.exit(0);
-//   }
-// };
-
-// main();