@lvce-editor/shared-process 0.17.0 → 0.17.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -16,12 +16,12 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.22.5",
-    "@lvce-editor/extension-host": "0.17.0",
-    "@lvce-editor/extension-host-helper-process": "0.17.0",
-    "@lvce-editor/pty-host": "0.17.0",
+    "@babel/code-frame": "^7.22.10",
+    "@lvce-editor/extension-host": "0.17.2",
+    "@lvce-editor/extension-host-helper-process": "0.17.2",
+    "@lvce-editor/pty-host": "0.17.2",
     "debug": "^4.3.4",
-    "execa": "^7.1.1",
+    "execa": "^7.2.0",
     "exit-hook": "^3.2.0",
     "got": "^13.0.0",
     "is-object": "^1.0.2",

package/src/parts/AutoUpdaterWindowsNsis/AutoUpdaterWindowsNsis.js

@@ -1,19 +1,18 @@
 import { spawn } from 'node:child_process'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
 import * as Assert from '../Assert/Assert.js'
 import * as Download from '../Download/Download.js'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+import * as GetFirstSpawnedProcessEvent from '../GetFirstSpawnedProcessEvent/GetFirstSpawnedProcessEvent.js'
+import * as GetNsisUpdateArgs from '../GetNsisUpdateArgs/GetNsisUpdateArgs.js'
+import * as GetNsisDownloadPath from '../GetNsisUpdateDownloadPath/GetNsisUpdateDownloadPath.js'
 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'
 
-const getOutfilePath = (version) => {
-  Assert.string(version)
-  const outFile = join(tmpdir(), `nsis-update-${version}`)
-  return outFile
-}
-
+// TODO make it possible to cancel downloading updates
 export const downloadUpdate = async (version) => {
   try {
     Assert.string(version)
@@ -21,9 +20,11 @@ export const downloadUpdate = async (version) => {
     const setupName = Platform.getSetupName()
     const fileName = `${setupName}-v${version}.exe`
     const downLoadUrl = GetWindowsNsisDownloadUrl.getDownloadUrl(repository, version, fileName)
-    const outFile = getOutfilePath(version)
+    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) {
@@ -31,44 +32,18 @@ export const downloadUpdate = async (version) => {
   }
 }
 
-const getNsisUpdateArgs = () => {
-  const args = []
-  args.push('--updated')
-  args.push('/S')
-  args.push('--force-run')
-  return args
-}
-
-const getFirstNsisProcessEvent = async (childProcess) => {
-  const { type, event } = await new Promise((resolve) => {
-    const cleanup = (value) => {
-      childProcess.off('error', handleError)
-      childProcess.off('exit', handleExit)
-      resolve(value)
-    }
-    const handleError = (event) => {
-      cleanup({ type: 'error', event })
-    }
-    const handleExit = (event) => {
-      cleanup({ type: 'exit', event })
-    }
-    childProcess.on('error', handleError)
-    childProcess.on('exit', handleExit)
-  })
-  return {
-    type,
-    event,
-  }
-}
-
 export const installAndRestart = async (downloadPath) => {
   try {
     Assert.string(downloadPath)
-    const args = getNsisUpdateArgs()
+    const args = GetNsisUpdateArgs.getNsisUpdateArgs()
     Logger.info(`[shared-process] spawning nsis update: ${downloadPath}`)
-    const child = spawn(downloadPath, args, { stdio: 'inherit' })
-    const { type, event } = await getFirstNsisProcessEvent(child)
-    if (type === 'error') {
+    UpdateState.set(UpdateStateType.Updating)
+    const child = spawn(downloadPath, args, {
+      stdio: 'inherit',
+      detached: true,
+    })
+    const { type, event } = await GetFirstSpawnedProcessEvent.getFirstSpawnedProcessEvent(child)
+    if (type === FirstNodeWorkerEventType.Error) {
       throw new Error(`Child process error: ${event}`)
     }
     Logger.info(`[shared-process] finished nsis update`)

package/src/parts/GetFirstSpawnedProcessEvent/GetFirstSpawnedProcessEvent.js

@@ -0,0 +1,9 @@
+import * as GetFirstEvent from '../GetFirstEvent/GetFirstEvent.js'
+import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
+
+export const getFirstSpawnedProcessEvent = (childProcess) => {
+  return GetFirstEvent.getFirstEvent(childProcess, {
+    error: FirstNodeWorkerEventType.Error,
+    exit: FirstNodeWorkerEventType.Exit,
+  })
+}

package/src/parts/GetNsisUpdateArgs/GetNsisUpdateArgs.js

@@ -0,0 +1,7 @@
+export const getNsisUpdateArgs = () => {
+  const args = []
+  args.push('--updated')
+  args.push('/S')
+  args.push('--force-run')
+  return args
+}

package/src/parts/GetNsisUpdateDownloadPath/GetNsisUpdateDownloadPath.js

@@ -0,0 +1,11 @@
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import * as Assert from '../Assert/Assert.js'
+import * as Platform from '../Platform/Platform.js'
+
+export const getNsisUpdateDownloadPath = (version) => {
+  Assert.string(version)
+  const name = Platform.applicationName
+  const outFile = join(tmpdir(), `${name}-update-${version}.exe`)
+  return outFile
+}

package/src/parts/GetWindowsNsisDownloadUrl/GetWindowsNsisDownloadUrl.js

@@ -1,6 +1,8 @@
 import * as Assert from '../Assert/Assert.js'
 
 export const getDownloadUrl = (repository, version, fileName) => {
+  Assert.string(repository)
   Assert.string(version)
+  Assert.string(fileName)
   return `https://github.com/${repository}/releases/download/v${version}/${fileName}`
 }

package/src/parts/Platform/Platform.js

@@ -169,11 +169,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.17.0'
+export const version = '0.17.2'
 
-export const commit = '4a17b31'
+export const commit = 'e83e740'
 
-export const date = '2023-08-05T17:17:49.000Z'
+export const date = '2023-08-12T10:04:22.000Z'
 
 export const getVersion = () => {
   return version

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