@intuned/runtime-dev 1.1.6-vnc.2 → 1.1.6-vnc.4

package/dist/commands/interface/run.js

@@ -246,6 +246,20 @@ if (require.main === module) {
 }
 const processes = [];
 async function startVncServer() {
+  function listenToProcess(process, name) {
+    process.stdout?.on("data", data => {
+      console.log(`[${name}  ]${data}`);
+    });
+    process.stderr?.on("data", data => {
+      console.error(`[${name}-E]${data}`);
+    });
+    process.on("error", error => {
+      console.error(`${name} error: ${error}`);
+    });
+    process.on("exit", (code, signal) => {
+      console.log(`${name} exited with code ${code} and signal ${signal}`);
+    });
+  }
   try {
     const vncLockPath = "/tmp/.X99-lock";
     if (await fs.exists(vncLockPath)) {
@@ -258,40 +272,51 @@ async function startVncServer() {
   } catch (error) {
     console.error("Error cleaning up VNC locks:", error);
   }
-  const openboxProcess = (0, _child_process.spawn)("openbox");
+  console.log("Starting VNC server...");
+  console.log("Spawning openbox");
+  const noDisplayEnv = {
+    ...process.env,
+    DISPLAY: null
+  };
+  const openboxProcess = (0, _child_process.spawn)("openbox", {
+    env: noDisplayEnv
+  });
+  listenToProcess(openboxProcess, "openbox");
   processes.push(openboxProcess);
-  const devilspieProcess = (0, _child_process.spawn)("devilspie");
+  console.log("Spawning devilspie");
+  const devilspieProcess = (0, _child_process.spawn)("devilspie", {
+    env: noDisplayEnv
+  });
+  listenToProcess(devilspieProcess, "devilspie");
   processes.push(devilspieProcess);
-  const xSetRootProcess = (0, _child_process.spawn)("xsetroot", ["-solid", "#000000"]);
+  console.log("Spawning xsetroot");
+  const xSetRootProcess = (0, _child_process.spawn)("xsetroot", ["-solid", "#000000"], {
+    env: noDisplayEnv
+  });
+  listenToProcess(xSetRootProcess, "xsetroot");
   processes.push(xSetRootProcess);
+  console.log("Setting up vnc startup script");
   const vncStartupScript = "exec xclock -digital -update 0 -bg black";
   await fs.writeFile("/tmp/vnc_startup.sh", vncStartupScript, {
     mode: 0o755
   });
+  console.log("Spawning vncserver");
   const vncServerProcess = (0, _child_process.spawn)("vncserver", [":99", "-localhost", "yes", "-rfbauth", "/root/vnc/passwd", "-rfbport", "5900", "-geometry", "1280x720"]);
+  listenToProcess(vncServerProcess, "vncserver");
   processes.push(vncServerProcess);
+  console.log("Waiting for VNC server to start...");
   while (true) {
     if (await fs.exists("/tmp/.X11-unix/X99")) {
       break;
     }
+    console.log("VNC server not ready yet, waiting...");
     await (0, _promises.setTimeout)(1000);
   }
+  console.log("VNC server started successfully");
+  console.log("Spawning noVNC server...");
   const noVncProcess = (0, _child_process.spawn)("/opt/bin/noVNC/utils/launch.sh", ["--listen", "6080", "--vnc", "localhost:5900"]);
+  listenToProcess(noVncProcess, "noVNC");
   processes.push(noVncProcess);
-  for (const process of processes) {
-    process.stdout?.on("data", data => {
-      console.log(`Process ${process.pid} stdout: ${data}`);
-    });
-    process.stderr?.on("data", data => {
-      console.error(`Process ${process.pid} stderr: ${data}`);
-    });
-    process.on("error", error => {
-      console.error(`Process ${process.pid} error: ${error}`);
-    });
-    process.on("exit", (code, signal) => {
-      console.log(`Process ${process.pid} exited with code ${code} and signal ${signal}`);
-    });
-  }
 }
 async function stopVncServer() {
   for (const process of processes.reverse()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.1.6-vnc.2",
+  "version": "1.1.6-vnc.4",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",