Improve error messages and format

jdalrymple · Dec 25, 2023 · cfe294c · cfe294c
1 parent 8385eee
commit cfe294c
Show file tree

Hide file tree

Showing 5 changed files with 1,045 additions and 1,074 deletions.
diff --git a/packages/requester-utils/src/GitbeakerError.ts b/packages/requester-utils/src/GitbeakerError.ts
@@ -0,0 +1,31 @@
+/* eslint-disable max-classes-per-file */
+export class GitbeakerRequestError extends Error {
+  constructor(
+    message: string,
+    options?: {
+      cause: {
+        description: string;
+        request: Request;
+        response: Response;
+      };
+    },
+  ) {
+    super(message, options);
+
+    this.name = 'GitbeakerRequestError';
+  }
+}
+
+export class GitbeakerTimeoutError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'GitbeakerTimeoutError';
+  }
+}
+
+export class GitbeakerRetryError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'GitbeakerTimeoutError';
+  }
+}
diff --git a/packages/requester-utils/src/index.ts b/packages/requester-utils/src/index.ts
@@ -1,2 +1,3 @@
 export * from './RequesterUtils';
 export * from './BaseResource';
+export * from './GitbeakerError';
diff --git a/packages/rest/src/Requester.ts b/packages/rest/src/Requester.ts
@@ -3,24 +3,13 @@ import type {
   ResourceOptions,
   ResponseBodyTypes,
 } from '@gitbeaker/requester-utils';
-import { createRequesterFn, getMatchingRateLimiter } from '@gitbeaker/requester-utils';
-
-class GitbeakerError extends Error {
-  constructor(
-    message: string,
-    options?: {
-      cause: {
-        description: string;
-        request: Request;
-        response: Response;
-      };
-    },
-  ) {
-    super(message, options);
-
-    this.name = 'GitbeakerError';
-  }
-}
+import {
+  GitbeakerRequestError,
+  GitbeakerRetryError,
+  GitbeakerTimeoutError,
+  createRequesterFn,
+  getMatchingRateLimiter,
+} from '@gitbeaker/requester-utils';
 
 export async function defaultOptionsHandler(
   resourceOptions: ResourceOptions,
@@ -83,7 +72,7 @@ async function parseResponse(response: Response, asStream = false) {
 async function throwFailedRequestError(
   request: Request,
   response: Response,
-): Promise<GitbeakerAPIError> {
+): Promise<GitbeakerRequestError> {
   const content = await response.text();
   const contentType = response.headers.get('Content-Type');
   let description = 'API Request Error';
@@ -96,7 +85,7 @@ async function throwFailedRequestError(
     description = content;
   }
 
-  throw new GitbeakerError(response.statusText, {
+  throw new GitbeakerRequestError(response.statusText, {
     cause: {
       description,
       request,
@@ -134,7 +123,7 @@ export async function defaultRequestHandler(endpoint: string, options?: RequestO
 
     const response = await fetch(request).catch((e) => {
       if (e.name === 'TimeoutError' || e.name === 'AbortError') {
-        throw new Error('Query timeout was reached');
+        throw new GitbeakerTimeoutError('Query timeout was reached');
       }
 
       throw e;
@@ -151,7 +140,7 @@ export async function defaultRequestHandler(endpoint: string, options?: RequestO
   }
   /* eslint-enable */
 
-  throw new Error(
+  throw new GitbeakerRetryError(
     `Could not successfully complete this request due to Error 429. Check the applicable rate limits for this endpoint.`,
   );
 }

diff --git a/packages/rest/test/unit/Requester.ts b/packages/rest/test/unit/Requester.ts
@@ -116,7 +116,7 @@ describe('defaultRequestHandler', () => {
 
     await expect(defaultRequestHandler('http://test.com', {} as RequestOptions)).rejects.toThrow({
       message: 'Really Bad Error',
-      name: 'Error',
+      name: 'GitbeakerRequestError',
       cause: {
         description: 'msg',
       },
@@ -141,7 +141,7 @@ describe('defaultRequestHandler', () => {
 
     await expect(defaultRequestHandler('http://test.com', {} as RequestOptions)).rejects.toThrow({
       message: 'Really Bad Error',
-      name: 'Error',
+      name: 'GitbeakerRequestError',
       cause: {
         description: stringBody,
       },
@@ -160,7 +160,7 @@ describe('defaultRequestHandler', () => {
 
     await expect(defaultRequestHandler('http://test.com', {} as RequestOptions)).rejects.toThrow({
       message: 'Query timeout was reached',
-      name: 'Error',
+      name: 'GitbeakerTimeoutError',
     });
   });
 
@@ -176,7 +176,7 @@ describe('defaultRequestHandler', () => {
 
     await expect(defaultRequestHandler('http://test.com', {} as RequestOptions)).rejects.toThrow({
       message: 'Query timeout was reached',
-      name: 'Error',
+      name: 'GitbeakerTimeoutError',
     });
   });
 
@@ -287,7 +287,7 @@ describe('defaultRequestHandler', () => {
     await expect(defaultRequestHandler('http://test.com', {} as RequestOptions)).rejects.toThrow({
       message:
         'Could not successfully complete this request due to Error 429. Check the applicable rate limits for this endpoint.',
-      name: 'Error',
+      name: 'GitbeakerRetryError',
     });
 
     MockFetch.mockRestore();