@intuned/runtime-dev 1.1.6-vnc.3 → 1.1.6-vnc.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -251,7 +251,7 @@ async function startVncServer() {
|
|
|
251
251
|
console.log(`[${name} ]${data}`);
|
|
252
252
|
});
|
|
253
253
|
process.stderr?.on("data", data => {
|
|
254
|
-
console.error(`[${
|
|
254
|
+
console.error(`[${name}-E]${data}`);
|
|
255
255
|
});
|
|
256
256
|
process.on("error", error => {
|
|
257
257
|
console.error(`${name} error: ${error}`);
|
|
@@ -273,20 +273,11 @@ async function startVncServer() {
|
|
|
273
273
|
console.error("Error cleaning up VNC locks:", error);
|
|
274
274
|
}
|
|
275
275
|
console.log("Starting VNC server...");
|
|
276
|
-
console.log("Spawning openbox");
|
|
277
|
-
const openboxProcess = (0, _child_process.spawn)("openbox");
|
|
278
|
-
listenToProcess(openboxProcess, "openbox");
|
|
279
|
-
processes.push(openboxProcess);
|
|
280
|
-
console.log("Spawning devilspie");
|
|
281
|
-
const devilspieProcess = (0, _child_process.spawn)("devilspie");
|
|
282
|
-
listenToProcess(devilspieProcess, "devilspie");
|
|
283
|
-
processes.push(devilspieProcess);
|
|
284
|
-
console.log("Spawning xsetroot");
|
|
285
|
-
const xSetRootProcess = (0, _child_process.spawn)("xsetroot", ["-solid", "#000000"]);
|
|
286
|
-
listenToProcess(xSetRootProcess, "xsetroot");
|
|
287
|
-
processes.push(xSetRootProcess);
|
|
288
276
|
console.log("Setting up vnc startup script");
|
|
289
|
-
const vncStartupScript =
|
|
277
|
+
const vncStartupScript = `openbox &
|
|
278
|
+
devilspie &
|
|
279
|
+
xsetroot -solid black &
|
|
280
|
+
exec xclock -digital -update 0 -bg black`;
|
|
290
281
|
await fs.writeFile("/tmp/vnc_startup.sh", vncStartupScript, {
|
|
291
282
|
mode: 0o755
|
|
292
283
|
});
|
|
@@ -299,6 +290,10 @@ async function startVncServer() {
|
|
|
299
290
|
if (await fs.exists("/tmp/.X11-unix/X99")) {
|
|
300
291
|
break;
|
|
301
292
|
}
|
|
293
|
+
if (vncServerProcess.exitCode !== null) {
|
|
294
|
+
console.error("VNC server process exited unexpectedly");
|
|
295
|
+
throw new Error("VNC server process exited unexpectedly");
|
|
296
|
+
}
|
|
302
297
|
console.log("VNC server not ready yet, waiting...");
|
|
303
298
|
await (0, _promises.setTimeout)(1000);
|
|
304
299
|
}
|