@lvce-editor/shared-process 0.14.9 → 0.14.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.14.9",
+  "version": "0.14.11",
   "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.9",
-    "@lvce-editor/extension-host-helper-process": "0.14.9",
-    "@lvce-editor/pty-host": "0.14.9",
+    "@lvce-editor/extension-host": "0.14.11",
+    "@lvce-editor/extension-host-helper-process": "0.14.11",
+    "@lvce-editor/pty-host": "0.14.11",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/AutoUpdaterAppImage/AutoUpdaterAppImage.js

@@ -1,20 +1,16 @@
 import { spawn } from 'node:child_process'
 import { rename } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
-import { join } from 'node:path'
+import { basename, dirname, 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 GetLatestReleaseVersion from '../GetLatestReleaseVersion/GetLatestReleaseVersion.js'
 import * as MakeExecutable from '../MakeExecutable/MakeExecutable.js'
 import * as Platform from '../Platform/Platform.js'
 import { VError } from '../VError/VError.js'
 
-const getDownloadUrl = (repository, version, appImageName) => {
-  Assert.string(version)
-  return `https://github.com/${repository}/releases/download/v${version}/${appImageName}-v${version}.AppImage`
-}
-
 const getOutfilePath = (version) => {
   Assert.string(version)
   const outFile = join(tmpdir(), `appimage-${version}`)
@@ -26,7 +22,7 @@ export const downloadUpdate = async (version) => {
     Assert.string(version)
     const repository = Platform.getRepository()
     const appImageName = Platform.getAppImageName()
-    const downLoadUrl = getDownloadUrl(repository, version, appImageName)
+    const downLoadUrl = GetAppImageDownloadUrl.getDownloadUrl(repository, version, appImageName)
     const outFile = getOutfilePath(version)
     await Download.download(downLoadUrl, outFile)
     return outFile
@@ -53,9 +49,18 @@ const getAppImagePath = () => {
   return process.env.APPIMAGE
 }
 
-const installNewAppImage = async (appImageFile, downloadPath) => {
+const installNewAppImage = async (currentAppImageFile, downloadPath) => {
   try {
-    await rename(downloadPath, appImageFile)
+    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
   } catch (error) {
     // @ts-ignore
     throw new VError(error, `Failed to rename AppImage file`)
@@ -70,13 +75,13 @@ const restart = (downloadPath) => {
 export const installAndRestart = async (downloadPath) => {
   try {
     Assert.string(downloadPath)
-    const appImageFile = getAppImagePath()
-    if (!appImageFile) {
+    const currentAppImageFile = getAppImagePath()
+    if (!currentAppImageFile) {
       throw new Error(`AppImage path not found`)
     }
     await MakeExecutable.makeExecutable(downloadPath)
-    await installNewAppImage(appImageFile, downloadPath)
-    await restart(downloadPath)
+    const installedPath = await installNewAppImage(currentAppImageFile, downloadPath)
+    await restart(installedPath)
   } catch (error) {
     // @ts-ignore
     throw new VError(error, `Failed to install AppImage update`)

package/src/parts/GetAppImageDownloadUrl/GetAppImageDownloadUrl.js

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