Systemd Root Service

.gitmodules

@@ -8,3 +8,6 @@
 [submodule "libs/libyuv-sys"]
 	path = libs/libyuv-sys
 	url = https://github.com/MahitMehta/libyuv-sys.git
+[submodule "libs/scrap"]
+	path = libs/scrap
+	url = https://github.com/MahitMehta/scrap.git

Cargo.toml

@@ -10,7 +10,7 @@ members = [
 exclude = [ "libs" ]
 
 [workspace.package]
-version = "0.1.16"
+version = "0.1.17"
 authors = ["Mahit Mehta", "Marco Ngai"]
 license = "GPL-3.0-only"
 edition = "2021"

linux/debian/mrial_server.service

@@ -1,13 +1,15 @@
 [Unit]
 Description=Mrial Server
-After=syslog.target network.target network-online.target sshd.service http-daem>
+After=syslog.target network.target network-online.target sshd.service
 Wants=network-online.target
 
 [Service]
 Type=simple
 Restart=always
-RestartSec=10
+RestartSec=1s
+StartLimitIntervalSec=15s
+StartLimitBurst=3
 ExecStart=/var/lib/mrial_server/scripts/startup.sh
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target

linux/debian/startup.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Uncomment if using LightDM
-# export XAUTHORITY=/var/lib/lightdm/.Xauthority
-export DISPLAY=:0
+export RUST_LOG=debug
+
 /usr/bin/mrial_server

mrial_server/Cargo.toml

@@ -9,7 +9,8 @@ version.workspace = true
 
 [dependencies]
 futures = { version = "0.3.29", features = ["thread-pool", "executor"]} 
-scrap = "0.5"
+# scrap = "0.5"
+scrap = { path = "../libs/scrap" }
 tokio = { version = "1.34.0", features = ["full"]}
 mouse-rs = "0.4.2"
 enigo = "0.2.0-rc2"
@@ -42,4 +43,5 @@ assets = [
     ["../target/release/mrial_server", "usr/bin/mrial_server", "755"],
     ["../linux/debian/*", "var/lib/mrial_server/scripts/", "755"]
 ]
-maintainer-scripts = "../linux/debian"
+maintainer-scripts = "../linux/debian"
+systemd-units = { enable = true }

mrial_server/src/audio/linux.rs

@@ -1,6 +1,7 @@
 use crate::conn::Connection;
 
 use super::{AudioEncoder, AudioServerThread, IAudioController};
+use log::{debug};
 use mrial_proto::*;
 
 use pipewire as pw;
@@ -39,7 +40,14 @@ impl IAudioController for AudioServerThread {
             // 1. systemctl --user restart pipewire.service
             // 2. "systemctl --user restart pipewire-pulse.service"
             // 3. pactl load-module module-null-sink media.class=Audio/Sink sink_name=mrial_sink channel_map=stereo
-            let core = context.connect(None).unwrap();
+            let core = match context.connect(None) {
+                Ok(core) => core,
+                Err(e) => {
+                    debug!("Failed to connect to PipeWire Context: {}", e);
+                    // TODO: Should attempt to reconnect
+                    return;
+                }
+            };
 
             let data = UserData {
                 format: Default::default(),

mrial_server/src/main.rs

@@ -15,7 +15,14 @@ async fn main() {
     pretty_env_logger::init_timed();
     let conn: Connection = Connection::new();
 
-    let mut video_server = VideoServerThread::new(conn.clone());
+    let mut video_server = match VideoServerThread::new(conn.clone()) {
+        Ok(server) => server,
+        Err(e) => {
+            log::error!("Failed to start Video Server: {}", e);
+            return;
+        }
+    };
+
     let audio_server = AudioServerThread::new();
 
     audio_server.run(conn);

mrial_server/src/video/display.rs

@@ -1,14 +1,23 @@
 #[cfg(target_os = "linux")]
 use xrandr::{ScreenResources, XHandle};
+use xrandr::XrandrError;
 
 pub struct DisplayMeta {}
 
 impl DisplayMeta {
     #[cfg(target_os = "linux")]
-    pub fn get_display_resolutions() -> Result<(Vec<u16>, Vec<u16>), xrandr::XrandrError> {
+    pub fn get_current_resolution() -> Result<(usize, usize), XrandrError> {
         let mut handle = XHandle::open().unwrap();
         let mon1 = &handle.monitors()?[0];
 
+        Ok((mon1.width_px as usize, mon1.height_px as usize))
+    }
+
+    #[cfg(target_os = "linux")]
+    pub fn get_display_resolutions() -> Result<(Vec<u16>, Vec<u16>), xrandr::XrandrError> {
+        let mut handle = XHandle::open().unwrap();
+        // let mon1 = &handle.monitors()?[0];
+
         let mut widths: Vec<u16> = Vec::new();
         let mut heights: Vec<u16> = Vec::new();