@overmap-ai/core 1.0.48 → 1.0.49-fix-error-messaging.1

package/dist/overmap-core.js

@@ -217,18 +217,54 @@ class OutboxCoordinator {
     this.requestAttemptCounter[uuid] = (this.requestAttemptCounter[uuid] || 0) + 1;
   }
 }
+function extractErrorMessage(errorRes, err) {
+  if (errorRes == null ? void 0 : errorRes.body) {
+    if (typeof errorRes.body === "object") {
+      if (typeof errorRes.body.error === "string")
+        return errorRes.body.error;
+      if (typeof errorRes.body.message === "string")
+        return errorRes.body.message;
+      try {
+        return Object.entries(errorRes.body).map(([key, value]) => {
+          if (typeof value === "string") {
+            if (key === "non_field_errors")
+              return value;
+            return `${key}: ${value}`;
+          }
+          if (Array.isArray(value)) {
+            if (key === "non_field_errors")
+              return value.join("\n");
+            return value.map((v) => `${key}: ${v}`).join("\n");
+          }
+          return `${key}: ${JSON.stringify(value)}`;
+        }).join("\n");
+      } catch (e) {
+        console.error("Failed to extract error message from response body", e);
+      }
+    } else if (typeof errorRes.body === "string")
+      return errorRes.body;
+  } else if (errorRes == null ? void 0 : errorRes.text) {
+    return errorRes.text;
+  } else if (err instanceof Error) {
+    return err.message;
+  }
+  return void 0;
+}
 class APIError extends Error {
-  constructor(message, response, options) {
-    super(response == null ? void 0 : response.text);
+  constructor(options) {
+    const unknownMessage = "An unknown error occurred";
+    super(unknownMessage);
     // NOTE: Needs to conform to NetworkError in @redux-offline/redux-offline, which has `status` and `response`.
     __publicField(this, "status");
-    __publicField(this, "message");
     __publicField(this, "response");
+    __publicField(this, "message");
     __publicField(this, "options");
-    this.message = message;
+    const { response, innerError } = options;
+    this.message = options.message ?? extractErrorMessage(response, innerError) ?? unknownMessage;
     this.status = (response == null ? void 0 : response.status) ?? 0;
     this.response = response;
-    this.options = options ?? { discard: false };
+    options.discard = options.discard ?? false;
+    this.options = options;
   }
 }
 class DeferredPromise {
@@ -4177,35 +4213,6 @@ function extractResponseFromError(error2) {
   }
   return void 0;
 }
-function extractErrorMessage(errorRes, err) {
-  if (errorRes == null ? void 0 : errorRes.body) {
-    if (typeof errorRes.body === "object") {
-      if (typeof errorRes.body.error === "string")
-        return errorRes.body.error;
-      if (typeof errorRes.body.message === "string")
-        return errorRes.body.message;
-      try {
-        return Object.entries(errorRes.body).map(([key, value]) => {
-          if (typeof value === "string") {
-            return `${key}: ${value}`;
-          }
-          if (Array.isArray(value)) {
-            return value.map((v) => `${key}: ${v}`).join("\n");
-          }
-          return `${key}: ${JSON.stringify(value)}`;
-        }).join("\n");
-      } catch (e) {
-        console.error("Failed to extract error message from response body", e);
-      }
-    } else if (typeof errorRes.body === "string")
-      return errorRes.body;
-  } else if (errorRes == null ? void 0 : errorRes.text) {
-    return errorRes.text;
-  } else if (err instanceof Error) {
-    return err.message;
-  }
-  return void 0;
-}
 async function performRequest(action, client) {
   async function checkToken() {
     if (client.auth.tokenIsExpiringSoon()) {
@@ -4308,8 +4315,11 @@ async function performRequest(action, client) {
           console.warn("No signed-in user to sign out.");
         }
         await client.auth.logout();
-        throw new APIError("You have been signed out due to inactivity.", errorResponse, {
-          discard: true
+        throw new APIError({
+          message: "You have been signed out due to inactivity.",
+          response: errorResponse,
+          discard: true,
+          innerError: error2
         });
       }
       console.debug("Forbidden; renewing tokens and retrying.");
@@ -4317,10 +4327,7 @@ async function performRequest(action, client) {
       console.debug("Successfully renewed tokens; retrying request.");
       return requestToSend.query(queryParams);
     }
-    const apiErrorMessage = extractErrorMessage(errorResponse, error2) || "An unexpected error occurred.";
-    throw new APIError(apiErrorMessage, errorResponse, {
-      discard: discardStatuses.includes(status)
-    });
+    throw new APIError({ response: errorResponse, innerError: error2, discard: discardStatuses.includes(status) });
   }
 }
 class MiddlewareChainerPrivate {
@@ -4531,18 +4538,29 @@ class BaseApiService {
         if (response) {
           promise.resolve(response.body);
         } else {
-          const error2 = new APIError(
-            "Could not get a response from the server.",
+          const error2 = new APIError({
+            message: "Could not get a response from the server.",
             response,
-            {
-              discard: true
-            }
-          );
+            discard: true
+          });
           promise.reject(error2);
         }
       };
       const errorHandler = (error2) => {
-        error2.options.discard = true;
+        if (error2 instanceof APIError) {
+          error2.options.discard = true;
+        } else {
+          console.error(
+            "Received an unexpected error while processing a request:",
+            error2,
+            "\nConverting error to APIError and discarding."
+          );
+          error2 = new APIError({
+            message: "An error occurred while processing the request.",
+            innerError: error2,
+            discard: true
+          });
+        }
         promise.reject(error2);
       };
       innerPromise.then(successOrUndefinedHandler, errorHandler);
@@ -7169,8 +7187,7 @@ class OrganizationAccessService extends BaseApiService {
       blockers: [],
       blocks: []
     });
-    const organizationAccesses = result;
-    store.dispatch(setOrganizationAccesses(organizationAccesses));
+    store.dispatch(setOrganizationAccesses(result));
   }
 }
 const cachedRequestPromises = {};