@lvce-editor/shared-process 0.23.0 → 0.23.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.23.0",
+    "@lvce-editor/extension-host-helper-process": "0.23.2",
     "@lvce-editor/ipc": "^2.1.0",
     "@lvce-editor/json-rpc": "^1.0.0",
     "@lvce-editor/jsonc-parser": "^1.1.0",
-    "@lvce-editor/pretty-error": "^1.4.1",
-    "@lvce-editor/pty-host": "0.23.0",
+    "@lvce-editor/pretty-error": "^1.5.0",
+    "@lvce-editor/pty-host": "0.23.2",
     "@lvce-editor/verror": "^1.1.2",
     "@lvce-editor/web-socket-server": "^1.1.0",
     "debug": "^4.3.4",
@@ -32,7 +32,7 @@
     "got": "^13.0.0",
     "is-object": "^1.0.2",
     "p-queue": "^8.0.1",
-    "tar-fs": "^3.0.4",
+    "tar-fs": "^3.0.5",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {

package/src/parts/ElectronBrowserView/ElectronBrowserView.js

@@ -1,13 +1,24 @@
+import * as ElectronBrowserViewIpcState from '../ElectronBrowserViewIpcState/ElectronBrowserViewIpcState.js'
+import * as ElectronBrowserViewState from '../ElectronBrowserViewState/ElectronBrowserViewState.js'
+import * as ElectronWebContents from '../ElectronWebContents/ElectronWebContents.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 
-export const createBrowserView = (restoreId, fallthroughKeyBindings) => {
-  return ParentIpc.invoke('ElectronBrowserView.createBrowserView', restoreId, fallthroughKeyBindings)
+export const createBrowserView = async (ipc, restoreId, fallthroughKeyBindings) => {
+  const webContentsId = await ParentIpc.invoke('ElectronBrowserView.createBrowserView2', restoreId)
+  ElectronBrowserViewIpcState.add(webContentsId, ipc)
+  // TODO get window id from renderer worker
+  await ParentIpc.invoke('ElectronBrowserView.attachEventListeners', webContentsId)
+  await ParentIpc.invoke('ElectronBrowserViewFunctions.setBackgroundColor', webContentsId, 'white')
+  return webContentsId
 }
 
-export const disposeBrowserView = (id) => {
-  return ParentIpc.invoke('ElectronBrowserView.disposeBrowserView', id)
+export const disposeBrowserView = async (id) => {
+  ElectronBrowserViewState.remove(id)
+  await ParentIpc.invoke('ElectronBrowserView.disposeBrowserView', id)
+  await ElectronWebContents.dispose(id)
 }
 
-export const getAll = () => {
-  return ParentIpc.invoke('ElectronBrowserView.getAll')
+export const handleBrowserViewCreated = (id) => {
+  console.log('created', id)
+  ElectronBrowserViewState.add(id)
 }

package/src/parts/ElectronBrowserViewFunctions/ElectronBrowserViewFunctions.js

@@ -1,4 +1,5 @@
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+import * as ElectronWebContents from '../ElectronWebContents/ElectronWebContents.js'
 
 export const resizeBrowserView = (id, x, y, width, height) => {
   return ParentIpc.invoke('ElectronBrowserViewFunctions.resizeBrowserView', id, x, y, width, height)
@@ -8,25 +9,19 @@ export const setIframeSrc = async (id, iframeSrc) => {
   return ParentIpc.invoke('ElectronBrowserViewFunctions.setIframeSrc', id, iframeSrc)
 }
 
-export const focus = (id) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.focus', id)
+const callFunction = (id, functionName) => {
+  return ParentIpc.invoke('ElectronWebContents.callFunction', id, functionName)
 }
 
-export const openDevtools = (id) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.openDevtools', id)
-}
+export const focus = ElectronWebContents.focus
 
-export const reload = (id) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.reload', id)
-}
+export const openDevtools = ElectronWebContents.openDevtools
 
-export const forward = (id) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.forward', id)
-}
+export const reload = ElectronWebContents.reload
 
-export const backward = (id) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.backward', id)
-}
+export const forward = ElectronWebContents.forward
+
+export const backward = ElectronWebContents.backward
 
 export const cancelNavigation = (id) => {
   return ParentIpc.invoke('ElectronBrowserViewFunctions.cancelNavigation', id)
@@ -40,9 +35,7 @@ export const hide = (id) => {
   return ParentIpc.invoke('ElectronBrowserViewFunctions.hide', id)
 }
 
-export const inspectElement = (id, x, y) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.inspectElement', id, x, y)
-}
+export const inspectElement = ElectronWebContents.inspectElement
 
 export const copyImageAt = (id, x, y) => {
   return ParentIpc.invoke('ElectronBrowserViewFunctions.copyImageAt', id, x, y)
@@ -53,5 +46,5 @@ export const setFallthroughKeyBindings = (fallthroughKeyBindings) => {
 }
 
 export const getStats = (id) => {
-  return ParentIpc.invoke('ElectronBrowserViewFunctions.getStats', id)
+  return ParentIpc.invoke('ElectronWebContents.getStats', id)
 }

package/src/parts/ElectronBrowserViewIpcState/ElectronBrowserViewIpcState.js

@@ -0,0 +1,19 @@
+const state = {
+  ipcMap: Object.create(null),
+}
+
+export const add = (id, ipc) => {
+  state.ipcMap[id] = ipc
+}
+
+export const get = (id) => {
+  return state.ipcMap[id]
+}
+
+export const remove = (id) => {
+  delete state.ipcMap[id]
+}
+
+export const getAll = () => {
+  return Object.values(state.ipcMap)
+}

package/src/parts/ElectronBrowserViewState/ElectronBrowserViewState.js

@@ -0,0 +1,15 @@
+const state = {
+  browserViews: Object.create(null),
+}
+
+export const add = (id) => {
+  state.browserViews[id] = id
+}
+
+export const remove = (id) => {
+  delete state.browserViews[id]
+}
+
+export const getAll = () => {
+  return Object.values(state.browserViews)
+}

package/src/parts/ElectronWebContents/ElectronWebContents.ipc.js

@@ -0,0 +1,14 @@
+import * as ElectronWebContents from './ElectronWebContents.js'
+
+export const name = 'ElectronWebContents'
+
+export const Commands = {
+  dispose: ElectronWebContents.dispose,
+  handleKeyBinding: ElectronWebContents.handleKeyBinding,
+  handleWindowOpen: ElectronWebContents.handleWindowOpen,
+  handleWillNavigate: ElectronWebContents.handleWillNavigate,
+  handleDidNavigate: ElectronWebContents.handleDidNavigate,
+  handleContextMenu: ElectronWebContents.handleContextMenu,
+  handleTitleUpdated: ElectronWebContents.handleTitleUpdated,
+  handleBrowserViewDestroyed: ElectronWebContents.handleBrowserViewDestroyed, // TODO rename to webcontents
+}

package/src/parts/ElectronWebContents/ElectronWebContents.js

@@ -0,0 +1,73 @@
+import * as ElectronBrowserViewIpcState from '../ElectronBrowserViewIpcState/ElectronBrowserViewIpcState.js'
+import * as ElectronBrowserViewState from '../ElectronBrowserViewState/ElectronBrowserViewState.js'
+import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+
+export const dispose = async (id) => {
+  await ParentIpc.invoke('ElectronWebContents.dispose', id)
+}
+
+export const callFunction = (webContentsId, method, ...params) => {
+  return ParentIpc.invoke(`ElectronWebContents.callFunction`, webContentsId, method, ...params)
+}
+
+export const focus = (webContentsId) => {
+  return callFunction(webContentsId, 'focus')
+}
+
+export const openDevtools = (webContentsId) => {
+  return callFunction(webContentsId, 'openDevTools')
+}
+
+export const reload = (webContentsId) => {
+  return callFunction(webContentsId, 'reload')
+}
+
+export const forward = (webContentsId) => {
+  return callFunction(webContentsId, 'goForward')
+}
+
+export const backward = (webContentsId) => {
+  return callFunction(webContentsId, 'goBack')
+}
+
+export const inspectElement = (webContentsId, x, y) => {
+  return callFunction(webContentsId, `inspectElement`, x, y)
+}
+
+export const handleWindowOpen = (webContentsId, url) => {
+  // TODO
+}
+
+const forwardEvent = (method, webContentsId, ...params) => {
+  const ipc = ElectronBrowserViewIpcState.get(webContentsId)
+  if (!ipc) {
+    console.log('no ipc', { webContentsId })
+    return
+  }
+  ipc.send({
+    jsonrpc: '2.0',
+    method: `SimpleBrowser.${method}`,
+    params,
+  })
+}
+
+export const handleWillNavigate = (...args) => {
+  return forwardEvent('handleWillNavigate', ...args)
+}
+
+export const handleDidNavigate = (...args) => {
+  return forwardEvent('handleDidNavigate', ...args)
+}
+
+export const handleContextMenu = (...args) => {
+  return forwardEvent('handleContextMenu', ...args)
+}
+
+export const handleTitleUpdated = (...args) => {
+  return forwardEvent('handleTitleUpdated', ...args)
+}
+
+export const handleBrowserViewDestroyed = (id) => {
+  ElectronBrowserViewState.remove(id)
+  ElectronBrowserViewIpcState.remove(id)
+}

package/src/parts/ElectronWindow/ElectronWindow.ipc.js

@@ -4,14 +4,15 @@ export const name = 'ElectronWindow'
 
 export const Commands = {
   close: ElectronWindow.close,
+  focus: ElectronWindow.focus,
+  getZoom: ElectronWindow.getZoom,
   maximize: ElectronWindow.maximize,
   minimize: ElectronWindow.minimize,
+  openNew: ElectronWindow.openNew,
   reload: ElectronWindow.reload,
   toggleDevtools: ElectronWindow.toggleDevtools,
   unmaximize: ElectronWindow.unmaximize,
   zoomIn: ElectronWindow.zoomIn,
   zoomOut: ElectronWindow.zoomOut,
   zoomReset: ElectronWindow.zoomReset,
-  openNew: ElectronWindow.openNew,
-  focus: ElectronWindow.focus,
 }

package/src/parts/ElectronWindow/ElectronWindow.js

@@ -92,6 +92,11 @@ export const zoomReset = (windowId) => {
   return setZoom(windowId, getDefaultZoomLevel(), getMinZoomLevel(), getMaxZoomLevel())
 }
 
+export const getZoom = (windowId) => {
+  // TODO zoom level should be stored in shared process
+  return ParentIpc.invoke('ElectronWindow.getZoom', windowId)
+}
+
 export const focus = (windowId) => {
   return ParentIpc.invoke('ElectronWindow.executeWebContentsFunction', windowId, 'focus')
 }
@@ -99,3 +104,7 @@ export const focus = (windowId) => {
 export const handleClose = (windowId) => {
   // TODO
 }
+
+export const getFocusedWindowId = () => {
+  return ParentIpc.invoke('ElectronWindow.getFocusedWindowId')
+}

package/src/parts/Module/Module.js

@@ -140,6 +140,8 @@ export const load = (moduleId) => {
       return import('../HandleRemoteRequest/HandleRemoteRequest.ipc.js')
     case ModuleId.HandleMessagePortForExtensionHostHelperProcess:
       return import('../HandleMessagePortForExtensionHostHelperProcess/HandleMessagePortForExtensionHostHelperProcess.ipc.js')
+    case ModuleId.ElectronWebContents:
+      return import('../ElectronWebContents/ElectronWebContents.ipc.js')
     default:
       throw new Error(`module ${moduleId} not found`)
   }

package/src/parts/ModuleId/ModuleId.js

@@ -69,3 +69,4 @@ export const TemporaryMessagePort = 62
 export const GetElectronFileResponse = 63
 export const HandleRemoteRequest = 64
 export const HandleMessagePortForExtensionHostHelperProcess = 65
+export const ElectronWebContents = 66

package/src/parts/ModuleMap/ModuleMap.js

@@ -261,16 +261,17 @@ export const getModuleId = (commandId) => {
     case 'WebSocketServer.handleUpgrade':
       return ModuleId.WebSocketServer
     case 'ElectronWindow.close':
+    case 'ElectronWindow.focus':
+    case 'ElectronWindow.getZoom':
     case 'ElectronWindow.maximize':
     case 'ElectronWindow.minimize':
+    case 'ElectronWindow.openNew':
     case 'ElectronWindow.reload':
     case 'ElectronWindow.toggleDevtools':
     case 'ElectronWindow.unmaximize':
     case 'ElectronWindow.zoomIn':
     case 'ElectronWindow.zoomOut':
     case 'ElectronWindow.zoomReset':
-    case 'ElectronWindow.focus':
-    case 'ElectronWindow.openNew':
       return ModuleId.Window
     case 'Workspace.getHomeDir':
     case 'Workspace.resolveRoot':
@@ -295,6 +296,14 @@ export const getModuleId = (commandId) => {
       return ModuleId.HandleRemoteRequest
     case 'HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess':
       return ModuleId.HandleMessagePortForExtensionHostHelperProcess
+    case 'ElectronWebContents.dispose':
+    case 'ElectronWebContents.handleKeyBinding':
+    case 'ElectronWebContents.handleWindowOpen':
+    case 'ElectronWebContents.handleWillNavigate':
+    case 'ElectronWebContents.handleDidNavigate':
+    case 'ElectronWebContents.handleContextMenu':
+    case 'ElectronWebContents.handlePageTitleUpdated':
+      return ModuleId.ElectronWebContents
     default:
       throw new CommandNotFoundError(commandId)
   }

package/src/parts/Platform/Platform.js

@@ -61,11 +61,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.23.0'
+export const version = '0.23.2'
 
-export const commit = 'c25a55a'
+export const commit = '40414a1'
 
-export const date = '2024-02-01T19:16:57.000Z'
+export const date = '2024-02-12T18:48:06.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/RequiresSocket/RequiresSocket.js

@@ -11,6 +11,7 @@ const METHODS_THAT_REQUIRE_SOCKET = new Set([
   'ElectronApplicationMenu.setItems',
   'GetWindowId.getWindowId',
   'HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess',
+  'ElectronBrowserView.createBrowserView',
 ])
 
 export const requiresSocket = (method) => {