@lvce-editor/shared-process 0.16.17 → 0.16.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.16.17",
+  "version": "0.16.18",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.22.5",
-    "@lvce-editor/extension-host": "0.16.17",
-    "@lvce-editor/extension-host-helper-process": "0.16.17",
-    "@lvce-editor/pty-host": "0.16.17",
+    "@lvce-editor/extension-host": "0.16.18",
+    "@lvce-editor/extension-host-helper-process": "0.16.18",
+    "@lvce-editor/pty-host": "0.16.18",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/GetElectronRebuildPath/GetElectronRebuildPath.js

@@ -1,6 +1,10 @@
+import * as IsElectron from '../IsElectron/IsElectron.js'
 import * as Path from '../Path/Path.js'
 import * as Root from '../Root/Root.js'
 
 export const getElectronRebuildPath = () => {
+  if (IsElectron.isElectron()) {
+    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/GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js

@@ -5,8 +5,10 @@ export const getFirstNodeChildProcessEvent = async (childProcess) => {
     let stderr = ''
     let stdout = ''
     const cleanup = (value) => {
-      childProcess.stderr.off('data', handleStdErrData)
-      childProcess.stdout.off('data', handleStdoutData)
+      if (childProcess.stdout && childProcess.stderr) {
+        childProcess.stderr.off('data', handleStdErrData)
+        childProcess.stdout.off('data', handleStdoutData)
+      }
       childProcess.off('message', handleMessage)
       childProcess.off('exit', handleExit)
       childProcess.off('error', handleError)
@@ -27,8 +29,10 @@ export const getFirstNodeChildProcessEvent = async (childProcess) => {
     const handleError = (event) => {
       cleanup({ type: FirstNodeWorkerEventType.Error, event, stdout, stderr })
     }
-    childProcess.stderr.on('data', handleStdErrData)
-    childProcess.stdout.on('data', handleStdoutData)
+    if (childProcess.stdout && childProcess.stderr) {
+      childProcess.stderr.on('data', handleStdErrData)
+      childProcess.stdout.on('data', handleStdoutData)
+    }
     childProcess.on('message', handleMessage)
     childProcess.on('exit', handleExit)
     childProcess.on('error', handleError)

package/src/parts/IsDlOpenError/IsDlOpenError.js

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

package/src/parts/LoadWindowsProcessTree/LoadWindowsProcessTree.js

@@ -1,12 +1,12 @@
+import * as IsDlOpenError from '../IsDlOpenError/IsDlOpenError.js'
 import { VError } from '../VError/VError.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 export const loadWindowProcessTree = async () => {
   try {
     // @ts-ignore
     return await import('@vscode/windows-process-tree')
   } catch (error) {
-    if (error && error instanceof Error && 'code' in error && error.code === ErrorCodes.ERR_DLOPEN_FAILED) {
+    if (IsDlOpenError.isDlOpenError(error)) {
       throw new VError(
         `Failed to load windows process tree: The native module "@vscode/windows-process-tree" is not compatible with this node version and must be compiled against a matching electron version using electron-rebuild`
       )

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.16.17'
+export const version = '0.16.18'
 
-export const commit = '6f015ba'
+export const commit = 'd5caee6'
 
-export const date = '2023-07-19T21:49:49.000Z'
+export const date = '2023-07-20T14:53:13.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/RebuildNodePty/RebuildNodePty.js

@@ -1,5 +1,7 @@
 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'
@@ -18,7 +20,10 @@ const rebuildNodePtyElectron = async (cwd) => {
     cwd,
     stdio: 'inherit',
   })
-  // TODO wait for child process to be finished
+  const { type, event } = await GetFirstNodeChildProcessEvent.getFirstNodeChildProcessEvent(childProcess)
+  if (type === FirstNodeWorkerEventType.Error) {
+    throw new Error(`Failed to rebuild native module: ${event}`)
+  }
 }
 
 /**
@@ -29,6 +34,10 @@ const rebuildNodePtyNode = async (cwd) => {
     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 = () => {