@lvce-editor/main-process 6.37.2 → 6.37.3

package/dist/mainProcessMain.js

@@ -6460,6 +6460,7 @@ const ElectronBrowserViewEventListenerLogin = {
 };
 
 const maxFaviconBytes = 1024 * 1024;
+const faviconFetchTimeout = 2000;
 const key$3 = PageFaviconUpdated;
 const attach$5 = (webContents, listener) => {
   webContents.on(PageFaviconUpdated, listener);
@@ -6467,12 +6468,11 @@ const attach$5 = (webContents, listener) => {
 const detach$3 = (webContents, listener) => {
   webContents.off(PageFaviconUpdated, listener);
 };
-const getFaviconDataUrl = async (event, favicon) => {
-  if (favicon.startsWith('data:')) {
-    return favicon;
-  }
+const getFaviconDataUrl = async (fetcher, favicon, signal) => {
   try {
-    const response = await event.sender.session.fetch(favicon);
+    const response = await fetcher(favicon, {
+      signal
+    });
     if (!response.ok) {
       return '';
     }
@@ -6494,14 +6494,41 @@ const getFaviconDataUrl = async (event, favicon) => {
     return '';
   }
 };
-const resolveFavicon = async (event, favicons) => {
+const resolveWithFetcher = async (fetcher, favicons, signal) => {
   for (const favicon of favicons) {
-    const dataUrl = await getFaviconDataUrl(event, favicon);
+    const dataUrl = await getFaviconDataUrl(fetcher, favicon, signal);
     if (dataUrl) {
-      return [dataUrl];
+      return dataUrl;
     }
   }
-  return favicons;
+  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();

package/package.json

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