@lvce-editor/main-process 6.46.1 → 6.46.2

package/dist/mainProcessMain.js

@@ -6741,40 +6741,44 @@ const attach$9 = (webContents, listener) => {
 const detach$6 = (webContents, listener) => {
   webContents.off(PageFaviconUpdated, listener);
 };
-const getFaviconDataUrl = async (fetcher, favicon, signal) => {
+const getFaviconData = async (fetcher, favicon, signal) => {
   try {
     const response = await fetcher(favicon, {
       signal
     });
     if (!response.ok) {
-      return '';
+      return undefined;
     }
     const contentLength = Number(response.headers.get('content-length'));
     if (contentLength > maxFaviconBytes) {
-      return '';
+      return undefined;
     }
-    const bytes = Buffer.from(await response.arrayBuffer());
+    const bytes = new Uint8Array(await response.arrayBuffer());
     if (bytes.byteLength > maxFaviconBytes) {
-      return '';
+      return undefined;
     }
     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 undefined;
     }
-    return `data:${mimeType};base64,${bytes.toString('base64')}`;
+    return {
+      bytes,
+      mimeType,
+      url: favicon
+    };
   } catch {
-    return '';
+    return undefined;
   }
 };
 const resolveWithFetcher = async (fetcher, favicons, signal) => {
   for (const favicon of favicons) {
-    const dataUrl = await getFaviconDataUrl(fetcher, favicon, signal);
-    if (dataUrl) {
-      return dataUrl;
+    const data = await getFaviconData(fetcher, favicon, signal);
+    if (data) {
+      return data;
     }
   }
-  return '';
+  return undefined;
 };
 const resolveWithTimeout = async (fetcher, favicons) => {
   const controller = new AbortController();
@@ -6782,7 +6786,7 @@ const resolveWithTimeout = async (fetcher, favicons) => {
   const timeoutPromise = new Promise(resolve => {
     timeout = setTimeout(() => {
       controller.abort();
-      resolve('');
+      resolve(undefined);
     }, faviconFetchTimeout);
   });
   try {
@@ -6794,7 +6798,8 @@ const resolveWithTimeout = async (fetcher, favicons) => {
 const resolveFavicon = async (webContents, favicons) => {
   const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
   if (dataUrl) {
-    return [dataUrl];
+    const data = await resolveWithTimeout((url, options) => fetch(url, options), [dataUrl]);
+    return data ? [data] : [dataUrl];
   }
   const sessionFavicon = await resolveWithTimeout((url, options) => webContents.session.fetch(url, options), favicons);
   if (sessionFavicon) {
@@ -6806,7 +6811,8 @@ const resolveFavicon = async (webContents, favicons) => {
 const resolveNetworkFavicon = async favicons => {
   const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
   if (dataUrl) {
-    return [dataUrl];
+    const data = await resolveWithTimeout((url, options) => fetch(url, options), [dataUrl]);
+    return data ? [data] : [dataUrl];
   }
   const networkFavicon = await resolveWithTimeout((url, options) => fetch(url, options), favicons);
   return networkFavicon ? [networkFavicon] : [];

package/package.json

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