@lvce-editor/shared-process 0.20.14 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.20.14",
+  "version": "0.21.0",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.23.5",
-    "@lvce-editor/extension-host": "0.20.14",
-    "@lvce-editor/extension-host-helper-process": "0.20.14",
+    "@lvce-editor/extension-host": "0.21.0",
+    "@lvce-editor/extension-host-helper-process": "0.21.0",
     "@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.14",
+    "@lvce-editor/pty-host": "0.21.0",
     "@lvce-editor/verror": "^1.1.2",
     "debug": "^4.3.4",
     "execa": "^8.0.1",
@@ -34,7 +34,7 @@
     "p-queue": "^8.0.0",
     "parse-json": "^8.1.0",
     "tar-fs": "^3.0.4",
-    "ws": "^8.14.2",
+    "ws": "^8.15.0",
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {

package/src/parts/AppWindow/AppWindow.js

@@ -0,0 +1,46 @@
+import * as DefaultUrl from '../DefaultUrl/DefaultUrl.js'
+import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+import * as Platform from '../Platform/Platform.js'
+import * as Preferences from '../Preferences/Preferences.js'
+import * as Screen from '../Screen/Screen.js'
+
+const getWindowOptions = (preferencs, screenWidth, screenHeight) => {
+  const titleBarPreference = preferencs['window.titleBarStyle']
+  const frame = titleBarPreference !== 'custom'
+  const titleBarStyle = titleBarPreference === 'custom' ? 'hidden' : undefined
+  const zoomLevelPreference = preferencs['window.zoomLevel']
+  const zoomLevel = zoomLevelPreference
+  const windowControlsOverlayPreference = Platform.isWindows && preferencs['window.controlsOverlay.enabled']
+
+  const titleBarOverlay = windowControlsOverlayPreference
+    ? {
+        color: '#1e2324',
+        symbolColor: '#74b1be',
+        height: 29,
+      }
+    : undefined
+  return {
+    y: 0,
+    x: screenWidth - 800,
+    width: 800,
+    height: screenHeight,
+    menu: true,
+    background: '#1e2324',
+    titleBarStyle,
+    frame,
+    zoomLevel,
+    titleBarOverlay,
+  }
+}
+
+export const createAppWindow = async (preferences, parsedArgs, workingDirectory, url = DefaultUrl.defaultUrl) => {
+  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)
+}
+
+export const openNew = async (url) => {
+  const preferences = await Preferences.getAll()
+  return createAppWindow(preferences, [], '', url)
+}

package/src/parts/AppWindowStates/AppWindowStates.js

@@ -0,0 +1,62 @@
+export const state = {
+  /**
+   * @type {any[]}
+   */
+  windowStates: [],
+}
+
+export const findByWindowId = (windowId) => {
+  const { windowStates } = state
+  for (const windowState of windowStates) {
+    if (windowState.windowId === windowId) {
+      return windowState
+    }
+  }
+  return undefined
+}
+
+export const findByWebContentsId = (webContentsId) => {
+  const { windowStates } = state
+  for (const windowState of windowStates) {
+    if (windowState.webContentsId === webContentsId) {
+      return windowState
+    }
+  }
+  return undefined
+}
+
+export const findIndexById = (id) => {
+  const { windowStates } = state
+  for (let i = 0; i < windowStates.length; i++) {
+    const windowState = windowStates[i]
+    if (windowState.windowId === id) {
+      return i
+    }
+  }
+  return -1
+}
+
+export const remove = (windowId) => {
+  const index = findIndexById(windowId)
+  if (index === -1) {
+    throw new Error(`expected window ${windowId} to be in windows array`)
+  }
+  state.windowStates.splice(index, 1)
+}
+
+export const getAll = () => {
+  return state.windowStates
+}
+
+export const add = (config) => {
+  state.windowStates.push(config)
+}
+
+export const findByPort = (port) => {
+  for (const config of state.windowStates) {
+    if (config.port === port) {
+      return config
+    }
+  }
+  return undefined
+}

package/src/parts/Authority/Authority.js

@@ -0,0 +1 @@
+export const Authority = '-'

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/DefaultUrl/DefaultUrl.js

@@ -0,0 +1,4 @@
+import * as Platform from '../Platform/Platform.js'
+import * as Authority from '../Authority/Authority.js'
+
+export const defaultUrl = `${Platform.scheme}://${Authority.Authority}/`

package/src/parts/ElectronWindow/ElectronWindow.js

@@ -1,8 +1,9 @@
 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) => {
@@ -50,3 +51,7 @@ export const zoomReset = (windowId) => {
 export const focus = (windowId) => {
   return ParentIpc.invoke('ElectronWindow.focus', windowId)
 }
+
+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/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('ElectronApp.quit')
+  }
+}

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/Module/Module.js

@@ -124,6 +124,12 @@ export const load = (moduleId) => {
       return import('../Workspace/Workspace.ipc.js')
     case ModuleId.ElectronNet:
       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

@@ -61,3 +61,6 @@ export const DesktopCapturer = 54
 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

@@ -277,6 +277,14 @@ export const getModuleId = (commandId) => {
       return ModuleId.Workspace
     case 'ElectronNet.getJson':
       return ModuleId.ElectronNet
+    case 'Screen.getWidth':
+    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

@@ -13,6 +13,8 @@ export const isMacOs = platform === 'darwin'
 
 export const isDeb = false
 
+export const scheme = 'lvce-oss'
+
 export const getPathSeparator = () => {
   return sep
 }
@@ -51,11 +53,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.20.14'
+export const version = '0.21.0'
 
-export const commit = 'c1ac804'
+export const commit = 'f639638'
 
-export const date = '2023-12-08T22:58:38.000Z'
+export const date = '2023-12-12T05:33:21.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/Screen/Screen.ipc.js

@@ -0,0 +1,9 @@
+import * as Screen from './Screen.js'
+
+export const name = 'Screen'
+
+export const Commands = {
+  getBounds: Screen.getBounds,
+  getWidth: Screen.getWidth,
+  getHeight: Screen.getHeight,
+}

package/src/parts/Screen/Screen.js

@@ -0,0 +1,13 @@
+import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+
+export const getWidth = () => {
+  return ParentIpc.invoke('ElectronScreen.getWidth')
+}
+
+export const getHeight = () => {
+  return ParentIpc.invoke('ElectronScreen.getHeight')
+}
+
+export const 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)
-}