Ethica/Termix
1
0
Fork 0
mirror of https://github.com/Termix-SSH/Termix.git synced 2026-07-15 21:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: remote desktop blank screen (#755)

Browse Source
This commit is contained in:
Luke Gustafson
2026-05-12 23:50:25 -05:00
committed by GitHub
parent 604de8a683
commit dc79d170b6
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electron/main.cjs
+10 -17
View File
@@ -560,13 +560,15 @@ async function clearElectronJwtCookiesAtStartup() {
} }
} }
function getBackendEntryPath() { function getBackendPaths() {
if (isDev) { if (isDev) {
return path.join(appRoot, "dist", "backend", "backend", "starter.js"); const backendDir = path.join(appRoot, "dist", "backend", "backend");
return { entryPath: path.join(backendDir, "starter.js"), backendCwd: backendDir };
} }
// Backend is asarUnpack'd — fork() cannot run files inside .asar archives // fork() does not go through Electron's asar redirector — use the unpacked path
const unpackedRoot = appRoot.replace("app.asar", "app.asar.unpacked"); const unpackedRoot = appRoot.replace("app.asar", "app.asar.unpacked");
return path.join(unpackedRoot, "dist", "backend", "backend", "starter.js"); const backendDir = path.join(unpackedRoot, "dist", "backend", "backend");
return { entryPath: path.join(backendDir, "starter.js"), backendCwd: backendDir };
} }
function getBackendDataDir() { function getBackendDataDir() {
@@ -580,7 +582,7 @@ function getBackendDataDir() {
function startBackendServer() { function startBackendServer() {
return new Promise((resolve) => { return new Promise((resolve) => {
const entryPath = getBackendEntryPath(); const { entryPath, backendCwd } = getBackendPaths();
logToFile("isDev:", isDev, "appRoot:", appRoot); logToFile("isDev:", isDev, "appRoot:", appRoot);
logToFile("app.isPackaged:", app.isPackaged); logToFile("app.isPackaged:", app.isPackaged);
@@ -596,24 +598,15 @@ function startBackendServer() {
logToFile("Starting embedded backend server..."); logToFile("Starting embedded backend server...");
logToFile("Backend entry:", entryPath); logToFile("Backend entry:", entryPath);
logToFile("Data directory:", dataDir); logToFile("Data directory:", dataDir);
logToFile("Backend cwd:", path.dirname(entryPath)); logToFile("Backend cwd:", backendCwd);
logToFile("Checking paths..."); logToFile("Checking paths...");
logToFile(" entryPath exists:", fs.existsSync(entryPath)); logToFile(" entryPath exists:", fs.existsSync(entryPath));
logToFile(" dataDir exists:", fs.existsSync(dataDir)); logToFile(" dataDir exists:", fs.existsSync(dataDir));
logToFile(" appRoot exists:", fs.existsSync(appRoot)); logToFile(" backendCwd exists:", fs.existsSync(backendCwd));
const distPath = path.join(appRoot, "dist");
if (fs.existsSync(distPath)) {
logToFile(" dist directory contents:", fs.readdirSync(distPath));
const backendPath = path.join(distPath, "backend");
if (fs.existsSync(backendPath)) {
logToFile(" dist/backend contents:", fs.readdirSync(backendPath));
}
}
backendProcess = fork(entryPath, [], { backendProcess = fork(entryPath, [], {
cwd: path.dirname(entryPath), cwd: backendCwd,
env: { env: {
...process.env, ...process.env,
DATA_DIR: dataDir, DATA_DIR: dataDir,