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

package/dist/overmap-core.js

@@ -3316,7 +3316,6 @@ const defaultStore = configureStore({
   }
 });
 async function performRequest(action, client) {
-  var _a2;
   async function checkToken() {
     if (client.auth.tokenIsExpiringSoon()) {
       await client.auth.renewTokens();
@@ -3411,9 +3410,13 @@ async function performRequest(action, client) {
     return await requestToSend.query(queryParams);
   } catch (error) {
     console.debug("TYPE OF ERROR:", typeof error, error instanceof Error, error instanceof Response);
+    if (error instanceof Error) {
+      console.error(error.message);
+    }
     console.error(error);
     const originalError = error;
-    if (originalError.status === 401) {
+    const status = originalError["status"];
+    if (status === 401) {
       console.debug("Forbidden; renewing tokens and retrying.");
       try {
         await client.auth.renewTokens();
@@ -3428,27 +3431,23 @@ 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.", originalError, {
+          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
-    );
+    const members = ["message", "text", "body", "error"];
+    const apiErrorMessage = members.map((member) => originalError[member]).find((member) => member !== void 0);
     throw new APIError(
       typeof apiErrorMessage === "string" ? apiErrorMessage : (
         // TODO: Error codes for all APIErrors.
         // TODO: Constant for all messages.
-        originalError.text || "An unexpected error occurred."
+        "An unexpected error occurred."
       ),
+      // TODO: Update the type in APIError to accept Error as well, or figure out when it's this or that.
       originalError,
       {
-        discard: discardStatuses.includes(originalError.status)
+        discard: discardStatuses.includes(status)
       }
     );
   }