@lvce-editor/shared-process 0.14.11 → 0.14.13

package/package.json

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

package/src/parts/AutoUpdaterAppImage/AutoUpdaterAppImage.js

@@ -1,14 +1,15 @@
-import { spawn } from 'node:child_process'
 import { rename } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
-import { basename, dirname, join } from 'node:path'
+import { join } from 'node:path'
 import * as Assert from '../Assert/Assert.js'
 import * as CompareVersion from '../CompareVersion/CompareVersion.js'
 import * as Download from '../Download/Download.js'
 import * as GetAppImageDownloadUrl from '../GetAppImageDownloadUrl/GetAppImageDownloadUrl.js'
+import * as GetAppImagePath from '../GetAppImagePath/GetAppImagePath.js'
 import * as GetLatestReleaseVersion from '../GetLatestReleaseVersion/GetLatestReleaseVersion.js'
 import * as MakeExecutable from '../MakeExecutable/MakeExecutable.js'
 import * as Platform from '../Platform/Platform.js'
+import * as Restart from '../Restart/Restart.js'
 import { VError } from '../VError/VError.js'
 
 const getOutfilePath = (version) => {
@@ -45,43 +46,26 @@ export const checkForUpdatesAndNotify = async () => {
   }
 }
 
-const getAppImagePath = () => {
-  return process.env.APPIMAGE
-}
-
 const installNewAppImage = async (currentAppImageFile, downloadPath) => {
   try {
-    const currentFileName = basename(currentAppImageFile)
-    const newFileName = basename(downloadPath)
-    if (currentFileName === newFileName) {
-      await rename(downloadPath, currentAppImageFile)
-      return currentAppImageFile
-    }
-    const destinationFolder = dirname(currentAppImageFile)
-    const destinationPath = join(destinationFolder, newFileName)
-    await rename(downloadPath, destinationPath)
-    return destinationPath
+    await rename(downloadPath, currentAppImageFile)
+    return currentAppImageFile
   } catch (error) {
     // @ts-ignore
     throw new VError(error, `Failed to rename AppImage file`)
   }
 }
 
-const restart = (downloadPath) => {
-  // TODO handle errors
-  spawn(downloadPath, { stdio: 'inherit' })
-}
-
 export const installAndRestart = async (downloadPath) => {
   try {
     Assert.string(downloadPath)
-    const currentAppImageFile = getAppImagePath()
+    const currentAppImageFile = GetAppImagePath.getAppImagePath()
     if (!currentAppImageFile) {
       throw new Error(`AppImage path not found`)
     }
     await MakeExecutable.makeExecutable(downloadPath)
     const installedPath = await installNewAppImage(currentAppImageFile, downloadPath)
-    await restart(installedPath)
+    await Restart.restart(installedPath)
   } catch (error) {
     // @ts-ignore
     throw new VError(error, `Failed to install AppImage update`)

package/src/parts/GetAppImagePath/GetAppImagePath.js

@@ -0,0 +1,3 @@
+export const getAppImagePath = () => {
+  return process.env.APPIMAGE
+}

package/src/parts/Restart/Restart.js

@@ -0,0 +1,11 @@
+import { spawn } from 'node:child_process'
+
+export const restart = (downloadPath) => {
+  const { ELECTRON_RUN_AS_NODE, ...env } = process.env
+  // TODO handle errors
+  const childProcess = spawn(downloadPath, {
+    stdio: 'inherit',
+    env,
+  })
+  childProcess.unref()
+}