@lvce-editor/main-process 2.5.0 → 2.6.0

package/dist/mainProcessMain.js

@@ -1,5 +1,5 @@
 import * as Electron from 'electron';
-import Electron__default, { dialog, app, clipboard, BrowserWindow, MessageChannelMain, Menu, shell, desktopCapturer, contentTracing, net, netLog, powerSaveBlocker, safeStorage, screen, WebContentsView, webContents } from 'electron';
+import Electron__default, { dialog, app, clipboard, BrowserWindow, MessageChannelMain, Menu, shell, desktopCapturer, contentTracing, net, netLog, powerSaveBlocker, safeStorage, screen, webContents, WebContentsView } from 'electron';
 import process$1 from 'node:process';
 import { inspect } from 'node:util';
 import { spawn } from 'node:child_process';
@@ -5805,6 +5805,53 @@ const getBounds = () => {
   };
 };
 
+const disposeWebContents = webContents => {
+  if (webContents.close) {
+    // electron v22
+    webContents.close();
+    // @ts-ignore
+  } else if (webContents.destroy) {
+    // older versions of electron
+    // @ts-ignore
+    webContents.destroy();
+  }
+};
+
+const getStats$1 = webContentsId => {
+  number(webContentsId);
+  const contents = webContents.fromId(webContentsId);
+  if (!contents) {
+    return undefined;
+  }
+  const canGoBack = contents.navigationHistory.canGoBack();
+  const canGoForward = contents.navigationHistory.canGoForward();
+  const url = contents.getURL();
+  const title = contents.getTitle();
+  return {
+    canGoBack,
+    canGoForward,
+    url,
+    title
+  };
+};
+const dispose$1 = webContentsId => {
+  number(webContentsId);
+  const contents = webContents.fromId(webContentsId);
+  if (!contents) {
+    return;
+  }
+  disposeWebContents(contents);
+};
+const callFunction = (webContentsId, functionName, ...args) => {
+  number(webContentsId);
+  string(functionName);
+  const contents = webContents.fromId(webContentsId);
+  if (!contents) {
+    return;
+  }
+  contents[functionName](...args);
+};
+
 const KeyDown = 'keyDown';
 
 const Backspace$1 = 'Backspace';
@@ -6628,15 +6675,6 @@ const wrapBrowserViewCommand = fn => {
   };
   return wrappedCommand;
 };
-
-/**
- *
- * @param {Electron.BrowserView} view
- * @param {number} x
- * @param {number} y
- * @param {number} width
- * @param {number} height
- */
 const resizeBrowserView = (view, x, y, width, height) => {
   object(view);
   number(x);
@@ -6658,12 +6696,6 @@ const setIframeSrcFallback = async (view, code, message) => {
     }
   });
 };
-
-/**
- *
- * @param {Electron.BrowserView} view
- * @param {string} iframeSrc
- */
 const setIframeSrc = async (view, iframeSrc) => {
   try {
     object(view);
@@ -6679,21 +6711,12 @@ const setIframeSrc = async (view, iframeSrc) => {
     throw betterError;
   }
 };
-/**
- *
- * @param {Electron.BrowserView} view
- */
 const focus = view => {
   const {
     webContents
   } = view;
   webContents.focus();
 };
-
-/**
- *
- * @param {Electron.BrowserView} view
- */
 const openDevtools = view => {
   const {
     webContents
@@ -6701,43 +6724,25 @@ const openDevtools = view => {
   // TODO return promise that resolves once devtools are actually open
   webContents.openDevTools();
 };
-/**
- *
- * @param {Electron.BrowserView} view
- */
 const reload = view => {
   const {
     webContents
   } = view;
   webContents.reload();
 };
-/**
- *
- * @param {Electron.BrowserView} view
- */
 const forward = view => {
   const {
     webContents
   } = view;
-  webContents.goForward();
+  webContents.navigationHistory.goForward();
 };
-
-/**
- *
- * @param {Electron.BrowserView} view
- */
 const backward = view => {
   // TODO return promise that resolves once devtools are actually open
   const {
     webContents
   } = view;
-  webContents.goBack();
+  webContents.navigationHistory.goBack();
 };
-
-/**
- *
- * @param {Electron.BrowserView} view
- */
 const cancelNavigation = view => {
   const {
     webContents
@@ -6745,8 +6750,8 @@ const cancelNavigation = view => {
   setCanceled(webContents.id);
   debug(`[main process] canceled navigation to ${webContents.getURL()}`);
   webContents.stop();
-  if (webContents.canGoBack()) {
-    webContents.goBack();
+  if (webContents.navigationHistory.canGoBack()) {
+    webContents.navigationHistory.goBack();
   }
 };
 const show = id => {
@@ -6833,7 +6838,7 @@ const setFallThroughKeyBindings = fallthroughKeyBindings => {
 /**
  * @param {Electron.BrowserView} view
  */
-const getStats$1 = view => {
+const getStats = view => {
   const {
     webContents
   } = view;
@@ -7133,7 +7138,7 @@ const sendTo2 = async (port, targetRpcId, sourceRpcId) => {
 };
 
 // todo dispose the rpc by rpc id
-const dispose$1 = name => {
+const dispose = name => {
   string(name);
   const formattedName = formatUtilityProcessName(name);
   const utilityProcess = getByName(formattedName);
@@ -7180,6 +7185,9 @@ const commandMap = {
   'ElectronShell.openExternal': openExternal,
   'ElectronShell.openPath': openPath,
   'ElectronShell.showItemInFolder': showItemInFolder,
+  'ElectronWebContents.callFunction': callFunction,
+  'ElectronWebContents.dispose': dispose$1,
+  'ElectronWebContents.getStats': getStats$1,
   'ElectronWebContentsView.attachEventListeners': attachEventListeners,
   'ElectronWebContentsView.createWebContentsView': createWebContentsView,
   'ElectronWebContentsView.disposeWebContentsView': disposeWebContentsView,
@@ -7189,7 +7197,7 @@ const commandMap = {
   'ElectronWebContentsViewFunctions.copyImageAt': wrapBrowserViewCommand(copyImageAt),
   'ElectronWebContentsViewFunctions.focus': wrapBrowserViewCommand(focus),
   'ElectronWebContentsViewFunctions.forward': wrapBrowserViewCommand(forward),
-  'ElectronWebContentsViewFunctions.getStats': wrapBrowserViewCommand(getStats$1),
+  'ElectronWebContentsViewFunctions.getStats': wrapBrowserViewCommand(getStats),
   'ElectronWebContentsViewFunctions.hide': hide,
   'ElectronWebContentsViewFunctions.inspectElement': wrapBrowserViewCommand(inspectElement),
   'ElectronWebContentsViewFunctions.openDevtools': wrapBrowserViewCommand(openDevtools),
@@ -7217,7 +7225,7 @@ const commandMap = {
   'Process.getPid': getPid,
   'Process.getV8Version': getV8Version,
   'TemporaryMessagePort.createPortTuple': createPortTuple,
-  'TemporaryMessagePort.dispose': dispose$1,
+  'TemporaryMessagePort.dispose': dispose,
   'TemporaryMessagePort.sendTo': sendTo,
   'TemporaryMessagePort.sendTo2': sendTo2,
   'Trash.trash': trash
@@ -7739,7 +7747,7 @@ const ElectronScreen_ipc = {
 const name$7 = 'TemporaryMessagePort';
 const Commands$7 = {
   createPortTuple: createPortTuple,
-  dispose: dispose$1,
+  dispose: dispose,
   sendTo: sendTo
 };
 
@@ -7749,61 +7757,10 @@ const TemporaryMessagePort_ipc = {
 	name: name$7
 };
 
-/**
- *
- * @param {Electron.WebContents} webContents
- */
-const disposeWebContents = webContents => {
-  if (webContents.close) {
-    // electron v22
-    webContents.close();
-    // @ts-ignore
-  } else if (webContents.destroy) {
-    // older versions of electron
-    // @ts-ignore
-    webContents.destroy();
-  }
-};
-
-const getStats = webContentsId => {
-  number(webContentsId);
-  const contents = webContents.fromId(webContentsId);
-  if (!contents) {
-    return undefined;
-  }
-  const canGoBack = contents.navigationHistory.canGoBack();
-  const canGoForward = contents.navigationHistory.canGoForward();
-  const url = contents.getURL();
-  const title = contents.getTitle();
-  return {
-    canGoBack,
-    canGoForward,
-    url,
-    title
-  };
-};
-const dispose = webContentsId => {
-  number(webContentsId);
-  const contents = webContents.fromId(webContentsId);
-  if (!contents) {
-    return;
-  }
-  disposeWebContents(contents);
-};
-const callFunction = (webContentsId, functionName, ...args) => {
-  number(webContentsId);
-  string(functionName);
-  const contents = webContents.fromId(webContentsId);
-  if (!contents) {
-    return;
-  }
-  contents[functionName](...args);
-};
-
 const name$6 = 'ElectronWebContents';
 const Commands$6 = {
-  dispose: dispose,
-  getStats: getStats,
+  dispose: dispose$1,
+  getStats: getStats$1,
   callFunction: callFunction
 };
 
@@ -7834,7 +7791,7 @@ const Commands$4 = {
   copyImageAt: wrapBrowserViewCommand(copyImageAt),
   focus: wrapBrowserViewCommand(focus),
   forward: wrapBrowserViewCommand(forward),
-  getStats: wrapBrowserViewCommand(getStats$1),
+  getStats: wrapBrowserViewCommand(getStats),
   hide: hide,
   inspectElement: wrapBrowserViewCommand(inspectElement),
   openDevtools: wrapBrowserViewCommand(openDevtools),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "",
   "keywords": [
     "lvce-editor",