@lvce-editor/main-process 6.33.0 → 6.33.2

package/dist/mainProcessMain.js

@@ -6561,6 +6561,16 @@ const cancelIfStartsWith = (url, canceledUrls) => {
   }
   return {};
 };
+const canceledAdUrls = ['https://c.amazon-adsystem.com/', 'https://cadmus.script.ac/', 'https://config.aps.amazon-adsystem.com/', 'https://dn0qt3r0xannq.cloudfront.net/', 'https://edge.aditude.io/', 'https://ep1.adtrafficquality.google/', 'https://event-ingestor.judy.pnap.aditude.cloud/', 'https://pagead2.googlesyndication.com/', 'https://raven-static.aditude.io/', 'https://securepubads.g.doubleclick.net/'];
+const safeframeUrlRegex = /^https:\/\/[^/]+\.safeframe\.googlesyndication\.com\//;
+const getBeforeRequestResponseAd = url => {
+  if (safeframeUrlRegex.test(url)) {
+    return {
+      cancel: true
+    };
+  }
+  return cancelIfStartsWith(url, canceledAdUrls);
+};
 const getBeforeRequestResponseXhrPost = url => {
   const canceledUrls = ['https://www.youtube.com/api/stats/qoe', 'https://www.youtube.com/youtubei/v1/log_event', 'https://play.google.com/log'];
   return cancelIfStartsWith(url, canceledUrls);
@@ -6604,6 +6614,10 @@ const getBeforeRequestResponse = details => {
     resourceType,
     url
   } = details;
+  const adResponse = getBeforeRequestResponseAd(url);
+  if (adResponse.cancel) {
+    return adResponse;
+  }
   switch (resourceType) {
     case MainFrame:
       return getBeforeRequestResponseMainFrame();
@@ -6692,6 +6706,31 @@ const send = (method, ...params) => {
   return rpc.send(method, ...params);
 };
 
+const webContentsWithEventListeners = new WeakSet();
+const attachEventListenersToWebContents = (webContentsId, webContents, browserWindow) => {
+  if (webContentsWithEventListeners.has(webContents)) {
+    return;
+  }
+  attach(webContents, browserWindow.webContents);
+  const values = Object.values(ElectronBrowserViewEventListeners);
+  for (const value of values) {
+    const wrappedListener = (...args) => {
+      // @ts-ignore
+      const {
+        messages,
+        result
+      } = value.handler(...args, webContentsId);
+      for (const message of messages) {
+        const [key, ...rest] = message;
+        send(`ElectronWebContents.${key}`, webContentsId, ...rest);
+      }
+      return result;
+    };
+    value.attach(webContents, wrappedListener);
+  }
+  webContentsWithEventListeners.add(webContents);
+};
+
 // TODO use electron 30 webcontentsview api
 const createWebContentsView = async () => {
   const view = new WebContentsView({
@@ -6715,6 +6754,7 @@ const createWebContentsView = async () => {
     id
   } = webContents;
   add$1(id, browserWindow, view);
+  attachEventListenersToWebContents(id, webContents, browserWindow);
   return id;
 };
 const attachEventListeners = webContentsId => {
@@ -6724,25 +6764,7 @@ const attachEventListeners = webContentsId => {
   if (!webContents || !state) {
     return;
   }
-  attach(webContents, state.browserWindow.webContents);
-  const values = Object.values(ElectronBrowserViewEventListeners);
-  for (const value of values) {
-    const wrappedListener = (...args) => {
-      // @ts-ignore
-      const {
-        messages,
-        result
-      } = value.handler(...args, webContentsId);
-      for (const message of messages) {
-        const [key, ...rest] = message;
-        send(`ElectronWebContents.${key}`, webContentsId, ...rest);
-      }
-      return result;
-    };
-    // TODO detached listeners when webcontents are disposed
-    // to avoid potential memory leaks
-    value.attach(webContents, wrappedListener);
-  }
+  attachEventListenersToWebContents(webContentsId, webContents, state.browserWindow);
 };
 const disposeWebContentsView = browserViewId => {
   console.log('[main process] dispose browser view', browserViewId);

package/package.json

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