@lvce-editor/shared-process 0.18.11 → 0.18.12

package/package.json

@@ -1,15 +1,28 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.18.11",
+  "version": "0.18.12",
   "main": "index.js",
   "type": "module",
+  "keywords": [
+    "Lvce Editor"
+  ],
+  "author": "Lvce Editor",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/lvce-editor/lvce-editor.git",
+    "directory": "packages/shared-process"
+  },
+  "engines": {
+    "node": ">=16"
+  },
   "dependencies": {
     "@babel/code-frame": "^7.22.13",
-    "@lvce-editor/extension-host": "0.18.11",
-    "@lvce-editor/extension-host-helper-process": "0.18.11",
+    "@lvce-editor/extension-host": "0.18.12",
+    "@lvce-editor/extension-host-helper-process": "0.18.12",
     "@lvce-editor/jsonc-parser": "^1.1.0",
-    "@lvce-editor/pretty-error": "^1.2.0",
-    "@lvce-editor/pty-host": "0.18.11",
+    "@lvce-editor/pretty-error": "^1.2.1",
+    "@lvce-editor/pty-host": "0.18.12",
     "@lvce-editor/verror": "^1.1.1",
     "debug": "^4.3.4",
     "execa": "^8.0.1",

package/src/parts/AutoUpdater/AutoUpdater.js

@@ -1,6 +1,7 @@
 import * as AutoUpdateType from '../AutoUpdateType/AutoUpdateType.js'
 import * as CompareVersion from '../CompareVersion/CompareVersion.js'
 import * as GetLatestReleaseVersion from '../GetLatestReleaseVersion/GetLatestReleaseVersion.js'
+import * as IsAppImage from '../IsAppImage/IsAppImage.js'
 import * as Platform from '../Platform/Platform.js'
 import { VError } from '../VError/VError.js'
 
@@ -12,7 +13,7 @@ export const getAutoUpdateType = async () => {
     if (Platform.isWindows) {
       return AutoUpdateType.WindowsNsis
     }
-    if (Platform.isAppImage()) {
+    if (IsAppImage.isAppImage()) {
       return AutoUpdateType.AppImage
     }
     return AutoUpdateType.None

package/src/parts/ChildProcessError/ChildProcessError.js

@@ -1,12 +1,21 @@
 import * as GetHelpfulChildProcessError from '../GetHelpfulChildProcessError/GetHelpfulChildProcessError.js'
+import * as JoinLines from '../JoinLines/JoinLines.js'
+import * as SplitLines from '../SplitLines/SplitLines.js'
 
 export class ChildProcessError extends Error {
   constructor(stderr) {
-    const { message, code } = GetHelpfulChildProcessError.getHelpfulChildProcessError('', stderr)
-    super(message)
+    const { message, code, stack } = GetHelpfulChildProcessError.getHelpfulChildProcessError('', stderr)
+    super(message || 'child process error')
     this.name = 'ChildProcessError'
     if (code) {
       this.code = code
     }
+    if (stack) {
+      const lines = SplitLines.splitLines(this.stack)
+      const [firstLine, ...stackLines] = lines
+      const newStackLines = [firstLine, ...stack, ...stackLines]
+      const newStack = JoinLines.joinLines(newStackLines)
+      this.stack = newStack
+    }
   }
 }

package/src/parts/Env/Env.js

@@ -17,3 +17,5 @@ export const getNodeEnv = () => {
 export const getRipGrepPath = () => {
   return process.env.RIP_GREP_PATH
 }
+
+export const env = process.env

package/src/parts/GetHelpfulChildProcessError/GetHelpfulChildProcessError.js

@@ -1,5 +1,6 @@
-import * as SplitLines from '../SplitLines/SplitLines.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as SplitLines from '../SplitLines/SplitLines.js'
+import * as JoinLines from '../JoinLines/JoinLines.js'
 
 const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/
 const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/
@@ -7,6 +8,9 @@ const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js versi
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/
 const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/
 
+const RE_AT = /^\s+at/
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/
+
 const isUnhelpfulNativeModuleError = (stderr) => {
   return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr)
 }
@@ -62,7 +66,7 @@ const isModuleNotFoundMessage = (line) => {
 }
 
 const getModuleNotFoundError = (stderr) => {
-  const lines = stderr.split('\n')
+  const lines = SplitLines.splitLines(stderr)
   const messageIndex = lines.findIndex(isModuleNotFoundMessage)
   const message = lines[messageIndex]
   return {
@@ -71,6 +75,30 @@ const getModuleNotFoundError = (stderr) => {
   }
 }
 
+const isNormalStackLine = (line) => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line)
+}
+
+const getDetails = (lines) => {
+  const index = lines.findIndex(isNormalStackLine)
+  if (index === -1) {
+    return {
+      actualMessage: JoinLines.joinLines(lines),
+      rest: [],
+    }
+  }
+  let lastIndex = index - 1
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break
+    }
+  }
+  return {
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex),
+  }
+}
+
 export const getHelpfulChildProcessError = (stdout, stderr) => {
   if (isUnhelpfulNativeModuleError(stderr)) {
     return getNativeModuleErrorMessage(stderr)
@@ -81,8 +109,11 @@ export const getHelpfulChildProcessError = (stdout, stderr) => {
   if (isModuleNotFoundError(stderr)) {
     return getModuleNotFoundError(stderr)
   }
+  const lines = SplitLines.splitLines(stderr)
+  const { actualMessage, rest } = getDetails(lines)
   return {
-    message: `child process error: ${stderr}`,
+    message: `${actualMessage}`,
     code: '',
+    stack: rest,
   }
 }

package/src/parts/IsAppImage/IsAppImage.js

@@ -0,0 +1,5 @@
+import * as Env from '../Env/Env.js'
+
+export const isAppImage = () => {
+  return Boolean(Env.env.APPIMAGE)
+}

package/src/parts/Main/Main.js

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

package/src/parts/MergeStacks/MergeStacks.js

@@ -0,0 +1,20 @@
+import * as GetNewLineIndex from '../GetNewLineIndex/GetNewLineIndex.js'
+import * as NormalizeErrorLine from '../NormalizeErrorLine/NormalizeErrorLine.js'
+
+export const mergeStacks = (parent, child) => {
+  if (!child) {
+    return parent
+  }
+  const parentNewLineIndex = GetNewLineIndex.getNewLineIndex(parent)
+  const childNewLineIndex = GetNewLineIndex.getNewLineIndex(child)
+  if (childNewLineIndex === -1) {
+    return parent
+  }
+  const parentFirstLine = parent.slice(0, parentNewLineIndex)
+  const childRest = child.slice(childNewLineIndex)
+  const childFirstLine = NormalizeErrorLine.normalizeLine(child.slice(0, childNewLineIndex))
+  if (parentFirstLine.includes(childFirstLine)) {
+    return parentFirstLine + childRest
+  }
+  return child
+}

package/src/parts/NormalizeErrorLine/NormalizeErrorLine.js

@@ -0,0 +1,9 @@
+export const normalizeLine = (line) => {
+  if (line.startsWith('Error: ')) {
+    return line.slice(`Error: `.length)
+  }
+  if (line.startsWith('VError: ')) {
+    return line.slice(`VError: `.length)
+  }
+  return line
+}

package/src/parts/Platform/Platform.js

@@ -13,10 +13,6 @@ export const isMacOs = platform === 'darwin'
 
 export const isDeb = false
 
-export const isAppImage = () => {
-  return Boolean(env.APPIMAGE)
-}
-
 export const getPathSeparator = () => {
   return sep
 }
@@ -55,11 +51,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.18.11'
+export const version = '0.18.12'
 
-export const commit = '40070c3'
+export const commit = '1045890'
 
-export const date = '2023-10-07T15:08:48.000Z'
+export const date = '2023-10-11T17:06:03.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/RebuildForElectron/RebuildForElectron.js

@@ -1,19 +1,18 @@
-import { spawn } from 'node:child_process'
-import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import { VError } from '@lvce-editor/verror'
+import * as Exec from '../Exec/Exec.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}`)
+  try {
+    const electronRebuildPath = GetElectronRebuildPath.getElectronRebuildPath()
+    await Exec.exec(electronRebuildPath, [], {
+      cwd,
+      stdio: 'inherit',
+    })
+  } catch (error) {
+    throw new VError(error, `Failed to rebuild native module`)
   }
 }

package/src/parts/RebuildForNode/RebuildForNode.js

@@ -1,17 +1,16 @@
-import { spawn } from 'node:child_process'
-import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
-import * as GetFirstNodeChildProcessEvent from '../GetFirstNodeChildProcessEvent/GetFirstNodeChildProcessEvent.js'
+import { VError } from '@lvce-editor/verror'
+import * as Exec from '../Exec/Exec.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}`)
+  try {
+    await Exec.exec('npm', ['rebuild'], {
+      cwd,
+      stdio: 'inherit',
+    })
+  } catch (error) {
+    throw new VError(error, `Failed to rebuild native module`)
   }
 }

package/src/sharedProcessMain.js

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