@lvce-editor/shared-process 0.20.15 → 0.21.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.20.15",
+  "version": "0.21.1",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.23.5",
-    "@lvce-editor/extension-host": "0.20.15",
-    "@lvce-editor/extension-host-helper-process": "0.20.15",
+    "@lvce-editor/extension-host": "0.21.1",
+    "@lvce-editor/extension-host-helper-process": "0.21.1",
     "@lvce-editor/json-rpc": "^0.4.0",
     "@lvce-editor/jsonc-parser": "^1.1.0",
     "@lvce-editor/pretty-error": "^1.2.2",
-    "@lvce-editor/pty-host": "0.20.15",
+    "@lvce-editor/pty-host": "0.21.1",
     "@lvce-editor/verror": "^1.1.2",
     "debug": "^4.3.4",
     "execa": "^8.0.1",

package/src/parts/AppWindow/AppWindow.js

@@ -4,7 +4,7 @@ import * as Platform from '../Platform/Platform.js'
 import * as Preferences from '../Preferences/Preferences.js'
 import * as Screen from '../Screen/Screen.js'
 
-const getWindowOptions = async (preferencs, screenWidth, screenHeight) => {
+const getWindowOptions = (preferencs, screenWidth, screenHeight) => {
   const titleBarPreference = preferencs['window.titleBarStyle']
   const frame = titleBarPreference !== 'custom'
   const titleBarStyle = titleBarPreference === 'custom' ? 'hidden' : undefined
@@ -37,7 +37,7 @@ export const createAppWindow = async (preferences, parsedArgs, workingDirectory,
   const screenWidth = await Screen.getWidth()
   const screenHeight = await Screen.getHeight()
   const windowOptions = getWindowOptions(preferences, screenWidth, screenHeight)
-  return ParentIpc.invoke('Appwindow.createAppWindow2', windowOptions, parsedArgs, workingDirectory, url)
+  return ParentIpc.invoke('AppWindow.createAppWindow2', windowOptions, parsedArgs, workingDirectory, url)
 }
 
 export const openNew = async (url) => {

package/src/parts/ColorTheme/ColorTheme.js

@@ -0,0 +1,21 @@
+import * as JoinLines from '../JoinLines/JoinLines.js'
+
+export const getColorThemeJson = async () => {
+  return {
+    MainBackground: '#1e2324',
+    TreeItemForeground: ` rgb(188, 190, 190)`,
+    FocusOutline: `#3d5252`,
+  }
+}
+
+const toInnerLine = ([key, value]) => {
+  return `  --${key}: ${value};`
+}
+
+export const toCss = (colorThemeJson) => {
+  const innerLines = Object.entries(colorThemeJson).map(toInnerLine)
+  const css = `:root {
+${JoinLines.joinLines(innerLines)}
+}`
+  return css
+}

package/src/parts/ElectronContextMenu/ElectronContextMenu.js

@@ -1,5 +1,9 @@
+import * as Assert from '../Assert/Assert.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 
-export const openContextMenu = (menuItems, x, y, customData) => {
-  return ParentIpc.invoke('ElectronContextMenu.openContextMenu', menuItems, x, y, customData)
+export const openContextMenu = (menuItems, x, y) => {
+  Assert.array(menuItems)
+  Assert.number(x)
+  Assert.number(y)
+  return ParentIpc.invoke('ElectronContextMenu.openContextMenu', menuItems, x, y)
 }

package/src/parts/ElectronSafeStorage/ElectronSafeStorage.js

@@ -1,13 +1,16 @@
+import * as EncodingType from '../EncodingType/EncodingType.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 
 export const isEncryptionAvailable = () => {
   return ParentIpc.invoke('ElectronSafeStorage.isEncryptionAvailable')
 }
 
-export const encryptString = (plainText) => {
-  return ParentIpc.invoke('ElectronSafeStorage.encryptString', plainText)
+export const encryptString = async (plainText) => {
+  const buffer = await ParentIpc.invoke('ElectronSafeStorage.encrypt', plainText)
+  return buffer.toString(EncodingType.Base64)
 }
 
 export const decryptString = (encrypted) => {
-  return ParentIpc.invoke('ElectronSafeStorage.decryptString', encrypted)
+  const buffer = Buffer.from(encrypted, EncodingType.Base64)
+  return ParentIpc.invoke('ElectronSafeStorage.decrypt', buffer)
 }

package/src/parts/ElectronWindow/ElectronWindow.js

@@ -1,38 +1,39 @@
 import * as Assert from '../Assert/Assert.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+import * as AppWindow from '../AppWindow/AppWindow.js'
 
 export const openNew = () => {
-  return ParentIpc.invoke('AppWindow.openNew')
+  return AppWindow.openNew()
 }
 
 export const minimize = (windowId) => {
   Assert.number(windowId)
-  return ParentIpc.invoke('ElectronWindow.minimize', windowId)
+  return ParentIpc.invoke('ElectronWindow.executeWindowFunction', windowId, 'minimize')
 }
 
 export const toggleDevtools = (windowId) => {
   Assert.number(windowId)
-  return ParentIpc.invoke('ElectronWindow.toggleDevtools', windowId)
+  return ParentIpc.invoke('ElectronWindow.executeWebContentsFunction', windowId, 'toggleDevTools')
 }
 
 export const maximize = (windowId) => {
   Assert.number(windowId)
-  return ParentIpc.invoke('ElectronWindow.maximize', windowId)
+  return ParentIpc.invoke('ElectronWindow.executeWindowFunction', windowId, 'maximize')
 }
 
 export const unmaximize = (windowId) => {
   Assert.number(windowId)
-  return ParentIpc.invoke('ElectronWindow.unmaximize')
+  return ParentIpc.invoke('ElectronWindow.executeWindowFunction', windowId, 'unmaximize')
 }
 
 export const close = (windowId) => {
   Assert.number(windowId)
-  return ParentIpc.invoke('ElectronWindow.close', windowId)
+  return ParentIpc.invoke('ElectronWindow.executeWindowFunction', windowId, 'close')
 }
 
 export const reload = (windowId) => {
   Assert.number(windowId)
-  return ParentIpc.invoke('ElectronWindow.reload', windowId)
+  return ParentIpc.invoke('ElectronWindow.executeWindowFunction', windowId, 'reload')
 }
 
 export const zoomIn = (windowId) => {
@@ -48,5 +49,9 @@ export const zoomReset = (windowId) => {
 }
 
 export const focus = (windowId) => {
-  return ParentIpc.invoke('ElectronWindow.focus', windowId)
+  return ParentIpc.invoke('ElectronWindow.executeWebContentsFunction', windowId, 'focus')
+}
+
+export const handleClose = (windowId) => {
+  // TODO
 }

package/src/parts/ElectronWindowProcessExplorer/ElectronWindowProcessExplorer.js

@@ -1,5 +1,34 @@
+import { writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import * as ColorTheme from '../ColorTheme/ColorTheme.js'
+import * as GetProcessExplorerUrl from '../GetProcessExplorerUrl/GetProcessExplorerUrl.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 
-export const open = () => {
-  return ParentIpc.invoke('ElectronWindowProcessExplorer.open')
+const getOptions = async (colorThemeJson) => {
+  const backgroundColor = colorThemeJson.MainBackground
+  const preload = GetProcessExplorerUrl.getProcessExplorerPreloadUrl()
+  const options = {
+    width: 800,
+    height: 500,
+    backgroundColor,
+    webPreferences: {
+      preload,
+      sandbox: true,
+      additionalArguments: ['--lvce-window-kind=process-explorer'],
+      spellcheck: false,
+    },
+  }
+  return options
+}
+
+export const open = async () => {
+  const colorThemeJson = await ColorTheme.getColorThemeJson()
+  const options = await getOptions(colorThemeJson)
+  // TODO get actual process explorer theme css from somewhere
+  const processExplorerThemeCss = ColorTheme.toCss(colorThemeJson)
+  const processExporerThemeCssPath = join(tmpdir(), 'process-explorer-theme.css')
+  await writeFile(processExporerThemeCssPath, processExplorerThemeCss)
+  const url = GetProcessExplorerUrl.getProcessExplorerUrl()
+  return ParentIpc.invoke('ElectronWindowProcessExplorer.open2', options, url)
 }

package/src/parts/GetProcessExplorerUrl/GetProcessExplorerUrl.js

@@ -0,0 +1,11 @@
+import * as Path from '../Path/Path.js'
+import * as Platform from '../Platform/Platform.js'
+import * as Root from '../Root/Root.js'
+
+export const getProcessExplorerUrl = () => {
+  return `${Platform.scheme}://-/packages/main-process/pages/process-explorer/process-explorer.html`
+}
+
+export const getProcessExplorerPreloadUrl = () => {
+  return Path.join(Root.root, 'packages', 'main-process', 'pages', 'process-explorer', 'process-explorer-preload.js')
+}

package/src/parts/HandleElectronReady/HandleElectronReady.ipc.js

@@ -0,0 +1,7 @@
+import * as HandleElectronReady from './HandleElectronReady.js'
+
+export const name = 'HandleElectronReady'
+
+export const Commands = {
+  handleElectronReady: HandleElectronReady.handleElectronReady,
+}

package/src/parts/HandleElectronReady/HandleElectronReady.js

@@ -0,0 +1,10 @@
+import * as AppWindow from '../AppWindow/AppWindow.js'
+import * as Assert from '../Assert/Assert.js'
+import * as Preferences from '../Preferences/Preferences.js'
+
+export const handleElectronReady = async (parsedArgs, workingDirectory) => {
+  Assert.object(parsedArgs)
+  Assert.string(workingDirectory)
+  const preferences = await Preferences.getAll()
+  await AppWindow.createAppWindow(preferences, parsedArgs, workingDirectory)
+}

package/src/parts/HandleUncaughtExceptionMonitor/HandleUncaughtExceptionMonitor.js

@@ -0,0 +1,5 @@
+import * as ErrorHandling from '../ErrorHandling/ErrorHandling.js'
+
+export const handleUncaughtExceptionMonitor = (error) => {
+  ErrorHandling.handleUncaughtExceptionMonitor(error)
+}

package/src/parts/HandleWindowAllClosed/HandleWindowAllClosed.ipc.js

@@ -0,0 +1,7 @@
+import * as HandleWindowAllClosed from './HandleWindowAllClosed.js'
+
+export const name = 'HandleWindowAllClosed'
+
+export const Commands = {
+  handleWindowAllClosed: HandleWindowAllClosed.handleWindowAllClosed,
+}

package/src/parts/HandleWindowAllClosed/HandleWindowAllClosed.js

@@ -0,0 +1,11 @@
+import * as Debug from '../Debug/Debug.js'
+import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+import * as Platform from '../Platform/Platform.js'
+
+export const handleWindowAllClosed = async () => {
+  Debug.debug('[info] all windows closed')
+  if (!Platform.isMacOs) {
+    Debug.debug('[info] quitting')
+    await ParentIpc.invoke('Exit.exit')
+  }
+}

package/src/parts/IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js

@@ -1,5 +1,3 @@
-import * as IsElectron from '../IsElectron/IsElectron.js'
-
 export const listen = () => {
   // @ts-ignore
   const parentPort = process.parentPort

package/src/parts/Main/Main.js

@@ -1,5 +1,5 @@
-import { setPriority } from 'node:os'
 import * as Command from '../Command/Command.js'
+import * as HandleUncaughtExceptionMonitor from '../HandleUncaughtExceptionMonitor/HandleUncaughtExceptionMonitor.js'
 import * as Module from '../Module/Module.js'
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 import * as ProcessListeners from '../ProcessListeners/ProcessListeners.js'
@@ -9,7 +9,6 @@ export const main = async () => {
   Command.setLoad(Module.load)
   process.on('disconnect', ProcessListeners.handleDisconnect)
   process.on(Signal.SIGTERM, ProcessListeners.handleSigTerm)
-  process.on('uncaughtExceptionMonitor', ProcessListeners.handleUncaughtExceptionMonitor)
+  process.on('uncaughtExceptionMonitor', HandleUncaughtExceptionMonitor.handleUncaughtExceptionMonitor)
   await ParentIpc.listen()
-  setPriority(process.pid, 19)
 }

package/src/parts/Module/Module.js

@@ -126,6 +126,10 @@ export const load = (moduleId) => {
       return import('../ElectronNet/ElectronNet.ipc.js')
     case ModuleId.Screen:
       return import('../Screen/Screen.ipc.js')
+    case ModuleId.HandleElectronReady:
+      return import('../HandleElectronReady/HandleElectronReady.ipc.js')
+    case ModuleId.HandleWindowAllClosed:
+      return import('../HandleWindowAllClosed/HandleWindowAllClosed.ipc.js')
     default:
       throw new Error(`module ${moduleId} not found`)
   }

package/src/parts/ModuleId/ModuleId.js

@@ -62,3 +62,5 @@ export const ElectronContentTracing = 55
 export const Os = 56
 export const ElectronNet = 57
 export const Screen = 58
+export const HandleElectronReady = 59
+export const HandleWindowAllClosed = 60

package/src/parts/ModuleMap/ModuleMap.js

@@ -281,6 +281,10 @@ export const getModuleId = (commandId) => {
     case 'Screen.getHeight':
     case 'Screen.getBounds':
       return ModuleId.Screen
+    case 'HandleElectronReady.handleElectronReady':
+      return ModuleId.HandleElectronReady
+    case 'HandleWindowAllClosed.handleWindowAllClosed':
+      return ModuleId.HandleWindowAllClosed
     default:
       throw new CommandNotFoundError(commandId)
   }

package/src/parts/Platform/Platform.js

@@ -53,11 +53,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.20.15'
+export const version = '0.21.1'
 
-export const commit = '7202220'
+export const commit = '1aea3f8'
 
-export const date = '2023-12-10T20:01:56.000Z'
+export const date = '2023-12-12T20:15:17.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/Screen/Screen.js

@@ -1,13 +1,13 @@
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 
 export const getWidth = () => {
-  return ParentIpc.invoke('Screen.getWidth')
+  return ParentIpc.invoke('ElectronScreen.getWidth')
 }
 
 export const getHeight = () => {
-  return ParentIpc.invoke('Screen.getHeight')
+  return ParentIpc.invoke('ElectronScreen.getHeight')
 }
 
 export const getBounds = () => {
-  return ParentIpc.invoke('Screen.getBounds')
+  return ParentIpc.invoke('ElectronScreen.getBounds')
 }

package/src/parts/GetResponse/GetResponse.js

@@ -1,14 +0,0 @@
-import * as GetErrorResponse from '../GetErrorResponse/GetErrorResponse.js'
-import * as GetSuccessResponse from '../GetSuccessResponse/GetSuccessResponse.js'
-import * as RequiresSocket from '../RequiresSocket/RequiresSocket.js'
-
-export const getResponse = async (message, ipc, execute, preparePrettyError, logError) => {
-  try {
-    const result = RequiresSocket.requiresSocket(message.method)
-      ? await execute(message.method, ipc, ...message.params)
-      : await execute(message.method, ...message.params)
-    return GetSuccessResponse.getSuccessResponse(message, result)
-  } catch (error) {
-    return GetErrorResponse.getErrorResponse(message, error, ipc, preparePrettyError, logError)
-  }
-}

package/src/parts/GetSuccessResponse/GetSuccessResponse.js

@@ -1,6 +0,0 @@
-import * as JsonRpcSuccessResponse from '../JsonRpcSuccessResponse/JsonSuccessResponse.js'
-
-export const getSuccessResponse = (message, result) => {
-  const resultProperty = result ?? null
-  return JsonRpcSuccessResponse.create(message, resultProperty)
-}