@overmap-ai/core 1.0.25-fix-api-error-messages.2 → 1.0.25-fix-api-error-messages.4

package/dist/overmap-core.js

@@ -3315,8 +3315,39 @@ const defaultStore = configureStore({
     });
   }
 });
+function extractResponseFromError(error) {
+  function isResponse(response) {
+    const knownKeys = ["ok", "redirect", "clientError", "serverError", "error"];
+    return typeof response === "object" && response !== null && knownKeys.every((key) => key in response);
+  }
+  if (isResponse(error))
+    return error;
+  if (typeof error === "object" && error !== null) {
+    const typedError = error;
+    if (isResponse(typedError.response))
+      return typedError.response;
+    if (typedError.response && isResponse(typedError.response.response))
+      return typedError.response.response;
+  }
+  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;
+    } 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) {
-  var _a2;
   async function checkToken() {
     if (client.auth.tokenIsExpiringSoon()) {
       await client.auth.renewTokens();
@@ -3410,10 +3441,9 @@ async function performRequest(action, client) {
   try {
     return await requestToSend.query(queryParams);
   } catch (error) {
-    console.debug("TYPE OF ERROR:", typeof error, error instanceof Error, error instanceof Response);
-    console.error(error);
-    const originalError = error;
-    if (originalError.status === 401) {
+    const errorResponse = extractResponseFromError(error);
+    const status = errorResponse == null ? void 0 : errorResponse.status;
+    if (status === 401) {
       console.debug("Forbidden; renewing tokens and retrying.");
       try {
         await client.auth.renewTokens();
@@ -3428,29 +3458,15 @@ async function performRequest(action, client) {
         } else {
           console.warn("No signed-in user to sign out.");
         }
-        throw new APIError("You have been signed out due to inactivity.", originalError, { discard: true });
+        throw new APIError("You have been signed out due to inactivity.", errorResponse, {
+          discard: true
+        });
       }
     }
-    const apiErrorMessage = ((_a2 = originalError.body) == null ? void 0 : _a2.error) ?? originalError.text ?? originalError.error;
-    console.log(
-      "API error:",
-      originalError,
-      originalError.error,
-      originalError.text,
-      originalError.body,
-      originalError.status
-    );
-    throw new APIError(
-      typeof apiErrorMessage === "string" ? apiErrorMessage : (
-        // TODO: Error codes for all APIErrors.
-        // TODO: Constant for all messages.
-        originalError.text || "An unexpected error occurred."
-      ),
-      originalError,
-      {
-        discard: discardStatuses.includes(originalError.status)
-      }
-    );
+    const apiErrorMessage = extractErrorMessage(errorResponse, error) || "An unexpected error occurred.";
+    throw new APIError(apiErrorMessage, errorResponse, {
+      discard: discardStatuses.includes(status)
+    });
   }
 }
 class MiddlewareChainerPrivate {