@lvce-editor/main-process 6.37.2 → 6.37.4

package/dist/mainProcessMain.js

@@ -2825,7 +2825,7 @@ const execute$1 = (command, ...args) => {
 
 const Two$2 = '2.0';
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$3 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$5 = id => {
@@ -2846,7 +2846,7 @@ const registerPromise$1 = () => {
     promise,
     resolve
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$3(id, resolve);
   return {
     id,
     promise
@@ -4909,7 +4909,7 @@ const createElectronSession = () => {
 const state$1 = {
   session: undefined
 };
-const has = () => {
+const has$1 = () => {
   return Boolean(state$1.session);
 };
 const get$3 = () => {
@@ -4918,7 +4918,7 @@ const get$3 = () => {
   }
   return state$1.session;
 };
-const set$1 = value => {
+const set$2 = value => {
   state$1.session = value;
 };
 
@@ -4938,8 +4938,8 @@ const create$2 = rpc => {
 };
 
 const get$2 = () => {
-  if (!has()) {
-    set$1(createElectronSession());
+  if (!has$1()) {
+    set$2(createElectronSession());
   }
   return get$3();
 };
@@ -5222,7 +5222,7 @@ const createPidMap = () => {
 };
 
 const rpcs = Object.create(null);
-const set = (id, rpc) => {
+const set$1 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -5235,7 +5235,7 @@ const createUtilityProcessRpc = async options => {
     ...options
   });
   const rpcId = options.targetRpcId || options.rpcId || options.ipcId;
-  set(rpcId, rpc);
+  set$1(rpcId, rpc);
 };
 
 const serializeDeskopCapturerSource = source => {
@@ -6372,26 +6372,160 @@ const ElectronBrowserViewEventListenerDestroyed = {
 	key: key$6
 };
 
-const key$5 = 'did-navigate';
+const faviconUrls = new WeakMap();
+const set = (webContents, url) => {
+  faviconUrls.set(webContents, url);
+};
+const has = (webContents, url) => {
+  return faviconUrls.get(webContents) === url;
+};
+
+const maxFaviconBytes = 1024 * 1024;
+const faviconFetchTimeout = 2000;
+const key$5 = PageFaviconUpdated;
 const attach$7 = (webContents, listener) => {
-  webContents.on(DidNavigate, listener);
+  webContents.on(PageFaviconUpdated, listener);
 };
 const detach$5 = (webContents, listener) => {
-  webContents.off(DidNavigate, listener);
+  webContents.off(PageFaviconUpdated, listener);
+};
+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 networkFavicons = await resolveNetworkFavicon(favicons);
+  return networkFavicons.length > 0 ? networkFavicons : favicons;
 };
-const handler$5 = (event, url) => {
+const resolveNetworkFavicon = async favicons => {
+  const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
+  if (dataUrl) {
+    return [dataUrl];
+  }
+  const networkFavicon = await resolveWithTimeout((url, options) => fetch(url, options), favicons);
+  return networkFavicon ? [networkFavicon] : [];
+};
+const handler$5 = async (event, favicons) => {
+  const pageUrl = event.sender.getURL();
+  if (favicons.length > 0) {
+    set(event.sender, pageUrl);
+  }
+  const resolvedFavicons = await resolveFavicon(event, favicons);
   return {
-    messages: [['handleDidNavigate', url]],
+    messages: event.sender.getURL() === pageUrl ? [['handlePageFaviconUpdated', resolvedFavicons]] : [],
     result: undefined
   };
 };
 
-const ElectronBrowserViewEventListenerDidNavigate = {
+const ElectronBrowserViewEventListenerPageFaviconUpdated = {
 	__proto__: null,
 	attach: attach$7,
 	detach: detach$5,
 	handler: handler$5,
-	key: key$5
+	key: key$5,
+	resolveNetworkFavicon
+};
+
+const send = (method, ...params) => {
+  const rpc = get$1(EmbedsProcess);
+  if (!rpc) {
+    return;
+  }
+  return rpc.send(method, ...params);
+};
+
+const key$4 = 'did-navigate';
+const attach$6 = (webContents, listener) => {
+  webContents.on(DidNavigate, listener);
+};
+const detach$4 = (webContents, listener) => {
+  webContents.off(DidNavigate, listener);
+};
+const loadDefaultFavicon = async (event, url, webContentsId) => {
+  let faviconUrl;
+  try {
+    const parsedUrl = new URL(url);
+    if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
+      return;
+    }
+    faviconUrl = new URL('/favicon.ico', parsedUrl).href;
+  } catch {
+    return;
+  }
+  const favicons = await resolveNetworkFavicon([faviconUrl]);
+  if (favicons.length === 0 || event.sender.getURL() !== url || has(event.sender, url)) {
+    return;
+  }
+  send('ElectronWebContents.handlePageFaviconUpdated', webContentsId, favicons);
+};
+const handler$4 = (event, url, _httpResponseCode, _httpStatusText, webContentsId) => {
+  void loadDefaultFavicon(event, url, webContentsId);
+  return {
+    messages: [['handleDidNavigate', url]],
+    result: undefined
+  };
+};
+
+const ElectronBrowserViewEventListenerDidNavigate = {
+	__proto__: null,
+	attach: attach$6,
+	detach: detach$4,
+	handler: handler$4,
+	key: key$4
 };
 
 const pendingLogins = new Map();
@@ -6427,14 +6561,14 @@ const cancelForWebContents = webContentsId => {
   }
 };
 
-const key$4 = Login;
-const attach$6 = (webContents, listener) => {
+const key$3 = Login;
+const attach$5 = (webContents, listener) => {
   webContents.on(Login, listener);
 };
-const detach$4 = (webContents, listener) => {
+const detach$3 = (webContents, listener) => {
   webContents.off(Login, listener);
 };
-const handler$4 = (event, authenticationResponseDetails, authInfo, callback, webContentsId) => {
+const handler$3 = (event, authenticationResponseDetails, authInfo, callback, webContentsId) => {
   event.preventDefault();
   const requestId = add(webContentsId, callback);
   return {
@@ -6452,67 +6586,6 @@ const handler$4 = (event, authenticationResponseDetails, authInfo, callback, web
 };
 
 const ElectronBrowserViewEventListenerLogin = {
-	__proto__: null,
-	attach: attach$6,
-	detach: detach$4,
-	handler: handler$4,
-	key: key$4
-};
-
-const maxFaviconBytes = 1024 * 1024;
-const key$3 = PageFaviconUpdated;
-const attach$5 = (webContents, listener) => {
-  webContents.on(PageFaviconUpdated, listener);
-};
-const detach$3 = (webContents, listener) => {
-  webContents.off(PageFaviconUpdated, listener);
-};
-const getFaviconDataUrl = async (event, favicon) => {
-  if (favicon.startsWith('data:')) {
-    return favicon;
-  }
-  try {
-    const response = await event.sender.session.fetch(favicon);
-    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 resolveFavicon = async (event, favicons) => {
-  for (const favicon of favicons) {
-    const dataUrl = await getFaviconDataUrl(event, favicon);
-    if (dataUrl) {
-      return [dataUrl];
-    }
-  }
-  return favicons;
-};
-const handler$3 = async (event, favicons) => {
-  const pageUrl = event.sender.getURL();
-  const resolvedFavicons = await resolveFavicon(event, favicons);
-  return {
-    messages: event.sender.getURL() === pageUrl ? [['handlePageFaviconUpdated', resolvedFavicons]] : [],
-    result: undefined
-  };
-};
-
-const ElectronBrowserViewEventListenerPageFaviconUpdated = {
 	__proto__: null,
 	attach: attach$5,
 	detach: detach$3,
@@ -6808,14 +6881,6 @@ const attach = webContents => {
   });
 };
 
-const send = (method, ...params) => {
-  const rpc = get$1(EmbedsProcess);
-  if (!rpc) {
-    return;
-  }
-  return rpc.send(method, ...params);
-};
-
 const webContentsWithEventListeners = new WeakSet();
 const attachEventListenersToWebContents = (webContentsId, webContents, browserWindow) => {
   if (webContentsWithEventListeners.has(webContents)) {
@@ -7369,7 +7434,7 @@ const handleElectronMessagePort = async (messagePort, rpcId) => {
     requiresSocket: requiresSocket
   });
   if (rpcId) {
-    set(rpcId, rpc);
+    set$1(rpcId, rpc);
   }
 };
 

package/package.json

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