Develop -> Main for v3.1.5

docker/Dockerfile

@@ -38,6 +38,12 @@ COPY elemento-gui-new/ /usr/share/nginx/html/
 COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
 COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
 COPY docker/startup.sh /opt/app/startup.sh
+COPY ./docker/follow_log.sh /opt/app/follow_log.sh
+COPY ./docker/logger_stream.sh /opt/app/logger_stream.sh
+
+RUN apt update
+RUN apt install -y socat
+RUN rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 RUN chmod +x /opt/daemons/*
 RUN chmod +x /opt/app/startup.sh

docker/arm_Dockerfile

@@ -37,7 +37,14 @@ COPY ./docker/nginx.conf /etc/nginx/nginx.conf
 COPY electros-daemons/linux/arm64/* /opt/daemons/
 COPY elemento-gui-new/ /usr/share/nginx/html/
 COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
+COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
 COPY ./docker/arm_startup.sh /opt/app/startup.sh
+COPY ./docker/follow_log.sh /opt/app/follow_log.sh
+COPY ./docker/logger_stream.sh /opt/app/logger_stream.sh
+
+RUN apt update
+RUN apt install -y socat
+RUN rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 RUN chmod +x /opt/daemons/*
 RUN chmod +x /opt/app/startup.sh

docker/arm_startup.sh

@@ -30,7 +30,8 @@
 # start background daemons
 
 #/opt/daemons/Elemento_Daemons_linux_x86 > /var/log/elemento/elemento_daemons.log 2>&1 &
-/opt/daemons/Elemento_Daemons_linux_arm >/var/log/elemento/elemento_daemons.log 2>&1 &
+/opt/daemons/elemento_daemons_linux_arm >/var/log/elemento/elemento_daemons.log 2>&1 &
+/opt/app/logger_stream.sh >/dev/null &
 
 # run the project
 

docker/follow_log.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+LOG_FILE=/var/log/elemento/elemento_daemons.log
+
+trap '' PIPE
+
+# Read and discard HTTP request headers
+while IFS= read -r line; do
+  [ "$line" = $'\r' ] && break
+done
+
+# Send HTTP headers
+printf "HTTP/1.1 200 OK\r\n"
+printf "Content-Type: text/plain\r\n"
+printf "Transfer-Encoding: chunked\r\n"
+printf "Cache-Control: no-cache\r\n"
+printf "Connection: keep-alive\r\n"
+printf "\r\n"
+
+# Send last 1000 lines
+tail -n 1000 "$LOG_FILE" | while IFS= read line; do
+  chunk="${line}\n"
+  len=$(printf "%s" "$chunk" | wc -c)
+  printf "%x\r\n%s\r\n" "$len" "$chunk" || break
+done
+
+# Follow file
+# shellcheck disable=SC2162
+tail -n 0 -F "$LOG_FILE" | while IFS= read line; do
+  chunk="${line}\n"
+  len=$(printf "%s" "$chunk" | wc -c)
+  printf "%x\r\n%s\r\n" "$len" "$chunk" || break
+done
+
+

docker/logger_stream.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+PORT=5142
+
+socat TCP-LISTEN:"$PORT",reuseaddr,fork SYSTEM:'bash -c /opt/app/follow_log.sh'

docker/nginx.conf

@@ -99,60 +99,118 @@ http {
         # Daemon statuses handlers
         location /authStatus {
             proxy_pass $authenticate/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /computeStatus {
             proxy_pass $compute/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /storageStatus {
             proxy_pass $storage/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /networksStatus {
             proxy_pass $network/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /servicesStatus {
             proxy_pass $services/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /targetsStatus {
             proxy_pass $targets/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         # Daemon handlers
         location /api/v1/authenticate/ {
             proxy_pass $authenticate;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /api/v1.0/client/backups/ {
             proxy_pass $compute;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /api/v1.0/client/vm/ {
             proxy_pass $compute;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         # special case for network attach/detach for a VM
         location ~ ^/api/v1.0/client/network/(attach|detach) {
             proxy_pass $compute;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /api/v1.0/client/volume/ {
             proxy_pass $storage;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /api/v1.0/client/network/ {
             proxy_pass $network;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /api/v1.0/service/ {
             proxy_pass $services;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
         }
 
         location /api/v1.0/client/target/ {
             proxy_pass $targets;
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
+        }
+
+        # WebSocket passthrough
+        location ~ ^/api/v1.0/client/vnc/(.*)$ {
+            proxy_pass http://127.0.0.1:$1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Port $server_port;
+        }
+
+        location /api/logs {
+            proxy_pass http://localhost:5142;
+            proxy_buffering off;
+            proxy_cache off;
         }
     }
 }

docker/startup.sh

@@ -28,6 +28,7 @@
 # start background daemons
 
 /opt/daemons/elemento_daemons_linux_x86 >/var/log/elemento/elemento_daemons.log 2>&1 &
+/opt/app/logger_stream.sh >/dev/null &
 
 # run the project
 

electros-electron/common/Daemons.js

@@ -22,13 +22,13 @@ export class Daemons {
     static Launch(platform, __dirname) {
         if (app.commandLine.hasSwitch("no-daemons")) {
             console.log("Daemons have been disabled by `--no-daemons`");
-            Terminal.Write("Elemento Client Daemons have been disabled by `--no-daemons`.");
+            Terminal.Write("[INFO] Elemento Client Daemons have been disabled by `--no-daemons`.");
             throw new DaemonsNotEnabledError();
         }
 
         if (!app.isPackaged) {
-            Terminal.Write("Electros is not packaged. Daemons might have to be manually started.")
-            console.log("Electros is not packaged. Daemons might have to be manually started.")
+            Terminal.Write("[WARNING] Electros is not packaged. Daemons might have to be manually started.")
+            console.warn("Electros is not packaged. Daemons might have to be manually started.")
         }
 
         const execPath = Daemons._GetCommand(platform, __dirname);

electros-electron/main.js

@@ -1,6 +1,6 @@
 const {app, BrowserWindow, ipcMain, Menu, nativeTheme, shell, safeStorage} = require('electron');
 
-app.commandLine.appendSwitch('disable-zoom-level-persistence');
+app.commandLine.appendSwitch('force-device-scale-factor', '1');
 const path = require('path');
 const {spawn} = require('child_process');
 const net = require('net');
@@ -447,3 +447,10 @@ ipcMain.handle("safestorage-decrypt", async (event, { value }) => {
 
     return safeStorage.decryptString(value)
 });
+
+ipcMain.handle("app-version", () => {
+    return {
+        version: app.getVersion(),
+        node: process.versions
+    };
+});

electros-electron/package.json

@@ -133,7 +133,8 @@
     },
     "dependencies": {
         "@xterm/addon-fit": "latest",
-        "@xterm/xterm": "^5.5.0",
+        "@xterm/addon-webgl": "^0.19.0",
+        "@xterm/xterm": "^6.0.0",
         "cors": "^2.8.5",
         "express": "^4.21.2",
         "socket.io": "^4.8.1",