@lvce-editor/shared-process 0.17.1 → 0.17.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.17.1",
+  "version": "0.17.3",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -16,10 +16,11 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.22.5",
-    "@lvce-editor/extension-host": "0.17.1",
-    "@lvce-editor/extension-host-helper-process": "0.17.1",
-    "@lvce-editor/pty-host": "0.17.1",
+    "@babel/code-frame": "^7.22.10",
+    "@lvce-editor/extension-host": "0.17.3",
+    "@lvce-editor/extension-host-helper-process": "0.17.3",
+    "@lvce-editor/pretty-error": "^0.1.1",
+    "@lvce-editor/pty-host": "0.17.3",
     "debug": "^4.3.4",
     "execa": "^7.2.0",
     "exit-hook": "^3.2.0",
@@ -34,11 +35,11 @@
   },
   "optionalDependencies": {
     "extract-zip": "^2.0.1",
-    "vscode-ripgrep-with-github-api-error-fix": "^2.8.0",
     "open": "^9.1.0",
     "symlink-dir": "^5.1.1",
+    "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",
     "trash": "^8.1.1",
-    "tail": "^2.2.6"
+    "vscode-ripgrep-with-github-api-error-fix": "^2.9.0"
   }
 }

package/src/parts/AutoUpdaterWindowsNsis/AutoUpdaterWindowsNsis.js

@@ -8,8 +8,11 @@ import * as GetNsisDownloadPath from '../GetNsisUpdateDownloadPath/GetNsisUpdate
 import * as GetWindowsNsisDownloadUrl from '../GetWindowsNsisDownloadUrl/GetWindowsNsisDownloadUrl.js'
 import * as Logger from '../Logger/Logger.js'
 import * as Platform from '../Platform/Platform.js'
+import * as UpdateState from '../UpdateState/UpdateState.js'
+import * as UpdateStateType from '../UpdateStateType/UpdateStateType.js'
 import { VError } from '../VError/VError.js'
 
+// TODO make it possible to cancel downloading updates
 export const downloadUpdate = async (version) => {
   try {
     Assert.string(version)
@@ -19,7 +22,9 @@ export const downloadUpdate = async (version) => {
     const downLoadUrl = GetWindowsNsisDownloadUrl.getDownloadUrl(repository, version, fileName)
     const outFile = GetNsisDownloadPath.getNsisUpdateDownloadPath(version)
     Logger.info(`[shared-process] downloading nsis update: ${downLoadUrl} -> ${outFile}`)
+    UpdateState.set(UpdateStateType.Downloading)
     await Download.download(downLoadUrl, outFile)
+    UpdateState.set(UpdateStateType.Downloaded)
     Logger.info(`[shared-process] downloaded nsis update: ${outFile}`)
     return outFile
   } catch (error) {
@@ -32,6 +37,7 @@ export const installAndRestart = async (downloadPath) => {
     Assert.string(downloadPath)
     const args = GetNsisUpdateArgs.getNsisUpdateArgs()
     Logger.info(`[shared-process] spawning nsis update: ${downloadPath}`)
+    UpdateState.set(UpdateStateType.Updating)
     const child = spawn(downloadPath, args, {
       stdio: 'inherit',
       detached: true,

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.17.1'
+export const version = '0.17.3'
 
-export const commit = 'b3e9c7f'
+export const commit = '8dd517b'
 
-export const date = '2023-08-05T20:50:47.000Z'
+export const date = '2023-08-12T15:25:18.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/PrettyError/PrettyError.js

@@ -1,107 +1,7 @@
 import { codeFrameColumns } from '@babel/code-frame'
 import { LinesAndColumns } from 'lines-and-columns'
-import { readFileSync } from 'node:fs'
-import * as CleanStack from '../CleanStack/CleanStack.js'
-import * as EncodingType from '../EncodingType/EncodingType.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
-import * as GetActualPath from '../GetActualPath/GetActualPath.js'
-import * as JoinLines from '../JoinLines/JoinLines.js'
 import * as Json from '../Json/Json.js'
-import * as SplitLines from '../SplitLines/SplitLines.js'
-import * as Logger from '../Logger/Logger.js'
-
-const RE_MODULE_NOT_FOUND_STACK = /Cannot find package '([^']+)' imported from (.+)$/
-
-const prepareModuleNotFoundError = (error) => {
-  const { message } = error
-  const match = message.match(RE_MODULE_NOT_FOUND_STACK)
-  if (!match) {
-    return {
-      message,
-      stack: error.stack,
-      codeFrame: '',
-    }
-  }
-  const notFoundModule = match[1]
-  const importedFrom = match[2]
-  const rawLines = readFileSync(importedFrom, EncodingType.Utf8)
-  let line = 0
-  let column = 0
-  const splittedLines = SplitLines.splitLines(rawLines)
-  for (let i = 0; i < splittedLines.length; i++) {
-    const splittedLine = splittedLines[i]
-    const index = splittedLine.indexOf(notFoundModule)
-    if (index !== -1) {
-      line = i + 1
-      column = index
-      break
-    }
-  }
-  const location = {
-    start: {
-      line,
-      column,
-    },
-  }
-  const codeFrame = codeFrameColumns(rawLines, location)
-  const stackLines = SplitLines.splitLines(error.stack)
-  const newStackLines = [stackLines[0], `    at ${importedFrom}:${line}:${column}`, ...stackLines.slice(1)]
-  const newStack = JoinLines.joinLines(newStackLines)
-  return {
-    message,
-    stack: newStack,
-    codeFrame,
-  }
-}
-
-export const prepare = (error) => {
-  try {
-    if (error && error.code === ErrorCodes.ERR_MODULE_NOT_FOUND) {
-      return prepareModuleNotFoundError(error)
-    }
-    const { message } = error
-    if (error && error.cause) {
-      const cause = error.cause()
-      if (cause) {
-        error = cause
-      }
-    }
-    const lines = CleanStack.cleanStack(error.stack)
-    const file = lines[0]
-    let codeFrame = ''
-    if (error.codeFrame) {
-      codeFrame = error.codeFrame
-    } else if (file) {
-      let match = file.match(/\((.*):(\d+):(\d+)\)$/)
-      if (!match) {
-        match = file.match(/at (.*):(\d+):(\d+)$/)
-      }
-      if (match) {
-        const [_, path, line, column] = match
-        const actualPath = GetActualPath.getActualPath(path)
-        const rawLines = readFileSync(actualPath, EncodingType.Utf8)
-        const location = {
-          start: {
-            line: Number.parseInt(line),
-            column: Number.parseInt(column),
-          },
-        }
-        codeFrame = codeFrameColumns(rawLines, location)
-      }
-    }
-    const relevantStack = JoinLines.joinLines(lines)
-    return {
-      message,
-      stack: relevantStack,
-      codeFrame,
-      type: error.constructor.name,
-      code: error.code,
-    }
-  } catch (otherError) {
-    Logger.warn(`ErrorHandling Error: ${otherError}`)
-    return error
-  }
-}
+export { prepare } from '@lvce-editor/pretty-error'
 
 const fixBackslashes = (string) => {
   return string.replaceAll('\\\\', '\\')

package/src/parts/UpdateState/UpdateState.js

@@ -0,0 +1,13 @@
+import * as UpdateStateType from '../UpdateStateType/UpdateStateType.js'
+
+export const state = {
+  updateState: UpdateStateType.Uninitialized,
+}
+
+export const get = () => {
+  return state.updateState
+}
+
+export const set = (value) => {
+  state.updateState = value
+}

package/src/parts/UpdateStateType/UpdateStateType.js

@@ -0,0 +1,9 @@
+export const Uninitialized = 1
+export const Idle = 2
+export const Disabled = 3
+export const CheckingForUpdates = 3
+export const AvailableForDownload = 4
+export const Downloading = 5
+export const Downloaded = 6
+export const Updating = 7
+export const Ready = 8

package/src/parts/CleanStack/CleanStack.js

@@ -1,97 +0,0 @@
-import * as SplitLines from '../SplitLines/SplitLines.js'
-
-const RE_AT = /^\s+at/
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/
-const RE_OBJECT_AS = /^\s*at (async )?Object\.\w+ \[as ([\w\.]+)\]/
-const RE_GET_RESPONSE = /^\s*at async getResponse/
-const RE_WEBSOCKET_HANDLE_MESSAGE = /^\s*at async WebSocket.handleMessage/
-const RE_EXECUTE_COMMAND_ASYNC = /^\s*at executeCommandAsync/
-const RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT = /^\s*at async MessagePort\.handleOtherMessagesFromMessagePort/
-const RE_ASSERT = /^\s*at .*\/Assert\.js/
-
-const isInternalLine = (line) => {
-  return line.includes('node:') || RE_AT_PROMISE_INDEX.test(line) || line.includes('node_modules/ws')
-}
-
-const isRelevantLine = (line) => {
-  return !isInternalLine(line)
-}
-
-const isApplicationUsefulLine = (line, index) => {
-  if (index === 0) {
-    if (RE_ASSERT.test(line)) {
-      return false
-    }
-    return true
-  }
-  if (RE_GET_RESPONSE.test(line)) {
-    return false
-  }
-  if (RE_WEBSOCKET_HANDLE_MESSAGE.test(line)) {
-    return false
-  }
-  if (RE_EXECUTE_COMMAND_ASYNC.test(line)) {
-    return false
-  }
-  if (RE_HANDLE_OTHER_MESSAGES_FROM_MESSAGE_PORT.test(line)) {
-    return false
-  }
-  return true
-}
-
-const isNormalStackLine = (line) => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line)
-}
-
-const cleanLine = (line) => {
-  if (line.startsWith('    at exports.')) {
-    return '    at ' + line.slice('    at exports.'.length)
-  }
-  if (line.startsWith('    at async exports.')) {
-    return '    at async ' + line.slice('    at async exports.'.length)
-  }
-  if (line.startsWith('    at async Module.')) {
-    return '    at async ' + line.slice('    at async Module.'.length)
-  }
-  if (line.startsWith('    at Module.')) {
-    return '    at ' + line.slice('    at Module.'.length)
-  }
-  const objectMatch = line.match(RE_OBJECT_AS)
-  if (objectMatch) {
-    const rest = line.slice(objectMatch[0].length)
-    if (objectMatch[1]) {
-      return '    at ' + objectMatch[1] + objectMatch[2] + rest
-    }
-    return '    at ' + objectMatch[2] + rest
-  }
-  return line
-}
-
-const getDetails = (lines) => {
-  const index = lines.findIndex(isNormalStackLine)
-  return {
-    custom: lines.slice(0, index),
-    actualStack: lines.slice(index).map(cleanLine),
-  }
-}
-
-const RE_PATH_1 = /^\/(.*)(\d+)$/
-
-const mergeCustom = (custom, relevantStack) => {
-  if (custom.length === 0) {
-    return relevantStack
-  }
-  const firstLine = custom[0]
-  if (RE_PATH_1.test(firstLine)) {
-    return [`    at ${firstLine}`, ...relevantStack]
-  }
-  return relevantStack
-}
-
-export const cleanStack = (stack) => {
-  const lines = SplitLines.splitLines(stack)
-  const { custom, actualStack } = getDetails(lines)
-  const relevantStack = actualStack.filter(isRelevantLine).filter(isApplicationUsefulLine)
-  const merged = mergeCustom(custom, relevantStack)
-  return merged
-}