@blueking/bk-weweb 0.0.2-5.beta.2 → 0.0.2-5.beta.4

package/dist/collect-source.js

@@ -1188,13 +1188,9 @@ async function execAppScripts(app) {
     }
     const appScriptList = Array.from(app.source.scripts.values()).filter(script => script.fromHtml && !script.initial);
     const commomList = appScriptList.filter(script => (!script.async && !script.defer) || script.isModule);
-    let i = 0;
-    while (i < commomList.length && commomList[i]) {
-        await commomList[i].excuteCode(app);
-        i++;
-    }
     // 保证同步脚本 和 module类型 最先执行
-    // await Promise.all(commomList.map(script => script.excuteCode(app)));
+    await Promise.all(commomList.map(script => script.getCode(app)));
+    await Promise.all(commomList.map(script => script.excuteCode(app)));
     // 最后执行 defer 和 async 脚本
     const deferScriptList = [];
     const asyncScriptList = [];
@@ -1823,7 +1819,12 @@ const createProxyDocument = (rawDocument, app) => {
             return rawDocument.querySelector.call(this, selectors);
         }
         // 返回当前应用程序容器中匹配选择器的元素，如果没有匹配的元素则返回 null
-        return app?.container?.querySelector(selectors) ?? null;
+        try {
+            return app?.container?.querySelector(selectors) ?? null;
+        }
+        catch {
+            return null;
+        }
     }
     /**
      * 重写了 Document 类的 querySelectorAll 方法
@@ -1849,7 +1850,7 @@ const createProxyDocument = (rawDocument, app) => {
     }
     function getElementsByTagName(key) {
         if (SPECIAL_ELEMENT_TAG.includes(key) || (!app?.showSourceCode && key.toLocaleLowerCase() === 'script')) {
-            return rawDocument.getElementsByName(key);
+            return rawDocument.getElementsByTagName(key);
         }
         return querySelectorAllNew(key);
     }
@@ -2607,9 +2608,10 @@ class EntrySource {
             const nonceStr = randomUrl();
             const scriptInstance = new Script({
                 async: false,
-                code: script.textContent,
+                code: script.textContent.replace(/var\s+([^=,]+)=/gm, `window.$1 = `),
                 defer: script.type === 'module',
                 fromHtml: !needReplaceELement,
+                initial: true,
                 isModule: script.type === 'module',
                 url: nonceStr,
             });
@@ -2623,36 +2625,64 @@ class EntrySource {
         }
         return { replace: script };
     }
-    collectScriptAndStyle(parent, app) {
-        const children = Array.from(parent.children);
-        children.length &&
-            children.forEach(child => {
-                this.collectScriptAndStyle(child, app);
-            });
-        children?.forEach(dom => {
-            if (dom instanceof HTMLLinkElement) {
-                this.collectLink(dom, parent);
-            }
-            else if (dom instanceof HTMLStyleElement) {
-                if (!dom.hasAttribute('exclude') && !dom.hasAttribute('ignore')) {
-                    this.styles.set(randomUrl(), new Style({
-                        code: dom.textContent || '',
-                        fromHtml: true,
-                        url: '',
-                    }));
-                    dom.remove();
-                }
-            }
-            else if (dom instanceof HTMLScriptElement) {
-                this.collectScript(dom, parent);
-            }
-            else if (dom instanceof HTMLMetaElement || dom instanceof HTMLTitleElement) {
-                parent.removeChild(dom);
+    collectScriptAndStyle(parent) {
+        const links = Array.from(parent.querySelectorAll('link'));
+        links?.forEach(link => {
+            this.collectLink(link, link.parentElement);
+        });
+        const styles = Array.from(parent.querySelectorAll('style'));
+        styles?.forEach(style => {
+            if (!style.hasAttribute('exclude') && !style.hasAttribute('ignore')) {
+                this.styles.set(randomUrl(), new Style({
+                    code: style.textContent || '',
+                    fromHtml: true,
+                    url: '',
+                }));
+                style.remove();
             }
-            else if (dom instanceof HTMLImageElement && dom.hasAttribute('src')) {
-                dom.setAttribute('src', fillUpPath(dom.getAttribute('src'), this.url));
+        });
+        const scripts = Array.from(parent.querySelectorAll('script'));
+        scripts?.forEach(script => {
+            this.collectScript(script, script.parentElement);
+        });
+        const metas = Array.from(parent.querySelectorAll('meta'));
+        metas?.forEach(meta => {
+            meta.parentElement.removeChild(meta);
+        });
+        const imgs = Array.from(parent.querySelectorAll('img'));
+        imgs?.forEach(img => {
+            if (img.hasAttribute('src')) {
+                img.setAttribute('src', fillUpPath(img.getAttribute('src'), this.url));
             }
         });
+        // const children = Array.from(parent.children);
+        // children?.forEach(dom => {
+        //   if (dom instanceof HTMLLinkElement) {
+        //     this.collectLink(dom, parent);
+        //   } else if (dom instanceof HTMLStyleElement) {
+        //     if (!dom.hasAttribute('exclude') && !dom.hasAttribute('ignore')) {
+        //       this.styles.set(
+        //         randomUrl(),
+        //         new Style({
+        //           code: dom.textContent || '',
+        //           fromHtml: true,
+        //           url: '',
+        //         }),
+        //       );
+        //       dom.remove();
+        //     }
+        //   } else if (dom instanceof HTMLScriptElement) {
+        //     this.collectScript(dom, parent);
+        //   } else if (dom instanceof HTMLMetaElement || dom instanceof HTMLTitleElement) {
+        //     parent.removeChild(dom);
+        //   } else if (dom instanceof HTMLImageElement && dom.hasAttribute('src')) {
+        //     dom.setAttribute('src', fillUpPath(dom.getAttribute('src')!, this.url));
+        //   }
+        // });
+        // children.length &&
+        //   children.forEach(child => {
+        //     this.collectScriptAndStyle(child as HTMLElement, app);
+        //   });
     }
     getScript(url) {
         return this.scripts.get(url);
@@ -2690,7 +2720,7 @@ class EntrySource {
         if (wrapElement.__BK_WEWEB_APP_KEY__)
             delete wrapElement.__BK_WEWEB_APP_KEY__;
         wrapElement.innerHTML = htmlStr.replace(/<\/?head>/gim, '').replace(/<\/?body>/i, '');
-        this.collectScriptAndStyle(wrapElement, app);
+        this.collectScriptAndStyle(wrapElement);
         await excuteAppStyles(app, wrapElement);
         this.html = wrapElement;
     }