Merge branch 'main' of https://github.com/Stremio/stremio-linux-shell into refactor/gtk4

tymmesyde · tymmesyde · commit e56b371bc018 · 2025-12-14T20:49:43.000+01:00
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,2 +1,3 @@
 [env]
-CEF_PATH = "vendor/cef"
+CEF_PATH = "vendor/cef"
+SERVER_PATH = "data/server.js"
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+data/server.js binary
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -22,9 +22,9 @@ jobs:
         run: |
           sudo apt-get -y update
           sudo apt-get -y install libmpv-dev
-          sudo sh -c 'echo "deb http://archive.ubuntu.com/ubuntu/ plucky main restricted" >> /etc/apt/sources.list'
+          sudo sh -c 'echo "deb http://archive.ubuntu.com/ubuntu/ questing main" >> /etc/apt/sources.list'
           sudo apt-get -y update
-          sudo apt-get -y install libssl-dev libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev gettext nodejs
+          sudo apt-get -y install libssl-dev libgtk-4-dev libadwaita-1-dev gettext nodejs
 
       - name: Lint fmt
         run: cargo fmt --all -- --check
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
           sudo apt-get -y install libmpv-dev
           sudo sh -c 'echo "deb http://archive.ubuntu.com/ubuntu/ plucky main restricted" >> /etc/apt/sources.list'
           sudo apt-get -y update
-          sudo apt-get -y install libssl-dev libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev gettext nodejs flatpak-builder python3-aiohttp python3-tomlkit
+          sudo apt-get -y install libssl-dev libgtk-4-dev libadwaita-1-dev gettext nodejs flatpak-builder python3-aiohttp python3-tomlkit
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           sudo flatpak install -y \
             org.gnome.Sdk//49 \
diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ git clone --recurse-submodules https://github.com/Stremio/stremio-linux-shell
 
 #### Fedora
 ```bash
-dnf install gtk4-devel libadwaita-devel webkitgtk6.0-devel mpv-devel libepoxy-devel flatpak-builder
+dnf install gtk4-devel libadwaita-devel mpv-devel libepoxy-devel flatpak-builder
 ```
 
 ```bash
@@ -35,7 +35,7 @@ cargo build --release
 
 #### Ubuntu
 ```bash
-apt install build-essential pkg-config libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev libmpv-dev gettext nodejs flatpak-builder
+apt install build-essential pkg-config libgtk-4-dev libadwaita-1-dev libmpv-dev gettext nodejs flatpak-builder
 ```
 
 ```bash
diff --git a/data/com.stremio.Stremio.metainfo.xml b/data/com.stremio.Stremio.metainfo.xml
@@ -50,6 +50,13 @@
     <launchable type="desktop-id">com.stremio.Stremio.desktop</launchable>
 
     <releases>
+        <release version="1.0.0-beta.12" date="2025-11-27">
+            <description>
+                <ul>
+                    <li>Update server</li>
+                </ul>
+            </description>
+        </release>
         <release version="1.0.0-beta.11" date="2025-06-26">
             <description>
                 <ul>
diff --git a/data/server.js b/data/server.js
diff --git a/flatpak/com.stremio.Stremio.Devel.json b/flatpak/com.stremio.Stremio.Devel.json
@@ -33,6 +33,7 @@
         "--talk-name=org.kde.StatusNotifierWatcher",
         "--own-name=com.stremio.Stremio.Devel",
         "--env=LD_LIBRARY_PATH=/app/lib/:/app/lib64/:/app/share/stremio",
+        "--env=SERVER_PATH=/app/bin/server.js",
         "--env=RUST_LOG=debug"
     ],
     "build-options": {
@@ -58,6 +59,7 @@
             ],
             "post-install": [
                 "install -Dm755 target/debug/stremio-linux-shell /app/bin/stremio",
+                "install -Dm644 data/server.js -t /app/bin/",
                 "install -Dm644 data/icons/com.stremio.Stremio.Devel.svg -t /app/share/icons/hicolor/scalable/apps/",
                 "install -Dm644 data/com.stremio.Stremio.desktop /app/share/applications/com.stremio.Stremio.Devel.desktop",
                 "sed -i -e 's/com.stremio.Stremio/com.stremio.Stremio.Devel/g' /app/share/applications/com.stremio.Stremio.Devel.desktop",
diff --git a/src/app/window/mod.rs b/src/app/window/mod.rs
@@ -28,14 +28,12 @@ impl Window {
     pub fn set_underlay(&self, widget: &impl IsA<Widget>) {
         let window = self.imp();
 
-        // window.overlay.set_child(Some(widget));
         window.overlay.set_child(Some(&graphics_offload(widget)));
     }
 
     pub fn set_overlay(&self, widget: &impl IsA<Widget>) {
         let window = self.imp();
 
-        // window.overlay.add_overlay(widget);
         window.overlay.add_overlay(&graphics_offload(widget));
     }
 
diff --git a/src/chromium/mod.rs b/src/chromium/mod.rs
@@ -2,7 +2,7 @@ mod app;
 mod config;
 mod types;
 
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::ptr;
 use std::sync::{Arc, Mutex, RwLock};
 
@@ -45,7 +45,7 @@ pub struct Chromium {
 }
 
 impl Chromium {
-    pub fn new(data_dir: PathBuf) -> Self {
+    pub fn new(data_dir: &Path) -> Self {
         let _ = api_hash(sys::CEF_API_VERSION_LAST, 0);
 
         let args = Args::new();
diff --git a/src/main.rs b/src/main.rs
@@ -5,7 +5,7 @@ mod server;
 mod shared;
 mod utils;
 
-use std::{env, ptr};
+use std::{env, fs, ptr};
 
 use clap::Parser;
 use gtk::glib::{ExitCode, object::ObjectExt};
@@ -14,7 +14,7 @@ use tokio::runtime::Runtime;
 use crate::{
     app::Application,
     chromium::Chromium,
-    config::{GETTEXT_DIR_DEV, GETTEXT_DIR_FLATPAK, GETTEXT_DOMAIN, STARTUP_URL},
+    config::{DATA_DIR, GETTEXT_DIR_DEV, GETTEXT_DIR_FLATPAK, GETTEXT_DOMAIN, STARTUP_URL},
     server::Server,
 };
 
@@ -37,9 +37,11 @@ fn main() -> ExitCode {
 
     let data_dir = dirs::data_dir()
         .expect("Failed to get data dir")
-        .join("stremio");
+        .join(DATA_DIR);
 
-    let mut chromium = Chromium::new(data_dir);
+    fs::create_dir_all(&data_dir).expect("Failed to create data directory");
+
+    let mut chromium = Chromium::new(&data_dir);
     if let Some(exit_code) = chromium.execute() {
         return ExitCode::from(exit_code as u8);
     }
@@ -68,9 +70,6 @@ fn main() -> ExitCode {
     let runtime = Runtime::new().expect("Failed to create Tokio runtime");
 
     let mut server = Server::new();
-    runtime
-        .block_on(server.setup())
-        .expect("Failed to setup server");
     server.start(args.dev).expect("Failed to start server");
 
     let app = Application::new();
diff --git a/src/server.rs b/src/server.rs
@@ -0,0 +1,65 @@
+use std::{
+    env,
+    io::{BufRead, BufReader},
+    path::PathBuf,
+    process::{self, Child, Command},
+    thread,
+};
+
+use anyhow::{Context, Ok};
+use tracing::debug;
+
+pub struct Server {
+    process: Option<Child>,
+    file: PathBuf,
+}
+
+impl Server {
+    pub fn new() -> Self {
+        let server_path = env::var("SERVER_PATH").expect("Failed to read SERVER_PATH env");
+        let file = PathBuf::from(&server_path);
+
+        Self {
+            process: None,
+            file,
+        }
+    }
+
+    pub fn start(&mut self, dev: bool) -> anyhow::Result<()> {
+        let mut child = Command::new("node")
+            .env("NO_CORS", (dev as i32).to_string())
+            .arg(self.file.as_os_str())
+            .stdout(process::Stdio::piped())
+            .spawn()
+            .context("Failed to start server")?;
+
+        if let Some(stdout) = child.stdout.take() {
+            let reader = BufReader::new(stdout);
+            let mut lines = reader.lines();
+
+            thread::spawn(move || {
+                while let Some(Result::Ok(line)) = lines.next() {
+                    debug!(target: "server", "{}", line);
+                }
+            });
+        }
+
+        self.process = Some(child);
+
+        Ok(())
+    }
+
+    pub fn stop(&mut self) -> anyhow::Result<()> {
+        if let Some(mut process) = self.process.take() {
+            process.kill().context("Failed to kill server process")?;
+        }
+
+        Ok(())
+    }
+}
+
+impl Drop for Server {
+    fn drop(&mut self) {
+        self.stop().expect("Failed to stop server");
+    }
+}
diff --git a/src/server/config.rs b/src/server/config.rs
diff --git a/src/server/mod.rs b/src/server/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,12 @@ impl Window {`
`28`	`28`	`pub fn set_underlay(&self, widget: &impl IsA<Widget>) {`
`29`	`29`	`let window = self.imp();`
`30`	`30`
`31`		`- // window.overlay.set_child(Some(widget));`
`32`	`31`	`window.overlay.set_child(Some(&graphics_offload(widget)));`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`pub fn set_overlay(&self, widget: &impl IsA<Widget>) {`
`36`	`35`	`let window = self.imp();`
`37`	`36`
`38`		`- // window.overlay.add_overlay(widget);`
`39`	`37`	`window.overlay.add_overlay(&graphics_offload(widget));`
`40`	`38`	`}`
`41`	`39`