eventmodeler 0.4.2 → 0.4.3

package/dist/cloud/slices/index.js

@@ -11,16 +11,7 @@ import { getValidAccessToken } from '../../lib/auth.js';
  */
 async function handleHttpError(response, path) {
     const text = await response.text().catch(() => '');
-    let errorDetail = '';
-    if (text.trim()) {
-        try {
-            const parsed = JSON.parse(text);
-            errorDetail = parsed.error ?? parsed.message ?? '';
-        }
-        catch {
-            // Response body isn't JSON (could be HTML error page, etc.)
-        }
-    }
+    const errorDetail = extractErrorDetail(text);
     switch (response.status) {
         case 401:
             throw new Error(`Authentication required. Run 'eventmodeler login' to authenticate.` +
@@ -34,6 +25,73 @@ async function handleHttpError(response, path) {
             throw new Error(errorDetail || `HTTP ${response.status}: ${response.statusText}`);
     }
 }
+const GENERIC_ERROR_MESSAGES = new Set([
+    'internal server error',
+    'bad request',
+    'unauthorized',
+    'forbidden',
+    'not found',
+]);
+function isGenericErrorMessage(value) {
+    return GENERIC_ERROR_MESSAGES.has(value.trim().toLowerCase());
+}
+function toStringValue(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+function collectCandidateMessages(node, out) {
+    if (!node || typeof node !== 'object')
+        return;
+    const obj = node;
+    // Prefer richer fields before generic "error".
+    for (const key of ['message', 'detail', 'reason', 'description', 'title', 'error']) {
+        const value = toStringValue(obj[key]);
+        if (value)
+            out.push(value);
+    }
+    const errors = obj.errors;
+    if (Array.isArray(errors)) {
+        for (const entry of errors) {
+            if (typeof entry === 'string') {
+                const value = entry.trim();
+                if (value)
+                    out.push(value);
+            }
+            else if (entry && typeof entry === 'object') {
+                collectCandidateMessages(entry, out);
+            }
+        }
+    }
+    const cause = obj.cause;
+    if (cause && typeof cause === 'object') {
+        collectCandidateMessages(cause, out);
+    }
+}
+function extractErrorDetail(text) {
+    const body = text.trim();
+    if (!body)
+        return '';
+    try {
+        const parsed = JSON.parse(body);
+        if (typeof parsed === 'string') {
+            return parsed.trim();
+        }
+        const candidates = [];
+        collectCandidateMessages(parsed, candidates);
+        if (candidates.length > 0) {
+            const specific = candidates.find((value) => !isGenericErrorMessage(value));
+            return specific ?? candidates[0];
+        }
+    }
+    catch {
+        // Not JSON. Fall back to plain text below.
+    }
+    // Avoid dumping entire HTML pages from reverse proxies.
+    if (body.startsWith('<')) {
+        const title = body.match(/<title>([^<]+)<\/title>/i)?.[1]?.trim();
+        return title && !isGenericErrorMessage(title) ? title : '';
+    }
+    return body;
+}
 async function cliGet(path, params) {
     const backendUrl = getBackendUrl();
     const accessToken = await getValidAccessToken();

package/dist/lib/cloud-client.js

@@ -4,8 +4,8 @@ import { getValidAccessToken } from './auth.js';
  * Handle HTTP error responses with user-friendly messages
  */
 async function handleHttpError(response) {
-    const errorData = await response.json().catch(() => ({}));
-    const errorDetail = errorData.error ?? errorData.message ?? '';
+    const text = await response.text().catch(() => '');
+    const errorDetail = extractErrorDetail(text);
     switch (response.status) {
         case 401:
             throw new Error(`Authentication required. Run 'eventmodeler login' to authenticate.` +
@@ -19,6 +19,73 @@ async function handleHttpError(response) {
             throw new Error(errorDetail || `HTTP ${response.status}: ${response.statusText}`);
     }
 }
+const GENERIC_ERROR_MESSAGES = new Set([
+    'internal server error',
+    'bad request',
+    'unauthorized',
+    'forbidden',
+    'not found',
+]);
+function isGenericErrorMessage(value) {
+    return GENERIC_ERROR_MESSAGES.has(value.trim().toLowerCase());
+}
+function toStringValue(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+function collectCandidateMessages(node, out) {
+    if (!node || typeof node !== 'object')
+        return;
+    const obj = node;
+    // Prefer specific fields before generic "error".
+    for (const key of ['message', 'detail', 'reason', 'description', 'title', 'error']) {
+        const value = toStringValue(obj[key]);
+        if (value)
+            out.push(value);
+    }
+    const errors = obj.errors;
+    if (Array.isArray(errors)) {
+        for (const entry of errors) {
+            if (typeof entry === 'string') {
+                const value = entry.trim();
+                if (value)
+                    out.push(value);
+            }
+            else if (entry && typeof entry === 'object') {
+                collectCandidateMessages(entry, out);
+            }
+        }
+    }
+    const cause = obj.cause;
+    if (cause && typeof cause === 'object') {
+        collectCandidateMessages(cause, out);
+    }
+}
+function extractErrorDetail(text) {
+    const body = text.trim();
+    if (!body)
+        return '';
+    try {
+        const parsed = JSON.parse(body);
+        if (typeof parsed === 'string') {
+            return parsed.trim();
+        }
+        const candidates = [];
+        collectCandidateMessages(parsed, candidates);
+        if (candidates.length > 0) {
+            const specific = candidates.find((value) => !isGenericErrorMessage(value));
+            return specific ?? candidates[0];
+        }
+    }
+    catch {
+        // Not JSON. Fall back to plain text below.
+    }
+    // Avoid dumping full HTML error pages.
+    if (body.startsWith('<')) {
+        const title = body.match(/<title>([^<]+)<\/title>/i)?.[1]?.trim();
+        return title && !isGenericErrorMessage(title) ? title : '';
+    }
+    return body;
+}
 /**
  * Create a cloud client for interacting with the Axon backend.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eventmodeler",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "CLI tool for interacting with Event Model files - query, update, and export event models from the terminal",
   "type": "module",
   "bin": {