@lvce-editor/main-process 6.37.10 → 6.37.12

package/dist/mainProcessMain.js

@@ -4090,6 +4090,7 @@ const BeforeInputEvent = 'before-input-event';
 const Login = 'login';
 const AudioStateChanged = 'audio-state-changed';
 
+const Allow = 'allow';
 const Deny = 'deny';
 
 const shouldOpenExternal = url => {
@@ -6352,6 +6353,39 @@ const ElectronBrowserViewEventListenerContextMenu = {
 	key: key$8
 };
 
+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$7 = 'destroyed';
 const attach$9 = (webContents, listener) => {
   webContents.on(Destroyed, listener);
@@ -6359,9 +6393,22 @@ const attach$9 = (webContents, listener) => {
 const detach$7 = (webContents, listener) => {
   webContents.off(Destroyed, listener);
 };
-const handler$7 = () => {
+const handler$7 = (_event, webContentsId) => {
+  cancelForWebContents(webContentsId);
+  const instance = get$4(webContentsId);
+  const messages = instance ? [['handleBrowserViewDestroyed']] : [];
+  if (instance) {
+    const {
+      browserWindow,
+      view
+    } = instance;
+    remove(webContentsId);
+    if (!browserWindow.isDestroyed()) {
+      browserWindow.contentView.removeChildView(view);
+    }
+  }
   return {
-    messages: [['handleBrowserViewDestroyed']],
+    messages,
     result: undefined
   };
 };
@@ -6549,39 +6596,6 @@ const ElectronBrowserViewEventListenerDidNavigateInPage = {
 	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);
@@ -6668,12 +6682,21 @@ const detach = (webContents, listener) => {
 const handler = ({
   disposition,
   url
-}) => {
-  const messages = shouldOpenExternal(url) ? [['handleWindowOpen', url, disposition]] : [];
+}, _webContentsId, _webContents, createWindow) => {
+  const shouldCreateWindow = url === 'about:blank' || shouldOpenExternal(url);
+  if (!shouldCreateWindow) {
+    return {
+      messages: [],
+      result: {
+        action: Deny
+      }
+    };
+  }
   return {
-    messages,
+    messages: [],
     result: {
-      action: Deny
+      action: Allow,
+      createWindow: options => createWindow(options, url, disposition)
     }
   };
 };
@@ -6944,7 +6967,13 @@ const attachEventListenersToWebContents = (webContentsId, webContents, browserWi
     };
     const wrappedListener = (...args) => {
       // @ts-ignore
-      const handlerResult = value.handler(...args, webContentsId, webContents);
+      const createWindow = (options, url, disposition) => {
+        const view = createWebContentsViewForWindow(browserWindow, options.webPreferences);
+        send('ElectronWebContents.handleWindowOpen', webContentsId, view.webContents.id, url, disposition);
+        return view.webContents;
+      };
+      // @ts-ignore Electron event handlers have different argument tuples
+      const handlerResult = value.handler(...args, webContentsId, webContents, createWindow);
       if (handlerResult instanceof Promise) {
         return handleAsyncResult(handlerResult);
       }
@@ -6954,16 +6983,13 @@ const attachEventListenersToWebContents = (webContentsId, webContents, browserWi
   }
   webContentsWithEventListeners.add(webContents);
 };
-
-// TODO use electron 30 webcontentsview api
-const createWebContentsView = async () => {
+const createWebContentsViewForWindow = (browserWindow, webPreferences = {}) => {
   const view = new WebContentsView({
     webPreferences: {
+      ...webPreferences,
       session: getSession()
     }
   });
-  // TODO get browser window id from renderer worker
-  const browserWindow = BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0];
   view.setBounds({
     height: 720,
     width: 1280,
@@ -6974,12 +7000,17 @@ const createWebContentsView = async () => {
   const {
     webContents
   } = view;
-  const {
-    id
-  } = webContents;
-  add$1(id, browserWindow, view);
-  attachEventListenersToWebContents(id, webContents, browserWindow);
-  return id;
+  add$1(webContents.id, browserWindow, view);
+  attachEventListenersToWebContents(webContents.id, webContents, browserWindow);
+  return view;
+};
+
+// TODO use electron 30 webcontentsview api
+const createWebContentsView = async () => {
+  // TODO get browser window id from renderer worker
+  const browserWindow = BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0];
+  const view = createWebContentsViewForWindow(browserWindow);
+  return view.webContents.id;
 };
 const attachEventListeners = webContentsId => {
   number(webContentsId);

package/package.json

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