@alan-ai/alan-sdk-web 1.8.130 → 1.8.132

package/dist/alan_lib.js

@@ -89356,7 +89356,7 @@
       hasFooterLinks = !!tempNode.querySelector(".footnotes");
       tempNode.remove();
     }
-    const links = msg.links?.filter((link) => isValidUrl2(link?.href));
+    const links = msg.links?.filter((link) => isValidUrl(link?.href));
     for (let i = 0; i < links?.length; i++) {
       const curLink = links[i];
       const target = getLinkTarget(curLink);
@@ -89383,7 +89383,7 @@
       return "_blank";
     }
   }
-  function isValidUrl2(url) {
+  function isValidUrl(url) {
     try {
       const parsedUrl = new URL(url);
       const hasValidProtocol = parsedUrl.protocol === "http:" || parsedUrl.protocol === "https:";
@@ -98713,6 +98713,7 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
             inlineScript.setAttribute(attr2.name, attr2.value);
           }
         });
+        inlineScript.setAttribute("inlined-resource-name", src);
         inlineScript.textContent = scriptContent;
         scriptTag.parentNode.replaceChild(inlineScript, scriptTag);
         console.log(`Inlined script from ${src}`);
@@ -98726,6 +98727,7 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
       try {
         const cssContent = await fetchResourceWithCache(href);
         const inlineStyle = doc.createElement("style");
+        inlineStyle.setAttribute("inlined-resource-name", href);
         inlineStyle.textContent = cssContent;
         linkTag.parentNode.replaceChild(inlineStyle, linkTag);
         console.log(`Inlined stylesheet from ${href}`);
@@ -98762,48 +98764,58 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
       const getStudioResourceUrlFn = extractFunction(code, "getStudioResourceUrl");
       const getProjectResourceUrlFn = extractFunction(code, "getProjectResourceUrl");
       const getDefaultResourcesFn = extractFunction(code, "getDefaultResources");
-      let getResourceUrl = null;
-      let getStudioResourceUrl = null;
-      let getProjectResourceUrl = null;
-      let isValidUrl = null;
-      let getDefaultResources = null;
+      let iframeGetResourceUrl = null;
+      let iframeGetStudioResourceUrl = null;
+      let iframeGetProjectResourceUrl = null;
+      let iframeIsValidUrl = null;
+      let iframeGetDefaultResources = null;
       try {
-        if (isValidUrlFn) {
-          eval(`isValidUrl = ${isValidUrlFn}`);
-        }
-        if (getResourceUrlFn) {
-          eval(`getResourceUrl = ${getResourceUrlFn}`);
-        }
-        if (getStudioResourceUrlFn) {
-          eval(`getStudioResourceUrl = ${getStudioResourceUrlFn}`);
-        }
-        if (getProjectResourceUrlFn) {
-          eval(`getProjectResourceUrl = ${getProjectResourceUrlFn}`);
-        }
-        if (getDefaultResourcesFn) {
-          eval(`getDefaultResources = ${getDefaultResourcesFn}`);
+        const extracted = eval(`
+                (function() {
+                    const isValidUrl = ${isValidUrlFn || "null"};
+                    const getResourceUrl = ${getResourceUrlFn || "null"};
+                    const getStudioResourceUrl = ${getStudioResourceUrlFn || "null"};
+                    const getProjectResourceUrl = ${getProjectResourceUrlFn || "null"};
+                    const getDefaultResources = ${getDefaultResourcesFn || "null"};
+
+                    return {
+                        isValidUrl,
+                        getResourceUrl,
+                        getStudioResourceUrl,
+                        getProjectResourceUrl,
+                        getDefaultResources
+                    };
+                })()
+            `);
+        if (extracted) {
+          iframeIsValidUrl = extracted.isValidUrl;
+          iframeGetResourceUrl = extracted.getResourceUrl;
+          iframeGetStudioResourceUrl = extracted.getStudioResourceUrl;
+          iframeGetProjectResourceUrl = extracted.getProjectResourceUrl;
+          iframeGetDefaultResources = extracted.getDefaultResources;
         }
       } catch (error) {
         console.error("Failed to parse resource-related functions using eval:", error);
       }
       let hasInternalFunctions = true;
-      if (!getResourceUrl || !getStudioResourceUrl || !getProjectResourceUrl || !isValidUrl || !getDefaultResources) {
+      if (!iframeGetResourceUrl || !iframeGetStudioResourceUrl || !iframeGetProjectResourceUrl || !iframeIsValidUrl || !iframeGetDefaultResources) {
         hasInternalFunctions = false;
         console.error("Unable to parse resource-related functions from the iframe code. Some iframes may appear without content.");
       }
       allInitIframeResourcesInlined = true;
       if (hasInternalFunctions) {
         const addDefaultStylesOptions = extractAddDefaultStylesParams(initIframeBody);
-        if (addDefaultStylesOptions && getDefaultResources) {
+        if (addDefaultStylesOptions && iframeGetDefaultResources) {
           try {
-            const basicResources = getDefaultResources(addDefaultStylesOptions);
+            const basicResources = iframeGetDefaultResources(addDefaultStylesOptions);
             await Promise.all(basicResources.map(async (resource) => {
               try {
                 const resourceType = resource.type;
                 if (resourceType === "stylesheet" && resource.href) {
-                  const resourceUrl = getResourceUrl(resource.href);
+                  const resourceUrl = iframeGetResourceUrl(resource.href);
                   const resourceContent = await fetchResourceWithCache(resourceUrl);
                   const inlineStyle = doc.createElement("style");
+                  inlineStyle.setAttribute("inlined-resource-name", resource.href);
                   inlineStyle.textContent = resourceContent;
                   doc.head.appendChild(inlineStyle);
                   console.log(`Inlined basic style from getDefaultResources: ${resourceUrl}`);
@@ -98816,12 +98828,36 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
             console.error("Failed to get or inline basic resources:", error);
           }
         }
-        await Promise.all(resourceUrls.map(async (resource) => {
+        const resourceResults = await Promise.all(resourceUrls.map(async (resource) => {
           try {
-            const resourceUrl = getResourceUrl(resource.url);
+            const resourceUrl = iframeGetResourceUrl(resource.url);
             const resourceContent = await fetchResourceWithCache(resourceUrl);
+            return {
+              success: true,
+              resource,
+              resourceUrl,
+              resourceContent
+            };
+          } catch (error) {
+            console.error(`Failed to fetch resource from ${resource.url}:`, error);
+            return {
+              success: false,
+              resource,
+              error
+            };
+          }
+        }));
+        let insertionPoint = doc.head.firstChild;
+        for (const result of resourceResults) {
+          if (!result.success) {
+            allInitIframeResourcesInlined = false;
+            continue;
+          }
+          const { resource, resourceUrl, resourceContent } = result;
+          try {
             if (resource.type === "addScript" || resource.url.endsWith(".js")) {
               const inlineScript = doc.createElement("script");
+              inlineScript.setAttribute("inlined-resource-name", resource.url);
               inlineScript.textContent = resourceContent;
               if (resource.options) {
                 const optionsObj = safelyParseScriptOptions(resource.options);
@@ -98835,19 +98871,22 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
                   if (optionsObj.crossOrigin) inlineScript.setAttribute("crossorigin", optionsObj.crossOrigin);
                 }
               }
-              doc.head.appendChild(inlineScript);
+              doc.head.insertBefore(inlineScript, insertionPoint);
+              insertionPoint = inlineScript.nextSibling;
               console.log(`Inlined script: ${resourceUrl}${inlineScript.type ? " (type=" + inlineScript.type + ")" : ""}`);
             } else if (resource.type === "addStyleSheet" || resource.url.endsWith(".css")) {
               const inlineStyle = doc.createElement("style");
+              inlineStyle.setAttribute("inlined-resource-name", resource.url);
               inlineStyle.textContent = resourceContent;
-              doc.head.appendChild(inlineStyle);
+              doc.head.insertBefore(inlineStyle, insertionPoint);
+              insertionPoint = inlineStyle.nextSibling;
               console.log(`Inlined stylesheet: ${resourceUrl}`);
             }
           } catch (error) {
             console.error(`Failed to inline resource from ${resource.url}:`, error);
             allInitIframeResourcesInlined = false;
           }
-        }));
+        }
       }
     }
     return {
@@ -99026,7 +99065,7 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
   }
 
   // alan_btn/src/textChat/helpers/resources.ts
-  function isValidUrl3(url) {
+  function isValidUrl2(url) {
     try {
       new URL(url);
       return true;
@@ -99034,21 +99073,21 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
       return false;
     }
   }
-  function getProjectResourceUrl2(resourcePath) {
+  function getProjectResourceUrl(resourcePath) {
     const resourceBaseUrl = uiState.resourceBaseUrl;
     return `${resourceBaseUrl}/` + resourcePath;
   }
-  function getResourceUrl2(resourceUrl) {
+  function getResourceUrl(resourceUrl) {
     const resourceBaseUrl = uiState.resourceBaseUrl;
     const projectResPrefix = "resource://";
     const studioResPrefix = "studio-resource://";
-    const withPublicUrl = isValidUrl3(resourceUrl);
+    const withPublicUrl = isValidUrl2(resourceUrl);
     if (!resourceUrl) {
       return `${resourceBaseUrl}`;
     }
     if (!withPublicUrl || resourceUrl.startsWith(projectResPrefix)) {
       const cleanResource = resourceUrl.startsWith(projectResPrefix) ? resourceUrl.slice(projectResPrefix.length) : resourceUrl;
-      return getProjectResourceUrl2(cleanResource);
+      return getProjectResourceUrl(cleanResource);
     }
     return resourceUrl;
   }
@@ -99057,19 +99096,19 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
       let el;
       if (resource.type === "script" && resource.src) {
         el = document.createElement("script");
-        el.src = getResourceUrl2(resource.src);
+        el.src = getResourceUrl(resource.src);
         el.onload = () => resolve(resource);
         el.onerror = () => reject(new Error("Failed to load script:", resource.src));
       } else if (resource.type === "stylesheet" && resource.href) {
         el = document.createElement("link");
         el.rel = "stylesheet";
-        el.href = getResourceUrl2(resource.href);
+        el.href = getResourceUrl(resource.href);
         el.onload = () => resolve(resource);
         el.onerror = () => reject(new Error("Failed to load stylesheet:", resource.href));
       } else if (resource.type === "font" && resource.href) {
         el = document.createElement("link");
         el.rel = "stylesheet";
-        el.href = getResourceUrl2(resource.href);
+        el.href = getResourceUrl(resource.href);
         el.onload = () => resolve(resource);
         el.onerror = () => reject(new Error("Failed to load stylesheet:", resource.href));
       }
@@ -99113,7 +99152,7 @@ var hljs=function(){"use strict";function e(n){return n instanceof Map?n.clear=n
   // alan_btn/alan_btn.ts
   (function(ns) {
     const uiState10 = getUIState();
-    const version2 = "alan-version.1.8.130".replace("alan-version.", "");
+    const version2 = "alan-version.1.8.132".replace("alan-version.", "");
     uiState10.lib.version = version2;
     window.alanLib = { version: version2 };
     if (window.alanBtn) {