@lvce-editor/main-process 6.37.5 → 6.37.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6439,12 +6439,12 @@ const resolveWithTimeout = async (fetcher, favicons) => {
6439
6439
  clearTimeout(timeout);
6440
6440
  }
6441
6441
  };
6442
- const resolveFavicon = async (event, favicons) => {
6442
+ const resolveFavicon = async (webContents, favicons) => {
6443
6443
  const dataUrl = favicons.find(favicon => favicon.startsWith('data:'));
6444
6444
  if (dataUrl) {
6445
6445
  return [dataUrl];
6446
6446
  }
6447
- const sessionFavicon = await resolveWithTimeout((url, options) => event.sender.session.fetch(url, options), favicons);
6447
+ const sessionFavicon = await resolveWithTimeout((url, options) => webContents.session.fetch(url, options), favicons);
6448
6448
  if (sessionFavicon) {
6449
6449
  return [sessionFavicon];
6450
6450
  }
@@ -6459,14 +6459,14 @@ const resolveNetworkFavicon = async favicons => {
6459
6459
  const networkFavicon = await resolveWithTimeout((url, options) => fetch(url, options), favicons);
6460
6460
  return networkFavicon ? [networkFavicon] : [];
6461
6461
  };
6462
- const handler$5 = async (event, favicons) => {
6463
- const pageUrl = event.sender.getURL();
6462
+ const handler$5 = async (_event, favicons, _webContentsId, webContents) => {
6463
+ const pageUrl = webContents.getURL();
6464
6464
  if (favicons.length > 0) {
6465
- set(event.sender, pageUrl);
6465
+ set(webContents, pageUrl);
6466
6466
  }
6467
- const resolvedFavicons = await resolveFavicon(event, favicons);
6467
+ const resolvedFavicons = await resolveFavicon(webContents, favicons);
6468
6468
  return {
6469
- messages: event.sender.getURL() === pageUrl ? [['handlePageFaviconUpdated', resolvedFavicons]] : [],
6469
+ messages: webContents.getURL() === pageUrl ? [['handlePageFaviconUpdated', resolvedFavicons]] : [],
6470
6470
  result: undefined
6471
6471
  };
6472
6472
  };
@@ -6487,7 +6487,7 @@ const attach$6 = (webContents, listener) => {
6487
6487
  const detach$4 = (webContents, listener) => {
6488
6488
  webContents.off(DidNavigate, listener);
6489
6489
  };
6490
- const loadDefaultFavicon = async (event, url) => {
6490
+ const loadDefaultFavicon = async (webContents, url) => {
6491
6491
  let faviconUrl;
6492
6492
  try {
6493
6493
  const parsedUrl = new URL(url);
@@ -6498,14 +6498,17 @@ const loadDefaultFavicon = async (event, url) => {
6498
6498
  } catch {
6499
6499
  return [];
6500
6500
  }
6501
+ if (has(webContents, url)) {
6502
+ return [];
6503
+ }
6501
6504
  const favicons = await resolveNetworkFavicon([faviconUrl]);
6502
- if (favicons.length === 0 || event.sender.getURL() !== url || has(event.sender, url)) {
6505
+ if (favicons.length === 0 || webContents.getURL() !== url) {
6503
6506
  return [];
6504
6507
  }
6505
6508
  return favicons;
6506
6509
  };
6507
- const handler$4 = async (event, url, _httpResponseCode, _httpStatusText, _webContentsId) => {
6508
- const favicons = await loadDefaultFavicon(event, url);
6510
+ const handler$4 = async (_event, url, _httpResponseCode, _httpStatusText, _webContentsId, webContents) => {
6511
+ const favicons = await loadDefaultFavicon(webContents, url);
6509
6512
  const messages = favicons.length > 0 ? [['handleDidNavigate', url], ['handlePageFaviconUpdated', favicons]] : [['handleDidNavigate', url]];
6510
6513
  return {
6511
6514
  messages,
@@ -6910,7 +6913,7 @@ const attachEventListenersToWebContents = (webContentsId, webContents, browserWi
6910
6913
  };
6911
6914
  const wrappedListener = (...args) => {
6912
6915
  // @ts-ignore
6913
- const handlerResult = value.handler(...args, webContentsId);
6916
+ const handlerResult = value.handler(...args, webContentsId, webContents);
6914
6917
  if (handlerResult instanceof Promise) {
6915
6918
  return handleAsyncResult(handlerResult);
6916
6919
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lvce-editor/main-process",
3
- "version": "6.37.5",
3
+ "version": "6.37.7",
4
4
  "keywords": [
5
5
  "lvce-editor",
6
6
  "electron"