@lvce-editor/shared-process 0.16.18 → 0.16.20

package/src/parts/GetAccurateMemoryUsage/GetAccurateMemoryUsage.js

@@ -3,34 +3,41 @@ import { join } from 'node:path'
 import * as Assert from '../Assert/Assert.js'
 import * as Character from '../Character/Character.js'
 import * as EncodingType from '../EncodingType/EncodingType.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
+import * as IsEsrchError from '../IsEsrchError/IsEsrchError.js'
 import { VError } from '../VError/VError.js'
 
-export const getAccurateMemoryUsage = async (pid) => {
-  Assert.number(pid)
+const getContent = async (pid) => {
   try {
     const filePath = join('/proc', `${pid}`, 'statm')
-    let content
-    try {
-      content = await readFile(filePath, EncodingType.Utf8)
-    } catch (error) {
-      if (
-        error &&
-        // @ts-ignore
-        (error.code === ErrorCodes.ENOENT ||
-          // @ts-ignore
-          error.code === ErrorCodes.ESRCH)
-      ) {
-        return -1
-      }
-      throw error
+    const content = await readFile(filePath, EncodingType.Utf8)
+    return content
+  } catch (error) {
+    if (IsEnoentError.isEnoentError(error) || IsEsrchError.isEsrchError(error)) {
+      return ''
+    }
+    throw error
+  }
+}
+
+const parseMemory = (content) => {
+  const trimmedContent = content.trim()
+  const numberBlocks = trimmedContent.split(Character.Space)
+  const pageSize = 4096
+  const rss = Number.parseInt(numberBlocks[1]) * pageSize
+  const shared = Number.parseInt(numberBlocks[2]) * pageSize
+  const memory = rss - shared
+  return memory
+}
+
+export const getAccurateMemoryUsage = async (pid) => {
+  try {
+    Assert.number(pid)
+    const content = await getContent(pid)
+    if (!content) {
+      return -1
     }
-    const trimmedContent = content.trim()
-    const numberBlocks = trimmedContent.split(Character.Space)
-    const pageSize = 4096
-    const rss = Number.parseInt(numberBlocks[1]) * pageSize
-    const shared = Number.parseInt(numberBlocks[2]) * pageSize
-    const memory = rss - shared
+    const memory = parseMemory(content)
     return memory
   } catch (error) {
     throw new VError(error, 'Failed to get accurate memory usage')

package/src/parts/GetElectronRebuildPath/GetElectronRebuildPath.js

@@ -1,9 +1,9 @@
-import * as IsElectron from '../IsElectron/IsElectron.js'
+import * as IsWindows from '../IsWindows/IsWindows.js'
 import * as Path from '../Path/Path.js'
 import * as Root from '../Root/Root.js'
 
 export const getElectronRebuildPath = () => {
-  if (IsElectron.isElectron()) {
+  if (IsWindows.isWindows) {
     return Path.join(Root.root, 'packages', 'main-process', 'node_modules', '.bin', 'electron-rebuild.cmd')
   }
   return Path.join(Root.root, 'packages', 'main-process', 'node_modules', '.bin', 'electron-rebuild')

package/src/parts/GetFirstEvent/GetFirstEvent.js

@@ -0,0 +1,22 @@
+export const getFirstEvent = async (eventEmitter, eventMap) => {
+  const { type, event } = await new Promise((resolve, reject) => {
+    const listenerMap = Object.create(null)
+    const cleanup = (value) => {
+      for (const event of Object.keys(eventMap)) {
+        eventEmitter.off(event, listenerMap[event])
+      }
+      resolve(value)
+    }
+    for (const [event, type] of Object.entries(eventMap)) {
+      const listener = (event) => {
+        cleanup({
+          type,
+          event,
+        })
+      }
+      eventEmitter.on(event, listener)
+      listenerMap[event] = listener
+    }
+  })
+  return { type, event }
+}

package/src/parts/GetFirstNodeWorkerEvent/GetFirstNodeWorkerEvent.js

@@ -1,20 +1,9 @@
 import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import * as GetFirstEvent from '../GetFirstEvent/GetFirstEvent.js'
 
-export const getFirstNodeWorkerEvent = async (worker) => {
-  const { type, event } = await new Promise((resolve, reject) => {
-    const cleanup = (value) => {
-      worker.off('exit', handleExit)
-      worker.off('error', handleError)
-      resolve(value)
-    }
-    const handleExit = (event) => {
-      cleanup({ type: FirstNodeWorkerEventType.Exit, event })
-    }
-    const handleError = (event) => {
-      cleanup({ type: FirstNodeWorkerEventType.Error, event })
-    }
-    worker.on('exit', handleExit)
-    worker.on('error', handleError)
+export const getFirstNodeWorkerEvent = (worker) => {
+  return GetFirstEvent.getFirstEvent(worker, {
+    exit: FirstNodeWorkerEventType.Exit,
+    error: FirstNodeWorkerEventType.Error,
   })
-  return { type, event }
 }

package/src/parts/GetFirstWebSocketEvent/GetFirstWebSocketEvent.js

@@ -1,14 +1,14 @@
 import * as FirstWebSocketEventType from '../FirstWebSocketEventType/FirstWebSocketEventType.js'
-import { WebSocket } from 'ws'
+import * as WebSocketReadyState from '../WebSocketReadyState/WebSocketReadyState.js'
 
 export const getFirstWebSocketEvent = async (webSocket) => {
   switch (webSocket.readyState) {
-    case WebSocket.OPEN:
+    case WebSocketReadyState.Open:
       return {
         type: FirstWebSocketEventType.Open,
         event: undefined,
       }
-    case WebSocket.CLOSED:
+    case WebSocketReadyState.Closed:
       return {
         type: FirstWebSocketEventType.Close,
         event: undefined,

package/src/parts/GetHttpErrorMessage/GetHttpErrorMessage.js

@@ -0,0 +1,28 @@
+import { HTTPError } from 'got'
+
+/**
+ *
+ * @param {HTTPError} error
+ */
+export const getHttpErrorMessage = (error) => {
+  try {
+    const body = error.response.body
+    if (error.response.url.includes('api.github.com') && typeof body === 'string') {
+      const json = JSON.parse(body)
+      if (json.message) {
+        const message = json.message
+        if (message.includes('rate limit exceeded')) {
+          const reset = error.response.headers['x-ratelimit-reset']
+          const limit = error.response.headers['x-ratelimit-limit']
+          if (reset && typeof reset === 'string' && typeof limit === 'string') {
+            const resetDate = new Date(parseInt(reset) * 1000)
+            const limitAmount = parseInt(limit)
+            return `GitHub rate limit of ${limitAmount} requests per hour execeeded, resets at ${resetDate}`
+          }
+        }
+        return json.message
+      }
+    }
+  } catch {}
+  return `${error.message}`
+}

package/src/parts/GetLatestReleaseVersion/GetLatestReleaseVersion.js

@@ -1,33 +1,7 @@
 import got, { HTTPError } from 'got'
+import * as GetHttpErrorMessage from '../GetHttpErrorMessage/GetHttpErrorMessage.js'
 import { VError } from '../VError/VError.js'
 
-/**
- *
- * @param {HTTPError} error
- */
-const getHttpErrorMessage = (error) => {
-  try {
-    const body = error.response.body
-    if (error.response.url.includes('api.github.com') && typeof body === 'string') {
-      const json = JSON.parse(body)
-      if (json.message) {
-        const message = json.message
-        if (message.includes('rate limit exceeded')) {
-          const reset = error.response.headers['x-ratelimit-reset']
-          const limit = error.response.headers['x-ratelimit-limit']
-          if (reset && typeof reset === 'string' && typeof limit === 'string') {
-            const resetDate = new Date(parseInt(reset) * 1000)
-            const limitAmount = parseInt(limit)
-            return `GitHub rate limit of ${limitAmount} requests per hour execeeded, resets at ${resetDate}`
-          }
-        }
-        return json.message
-      }
-    }
-  } catch {}
-  return `${error.message}`
-}
-
 const parseVersionFromUrl = (url, repository) => {
   if (!url.includes('releases/tag')) {
     if (url.endsWith('/releases')) {
@@ -51,7 +25,7 @@ export const getLatestReleaseVersion = async (repository) => {
     return version
   } catch (error) {
     if (error instanceof HTTPError) {
-      const httpErrorMessage = getHttpErrorMessage(error)
+      const httpErrorMessage = GetHttpErrorMessage.getHttpErrorMessage(error)
       throw new VError(`Failed to get latest release for ${repository}: ${httpErrorMessage}`)
     }
     // @ts-ignore

package/src/parts/GetTerminalProcessPath/GetTerminalProcessPath.js

@@ -0,0 +1,6 @@
+import * as Path from '../Path/Path.js'
+import * as Root from '../Root/Root.js'
+
+export const getTerminalProcessPath = () => {
+  return Path.join(Root.root, 'packages', 'pty-host', 'src', 'ptyHostMain.js')
+}

package/src/parts/IpcParentType/IpcParentType.js

@@ -1,2 +1,3 @@
 export const NodeWorker = 1
 export const NodeForkedProcess = 2
+export const ElectronUtilityProcess = 3

package/src/parts/IpcParentWithElectronUtilityProcess/IpcParentWithElectronUtilityProcess.js

@@ -0,0 +1,12 @@
+import * as ParentIpc from '../ParentIpc/ParentIpc.js'
+
+export const create = async (options) => {
+  // TODO how to launch process without race condition?
+  // when promise resolves, process might have already exited
+  const messagePort = await ParentIpc.invoke('IpcParent.create', { ...options })
+  return messagePort
+}
+
+export const wrap = (messagePort) => {
+  return {}
+}

package/src/parts/IsEsrchError/IsEsrchError.js

@@ -0,0 +1,5 @@
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+
+export const isEsrchError = (error) => {
+  return error && error.code === ErrorCodes.ESRCH
+}

package/src/parts/IsWindows/IsWindows.js

@@ -0,0 +1 @@
+export const isWindows = process.platform === 'win32'

package/src/parts/ListProcessGetName/ListProcessGetName.js

@@ -50,5 +50,8 @@ export const getName = (pid, cmd, rootPid, pidMap) => {
   if (cmd.startsWith(`/opt/sublime_text/sublime_text `)) {
     return 'sublime-text'
   }
+  if(cmd.includes('\\conhost.exe')){
+    return 'conhost.exe'
+  }
   return `${cmd}`
 }

package/src/parts/Module/Module.js

@@ -20,8 +20,14 @@ export const load = (moduleId) => {
       return import('../Developer/Developer.ipc.js')
     case ModuleId.Download:
       return import('../Download/Download.ipc.js')
+    case ModuleId.ElectronContextMenu:
+      return import('../ElectronContextMenu/ElectronContextMenu.ipc.js')
     case ModuleId.ElectronInitialize:
       return import('../ElectronInitialize/ElectronInitialize.ipc.js')
+    case ModuleId.ElectronProcess:
+      return import('../ElectronProcess/ElectronProcess.ipc.js')
+    case ModuleId.ElectronSafeStorage:
+      return import('../ElectronSafeStorage/ElectronSafeStorage.ipc.js')
     case ModuleId.ExtensionHost:
       return import('../ExtensionHost/ExtensionHost.ipc.js')
     case ModuleId.ExtensionManagement:
@@ -52,6 +58,8 @@ export const load = (moduleId) => {
       return import('../OpenNativeFolder/OpenNativeFolder.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.Preferences:
@@ -72,10 +80,10 @@ export const load = (moduleId) => {
       return import('../TextSearch/TextSearch.ipc.js')
     case ModuleId.WebSocketServer:
       return import('../WebSocketServer/WebSocketServer.ipc.js')
+    case ModuleId.Window:
+      return import('../Window/ElectronWindow.ipc.js')
     case ModuleId.Workspace:
       return import('../Workspace/Workspace.ipc.js')
-    case ModuleId.Performance:
-      return import('../Performance/Performance.ipc.js')
     default:
       throw new Error(`module ${moduleId} not found`)
   }

package/src/parts/ModuleId/ModuleId.js

@@ -24,14 +24,19 @@ export const IsAutoUpdateSupported = 23
 export const AutoUpdaterAppImage = 24
 export const AutoUpdaterWindowsNsis = 25
 export const RebuildNodePty = 26
+export const ElectronSafeStorage = 80
 export const ElectronInitialize = 27
 export const HandleWebSocket = 28
 export const Process = 29
 export const AttachDebugger = 30
 export const HandleElectronMessagePort = 31
+export const ElectronProcess = 70
 export const HandleNodeMessagePort = 32
 export const GetTerminalSpawnOptions = 33
 export const HandleCliArgs = 34
 export const ListProcessesWithMemoryUsage = 35
+export const ElectronContextMenu = 40
 export const IncrementalTextSearch = 36
 export const Performance = 37
+export const Window = 38
+export const PassThroughElectronMessagePort = 39

package/src/parts/ModuleMap/ModuleMap.js

@@ -3,6 +3,8 @@ import * as ModuleId from '../ModuleId/ModuleId.js'
 
 export const getModuleId = (commandId) => {
   switch (commandId) {
+    case 'PassthroughElectronMessagePort.passThroughElectronMessagePort':
+      return ModuleId.PassThroughElectronMessagePort
     case 'AttachDebugger.attachDebugger':
       return ModuleId.AttachDebugger
     case 'AutoUpdater.getAutoUpdateType':
@@ -22,6 +24,10 @@ export const getModuleId = (commandId) => {
     case 'ClipBoard.readFiles':
     case 'ClipBoard.writeFiles':
       return ModuleId.ClipBoard
+    case 'ElectronSafeStorage.encryptString':
+    case 'ElectronSafeStorage.decryptString':
+    case 'ElectronSafeStorage.isEncryptionAvailable':
+      return ModuleId.ElectronSafeStorage
     case 'Developer.allocateMemory':
     case 'Developer.crashSharedProcess':
     case 'Developer.createHeapSnapshot':
@@ -177,13 +183,25 @@ export const getModuleId = (commandId) => {
     case 'Terminal.resize':
     case 'Terminal.write':
       return ModuleId.Terminal
+    case 'ElectronProcess.getChromeVersion':
+    case 'ElectronProcess.getElectronVersion':
+      return ModuleId.ElectronProcess
     case 4820:
       return ModuleId.TextDocument
+    case 'ElectronContextMenu.openContextMenu':
+      return ModuleId.ElectronContextMenu
     case 'WebSocketServer.handleUpgrade':
       return ModuleId.WebSocketServer
     case 'Workspace.getHomeDir':
     case 'Workspace.resolveRoot':
       return ModuleId.Workspace
+    case 'ElectronWindow.minimize':
+    case 'ElectronWindow.maximize':
+    case 'ElectronWindow.toggleDevtools':
+    case 'ElectronWindow.unmaximize':
+    case 'ElectronWindow.close':
+    case 'ElectronWindow.reload':
+      return ModuleId.Window
     default:
       throw new CommandNotFoundError(commandId)
   }

package/src/parts/PassThroughElectronMessageForTerminalProcess/PassThroughElectronMessageForTerminalProcess.js

@@ -0,0 +1,29 @@
+import * as Assert from '../Assert/Assert.js'
+import * as GetTerminalProcessPath from '../GetTerminalProcessPath/GetTerminalProcessPath.js'
+import * as IpcParent from '../IpcParent/IpcParent.js'
+import * as IpcParentType from '../IpcParentType/IpcParentType.js'
+
+/**
+ *
+ * @returns
+ */
+export const handlePort = async (browserWindowPort, type, name) => {
+  Assert.object(browserWindowPort)
+  Assert.string(type)
+  Assert.string(name)
+  const ptyHostPath = GetTerminalProcessPath.getTerminalProcessPath()
+  const ipc = await IpcParent.create({
+    method: IpcParentType.ElectronUtilityProcess,
+    path: ptyHostPath,
+    name,
+  })
+  // TODO use connectIpc for better error handling
+  ipc.sendAndTransfer(
+    {
+      jsonrpc: '2.0',
+      method: 'HandleElectronMessagePort.handleElectronMessagePort',
+      params: [],
+    },
+    [browserWindowPort]
+  )
+}

package/src/parts/PassThroughElectronMessagePort/PassThroughElectronMessagePort.ipc.js

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

package/src/parts/PassThroughElectronMessagePort/PassThroughElectronMessagePort.js

@@ -0,0 +1,4 @@
+import * as Path from '../Path/Path.js'
+import * as Root from '../Root/Root.js'
+
+export const passThroughElectronMessagePort = () => {}

package/src/parts/PassThroughElectronMessagePortModule/PassThroughElectronMessagePortModule.js

@@ -0,0 +1,8 @@
+export const getModule = (type) => {
+  switch (type) {
+    case 'terminal-process':
+      return import('../PassThroughElectronMessageForTerminalProcess/PassThroughElectronMessageForTerminalProcess.js')
+    default:
+      return undefined
+  }
+}

package/src/parts/Platform/Platform.ipc.js

@@ -21,8 +21,8 @@ export const Commands = {
   getRecentlyOpenedPath: Platform.getRecentlyOpenedPath,
   getTestPath: Platform.getTestPath,
   getTmpDir: Platform.getTmpDir,
+  getUserKeyBindingsPath: Platform.getUserKeyBindingsPath,
   getUserSettingsPath: Platform.getUserSettingsPath,
   getVersion: Platform.getVersion,
   setEnvironmentVariables: Platform.setEnvironmentVariables,
-  getUserKeyBindingsPath: Platform.getUserKeyBindingsPath,
 }

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.18'
+export const version = '0.16.20'
 
-export const commit = 'd5caee6'
+export const commit = '2a4c633'
 
-export const date = '2023-07-20T14:53:13.000Z'
+export const date = '2023-07-29T10:35:52.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/Preferences/Preferences.js

@@ -2,6 +2,7 @@ import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as JsoncFile from '../JsoncFile/JsoncFile.js'
 import * as Platform from '../Platform/Platform.js'
 import * as Process from '../Process/Process.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import { VError } from '../VError/VError.js'
 // TODO need jsonc parser for settings with comments
 
@@ -12,7 +13,7 @@ export const getUserPreferences = async () => {
     try {
       json = await JsoncFile.readJsonc(userSettingsPath)
     } catch (error) {
-      if (error && error.code === ErrorCodes.ENOENT) {
+      if (IsEnoentError.isEnoentError(error)) {
         return {}
       }
       throw error

package/src/parts/Process/Process.js

@@ -1,4 +1,5 @@
 import { VError } from '../VError/VError.js'
+import * as IsEsrchError from '../IsEsrchError/IsEsrchError.js'
 
 export const crash = (message) => {
   throw new Error(message)
@@ -34,6 +35,9 @@ export const kill = (pid, signal) => {
   try {
     process.kill(pid, signal)
   } catch (error) {
+    if (IsEsrchError.isEsrchError(error)) {
+      return
+    }
     throw new VError(error, `Failed to kill process ${pid} with signal ${signal}`)
   }
 }

package/src/parts/PtyHost/PtyHost.js

@@ -3,12 +3,13 @@ import * as Debug from '../Debug/Debug.js'
 import * as IpcParent from '../IpcParent/IpcParent.js'
 import * as IpcParentType from '../IpcParentType/IpcParentType.js'
 import * as PtyHostPath from '../PtyHostPath/PtyHostPath.js'
+import * as JsonRpc from '../JsonRpc/JsonRpc.js'
 
 export const state = {
   /**
    * @type {any}
    */
-  ptyHost: undefined,
+  ipc: undefined,
   /**
    * @type {any}
    */
@@ -23,9 +24,9 @@ export const state = {
 }
 
 const cleanUpAll = () => {
-  if (state.ptyHost) {
-    state.ptyHost.dispose()
-    state.ptyHost = undefined
+  if (state.ipc) {
+    state.ipc.dispose()
+    state.ipc = undefined
   }
 }
 
@@ -46,11 +47,11 @@ const createPtyHost = async () => {
   })
   const handleClose = () => {
     ptyHost.off('close', handleClose)
-    state.ptyHost = undefined
+    state.ipc = undefined
     state.ptyHostPromise = undefined
   }
   ptyHost.on('close', handleClose)
-  state.ptyHost = ptyHost
+  state.ipc = ptyHost
   return ptyHost
 }
 
@@ -63,15 +64,15 @@ export const getOrCreate = () => {
 }
 
 export const getCurrentInstance = () => {
-  return state.ptyHost
+  return state.ipc
 }
 
 export const disposeAll = () => {
-  if (state.ptyHost) {
-    state.ptyHost.removeAllListeners()
-    if (state.ptyHost) {
-      state.ptyHost.dispose()
-      state.ptyHost = undefined
+  if (state.ipc) {
+    state.ipc.removeAllListeners()
+    if (state.ipc) {
+      state.ipc.dispose()
+      state.ipc = undefined
     }
     state.ptyHostState = /* None */ 0
     state.send = (message) => {
@@ -79,3 +80,7 @@ export const disposeAll = () => {
     }
   }
 }
+
+export const invoke = (method, ...params) => {
+  return JsonRpc.invoke(state.ipc, method, ...params)
+}

package/src/parts/RebuildForElectron/RebuildForElectron.js

@@ -0,0 +1,19 @@
+import { spawn } from 'node:child_process'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import * as GetElectronRebuildPath from '../GetElectronRebuildPath/GetElectronRebuildPath.js'
+import * as GetFirstNodeChildProcessEvent from '../GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js'
+
+/**
+ * @param {string} cwd
+ */
+export const rebuild = async (cwd) => {
+  const electronRebuildPath = GetElectronRebuildPath.getElectronRebuildPath()
+  const childProcess = spawn(electronRebuildPath, [], {
+    cwd,
+    stdio: 'inherit',
+  })
+  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
+  if (type === FirstNodeWorkerEventType.Error) {
+    throw new Error(`Failed to rebuild native module: ${event}`)
+  }
+}

package/src/parts/RebuildForNode/RebuildForNode.js

@@ -0,0 +1,17 @@
+import { spawn } from 'node:child_process'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import * as GetFirstNodeChildProcessEvent from '../GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js'
+
+/**
+ * @param {string} cwd
+ */
+export const rebuild = async (cwd) => {
+  const childProcess = spawn('npm', ['rebuild'], {
+    cwd,
+    stdio: 'inherit',
+  })
+  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
+  if (type === FirstNodeWorkerEventType.Error) {
+    throw new Error(`Failed to rebuild native module: ${event}`)
+  }
+}

package/src/parts/RebuildNodePty/RebuildNodePty.js

@@ -1,7 +1,3 @@
-import { spawn } from 'node:child_process'
-import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
-import * as GetElectronRebuildPath from '../GetElectronRebuildPath/GetElectronRebuildPath.js'
-import * as GetFirstNodeChildProcessEvent from '../GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js'
 import * as IsElectron from '../IsElectron/IsElectron.js'
 import * as Path from '../Path/Path.js'
 import * as Root from '../Root/Root.js'
@@ -11,47 +7,18 @@ const getPtyHostPath = () => {
   return Path.join(Root.root, 'packages', 'pty-host')
 }
 
-/**
- * @param {string} cwd
- */
-const rebuildNodePtyElectron = async (cwd) => {
-  const electronRebuildPath = GetElectronRebuildPath.getElectronRebuildPath()
-  const childProcess = spawn(electronRebuildPath, [], {
-    cwd,
-    stdio: 'inherit',
-  })
-  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
-  if (type === FirstNodeWorkerEventType.Error) {
-    throw new Error(`Failed to rebuild native module: ${event}`)
-  }
-}
-
-/**
- * @param {string} cwd
- */
-const rebuildNodePtyNode = async (cwd) => {
-  const childProcess = spawn('npm', ['rebuild'], {
-    cwd,
-    stdio: 'inherit',
-  })
-  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
-  if (type === FirstNodeWorkerEventType.Error) {
-    throw new Error(`Failed to rebuild native module: ${event}`)
-  }
-}
-
-const getFn = () => {
+const getModule = () => {
   if (IsElectron.isElectron()) {
-    return rebuildNodePtyElectron
+    return import('../RebuildForElectron/RebuildForElectron.js')
   }
-  return rebuildNodePtyNode
+  return import('../RebuildForNode/RebuildForNode.js')
 }
 
 export const rebuildNodePty = async () => {
   try {
     const ptyHostPath = getPtyHostPath()
-    const rebuild = getFn()
-    await rebuild(ptyHostPath)
+    const module = await getModule()
+    await module.rebuild(ptyHostPath)
   } catch (error) {
     throw new VError(error, `Failed to rebuild node-pty`)
   }