@lvce-editor/shared-process 0.86.4 → 0.86.6

package/src/parts/IpcParentWithElectronUtilityProcess/IpcParentWithElectronUtilityProcess.js

@@ -37,14 +37,22 @@ const getActualData = (event) => {
 
 export const wrap = (port) => {
   return {
-    port,
-    wrappedListener: undefined,
-    send(message)      {
-      this.port.postMessage(message)
+    dispose()      {
+      this.port.close()
+      ParentIpc.invoke('TemporaryMessagePort.dispose', this.port.name)
     },
-    async sendAndTransfer(message)               {
-      const { newValue, transfer } = FixElectronParameters.fixElectronParameters(message)
-      this.port.postMessage(newValue, transfer)
+    off(event, listener)      {
+      switch (event) {
+        case 'close':
+          this.port.off(event, listener)
+          break
+        case 'message':
+          this.port.off(event, this.wrappedListener)
+          this.wrappedListener = undefined
+          break
+        default:
+          break
+      }
     },
     on(event, listener)      {
       switch (event) {
@@ -66,22 +74,14 @@ export const wrap = (port) => {
           break
       }
     },
-    off(event, listener)      {
-      switch (event) {
-        case 'close':
-          this.port.off(event, listener)
-          break
-        case 'message':
-          this.port.off(event, this.wrappedListener)
-          this.wrappedListener = undefined
-          break
-        default:
-          break
-      }
+    port,
+    send(message)      {
+      this.port.postMessage(message)
     },
-    dispose()      {
-      this.port.close()
-      ParentIpc.invoke('TemporaryMessagePort.dispose', this.port.name)
+    async sendAndTransfer(message)               {
+      const { newValue, transfer } = FixElectronParameters.fixElectronParameters(message)
+      this.port.postMessage(newValue, transfer)
     },
+    wrappedListener: undefined,
   }
 }

package/src/parts/Json/Json.js

@@ -1,8 +1,8 @@
 // parsing error handling based on https://github.com/sindresorhus/parse-json/blob/main/index.js
 
-import { VError } from '../VError/VError.js'
 import * as Character from '../Character/Character.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import { VError } from '../VError/VError.js'
 
 export const parse = async (string, filePath) => {
   try {

package/src/parts/LaunchAuthProcess/LaunchAuthProcess.js

@@ -5,11 +5,11 @@ import * as LaunchProcess from '../LaunchProcess/LaunchProcess.js'
 
 export const launchAuthProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'Auth Process',
-    targetRpcId: IpcId.AuthProcess,
     defaultPath: AuthProcessPath.authProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'Auth Process',
     settingName: 'develop.authProcessPath',
+    targetRpcId: IpcId.AuthProcess,
   })
   return ipc
 }

package/src/parts/LaunchClipBoardProcess/LaunchClipBoardProcess.js

@@ -5,11 +5,11 @@ import * as LaunchProcess from '../LaunchProcess/LaunchProcess.js'
 
 export const launchClipBoardProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'ClipBoard Process',
-    targetRpcId: IpcId.ClipBoardProcess,
     defaultPath: ClipBoardProcessPath.clipBoardProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'ClipBoard Process',
     settingName: 'develop.clipBoardProcessPath',
+    targetRpcId: IpcId.ClipBoardProcess,
   })
   return ipc
 }

package/src/parts/LaunchEmbedsProcess/LaunchEmbedsProcess.js

@@ -6,11 +6,11 @@ import * as LaunchProcess from '../LaunchProcess/LaunchProcess.js'
 
 export const launchEmbedsProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'Embeds Process',
-    targetRpcId: IpcId.EmbedsProcess,
     defaultPath: EmbedsProcessPath.embedsProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'Embeds Process',
     settingName: 'develop.embedsProcessPath',
+    targetRpcId: IpcId.EmbedsProcess,
   })
   // TODO embeds worker itself should connect to main process
   await ConnectIpcToElectron.connectIpcToMainProcess2(ipc, IpcId.EmbedsProcess)

package/src/parts/LaunchFileSystemProcess/LaunchFileSystemProcess.js

@@ -7,11 +7,11 @@ import * as LaunchProcess from '../LaunchProcess/LaunchProcess.js'
 
 export const launchFileSystemProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'File System Process',
-    targetRpcId: IpcId.FileSystemProcess,
     defaultPath: FileSystemProcessPath.fileSystemProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'File System Process',
     settingName: 'develop.fileSystemProcessPath',
+    targetRpcId: IpcId.FileSystemProcess,
   })
   // @ts-ignore
   set(IpcId.FileSystemProcess, ipc)

package/src/parts/LaunchFileWatcherProcess/LaunchFileWatcherProcess.js

@@ -5,10 +5,10 @@ import * as LaunchProcess from '../LaunchProcess/LaunchProcess.js'
 
 export const launchFileWatcherProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'File Watcher Process',
-    settingName: 'develop.fileWatcherProcessPath',
     defaultPath: FileWatcherProcessPath.fileWatcherProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'File Watcher Process',
+    settingName: 'develop.fileWatcherProcessPath',
     targetRpcId: IpcId.FileWatcherProcess,
   })
   return ipc

package/src/parts/LaunchPreviewProcess/LaunchPreviewProcess.js

@@ -4,10 +4,10 @@ import * as PreviewProcessPath from '../PreviewProcessPath/PreviewProcessPath.js
 
 export const launchPreviewProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    settingName: 'develop.previewProcessPath',
-    name: 'Preview Process',
     defaultPath: PreviewProcessPath.previewProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'Preview Process',
+    settingName: 'develop.previewProcessPath',
     targetRpcId: undefined,
   })
   return ipc

package/src/parts/LaunchProcess/LaunchProcess.js

@@ -18,16 +18,16 @@ const getConfiguredUrl = async (settingName, defaultPath) => {
   return defaultPath
 }
 
-export const launchProcess = async ({ settingName, defaultPath, targetRpcId, name, isElectron }     ) => {
+export const launchProcess = async ({ defaultPath, isElectron, name, settingName, targetRpcId }     ) => {
   const path = await getConfiguredUrl(settingName, defaultPath)
   const method = isElectron ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess
   const ipc = await IpcParent.create({
+    argv: [],
+    ipcId: IpcId.SharedProcess,
     method,
+    name,
     path,
-    argv: [],
     stdio: 'inherit',
-    name,
-    ipcId: IpcId.SharedProcess,
     targetRpcId,
   })
   HandleIpc.handleIpc(ipc)

package/src/parts/LaunchProcessExplorer/LaunchProcessExplorer.js

@@ -7,9 +7,9 @@ import * as ProcessExplorerPath from '../ProcessExplorerPath/ProcessExplorerPath
 
 export const launchProcessExplorer = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'Process Explorer',
     defaultPath: ProcessExplorerPath.processExplorerPath,
     isElectron: IsElectron.isElectron,
+    name: 'Process Explorer',
     settingName: 'develop.processExplorerPath',
     targetRpcId: IpcId.ProcessExplorer,
   })

package/src/parts/LaunchSearchProcess/LaunchSearchProcess.js

@@ -4,9 +4,9 @@ import * as SearchProcessPath from '../SearchProcessPath/SearchProcessPath.js'
 
 export const launchSearchProcess = async () => {
   const ipc = await LaunchProcess.launchProcess({
-    name: 'Search Process',
     defaultPath: SearchProcessPath.searchProcessPath,
     isElectron: IsElectron.isElectron,
+    name: 'Search Process',
     settingName: 'develop.searchProcessPath',
     targetRpcId: undefined,
   })

package/src/parts/LaunchTypeScriptCompileProcess/LaunchTypeScriptCompileProcess.js

@@ -1,22 +1,22 @@
+import * as GetTypeScriptPath from '../GetTypeScriptPath/GetTypeScriptPath.js'
 import * as HandleIpc from '../HandleIpc/HandleIpc.js'
+import * as IpcId from '../IpcId/IpcId.js'
 import * as IpcParent from '../IpcParent/IpcParent.js'
 import * as IpcParentType from '../IpcParentType/IpcParentType.js'
 import * as IsElectron from '../IsElectron/IsElectron.js'
-import * as GetTypeScriptPath from '../GetTypeScriptPath/GetTypeScriptPath.js'
-import * as IpcId from '../IpcId/IpcId.js'
 import * as JsonRpc from '../JsonRpc/JsonRpc.js'
 
 export const launchTypeScriptCompileProcess = async () => {
   const method = IsElectron.isElectron ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess
   const TypeScriptCompileProcessPath = await import('../TypeScriptCompileProcessPath/TypeScriptCompileProcessPath.js')
   const typescriptCompileProcess = await IpcParent.create({
+    argv: [],
+    execArgv: ['--disable-warning=ExperimentalWarnings'], // TODO remove this when stripTypes is stable
+    ipcId: IpcId.SharedProcess,
     method,
+    name: 'TypeScript Compile Process',
     path: TypeScriptCompileProcessPath.typescriptCompileProcessPath,
-    execArgv: ['--disable-warning=ExperimentalWarnings'], // TODO remove this when stripTypes is stable
-    argv: [],
     stdio: 'inherit',
-    name: 'TypeScript Compile Process',
-    ipcId: IpcId.SharedProcess,
     targetRpcId: IpcId.TypescriptCompileProcess,
   })
   HandleIpc.handleIpc(typescriptCompileProcess)

package/src/parts/Main/Main.js

@@ -1,8 +1,8 @@
 import * as Command from '../Command/Command.js'
 import * as HandleDisconnect from '../HandleDisconnect/HandleDisconnect.js'
 import * as HandleUncaughtExceptionMonitor from '../HandleUncaughtExceptionMonitor/HandleUncaughtExceptionMonitor.js'
-import * as Module from '../Module/Module.js'
 import * as ParentIpc from '../MainProcess/MainProcess.js'
+import * as Module from '../Module/Module.js'
 import * as ProcessListeners from '../ProcessListeners/ProcessListeners.js'
 import * as Signal from '../Signal/Signal.js'
 

package/src/parts/Module/Module.js

@@ -8,16 +8,14 @@ export const load = (moduleId) => {
       return import('../AutoUpdater/AutoUpdater.ipc.js')
     case ModuleId.AutoUpdaterAppImage:
       return import('../AutoUpdaterAppImage/AutoUpdaterAppImage.ipc.js')
-    case ModuleId.GetWindowId:
-      return import('../GetWindowId/GetWindowId.ipc.js')
     case ModuleId.AutoUpdaterWindowsNsis:
       return import('../AutoUpdaterWindowsNsis/AutoUpdaterWindowsNsis.ipc.js')
     case ModuleId.BulkReplacement:
       return import('../BulkReplacement/BulkReplacement.ipc.js')
-    case ModuleId.Exec:
-      return import('../Exec/Exec.ipc.js')
     case ModuleId.ClipBoard:
       return import('../ClipBoard/ClipBoard.ipc.js')
+    case ModuleId.ContentSecurityPolicy:
+      return import('../ContentSecurityPolicy/ContentSecurityPolicy.ipc.js')
     case ModuleId.Crash:
       return import('../Crash/Crash.ipc.js')
     case ModuleId.DesktopCapturer:
@@ -30,46 +28,84 @@ export const load = (moduleId) => {
       return import('../ElectronApplicationMenu/ElectronApplicationMenu.ipc.js')
     case ModuleId.ElectronContentTracing:
       return import('../ElectronContentTracing/ElectronContentTracing.ipc.js')
-    case ModuleId.ElectronDeveloper:
-      return import('../ElectronDeveloper/ElectronDeveloper.ipc.js')
     case ModuleId.ElectronContextMenu:
       return import('../ElectronContextMenu/ElectronContextMenu.ipc.js')
+    case ModuleId.ElectronDeveloper:
+      return import('../ElectronDeveloper/ElectronDeveloper.ipc.js')
     case ModuleId.ElectronDialog:
       return import('../ElectronDialog/ElectronDialog.ipc.js')
     case ModuleId.ElectronInitialize:
       return import('../ElectronInitialize/ElectronInitialize.ipc.js')
+    case ModuleId.ElectronNet:
+      return import('../ElectronNet/ElectronNet.ipc.js')
     case ModuleId.ElectronNetLog:
       return import('../ElectronNetLog/ElectronNetLog.ipc.js')
+    case ModuleId.ElectronPowerSaveBlocker:
+      return import('../ElectronPowerSaveBlocker/ElectronPowerSaveBlocker.ipc.js')
     case ModuleId.ElectronProcess:
       return import('../ElectronProcess/ElectronProcess.ipc.js')
     case ModuleId.ElectronSafeStorage:
       return import('../ElectronSafeStorage/ElectronSafeStorage.ipc.js')
-    case ModuleId.Window:
-      return import('../ElectronWindow/ElectronWindow.ipc.js')
     case ModuleId.ElectronWindowAbout:
       return import('../ElectronWindowAbout/ElectronWindowAbout.ipc.js')
     case ModuleId.ElectronWindowProcessExplorer:
       return import('../ElectronWindowProcessExplorer/ElectronWindowProcessExplorer.ipc.js')
+    case ModuleId.Exec:
+      return import('../Exec/Exec.ipc.js')
     case ModuleId.Exit:
       return import('../Exit/Exit.ipc.js')
-    case ModuleId.HandleRequestTest:
-      return import('../HandleRequestTest/HandleRequestTest.ipc.js')
     case ModuleId.ExtensionManagement:
       return import('../ExtensionManagement/ExtensionManagement.ipc.js')
     case ModuleId.FileSystem:
       return import('../FileSystem/FileSystem.ipc.js')
+    case ModuleId.FileSystemDisk:
+      return import('../FileSystemDisk/FileSystemDisk.ipc.js')
+    case ModuleId.FileWatcher:
+      return import('../FileWatcher/FileWatcher.ipc.js')
+    case ModuleId.GetElectronFileResponse:
+      return import('../GetElectronFileResponse/GetElectronFileResponse.ipc.js')
+    case ModuleId.GetExtensions:
+      return import('../GetExtensions/GetExtensions.ipc.js')
     case ModuleId.GetTerminalSpawnOptions:
       return import('../GetTerminalSpawnOptions/GetTerminalSpawnOptions.ipc.js')
+    case ModuleId.GetWindowId:
+      return import('../GetWindowId/GetWindowId.ipc.js')
     case ModuleId.GitLsFiles:
       return import('../GitLsFiles/GitLsFiles.ipc.js')
     case ModuleId.HandleCliArgs:
       return import('../HandleCliArgs/HandleCliArgs.ipc.js')
     case ModuleId.HandleElectronMessagePort:
       return import('../HandleElectronMessagePort/HandleElectronMessagePort.ipc.js')
+    case ModuleId.HandleElectronReady:
+      return import('../HandleElectronReady/HandleElectronReady.ipc.js')
+    case ModuleId.HandleMessagePortForAuthProcess:
+      return import('../HandleMessagePortForAuthProcess/HandleMessagePortForAuthProcess.ipc.js')
+    case ModuleId.HandleMessagePortForClipBoardProcess:
+      return import('../HandleMessagePortForClipBoardProcess/HandleMessagePortForClipBoardProcess.ipc.js')
+    case ModuleId.HandleMessagePortForEmbedsProcess:
+      return import('../HandleMessagePortForEmbedsProcess/HandleMessagePortForEmbedsProcess.ipc.js')
+    case ModuleId.HandleMessagePortForExtensionHostHelperProcess:
+      return import('../HandleMessagePortForExtensionHostHelperProcess/HandleMessagePortForExtensionHostHelperProcess.ipc.js')
+    case ModuleId.HandleMessagePortForFileSystemProcess:
+      return import('../HandleMessagePortForFileSystemProcess/HandleMessagePortForFileSystemProcess.ipc.js')
+    case ModuleId.HandleMessagePortForProcessExplorer:
+      return import('../HandleMessagePortForProcessExplorer/HandleMessagePortForProcessExplorer.ipc.js')
+    case ModuleId.HandleMessagePortForSearchProcess:
+      return import('../HandleMessagePortForSearchProcess/HandleMessagePortForSearchProcess.ipc.js')
+    case ModuleId.HandleMessagePortForTerminalProcess:
+      return import('../HandleMessagePortForTerminalProcess/HandleMessagePortForTerminalProcess.ipc.js')
     case ModuleId.HandleNodeMessagePort:
       return import('../HandleNodeMessagePort/HandleNodeMessagePort.ipc.js')
+    case ModuleId.HandleRemoteRequest:
+      return import('../HandleRemoteRequest/HandleRemoteRequest.ipc.js')
+    case ModuleId.HandleRequest:
+      return import('../HandleRequest/HandleRequest.ipc.js')
+    case ModuleId.HandleRequestTest:
+      return import('../HandleRequestTest/HandleRequestTest.ipc.js')
     case ModuleId.HandleWebSocket:
       return import('../HandleWebSocket/HandleWebSocket.ipc.js')
+    case ModuleId.HandleWindowAllClosed:
+      return import('../HandleWindowAllClosed/HandleWindowAllClosed.ipc.js')
     case ModuleId.InstallExtension:
       return import('../InstallExtension/InstallExtension.ipc.js')
     case ModuleId.IsAutoUpdateSupported:
@@ -78,20 +114,16 @@ export const load = (moduleId) => {
       return import('../OpenExternal/OpenExternal.ipc.js')
     case ModuleId.OpenNativeFolder:
       return import('../OpenNativeFolder/OpenNativeFolder.ipc.js')
-    case ModuleId.ElectronPowerSaveBlocker:
-      return import('../ElectronPowerSaveBlocker/ElectronPowerSaveBlocker.ipc.js')
     case ModuleId.Os:
       return import('../Os/Os.ipc.js')
-    case ModuleId.PlatformPaths:
-      return import('../PlatformPaths/PlatformPaths.ipc.js')
-    case ModuleId.HandleMessagePortForAuthProcess:
-      return import('../HandleMessagePortForAuthProcess/HandleMessagePortForAuthProcess.ipc.js')
     case ModuleId.OutputChannel:
       return import('../OutputChannel/OutputChannel.ipc.js')
     case ModuleId.Performance:
       return import('../Performance/Performance.ipc.js')
     case ModuleId.Platform:
       return import('../Platform/Platform.ipc.js')
+    case ModuleId.PlatformPaths:
+      return import('../PlatformPaths/PlatformPaths.ipc.js')
     case ModuleId.Preferences:
       return import('../Preferences/Preferences.ipc.js')
     case ModuleId.Process:
@@ -104,52 +136,20 @@ export const load = (moduleId) => {
       return import('../RebuildNodePty/RebuildNodePty.ipc.js')
     case ModuleId.RecentlyOpened:
       return import('../RecentlyOpened/RecentlyOpened.ipc.js')
-    case ModuleId.Terminal:
-      return import('../Terminal/Terminal.ipc.js')
-    case ModuleId.TextDocument:
-      return import('../TextDocument/TextDocument.ipc.js')
-    case ModuleId.Workspace:
-      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')
-    case ModuleId.HandleMessagePortForTerminalProcess:
-      return import('../HandleMessagePortForTerminalProcess/HandleMessagePortForTerminalProcess.ipc.js')
-    case ModuleId.HandleMessagePortForEmbedsProcess:
-      return import('../HandleMessagePortForEmbedsProcess/HandleMessagePortForEmbedsProcess.ipc.js')
-    case ModuleId.HandleMessagePortForFileSystemProcess:
-      return import('../HandleMessagePortForFileSystemProcess/HandleMessagePortForFileSystemProcess.ipc.js')
     case ModuleId.TemporaryMessagePort:
       return import('../TemporaryMessagePort/TemporaryMessagePort.ipc.js')
-    case ModuleId.GetElectronFileResponse:
-      return import('../GetElectronFileResponse/GetElectronFileResponse.ipc.js')
-    case ModuleId.HandleRemoteRequest:
-      return import('../HandleRemoteRequest/HandleRemoteRequest.ipc.js')
-    case ModuleId.HandleMessagePortForExtensionHostHelperProcess:
-      return import('../HandleMessagePortForExtensionHostHelperProcess/HandleMessagePortForExtensionHostHelperProcess.ipc.js')
-    case ModuleId.ContentSecurityPolicy:
-      return import('../ContentSecurityPolicy/ContentSecurityPolicy.ipc.js')
-    case ModuleId.HandleMessagePortForProcessExplorer:
-      return import('../HandleMessagePortForProcessExplorer/HandleMessagePortForProcessExplorer.ipc.js')
-    case ModuleId.HandleMessagePortForSearchProcess:
-      return import('../HandleMessagePortForSearchProcess/HandleMessagePortForSearchProcess.ipc.js')
-    case ModuleId.FileWatcher:
-      return import('../FileWatcher/FileWatcher.ipc.js')
+    case ModuleId.Terminal:
+      return import('../Terminal/Terminal.ipc.js')
+    case ModuleId.TextDocument:
+      return import('../TextDocument/TextDocument.ipc.js')
     case ModuleId.WebViewServer:
       return import('../WebViewServer/WebViewServer.ipc.js')
-    case ModuleId.GetExtensions:
-      return import('../GetExtensions/GetExtensions.ipc.js')
-    case ModuleId.FileSystemDisk:
-      return import('../FileSystemDisk/FileSystemDisk.ipc.js')
-    case ModuleId.HandleRequest:
-      return import('../HandleRequest/HandleRequest.ipc.js')
-    case ModuleId.HandleMessagePortForClipBoardProcess:
-      return import('../HandleMessagePortForClipBoardProcess/HandleMessagePortForClipBoardProcess.ipc.js')
+    case ModuleId.Window:
+      return import('../ElectronWindow/ElectronWindow.ipc.js')
+    case ModuleId.Workspace:
+      return import('../Workspace/Workspace.ipc.js')
     default:
       throw new Error(`module ${moduleId} not found`)
   }