@lvce-editor/main-process 2.2.0 → 2.4.0

package/dist/mainProcessMain.js

@@ -2710,7 +2710,7 @@ const callbacks = Object.create(null);
 const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$3 = id => {
+const get$4 = id => {
   return callbacks[id];
 };
 const remove$2 = id => {
@@ -2883,7 +2883,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$3(id);
+  const fn = get$4(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -4803,7 +4803,7 @@ const hasWebContents = id => {
  * @param {number} id
  * @returns {{browserWindow: Electron.BrowserWindow, view: Electron.WebContentsView}}
  */
-const get$2 = id => {
+const get$3 = id => {
   return state$5.views[id];
 };
 const remove$1 = id => {
@@ -5271,7 +5271,7 @@ const state$3 = {
 const has = () => {
   return Boolean(state$3.session);
 };
-const get$1 = () => {
+const get$2 = () => {
   if (!state$3.session) {
     throw new Error('session is not defined');
   }
@@ -5374,11 +5374,11 @@ const create$1 = ipc => {
   return handleRequest;
 };
 
-const get = () => {
+const get$1 = () => {
   if (!has()) {
     set$1(createElectronSession());
   }
-  return get$1();
+  return get$2();
 };
 const registerWebviewProtocol = async port => {
   object(port);
@@ -5390,7 +5390,7 @@ const registerWebviewProtocol = async port => {
   console.log('do register protocol');
   handleIpc(ipc);
   port.start();
-  const session = get();
+  const session = get$1();
   const handleRequest = create$1(ipc);
   // @ts-ignore
   handle(session.protocol, WebView, handleRequest);
@@ -5422,7 +5422,7 @@ const loadUrl = async (browserWindow, url) => {
 
 // TODO avoid mixing BrowserWindow, childprocess and various lifecycle methods in one file -> separate concerns
 const createAppWindow = async (windowOptions, parsedArgs, workingDirectory, titleBarItems, url) => {
-  const session = get();
+  const session = get$1();
   mark(WillCreateCodeWindow);
   const window = new BrowserWindow({
     ...windowOptions,
@@ -5632,6 +5632,22 @@ const createPidMap = () => {
   return pidWindowMap;
 };
 
+const rpcs = Object.create(null);
+const set$3 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+
+const createUtilityProcessRpc = async options => {
+  const rpc = await ElectronUtilityProcessRpcParent.create({
+    commandMap: commandMapRef,
+    ...options
+  });
+  set$3(options.rpcId, rpc);
+};
+
 const serializeDeskopCapturerSource = source => {
   return {
     display_id: source.display_id,
@@ -6678,7 +6694,7 @@ const attachEventListeners = webContentsId => {
 };
 const disposeWebContentsView = browserViewId => {
   console.log('[main process] dispose browser view', browserViewId);
-  const instance = get$2(browserViewId);
+  const instance = get$3(browserViewId);
   if (!instance) {
     return;
   }
@@ -6696,7 +6712,7 @@ const webContentsViewErrorPath = join(root, 'packages', 'main-process', 'pages',
 
 const wrapBrowserViewCommand = fn => {
   const wrappedCommand = (id, ...args) => {
-    const state = get$2(id);
+    const state = get$3(id);
     if (!state) {
       console.log(`[main process] no browser view with id ${id}`);
       return;
@@ -6831,7 +6847,7 @@ const cancelNavigation = view => {
 };
 const show = id => {
   // console.log('[main-process] show browser view', id)
-  const state = get$2(id);
+  const state = get$3(id);
   if (!state) {
     debug('[main-process] failed to show browser view', id);
     return;
@@ -6843,7 +6859,7 @@ const show = id => {
   browserWindow.contentView.addChildView(view);
 };
 const addToWindow = (browserWindowId, browserViewId) => {
-  const state = get$2(browserViewId);
+  const state = get$3(browserViewId);
   const {
     view
   } = state;
@@ -6854,7 +6870,7 @@ const addToWindow = (browserWindowId, browserViewId) => {
   browserWindow.contentView.addChildView(view);
 };
 const hide = id => {
-  const state = get$2(id);
+  const state = get$3(id);
   if (!state) {
     debug('[main-process] failed to hide browser view', id);
     return;
@@ -6968,7 +6984,7 @@ const open2 = async (options, url) => {
     ...options,
     webPreferences: {
       ...options.webPreferences,
-      session: get()
+      session: get$1()
     }
   };
   const processExplorerWindow = new BrowserWindow(allOptions);
@@ -7124,6 +7140,15 @@ const sendTo = async (port, name, ipcId) => {
   await invokeAndTransfer$1(utilityProcessIpc, 'HandleElectronMessagePort.handleElectronMessagePort', port, ipcId);
   unhandleIpc(utilityProcessIpc);
 };
+
+// TODO use rpc id, and then use rpc.invokeAndtransfer
+const sendTo2 = async (port, rpcId) => {
+  object(port);
+  const rpc = get(rpcId);
+  await rpc.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port, rpcId);
+};
+
+// todo dispose the rpc by rpc id
 const dispose$1 = name => {
   string(name);
   const formattedName = formatUtilityProcessName(name);
@@ -7143,9 +7168,10 @@ const commandMap = {
   'AppWindow.createAppWindow': createAppWindow,
   'Beep.beep': beep$1,
   'Crash.crashMainProcess': crashMainProcess$1,
-  'DesktopCapturer.getSources': getSources,
   'CreateMessagePort.createMessagePort': createMessagePort,
   'CreatePidMap.createPidMap': createPidMap,
+  'CreateUtilityProcessRpc.createUtilityProcessRpc': createUtilityProcessRpc,
+  'DesktopCapturer.getSources': getSources,
   'ElectronApplicationMenu.setItems': setItems,
   'ElectronBeep.beep': beep,
   'ElectronContentTracing.startRecording': startRecording,
@@ -7186,7 +7212,7 @@ const commandMap = {
   'ElectronWebContentsViewFunctions.reload': reload,
   'ElectronWebContentsViewFunctions.resizeBrowserView': resizeBrowserView,
   'ElectronWebContentsViewFunctions.setBackgroundColor': setBackgroundColor,
-  'ElectronWebContentsViewFunctions.setFallthroughKeyBindings': undefined,
+  'ElectronWebContentsViewFunctions.setFallthroughKeyBindings': setFallThroughKeyBindings,
   'ElectronWebContentsViewFunctions.setIframeSrc': setIframeSrc,
   'ElectronWebContentsViewFunctions.setIframeSrcFallback': setIframeSrcFallback,
   'ElectronWebContentsViewFunctions.show': show,
@@ -7209,6 +7235,7 @@ const commandMap = {
   'TemporaryMessagePort.createPortTuple': createPortTuple,
   'TemporaryMessagePort.dispose': dispose$1,
   'TemporaryMessagePort.sendTo': sendTo,
+  'TemporaryMessagePort.sendTo2': sendTo2,
   'Trash.trash': trash
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "",
   "keywords": [
     "lvce-editor",
@@ -15,7 +15,7 @@
   "type": "module",
   "main": "dist/mainProcessMain.js",
   "dependencies": {
-    "electron": "36.1.0"
+    "electron": "36.2.0"
   },
   "engines": {
     "node": ">=22"