refactor(Rest): if retries are exceeded throw the last error

cordis-lib · Jan 21, 2022 · e94b5ff · e94b5ff
1 parent 560dbb7
commit e94b5ff
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/libs/rest/src/Error.ts b/libs/rest/src/Error.ts
@@ -7,8 +7,7 @@ export const CordisRestError = makeCordisError(
   {
     retryLimitExceeded: (request: string, attempts: number) => `Tried to "${request}" for ${attempts} times but all of them failed`,
     mutexLock: (route: string) => `A mutex for the "${route}" bucket locked up but was told to not wait`,
-    rateLimited: (request: string) => `A ratelimit was hit/prevented while "${request}"`,
-    internal: (request: string) => `Discord raised an internal error on "${request}"`
+    rateLimited: (request: string) => `A ratelimit was hit/prevented while "${request}"`
   }
 );
 

diff --git a/libs/rest/src/fetcher/Bucket.ts b/libs/rest/src/fetcher/Bucket.ts
@@ -74,8 +74,6 @@ export class Bucket extends BaseBucket {
 
       await this.mutex.set(this.route, { timeout: retryAfter });
       return Promise.reject(new CordisRestError('rateLimited', `${req.method.toUpperCase()} ${req.path}`));
-    } else if (res.status >= 500 && res.status < 600) {
-      return Promise.reject(new CordisRestError('internal', `${req.method.toUpperCase()} ${req.path}`));
     } else if (!res.ok) {
       return Promise.reject(new HTTPError(res.clone(), await res.text()));
     }

diff --git a/libs/rest/src/fetcher/ProxyBucket.ts b/libs/rest/src/fetcher/ProxyBucket.ts
@@ -33,8 +33,6 @@ export class ProxyBucket extends BaseBucket {
 
     if (res.status === 429) {
       return Promise.reject(new CordisRestError('rateLimited', `${req.method.toUpperCase()} ${req.path}`));
-    } else if (res.status >= 500 && res.status < 600) {
-      return Promise.reject(new CordisRestError('internal', `${req.method.toUpperCase()} ${req.path}`));
     } else if (!res.ok) {
       return Promise.reject(new HTTPError(res.clone(), await res.text()));
     }

diff --git a/libs/rest/src/struct/Rest.ts b/libs/rest/src/struct/Rest.ts
@@ -246,6 +246,8 @@ export class Rest extends EventEmitter {
     const isGet = options.method.toLowerCase() === 'get';
     const shouldCache = options.cache && isGet;
 
+    let rejected: Promise<never>;
+
     for (let retries = 0; retries <= this.retries; retries++) {
       try {
         if (shouldCache && this.cache.has(options.path)) {
@@ -273,21 +275,27 @@ export class Rest extends EventEmitter {
         const isRatelimit = e instanceof CordisRestError && e.code === 'rateLimited';
         isRetryAfterRatelimit = isRatelimit;
 
-        if (
-          e instanceof HTTPError ||
-          e.name === 'AbortError' ||
-          (isRatelimit && !options.retryAfterRatelimit)
-        ) {
+        if (e.name === 'AbortError') {
           return Promise.reject(e);
         }
 
-        if (e instanceof CordisRestError && e.code === 'internal') {
-          await halt(1000);
+        if (isRatelimit && !options.retryAfterRatelimit) {
+          return Promise.reject(e);
         }
+
+        if (e instanceof HTTPError) {
+          if (e.response.status >= 500 && e.response.status < 600) {
+            await halt(1000);
+          } else {
+            return Promise.reject(e);
+          }
+        }
+
+        rejected = Promise.reject(e);
       }
     }
 
-    return Promise.reject(new CordisRestError('retryLimitExceeded', `${options.method.toUpperCase()} ${options.path}`, this.retries));
+    return rejected!;
   }
 
   /**