@hef2024/llmasaservice-ui 0.24.4 → 0.24.5

package/dist/index.js

@@ -1414,46 +1414,51 @@ var ChatPanel = ({
           const urlToFetch = `${publicAPIUrl}/tools/${encodeURIComponent(
             m.url
           )}`;
-          try {
-            const requestHeaders = yield buildMcpRequestHeaders({
-              phase: "list",
-              mcpServer: m
-            });
-            const response2 = yield fetch(urlToFetch, {
-              headers: requestHeaders
-            });
-            if (!response2.ok) {
-              console.error(
-                `Error fetching tools from ${m.url}: ${response2.status} ${response2.statusText}`
-              );
-              const errorBody = yield response2.text();
-              console.error(`Error body: ${errorBody}`);
-              throw new Error(
-                `HTTP ${response2.status}: ${response2.statusText}`
-              );
-            }
-            const toolsFromServer = yield response2.json();
-            if (Array.isArray(toolsFromServer)) {
-              return toolsFromServer.map((tool) => __spreadProps(__spreadValues({}, tool), {
-                url: m.url,
-                accessToken: m.accessToken || "",
-                headers: requestHeaders
-              }));
-            } else {
-              return [];
-            }
-          } catch (fetchError) {
+          const requestHeaders = yield buildMcpRequestHeaders({
+            phase: "list",
+            mcpServer: m
+          });
+          const response2 = yield fetch(urlToFetch, {
+            headers: requestHeaders
+          });
+          if (!response2.ok) {
             console.error(
-              `Network or parsing error fetching tools from ${m.url}:`,
-              fetchError
+              `Error fetching tools from ${m.url}: ${response2.status} ${response2.statusText}`
             );
-            throw fetchError;
+            const errorBody = yield response2.text();
+            console.error(`Error body: ${errorBody}`);
+            throw new Error(
+              `HTTP ${response2.status}: ${response2.statusText}`
+            );
+          }
+          const toolsFromServer = yield response2.json();
+          if (Array.isArray(toolsFromServer)) {
+            return toolsFromServer.map((tool) => __spreadProps(__spreadValues({}, tool), {
+              url: m.url,
+              accessToken: m.accessToken || "",
+              headers: requestHeaders
+            }));
           }
+          return [];
         }));
-        const results = yield Promise.all(fetchPromises);
-        const allTools = results.flat();
+        const settledResults = yield Promise.allSettled(fetchPromises);
+        const allTools = settledResults.flatMap((result, index) => {
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
+          const server = mcpServers == null ? void 0 : mcpServers[index];
+          const failingUrl = typeof (server == null ? void 0 : server.url) === "string" ? server.url : `mcp[${index}]`;
+          console.error(
+            `Network or parsing error fetching tools from ${failingUrl}:`,
+            result.reason
+          );
+          return [];
+        });
+        const failedCount = settledResults.filter(
+          (result) => result.status === "rejected"
+        ).length;
         setToolList(allTools);
-        setToolsFetchError(false);
+        setToolsFetchError(failedCount > 0 && allTools.length === 0);
       } catch (error2) {
         console.error(
           "An error occurred while processing tool fetches:",
@@ -5418,7 +5423,7 @@ var AIChatPanel = ({
         return;
       }
       try {
-        const enriched = yield Promise.all(
+        const settled = yield Promise.allSettled(
           mcpServers.map((server) => __async(void 0, null, function* () {
             const resolved = yield resolveMcpAuthHeaders({
               phase: "list",
@@ -5433,6 +5438,18 @@ var AIChatPanel = ({
             });
           }))
         );
+        const enriched = settled.map((result, index) => {
+          var _a2;
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
+          const failingUrl = typeof ((_a2 = mcpServers == null ? void 0 : mcpServers[index]) == null ? void 0 : _a2.url) === "string" ? mcpServers[index].url : `mcp[${index}]`;
+          console.error(
+            `[AIChatPanel] Failed to resolve MCP auth headers for ${failingUrl}:`,
+            result.reason
+          );
+          return mcpServers[index];
+        });
         if (!cancelled) setResolvedMcpServers(enriched);
       } catch (error2) {
         console.error("[AIChatPanel] Failed to resolve MCP auth headers:", error2);
@@ -5524,10 +5541,22 @@ var AIChatPanel = ({
             headers: requestHeaders
           }));
         }));
-        const results = yield Promise.all(fetchPromises);
-        const allTools = results.flat();
+        const settled = yield Promise.allSettled(fetchPromises);
+        const allTools = settled.flatMap((result, index) => {
+          var _a2;
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
+          const failingUrl = typeof ((_a2 = resolvedMcpServers == null ? void 0 : resolvedMcpServers[index]) == null ? void 0 : _a2.url) === "string" ? resolvedMcpServers[index].url : `mcp[${index}]`;
+          console.error(
+            `[AIChatPanel] Failed to load MCP tools from ${failingUrl}:`,
+            result.reason
+          );
+          return [];
+        });
+        const failedCount = settled.filter((result) => result.status === "rejected").length;
         setToolList(allTools);
-        setToolsFetchError(false);
+        setToolsFetchError(failedCount > 0 && allTools.length === 0);
       } catch (error2) {
         console.error("[AIChatPanel] Failed to load MCP tools:", error2);
         setToolList([]);

package/dist/index.mjs

@@ -1373,46 +1373,51 @@ var ChatPanel = ({
           const urlToFetch = `${publicAPIUrl}/tools/${encodeURIComponent(
             m.url
           )}`;
-          try {
-            const requestHeaders = yield buildMcpRequestHeaders({
-              phase: "list",
-              mcpServer: m
-            });
-            const response2 = yield fetch(urlToFetch, {
-              headers: requestHeaders
-            });
-            if (!response2.ok) {
-              console.error(
-                `Error fetching tools from ${m.url}: ${response2.status} ${response2.statusText}`
-              );
-              const errorBody = yield response2.text();
-              console.error(`Error body: ${errorBody}`);
-              throw new Error(
-                `HTTP ${response2.status}: ${response2.statusText}`
-              );
-            }
-            const toolsFromServer = yield response2.json();
-            if (Array.isArray(toolsFromServer)) {
-              return toolsFromServer.map((tool) => __spreadProps(__spreadValues({}, tool), {
-                url: m.url,
-                accessToken: m.accessToken || "",
-                headers: requestHeaders
-              }));
-            } else {
-              return [];
-            }
-          } catch (fetchError) {
+          const requestHeaders = yield buildMcpRequestHeaders({
+            phase: "list",
+            mcpServer: m
+          });
+          const response2 = yield fetch(urlToFetch, {
+            headers: requestHeaders
+          });
+          if (!response2.ok) {
             console.error(
-              `Network or parsing error fetching tools from ${m.url}:`,
-              fetchError
+              `Error fetching tools from ${m.url}: ${response2.status} ${response2.statusText}`
             );
-            throw fetchError;
+            const errorBody = yield response2.text();
+            console.error(`Error body: ${errorBody}`);
+            throw new Error(
+              `HTTP ${response2.status}: ${response2.statusText}`
+            );
+          }
+          const toolsFromServer = yield response2.json();
+          if (Array.isArray(toolsFromServer)) {
+            return toolsFromServer.map((tool) => __spreadProps(__spreadValues({}, tool), {
+              url: m.url,
+              accessToken: m.accessToken || "",
+              headers: requestHeaders
+            }));
           }
+          return [];
         }));
-        const results = yield Promise.all(fetchPromises);
-        const allTools = results.flat();
+        const settledResults = yield Promise.allSettled(fetchPromises);
+        const allTools = settledResults.flatMap((result, index) => {
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
+          const server = mcpServers == null ? void 0 : mcpServers[index];
+          const failingUrl = typeof (server == null ? void 0 : server.url) === "string" ? server.url : `mcp[${index}]`;
+          console.error(
+            `Network or parsing error fetching tools from ${failingUrl}:`,
+            result.reason
+          );
+          return [];
+        });
+        const failedCount = settledResults.filter(
+          (result) => result.status === "rejected"
+        ).length;
         setToolList(allTools);
-        setToolsFetchError(false);
+        setToolsFetchError(failedCount > 0 && allTools.length === 0);
       } catch (error2) {
         console.error(
           "An error occurred while processing tool fetches:",
@@ -5383,7 +5388,7 @@ var AIChatPanel = ({
         return;
       }
       try {
-        const enriched = yield Promise.all(
+        const settled = yield Promise.allSettled(
           mcpServers.map((server) => __async(void 0, null, function* () {
             const resolved = yield resolveMcpAuthHeaders({
               phase: "list",
@@ -5398,6 +5403,18 @@ var AIChatPanel = ({
             });
           }))
         );
+        const enriched = settled.map((result, index) => {
+          var _a2;
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
+          const failingUrl = typeof ((_a2 = mcpServers == null ? void 0 : mcpServers[index]) == null ? void 0 : _a2.url) === "string" ? mcpServers[index].url : `mcp[${index}]`;
+          console.error(
+            `[AIChatPanel] Failed to resolve MCP auth headers for ${failingUrl}:`,
+            result.reason
+          );
+          return mcpServers[index];
+        });
         if (!cancelled) setResolvedMcpServers(enriched);
       } catch (error2) {
         console.error("[AIChatPanel] Failed to resolve MCP auth headers:", error2);
@@ -5489,10 +5506,22 @@ var AIChatPanel = ({
             headers: requestHeaders
           }));
         }));
-        const results = yield Promise.all(fetchPromises);
-        const allTools = results.flat();
+        const settled = yield Promise.allSettled(fetchPromises);
+        const allTools = settled.flatMap((result, index) => {
+          var _a2;
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
+          const failingUrl = typeof ((_a2 = resolvedMcpServers == null ? void 0 : resolvedMcpServers[index]) == null ? void 0 : _a2.url) === "string" ? resolvedMcpServers[index].url : `mcp[${index}]`;
+          console.error(
+            `[AIChatPanel] Failed to load MCP tools from ${failingUrl}:`,
+            result.reason
+          );
+          return [];
+        });
+        const failedCount = settled.filter((result) => result.status === "rejected").length;
         setToolList(allTools);
-        setToolsFetchError(false);
+        setToolsFetchError(failedCount > 0 && allTools.length === 0);
       } catch (error2) {
         console.error("[AIChatPanel] Failed to load MCP tools:", error2);
         setToolList([]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hef2024/llmasaservice-ui",
-  "version": "0.24.4",
+  "version": "0.24.5",
   "description": "Prebuilt UI components for LLMAsAService.io",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/AIChatPanel.tsx

@@ -2006,7 +2006,7 @@ const AIChatPanel: React.FC<AIChatPanelProps> = ({
       }
 
       try {
-        const enriched = await Promise.all(
+        const settled = await Promise.allSettled(
           mcpServers.map(async (server) => {
             const resolved = await resolveMcpAuthHeaders({
               phase: 'list',
@@ -2025,6 +2025,23 @@ const AIChatPanel: React.FC<AIChatPanelProps> = ({
             };
           })
         );
+
+        const enriched = settled.map((result, index) => {
+          if (result.status === 'fulfilled') {
+            return result.value;
+          }
+
+          const failingUrl =
+            typeof mcpServers?.[index]?.url === 'string'
+              ? mcpServers[index].url
+              : `mcp[${index}]`;
+          console.error(
+            `[AIChatPanel] Failed to resolve MCP auth headers for ${failingUrl}:`,
+            result.reason
+          );
+          return mcpServers[index];
+        });
+
         if (!cancelled) setResolvedMcpServers(enriched);
       } catch (error) {
         console.error('[AIChatPanel] Failed to resolve MCP auth headers:', error);
@@ -2142,10 +2159,26 @@ const AIChatPanel: React.FC<AIChatPanelProps> = ({
           }));
         });
 
-        const results = await Promise.all(fetchPromises);
-        const allTools = results.flat();
+        const settled = await Promise.allSettled(fetchPromises);
+        const allTools = settled.flatMap((result, index) => {
+          if (result.status === 'fulfilled') {
+            return result.value;
+          }
+
+          const failingUrl =
+            typeof resolvedMcpServers?.[index]?.url === 'string'
+              ? resolvedMcpServers[index].url
+              : `mcp[${index}]`;
+          console.error(
+            `[AIChatPanel] Failed to load MCP tools from ${failingUrl}:`,
+            result.reason
+          );
+          return [];
+        });
+
+        const failedCount = settled.filter((result) => result.status === 'rejected').length;
         setToolList(allTools);
-        setToolsFetchError(false);
+        setToolsFetchError(failedCount > 0 && allTools.length === 0);
       } catch (error) {
         console.error('[AIChatPanel] Failed to load MCP tools:', error);
         setToolList([]);

package/src/ChatPanel.tsx

@@ -701,58 +701,65 @@ const ChatPanel: React.FC<ChatPanelProps & ExtraProps> = ({
       setToolsFetchError(false);
 
       try {
-        // Create an array of promises, one for each fetch call
         const fetchPromises = (mcpServers ?? []).map(async (m: any) => {
           const urlToFetch = `${publicAPIUrl}/tools/${encodeURIComponent(
             m.url
           )}`;
 
-          try {
-            const requestHeaders = await buildMcpRequestHeaders({
-              phase: "list",
-              mcpServer: m,
-            });
-            const response = await fetch(urlToFetch, {
-              headers: requestHeaders,
-            });
-            if (!response.ok) {
-              console.error(
-                `Error fetching tools from ${m.url}: ${response.status} ${response.statusText}`
-              );
-              const errorBody = await response.text();
-              console.error(`Error body: ${errorBody}`);
-              throw new Error(
-                `HTTP ${response.status}: ${response.statusText}`
-              );
-            }
-            const toolsFromServer = await response.json();
-            if (Array.isArray(toolsFromServer)) {
-              return toolsFromServer.map((tool) => ({
-                ...tool,
-                url: m.url,
-                accessToken: m.accessToken || "",
-                headers: requestHeaders,
-              }));
-            } else {
-              return [];
-            }
-          } catch (fetchError) {
+          const requestHeaders = await buildMcpRequestHeaders({
+            phase: "list",
+            mcpServer: m,
+          });
+          const response = await fetch(urlToFetch, {
+            headers: requestHeaders,
+          });
+          if (!response.ok) {
             console.error(
-              `Network or parsing error fetching tools from ${m.url}:`,
-              fetchError
+              `Error fetching tools from ${m.url}: ${response.status} ${response.statusText}`
             );
-            throw fetchError; // Re-throw to be caught by outer try-catch
+            const errorBody = await response.text();
+            console.error(`Error body: ${errorBody}`);
+            throw new Error(
+              `HTTP ${response.status}: ${response.statusText}`
+            );
+          }
+          const toolsFromServer = await response.json();
+          if (Array.isArray(toolsFromServer)) {
+            return toolsFromServer.map((tool) => ({
+              ...tool,
+              url: m.url,
+              accessToken: m.accessToken || "",
+              headers: requestHeaders,
+            }));
           }
+          return [];
         });
 
-        // Wait for all fetch calls to complete
-        const results = await Promise.all(fetchPromises);
+        const settledResults = await Promise.allSettled(fetchPromises);
+        const allTools = settledResults.flatMap((result, index) => {
+          if (result.status === "fulfilled") {
+            return result.value;
+          }
 
-        const allTools = results.flat();
+          const server = (mcpServers as Array<{ url?: string }> | undefined)?.[
+            index
+          ];
+          const failingUrl =
+            typeof server?.url === "string" ? server.url : `mcp[${index}]`;
+          console.error(
+            `Network or parsing error fetching tools from ${failingUrl}:`,
+            result.reason
+          );
+          return [];
+        });
+
+        const failedCount = settledResults.filter(
+          (result) => result.status === "rejected"
+        ).length;
 
         //console.log("Merged tools from all servers:", allTools);
         setToolList(allTools);
-        setToolsFetchError(false);
+        setToolsFetchError(failedCount > 0 && allTools.length === 0);
       } catch (error) {
         console.error(
           "An error occurred while processing tool fetches:",