@lvce-editor/main-process 6.37.3 → 6.37.5

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,100 +6372,21 @@ const ElectronBrowserViewEventListenerDestroyed = {
 	key: key$6
 };
 
-const key$5 = 'did-navigate';
-const attach$7 = (webContents, listener) => {
-  webContents.on(DidNavigate, listener);
-};
-const detach$5 = (webContents, listener) => {
-  webContents.off(DidNavigate, listener);
-};
-const handler$5 = (event, url) => {
-  return {
-    messages: [['handleDidNavigate', url]],
-    result: undefined
-  };
-};
-
-const ElectronBrowserViewEventListenerDidNavigate = {
-	__proto__: null,
-	attach: attach$7,
-	detach: detach$5,
-	handler: handler$5,
-	key: key$5
-};
-
-const pendingLogins = new Map();
-let nextRequestId = 1;
-const add = (webContentsId, callback) => {
-  const requestId = `${webContentsId}:${nextRequestId++}`;
-  pendingLogins.set(requestId, {
-    callback,
-    webContentsId
-  });
-  return requestId;
-};
-const take = requestId => {
-  const pendingLogin = pendingLogins.get(requestId);
-  pendingLogins.delete(requestId);
-  return pendingLogin;
-};
-const accept = (requestId, username, password) => {
-  const pendingLogin = take(requestId);
-  pendingLogin?.callback(username, password);
-};
-const cancel = requestId => {
-  const pendingLogin = take(requestId);
-  pendingLogin?.callback();
-};
-const cancelForWebContents = webContentsId => {
-  for (const [requestId, pendingLogin] of pendingLogins) {
-    if (pendingLogin.webContentsId !== webContentsId) {
-      continue;
-    }
-    pendingLogins.delete(requestId);
-    pendingLogin.callback();
-  }
-};
-
-const key$4 = Login;
-const attach$6 = (webContents, listener) => {
-  webContents.on(Login, listener);
+const faviconUrls = new WeakMap();
+const set = (webContents, url) => {
+  faviconUrls.set(webContents, url);
 };
-const detach$4 = (webContents, listener) => {
-  webContents.off(Login, listener);
-};
-const handler$4 = (event, authenticationResponseDetails, authInfo, callback, webContentsId) => {
-  event.preventDefault();
-  const requestId = add(webContentsId, callback);
-  return {
-    messages: [['handleLogin', {
-      host: authInfo.host,
-      isProxy: authInfo.isProxy,
-      port: authInfo.port,
-      realm: authInfo.realm,
-      requestId,
-      scheme: authInfo.scheme,
-      url: String(authenticationResponseDetails.url)
-    }]],
-    result: undefined
-  };
-};
-
-const ElectronBrowserViewEventListenerLogin = {
-	__proto__: null,
-	attach: attach$6,
-	detach: detach$4,
-	handler: handler$4,
-	key: key$4
+const has = (webContents, url) => {
+  return faviconUrls.get(webContents) === url;
 };
 
 const maxFaviconBytes = 1024 * 1024;
 const faviconFetchTimeout = 2000;
-const key$3 = PageFaviconUpdated;
-const attach$5 = (webContents, listener) => {
+const key$5 = PageFaviconUpdated;
+const attach$7 = (webContents, listener) => {
   webContents.on(PageFaviconUpdated, listener);
 };
-const detach$3 = (webContents, listener) => {
+const detach$5 = (webContents, listener) => {
   webContents.off(PageFaviconUpdated, listener);
 };
 const getFaviconDataUrl = async (fetcher, favicon, signal) => {
@@ -6527,11 +6448,22 @@ const resolveFavicon = async (event, favicons) => {
   if (sessionFavicon) {
     return [sessionFavicon];
   }
+  const networkFavicons = await resolveNetworkFavicon(favicons);
+  return networkFavicons.length > 0 ? networkFavicons : favicons;
+};
+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] : favicons;
+  return networkFavicon ? [networkFavicon] : [];
 };
-const handler$3 = async (event, favicons) => {
+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: event.sender.getURL() === pageUrl ? [['handlePageFaviconUpdated', resolvedFavicons]] : [],
@@ -6540,6 +6472,113 @@ const handler$3 = async (event, favicons) => {
 };
 
 const ElectronBrowserViewEventListenerPageFaviconUpdated = {
+	__proto__: null,
+	attach: attach$7,
+	detach: detach$5,
+	handler: handler$5,
+	key: key$5,
+	resolveNetworkFavicon
+};
+
+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) => {
+  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 [];
+  }
+  return favicons;
+};
+const handler$4 = async (event, url, _httpResponseCode, _httpStatusText, _webContentsId) => {
+  const favicons = await loadDefaultFavicon(event, url);
+  const messages = favicons.length > 0 ? [['handleDidNavigate', url], ['handlePageFaviconUpdated', favicons]] : [['handleDidNavigate', url]];
+  return {
+    messages,
+    result: undefined
+  };
+};
+
+const ElectronBrowserViewEventListenerDidNavigate = {
+	__proto__: null,
+	attach: attach$6,
+	detach: detach$4,
+	handler: handler$4,
+	key: key$4
+};
+
+const pendingLogins = new Map();
+let nextRequestId = 1;
+const add = (webContentsId, callback) => {
+  const requestId = `${webContentsId}:${nextRequestId++}`;
+  pendingLogins.set(requestId, {
+    callback,
+    webContentsId
+  });
+  return requestId;
+};
+const take = requestId => {
+  const pendingLogin = pendingLogins.get(requestId);
+  pendingLogins.delete(requestId);
+  return pendingLogin;
+};
+const accept = (requestId, username, password) => {
+  const pendingLogin = take(requestId);
+  pendingLogin?.callback(username, password);
+};
+const cancel = requestId => {
+  const pendingLogin = take(requestId);
+  pendingLogin?.callback();
+};
+const cancelForWebContents = webContentsId => {
+  for (const [requestId, pendingLogin] of pendingLogins) {
+    if (pendingLogin.webContentsId !== webContentsId) {
+      continue;
+    }
+    pendingLogins.delete(requestId);
+    pendingLogin.callback();
+  }
+};
+
+const key$3 = Login;
+const attach$5 = (webContents, listener) => {
+  webContents.on(Login, listener);
+};
+const detach$3 = (webContents, listener) => {
+  webContents.off(Login, listener);
+};
+const handler$3 = (event, authenticationResponseDetails, authInfo, callback, webContentsId) => {
+  event.preventDefault();
+  const requestId = add(webContentsId, callback);
+  return {
+    messages: [['handleLogin', {
+      host: authInfo.host,
+      isProxy: authInfo.isProxy,
+      port: authInfo.port,
+      realm: authInfo.realm,
+      requestId,
+      scheme: authInfo.scheme,
+      url: String(authenticationResponseDetails.url)
+    }]],
+    result: undefined
+  };
+};
+
+const ElectronBrowserViewEventListenerLogin = {
 	__proto__: null,
 	attach: attach$5,
 	detach: detach$3,
@@ -7396,7 +7435,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.3",
+  "version": "6.37.5",
   "keywords": [
     "lvce-editor",
     "electron"