better error wrapping

Author: tsmbl

packages/sdk/src/dialect-cloud-api/data-service-errors.ts

@@ -24,8 +24,7 @@ export async function withErrorParsing<T>(
     }
     if (e instanceof ApiError) {
       if (e.statusCode === 400) {
-        console.error(e);
-        throw new IllegalArgumentError(createMessage(e));
+        throw new IllegalArgumentError(e.error, createMessage(e));
       }
       if (e.statusCode === 401) {
         throw new AuthenticationError(createMessage(e));
@@ -51,5 +50,5 @@ export async function withErrorParsing<T>(
 }
 
 function createMessage(e: ApiError) {
-  return `${e.message ?? e.error}`;
+  return `${e.message ?? JSON.stringify(e.error)}`;
 }

packages/sdk/src/dialect-cloud-api/utils.ts

@@ -39,6 +39,7 @@ export class ApiError {
     readonly error: string,
     readonly statusCode: number,
     readonly message?: string | null,
+    readonly details?: any,
     readonly requestId?: string | null,
   ) {}
 }

packages/sdk/src/dialect-cloud-api/v2/application-api.ts

@@ -79,46 +79,42 @@ export class AppV2Api {
       clientKey: this.clientKey,
     });
 
-    try {
-      const response = await fetch(`${this.baseUrl}${path}`, {
-        ...init,
-        headers: {
-          ...headers,
-          ...init?.headers,
-        },
-      });
-
-      if (response.ok) {
-        return response.json();
-      }
-      const isJsonResponse = response.headers
-        .get('Content-Type')
-        ?.includes('application/json');
-
-      if (!isJsonResponse) {
-        console.error(await response.text());
-        throw new ApiError(
-          'Unknown Error',
-          response.status,
-          null,
-          headers[XRequestIdHeader] ?? null,
-        );
-      }
-
-      const { error, message } = (await response.json()) as {
-        message?: string;
-        error?: any;
-      };
+    const response = await fetch(`${this.baseUrl}${path}`, {
+      ...init,
+      headers: {
+        ...headers,
+        ...init?.headers,
+      },
+    });
+
+    if (response.ok) {
+      return response.json();
+    }
+    const isJsonResponse = response.headers
+      .get('Content-Type')
+      ?.includes('application/json');
+
+    if (!isJsonResponse) {
       throw new ApiError(
-        message ?? 'Unknown Error',
+        'Unknown Error',
         response.status,
-        error,
+        null,
         headers[XRequestIdHeader] ?? null,
       );
-    } catch (e) {
-      console.error(e);
-      throw new NetworkError();
     }
+
+    const { error, message } = (await response.json()) as {
+      message?: string;
+      error?: any;
+    };
+
+    throw new ApiError(
+      'ApiError',
+      response.status,
+      message ?? JSON.stringify(error),
+      error,
+      headers[XRequestIdHeader] ?? null,
+    );
   }
 
   async sendAlert(appId: string, request: SendAlertRequest): Promise<void> {

packages/sdk/src/dialect-cloud-api/v2/auth-api.ts

@@ -31,47 +31,42 @@ export class AuthV2Api {
       clientKey: this.clientKey,
     });
 
-    try {
-      const response = await fetch(`${this.baseUrl}${path}`, {
-        ...init,
-        headers: {
-          ...headers,
-          ...init?.headers,
-        },
-      });
-
-      if (response.ok) {
-        return response.json();
-      }
-      const isJsonResponse = response.headers
-        .get('Content-Type')
-        ?.includes('application/json');
+    const response = await fetch(`${this.baseUrl}${path}`, {
+      ...init,
+      headers: {
+        ...headers,
+        ...init?.headers,
+      },
+    });
 
-      if (!isJsonResponse) {
-        const text = await response.text();
-        console.error(text);
-        throw new ApiError(
-          'Unknown Error',
-          response.status,
-          text,
-          headers[XRequestIdHeader] ?? null,
-        );
-      }
+    if (response.ok) {
+      return response.json();
+    }
+    const isJsonResponse = response.headers
+      .get('Content-Type')
+      ?.includes('application/json');
 
-      const { error, message } = (await response.json()) as {
-        message?: string;
-        error?: any;
-      };
+    if (!isJsonResponse) {
       throw new ApiError(
-        message ?? 'Unknown Error',
+        'Unknown Error',
         response.status,
-        error,
+        null,
         headers[XRequestIdHeader] ?? null,
       );
-    } catch (e) {
-      console.error(e);
-      throw new NetworkError();
     }
+
+    const { error, message } = (await response.json()) as {
+      message?: string;
+      error?: any;
+    };
+
+    throw new ApiError(
+      'ApiError',
+      response.status,
+      message ?? JSON.stringify(error),
+      error,
+      headers[XRequestIdHeader] ?? null,
+    );
   }
 
   async getAuth(): Promise<AuthResponse> {

packages/sdk/src/internal/errors.ts

@@ -3,7 +3,7 @@ import { DialectSdkError } from '../sdk/errors';
 export abstract class DialectCloudError extends DialectSdkError {}
 
 export class DialectCloudUnreachableError extends DialectCloudError {
-  constructor(details?: any[]) {
+  constructor(details?: any) {
     super(
       DialectCloudUnreachableError.name,
       'Lost connection to Dialect Cloud',

packages/sdk/src/sdk/errors.ts

@@ -3,7 +3,7 @@ export class DialectSdkError extends Error {
     readonly type: string,
     readonly title: string,
     readonly msg?: string,
-    readonly details?: any[],
+    readonly details?: any,
   ) {
     super(msg);
     this.msg = msg;