Skip to content

Commit 872671c

Browse files
committed
Remote server download targets correct depot, fixed rm import problem on server
1 parent 63b9913 commit 872671c

3 files changed

Lines changed: 32 additions & 8 deletions

File tree

‎backend/utils/pythonEnv.js‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,31 @@ import util from "util"
44
import fs from "fs"
55
import { execSync, exec as execCb } from "child_process"
66
const exec = util.promisify(execCb)
7-
import { readdir, stat, rm } from "fs/promises"
7+
import { readdir, stat } from "fs/promises"
8+
9+
async function rmRecursive(targetPath) {
10+
// Node 14.5 (used by nexe targets) does not support `rm` in fs/promises.
11+
// Prefer rm when available, otherwise fall back to rmdir(recursive).
12+
const fsp = fs.promises
13+
try {
14+
if (fsp && typeof fsp.rm === "function") {
15+
await fsp.rm(targetPath, { recursive: true, force: true })
16+
return
17+
}
18+
} catch (e) {
19+
// If rm exists but fails (permissions, etc.), fall through to rmdir.
20+
}
21+
22+
try {
23+
if (fsp && typeof fsp.rmdir === "function") {
24+
await fsp.rmdir(targetPath, { recursive: true })
25+
}
26+
} catch (e) {
27+
// Match rm({force:true}) semantics as closely as we can.
28+
if (e && (e.code === "ENOENT")) return
29+
throw e
30+
}
31+
}
832

933
function getServerBundleRoot() {
1034
// In Electron builds, process.resourcesPath is a good anchor.
@@ -102,7 +126,7 @@ async function checkSizeAndDeleteIfZero(directoryPath) {
102126
if (size === 0) {
103127
console.log(`Directory is empty. Deleting...`)
104128
// The { recursive: true } option allows deleting a directory and its contents (even if empty)
105-
await rm(directoryPath, { recursive: true, force: true })
129+
await rmRecursive(directoryPath)
106130
console.log(`Directory deleted: ${directoryPath}`)
107131
} else {
108132
console.log(`Directory is not empty (size: ${size} bytes). Not deleting.`)

‎main/background.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ ipcMain.handle('setLocalBackendPath', async (_event, exePath) => {
869869
// IPC: Get latest backend release info from GitHub
870870
// Enhancement: fetch all releases and return the latest "server-" tagged one.
871871
ipcMain.handle('getLatestBackendReleaseInfo', async (_event, payload) => {
872-
const owner = (payload && payload.owner) || 'm-alexparent' // TO REPLACE WITH MEDOMICS BASE REPO
873-
const repo = (payload && payload.repo) || 'MEDomics-NodeServerDeploymentTests'
872+
const owner = (payload && payload.owner) || 'MEDomicsLab' // TO REPLACE WITH MEDOMICS BASE REPO
873+
const repo = (payload && payload.repo) || 'MEDomics'
874874
const serverOnly = payload && typeof payload.serverOnly === 'boolean' ? payload.serverOnly : true
875875

876876
// Helpers
@@ -1054,8 +1054,8 @@ ipcMain.handle('installLocalBackendFromURL', async (_event, { version, manifestU
10541054
}
10551055

10561056
// New GitHub releases-based install
1057-
const defaultOwner = 'm-alexparent'
1058-
const defaultRepo = 'MEDomics-NodeServerDeploymentTests'
1057+
const defaultOwner = 'MEDomicsLab'
1058+
const defaultRepo = 'MEDomics'
10591059
progress({ phase: 'github-fetch-releases', owner: defaultOwner, repo: defaultRepo })
10601060
const { data: releases } = await axios.get(`https://api.github.com/repos/${defaultOwner}/${defaultRepo}/releases`, {
10611061
headers: { 'Accept': 'application/vnd.github+json', 'User-Agent': 'medomicslab-installer' },

‎main/utils/remoteFunctions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,8 @@ ipcMain.handle('installRemoteBackendFromURL', async (_event, { manifestUrl, vers
757757
}
758758
} else {
759759
// GitHub releases-based install (no manifest provided)
760-
const defaultOwner = 'm-alexparent'
761-
const defaultRepo = 'MEDomics-NodeServerDeploymentTests'
760+
const defaultOwner = 'MEDomicsLab'
761+
const defaultRepo = 'MEDomics'
762762
sendInstallProgress({ phase: 'github-fetch-releases', owner: defaultOwner, repo: defaultRepo })
763763
const { data: releases } = await axios.get(`https://api.github.com/repos/${defaultOwner}/${defaultRepo}/releases`, {
764764
headers: { 'Accept': 'application/vnd.github+json', 'User-Agent': 'medomicslab-remote-installer' },

0 commit comments

Comments
 (0)