@lvce-editor/main-process 6.37.1 → 6.37.3

package/dist/mainProcessMain.js

@@ -6459,6 +6459,8 @@ const ElectronBrowserViewEventListenerLogin = {
 	key: key$4
 };
 
+const maxFaviconBytes = 1024 * 1024;
+const faviconFetchTimeout = 2000;
 const key$3 = PageFaviconUpdated;
 const attach$5 = (webContents, listener) => {
   webContents.on(PageFaviconUpdated, listener);
@@ -6466,9 +6468,73 @@ const attach$5 = (webContents, listener) => {
 const detach$3 = (webContents, listener) => {
   webContents.off(PageFaviconUpdated, listener);
 };
-const handler$3 = (event, favicons) => {
+const getFaviconDataUrl = async (fetcher, favicon, signal) => {
+  try {
+    const response = await fetcher(favicon, {
+      signal
+    });
+    if (!response.ok) {
+      return '';
+    }
+    const contentLength = Number(response.headers.get('content-length'));
+    if (contentLength > maxFaviconBytes) {
+      return '';
+    }
+    const bytes = Buffer.from(await response.arrayBuffer());
+    if (bytes.byteLength > maxFaviconBytes) {
+      return '';
+    }
+    const contentType = response.headers.get('content-type') || 'image/x-icon';
+    const mimeType = contentType.split(';', 1)[0].trim();
+    if (!mimeType.startsWith('image/') && mimeType !== 'application/octet-stream') {
+      return '';
+    }
+    return `data:${mimeType};base64,${bytes.toString('base64')}`;
+  } catch {
+    return '';
+  }
+};
+const resolveWithFetcher = async (fetcher, favicons, signal) => {
+  for (const favicon of favicons) {
+    const dataUrl = await getFaviconDataUrl(fetcher, favicon, signal);
+    if (dataUrl) {
+      return dataUrl;
+    }
+  }
+  return '';
+};
+const resolveWithTimeout = async (fetcher, favicons) => {
+  const controller = new AbortController();
+  let timeout;
+  const timeoutPromise = new Promise(resolve => {
+    timeout = setTimeout(() => {
+      controller.abort();
+      resolve('');
+    }, faviconFetchTimeout);
+  });
+  try {
+    return await Promise.race([resolveWithFetcher(fetcher, favicons, controller.signal), timeoutPromise]);
+  } finally {
+    clearTimeout(timeout);
+  }
+};
+const resolveFavicon = async (event, favicons) => {
+  const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
+  if (dataUrl) {
+    return [dataUrl];
+  }
+  const sessionFavicon = await resolveWithTimeout((url, options) => event.sender.session.fetch(url, options), favicons);
+  if (sessionFavicon) {
+    return [sessionFavicon];
+  }
+  const networkFavicon = await resolveWithTimeout((url, options) => fetch(url, options), favicons);
+  return networkFavicon ? [networkFavicon] : favicons;
+};
+const handler$3 = async (event, favicons) => {
+  const pageUrl = event.sender.getURL();
+  const resolvedFavicons = await resolveFavicon(event, favicons);
   return {
-    messages: [['handlePageFaviconUpdated', favicons]],
+    messages: event.sender.getURL() === pageUrl ? [['handlePageFaviconUpdated', resolvedFavicons]] : [],
     result: undefined
   };
 };
@@ -6786,18 +6852,31 @@ const attachEventListenersToWebContents = (webContentsId, webContents, browserWi
   attach(webContents);
   const values = Object.values(ElectronBrowserViewEventListeners);
   for (const value of values) {
-    const wrappedListener = (...args) => {
-      // @ts-ignore
-      const {
-        messages,
-        result
-      } = value.handler(...args, webContentsId);
+    const handleResult = ({
+      messages,
+      result
+    }) => {
       for (const message of messages) {
         const [key, ...rest] = message;
         send(`ElectronWebContents.${key}`, webContentsId, ...rest);
       }
       return result;
     };
+    const handleAsyncResult = async handlerResult => {
+      try {
+        return handleResult(await handlerResult);
+      } catch (error) {
+        console.error(error);
+      }
+    };
+    const wrappedListener = (...args) => {
+      // @ts-ignore
+      const handlerResult = value.handler(...args, webContentsId);
+      if (handlerResult instanceof Promise) {
+        return handleAsyncResult(handlerResult);
+      }
+      return handleResult(handlerResult);
+    };
     value.attach(webContents, wrappedListener);
   }
   webContentsWithEventListeners.add(webContents);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "6.37.1",
+  "version": "6.37.3",
   "keywords": [
     "lvce-editor",
     "electron"