@lvce-editor/main-process 6.44.1 → 6.46.0

package/dist/mainProcessMain.js

@@ -7330,11 +7330,13 @@ const createWebContentsViewForWindow = (browserWindow, options = {}) => {
   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 createWebContentsView = async (_restoreId = 0, windowId = 0) => {
+  number(windowId);
+  // Legacy callers omit the owner. A supplied owner must never be replaced by whichever window currently has focus.
+  const browserWindow = windowId ? BrowserWindow.fromId(windowId) : BrowserWindow.getFocusedWindow() || BrowserWindow.getAllWindows()[0];
+  if (!browserWindow || browserWindow.isDestroyed()) {
+    throw new Error('Cannot create a browser tab because its window is closed');
+  }
   const view = createWebContentsViewForWindow(browserWindow);
   return view.webContents.id;
 };
@@ -7488,10 +7490,46 @@ const getDomTree = async view => {
   const result = await getBodyOuterHtml(view);
   return getSlimCode(result);
 };
-const capturePage = async view => {
-  const image = await view.webContents.capturePage();
+const pendingCaptures = new WeakMap();
+const recoverableCaptureErrors = new Set(['Empty page capture', 'UnknownVizError', 'VizSentEmptyBitmap', 'Current display surface not available for capture']);
+const captureNonEmptyPage = async webContents => {
+  const image = await webContents.capturePage();
+  if (image.isEmpty()) {
+    throw new Error('Empty page capture');
+  }
   return image.toPNG();
 };
+const captureWithRecovery = async webContents => {
+  try {
+    return await captureNonEmptyPage(webContents);
+  } catch (error) {
+    if (!(error instanceof Error) || !recoverableCaptureErrors.has(error.message) || webContents.isDestroyed()) {
+      throw error;
+    }
+    // A missing compositor surface must not become a blank overlay. Request a repaint without reloading the page.
+    webContents.invalidate();
+    return captureNonEmptyPage(webContents);
+  }
+};
+const captureAndRelease = async webContents => {
+  try {
+    return await captureWithRecovery(webContents);
+  } finally {
+    pendingCaptures.delete(webContents);
+  }
+};
+const capturePage = view => {
+  const {
+    webContents
+  } = view;
+  const pending = pendingCaptures.get(webContents);
+  if (pending) {
+    return pending;
+  }
+  const capture = captureAndRelease(webContents);
+  pendingCaptures.set(webContents, capture);
+  return capture;
+};
 const insertCss = async (view, code) => {
   const {
     webContents
@@ -7585,7 +7623,6 @@ const cancelNavigation = view => {
   }
 };
 const show = id => {
-  // console.log('[main-process] show browser view', id)
   const state = get$4(id);
   if (!state) {
     return;
@@ -7594,7 +7631,10 @@ const show = id => {
     browserWindow,
     view
   } = state;
-  browserWindow.contentView.addChildView(view);
+  if (!browserWindow.contentView.children.includes(view)) {
+    browserWindow.contentView.addChildView(view);
+  }
+  view.setVisible(true);
 };
 const addToWindow = (browserWindowId, browserViewId) => {
   const state = get$4(browserViewId);
@@ -7613,10 +7653,11 @@ const hide = id => {
     return;
   }
   const {
-    browserWindow,
     view
   } = state;
-  browserWindow.contentView.removeChildView(view);
+  // Detaching and reattaching can leave Electron's native page hidden even when
+  // the View is visible. Keep its parent and compositor surface across overlays.
+  view.setVisible(false);
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "6.44.1",
+  "version": "6.46.0",
   "keywords": [
     "lvce-editor",
     "electron"
@@ -14,7 +14,7 @@
   "type": "module",
   "main": "dist/mainProcessMain.js",
   "dependencies": {
-    "electron": "44.0.0"
+    "electron": "44.3.0"
   },
   "engines": {
     "node": ">=22.11.0"