From 334500b39763e14f406080be648ddbcbffebefef Mon Sep 17 00:00:00 2001 From: Zortos Date: Tue, 30 Dec 2025 21:56:38 +0100 Subject: [PATCH 01/67] Add native Rust streamer (opennow-streamer) with full GFN client implementation - Native egui/wgpu/winit UI with game library, settings, and streaming - WebRTC streaming with H.264/H.265/AV1 hardware decoding (NVIDIA CUVID, Intel QSV, D3D11VA) - Intel QSV runtime detection with automatic fallback - GFN API integration: authentication, session management, game library - Input handling: keyboard, mouse with raw input support - Audio playback via cpal/Opus - Auto server selection with ping testing - Bottom status bar with subscription info - Alliance partner support for different streaming URLs - Settings persistence (resolution, FPS, codec, server selection) - Recording module for Tauri client --- index.html | 23 + opennow-streamer/Cargo.lock | 6534 ++++++++++++++++++++ opennow-streamer/Cargo.toml | 107 + opennow-streamer/IMPLEMENTATION_PLAN.md | 1008 +++ opennow-streamer/src/api/cloudmatch.rs | 465 ++ opennow-streamer/src/api/games.rs | 559 ++ opennow-streamer/src/api/mod.rs | 404 ++ opennow-streamer/src/app/config.rs | 322 + opennow-streamer/src/app/mod.rs | 1630 +++++ opennow-streamer/src/app/session.rs | 375 ++ opennow-streamer/src/auth/mod.rs | 707 +++ opennow-streamer/src/gui/image_cache.rs | 170 + opennow-streamer/src/gui/mod.rs | 13 + opennow-streamer/src/gui/renderer.rs | 2411 ++++++++ opennow-streamer/src/gui/stats_panel.rs | 169 + opennow-streamer/src/input/mod.rs | 686 ++ opennow-streamer/src/input/protocol.rs | 103 + opennow-streamer/src/input/windows.rs | 563 ++ opennow-streamer/src/lib.rs | 14 + opennow-streamer/src/main.rs | 432 ++ opennow-streamer/src/media/audio.rs | 161 + opennow-streamer/src/media/mod.rs | 182 + opennow-streamer/src/media/video.rs | 845 +++ opennow-streamer/src/utils/logging.rs | 157 + opennow-streamer/src/utils/mod.rs | 44 + opennow-streamer/src/utils/time.rs | 128 + opennow-streamer/src/webrtc/datachannel.rs | 216 + opennow-streamer/src/webrtc/mod.rs | 668 ++ opennow-streamer/src/webrtc/peer.rs | 486 ++ opennow-streamer/src/webrtc/sdp.rs | 218 + opennow-streamer/src/webrtc/signaling.rs | 354 ++ src-tauri/src/config.rs | 41 + src-tauri/src/lib.rs | 28 + src-tauri/src/recording.rs | 181 + src/main.ts | 359 +- src/recording.ts | 648 ++ src/streaming.ts | 50 +- src/styles/main.css | 105 + 38 files changed, 21547 insertions(+), 19 deletions(-) create mode 100644 opennow-streamer/Cargo.lock create mode 100644 opennow-streamer/Cargo.toml create mode 100644 opennow-streamer/IMPLEMENTATION_PLAN.md create mode 100644 opennow-streamer/src/api/cloudmatch.rs create mode 100644 opennow-streamer/src/api/games.rs create mode 100644 opennow-streamer/src/api/mod.rs create mode 100644 opennow-streamer/src/app/config.rs create mode 100644 opennow-streamer/src/app/mod.rs create mode 100644 opennow-streamer/src/app/session.rs create mode 100644 opennow-streamer/src/auth/mod.rs create mode 100644 opennow-streamer/src/gui/image_cache.rs create mode 100644 opennow-streamer/src/gui/mod.rs create mode 100644 opennow-streamer/src/gui/renderer.rs create mode 100644 opennow-streamer/src/gui/stats_panel.rs create mode 100644 opennow-streamer/src/input/mod.rs create mode 100644 opennow-streamer/src/input/protocol.rs create mode 100644 opennow-streamer/src/input/windows.rs create mode 100644 opennow-streamer/src/lib.rs create mode 100644 opennow-streamer/src/main.rs create mode 100644 opennow-streamer/src/media/audio.rs create mode 100644 opennow-streamer/src/media/mod.rs create mode 100644 opennow-streamer/src/media/video.rs create mode 100644 opennow-streamer/src/utils/logging.rs create mode 100644 opennow-streamer/src/utils/mod.rs create mode 100644 opennow-streamer/src/utils/time.rs create mode 100644 opennow-streamer/src/webrtc/datachannel.rs create mode 100644 opennow-streamer/src/webrtc/mod.rs create mode 100644 opennow-streamer/src/webrtc/peer.rs create mode 100644 opennow-streamer/src/webrtc/sdp.rs create mode 100644 opennow-streamer/src/webrtc/signaling.rs create mode 100644 src-tauri/src/recording.rs create mode 100644 src/recording.ts diff --git a/index.html b/index.html index 9657c9b..e17ea65 100644 --- a/index.html +++ b/index.html @@ -305,6 +305,29 @@

Settings

+
+ +

VP8 is recommended - it uses software encoding and won't interfere with stream playback. H.264 may cause stuttering due to GPU contention.

+
+ +
+
+ VP8 (No Stuttering) + +
+
+
VP8 (No Stuttering)
+
AV1 (RTX 40+ Only)
+
H.264 (May Stutter)
+
+
+
+
+ + +
+ +

Export logs to share with developers for debugging issues. Logs are automatically cleared when they exceed 10MB.

diff --git a/opennow-streamer/Cargo.lock b/opennow-streamer/Cargo.lock new file mode 100644 index 0000000..aaf83fd --- /dev/null +++ b/opennow-streamer/Cargo.lock @@ -0,0 +1,6534 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "ab_glyph" +version = "0.2.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "getrandom 0.3.4", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" +dependencies = [ + "alsa-sys", + "bitflags 2.10.0", + "cfg-if", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-activity" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" +dependencies = [ + "android-properties", + "bitflags 2.10.0", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk 0.9.0", + "ndk-context", + "ndk-sys 0.6.0+11769913", + "num_enum", + "thiserror 1.0.69", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.61.2", +] + +[[package]] +name = "anyhow" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" + +[[package]] +name = "arboard" +version = "3.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf" +dependencies = [ + "clipboard-win", + "image", + "log", + "objc2 0.6.3", + "objc2-app-kit 0.3.2", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-foundation 0.3.2", + "parking_lot", + "percent-encoding", + "windows-sys 0.60.2", + "x11rb", +] + +[[package]] +name = "arc-swap" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" +dependencies = [ + "rustversion", +] + +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading", +] + +[[package]] +name = "asn1-rs" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +dependencies = [ + "asn1-rs-derive 0.4.0", + "asn1-rs-impl 0.1.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror 1.0.69", +] + +[[package]] +name = "asn1-rs" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +dependencies = [ + "asn1-rs-derive 0.5.1", + "asn1-rs-impl 0.2.0", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", + "thiserror 1.0.69", + "time", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure 0.12.6", +] + +[[package]] +name = "asn1-rs-derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure 0.13.2", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "asn1-rs-impl" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "async-compression" +version = "0.4.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" +dependencies = [ + "compression-codecs", + "compression-core", + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.111", +] + +[[package]] +name = "bindgen" +version = "0.72.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" +dependencies = [ + "bitflags 2.10.0", + "cexpr", + "clang-sys", + "itertools", + "proc-macro2", + "quote", + "regex", + "rustc-hash 2.1.1", + "shlex", + "syn 2.0.111", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2 0.5.2", +] + +[[package]] +name = "bumpalo" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" + +[[package]] +name = "bytemuck" +version = "1.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] +name = "bytes" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" + +[[package]] +name = "calloop" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" +dependencies = [ + "bitflags 2.10.0", + "log", + "polling", + "rustix 0.38.44", + "slab", + "thiserror 1.0.69", +] + +[[package]] +name = "calloop" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9f6e1368bd4621d2c86baa7e37de77a938adf5221e5dd3d6133340101b309e" +dependencies = [ + "bitflags 2.10.0", + "polling", + "rustix 1.1.3", + "slab", + "tracing", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" +dependencies = [ + "calloop 0.13.0", + "rustix 0.38.44", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa" +dependencies = [ + "calloop 0.14.3", + "rustix 1.1.3", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.2.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" +dependencies = [ + "find-msvc-tools", + "jobserver", + "libc", + "shlex", +] + +[[package]] +name = "ccm" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" +dependencies = [ + "aead", + "cipher", + "ctr", + "subtle", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-if" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" + +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clang-sys" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clipboard-win" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4" +dependencies = [ + "error-code", +] + +[[package]] +name = "cocoa" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" +dependencies = [ + "bitflags 2.10.0", + "block", + "cocoa-foundation", + "core-foundation 0.10.1", + "core-graphics 0.24.0", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" +dependencies = [ + "bitflags 2.10.0", + "block", + "core-foundation 0.10.1", + "core-graphics-types 0.2.0", + "objc", +] + +[[package]] +name = "codespan-reporting" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" +dependencies = [ + "serde", + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "compression-codecs" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" +dependencies = [ + "compression-core", + "flate2", + "memchr", +] + +[[package]] +name = "compression-core" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "core-graphics" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.10.1", + "core-graphics-types 0.2.0", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.10.1", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6" +dependencies = [ + "bindgen 0.72.1", +] + +[[package]] +name = "cpal" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk 0.8.0", + "ndk-context", + "oboe", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.54.0", +] + +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32fast" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crunchy" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-common" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "cursor-icon" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f" + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "rustc_version", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "data-encoding" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" + +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "der-parser" +version = "8.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +dependencies = [ + "asn1-rs 0.5.2", + "displaydoc", + "nom", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "der-parser" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +dependencies = [ + "asn1-rs 0.6.2", + "displaydoc", + "nom", + "num-bigint", + "num-traits", + "rusticata-macros", +] + +[[package]] +name = "deranged" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "document-features" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" +dependencies = [ + "litrs", +] + +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + +[[package]] +name = "dpi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" + +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", + "spki", +] + +[[package]] +name = "ecolor" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e" +dependencies = [ + "bytemuck", + "emath", +] + +[[package]] +name = "egui" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3" +dependencies = [ + "ahash", + "bitflags 2.10.0", + "emath", + "epaint", + "log", + "nohash-hasher", + "profiling", + "smallvec", + "unicode-segmentation", +] + +[[package]] +name = "egui-wgpu" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d209971c84b2352a06174abdba701af1e552ce56b144d96f2bd50a3c91236" +dependencies = [ + "ahash", + "bytemuck", + "document-features", + "egui", + "epaint", + "log", + "profiling", + "thiserror 2.0.17", + "type-map", + "web-time", + "wgpu", +] + +[[package]] +name = "egui-winit" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec6687e5bb551702f4ad10ac428bab12acf9d53047ebb1082d4a0ed8c6251a29" +dependencies = [ + "arboard", + "bytemuck", + "egui", + "log", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-ui-kit", + "profiling", + "raw-window-handle", + "smithay-clipboard", + "web-time", + "webbrowser", + "winit", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "hkdf", + "pem-rfc7468", + "pkcs8", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "emath" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "491bdf728bf25ddd9ad60d4cf1c48588fa82c013a2440b91aa7fc43e34a07c32" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_filter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "jiff", + "log", +] + +[[package]] +name = "epaint" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009d0dd3c2163823a0abdb899451ecbc78798dec545ee91b43aff1fa790bab62" +dependencies = [ + "ab_glyph", + "ahash", + "bytemuck", + "ecolor", + "emath", + "epaint_default_fonts", + "log", + "nohash-hasher", + "parking_lot", + "profiling", +] + +[[package]] +name = "epaint_default_fonts" +version = "0.33.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c4fbe202b6578d3d56428fa185cdf114a05e49da05f477b3c7f0fbb221f1862" + +[[package]] +name = "equivalent" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" + +[[package]] +name = "errno" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +dependencies = [ + "libc", + "windows-sys 0.61.2", +] + +[[package]] +name = "error-code" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" + +[[package]] +name = "evdev" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab6055a93a963297befb0f4f6e18f314aec9767a4bbe88b151126df2433610a7" +dependencies = [ + "bitvec", + "cfg-if", + "libc", + "nix 0.23.2", + "thiserror 1.0.69", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "fax" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab" +dependencies = [ + "fax_derive", +] + +[[package]] +name = "fax_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "fdeflate" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "ffmpeg-next" +version = "7.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da02698288e0275e442a47fc12ca26d50daf0d48b15398ba5906f20ac2e2a9f9" +dependencies = [ + "bitflags 2.10.0", + "ffmpeg-sys-next", + "libc", +] + +[[package]] +name = "ffmpeg-sys-next" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9e9c75ebd4463de9d8998fb134ba26347fe5faee62fabf0a4b4d41bd500b4ad" +dependencies = [ + "bindgen 0.70.1", + "cc", + "libc", + "num_cpus", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "find-msvc-tools" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", + "zeroize", +] + +[[package]] +name = "gethostname" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" +dependencies = [ + "rustix 1.1.3", + "windows-link", +] + +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasip2", + "wasm-bindgen", +] + +[[package]] +name = "ghash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glob" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "glow" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "glutin_wgl_sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e" +dependencies = [ + "gl_generator", +] + +[[package]] +name = "gpu-alloc" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" +dependencies = [ + "bitflags 2.10.0", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "gpu-allocator" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +dependencies = [ + "log", + "presser", + "thiserror 1.0.69", + "windows 0.58.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" +dependencies = [ + "bitflags 2.10.0", + "gpu-descriptor-types", + "hashbrown 0.15.5", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "h2" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", + "zerocopy", +] + +[[package]] +name = "hashbrown" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "foldhash 0.2.0", +] + +[[package]] +name = "hermit-abi" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "http" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "h2", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2 0.6.1", + "system-configuration", + "tokio", + "tower-service", + "tracing", + "windows-registry", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.62.2", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "icu_collections" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "image" +version = "0.25.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" +dependencies = [ + "bytemuck", + "byteorder-lite", + "image-webp", + "moxcms", + "num-traits", + "png", + "tiff", + "zune-core 0.5.0", + "zune-jpeg 0.5.8", +] + +[[package]] +name = "image-webp" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" +dependencies = [ + "byteorder-lite", + "quick-error", +] + +[[package]] +name = "indexmap" +version = "2.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +dependencies = [ + "equivalent", + "hashbrown 0.16.1", +] + +[[package]] +name = "inout" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "interceptor" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4705c00485029e738bea8c9505b5ddb1486a8f3627a953e1e77e6abdf5eef90c" +dependencies = [ + "async-trait", + "bytes", + "log", + "portable-atomic", + "rand 0.8.5", + "rtcp", + "rtp", + "thiserror 1.0.69", + "tokio", + "waitgroup", + "webrtc-srtp", + "webrtc-util 0.9.0", +] + +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "is-docker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" +dependencies = [ + "once_cell", +] + +[[package]] +name = "is-wsl" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" +dependencies = [ + "is-docker", + "once_cell", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" + +[[package]] +name = "jiff" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a87d9b8105c23642f50cbbae03d1f75d8422c5cb98ce7ee9271f7ff7505be6b8" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" +dependencies = [ + "getrandom 0.3.4", + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "khronos-egl" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" +dependencies = [ + "libc", + "libloading", + "pkg-config", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.178" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" + +[[package]] +name = "libloading" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" +dependencies = [ + "cfg-if", + "windows-link", +] + +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "libredox" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" +dependencies = [ + "bitflags 2.10.0", + "libc", + "redox_syscall 0.7.0", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + +[[package]] +name = "litemap" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "litrs" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" + +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + +[[package]] +name = "mach2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" + +[[package]] +name = "memmap2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metal" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" +dependencies = [ + "bitflags 2.10.0", + "block", + "core-graphics-types 0.2.0", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.61.2", +] + +[[package]] +name = "moxcms" +version = "0.7.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" +dependencies = [ + "num-traits", + "pxfm", +] + +[[package]] +name = "naga" +version = "27.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" +dependencies = [ + "arrayvec", + "bit-set", + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "codespan-reporting", + "half", + "hashbrown 0.16.1", + "hexf-parse", + "indexmap", + "libm", + "log", + "num-traits", + "once_cell", + "rustc-hash 1.1.0", + "spirv", + "thiserror 2.0.17", + "unicode-ident", +] + +[[package]] +name = "nasm-rs" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34f676553b60ccbb76f41f9ae8f2428dac3f259ff8f1c2468a174778d06a1af9" +dependencies = [ + "log", +] + +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe 0.1.6", + "openssl-sys", + "schannel", + "security-framework 2.11.1", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.10.0", + "jni-sys", + "log", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror 1.0.69", +] + +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.10.0", + "jni-sys", + "log", + "ndk-sys 0.6.0+11769913", + "num_enum", + "raw-window-handle", + "thiserror 1.0.69", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_cpus" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +dependencies = [ + "num_enum_derive", + "rustversion", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.10.0", + "block2", + "libc", + "objc2 0.5.2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation 0.2.2", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-app-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-graphics", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2 0.5.2", + "objc2-core-location", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-core-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2 0.6.3", +] + +[[package]] +name = "objc2-core-graphics" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" +dependencies = [ + "bitflags 2.10.0", + "dispatch2", + "objc2 0.6.3", + "objc2-core-foundation", + "objc2-io-surface", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-contacts", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.10.0", + "block2", + "dispatch", + "libc", + "objc2 0.5.2", +] + +[[package]] +name = "objc2-foundation" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-io-surface" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" +dependencies = [ + "bitflags 2.10.0", + "objc2 0.6.3", + "objc2-core-foundation", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-app-kit 0.2.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2 0.5.2", + "objc2-foundation 0.2.2", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2 0.5.2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation 0.2.2", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2 0.5.2", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.10.0", + "block2", + "objc2 0.5.2", + "objc2-core-location", + "objc2-foundation 0.2.2", +] + +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni", + "ndk 0.8.0", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + +[[package]] +name = "oid-registry" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +dependencies = [ + "asn1-rs 0.6.2", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "open" +version = "5.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" +dependencies = [ + "is-wsl", + "libc", + "pathdiff", +] + +[[package]] +name = "openh264" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c1af3a4d35290ba7a46d1ce69cb13ae740a2d72cc2ee00abee3c84bed3dbe5d" +dependencies = [ + "openh264-sys2", + "wide", +] + +[[package]] +name = "openh264-sys2" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a77c1e18503537113d77b1b1d05274e81fa9f44843c06be2d735adb19f7c9d" +dependencies = [ + "cc", + "nasm-rs", + "walkdir", +] + +[[package]] +name = "opennow-streamer" +version = "0.1.0" +dependencies = [ + "anyhow", + "base64 0.22.1", + "bytemuck", + "bytes", + "chrono", + "cocoa", + "core-foundation 0.10.1", + "core-graphics 0.24.0", + "cpal", + "dirs", + "egui", + "egui-wgpu", + "egui-winit", + "env_logger", + "evdev", + "ffmpeg-next", + "futures-util", + "hex", + "http", + "image", + "lazy_static", + "libc", + "log", + "native-tls", + "objc", + "once_cell", + "open", + "openh264", + "parking_lot", + "pollster", + "rand 0.8.5", + "regex", + "reqwest", + "serde", + "serde_json", + "sha2", + "thiserror 2.0.17", + "tokio", + "tokio-native-tls", + "tokio-tungstenite", + "urlencoding", + "uuid", + "webrtc", + "webrtc-util 0.8.1", + "wgpu", + "windows 0.62.2", + "winit", + "x11", +] + +[[package]] +name = "openssl" +version = "0.10.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "foreign-types 0.3.2", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + +[[package]] +name = "openssl-probe" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f50d9b3dabb09ecd771ad0aa242ca6894994c130308ca3d7684634df8037391" + +[[package]] +name = "openssl-sys" +version = "0.9.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" +dependencies = [ + "libredox", +] + +[[package]] +name = "ordered-float" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4779c6901a562440c3786d08192c6fbda7c1c2060edd10006b05ee35d10f2d" +dependencies = [ + "num-traits", +] + +[[package]] +name = "owned_ttf_parser" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "p256" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "p384" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" +dependencies = [ + "ecdsa", + "elliptic-curve", + "primeorder", + "sha2", +] + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.5.18", + "smallvec", + "windows-link", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + +[[package]] +name = "pem" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" +dependencies = [ + "base64 0.22.1", + "serde_core", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "png" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" +dependencies = [ + "bitflags 2.10.0", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "3.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix 1.1.3", + "windows-sys 0.61.2", +] + +[[package]] +name = "pollster" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" + +[[package]] +name = "polyval" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "portable-atomic" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + +[[package]] +name = "presser" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" + +[[package]] +name = "primeorder" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" +dependencies = [ + "elliptic-curve", +] + +[[package]] +name = "proc-macro-crate" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" + +[[package]] +name = "pxfm" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" +dependencies = [ + "num-traits", +] + +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + +[[package]] +name = "quick-xml" +version = "0.37.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +dependencies = [ + "memchr", +] + +[[package]] +name = "quinn" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" +dependencies = [ + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls", + "socket2 0.6.1", + "thiserror 2.0.17", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash 2.1.1", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.17", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2 0.6.1", + "tracing", + "windows-sys 0.60.2", +] + +[[package]] +name = "quote" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.16", +] + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +dependencies = [ + "getrandom 0.3.4", +] + +[[package]] +name = "range-alloc" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde" + +[[package]] +name = "raw-window-handle" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" + +[[package]] +name = "rcgen" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" +dependencies = [ + "pem", + "ring", + "rustls-pki-types", + "time", + "x509-parser", + "yasna", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "redox_syscall" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "redox_users" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +dependencies = [ + "getrandom 0.2.16", + "libredox", + "thiserror 1.0.69", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "renderdoc-sys" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" + +[[package]] +name = "reqwest" +version = "0.12.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +dependencies = [ + "base64 0.22.1", + "bytes", + "encoding_rs", + "futures-core", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-tls", + "hyper-util", + "js-sys", + "log", + "mime", + "native-tls", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", +] + +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + +[[package]] +name = "ring" +version = "0.17.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.16", + "libc", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rtcp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2" +dependencies = [ + "bytes", + "thiserror 1.0.69", + "webrtc-util 0.9.0", +] + +[[package]] +name = "rtp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6870f09b5db96f8b9e7290324673259fd15519ebb7d55acf8e7eb044a9ead6af" +dependencies = [ + "bytes", + "portable-atomic", + "rand 0.8.5", + "serde", + "thiserror 1.0.69", + "webrtc-util 0.9.0", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rusticata-macros" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +dependencies = [ + "nom", +] + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +dependencies = [ + "bitflags 2.10.0", + "errno", + "libc", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls" +version = "0.23.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +dependencies = [ + "openssl-probe 0.2.0", + "rustls-pki-types", + "schannel", + "security-framework 3.5.1", +] + +[[package]] +name = "rustls-pki-types" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" +dependencies = [ + "web-time", + "zeroize", +] + +[[package]] +name = "rustls-webpki" +version = "0.103.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" + +[[package]] +name = "safe_arch" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sctk-adwaita" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" +dependencies = [ + "ab_glyph", + "log", + "memmap2", + "smithay-client-toolkit 0.19.2", + "tiny-skia", +] + +[[package]] +name = "sdp" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f" +dependencies = [ + "rand 0.8.5", + "substring", + "thiserror 1.0.69", + "url", +] + +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "pkcs8", + "subtle", + "zeroize", +] + +[[package]] +name = "security-framework" +version = "2.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.10.1", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "serde_json" +version = "1.0.148" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da" +dependencies = [ + "itoa", + "memchr", + "serde", + "serde_core", + "zmij", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + +[[package]] +name = "slotmap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038" +dependencies = [ + "version_check", +] + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "smithay-client-toolkit" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" +dependencies = [ + "bitflags 2.10.0", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix 0.38.44", + "thiserror 1.0.69", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" +dependencies = [ + "bitflags 2.10.0", + "calloop 0.14.3", + "calloop-wayland-source 0.4.1", + "cursor-icon", + "libc", + "log", + "memmap2", + "rustix 1.1.3", + "thiserror 2.0.17", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-experimental", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-clipboard" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71704c03f739f7745053bde45fa203a46c58d25bc5c4efba1d9a60e9dba81226" +dependencies = [ + "libc", + "smithay-client-toolkit 0.20.0", + "wayland-backend", +] + +[[package]] +name = "smol_str" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "socket2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + +[[package]] +name = "spirv" +version = "0.3.0+sdk-1.3.268.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" +dependencies = [ + "bitflags 2.10.0", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" + +[[package]] +name = "stun" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b" +dependencies = [ + "base64 0.21.7", + "crc", + "lazy_static", + "md-5", + "rand 0.8.5", + "ring", + "subtle", + "thiserror 1.0.69", + "tokio", + "url", + "webrtc-util 0.9.0", +] + +[[package]] +name = "substring" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" +dependencies = [ + "autocfg", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.10.0", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "tempfile" +version = "3.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" +dependencies = [ + "fastrand", + "getrandom 0.3.4", + "once_cell", + "rustix 1.1.3", + "windows-sys 0.61.2", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +dependencies = [ + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "tiff" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f" +dependencies = [ + "fax", + "flate2", + "half", + "quick-error", + "weezl", + "zune-jpeg 0.4.21", +] + +[[package]] +name = "time" +version = "0.3.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" + +[[package]] +name = "time-macros" +version = "0.2.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-skia" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "log", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinystr" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +dependencies = [ + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.6.1", + "tokio-macros", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-macros" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" +dependencies = [ + "futures-util", + "log", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml_datetime" +version = "0.7.5+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" +dependencies = [ + "serde_core", +] + +[[package]] +name = "toml_edit" +version = "0.23.10+spec-1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +dependencies = [ + "indexmap", + "toml_datetime", + "toml_parser", + "winnow", +] + +[[package]] +name = "toml_parser" +version = "1.0.6+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +dependencies = [ + "winnow", +] + +[[package]] +name = "tower" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +dependencies = [ + "async-compression", + "bitflags 2.10.0", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "iri-string", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "log", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" + +[[package]] +name = "tungstenite" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.8.5", + "rustls", + "rustls-pki-types", + "sha1", + "thiserror 1.0.69", + "utf-8", +] + +[[package]] +name = "turn" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b000cebd930420ac1ed842c8128e3b3412512dfd5b82657eab035a3f5126acc" +dependencies = [ + "async-trait", + "base64 0.21.7", + "futures", + "log", + "md-5", + "portable-atomic", + "rand 0.8.5", + "ring", + "stun", + "thiserror 1.0.69", + "tokio", + "tokio-util", + "webrtc-util 0.9.0", +] + +[[package]] +name = "type-map" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" +dependencies = [ + "rustc-hash 2.1.1", +] + +[[package]] +name = "typenum" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" + +[[package]] +name = "unicode-segmentation" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" + +[[package]] +name = "unicode-width" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +dependencies = [ + "getrandom 0.3.4", + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "waitgroup" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +dependencies = [ + "atomic-waker", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn 2.0.111", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wayland-backend" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" +dependencies = [ + "cc", + "downcast-rs", + "rustix 1.1.3", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" +dependencies = [ + "bitflags 2.10.0", + "rustix 1.1.3", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.10.0", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29" +dependencies = [ + "rustix 1.1.3", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-experimental" +version = "20250721.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dfe33d551eb8bffd03ff067a8b44bb963919157841a99957151299a6307d19c" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec" +dependencies = [ + "bitflags 2.10.0", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" +dependencies = [ + "dlib", + "log", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webbrowser" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f1243ef785213e3a32fa0396093424a3a6ea566f9948497e5a2309261a4c97" +dependencies = [ + "core-foundation 0.10.1", + "jni", + "log", + "ndk-context", + "objc2 0.6.3", + "objc2-foundation 0.3.2", + "url", + "web-sys", +] + +[[package]] +name = "webpki-roots" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "webrtc" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b3a840e31c969844714f93b5a87e73ee49f3bc2a4094ab9132c69497eb31db" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "cfg-if", + "hex", + "interceptor", + "lazy_static", + "log", + "portable-atomic", + "rand 0.8.5", + "rcgen", + "regex", + "ring", + "rtcp", + "rtp", + "rustls", + "sdp", + "serde", + "serde_json", + "sha2", + "smol_str", + "stun", + "thiserror 1.0.69", + "time", + "tokio", + "turn", + "url", + "waitgroup", + "webrtc-data", + "webrtc-dtls", + "webrtc-ice", + "webrtc-mdns", + "webrtc-media", + "webrtc-sctp", + "webrtc-srtp", + "webrtc-util 0.9.0", +] + +[[package]] +name = "webrtc-data" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8b7c550f8d35867b72d511640adf5159729b9692899826fe00ba7fa74f0bf70" +dependencies = [ + "bytes", + "log", + "portable-atomic", + "thiserror 1.0.69", + "tokio", + "webrtc-sctp", + "webrtc-util 0.9.0", +] + +[[package]] +name = "webrtc-dtls" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e5eedbb0375aa04da93fc3a189b49ed3ed9ee844b6997d5aade14fc3e2c26e" +dependencies = [ + "aes", + "aes-gcm", + "async-trait", + "bincode", + "byteorder", + "cbc", + "ccm", + "der-parser 8.2.0", + "hkdf", + "hmac", + "log", + "p256", + "p384", + "portable-atomic", + "rand 0.8.5", + "rand_core 0.6.4", + "rcgen", + "ring", + "rustls", + "sec1", + "serde", + "sha1", + "sha2", + "subtle", + "thiserror 1.0.69", + "tokio", + "webrtc-util 0.9.0", + "x25519-dalek", + "x509-parser", +] + +[[package]] +name = "webrtc-ice" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4f0ca6d4df8d1bdd34eece61b51b62540840b7a000397bcfb53a7bfcf347c8" +dependencies = [ + "arc-swap", + "async-trait", + "crc", + "log", + "portable-atomic", + "rand 0.8.5", + "serde", + "serde_json", + "stun", + "thiserror 1.0.69", + "tokio", + "turn", + "url", + "uuid", + "waitgroup", + "webrtc-mdns", + "webrtc-util 0.9.0", +] + +[[package]] +name = "webrtc-mdns" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4" +dependencies = [ + "log", + "socket2 0.5.10", + "thiserror 1.0.69", + "tokio", + "webrtc-util 0.9.0", +] + +[[package]] +name = "webrtc-media" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c15b20e98167b22949abc1c20eca7c6d814307d187068fe7a48f0b87a4f6d46" +dependencies = [ + "byteorder", + "bytes", + "rand 0.8.5", + "rtp", + "thiserror 1.0.69", +] + +[[package]] +name = "webrtc-sctp" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d850daa68639b9d7bb16400676e97525d1e52b15b4928240ae2ba0e849817a5" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "crc", + "log", + "portable-atomic", + "rand 0.8.5", + "thiserror 1.0.69", + "tokio", + "webrtc-util 0.9.0", +] + +[[package]] +name = "webrtc-srtp" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbec5da43a62c228d321d93fb12cc9b4d9c03c9b736b0c215be89d8bd0774cfe" +dependencies = [ + "aead", + "aes", + "aes-gcm", + "byteorder", + "bytes", + "ctr", + "hmac", + "log", + "rtcp", + "rtp", + "sha1", + "subtle", + "thiserror 1.0.69", + "tokio", + "webrtc-util 0.9.0", +] + +[[package]] +name = "webrtc-util" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e85154ef743d9a2a116d104faaaa82740a281b8b4bed5ee691a2df6c133d873" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "bytes", + "ipnet", + "lazy_static", + "libc", + "log", + "nix 0.26.4", + "rand 0.8.5", + "thiserror 1.0.69", + "tokio", + "winapi", +] + +[[package]] +name = "webrtc-util" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e" +dependencies = [ + "async-trait", + "bitflags 1.3.2", + "bytes", + "ipnet", + "lazy_static", + "libc", + "log", + "nix 0.26.4", + "portable-atomic", + "rand 0.8.5", + "thiserror 1.0.69", + "tokio", + "winapi", +] + +[[package]] +name = "weezl" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" + +[[package]] +name = "wgpu" +version = "27.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" +dependencies = [ + "arrayvec", + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "document-features", + "hashbrown 0.16.1", + "js-sys", + "log", + "naga", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "smallvec", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "27.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" +dependencies = [ + "arrayvec", + "bit-set", + "bit-vec", + "bitflags 2.10.0", + "bytemuck", + "cfg_aliases", + "document-features", + "hashbrown 0.16.1", + "indexmap", + "log", + "naga", + "once_cell", + "parking_lot", + "portable-atomic", + "profiling", + "raw-window-handle", + "rustc-hash 1.1.0", + "smallvec", + "thiserror 2.0.17", + "wgpu-core-deps-apple", + "wgpu-core-deps-emscripten", + "wgpu-core-deps-windows-linux-android", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core-deps-apple" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-emscripten" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-windows-linux-android" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-hal" +version = "27.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" +dependencies = [ + "android_system_properties", + "arrayvec", + "ash", + "bit-set", + "bitflags 2.10.0", + "block", + "bytemuck", + "cfg-if", + "cfg_aliases", + "core-graphics-types 0.2.0", + "glow", + "glutin_wgl_sys", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hashbrown 0.16.1", + "js-sys", + "khronos-egl", + "libc", + "libloading", + "log", + "metal", + "naga", + "ndk-sys 0.6.0+11769913", + "objc", + "once_cell", + "ordered-float", + "parking_lot", + "portable-atomic", + "portable-atomic-util", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "smallvec", + "thiserror 2.0.17", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "windows 0.58.0", + "windows-core 0.58.0", +] + +[[package]] +name = "wgpu-types" +version = "27.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" +dependencies = [ + "bitflags 2.10.0", + "bytemuck", + "js-sys", + "log", + "thiserror 2.0.17", + "web-sys", +] + +[[package]] +name = "wide" +version = "0.7.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03" +dependencies = [ + "bytemuck", + "safe_arch", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections", + "windows-core 0.62.2", + "windows-future", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core 0.62.2", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement 0.58.0", + "windows-interface 0.58.0", + "windows-result 0.2.0", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-link", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link", + "windows-threading", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link", +] + +[[package]] +name = "windows-registry" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result 0.4.1", + "windows-strings 0.5.1", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result 0.2.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + +[[package]] +name = "winit" +version = "0.30.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.10.0", + "block2", + "bytemuck", + "calloop 0.13.0", + "cfg_aliases", + "concurrent-queue", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "cursor-icon", + "dpi", + "js-sys", + "libc", + "memmap2", + "ndk 0.9.0", + "objc2 0.5.2", + "objc2-app-kit 0.2.2", + "objc2-foundation 0.2.2", + "objc2-ui-kit", + "orbclient", + "percent-encoding", + "pin-project", + "raw-window-handle", + "redox_syscall 0.4.1", + "rustix 0.38.44", + "sctk-adwaita", + "smithay-client-toolkit 0.19.2", + "smol_str", + "tracing", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.52.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading", + "once_cell", + "rustix 1.1.3", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" + +[[package]] +name = "x25519-dalek" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" +dependencies = [ + "curve25519-dalek", + "rand_core 0.6.4", + "serde", + "zeroize", +] + +[[package]] +name = "x509-parser" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +dependencies = [ + "asn1-rs 0.6.2", + "data-encoding", + "der-parser 9.0.0", + "lazy_static", + "nom", + "oid-registry", + "ring", + "rusticata-macros", + "thiserror 1.0.69", + "time", +] + +[[package]] +name = "xcursor" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" + +[[package]] +name = "xkbcommon-dl" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" +dependencies = [ + "bitflags 2.10.0", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" + +[[package]] +name = "xml-rs" +version = "0.8.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[package]] +name = "yoke" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure 0.13.2", +] + +[[package]] +name = "zerocopy" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", + "synstructure 0.13.2", +] + +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.111", +] + +[[package]] +name = "zmij" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4a4e8e9dc5c62d159f04fcdbe07f4c3fb710415aab4754bf11505501e3251d" + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773" + +[[package]] +name = "zune-jpeg" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" +dependencies = [ + "zune-core 0.4.12", +] + +[[package]] +name = "zune-jpeg" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5" +dependencies = [ + "zune-core 0.5.0", +] diff --git a/opennow-streamer/Cargo.toml b/opennow-streamer/Cargo.toml new file mode 100644 index 0000000..d2849cb --- /dev/null +++ b/opennow-streamer/Cargo.toml @@ -0,0 +1,107 @@ +[package] +name = "opennow-streamer" +version = "0.1.0" +edition = "2021" +description = "High-performance native streaming client for GeForce NOW" +authors = ["OpenNow"] +license = "MIT" + +[dependencies] +# Async runtime +tokio = { version = "1", features = ["full", "sync", "time", "rt-multi-thread", "macros"] } + +# WebRTC +webrtc = "0.11" +webrtc-util = "0.8" + +# HTTP client +reqwest = { version = "0.12", features = ["json", "rustls-tls", "gzip"] } + +# WebSocket (signaling) +tokio-tungstenite = { version = "0.24", features = ["rustls-tls-native-roots"] } +futures-util = "0.3" + +# TLS +native-tls = "0.2" +tokio-native-tls = "0.3" + +# Video decoding - FFmpeg with hardware acceleration +ffmpeg-next = "7" +# Keep OpenH264 as fallback +openh264 = "0.6" + +# Audio decoding (stub for now - will add opus decoding later) +# audiopus requires CMake to build, so we'll stub audio for now + +# Audio playback (cross-platform) +cpal = "0.15" + +# Window & Graphics +winit = "0.30" +wgpu = "27" +pollster = "0.4" +bytemuck = { version = "1", features = ["derive"] } + +# GUI overlay +egui = "0.33" +egui-wgpu = "0.33" +egui-winit = "0.33" + +# Serialization +serde = { version = "1", features = ["derive"] } +serde_json = "1" + +# Image loading (for game art) +image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp"] } + +# Utilities +libc = "0.2" +anyhow = "1" +thiserror = "2" +log = "0.4" +env_logger = "0.11" +parking_lot = "0.12" +bytes = "1" +base64 = "0.22" +sha2 = "0.10" +uuid = { version = "1", features = ["v4"] } +chrono = "0.4" +rand = "0.8" +urlencoding = "2" +http = "1" +dirs = "5" +regex = "1" +lazy_static = "1.4" +hex = "0.4" +open = "5" +once_cell = "1.19" + +# Platform-specific dependencies +[target.'cfg(windows)'.dependencies] +windows = { version = "0.62", features = [ + "Win32_UI_WindowsAndMessaging", + "Win32_UI_Input", + "Win32_UI_Input_KeyboardAndMouse", + "Win32_Graphics_Gdi", + "Win32_Foundation", + "Win32_System_LibraryLoader", +] } + +[target.'cfg(target_os = "macos")'.dependencies] +core-foundation = "0.10" +core-graphics = "0.24" +cocoa = "0.26" +objc = "0.2" + +[target.'cfg(target_os = "linux")'.dependencies] +evdev = "0.12" +x11 = { version = "2.21", features = ["xlib"] } + +[profile.release] +opt-level = 3 +lto = true +codegen-units = 1 +strip = true + +[profile.dev] +opt-level = 1 diff --git a/opennow-streamer/IMPLEMENTATION_PLAN.md b/opennow-streamer/IMPLEMENTATION_PLAN.md new file mode 100644 index 0000000..d038309 --- /dev/null +++ b/opennow-streamer/IMPLEMENTATION_PLAN.md @@ -0,0 +1,1008 @@ +# OpenNow Streamer - Native Client Implementation Plan + +## Executive Summary + +A high-performance, cross-platform native streaming client for GeForce NOW that: +- Works on **Windows, macOS, and Linux** +- Supports **all video codecs**: H.264, H.265/HEVC, AV1 +- Uses **native mouse capture** for minimal latency +- Runs efficiently on **low-end hardware** +- Features the same **stats panel** (bottom-left) as the web client + +--- + +## Architecture Overview + +``` +┌─────────────────────────────────────────────────────────────────┐ +│ OpenNow Streamer │ +├─────────────────────────────────────────────────────────────────┤ +│ ┌──────────────┐ ┌──────────────┐ ┌──────────────────────┐ │ +│ │ GUI Layer │ │ Stats Panel │ │ Settings/Config │ │ +│ │ (winit/wgpu)│ │ (bottom-left)│ │ (JSON persistent) │ │ +│ └──────┬───────┘ └──────┬───────┘ └──────────┬───────────┘ │ +│ │ │ │ │ +│ ┌──────▼─────────────────▼─────────────────────▼───────────┐ │ +│ │ Application Core │ │ +│ │ - Session Management (CloudMatch API) │ │ +│ │ - Authentication (OAuth/JWT) │ │ +│ │ - WebRTC State Machine │ │ +│ └──────┬───────────────────────────────────────┬───────────┘ │ +│ │ │ │ +│ ┌──────▼───────┐ ┌───────────────┐ ┌────────▼────────────┐ │ +│ │ WebRTC │ │ Video Decode │ │ Input Handler │ │ +│ │ (webrtc-rs) │ │ (FFmpeg) │ │ (Platform-native) │ │ +│ │ - Signaling │ │ - H.264 │ │ - Windows: RawInput│ │ +│ │ - ICE/DTLS │ │ - H.265 │ │ - macOS: CGEvent │ │ +│ │ - DataChan │ │ - AV1 │ │ - Linux: evdev │ │ +│ └──────┬───────┘ └───────┬───────┘ └─────────┬───────────┘ │ +│ │ │ │ │ +│ ┌──────▼──────────────────▼────────────────────▼───────────┐ │ +│ │ Media Pipeline │ │ +│ │ RTP → Depacketize → Decode → YUV→RGB → GPU Texture │ │ +│ │ Audio: Opus → PCM → CPAL (cross-platform audio) │ │ +│ └──────────────────────────────────────────────────────────┘ │ +└─────────────────────────────────────────────────────────────────┘ +``` + +--- + +## Component Breakdown + +### 1. Project Structure + +``` +opennow-streamer/ +├── Cargo.toml # Workspace dependencies +├── src/ +│ ├── main.rs # Entry point, CLI args +│ ├── lib.rs # Library exports +│ │ +│ ├── app/ +│ │ ├── mod.rs # Application state machine +│ │ ├── config.rs # Settings (JSON, persistent) +│ │ └── session.rs # GFN session lifecycle +│ │ +│ ├── auth/ +│ │ ├── mod.rs # OAuth flow, token management +│ │ └── jwt.rs # JWT/GFN token handling +│ │ +│ ├── api/ +│ │ ├── mod.rs # HTTP client wrapper +│ │ ├── cloudmatch.rs # Session API (CloudMatch) +│ │ └── games.rs # Game library fetching +│ │ +│ ├── webrtc/ +│ │ ├── mod.rs # WebRTC state machine +│ │ ├── signaling.rs # WebSocket signaling (GFN protocol) +│ │ ├── peer.rs # RTCPeerConnection wrapper +│ │ ├── sdp.rs # SDP parsing/manipulation +│ │ └── datachannel.rs # Input/control channels +│ │ +│ ├── media/ +│ │ ├── mod.rs # Media pipeline orchestration +│ │ ├── rtp.rs # RTP depacketization +│ │ ├── video_decoder.rs # FFmpeg video decode (H.264/H.265/AV1) +│ │ ├── audio_decoder.rs # Opus decode +│ │ └── renderer.rs # GPU texture upload, frame queue +│ │ +│ ├── input/ +│ │ ├── mod.rs # Cross-platform input abstraction +│ │ ├── protocol.rs # GFN binary input protocol encoder +│ │ ├── windows.rs # Windows RawInput + cursor clip +│ │ ├── macos.rs # macOS CGEvent + CGWarpMouseCursorPosition +│ │ └── linux.rs # Linux evdev/libinput +│ │ +│ ├── gui/ +│ │ ├── mod.rs # GUI framework setup +│ │ ├── window.rs # winit window management +│ │ ├── renderer.rs # wgpu rendering pipeline +│ │ ├── stats_panel.rs # Stats overlay (bottom-left) +│ │ └── fullscreen.rs # Fullscreen management +│ │ +│ └── utils/ +│ ├── mod.rs +│ ├── logging.rs # File + console logging +│ └── time.rs # High-precision timestamps +│ +├── assets/ +│ └── shaders/ +│ ├── video.wgsl # YUV→RGB shader +│ └── ui.wgsl # Stats panel shader +│ +└── build.rs # FFmpeg linking, platform setup +``` + +### 2. Core Dependencies (Cargo.toml) + +```toml +[package] +name = "opennow-streamer" +version = "0.1.0" +edition = "2021" + +[dependencies] +# Async runtime +tokio = { version = "1", features = ["full"] } + +# WebRTC +webrtc = "0.12" + +# HTTP client +reqwest = { version = "0.12", features = ["json", "rustls-tls"] } + +# WebSocket (signaling) +tokio-tungstenite = { version = "0.24", features = ["rustls-tls-native-roots"] } + +# Video decoding (FFmpeg bindings) +ffmpeg-next = "7" + +# Audio decoding +opus = "0.3" +audiopus = "0.3" + +# Audio playback (cross-platform) +cpal = "0.15" + +# Window & Graphics +winit = "0.30" +wgpu = "23" +bytemuck = { version = "1", features = ["derive"] } + +# Serialization +serde = { version = "1", features = ["derive"] } +serde_json = "1" + +# Utilities +anyhow = "1" +log = "0.4" +env_logger = "0.11" +parking_lot = "0.12" +bytes = "1" +base64 = "0.22" +sha2 = "0.10" +uuid = { version = "1", features = ["v4"] } +chrono = "0.4" + +# Platform-specific +[target.'cfg(windows)'.dependencies] +windows = { version = "0.58", features = [ + "Win32_UI_WindowsAndMessaging", + "Win32_UI_Input", + "Win32_UI_Input_KeyboardAndMouse", + "Win32_Graphics_Gdi", + "Win32_Foundation", +] } + +[target.'cfg(target_os = "macos")'.dependencies] +core-foundation = "0.10" +core-graphics = "0.24" + +[target.'cfg(target_os = "linux")'.dependencies] +evdev = "0.12" +x11 = { version = "2.21", features = ["xlib"] } +``` + +--- + +## Implementation Phases + +### Phase 1: Core Infrastructure (Week 1) + +#### 1.1 Project Setup +- [ ] Create Cargo workspace +- [ ] Set up build.rs for FFmpeg linking +- [ ] Configure cross-compilation for Windows/macOS/Linux +- [ ] Set up logging infrastructure + +#### 1.2 Configuration System +```rust +// src/app/config.rs +#[derive(Serialize, Deserialize, Default)] +pub struct Settings { + // Video settings + pub resolution: Resolution, + pub fps: u32, // 30, 60, 120, 240, 360 + pub codec: VideoCodec, // H264, H265, AV1 + pub max_bitrate_mbps: u32, // 5-200, 200 = unlimited + + // Audio settings + pub audio_codec: AudioCodec, + pub surround: bool, + + // Performance + pub vsync: bool, + pub low_latency_mode: bool, + pub nvidia_reflex: bool, + + // Input + pub mouse_sensitivity: f32, + pub raw_input: bool, // Windows only + + // Display + pub fullscreen: bool, + pub borderless: bool, + pub stats_panel: bool, + pub stats_position: StatsPosition, + + // Network + pub preferred_region: Option, + pub proxy: Option, +} + +#[derive(Serialize, Deserialize)] +pub enum VideoCodec { + H264, + H265, + AV1, + Auto, // Let server decide +} +``` + +#### 1.3 Authentication Module +- Port OAuth flow from web client +- JWT token management +- Token persistence and refresh + +### Phase 2: WebRTC Implementation (Week 2) + +#### 2.1 Signaling Protocol +```rust +// src/webrtc/signaling.rs +// Ported from native/signaling.rs with improvements + +pub struct GfnSignaling { + server_ip: String, + session_id: String, + ws: Option, + event_tx: mpsc::Sender, +} + +impl GfnSignaling { + pub async fn connect(&mut self) -> Result<()> { + // WebSocket URL: wss://{server}/nvst/sign_in?peer_id=peer-{random}&version=2 + // Subprotocol: x-nv-sessionid.{session_id} + + // Key implementation details from web client: + // 1. Accept self-signed certs (GFN servers) + // 2. Send peer_info immediately after connect + // 3. Handle heartbeats (hb) every 5 seconds + // 4. ACK all messages with ackid + } + + pub async fn send_answer(&self, sdp: &str) -> Result<()>; + pub async fn send_ice_candidate(&self, candidate: &IceCandidate) -> Result<()>; +} +``` + +#### 2.2 Peer Connection Management +```rust +// src/webrtc/peer.rs +// Enhanced from existing webrtc_client.rs + +pub struct WebRtcPeer { + connection: RTCPeerConnection, + input_channel: Option>, + video_track_rx: mpsc::Receiver>, + audio_track_rx: mpsc::Receiver>, +} + +impl WebRtcPeer { + pub async fn handle_offer(&mut self, sdp: &str, ice_servers: Vec) -> Result { + // CRITICAL: Create input_channel_v1 BEFORE setRemoteDescription + // This is required by GFN protocol (discovered from web client) + + let input_channel = self.connection.create_data_channel( + "input_channel_v1", + Some(RTCDataChannelInit { + ordered: Some(false), // Unordered for lowest latency + max_retransmits: Some(0), // No retransmits + ..Default::default() + }), + ).await?; + + // Set remote description (server's offer) + // Create and send answer + // Wait for ICE gathering + } +} +``` + +#### 2.3 SDP Manipulation +```rust +// src/webrtc/sdp.rs +// Codec forcing logic from streaming.ts preferCodec() + +pub fn prefer_codec(sdp: &str, codec: VideoCodec) -> String { + // Parse SDP lines + // Find video section (m=video) + // Identify payload types for each codec via a=rtpmap + // Rewrite m=video line to only include preferred codec payloads + // Remove a=rtpmap, a=fmtp, a=rtcp-fb lines for other codecs +} + +pub fn fix_ice_candidates(sdp: &str, server_ip: &str) -> String { + // Replace 0.0.0.0 with actual server IP + // Add host candidates for ice-lite compatibility +} +``` + +### Phase 3: Media Pipeline (Week 3) + +#### 3.1 RTP Depacketization +```rust +// src/media/rtp.rs + +pub struct RtpDepacketizer { + codec: VideoCodec, + // H.264: NAL unit assembly from fragmented packets + // H.265: Similar NAL unit handling + // AV1: OBU (Open Bitstream Unit) assembly +} + +impl RtpDepacketizer { + pub fn process_packet(&mut self, rtp_data: &[u8]) -> Option { + // Extract payload from RTP + // Handle fragmentation (FU-A for H.264) + // Assemble complete NAL units + // Return complete frames for decoding + } +} +``` + +#### 3.2 Video Decoder (FFmpeg) +```rust +// src/media/video_decoder.rs + +pub struct VideoDecoder { + decoder: ffmpeg::decoder::Video, + scaler: Option, + hw_accel: bool, +} + +impl VideoDecoder { + pub fn new(codec: VideoCodec, hw_accel: bool) -> Result { + let codec_id = match codec { + VideoCodec::H264 => ffmpeg::codec::Id::H264, + VideoCodec::H265 => ffmpeg::codec::Id::HEVC, + VideoCodec::AV1 => ffmpeg::codec::Id::AV1, + }; + + let mut decoder = ffmpeg::decoder::find(codec_id) + .ok_or(anyhow!("Codec not found"))? + .video()?; + + // Try hardware acceleration + if hw_accel { + #[cfg(target_os = "windows")] + Self::try_dxva2(&mut decoder); + + #[cfg(target_os = "macos")] + Self::try_videotoolbox(&mut decoder); + + #[cfg(target_os = "linux")] + Self::try_vaapi(&mut decoder); + } + + Ok(Self { decoder, scaler: None, hw_accel }) + } + + pub fn decode(&mut self, data: &[u8]) -> Result> { + // Send packet to decoder + // Receive frame (YUV420P typically) + // Return decoded frame for rendering + } +} +``` + +#### 3.3 GPU Rendering (wgpu) +```rust +// src/gui/renderer.rs + +pub struct VideoRenderer { + device: wgpu::Device, + queue: wgpu::Queue, + texture: wgpu::Texture, + pipeline: wgpu::RenderPipeline, + // YUV textures for efficient upload + y_texture: wgpu::Texture, + u_texture: wgpu::Texture, + v_texture: wgpu::Texture, +} + +impl VideoRenderer { + pub fn upload_frame(&mut self, frame: &DecodedFrame) { + // Upload Y, U, V planes separately + // This is more efficient than CPU RGB conversion + + self.queue.write_texture( + self.y_texture.as_image_copy(), + &frame.y_plane, + // ... + ); + // Same for U and V + } + + pub fn render(&self, encoder: &mut wgpu::CommandEncoder, view: &wgpu::TextureView) { + // Run YUV→RGB shader + // Draw fullscreen quad with video texture + } +} +``` + +#### 3.4 YUV to RGB Shader +```wgsl +// assets/shaders/video.wgsl + +@group(0) @binding(0) var y_texture: texture_2d; +@group(0) @binding(1) var u_texture: texture_2d; +@group(0) @binding(2) var v_texture: texture_2d; +@group(0) @binding(3) var tex_sampler: sampler; + +@fragment +fn fs_main(@location(0) tex_coords: vec2) -> @location(0) vec4 { + let y = textureSample(y_texture, tex_sampler, tex_coords).r; + let u = textureSample(u_texture, tex_sampler, tex_coords).r - 0.5; + let v = textureSample(v_texture, tex_sampler, tex_coords).r - 0.5; + + // BT.709 YUV to RGB conversion (for HD content) + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; + + return vec4(r, g, b, 1.0); +} +``` + +### Phase 4: Audio Pipeline (Week 4) + +#### 4.1 Opus Decoder +```rust +// src/media/audio_decoder.rs + +pub struct AudioDecoder { + decoder: opus::Decoder, + sample_rate: u32, + channels: opus::Channels, +} + +impl AudioDecoder { + pub fn new(sample_rate: u32, channels: u32) -> Result { + let channels = match channels { + 1 => opus::Channels::Mono, + 2 => opus::Channels::Stereo, + _ => return Err(anyhow!("Unsupported channel count")), + }; + + let decoder = opus::Decoder::new(sample_rate, channels)?; + Ok(Self { decoder, sample_rate, channels }) + } + + pub fn decode(&mut self, data: &[u8]) -> Result> { + let mut output = vec![0i16; 5760]; // Max frame size + let samples = self.decoder.decode(data, &mut output, false)?; + output.truncate(samples * self.channels.count()); + Ok(output) + } +} +``` + +#### 4.2 Audio Playback (cpal) +```rust +// src/media/audio_player.rs + +pub struct AudioPlayer { + stream: cpal::Stream, + buffer_tx: mpsc::Sender>, +} + +impl AudioPlayer { + pub fn new() -> Result { + let host = cpal::default_host(); + let device = host.default_output_device() + .ok_or(anyhow!("No audio output device"))?; + + let config = device.default_output_config()?; + + let (buffer_tx, mut buffer_rx) = mpsc::channel::>(64); + + let stream = device.build_output_stream( + &config.into(), + move |data: &mut [i16], _| { + // Fill from buffer_rx + if let Ok(samples) = buffer_rx.try_recv() { + for (i, sample) in samples.iter().enumerate() { + if i < data.len() { + data[i] = *sample; + } + } + } + }, + |err| eprintln!("Audio error: {}", err), + None, + )?; + + stream.play()?; + Ok(Self { stream, buffer_tx }) + } + + pub fn push_samples(&self, samples: Vec) { + let _ = self.buffer_tx.try_send(samples); + } +} +``` + +### Phase 5: Input System (Week 5) + +#### 5.1 GFN Binary Input Protocol +```rust +// src/input/protocol.rs +// Ported from native/input.rs with full protocol support + +pub const INPUT_HEARTBEAT: u32 = 2; +pub const INPUT_KEY_UP: u32 = 3; +pub const INPUT_KEY_DOWN: u32 = 4; +pub const INPUT_MOUSE_ABS: u32 = 5; +pub const INPUT_MOUSE_REL: u32 = 7; +pub const INPUT_MOUSE_BUTTON_DOWN: u32 = 8; +pub const INPUT_MOUSE_BUTTON_UP: u32 = 9; +pub const INPUT_MOUSE_WHEEL: u32 = 10; + +pub struct InputEncoder { + protocol_version: u8, + stream_start_time: Instant, +} + +impl InputEncoder { + pub fn encode(&self, event: &InputEvent) -> Vec { + let mut buf = BytesMut::with_capacity(32); + + match event { + InputEvent::MouseMove { dx, dy } => { + // Type 7 (Mouse Relative): 22 bytes + // [type 4B LE][dx 2B BE][dy 2B BE][reserved 6B][timestamp 8B BE] + buf.put_u32_le(INPUT_MOUSE_REL); + buf.put_i16(*dx); // BE + buf.put_i16(*dy); // BE + buf.put_u16(0); // Reserved + buf.put_u32(0); // Reserved + buf.put_u64(self.timestamp_us()); + } + InputEvent::KeyDown { scancode, modifiers } => { + // Type 4 (Key Down): 18 bytes + // [type 4B LE][keycode 2B BE][modifiers 2B BE][scancode 2B BE][timestamp 8B BE] + buf.put_u32_le(INPUT_KEY_DOWN); + buf.put_u16(0); // Keycode (unused) + buf.put_u16(*modifiers); + buf.put_u16(*scancode); + buf.put_u64(self.timestamp_us()); + } + // ... other event types + } + + // Protocol v3+ requires header wrapper + if self.protocol_version > 2 { + let mut final_buf = BytesMut::with_capacity(10 + buf.len()); + final_buf.put_u8(0x23); // Header marker + final_buf.put_u64(self.timestamp_us()); + final_buf.put_u8(0x22); // Single event wrapper + final_buf.extend_from_slice(&buf); + final_buf.to_vec() + } else { + buf.to_vec() + } + } + + fn timestamp_us(&self) -> u64 { + self.stream_start_time.elapsed().as_micros() as u64 + } +} +``` + +#### 5.2 Windows Input (Raw Input + Cursor Clip) +```rust +// src/input/windows.rs + +use windows::Win32::UI::Input::*; +use windows::Win32::UI::WindowsAndMessaging::*; + +pub struct WindowsInputHandler { + hwnd: HWND, + cursor_captured: bool, + accumulated_dx: AtomicI32, + accumulated_dy: AtomicI32, +} + +impl WindowsInputHandler { + pub fn capture_cursor(&mut self) -> Result<()> { + unsafe { + // Register for raw input (high-frequency mouse) + let rid = RAWINPUTDEVICE { + usUsagePage: 0x01, // Generic Desktop + usUsage: 0x02, // Mouse + dwFlags: RIDEV_INPUTSINK, + hwndTarget: self.hwnd, + }; + RegisterRawInputDevices(&[rid], std::mem::size_of::() as u32)?; + + // Clip cursor to window + let mut rect = RECT::default(); + GetClientRect(self.hwnd, &mut rect)?; + ClientToScreen(self.hwnd, &mut rect as *mut _ as *mut POINT)?; + ClipCursor(Some(&rect))?; + + // Hide cursor + ShowCursor(false); + + self.cursor_captured = true; + } + Ok(()) + } + + pub fn process_raw_input(&self, raw: &RAWINPUT) -> Option { + if raw.header.dwType == RIM_TYPEMOUSE as u32 { + let mouse = unsafe { raw.data.mouse }; + + // Accumulate deltas (for high-frequency polling) + self.accumulated_dx.fetch_add(mouse.lLastX, Ordering::Relaxed); + self.accumulated_dy.fetch_add(mouse.lLastY, Ordering::Relaxed); + + Some(InputEvent::MouseMove { + dx: mouse.lLastX as i16, + dy: mouse.lLastY as i16, + }) + } else { + None + } + } + + pub fn release_cursor(&mut self) { + unsafe { + ClipCursor(None); + ShowCursor(true); + self.cursor_captured = false; + } + } +} +``` + +#### 5.3 macOS Input (CGEvent + Quartz) +```rust +// src/input/macos.rs + +use core_graphics::event::*; +use core_graphics::display::*; + +pub struct MacOSInputHandler { + event_tap: CFMachPortRef, + run_loop_source: CFRunLoopSourceRef, + cursor_captured: bool, + center_x: f64, + center_y: f64, +} + +impl MacOSInputHandler { + pub fn capture_cursor(&mut self, window_bounds: CGRect) -> Result<()> { + // Calculate window center + self.center_x = window_bounds.origin.x + window_bounds.size.width / 2.0; + self.center_y = window_bounds.origin.y + window_bounds.size.height / 2.0; + + // Hide cursor + CGDisplayHideCursor(CGMainDisplayID()); + + // Warp cursor to center + CGWarpMouseCursorPosition(CGPoint { x: self.center_x, y: self.center_y }); + + // Disassociate mouse and cursor (for FPS games) + CGAssociateMouseAndMouseCursorPosition(0); + + self.cursor_captured = true; + Ok(()) + } + + pub fn handle_mouse_moved(&self, event: CGEvent) -> InputEvent { + let dx = event.get_integer_value_field(CGEventField::MouseEventDeltaX); + let dy = event.get_integer_value_field(CGEventField::MouseEventDeltaY); + + InputEvent::MouseMove { + dx: dx as i16, + dy: dy as i16, + } + } + + pub fn release_cursor(&mut self) { + CGDisplayShowCursor(CGMainDisplayID()); + CGAssociateMouseAndMouseCursorPosition(1); + self.cursor_captured = false; + } +} +``` + +#### 5.4 Linux Input (evdev/libinput) +```rust +// src/input/linux.rs + +use evdev::{Device, InputEventKind, RelativeAxisType}; + +pub struct LinuxInputHandler { + mouse_device: Option, + cursor_captured: bool, +} + +impl LinuxInputHandler { + pub fn new() -> Result { + // Find mouse device + let mouse = evdev::enumerate() + .filter_map(|(_, device)| { + if device.supported_relative_axes().map_or(false, |axes| { + axes.contains(RelativeAxisType::REL_X) && axes.contains(RelativeAxisType::REL_Y) + }) { + Some(device) + } else { + None + } + }) + .next(); + + Ok(Self { + mouse_device: mouse, + cursor_captured: false, + }) + } + + pub fn capture_cursor(&mut self, window: &Window) -> Result<()> { + // Grab mouse device exclusively + if let Some(ref mut device) = self.mouse_device { + device.grab()?; + } + + // Use XGrabPointer for X11 or zwp_pointer_constraints for Wayland + // Hide cursor + + self.cursor_captured = true; + Ok(()) + } + + pub fn poll_events(&mut self) -> Vec { + let mut events = Vec::new(); + + if let Some(ref mut device) = self.mouse_device { + for ev in device.fetch_events().ok().into_iter().flatten() { + match ev.kind() { + InputEventKind::RelAxis(axis) => { + match axis { + RelativeAxisType::REL_X => { + events.push(InputEvent::MouseMove { + dx: ev.value() as i16, + dy: 0, + }); + } + RelativeAxisType::REL_Y => { + events.push(InputEvent::MouseMove { + dx: 0, + dy: ev.value() as i16, + }); + } + _ => {} + } + } + _ => {} + } + } + } + + events + } +} +``` + +### Phase 6: GUI & Stats Panel (Week 6) + +#### 6.1 Stats Panel (Bottom-Left) +```rust +// src/gui/stats_panel.rs + +pub struct StatsPanel { + visible: bool, + position: StatsPosition, // TopLeft, TopRight, BottomLeft, BottomRight + stats: StreamStats, +} + +#[derive(Default)] +pub struct StreamStats { + pub resolution: String, // "1920x1080" + pub fps: f32, // Current FPS + pub target_fps: u32, // Target FPS + pub bitrate_mbps: f32, // Video bitrate + pub latency_ms: f32, // Network latency + pub decode_time_ms: f32, // Frame decode time + pub render_time_ms: f32, // Frame render time + pub codec: String, // "H.264" / "H.265" / "AV1" + pub gpu_type: String, // "RTX 4080" etc + pub server_region: String, // "EU West" + pub packet_loss: f32, // % + pub jitter_ms: f32, +} + +impl StatsPanel { + pub fn render(&self, ctx: &egui::Context) { + if !self.visible { + return; + } + + let anchor = match self.position { + StatsPosition::BottomLeft => egui::Align2::LEFT_BOTTOM, + StatsPosition::BottomRight => egui::Align2::RIGHT_BOTTOM, + StatsPosition::TopLeft => egui::Align2::LEFT_TOP, + StatsPosition::TopRight => egui::Align2::RIGHT_TOP, + }; + + egui::Area::new("stats_panel") + .anchor(anchor, [10.0, -10.0]) + .show(ctx, |ui| { + ui.style_mut().override_font_id = Some(egui::FontId::monospace(12.0)); + + egui::Frame::none() + .fill(egui::Color32::from_rgba_unmultiplied(0, 0, 0, 180)) + .rounding(4.0) + .inner_margin(8.0) + .show(ui, |ui| { + ui.colored_label(egui::Color32::WHITE, format!( + "{} @ {} fps", self.stats.resolution, self.stats.fps as u32 + )); + ui.colored_label(egui::Color32::LIGHT_GRAY, format!( + "{} • {:.1} Mbps", self.stats.codec, self.stats.bitrate_mbps + )); + ui.colored_label(egui::Color32::LIGHT_GRAY, format!( + "Latency: {:.0} ms • Loss: {:.1}%", + self.stats.latency_ms, self.stats.packet_loss + )); + ui.colored_label(egui::Color32::LIGHT_GRAY, format!( + "Decode: {:.1} ms • Render: {:.1} ms", + self.stats.decode_time_ms, self.stats.render_time_ms + )); + ui.colored_label(egui::Color32::DARK_GRAY, format!( + "{} • {}", self.stats.gpu_type, self.stats.server_region + )); + }); + }); + } +} +``` + +#### 6.2 Window Management +```rust +// src/gui/window.rs + +pub struct MainWindow { + window: winit::window::Window, + surface: wgpu::Surface, + device: wgpu::Device, + queue: wgpu::Queue, + fullscreen: bool, +} + +impl MainWindow { + pub fn new(event_loop: &EventLoop<()>) -> Result { + let window = WindowBuilder::new() + .with_title("OpenNow Streamer") + .with_inner_size(LogicalSize::new(1920.0, 1080.0)) + .with_resizable(true) + .build(event_loop)?; + + // Set up wgpu surface + let instance = wgpu::Instance::default(); + let surface = instance.create_surface(&window)?; + + let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::HighPerformance, + compatible_surface: Some(&surface), + force_fallback_adapter: false, + })).ok_or(anyhow!("No suitable GPU adapter"))?; + + let (device, queue) = pollster::block_on(adapter.request_device( + &wgpu::DeviceDescriptor::default(), + None, + ))?; + + Ok(Self { window, surface, device, queue, fullscreen: false }) + } + + pub fn toggle_fullscreen(&mut self) { + self.fullscreen = !self.fullscreen; + self.window.set_fullscreen(if self.fullscreen { + Some(winit::window::Fullscreen::Borderless(None)) + } else { + None + }); + } +} +``` + +--- + +## Performance Optimizations + +### 1. Low-Latency Video Pipeline +``` +RTP Packet → Zero-Copy Depacketize → HW Decode → Direct GPU Upload + ↓ + Ring buffer (3 frames) + ↓ + Present with minimal vsync delay +``` + +### 2. Input Optimizations +- **Windows**: Raw Input API at 1000Hz polling +- **macOS**: CGEvent tap with disassociated cursor +- **Linux**: evdev with exclusive grab + +### 3. Memory Optimizations +- Pre-allocated frame buffers +- Ring buffer for decoded frames +- Zero-copy where possible + +### 4. Thread Architecture +``` +Main Thread: Window events, rendering +Decode Thread: Video decoding (FFmpeg) +Audio Thread: Audio decode + playback +Network Thread: WebRTC, signaling +Input Thread: High-frequency input polling (Windows) +``` + +--- + +## Build & Distribution + +### Cross-Compilation + +```bash +# Windows (MSVC) +cargo build --release --target x86_64-pc-windows-msvc + +# macOS (Universal) +cargo build --release --target aarch64-apple-darwin +cargo build --release --target x86_64-apple-darwin +lipo -create -output target/opennow-streamer \ + target/aarch64-apple-darwin/release/opennow-streamer \ + target/x86_64-apple-darwin/release/opennow-streamer + +# Linux +cargo build --release --target x86_64-unknown-linux-gnu +``` + +### FFmpeg Bundling +- Windows: Bundle ffmpeg.dll (or statically link) +- macOS: Bundle dylibs or use VideoToolbox +- Linux: Require libffmpeg as system dependency + +--- + +## Testing Strategy + +1. **Unit Tests**: Input encoding, SDP parsing, RTP depacketization +2. **Integration Tests**: WebRTC connection with mock server +3. **Manual Tests**: Real GFN server connection +4. **Performance Tests**: Frame latency, input latency, CPU/GPU usage + +--- + +## Timeline Summary + +| Phase | Duration | Deliverables | +|-------|----------|--------------| +| 1. Core | Week 1 | Project setup, config, auth | +| 2. WebRTC | Week 2 | Signaling, peer connection, SDP | +| 3. Video | Week 3 | RTP, FFmpeg decode, GPU render | +| 4. Audio | Week 4 | Opus decode, cpal playback | +| 5. Input | Week 5 | Platform-native capture | +| 6. GUI | Week 6 | Stats panel, fullscreen, polish | + +--- + +## Next Steps + +1. **Approve this plan** or suggest modifications +2. **Start with Phase 1**: Create project structure +3. **Iterate**: Build incrementally, test each component diff --git a/opennow-streamer/src/api/cloudmatch.rs b/opennow-streamer/src/api/cloudmatch.rs new file mode 100644 index 0000000..51975f7 --- /dev/null +++ b/opennow-streamer/src/api/cloudmatch.rs @@ -0,0 +1,465 @@ +//! CloudMatch Session API +//! +//! Create and manage GFN streaming sessions. + +use anyhow::{Result, Context}; +use log::{info, debug, warn}; + +use crate::app::session::*; +use crate::app::Settings; +use crate::auth; +use crate::utils::generate_uuid; +use super::GfnApiClient; + +/// GFN client version +const GFN_CLIENT_VERSION: &str = "2.0.80.173"; + +/// User-Agent for native client +const GFN_USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173"; + +/// Build CloudMatch zone URL +fn cloudmatch_zone_url(zone: &str) -> String { + format!("https://{}.cloudmatchbeta.nvidiagrid.net", zone) +} + +impl GfnApiClient { + /// Request a new streaming session using browser-compatible format + pub async fn create_session( + &self, + app_id: &str, + game_title: &str, + settings: &Settings, + zone: &str, + ) -> Result { + let token = self.token() + .context("No access token")?; + + let device_id = generate_uuid(); + let client_id = generate_uuid(); + let sub_session_id = generate_uuid(); + + let (width, height) = settings.resolution_tuple(); + + // Get timezone offset in milliseconds + let timezone_offset_ms = chrono::Local::now() + .offset() + .local_minus_utc() as i64 * 1000; + + // Build browser-compatible request + let request = CloudMatchRequest { + session_request_data: SessionRequestData { + app_id: app_id.to_string(), // STRING format + internal_title: Some(game_title.to_string()), + available_supported_controllers: vec![], + network_test_session_id: None, + parent_session_id: None, + client_identification: "GFN-PC".to_string(), + device_hash_id: device_id.clone(), + client_version: "30.0".to_string(), + sdk_version: "1.0".to_string(), + streamer_version: 1, // NUMBER format + client_platform_name: "windows".to_string(), + client_request_monitor_settings: vec![MonitorSettings { + width_in_pixels: width, + height_in_pixels: height, + frames_per_second: settings.fps, + sdr_hdr_mode: 0, + display_data: DisplayData { + desired_content_max_luminance: 0, + desired_content_min_luminance: 0, + desired_content_max_frame_average_luminance: 0, + }, + dpi: 100, + }], + use_ops: true, + audio_mode: 2, // 5.1 surround + meta_data: vec![ + MetaDataEntry { key: "SubSessionId".to_string(), value: sub_session_id }, + MetaDataEntry { key: "wssignaling".to_string(), value: "1".to_string() }, + MetaDataEntry { key: "GSStreamerType".to_string(), value: "WebRTC".to_string() }, + MetaDataEntry { key: "networkType".to_string(), value: "Unknown".to_string() }, + MetaDataEntry { key: "ClientImeSupport".to_string(), value: "0".to_string() }, + MetaDataEntry { + key: "clientPhysicalResolution".to_string(), + value: format!("{{\"horizontalPixels\":{},\"verticalPixels\":{}}}", width, height) + }, + MetaDataEntry { key: "surroundAudioInfo".to_string(), value: "2".to_string() }, + ], + sdr_hdr_mode: 0, + client_display_hdr_capabilities: None, + surround_audio_info: 0, + remote_controllers_bitmap: 0, + client_timezone_offset: timezone_offset_ms, + enhanced_stream_mode: 1, + app_launch_mode: 1, + secure_rtsp_supported: false, + partner_custom_data: Some("".to_string()), + account_linked: true, + enable_persisting_in_game_settings: true, + user_age: 26, + requested_streaming_features: Some(StreamingFeatures { + reflex: settings.fps >= 120, // Enable Reflex for high refresh rate + bit_depth: 0, + cloud_gsync: false, + enabled_l4s: false, + mouse_movement_flags: 0, + true_hdr: false, + supported_hid_devices: 0, + profile: 0, + fallback_to_logical_resolution: false, + hid_devices: None, + chroma_format: 0, + prefilter_mode: 0, + prefilter_sharpness: 0, + prefilter_noise_reduction: 0, + hud_streaming_mode: 0, + }), + }, + }; + + // Check if we're using an Alliance Partner + let streaming_base_url = auth::get_streaming_base_url(); + let is_alliance_partner = !streaming_base_url.contains("cloudmatchbeta.nvidiagrid.net"); + + // Build session URL + let url = if is_alliance_partner { + let base = streaming_base_url.trim_end_matches('/'); + format!("{}/v2/session?keyboardLayout=en-US&languageCode=en_US", base) + } else { + format!( + "{}/v2/session?keyboardLayout=en-US&languageCode=en_US", + cloudmatch_zone_url(zone) + ) + }; + + info!("Creating session at: {}", url); + debug!("App ID: {}, Title: {}", app_id, game_title); + + let response = self.client.post(&url) + .header("User-Agent", GFN_USER_AGENT) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Content-Type", "application/json") + .header("Origin", "https://play.geforcenow.com") + .header("Referer", "https://play.geforcenow.com/") + // NV-* headers + .header("nv-browser-type", "CHROME") + .header("nv-client-id", &client_id) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-device-make", "UNKNOWN") + .header("nv-device-model", "UNKNOWN") + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .header("x-device-id", &device_id) + .json(&request) + .send() + .await + .context("Session request failed")?; + + let status = response.status(); + let response_text = response.text().await + .context("Failed to read response")?; + + debug!("CloudMatch response ({} bytes): {}", + response_text.len(), + &response_text[..response_text.len().min(500)]); + + if !status.is_success() { + return Err(anyhow::anyhow!("CloudMatch request failed: {} - {}", + status, &response_text[..response_text.len().min(200)])); + } + + let api_response: CloudMatchResponse = serde_json::from_str(&response_text) + .context("Failed to parse CloudMatch response")?; + + if api_response.request_status.status_code != 1 { + let error_desc = api_response.request_status.status_description + .unwrap_or_else(|| "Unknown error".to_string()); + return Err(anyhow::anyhow!("CloudMatch error: {} (code: {}, unified: {})", + error_desc, + api_response.request_status.status_code, + api_response.request_status.unified_error_code)); + } + + let session_data = api_response.session; + info!("Session allocated: {} (status: {})", session_data.session_id, session_data.status); + + // Determine session state + let state = Self::parse_session_state(&session_data); + + // Extract connection info + let server_ip = session_data.streaming_server_ip().unwrap_or_default(); + let signaling_path = session_data.signaling_url(); + + // Build full signaling URL + let signaling_url = signaling_path.map(|path| { + if path.starts_with("wss://") || path.starts_with("rtsps://") { + // Already a full URL + Self::build_signaling_url(&path, &server_ip) + } else if path.starts_with('/') { + // Path like /nvst/ + format!("wss://{}:443{}", server_ip, path) + } else { + format!("wss://{}:443/nvst/", server_ip) + } + }).or_else(|| { + if !server_ip.is_empty() { + Some(format!("wss://{}:443/nvst/", server_ip)) + } else { + None + } + }); + + info!("Stream server: {}, signaling: {:?}", server_ip, signaling_url); + + // Extract ICE servers and media info before moving other fields + let ice_servers = session_data.ice_servers(); + let media_connection_info = session_data.media_connection_info(); + + // Debug: log connection info + if let Some(ref conns) = session_data.connection_info { + for conn in conns { + info!("ConnectionInfo: ip={:?} port={} usage={} protocol={}", + conn.ip, conn.port, conn.usage, conn.protocol); + } + } else { + info!("No connection_info in session response"); + } + info!("Media connection info: {:?}", media_connection_info); + + Ok(SessionInfo { + session_id: session_data.session_id, + server_ip, + zone: zone.to_string(), + state, + gpu_type: session_data.gpu_type, + signaling_url, + ice_servers, + media_connection_info, + }) + } + + /// Build signaling WebSocket URL from raw path/URL + fn build_signaling_url(raw: &str, server_ip: &str) -> String { + if raw.starts_with("rtsps://") || raw.starts_with("rtsp://") { + // Extract hostname from RTSP URL + let host = raw + .strip_prefix("rtsps://") + .or_else(|| raw.strip_prefix("rtsp://")) + .and_then(|s| s.split(':').next()) + .filter(|h| !h.is_empty() && !h.starts_with('.')); + + if let Some(h) = host { + format!("wss://{}/nvst/", h) + } else { + // Malformed URL, use server IP + format!("wss://{}:443/nvst/", server_ip) + } + } else if raw.starts_with("wss://") { + raw.to_string() + } else if raw.starts_with('/') { + format!("wss://{}:443{}", server_ip, raw) + } else { + format!("wss://{}:443/nvst/", server_ip) + } + } + + /// Poll session status until ready + pub async fn poll_session( + &self, + session_id: &str, + zone: &str, + server_ip: Option<&str>, + ) -> Result { + let token = self.token() + .context("No access token")?; + + let device_id = generate_uuid(); + let client_id = generate_uuid(); + + // Check if we're using an Alliance Partner + let streaming_base_url = auth::get_streaming_base_url(); + let is_alliance_partner = !streaming_base_url.contains("cloudmatchbeta.nvidiagrid.net"); + + // Build polling URL - prefer server IP if available + let poll_base = if is_alliance_partner { + streaming_base_url.trim_end_matches('/').to_string() + } else if let Some(ip) = server_ip { + format!("https://{}", ip) + } else { + cloudmatch_zone_url(zone) + }; + + let url = format!("{}/v2/session/{}", poll_base, session_id); + + debug!("Polling session at: {}", url); + + let response = self.client.get(&url) + .header("User-Agent", GFN_USER_AGENT) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Content-Type", "application/json") + // NV-* headers + .header("nv-client-id", &client_id) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .header("x-device-id", &device_id) + .send() + .await + .context("Poll request failed")?; + + if !response.status().is_success() { + let status = response.status(); + let body = response.text().await.unwrap_or_default(); + return Err(anyhow::anyhow!("Poll failed: {} - {}", status, body)); + } + + let response_text = response.text().await + .context("Failed to read poll response")?; + + let poll_response: CloudMatchResponse = serde_json::from_str(&response_text) + .context("Failed to parse poll response")?; + + if poll_response.request_status.status_code != 1 { + let error = poll_response.request_status.status_description + .unwrap_or_else(|| "Unknown error".to_string()); + return Err(anyhow::anyhow!("Session poll error: {}", error)); + } + + let session_data = poll_response.session; + let state = Self::parse_session_state(&session_data); + + let server_ip = session_data.streaming_server_ip().unwrap_or_default(); + let signaling_path = session_data.signaling_url(); + + // Build full signaling URL + let signaling_url = signaling_path.map(|path| { + Self::build_signaling_url(&path, &server_ip) + }).or_else(|| { + if !server_ip.is_empty() { + Some(format!("wss://{}:443/nvst/", server_ip)) + } else { + None + } + }); + + // Extract ICE servers and media info before moving other fields + let ice_servers = session_data.ice_servers(); + let media_connection_info = session_data.media_connection_info(); + + // Debug: log connection info in poll response + if let Some(ref conns) = session_data.connection_info { + for conn in conns { + info!("Poll ConnectionInfo: ip={:?} port={} usage={} protocol={}", + conn.ip, conn.port, conn.usage, conn.protocol); + } + } + if media_connection_info.is_some() { + info!("Poll media connection info: {:?}", media_connection_info); + } + + Ok(SessionInfo { + session_id: session_data.session_id, + server_ip, + zone: zone.to_string(), + state, + gpu_type: session_data.gpu_type, + signaling_url, + ice_servers, + media_connection_info, + }) + } + + /// Stop a streaming session + pub async fn stop_session( + &self, + session_id: &str, + zone: &str, + server_ip: Option<&str>, + ) -> Result<()> { + let token = self.token() + .context("No access token")?; + + let device_id = generate_uuid(); + + // Check if we're using an Alliance Partner + let streaming_base_url = auth::get_streaming_base_url(); + let is_alliance_partner = !streaming_base_url.contains("cloudmatchbeta.nvidiagrid.net"); + + // Build delete URL + let delete_base = if is_alliance_partner { + streaming_base_url.trim_end_matches('/').to_string() + } else if let Some(ip) = server_ip { + format!("https://{}", ip) + } else { + cloudmatch_zone_url(zone) + }; + + let url = format!("{}/v2/session/{}", delete_base, session_id); + + info!("Stopping session at: {}", url); + + let response = self.client.delete(&url) + .header("User-Agent", GFN_USER_AGENT) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Content-Type", "application/json") + .header("x-device-id", &device_id) + .send() + .await + .context("Stop session request failed")?; + + if !response.status().is_success() { + let status = response.status(); + let body = response.text().await.unwrap_or_default(); + warn!("Session stop returned: {} - {}", status, body); + } + + info!("Session stopped: {}", session_id); + Ok(()) + } + + /// Parse session state from CloudMatch response + fn parse_session_state(session_data: &CloudMatchSession) -> SessionState { + // Status 2 = ready for streaming + if session_data.status == 2 { + return SessionState::Ready; + } + + // Status 3 = already streaming + if session_data.status == 3 { + return SessionState::Streaming; + } + + // Check seat setup info + if let Some(ref seat_info) = session_data.seat_setup_info { + if seat_info.queue_position > 0 { + return SessionState::InQueue { + position: seat_info.queue_position as u32, + eta_secs: (seat_info.seat_setup_eta / 1000) as u32, + }; + } + if seat_info.seat_setup_step > 0 { + return SessionState::Launching; + } + } + + // Status 1 = setting up + if session_data.status == 1 { + return SessionState::Launching; + } + + // Error states + if session_data.status <= 0 || session_data.error_code != 0 { + return SessionState::Error(format!( + "Error code: {} (status: {})", + session_data.error_code, + session_data.status + )); + } + + SessionState::Launching + } +} diff --git a/opennow-streamer/src/api/games.rs b/opennow-streamer/src/api/games.rs new file mode 100644 index 0000000..3228924 --- /dev/null +++ b/opennow-streamer/src/api/games.rs @@ -0,0 +1,559 @@ +//! Games Library API +//! +//! Fetch and search GFN game catalog using GraphQL. + +use anyhow::{Result, Context}; +use log::{info, debug, warn}; +use serde::Deserialize; +use std::time::{SystemTime, UNIX_EPOCH}; + +use crate::app::GameInfo; +use crate::auth; +use super::GfnApiClient; + +/// GraphQL endpoint +const GRAPHQL_URL: &str = "https://games.geforce.com/graphql"; + +/// Persisted query hash for panels (MAIN, LIBRARY, etc.) +const PANELS_QUERY_HASH: &str = "f8e26265a5db5c20e1334a6872cf04b6e3970507697f6ae55a6ddefa5420daf0"; + +/// GFN CEF User-Agent +const GFN_USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173"; + +/// Default VPC ID for general access (from GFN config) +const DEFAULT_VPC_ID: &str = "GFN-PC"; + +/// Default locale +const DEFAULT_LOCALE: &str = "en_US"; + +/// LCARS Client ID +const LCARS_CLIENT_ID: &str = "ec7e38d4-03af-4b58-b131-cfb0495903ab"; + +/// GFN client version +const GFN_CLIENT_VERSION: &str = "2.0.80.173"; + +// ============================================ +// GraphQL Response Types (matching Tauri client) +// ============================================ + +#[derive(Debug, Deserialize)] +struct GraphQLResponse { + data: Option, + errors: Option>, +} + +#[derive(Debug, Deserialize)] +struct GraphQLError { + message: String, +} + +#[derive(Debug, Deserialize)] +struct PanelsData { + panels: Vec, +} + +#[derive(Debug, Deserialize)] +struct Panel { + #[allow(dead_code)] + id: Option, + name: String, + #[serde(default)] + sections: Vec, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct PanelSection { + #[allow(dead_code)] + #[serde(default)] + id: Option, + #[allow(dead_code)] + #[serde(default)] + title: Option, + #[serde(default)] + items: Vec, +} + +/// Panel items are tagged by __typename +#[derive(Debug, Deserialize)] +#[serde(tag = "__typename")] +enum PanelItem { + GameItem { app: AppData }, + #[serde(other)] + Other, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct AppData { + id: String, + title: String, + #[serde(default)] + images: Option, + #[serde(default)] + variants: Option>, + #[serde(default)] + gfn: Option, +} + +/// Image URLs from GraphQL +#[derive(Debug, Deserialize)] +struct AppImages { + #[serde(rename = "GAME_BOX_ART")] + game_box_art: Option, + #[serde(rename = "TV_BANNER")] + tv_banner: Option, + #[serde(rename = "HERO_IMAGE")] + hero_image: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct AppVariant { + id: String, + app_store: String, + #[serde(default)] + supported_controls: Option>, + #[serde(default)] + gfn: Option, +} + +#[derive(Debug, Deserialize)] +struct VariantGfnStatus { + #[serde(default)] + status: Option, + #[serde(default)] + library: Option, +} + +#[derive(Debug, Deserialize)] +struct VariantLibraryStatus { + #[serde(default)] + selected: Option, + #[serde(default)] + installed: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct AppGfnStatus { + #[serde(default)] + playability_state: Option, +} + +// ============================================ +// Raw game data from static JSON +// ============================================ + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct RawGameInfo { + /// Game ID (numeric in public list) + #[serde(default)] + id: Option, + /// Game title + #[serde(default)] + title: Option, + /// Publisher name + #[serde(default)] + publisher: Option, + /// Store type (Steam, Epic, etc.) + #[serde(default)] + store: Option, + /// Steam URL (contains app ID) + #[serde(default)] + steam_url: Option, + /// Epic URL + #[serde(default)] + epic_url: Option, + /// Status (AVAILABLE, etc.) + #[serde(default)] + status: Option, + /// Genres + #[serde(default)] + genres: Vec, +} + +/// Generate a random huId for GraphQL requests +fn generate_hu_id() -> String { + let timestamp = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap_or_default() + .as_nanos(); + format!("{:x}", timestamp) +} + +/// Optimize image URL with webp format and size +fn optimize_image_url(url: &str, width: u32) -> String { + if url.contains("img.nvidiagrid.net") { + format!("{};f=webp;w={}", url, width) + } else { + url.to_string() + } +} + +impl GfnApiClient { + /// Fetch panels using persisted query (GET request) + /// This is the correct way to fetch from GFN API + async fn fetch_panels(&self, panel_names: &[&str], vpc_id: &str) -> Result> { + let token = self.token() + .context("No access token for panel fetch")?; + + let variables = serde_json::json!({ + "vpcId": vpc_id, + "locale": DEFAULT_LOCALE, + "panelNames": panel_names, + }); + + let extensions = serde_json::json!({ + "persistedQuery": { + "sha256Hash": PANELS_QUERY_HASH + } + }); + + // Build request type based on panel names + let request_type = if panel_names.contains(&"LIBRARY") { + "panels/Library" + } else { + "panels/MainV2" + }; + + let variables_str = serde_json::to_string(&variables) + .context("Failed to serialize variables")?; + let extensions_str = serde_json::to_string(&extensions) + .context("Failed to serialize extensions")?; + + let hu_id = generate_hu_id(); + + // Build URL with all required parameters + let url = format!( + "{}?requestType={}&extensions={}&huId={}&variables={}", + GRAPHQL_URL, + urlencoding::encode(request_type), + urlencoding::encode(&extensions_str), + urlencoding::encode(&hu_id), + urlencoding::encode(&variables_str) + ); + + debug!("Fetching panels from: {}", url); + + let response = self.client + .get(&url) + .header("User-Agent", GFN_USER_AGENT) + .header("Accept", "application/json, text/plain, */*") + .header("Content-Type", "application/graphql") + .header("Origin", "https://play.geforcenow.com") + .header("Referer", "https://play.geforcenow.com/") + .header("Authorization", format!("GFNJWT {}", token)) + // GFN client headers (native client) + .header("nv-client-id", LCARS_CLIENT_ID) + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .header("nv-device-make", "UNKNOWN") + .header("nv-device-model", "UNKNOWN") + .header("nv-browser-type", "CHROME") + .send() + .await + .context("Panel fetch request failed")?; + + let status = response.status(); + if !status.is_success() { + let body = response.text().await.unwrap_or_default(); + return Err(anyhow::anyhow!("Panel fetch failed: {} - {}", status, body)); + } + + let body_text = response.text().await + .context("Failed to read panel response")?; + + debug!("Panel response (first 500 chars): {}", &body_text[..body_text.len().min(500)]); + + let graphql_response: GraphQLResponse = serde_json::from_str(&body_text) + .context(format!("Failed to parse panel response: {}", &body_text[..body_text.len().min(200)]))?; + + if let Some(errors) = graphql_response.errors { + if !errors.is_empty() { + let error_msg = errors.iter().map(|e| e.message.clone()).collect::>().join(", "); + return Err(anyhow::anyhow!("GraphQL errors: {}", error_msg)); + } + } + + Ok(graphql_response.data + .map(|d| d.panels) + .unwrap_or_default()) + } + + /// Convert AppData to GameInfo + fn app_to_game_info(app: AppData) -> GameInfo { + // Find selected variant (the one marked as selected, or first available) + let selected_variant = app.variants.as_ref() + .and_then(|vars| vars.iter().find(|v| { + v.gfn.as_ref() + .and_then(|g| g.library.as_ref()) + .and_then(|l| l.selected) + .unwrap_or(false) + })) + .or_else(|| app.variants.as_ref().and_then(|v| v.first())); + + let store = selected_variant + .map(|v| v.app_store.clone()) + .unwrap_or_else(|| "Unknown".to_string()); + + // Use variant ID for launching (e.g., "102217611") + let variant_id = selected_variant + .map(|v| v.id.clone()) + .unwrap_or_default(); + + // Parse app_id from variant ID (may be numeric) + let app_id = variant_id.parse::().ok(); + + // Optimize image URLs (272px width for cards, webp format) + // Prefer GAME_BOX_ART over TV_BANNER for better quality box art + let image_url = app.images.as_ref() + .and_then(|i| i.game_box_art.as_ref().or(i.tv_banner.as_ref()).or(i.hero_image.as_ref())) + .map(|url| optimize_image_url(url, 272)); + + GameInfo { + id: if variant_id.is_empty() { app.id } else { variant_id }, + title: app.title, + publisher: None, + image_url, + store, + app_id, + } + } + + /// Fetch games from MAIN panel (GraphQL with images) + pub async fn fetch_main_games(&self, vpc_id: Option<&str>) -> Result> { + // Use provided VPC ID or fetch dynamically from serverInfo + let vpc = match vpc_id { + Some(v) => v.to_string(), + None => { + let token = self.token().map(|s| s.as_str()); + super::get_vpc_id(&self.client, token).await + } + }; + + info!("Fetching main games from GraphQL (VPC: {})", vpc); + + let panels = self.fetch_panels(&["MAIN"], &vpc).await?; + + let mut games: Vec = Vec::new(); + + for panel in panels { + info!("Panel '{}' has {} sections", panel.name, panel.sections.len()); + for section in panel.sections { + debug!("Section has {} items", section.items.len()); + for item in section.items { + if let PanelItem::GameItem { app } = item { + debug!("Found game: {} with images: {:?}", app.title, app.images.is_some()); + games.push(Self::app_to_game_info(app)); + } + } + } + } + + info!("Fetched {} games from MAIN panel", games.len()); + Ok(games) + } + + /// Fetch user's library (GraphQL) + pub async fn fetch_library(&self, vpc_id: Option<&str>) -> Result> { + // Use provided VPC ID or fetch dynamically from serverInfo + let vpc = match vpc_id { + Some(v) => v.to_string(), + None => { + let token = self.token().map(|s| s.as_str()); + super::get_vpc_id(&self.client, token).await + } + }; + + info!("Fetching library from GraphQL (VPC: {})", vpc); + + let panels = match self.fetch_panels(&["LIBRARY"], &vpc).await { + Ok(p) => p, + Err(e) => { + warn!("Library fetch failed: {}", e); + return Ok(Vec::new()); + } + }; + + let mut games: Vec = Vec::new(); + + for panel in panels { + if panel.name == "LIBRARY" { + for section in panel.sections { + for item in section.items { + if let PanelItem::GameItem { app } = item { + games.push(Self::app_to_game_info(app)); + } + } + } + } + } + + info!("Fetched {} games from LIBRARY panel", games.len()); + Ok(games) + } + + /// Fetch public games list (static JSON, no auth required) + /// Uses Steam CDN for game images when available + pub async fn fetch_public_games(&self) -> Result> { + let url = "https://static.nvidiagrid.net/supported-public-game-list/locales/gfnpc-en-US.json"; + + info!("Fetching public games from: {}", url); + + let response = self.client.get(url) + .header("User-Agent", GFN_USER_AGENT) + .send() + .await + .context("Failed to fetch games list")?; + + let text = response.text().await + .context("Failed to read games response")?; + + debug!("Fetched {} bytes of games data", text.len()); + + let raw_games: Vec = serde_json::from_str(&text) + .context("Failed to parse games JSON")?; + + let games: Vec = raw_games.into_iter() + .filter_map(|g| { + let title = g.title?; + + // Extract ID (can be number or string) + let id = match g.id { + Some(serde_json::Value::Number(n)) => n.to_string(), + Some(serde_json::Value::String(s)) => s, + _ => title.clone(), + }; + + // Extract Steam app ID from steamUrl + // Format: https://store.steampowered.com/app/123456 + let app_id = g.steam_url + .as_ref() + .and_then(|url| { + url.split("/app/") + .nth(1) + .and_then(|s| s.split('/').next()) + .and_then(|s| s.parse::().ok()) + }); + + // Skip games that aren't available + if g.status.as_deref() != Some("AVAILABLE") { + return None; + } + + // Generate image URL from Steam CDN if we have a Steam app ID + // Steam CDN provides public game art: header.jpg (460x215), library_600x900.jpg + let image_url = app_id.map(|steam_id| { + format!("https://cdn.cloudflare.steamstatic.com/steam/apps/{}/library_600x900.jpg", steam_id) + }); + + let store = g.store.unwrap_or_else(|| "Unknown".to_string()); + + Some(GameInfo { + id, + title, + publisher: g.publisher, + image_url, + store, + app_id, + }) + }) + .collect(); + + info!("Parsed {} games from public list", games.len()); + Ok(games) + } + + /// Search games by title + pub fn search_games<'a>(games: &'a [GameInfo], query: &str) -> Vec<&'a GameInfo> { + let query_lower = query.to_lowercase(); + + games.iter() + .filter(|g| g.title.to_lowercase().contains(&query_lower)) + .collect() + } +} + +/// Fetch server info to get VPC ID for current provider +pub async fn fetch_server_info(access_token: Option<&str>) -> Result { + let base_url = auth::get_streaming_base_url(); + let url = format!("{}v2/serverInfo", base_url); + + info!("Fetching server info from: {}", url); + + let client = reqwest::Client::builder() + .user_agent(GFN_USER_AGENT) + .build()?; + + let mut request = client + .get(&url) + .header("Accept", "application/json") + .header("nv-client-id", LCARS_CLIENT_ID) + .header("nv-client-type", "BROWSER") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-client-streamer", "WEBRTC") + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP"); + + if let Some(token) = access_token { + request = request.header("Authorization", format!("GFNJWT {}", token)); + } + + let response = request.send().await + .context("Server info request failed")?; + + if !response.status().is_success() { + return Err(anyhow::anyhow!("Server info failed: {}", response.status())); + } + + #[derive(Deserialize)] + #[serde(rename_all = "camelCase")] + struct ServerInfoResponse { + request_status: Option, + #[serde(default)] + meta_data: Vec, + } + + #[derive(Deserialize)] + #[serde(rename_all = "camelCase")] + struct RequestStatus { + server_id: Option, + } + + #[derive(Deserialize)] + struct MetaDataEntry { + key: String, + value: String, + } + + let server_response: ServerInfoResponse = response.json().await + .context("Failed to parse server info")?; + + let vpc_id = server_response.request_status + .and_then(|s| s.server_id) + .unwrap_or_else(|| DEFAULT_VPC_ID.to_string()); + + // Extract regions from metaData + let mut regions: Vec<(String, String)> = Vec::new(); + for meta in server_response.meta_data { + if meta.value.starts_with("https://") { + regions.push((meta.key, meta.value)); + } + } + + info!("Server info: VPC={}, {} regions", vpc_id, regions.len()); + + Ok(ServerInfo { vpc_id, regions }) +} + +/// Server info result +#[derive(Debug, Clone)] +pub struct ServerInfo { + pub vpc_id: String, + pub regions: Vec<(String, String)>, +} diff --git a/opennow-streamer/src/api/mod.rs b/opennow-streamer/src/api/mod.rs new file mode 100644 index 0000000..c7278da --- /dev/null +++ b/opennow-streamer/src/api/mod.rs @@ -0,0 +1,404 @@ +//! GFN API Client +//! +//! HTTP API interactions with GeForce NOW services. + +mod cloudmatch; +mod games; + +pub use cloudmatch::*; +pub use games::*; + +use reqwest::Client; +use parking_lot::RwLock; +use log::{info, debug, warn}; +use serde::Deserialize; + +/// Cached VPC ID from serverInfo +static CACHED_VPC_ID: RwLock> = RwLock::new(None); + +/// Server info response from /v2/serverInfo endpoint +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct ServerInfoResponse { + request_status: Option, + #[serde(default)] + meta_data: Vec, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct ServerInfoRequestStatus { + server_id: Option, +} + +#[derive(Debug, Clone, Deserialize)] +struct ServerMetaData { + key: String, + value: String, +} + +/// Dynamic server region from serverInfo API +#[derive(Debug, Clone)] +pub struct DynamicServerRegion { + pub name: String, + pub url: String, +} + +/// Get the cached VPC ID or fetch it from serverInfo +pub async fn get_vpc_id(client: &Client, token: Option<&str>) -> String { + // Check cache first + { + let cached = CACHED_VPC_ID.read(); + if let Some(vpc_id) = cached.as_ref() { + return vpc_id.clone(); + } + } + + // Fetch from serverInfo endpoint + if let Some(vpc_id) = fetch_vpc_id_from_server_info(client, token).await { + // Cache it + *CACHED_VPC_ID.write() = Some(vpc_id.clone()); + return vpc_id; + } + + // Fallback to a common European VPC + "NP-AMS-08".to_string() +} + +/// Fetch VPC ID from the /v2/serverInfo endpoint +async fn fetch_vpc_id_from_server_info(client: &Client, token: Option<&str>) -> Option { + let url = "https://prod.cloudmatchbeta.nvidiagrid.net/v2/serverInfo"; + + info!("Fetching VPC ID from serverInfo: {}", url); + + let mut request = client + .get(url) + .header("Accept", "application/json") + .header("nv-client-id", "ec7e38d4-03af-4b58-b131-cfb0495903ab") + .header("nv-client-type", "NATIVE") + .header("nv-client-version", "2.0.80.173") + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP"); + + if let Some(t) = token { + request = request.header("Authorization", format!("GFNJWT {}", t)); + } + + let response = match request.send().await { + Ok(r) => r, + Err(e) => { + warn!("Failed to fetch serverInfo: {}", e); + return None; + } + }; + + if !response.status().is_success() { + warn!("serverInfo returned status: {}", response.status()); + return None; + } + + let body = match response.text().await { + Ok(b) => b, + Err(e) => { + warn!("Failed to read serverInfo body: {}", e); + return None; + } + }; + + debug!("serverInfo response: {}", &body[..body.len().min(500)]); + + let info: ServerInfoResponse = match serde_json::from_str(&body) { + Ok(i) => i, + Err(e) => { + warn!("Failed to parse serverInfo: {}", e); + return None; + } + }; + + let vpc_id = info.request_status + .and_then(|s| s.server_id); + + info!("Discovered VPC ID: {:?}", vpc_id); + vpc_id +} + +/// Clear the cached VPC ID (call on logout) +pub fn clear_vpc_cache() { + *CACHED_VPC_ID.write() = None; +} + +/// Fetch dynamic server regions from the /v2/serverInfo endpoint +/// Uses the selected provider's streaming URL (supports Alliance partners) +/// Returns regions discovered from metaData with their streaming URLs +pub async fn fetch_dynamic_regions(client: &Client, token: Option<&str>) -> Vec { + use crate::auth; + + // Get the base URL from the selected provider (Alliance partners have different URLs) + let base_url = auth::get_streaming_base_url(); + let url = format!("{}v2/serverInfo", base_url); + + info!("[serverInfo] Fetching dynamic regions from: {}", url); + + let mut request = client + .get(&url) + .header("Accept", "application/json") + .header("nv-client-id", "ec7e38d4-03af-4b58-b131-cfb0495903ab") + .header("nv-client-type", "BROWSER") + .header("nv-client-version", "2.0.80.173") + .header("nv-client-streamer", "WEBRTC") + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP"); + + if let Some(t) = token { + request = request.header("Authorization", format!("GFNJWT {}", t)); + } + + let response = match request.send().await { + Ok(r) => r, + Err(e) => { + warn!("[serverInfo] Failed to fetch: {}", e); + return Vec::new(); + } + }; + + if !response.status().is_success() { + warn!("[serverInfo] Returned status: {}", response.status()); + return Vec::new(); + } + + let body = match response.text().await { + Ok(b) => b, + Err(e) => { + warn!("[serverInfo] Failed to read body: {}", e); + return Vec::new(); + } + }; + + let info: ServerInfoResponse = match serde_json::from_str(&body) { + Ok(i) => i, + Err(e) => { + warn!("[serverInfo] Failed to parse: {}", e); + return Vec::new(); + } + }; + + // Extract regions from metaData + // Format: key="REGION NAME", value="https://region-url.domain.net" + // For NVIDIA: URLs contain "nvidiagrid.net" + // For Alliance partners: URLs may have different domains + let mut regions: Vec = Vec::new(); + + for meta in &info.meta_data { + // Skip special keys like "gfn-regions" + if meta.key == "gfn-regions" || meta.key.starts_with("gfn-") { + continue; + } + + // Include entries where value is a streaming URL (https://) + // Don't filter by domain - Alliance partners have different domains + if meta.value.starts_with("https://") { + regions.push(DynamicServerRegion { + name: meta.key.clone(), + url: meta.value.clone(), + }); + } + } + + info!("[serverInfo] Found {} zones from API", regions.len()); + + // Also cache the VPC ID if available + if let Some(vpc_id) = info.request_status.and_then(|s| s.server_id) { + info!("[serverInfo] Discovered VPC ID: {}", vpc_id); + *CACHED_VPC_ID.write() = Some(vpc_id); + } + + regions +} + +/// HTTP client wrapper for GFN APIs +pub struct GfnApiClient { + client: Client, + access_token: Option, +} + +impl GfnApiClient { + /// Create a new API client + pub fn new() -> Self { + let client = Client::builder() + .danger_accept_invalid_certs(true) // GFN servers may have self-signed certs + .gzip(true) + .build() + .expect("Failed to create HTTP client"); + + Self { + client, + access_token: None, + } + } + + /// Set the access token for authenticated requests + pub fn set_access_token(&mut self, token: String) { + self.access_token = Some(token); + } + + /// Get the HTTP client + pub fn client(&self) -> &Client { + &self.client + } + + /// Get the access token + pub fn token(&self) -> Option<&String> { + self.access_token.as_ref() + } +} + +impl Default for GfnApiClient { + fn default() -> Self { + Self::new() + } +} + +/// Common headers for GFN API requests +pub fn gfn_headers() -> Vec<(&'static str, &'static str)> { + vec![ + ("nv-browser-type", "CHROME"), + ("nv-client-streamer", "NVIDIA-CLASSIC"), + ("nv-client-type", "NATIVE"), + ("nv-client-version", "2.0.80.173"), + ("nv-device-os", "WINDOWS"), + ("nv-device-type", "DESKTOP"), + ] +} + +/// MES (Membership/Subscription) API URL +const MES_URL: &str = "https://mes.geforcenow.com/v4/subscriptions"; + +/// LCARS Client ID +const LCARS_CLIENT_ID: &str = "ec7e38d4-03af-4b58-b131-cfb0495903ab"; + +/// GFN client version +const GFN_CLIENT_VERSION: &str = "2.0.80.173"; + +/// Subscription response from MES API +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct SubscriptionResponse { + #[serde(default = "default_tier")] + membership_tier: String, + remaining_time_in_minutes: Option, + total_time_in_minutes: Option, + #[serde(default)] + addons: Vec, +} + +fn default_tier() -> String { + "FREE".to_string() +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct SubscriptionAddon { + #[serde(rename = "type")] + addon_type: Option, + sub_type: Option, + #[serde(default)] + attributes: Vec, + status: Option, +} + +#[derive(Debug, Deserialize)] +struct AddonAttribute { + key: Option, + #[serde(rename = "textValue")] + text_value: Option, +} + +/// Fetch subscription info from MES API +pub async fn fetch_subscription(token: &str, user_id: &str) -> Result { + let client = Client::builder() + .gzip(true) + .build() + .map_err(|e| format!("Failed to create HTTP client: {}", e))?; + + // Get VPC ID for request + let vpc_id = { + let cached = CACHED_VPC_ID.read(); + cached.as_ref().cloned().unwrap_or_else(|| "NP-AMS-08".to_string()) + }; + + let url = format!( + "{}?serviceName=gfn_pc&languageCode=en_US&vpcId={}&userId={}", + MES_URL, vpc_id, user_id + ); + + info!("Fetching subscription from: {}", url); + + let response = client + .get(&url) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Accept", "application/json") + .header("nv-client-id", LCARS_CLIENT_ID) + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .send() + .await + .map_err(|e| format!("Failed to fetch subscription: {}", e))?; + + if !response.status().is_success() { + let status = response.status(); + let body = response.text().await.unwrap_or_default(); + return Err(format!("Subscription API failed with status {}: {}", status, body)); + } + + let body = response.text().await + .map_err(|e| format!("Failed to read subscription response: {}", e))?; + + debug!("Subscription response: {}", &body[..body.len().min(500)]); + + let sub: SubscriptionResponse = serde_json::from_str(&body) + .map_err(|e| format!("Failed to parse subscription: {}", e))?; + + // Convert minutes to hours + let remaining_hours = sub.remaining_time_in_minutes + .map(|m| m as f32 / 60.0) + .unwrap_or(0.0); + let total_hours = sub.total_time_in_minutes + .map(|m| m as f32 / 60.0) + .unwrap_or(0.0); + + // Check for persistent storage addon + let mut has_persistent_storage = false; + let mut storage_size_gb: Option = None; + + for addon in &sub.addons { + if addon.addon_type.as_deref() == Some("ADDON") + && addon.sub_type.as_deref() == Some("PERMANENT_STORAGE") + && addon.status.as_deref() == Some("ACTIVE") + { + has_persistent_storage = true; + // Try to find storage size from attributes + for attr in &addon.attributes { + if attr.key.as_deref() == Some("storageSizeInGB") { + if let Some(val) = attr.text_value.as_ref() { + storage_size_gb = val.parse().ok(); + } + } + } + } + } + + info!("Subscription: tier={}, hours={:.1}/{:.1}, storage={}", + sub.membership_tier, remaining_hours, total_hours, has_persistent_storage); + + Ok(crate::app::SubscriptionInfo { + membership_tier: sub.membership_tier, + remaining_hours, + total_hours, + has_persistent_storage, + storage_size_gb, + }) +} diff --git a/opennow-streamer/src/app/config.rs b/opennow-streamer/src/app/config.rs new file mode 100644 index 0000000..ff32b53 --- /dev/null +++ b/opennow-streamer/src/app/config.rs @@ -0,0 +1,322 @@ +//! Application Configuration +//! +//! Persistent settings for the OpenNow Streamer. + +use serde::{Deserialize, Serialize}; +use std::path::PathBuf; +use anyhow::Result; + +/// Application settings +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(default)] +pub struct Settings { + // === Video Settings === + /// Stream quality preset + pub quality: StreamQuality, + + /// Custom resolution (e.g., "1920x1080") + pub resolution: String, + + /// Target FPS (30, 60, 120, 240, 360) + pub fps: u32, + + /// Preferred video codec + pub codec: VideoCodec, + + /// Maximum bitrate in Mbps (200 = unlimited) + pub max_bitrate_mbps: u32, + + // === Audio Settings === + /// Audio codec + pub audio_codec: AudioCodec, + + /// Enable surround sound + pub surround: bool, + + // === Performance === + /// Enable VSync + pub vsync: bool, + + /// Low latency mode (reduces buffer) + pub low_latency_mode: bool, + + /// NVIDIA Reflex (auto-enabled for 120+ FPS) + pub nvidia_reflex: bool, + + // === Input === + /// Mouse sensitivity multiplier + pub mouse_sensitivity: f32, + + /// Use raw input (Windows only) + pub raw_input: bool, + + // === Display === + /// Start in fullscreen + pub fullscreen: bool, + + /// Borderless fullscreen + pub borderless: bool, + + /// Show stats panel + pub show_stats: bool, + + /// Stats panel position + pub stats_position: StatsPosition, + + // === Network === + /// Preferred server region + pub preferred_region: Option, + + /// Selected server ID (zone ID) + pub selected_server: Option, + + /// Auto server selection (picks best ping) + pub auto_server_selection: bool, + + /// Proxy URL + pub proxy: Option, + + /// Disable telemetry + pub disable_telemetry: bool, +} + +impl Default for Settings { + fn default() -> Self { + Self { + // Video + quality: StreamQuality::Auto, + resolution: "1920x1080".to_string(), + fps: 60, + codec: VideoCodec::H264, + max_bitrate_mbps: 50, + + // Audio + audio_codec: AudioCodec::Opus, + surround: false, + + // Performance + vsync: false, + low_latency_mode: true, + nvidia_reflex: true, + + // Input + mouse_sensitivity: 1.0, + raw_input: true, + + // Display + fullscreen: false, + borderless: true, + show_stats: true, + stats_position: StatsPosition::BottomLeft, + + // Network + preferred_region: None, + selected_server: None, + auto_server_selection: true, // Default to auto + proxy: None, + disable_telemetry: true, + } + } +} + +impl Settings { + /// Get settings file path + fn file_path() -> Option { + dirs::config_dir().map(|p| p.join("opennow-streamer").join("settings.json")) + } + + /// Load settings from disk + pub fn load() -> Result { + let path = Self::file_path().ok_or_else(|| anyhow::anyhow!("No config directory"))?; + + if !path.exists() { + return Ok(Self::default()); + } + + let content = std::fs::read_to_string(&path)?; + let settings: Settings = serde_json::from_str(&content)?; + Ok(settings) + } + + /// Save settings to disk + pub fn save(&self) -> Result<()> { + let path = Self::file_path().ok_or_else(|| anyhow::anyhow!("No config directory"))?; + + // Ensure directory exists + if let Some(parent) = path.parent() { + std::fs::create_dir_all(parent)?; + } + + let content = serde_json::to_string_pretty(self)?; + std::fs::write(&path, content)?; + + Ok(()) + } + + /// Get resolution as (width, height) + pub fn resolution_tuple(&self) -> (u32, u32) { + let parts: Vec<&str> = self.resolution.split('x').collect(); + if parts.len() == 2 { + let width = parts[0].parse().unwrap_or(1920); + let height = parts[1].parse().unwrap_or(1080); + (width, height) + } else { + (1920, 1080) + } + } + + /// Get max bitrate in kbps + pub fn max_bitrate_kbps(&self) -> u32 { + self.max_bitrate_mbps * 1000 + } +} + +/// Stream quality presets +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)] +#[serde(rename_all = "lowercase")] +pub enum StreamQuality { + /// Auto-detect based on connection + #[default] + Auto, + /// 720p 30fps + Low, + /// 1080p 60fps + Medium, + /// 1440p 60fps + High, + /// 4K 60fps + Ultra, + /// 1080p 120fps + High120, + /// 1440p 120fps + Ultra120, + /// 1080p 240fps (competitive) + Competitive, + /// 1080p 360fps (extreme) + Extreme, + /// Custom settings + Custom, +} + +impl StreamQuality { + /// Get resolution and FPS for this quality preset + pub fn settings(&self) -> (&str, u32) { + match self { + StreamQuality::Auto => ("1920x1080", 60), + StreamQuality::Low => ("1280x720", 30), + StreamQuality::Medium => ("1920x1080", 60), + StreamQuality::High => ("2560x1440", 60), + StreamQuality::Ultra => ("3840x2160", 60), + StreamQuality::High120 => ("1920x1080", 120), + StreamQuality::Ultra120 => ("2560x1440", 120), + StreamQuality::Competitive => ("1920x1080", 240), + StreamQuality::Extreme => ("1920x1080", 360), + StreamQuality::Custom => ("1920x1080", 60), + } + } + + /// Get display name for UI + pub fn display_name(&self) -> &'static str { + match self { + StreamQuality::Auto => "Auto", + StreamQuality::Low => "720p 30fps", + StreamQuality::Medium => "1080p 60fps", + StreamQuality::High => "1440p 60fps", + StreamQuality::Ultra => "4K 60fps", + StreamQuality::High120 => "1080p 120fps", + StreamQuality::Ultra120 => "1440p 120fps", + StreamQuality::Competitive => "1080p 240fps", + StreamQuality::Extreme => "1080p 360fps", + StreamQuality::Custom => "Custom", + } + } + + /// Get all available presets + pub fn all() -> &'static [StreamQuality] { + &[ + StreamQuality::Auto, + StreamQuality::Low, + StreamQuality::Medium, + StreamQuality::High, + StreamQuality::Ultra, + StreamQuality::High120, + StreamQuality::Ultra120, + StreamQuality::Competitive, + StreamQuality::Extreme, + StreamQuality::Custom, + ] + } +} + +/// Available resolutions +pub const RESOLUTIONS: &[(&str, &str)] = &[ + ("1280x720", "720p"), + ("1920x1080", "1080p"), + ("2560x1440", "1440p"), + ("3840x2160", "4K"), + ("2560x1080", "Ultrawide 1080p"), + ("3440x1440", "Ultrawide 1440p"), + ("5120x1440", "Super Ultrawide"), +]; + +/// Available FPS options +pub const FPS_OPTIONS: &[u32] = &[30, 60, 90, 120, 144, 165, 240, 360]; + +/// Video codec options +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)] +#[serde(rename_all = "lowercase")] +pub enum VideoCodec { + /// H.264/AVC - widest compatibility + #[default] + H264, + /// H.265/HEVC - better compression + H265, + /// AV1 - newest, best quality (requires RTX 40+) + AV1, +} + +impl VideoCodec { + pub fn as_str(&self) -> &'static str { + match self { + VideoCodec::H264 => "H264", + VideoCodec::H265 => "H265", + VideoCodec::AV1 => "AV1", + } + } + + /// Get display name with description + pub fn display_name(&self) -> &'static str { + match self { + VideoCodec::H264 => "H.264 (Wide compatibility)", + VideoCodec::H265 => "H.265/HEVC (Better quality)", + VideoCodec::AV1 => "AV1 (Best quality, RTX 40+)", + } + } + + /// Get all available codecs + pub fn all() -> &'static [VideoCodec] { + &[VideoCodec::H264, VideoCodec::H265, VideoCodec::AV1] + } +} + +/// Audio codec options +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)] +#[serde(rename_all = "lowercase")] +pub enum AudioCodec { + /// Opus - low latency + #[default] + Opus, + /// Opus Stereo + OpusStereo, +} + +/// Stats panel position +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)] +#[serde(rename_all = "kebab-case")] +pub enum StatsPosition { + TopLeft, + TopRight, + #[default] + BottomLeft, + BottomRight, +} diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs new file mode 100644 index 0000000..9f73bef --- /dev/null +++ b/opennow-streamer/src/app/mod.rs @@ -0,0 +1,1630 @@ +//! Application State Management +//! +//! Central state machine for the OpenNow Streamer. + +pub mod config; +pub mod session; + +pub use config::{Settings, VideoCodec, AudioCodec, StreamQuality, StatsPosition}; +pub use session::{SessionInfo, SessionState}; + +use std::sync::Arc; +use std::sync::atomic::{AtomicU64, Ordering}; +use parking_lot::{Mutex, RwLock}; +use tokio::runtime::Handle; +use tokio::sync::mpsc; +use log::{info, error, warn}; + +use crate::auth::{self, LoginProvider, AuthTokens, UserInfo, PkceChallenge}; +use crate::api::{self, GfnApiClient, DynamicServerRegion}; + +use crate::input::InputHandler; + +use crate::media::{VideoFrame, StreamStats}; +use crate::webrtc::StreamingSession; + +/// Cache for dynamic regions fetched from serverInfo API +static DYNAMIC_REGIONS_CACHE: RwLock>> = RwLock::new(None); + +/// Shared frame holder for zero-latency frame delivery +/// Decoder writes latest frame, renderer reads it - no buffering +pub struct SharedFrame { + frame: Mutex>, + frame_count: AtomicU64, + last_read_count: AtomicU64, +} + +impl SharedFrame { + pub fn new() -> Self { + Self { + frame: Mutex::new(None), + frame_count: AtomicU64::new(0), + last_read_count: AtomicU64::new(0), + } + } + + /// Write a new frame (called by decoder) + pub fn write(&self, frame: VideoFrame) { + *self.frame.lock() = Some(frame); + self.frame_count.fetch_add(1, Ordering::Release); + } + + /// Check if there's a new frame since last read + pub fn has_new_frame(&self) -> bool { + let current = self.frame_count.load(Ordering::Acquire); + let last = self.last_read_count.load(Ordering::Acquire); + current > last + } + + /// Read the latest frame (called by renderer) + /// Returns None if no frame available or no new frame since last read + /// Uses take() instead of clone() to avoid copying ~3MB per frame + pub fn read(&self) -> Option { + let current = self.frame_count.load(Ordering::Acquire); + let last = self.last_read_count.load(Ordering::Acquire); + + if current > last { + self.last_read_count.store(current, Ordering::Release); + self.frame.lock().take() // Move instead of clone - zero copy + } else { + None + } + } + + /// Get frame count for stats + pub fn frame_count(&self) -> u64 { + self.frame_count.load(Ordering::Relaxed) + } +} + +impl Default for SharedFrame { + fn default() -> Self { + Self::new() + } +} + +/// Parse resolution string (e.g., "1920x1080") into (width, height) +/// Returns (1920, 1080) as default if parsing fails +pub fn parse_resolution(res: &str) -> (u32, u32) { + let parts: Vec<&str> = res.split('x').collect(); + if parts.len() == 2 { + let width = parts[0].parse().unwrap_or(1920); + let height = parts[1].parse().unwrap_or(1080); + (width, height) + } else { + (1920, 1080) // Default to 1080p + } +} + +/// UI actions that can be triggered from the renderer +#[derive(Debug, Clone)] +pub enum UiAction { + /// Start OAuth login flow + StartLogin, + /// Select a login provider + SelectProvider(usize), + /// Logout + Logout, + /// Launch a game by index + LaunchGame(usize), + /// Launch a specific game + LaunchGameDirect(GameInfo), + /// Stop streaming + StopStreaming, + /// Toggle stats overlay + ToggleStats, + /// Update search query + UpdateSearch(String), + /// Toggle settings panel + ToggleSettings, + /// Update a setting + UpdateSetting(SettingChange), + /// Refresh games list + RefreshGames, + /// Switch to a tab + SwitchTab(GamesTab), + /// Open game detail popup + OpenGamePopup(GameInfo), + /// Close game detail popup + CloseGamePopup, + /// Select a server/region + SelectServer(usize), + /// Enable auto server selection (best ping) + SetAutoServerSelection(bool), + /// Start ping test for all servers + StartPingTest, + /// Toggle settings modal + ToggleSettingsModal, +} + +/// Setting changes +#[derive(Debug, Clone)] +pub enum SettingChange { + Resolution(String), + Fps(u32), + Codec(VideoCodec), + MaxBitrate(u32), + Fullscreen(bool), + VSync(bool), + LowLatency(bool), +} + +/// Application state enum +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum AppState { + /// Login screen + Login, + /// Browsing games library + Games, + /// Session being set up (queue, launching) + Session, + /// Active streaming + Streaming, +} + +/// Main application structure +pub struct App { + /// Current application state + pub state: AppState, + + /// Tokio runtime handle for async operations + pub runtime: Handle, + + /// User settings + pub settings: Settings, + + /// Authentication tokens + pub auth_tokens: Option, + + /// User info + pub user_info: Option, + + /// Current session info + pub session: Option, + + /// Streaming session (WebRTC) + pub streaming_session: Option>>, + + /// Input handler for the current platform + pub input_handler: Option>, + + /// Whether cursor is captured + pub cursor_captured: bool, + + /// Current video frame (for rendering) + pub current_frame: Option, + + /// Shared frame holder for zero-latency frame delivery + pub shared_frame: Option>, + + /// Stream statistics + pub stats: StreamStats, + + /// Whether to show stats overlay + pub show_stats: bool, + + /// Status message for UI + pub status_message: String, + + /// Error message (if any) + pub error_message: Option, + + /// Games list + pub games: Vec, + + /// Search query + pub search_query: String, + + /// Selected game + pub selected_game: Option, + + /// Channel for receiving stats updates + stats_rx: Option>, + + // === Login State === + /// Available login providers + pub login_providers: Vec, + + /// Selected provider index + pub selected_provider_index: usize, + + /// Whether settings panel is visible + pub show_settings: bool, + + /// Loading state for async operations + pub is_loading: bool, + + /// VPC ID for current provider + pub vpc_id: Option, + + /// API client + api_client: GfnApiClient, + + /// Subscription info (hours, storage, etc.) + pub subscription: Option, + + /// User's library games + pub library_games: Vec, + + /// Current tab in Games view + pub current_tab: GamesTab, + + /// Selected game for detail popup (None = popup closed) + pub selected_game_popup: Option, + + /// Available servers/regions + pub servers: Vec, + + /// Selected server index + pub selected_server_index: usize, + + /// Auto server selection (picks best ping) + pub auto_server_selection: bool, + + /// Whether ping test is running + pub ping_testing: bool, + + /// Whether settings modal is visible + pub show_settings_modal: bool, + + /// Last time we polled the session (for rate limiting) + last_poll_time: std::time::Instant, + + /// Render FPS tracking + render_frame_count: u64, + last_render_fps_time: std::time::Instant, + last_render_frame_count: u64, +} + +/// Poll interval for session status (2 seconds) +const POLL_INTERVAL: std::time::Duration = std::time::Duration::from_secs(2); + +/// Game information +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] +pub struct GameInfo { + pub id: String, + pub title: String, + pub publisher: Option, + pub image_url: Option, + pub store: String, + pub app_id: Option, +} + +/// Subscription information +#[derive(Debug, Clone, Default)] +pub struct SubscriptionInfo { + pub membership_tier: String, + pub remaining_hours: f32, + pub total_hours: f32, + pub has_persistent_storage: bool, + pub storage_size_gb: Option, +} + +/// Current tab in Games view +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum GamesTab { + AllGames, + MyLibrary, +} + +impl Default for GamesTab { + fn default() -> Self { + GamesTab::AllGames + } +} + +/// Server/Region information +#[derive(Debug, Clone)] +pub struct ServerInfo { + pub id: String, + pub name: String, + pub region: String, + pub url: Option, + pub ping_ms: Option, + pub status: ServerStatus, +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum ServerStatus { + Online, + Testing, + Offline, + Unknown, +} + +impl App { + /// Create new application instance + pub fn new(runtime: Handle) -> Self { + // Load settings + let settings = Settings::load().unwrap_or_default(); + let auto_server = settings.auto_server_selection; // Save before move + + // Try to load saved tokens + let auth_tokens = Self::load_tokens(); + let has_token = auth_tokens.as_ref().map(|t| !t.is_expired()).unwrap_or(false); + + let initial_state = if has_token { + AppState::Games + } else { + AppState::Login + }; + + // Start fetching login providers + let rt = runtime.clone(); + rt.spawn(async { + if let Err(e) = auth::fetch_login_providers().await { + warn!("Failed to fetch login providers: {}", e); + } + }); + + Self { + state: initial_state, + runtime, + settings, + auth_tokens, + user_info: None, + session: None, + streaming_session: None, + input_handler: None, + cursor_captured: false, + current_frame: None, + shared_frame: None, + stats: StreamStats::default(), + show_stats: true, + status_message: "Welcome to OpenNOW".to_string(), + error_message: None, + games: Vec::new(), + search_query: String::new(), + selected_game: None, + stats_rx: None, + login_providers: vec![LoginProvider::nvidia_default()], + selected_provider_index: 0, + show_settings: false, + is_loading: false, + vpc_id: None, + api_client: GfnApiClient::new(), + subscription: None, + library_games: Vec::new(), + current_tab: GamesTab::AllGames, + selected_game_popup: None, + servers: Vec::new(), + selected_server_index: 0, + auto_server_selection: auto_server, // Load from settings + ping_testing: false, + show_settings_modal: false, + last_poll_time: std::time::Instant::now(), + render_frame_count: 0, + last_render_fps_time: std::time::Instant::now(), + last_render_frame_count: 0, + } + } + + /// Handle a UI action + pub fn handle_action(&mut self, action: UiAction) { + match action { + UiAction::StartLogin => { + self.start_oauth_login(); + } + UiAction::SelectProvider(index) => { + self.select_provider(index); + } + UiAction::Logout => { + self.logout(); + } + UiAction::LaunchGame(index) => { + // Get game from appropriate list based on current tab + let game = match self.current_tab { + GamesTab::AllGames => self.games.get(index).cloned(), + GamesTab::MyLibrary => self.library_games.get(index).cloned(), + }; + if let Some(game) = game { + self.launch_game(&game); + } + } + UiAction::LaunchGameDirect(game) => { + self.launch_game(&game); + } + UiAction::StopStreaming => { + self.stop_streaming(); + } + UiAction::ToggleStats => { + self.toggle_stats(); + } + UiAction::UpdateSearch(query) => { + self.search_query = query; + } + UiAction::ToggleSettings => { + self.show_settings = !self.show_settings; + } + UiAction::UpdateSetting(change) => { + match change { + SettingChange::Resolution(res) => self.settings.resolution = res, + SettingChange::Fps(fps) => self.settings.fps = fps, + SettingChange::Codec(codec) => self.settings.codec = codec, + SettingChange::MaxBitrate(bitrate) => self.settings.max_bitrate_mbps = bitrate, + SettingChange::Fullscreen(fs) => self.settings.fullscreen = fs, + SettingChange::VSync(vsync) => self.settings.vsync = vsync, + SettingChange::LowLatency(ll) => self.settings.low_latency_mode = ll, + } + self.save_settings(); + } + UiAction::RefreshGames => { + self.fetch_games(); + } + UiAction::SwitchTab(tab) => { + self.current_tab = tab; + // Fetch library if switching to My Library and it's empty + if tab == GamesTab::MyLibrary && self.library_games.is_empty() { + self.fetch_library(); + } + } + UiAction::OpenGamePopup(game) => { + self.selected_game_popup = Some(game); + } + UiAction::CloseGamePopup => { + self.selected_game_popup = None; + } + UiAction::SelectServer(index) => { + if index < self.servers.len() { + self.selected_server_index = index; + self.auto_server_selection = false; // Disable auto when manually selecting + // Save selected server and auto mode to settings + self.settings.selected_server = Some(self.servers[index].id.clone()); + self.settings.auto_server_selection = false; + self.save_settings(); + info!("Selected server: {}", self.servers[index].name); + } + } + UiAction::SetAutoServerSelection(enabled) => { + self.auto_server_selection = enabled; + self.settings.auto_server_selection = enabled; + self.save_settings(); + if enabled { + // Auto-select best server based on ping + self.select_best_server(); + } + } + UiAction::StartPingTest => { + self.start_ping_test(); + } + UiAction::ToggleSettingsModal => { + self.show_settings_modal = !self.show_settings_modal; + // Load servers when opening settings if not loaded + if self.show_settings_modal && self.servers.is_empty() { + self.load_servers(); + } + } + } + } + + /// Get filtered games based on search query + pub fn filtered_games(&self) -> Vec<(usize, &GameInfo)> { + let query = self.search_query.to_lowercase(); + self.games + .iter() + .enumerate() + .filter(|(_, game)| { + query.is_empty() || game.title.to_lowercase().contains(&query) + }) + .collect() + } + + /// Select a login provider + pub fn select_provider(&mut self, index: usize) { + // Update cached providers from global state + self.login_providers = auth::get_cached_providers(); + if self.login_providers.is_empty() { + self.login_providers = vec![LoginProvider::nvidia_default()]; + } + + if index < self.login_providers.len() { + self.selected_provider_index = index; + let provider = self.login_providers[index].clone(); + auth::set_login_provider(provider.clone()); + info!("Selected provider: {}", provider.login_provider_display_name); + } + } + + /// Start OAuth login flow + pub fn start_oauth_login(&mut self) { + // Find available port + let port = match auth::find_available_port() { + Some(p) => p, + None => { + self.error_message = Some("No available ports for OAuth callback".to_string()); + return; + } + }; + + self.is_loading = true; + self.status_message = "Opening browser for login...".to_string(); + + let pkce = PkceChallenge::new(); + let auth_url = auth::build_auth_url(&pkce, port); + let verifier = pkce.verifier.clone(); + + // Open browser + if let Err(e) = open::that(&auth_url) { + self.error_message = Some(format!("Failed to open browser: {}", e)); + self.is_loading = false; + return; + } + + info!("Opened browser for OAuth login"); + + // Spawn task to wait for callback + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match auth::start_callback_server(port).await { + Ok(code) => { + info!("Received OAuth code"); + match auth::exchange_code(&code, &verifier, port).await { + Ok(tokens) => { + info!("Token exchange successful!"); + // Tokens will be picked up in update() + // For now, we store them in a temp file + Self::save_tokens(&tokens); + } + Err(e) => { + error!("Token exchange failed: {}", e); + } + } + } + Err(e) => { + error!("OAuth callback failed: {}", e); + } + } + }); + } + + /// Update application state (called each frame) + pub fn update(&mut self) { + // Track render FPS + self.render_frame_count += 1; + let now = std::time::Instant::now(); + let elapsed = now.duration_since(self.last_render_fps_time).as_secs_f64(); + if elapsed >= 1.0 { + let frames_this_period = self.render_frame_count - self.last_render_frame_count; + self.stats.render_fps = (frames_this_period as f64 / elapsed) as f32; + self.stats.frames_rendered = self.render_frame_count; + self.last_render_frame_count = self.render_frame_count; + self.last_render_fps_time = now; + } + + // Check for new video frames from shared frame holder + if let Some(ref shared) = self.shared_frame { + if let Some(frame) = shared.read() { + // Only log the first frame (when current_frame is None) + if self.current_frame.is_none() { + log::info!("First video frame received: {}x{}", frame.width, frame.height); + } + self.current_frame = Some(frame); + } + } + + // Check for stats updates + if let Some(ref mut rx) = self.stats_rx { + while let Ok(mut stats) = rx.try_recv() { + // Preserve render_fps from our local tracking + stats.render_fps = self.stats.render_fps; + stats.frames_rendered = self.stats.frames_rendered; + self.stats = stats; + } + } + + // Update cached providers + let cached = auth::get_cached_providers(); + if !cached.is_empty() && cached.len() != self.login_providers.len() { + self.login_providers = cached; + } + + // Check if tokens were saved by OAuth callback + if self.state == AppState::Login && self.is_loading { + if let Some(tokens) = Self::load_tokens() { + if !tokens.is_expired() { + info!("OAuth login successful!"); + self.auth_tokens = Some(tokens.clone()); + self.api_client.set_access_token(tokens.jwt().to_string()); + self.is_loading = false; + self.state = AppState::Games; + self.status_message = "Login successful!".to_string(); + self.fetch_games(); + self.fetch_subscription(); // Also fetch subscription info + self.load_servers(); // Load servers (fetches dynamic regions) + } + } + } + + // Check if games were fetched and saved to cache + if self.state == AppState::Games && self.is_loading && self.games.is_empty() { + if let Some(games) = Self::load_games_cache() { + if !games.is_empty() { + // Check if cache has images - if not, it's old cache that needs refresh + let has_images = games.iter().any(|g| g.image_url.is_some()); + if has_images { + info!("Loaded {} games from cache (with images)", games.len()); + self.games = games; + self.is_loading = false; + self.status_message = format!("Loaded {} games", self.games.len()); + } else { + info!("Cache has {} games but no images - forcing refresh", games.len()); + Self::clear_games_cache(); + self.fetch_games(); + } + } + } + } + + // Check if library was fetched and saved to cache + if self.state == AppState::Games && self.current_tab == GamesTab::MyLibrary && self.library_games.is_empty() { + if let Some(games) = Self::load_library_cache() { + if !games.is_empty() { + info!("Loaded {} games from library cache", games.len()); + self.library_games = games; + self.is_loading = false; + self.status_message = format!("Your Library: {} games", self.library_games.len()); + } + } + } + + // Check if subscription was fetched and saved to cache + if self.state == AppState::Games && self.subscription.is_none() { + if let Some(sub) = Self::load_subscription_cache() { + info!("Loaded subscription from cache: {}", sub.membership_tier); + self.subscription = Some(sub); + } + } + + // Check for dynamic regions from serverInfo API + self.check_dynamic_regions(); + + // Check for ping test results + if self.ping_testing { + self.load_ping_results(); + } + + // Poll session status when in session state + if self.state == AppState::Session && self.is_loading { + self.poll_session_status(); + } + } + + /// Logout and return to login screen + pub fn logout(&mut self) { + self.auth_tokens = None; + self.user_info = None; + auth::clear_login_provider(); + Self::clear_tokens(); + self.state = AppState::Login; + self.games.clear(); + self.status_message = "Logged out".to_string(); + } + + /// Fetch games library + pub fn fetch_games(&mut self) { + if self.auth_tokens.is_none() { + return; + } + + self.is_loading = true; + self.status_message = "Loading games...".to_string(); + + let token = self.auth_tokens.as_ref().unwrap().jwt().to_string(); + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token.clone()); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + // Fetch games from GraphQL MAIN panel (has images) + // This is the same approach as the official GFN client + match api_client.fetch_main_games(None).await { + Ok(games) => { + info!("Fetched {} games from GraphQL MAIN panel (with images)", games.len()); + Self::save_games_cache(&games); + } + Err(e) => { + error!("Failed to fetch main games from GraphQL: {}", e); + + // Fallback: try public games list (no images, but has all games) + info!("Falling back to public games list..."); + match api_client.fetch_public_games().await { + Ok(games) => { + info!("Fetched {} games from public list (fallback)", games.len()); + Self::save_games_cache(&games); + } + Err(e2) => { + error!("Failed to fetch public games: {}", e2); + } + } + } + } + }); + } + + /// Fetch user's library games + pub fn fetch_library(&mut self) { + if self.auth_tokens.is_none() { + return; + } + + self.is_loading = true; + self.status_message = "Loading your library...".to_string(); + + let token = self.auth_tokens.as_ref().unwrap().jwt().to_string(); + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token.clone()); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.fetch_library(None).await { + Ok(games) => { + info!("Fetched {} games from LIBRARY panel", games.len()); + Self::save_library_cache(&games); + } + Err(e) => { + error!("Failed to fetch library: {}", e); + } + } + }); + } + + /// Fetch subscription info (hours, addons, etc.) + pub fn fetch_subscription(&mut self) { + if self.auth_tokens.is_none() { + return; + } + + let token = self.auth_tokens.as_ref().unwrap().jwt().to_string(); + let user_id = self.auth_tokens.as_ref().unwrap().user_id().to_string(); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match crate::api::fetch_subscription(&token, &user_id).await { + Ok(sub) => { + info!("Fetched subscription: tier={}, hours={:.1}/{:.1}, storage={}", + sub.membership_tier, + sub.remaining_hours, + sub.total_hours, + sub.has_persistent_storage + ); + Self::save_subscription_cache(&sub); + } + Err(e) => { + warn!("Failed to fetch subscription: {}", e); + } + } + }); + } + + /// Load available servers/regions (tries dynamic fetch first, falls back to hardcoded) + pub fn load_servers(&mut self) { + info!("Loading servers..."); + + let runtime = self.runtime.clone(); + let token = self.auth_tokens.as_ref().map(|t| t.jwt().to_string()); + + // Spawn async task to fetch dynamic regions + runtime.spawn(async move { + let client = reqwest::Client::new(); + let regions = api::fetch_dynamic_regions(&client, token.as_deref()).await; + + // Store the results for the main thread to pick up + DYNAMIC_REGIONS_CACHE.write().replace(regions); + }); + + // For now, start with hardcoded servers (will update when dynamic fetch completes) + self.load_hardcoded_servers(); + } + + /// Load hardcoded servers as fallback + fn load_hardcoded_servers(&mut self) { + let server_zones: Vec<(&str, &str, &str)> = vec![ + // Europe + ("eu-netherlands-north", "Netherlands North", "Europe"), + ("eu-netherlands-south", "Netherlands South", "Europe"), + ("eu-united-kingdom-1", "United Kingdom", "Europe"), + ("eu-germany-frankfurt-1", "Frankfurt", "Europe"), + ("eu-france-paris-1", "Paris", "Europe"), + ("eu-finland-helsinki-1", "Helsinki", "Europe"), + ("eu-norway-oslo-1", "Oslo", "Europe"), + ("eu-sweden-stockholm-1", "Stockholm", "Europe"), + ("eu-poland-warsaw-1", "Warsaw", "Europe"), + ("eu-italy-rome-1", "Rome", "Europe"), + ("eu-spain-madrid-1", "Madrid", "Europe"), + // North America + ("us-california-north", "California North", "North America"), + ("us-california-south", "California South", "North America"), + ("us-texas-dallas-1", "Dallas", "North America"), + ("us-virginia-north", "Virginia North", "North America"), + ("us-illinois-chicago-1", "Chicago", "North America"), + ("us-washington-seattle-1", "Seattle", "North America"), + ("us-arizona-phoenix-1", "Phoenix", "North America"), + // Canada + ("ca-quebec", "Quebec", "Canada"), + // Asia-Pacific + ("ap-japan-tokyo-1", "Tokyo", "Asia-Pacific"), + ("ap-japan-osaka-1", "Osaka", "Asia-Pacific"), + ("ap-south-korea-seoul-1", "Seoul", "Asia-Pacific"), + ("ap-australia-sydney-1", "Sydney", "Asia-Pacific"), + ("ap-singapore-1", "Singapore", "Asia-Pacific"), + ]; + + self.servers = server_zones + .iter() + .map(|(id, name, region)| ServerInfo { + id: id.to_string(), + name: name.to_string(), + region: region.to_string(), + url: None, + ping_ms: None, + status: ServerStatus::Unknown, + }) + .collect(); + + // Restore selected server from settings + if let Some(ref selected_id) = self.settings.selected_server { + if let Some(idx) = self.servers.iter().position(|s| s.id == *selected_id) { + self.selected_server_index = idx; + } + } + + info!("Loaded {} hardcoded servers", self.servers.len()); + } + + /// Update servers from dynamic region cache (call this periodically from update loop) + pub fn check_dynamic_regions(&mut self) { + let dynamic_regions = DYNAMIC_REGIONS_CACHE.write().take(); + + if let Some(regions) = dynamic_regions { + if !regions.is_empty() { + info!("[serverInfo] Applying {} dynamic regions", regions.len()); + + // Convert dynamic regions to ServerInfo + // Group by region based on URL pattern + self.servers = regions + .iter() + .map(|r| { + // Extract server ID from URL hostname + // e.g., "https://eu-netherlands-south.cloudmatchbeta.nvidiagrid.net" -> "eu-netherlands-south" + let hostname = r.url + .trim_start_matches("https://") + .trim_start_matches("http://") + .split('.') + .next() + .unwrap_or(&r.name); + + // Determine region from name or hostname + let region = if hostname.starts_with("eu-") || r.name.contains("Europe") || r.name.contains("UK") || r.name.contains("France") || r.name.contains("Germany") { + "Europe" + } else if hostname.starts_with("us-") || r.name.contains("US") || r.name.contains("California") || r.name.contains("Texas") { + "North America" + } else if hostname.starts_with("ca-") || r.name.contains("Canada") || r.name.contains("Quebec") { + "Canada" + } else if hostname.starts_with("ap-") || r.name.contains("Japan") || r.name.contains("Korea") || r.name.contains("Singapore") { + "Asia-Pacific" + } else { + "Other" + }; + + ServerInfo { + id: hostname.to_string(), + name: r.name.clone(), + region: region.to_string(), + url: Some(r.url.clone()), + ping_ms: None, + status: ServerStatus::Unknown, + } + }) + .collect(); + + // Restore selected server + if let Some(ref selected_id) = self.settings.selected_server { + if let Some(idx) = self.servers.iter().position(|s| s.id == *selected_id) { + self.selected_server_index = idx; + } + } + + info!("[serverInfo] Now have {} servers", self.servers.len()); + + // Auto-start ping test after loading dynamic servers + self.start_ping_test(); + } + } + } + + /// Start ping test for all servers + pub fn start_ping_test(&mut self) { + if self.ping_testing { + return; // Already running + } + + self.ping_testing = true; + info!("Starting ping test for {} servers", self.servers.len()); + + // Mark all servers as testing + for server in &mut self.servers { + server.status = ServerStatus::Testing; + server.ping_ms = None; + } + + // Collect server info with URLs for pinging + let server_data: Vec<(String, Option)> = self.servers + .iter() + .map(|s| (s.id.clone(), s.url.clone())) + .collect(); + let runtime = self.runtime.clone(); + + runtime.spawn(async move { + let mut results: Vec<(String, Option, ServerStatus)> = Vec::new(); + + for (server_id, url_opt) in server_data { + // Extract hostname from URL or construct from server_id + let hostname = if let Some(url) = url_opt { + url.trim_start_matches("https://") + .trim_start_matches("http://") + .split('/') + .next() + .unwrap_or(&format!("{}.cloudmatchbeta.nvidiagrid.net", server_id)) + .to_string() + } else { + format!("{}.cloudmatchbeta.nvidiagrid.net", server_id) + }; + + // TCP ping to port 443 + let ping_result = Self::tcp_ping(&hostname, 443).await; + + let (ping_ms, status) = match ping_result { + Some(ms) => (Some(ms), ServerStatus::Online), + None => (None, ServerStatus::Offline), + }; + + results.push((server_id, ping_ms, status)); + } + + // Save results to cache + Self::save_ping_results(&results); + }); + } + + /// TCP ping to measure latency + async fn tcp_ping(hostname: &str, port: u16) -> Option { + use std::time::Instant; + use tokio::net::TcpStream; + use tokio::time::{timeout, Duration}; + + // Resolve hostname first + let addr = format!("{}:{}", hostname, port); + + let start = Instant::now(); + let result = timeout(Duration::from_secs(3), TcpStream::connect(&addr)).await; + + match result { + Ok(Ok(_stream)) => { + let elapsed = start.elapsed().as_millis() as u32; + Some(elapsed) + } + _ => None, + } + } + + /// Save ping results to cache (for async loading) + fn save_ping_results(results: &[(String, Option, ServerStatus)]) { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("ping_results.json")) { + let cache: Vec = results + .iter() + .map(|(id, ping, status)| { + serde_json::json!({ + "id": id, + "ping_ms": ping, + "status": format!("{:?}", status), + }) + }) + .collect(); + + if let Ok(json) = serde_json::to_string(&cache) { + let _ = std::fs::write(path, json); + } + } + } + + /// Load ping results from cache + fn load_ping_results(&mut self) { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("ping_results.json")) { + if let Ok(content) = std::fs::read_to_string(&path) { + if let Ok(results) = serde_json::from_str::>(&content) { + for result in results { + if let Some(id) = result.get("id").and_then(|v| v.as_str()) { + if let Some(server) = self.servers.iter_mut().find(|s| s.id == id) { + server.ping_ms = result.get("ping_ms").and_then(|v| v.as_u64()).map(|v| v as u32); + server.status = match result.get("status").and_then(|v| v.as_str()) { + Some("Online") => ServerStatus::Online, + Some("Offline") => ServerStatus::Offline, + _ => ServerStatus::Unknown, + }; + } + } + } + + // Clear the ping file after loading + let _ = std::fs::remove_file(&path); + self.ping_testing = false; + + // Sort servers by ping (online first, then by ping) + self.servers.sort_by(|a, b| { + match (&a.status, &b.status) { + (ServerStatus::Online, ServerStatus::Online) => { + a.ping_ms.unwrap_or(9999).cmp(&b.ping_ms.unwrap_or(9999)) + } + (ServerStatus::Online, _) => std::cmp::Ordering::Less, + (_, ServerStatus::Online) => std::cmp::Ordering::Greater, + _ => std::cmp::Ordering::Equal, + } + }); + + // Update selected index after sort + if self.auto_server_selection { + // Auto-select best server + self.select_best_server(); + } else if let Some(ref selected_id) = self.settings.selected_server { + if let Some(idx) = self.servers.iter().position(|s| s.id == *selected_id) { + self.selected_server_index = idx; + } + } + } + } + } + } + + /// Select the best server based on ping (lowest ping online server) + fn select_best_server(&mut self) { + // Find the server with the lowest ping that is online + let best_server = self.servers + .iter() + .enumerate() + .filter(|(_, s)| s.status == ServerStatus::Online && s.ping_ms.is_some()) + .min_by_key(|(_, s)| s.ping_ms.unwrap_or(9999)); + + if let Some((idx, server)) = best_server { + self.selected_server_index = idx; + info!("Auto-selected best server: {} ({}ms)", server.name, server.ping_ms.unwrap_or(0)); + } + } + + /// Launch a game session + pub fn launch_game(&mut self, game: &GameInfo) { + info!("Launching game: {} (ID: {})", game.title, game.id); + + // Clear any old session data first + Self::clear_session_cache(); + Self::clear_session_error(); + + self.selected_game = Some(game.clone()); + self.state = AppState::Session; + self.status_message = format!("Starting {}...", game.title); + self.error_message = None; + self.is_loading = true; + self.last_poll_time = std::time::Instant::now() - POLL_INTERVAL; // Allow immediate first poll + + // Get token and settings for session creation + let token = match &self.auth_tokens { + Some(t) => t.jwt().to_string(), + None => { + self.error_message = Some("Not logged in".to_string()); + self.is_loading = false; + return; + } + }; + + let app_id = game.id.clone(); + let game_title = game.title.clone(); + let settings = self.settings.clone(); + + // Use selected server or default + let zone = self.servers.get(self.selected_server_index) + .map(|s| s.id.clone()) + .unwrap_or_else(|| "eu-netherlands-south".to_string()); + + // Create API client with token + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + // Spawn async task to create and poll session + let runtime = self.runtime.clone(); + runtime.spawn(async move { + // Create session + match api_client.create_session(&app_id, &game_title, &settings, &zone).await { + Ok(session) => { + info!("Session created: {} (state: {:?})", session.session_id, session.state); + // Save session info for polling + Self::save_session_cache(&session); + } + Err(e) => { + error!("Failed to create session: {}", e); + Self::save_session_error(&format!("Failed to create session: {}", e)); + } + } + }); + } + + /// Poll session state and update UI + fn poll_session_status(&mut self) { + // First check cache for state updates (from in-flight or completed requests) + if let Some(session) = Self::load_session_cache() { + if session.state == SessionState::Ready { + info!("Session ready! GPU: {:?}, Server: {}", session.gpu_type, session.server_ip); + self.status_message = format!( + "Connecting to GPU: {}", + session.gpu_type.as_deref().unwrap_or("Unknown") + ); + Self::clear_session_cache(); + self.start_streaming(session); + return; + } else if let SessionState::InQueue { position, eta_secs } = session.state { + self.status_message = format!("Queue position: {} (ETA: {}s)", position, eta_secs); + } else if let SessionState::Error(ref msg) = session.state { + self.error_message = Some(msg.clone()); + self.is_loading = false; + Self::clear_session_cache(); + return; + } else { + self.status_message = "Setting up session...".to_string(); + } + } + + // Rate limit polling - only poll every POLL_INTERVAL (2 seconds) + let now = std::time::Instant::now(); + if now.duration_since(self.last_poll_time) < POLL_INTERVAL { + return; + } + + if let Some(session) = Self::load_session_cache() { + let should_poll = matches!( + session.state, + SessionState::Requesting | SessionState::Launching | SessionState::InQueue { .. } + ); + + if should_poll { + // Update timestamp to rate limit next poll + self.last_poll_time = now; + + let token = match &self.auth_tokens { + Some(t) => t.jwt().to_string(), + None => return, + }; + + let session_id = session.session_id.clone(); + let zone = session.zone.clone(); + let server_ip = if session.server_ip.is_empty() { + None + } else { + Some(session.server_ip.clone()) + }; + + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.poll_session(&session_id, &zone, server_ip.as_deref()).await { + Ok(updated_session) => { + info!("Session poll: state={:?}", updated_session.state); + Self::save_session_cache(&updated_session); + } + Err(e) => { + error!("Session poll failed: {}", e); + } + } + }); + } + } + + // Check for session errors + if let Some(error) = Self::load_session_error() { + self.error_message = Some(error); + self.is_loading = false; + Self::clear_session_error(); + } + } + + // Session cache helpers + fn session_cache_path() -> Option { + Self::get_app_data_dir().map(|p| p.join("session_cache.json")) + } + + fn session_error_path() -> Option { + Self::get_app_data_dir().map(|p| p.join("session_error.txt")) + } + + fn save_session_cache(session: &SessionInfo) { + if let Some(path) = Self::session_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + // Serialize session info (we need to make it serializable) + let cache = serde_json::json!({ + "session_id": session.session_id, + "server_ip": session.server_ip, + "zone": session.zone, + "state": format!("{:?}", session.state), + "gpu_type": session.gpu_type, + "signaling_url": session.signaling_url, + "is_ready": session.is_ready(), + "is_queued": session.is_queued(), + "queue_position": session.queue_position(), + "media_connection_info": session.media_connection_info.as_ref().map(|mci| { + serde_json::json!({ + "ip": mci.ip, + "port": mci.port, + }) + }), + }); + if let Ok(json) = serde_json::to_string(&cache) { + let _ = std::fs::write(path, json); + } + } + } + + fn load_session_cache() -> Option { + let path = Self::session_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + let cache: serde_json::Value = serde_json::from_str(&content).ok()?; + + let state_str = cache.get("state")?.as_str()?; + let state = if state_str.contains("Ready") { + SessionState::Ready + } else if state_str.contains("Streaming") { + SessionState::Streaming + } else if state_str.contains("InQueue") { + // Parse queue position and eta from state string + let position = cache.get("queue_position") + .and_then(|v| v.as_u64()) + .unwrap_or(0) as u32; + SessionState::InQueue { position, eta_secs: 0 } + } else if state_str.contains("Error") { + SessionState::Error(state_str.to_string()) + } else if state_str.contains("Launching") { + SessionState::Launching + } else { + SessionState::Requesting + }; + + // Parse media_connection_info if present + let media_connection_info = cache.get("media_connection_info") + .and_then(|v| v.as_object()) + .and_then(|obj| { + let ip = obj.get("ip")?.as_str()?.to_string(); + let port = obj.get("port")?.as_u64()? as u16; + Some(crate::app::session::MediaConnectionInfo { ip, port }) + }); + + Some(SessionInfo { + session_id: cache.get("session_id")?.as_str()?.to_string(), + server_ip: cache.get("server_ip")?.as_str()?.to_string(), + zone: cache.get("zone")?.as_str()?.to_string(), + state, + gpu_type: cache.get("gpu_type").and_then(|v| v.as_str()).map(|s| s.to_string()), + signaling_url: cache.get("signaling_url").and_then(|v| v.as_str()).map(|s| s.to_string()), + ice_servers: Vec::new(), + media_connection_info, + }) + } + + fn clear_session_cache() { + if let Some(path) = Self::session_cache_path() { + let _ = std::fs::remove_file(path); + } + } + + fn save_session_error(error: &str) { + if let Some(path) = Self::session_error_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let _ = std::fs::write(path, error); + } + } + + fn load_session_error() -> Option { + let path = Self::session_error_path()?; + std::fs::read_to_string(path).ok() + } + + fn clear_session_error() { + if let Some(path) = Self::session_error_path() { + let _ = std::fs::remove_file(path); + } + } + + /// Start streaming once session is ready + pub fn start_streaming(&mut self, session: SessionInfo) { + info!("Starting streaming to {}", session.server_ip); + + self.session = Some(session.clone()); + self.state = AppState::Streaming; + self.cursor_captured = true; + self.is_loading = false; + + // Initialize session timing for proper input timestamps + // This must be called BEFORE any input events are sent + crate::input::init_session_timing(); + + // Set local cursor dimensions for instant visual feedback + // Parse resolution from settings (e.g., "1920x1080" -> width, height) + let (width, height) = parse_resolution(&self.settings.resolution); + #[cfg(target_os = "windows")] + crate::input::set_local_cursor_dimensions(width, height); + + info!("Input system initialized: session timing + local cursor {}x{}", width, height); + + // Create shared frame holder for zero-latency frame delivery + // No buffering - decoder writes latest frame, renderer reads it immediately + let shared_frame = Arc::new(SharedFrame::new()); + self.shared_frame = Some(shared_frame.clone()); + + // Stats channel (small buffer is fine for stats) + let (stats_tx, stats_rx) = mpsc::channel(8); + info!("Using zero-latency shared frame delivery for {}fps", self.settings.fps); + + self.stats_rx = Some(stats_rx); + + // Create input handler + let input_handler = Arc::new(InputHandler::new()); + self.input_handler = Some(input_handler.clone()); + + self.status_message = "Connecting...".to_string(); + + // Clone settings for the async task + let settings = self.settings.clone(); + + // Spawn the streaming task + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match crate::webrtc::run_streaming( + session, + settings, + shared_frame, + stats_tx, + input_handler, + ).await { + Ok(()) => { + info!("Streaming ended normally"); + } + Err(e) => { + error!("Streaming error: {}", e); + } + } + }); + } + + /// Stop streaming and return to games + pub fn stop_streaming(&mut self) { + info!("Stopping streaming"); + + // Clear session cache first to prevent stale session data + Self::clear_session_cache(); + + // Reset input timing for next session + crate::input::reset_session_timing(); + + // Reset input coalescing and local cursor state + #[cfg(target_os = "windows")] + crate::input::reset_coalescing(); + + self.cursor_captured = false; + self.state = AppState::Games; + self.streaming_session = None; + self.session = None; // Clear session info + self.input_handler = None; + self.current_frame = None; + self.shared_frame = None; + self.stats_rx = None; + self.selected_game = None; + self.is_loading = false; + self.error_message = None; + + self.status_message = "Stream ended".to_string(); + } + + /// Toggle stats overlay + pub fn toggle_stats(&mut self) { + self.show_stats = !self.show_stats; + } + + /// Save settings + pub fn save_settings(&self) { + if let Err(e) = self.settings.save() { + error!("Failed to save settings: {}", e); + } + } + + /// Get current user display name + pub fn user_display_name(&self) -> &str { + self.user_info.as_ref() + .map(|u| u.display_name.as_str()) + .unwrap_or("User") + } + + /// Get current membership tier + pub fn membership_tier(&self) -> &str { + self.user_info.as_ref() + .map(|u| u.membership_tier.as_str()) + .unwrap_or("FREE") + } + + // Token persistence helpers - cross-platform using data_dir/opennow + // Cached app data directory (initialized once) + fn get_app_data_dir() -> Option { + use std::sync::OnceLock; + static APP_DATA_DIR: OnceLock> = OnceLock::new(); + + APP_DATA_DIR.get_or_init(|| { + let data_dir = dirs::data_dir()?; + let app_dir = data_dir.join("opennow"); + + // Ensure directory exists + if let Err(e) = std::fs::create_dir_all(&app_dir) { + error!("Failed to create app data directory: {}", e); + } + + // Migration: copy auth.json from legacy locations if it doesn't exist in new location + let new_auth = app_dir.join("auth.json"); + if !new_auth.exists() { + // Try legacy opennow-streamer location (config_dir) + if let Some(config_dir) = dirs::config_dir() { + let legacy_path = config_dir.join("opennow-streamer").join("auth.json"); + if legacy_path.exists() { + if let Err(e) = std::fs::copy(&legacy_path, &new_auth) { + warn!("Failed to migrate auth.json from legacy location: {}", e); + } else { + info!("Migrated auth.json from {:?} to {:?}", legacy_path, new_auth); + } + } + } + + // Try gfn-client location (config_dir) + if !new_auth.exists() { + if let Some(config_dir) = dirs::config_dir() { + let legacy_path = config_dir.join("gfn-client").join("auth.json"); + if legacy_path.exists() { + if let Err(e) = std::fs::copy(&legacy_path, &new_auth) { + warn!("Failed to migrate auth.json from gfn-client: {}", e); + } else { + info!("Migrated auth.json from {:?} to {:?}", legacy_path, new_auth); + } + } + } + } + } + + Some(app_dir) + }).clone() + } + + fn tokens_path() -> Option { + Self::get_app_data_dir().map(|p| p.join("auth.json")) + } + + fn load_tokens() -> Option { + let path = Self::tokens_path()?; + let content = std::fs::read_to_string(&path).ok()?; + let tokens: AuthTokens = serde_json::from_str(&content).ok()?; + + // Validate token is not expired + if tokens.is_expired() { + info!("Saved token expired, clearing auth file"); + let _ = std::fs::remove_file(&path); + return None; + } + + Some(tokens) + } + + fn save_tokens(tokens: &AuthTokens) { + if let Some(path) = Self::tokens_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string_pretty(tokens) { + if let Err(e) = std::fs::write(&path, &json) { + error!("Failed to save tokens: {}", e); + } else { + info!("Saved tokens to {:?}", path); + } + } + } + } + + fn clear_tokens() { + if let Some(path) = Self::tokens_path() { + let _ = std::fs::remove_file(path); + info!("Cleared auth tokens"); + } + } + + // Games cache for async fetch + fn games_cache_path() -> Option { + Self::get_app_data_dir().map(|p| p.join("games_cache.json")) + } + + fn save_games_cache(games: &[GameInfo]) { + if let Some(path) = Self::games_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(games) { + let _ = std::fs::write(path, json); + } + } + } + + fn load_games_cache() -> Option> { + let path = Self::games_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() + } + + fn clear_games_cache() { + if let Some(path) = Self::games_cache_path() { + let _ = std::fs::remove_file(path); + } + } + + // Library cache for async fetch + fn library_cache_path() -> Option { + Self::get_app_data_dir().map(|p| p.join("library_cache.json")) + } + + fn save_library_cache(games: &[GameInfo]) { + if let Some(path) = Self::library_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(games) { + let _ = std::fs::write(path, json); + } + } + } + + fn load_library_cache() -> Option> { + let path = Self::library_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() + } + + // Subscription cache for async fetch + fn subscription_cache_path() -> Option { + Self::get_app_data_dir().map(|p| p.join("subscription_cache.json")) + } + + fn save_subscription_cache(sub: &SubscriptionInfo) { + if let Some(path) = Self::subscription_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let cache = serde_json::json!({ + "membership_tier": sub.membership_tier, + "remaining_hours": sub.remaining_hours, + "total_hours": sub.total_hours, + "has_persistent_storage": sub.has_persistent_storage, + "storage_size_gb": sub.storage_size_gb, + }); + if let Ok(json) = serde_json::to_string(&cache) { + let _ = std::fs::write(path, json); + } + } + } + + fn load_subscription_cache() -> Option { + let path = Self::subscription_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + let cache: serde_json::Value = serde_json::from_str(&content).ok()?; + + Some(SubscriptionInfo { + membership_tier: cache.get("membership_tier")?.as_str()?.to_string(), + remaining_hours: cache.get("remaining_hours")?.as_f64()? as f32, + total_hours: cache.get("total_hours")?.as_f64()? as f32, + has_persistent_storage: cache.get("has_persistent_storage")?.as_bool()?, + storage_size_gb: cache.get("storage_size_gb").and_then(|v| v.as_u64()).map(|v| v as u32), + }) + } +} diff --git a/opennow-streamer/src/app/session.rs b/opennow-streamer/src/app/session.rs new file mode 100644 index 0000000..2dc5412 --- /dev/null +++ b/opennow-streamer/src/app/session.rs @@ -0,0 +1,375 @@ +//! Session Management +//! +//! GFN session state and lifecycle. + +use serde::{Deserialize, Serialize}; + +/// Session information +#[derive(Debug, Clone)] +pub struct SessionInfo { + /// Session ID from CloudMatch + pub session_id: String, + + /// Streaming server IP + pub server_ip: String, + + /// Server region/zone + pub zone: String, + + /// Current session state + pub state: SessionState, + + /// GPU type allocated + pub gpu_type: Option, + + /// Signaling WebSocket URL (full URL like wss://server/nvst/) + pub signaling_url: Option, + + /// ICE servers from session API (for Alliance Partners with TURN servers) + pub ice_servers: Vec, + + /// Media connection info (real UDP port for streaming) + pub media_connection_info: Option, +} + +/// ICE server configuration +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct IceServerConfig { + pub urls: Vec, + pub username: Option, + pub credential: Option, +} + +/// Media connection info (real port for Alliance Partners) +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct MediaConnectionInfo { + pub ip: String, + pub port: u16, +} + +/// Session state +#[derive(Debug, Clone, PartialEq)] +pub enum SessionState { + /// Requesting session from CloudMatch + Requesting, + + /// Session created, seat being set up + Launching, + + /// In queue waiting for a seat + InQueue { + position: u32, + eta_secs: u32, + }, + + /// Session ready for streaming + Ready, + + /// Actively streaming + Streaming, + + /// Session error + Error(String), + + /// Session terminated + Terminated, +} + +impl SessionInfo { + /// Create a new session in requesting state + pub fn new_requesting(zone: &str) -> Self { + Self { + session_id: String::new(), + server_ip: String::new(), + zone: zone.to_string(), + state: SessionState::Requesting, + gpu_type: None, + signaling_url: None, + ice_servers: Vec::new(), + media_connection_info: None, + } + } + + /// Check if session is ready to stream + pub fn is_ready(&self) -> bool { + matches!(self.state, SessionState::Ready) + } + + /// Check if session is in queue + pub fn is_queued(&self) -> bool { + matches!(self.state, SessionState::InQueue { .. }) + } + + /// Get queue position if in queue + pub fn queue_position(&self) -> Option { + match self.state { + SessionState::InQueue { position, .. } => Some(position), + _ => None, + } + } +} + +// ============================================ +// CloudMatch API Request Types (Browser Format) +// ============================================ + +/// CloudMatch API request structure (browser format) +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct CloudMatchRequest { + pub session_request_data: SessionRequestData, +} + +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct SessionRequestData { + /// App ID as STRING (browser format) + pub app_id: String, + pub internal_title: Option, + pub available_supported_controllers: Vec, + pub network_test_session_id: Option, + pub parent_session_id: Option, + pub client_identification: String, + pub device_hash_id: String, + pub client_version: String, + pub sdk_version: String, + /// Streamer version as NUMBER (browser format) + pub streamer_version: i32, + pub client_platform_name: String, + pub client_request_monitor_settings: Vec, + pub use_ops: bool, + pub audio_mode: i32, + pub meta_data: Vec, + pub sdr_hdr_mode: i32, + pub client_display_hdr_capabilities: Option, + pub surround_audio_info: i32, + pub remote_controllers_bitmap: i32, + pub client_timezone_offset: i64, + pub enhanced_stream_mode: i32, + pub app_launch_mode: i32, + pub secure_rtsp_supported: bool, + pub partner_custom_data: Option, + pub account_linked: bool, + pub enable_persisting_in_game_settings: bool, + pub user_age: i32, + pub requested_streaming_features: Option, +} + +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct MonitorSettings { + pub width_in_pixels: u32, + pub height_in_pixels: u32, + pub frames_per_second: u32, + pub sdr_hdr_mode: i32, + pub display_data: DisplayData, + pub dpi: i32, +} + +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct DisplayData { + pub desired_content_max_luminance: i32, + pub desired_content_min_luminance: i32, + pub desired_content_max_frame_average_luminance: i32, +} + +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct HdrCapabilities { + pub version: i32, + pub hdr_edr_supported_flags_in_uint32: i32, + pub static_metadata_descriptor_id: i32, +} + +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct MetaDataEntry { + pub key: String, + pub value: String, +} + +#[derive(Debug, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct StreamingFeatures { + pub reflex: bool, + pub bit_depth: i32, + pub cloud_gsync: bool, + pub enabled_l4s: bool, + pub mouse_movement_flags: i32, + pub true_hdr: bool, + pub supported_hid_devices: i32, + pub profile: i32, + pub fallback_to_logical_resolution: bool, + pub hid_devices: Option, + pub chroma_format: i32, + pub prefilter_mode: i32, + pub prefilter_sharpness: i32, + pub prefilter_noise_reduction: i32, + pub hud_streaming_mode: i32, +} + +// ============================================ +// CloudMatch API Response Types +// ============================================ + +/// CloudMatch API response +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct CloudMatchResponse { + pub session: CloudMatchSession, + pub request_status: RequestStatus, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct CloudMatchSession { + pub session_id: String, + #[serde(default)] + pub seat_setup_info: Option, + #[serde(default)] + pub session_control_info: Option, + #[serde(default)] + pub connection_info: Option>, + #[serde(default)] + pub gpu_type: Option, + #[serde(default)] + pub status: i32, + #[serde(default)] + pub error_code: i32, + #[serde(default)] + pub ice_server_configuration: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SeatSetupInfo { + #[serde(default)] + pub queue_position: i32, + #[serde(default)] + pub seat_setup_eta: i32, + #[serde(default)] + pub seat_setup_step: i32, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SessionControlInfo { + #[serde(default)] + pub ip: Option, + #[serde(default)] + pub port: u16, + #[serde(default)] + pub resource_path: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ConnectionInfoData { + #[serde(default)] + pub ip: Option, + #[serde(default)] + pub port: u16, + #[serde(default)] + pub resource_path: Option, + /// Usage type: + /// - 2: Primary media path (UDP) + /// - 14: Signaling (WSS) + /// - 17: Alternative media path + #[serde(default)] + pub usage: i32, + /// Protocol: 1 = TCP/WSS, 2 = UDP + #[serde(default)] + pub protocol: i32, +} + +/// ICE server configuration from session API +#[derive(Debug, Deserialize, Clone)] +#[serde(rename_all = "camelCase")] +pub struct IceServerConfiguration { + #[serde(default)] + pub ice_servers: Vec, +} + +/// Individual ICE server from session API +#[derive(Debug, Deserialize, Clone)] +#[serde(rename_all = "camelCase")] +pub struct SessionIceServer { + pub urls: String, + #[serde(default)] + pub username: Option, + #[serde(default)] + pub credential: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct RequestStatus { + pub status_code: i32, + #[serde(default)] + pub status_description: Option, + #[serde(default)] + pub unified_error_code: i32, + #[serde(default)] + pub server_id: Option, +} + +impl CloudMatchSession { + /// Extract streaming server IP from connection info + pub fn streaming_server_ip(&self) -> Option { + // Look for connection with usage=14 (signaling) first + self.connection_info + .as_ref() + .and_then(|conns| conns.iter().find(|c| c.usage == 14)) + .and_then(|conn| conn.ip.clone()) + .or_else(|| { + self.session_control_info + .as_ref() + .and_then(|sci| sci.ip.clone()) + }) + } + + /// Extract signaling URL from connection info + pub fn signaling_url(&self) -> Option { + self.connection_info + .as_ref() + .and_then(|conns| conns.iter().find(|c| c.usage == 14)) + .and_then(|conn| conn.resource_path.clone()) + } + + /// Extract media connection info (usage=2 or usage=17) + pub fn media_connection_info(&self) -> Option { + self.connection_info.as_ref().and_then(|conns| { + let media_conn = conns.iter() + .find(|c| c.usage == 2) + .or_else(|| conns.iter().find(|c| c.usage == 17)); + + media_conn.and_then(|conn| { + conn.ip.as_ref().filter(|_| conn.port > 0).map(|ip| { + MediaConnectionInfo { + ip: ip.clone(), + port: conn.port, + } + }) + }) + }) + } + + /// Convert ICE server configuration + pub fn ice_servers(&self) -> Vec { + self.ice_server_configuration + .as_ref() + .map(|config| { + config.ice_servers.iter().map(|server| { + IceServerConfig { + urls: vec![server.urls.clone()], + username: server.username.clone(), + credential: server.credential.clone(), + } + }).collect() + }) + .unwrap_or_default() + } +} diff --git a/opennow-streamer/src/auth/mod.rs b/opennow-streamer/src/auth/mod.rs new file mode 100644 index 0000000..81db17e --- /dev/null +++ b/opennow-streamer/src/auth/mod.rs @@ -0,0 +1,707 @@ +//! Authentication Module +//! +//! OAuth flow and token management for NVIDIA accounts. +//! Supports multi-region login via Alliance Partners. + +use anyhow::{Result, Context}; +use log::{info, warn, debug}; +use serde::{Deserialize, Serialize}; +use sha2::{Sha256, Digest}; +use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; +use std::sync::Arc; +use parking_lot::RwLock; + +/// Service URLs API endpoint +const SERVICE_URLS_ENDPOINT: &str = "https://pcs.geforcenow.com/v1/serviceUrls"; + +/// OAuth client configuration +const CLIENT_ID: &str = "ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ"; +const SCOPES: &str = "openid consent email tk_client age"; + +/// Default NVIDIA IDP ID +const DEFAULT_IDP_ID: &str = "PDiAhv2kJTFeQ7WOPqiQ2tRZ7lGhR2X11dXvM4TZSxg"; + +/// GFN CEF User-Agent +const GFN_USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173"; + +/// CEF Origin for CORS +const CEF_ORIGIN: &str = "https://nvfile"; + +/// Available redirect ports +const REDIRECT_PORTS: [u16; 5] = [2259, 6460, 7119, 8870, 9096]; + +// ============================================ +// Login Provider (Alliance Partner) Support +// ============================================ + +/// Login provider from service URLs API +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct LoginProvider { + /// Unique IDP ID for OAuth + pub idp_id: String, + /// Provider code (e.g., "NVIDIA", "KDD", "TWM") + pub login_provider_code: String, + /// Display name (e.g., "NVIDIA", "au", "Taiwan Mobile") + pub login_provider_display_name: String, + /// Internal provider name + pub login_provider: String, + /// Streaming service base URL + pub streaming_service_url: String, + /// Priority for sorting + #[serde(default)] + pub login_provider_priority: i32, +} + +impl LoginProvider { + /// Create default NVIDIA provider + pub fn nvidia_default() -> Self { + Self { + idp_id: DEFAULT_IDP_ID.to_string(), + login_provider_code: "NVIDIA".to_string(), + login_provider_display_name: "NVIDIA".to_string(), + login_provider: "NVIDIA".to_string(), + streaming_service_url: "https://prod.cloudmatchbeta.nvidiagrid.net/".to_string(), + login_provider_priority: 0, + } + } + + /// Check if this is an Alliance Partner (non-NVIDIA) + pub fn is_alliance_partner(&self) -> bool { + self.login_provider_code != "NVIDIA" + } +} + +/// Service URLs API response +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct ServiceUrlsResponse { + request_status: RequestStatus, + gfn_service_info: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct RequestStatus { + status_code: i32, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct GfnServiceInfo { + gfn_service_endpoints: Vec, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct ServiceEndpoint { + idp_id: String, + login_provider_code: String, + login_provider_display_name: String, + login_provider: String, + streaming_service_url: String, + #[serde(default)] + login_provider_priority: i32, +} + +/// Global selected provider storage +lazy_static::lazy_static! { + static ref SELECTED_PROVIDER: Arc>> = Arc::new(RwLock::new(None)); + static ref CACHED_PROVIDERS: Arc>> = Arc::new(RwLock::new(Vec::new())); +} + +/// Fetch available login providers from GFN service URLs API +pub async fn fetch_login_providers() -> Result> { + info!("Fetching login providers from {}", SERVICE_URLS_ENDPOINT); + + let client = reqwest::Client::builder() + .user_agent(GFN_USER_AGENT) + .build()?; + + let response = client + .get(SERVICE_URLS_ENDPOINT) + .header("Accept", "application/json") + .send() + .await + .context("Failed to fetch service URLs")?; + + if !response.status().is_success() { + let status = response.status(); + let body = response.text().await.unwrap_or_default(); + return Err(anyhow::anyhow!("Service URLs request failed: {} - {}", status, body)); + } + + let service_response: ServiceUrlsResponse = response.json().await + .context("Failed to parse service URLs response")?; + + if service_response.request_status.status_code != 1 { + return Err(anyhow::anyhow!("Service URLs API error: status_code={}", + service_response.request_status.status_code)); + } + + let service_info = service_response.gfn_service_info + .ok_or_else(|| anyhow::anyhow!("No service info in response"))?; + + let mut providers: Vec = service_info.gfn_service_endpoints + .into_iter() + .map(|ep| { + // Rename "Brothers Pictures" to "bro.game" + let display_name = if ep.login_provider_code == "BPC" { + "bro.game".to_string() + } else { + ep.login_provider_display_name + }; + + LoginProvider { + idp_id: ep.idp_id, + login_provider_code: ep.login_provider_code, + login_provider_display_name: display_name, + login_provider: ep.login_provider, + streaming_service_url: ep.streaming_service_url, + login_provider_priority: ep.login_provider_priority, + } + }) + .collect(); + + // Sort by priority + providers.sort_by_key(|p| p.login_provider_priority); + + info!("Found {} login providers", providers.len()); + for provider in &providers { + debug!(" - {} ({})", provider.login_provider_display_name, provider.login_provider_code); + } + + // Cache providers + { + let mut cache = CACHED_PROVIDERS.write(); + *cache = providers.clone(); + } + + Ok(providers) +} + +/// Get cached login providers +pub fn get_cached_providers() -> Vec { + CACHED_PROVIDERS.read().clone() +} + +/// Set the selected login provider +pub fn set_login_provider(provider: LoginProvider) { + info!("Setting login provider to: {} ({})", + provider.login_provider_display_name, provider.idp_id); + let mut selected = SELECTED_PROVIDER.write(); + *selected = Some(provider); +} + +/// Get the selected login provider (or default NVIDIA) +pub fn get_selected_provider() -> LoginProvider { + SELECTED_PROVIDER.read() + .clone() + .unwrap_or_else(LoginProvider::nvidia_default) +} + +/// Get the streaming base URL for the selected provider +pub fn get_streaming_base_url() -> String { + let provider = get_selected_provider(); + let url = provider.streaming_service_url; + if url.ends_with('/') { url } else { format!("{}/", url) } +} + +/// Clear the selected provider (reset to NVIDIA default) +pub fn clear_login_provider() { + let mut selected = SELECTED_PROVIDER.write(); + *selected = None; +} + +// ============================================ +// Authentication Tokens +// ============================================ + +/// Authentication tokens +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct AuthTokens { + pub access_token: String, + pub refresh_token: Option, + pub id_token: Option, + pub expires_at: i64, +} + +impl AuthTokens { + /// Check if token is expired + pub fn is_expired(&self) -> bool { + let now = chrono::Utc::now().timestamp(); + now >= self.expires_at + } + + /// Get the JWT token for API calls (id_token if available, else access_token) + pub fn jwt(&self) -> &str { + self.id_token.as_deref().unwrap_or(&self.access_token) + } + + /// Extract user_id from the JWT token + pub fn user_id(&self) -> String { + // Try to extract user_id from JWT payload + let token = self.jwt(); + let parts: Vec<&str> = token.split('.').collect(); + if parts.len() == 3 { + let payload_b64 = parts[1]; + // Add padding if needed + let padded = match payload_b64.len() % 4 { + 2 => format!("{}==", payload_b64), + 3 => format!("{}=", payload_b64), + _ => payload_b64.to_string(), + }; + if let Ok(payload_bytes) = URL_SAFE_NO_PAD.decode(&padded) + .or_else(|_| base64::engine::general_purpose::STANDARD.decode(&padded)) + { + if let Ok(payload_str) = String::from_utf8(payload_bytes) { + #[derive(Deserialize)] + struct JwtSub { sub: String } + if let Ok(payload) = serde_json::from_str::(&payload_str) { + return payload.sub; + } + } + } + } + // Fallback + "unknown".to_string() + } +} + +/// User info from JWT or userinfo endpoint +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct UserInfo { + pub user_id: String, + pub display_name: String, + pub email: Option, + pub avatar_url: Option, + pub membership_tier: String, +} + +// ============================================ +// PKCE Challenge +// ============================================ + +/// PKCE code verifier and challenge +pub struct PkceChallenge { + pub verifier: String, + pub challenge: String, +} + +impl PkceChallenge { + /// Generate a new PKCE challenge + pub fn new() -> Self { + // Generate random 64-character verifier + let verifier: String = (0..64) + .map(|_| { + let idx = rand::random::() % 62; + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" + .chars() + .nth(idx) + .unwrap() + }) + .collect(); + + // Generate SHA256 challenge + let mut hasher = Sha256::new(); + hasher.update(verifier.as_bytes()); + let challenge = URL_SAFE_NO_PAD.encode(hasher.finalize()); + + Self { verifier, challenge } + } +} + +impl Default for PkceChallenge { + fn default() -> Self { + Self::new() + } +} + +// ============================================ +// OAuth Flow +// ============================================ + +/// Find an available port for OAuth callback +pub fn find_available_port() -> Option { + for port in REDIRECT_PORTS { + if std::net::TcpListener::bind(format!("127.0.0.1:{}", port)).is_ok() { + return Some(port); + } + } + None +} + +/// Build the OAuth authorization URL with provider-specific IDP ID +pub fn build_auth_url(pkce: &PkceChallenge, port: u16) -> String { + let provider = get_selected_provider(); + let redirect_uri = format!("http://localhost:{}", port); + let nonce = generate_nonce(); + let device_id = get_device_id(); + + format!( + "https://login.nvidia.com/authorize?\ + response_type=code&\ + device_id={}&\ + scope={}&\ + client_id={}&\ + redirect_uri={}&\ + ui_locales=en_US&\ + nonce={}&\ + prompt=select_account&\ + code_challenge={}&\ + code_challenge_method=S256&\ + idp_id={}", + device_id, + urlencoding::encode(SCOPES), + CLIENT_ID, + urlencoding::encode(&redirect_uri), + nonce, + pkce.challenge, + provider.idp_id + ) +} + +/// Generate a UUID-like nonce +fn generate_nonce() -> String { + use std::time::{SystemTime, UNIX_EPOCH}; + + let timestamp = SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_nanos(); + + let mut hasher = Sha256::new(); + hasher.update(timestamp.to_le_bytes()); + hasher.update(std::process::id().to_le_bytes()); + hasher.update(b"nonce"); + let hash = hasher.finalize(); + + format!( + "{:08x}-{:04x}-{:04x}-{:04x}-{:012x}", + u32::from_le_bytes([hash[0], hash[1], hash[2], hash[3]]), + u16::from_le_bytes([hash[4], hash[5]]), + u16::from_le_bytes([hash[6], hash[7]]), + u16::from_le_bytes([hash[8], hash[9]]), + u64::from_le_bytes([hash[10], hash[11], hash[12], hash[13], hash[14], hash[15], 0, 0]) & 0xffffffffffff + ) +} + +/// Get or generate device ID +fn get_device_id() -> String { + // Try to read from official GFN client config + if let Some(app_data) = std::env::var_os("LOCALAPPDATA") { + let gfn_config = std::path::PathBuf::from(app_data) + .join("NVIDIA Corporation") + .join("GeForceNOW") + .join("sharedstorage.json"); + + if gfn_config.exists() { + if let Ok(content) = std::fs::read_to_string(&gfn_config) { + if let Ok(json) = serde_json::from_str::(&content) { + if let Some(device_id) = json.get("gfnTelemetry") + .and_then(|t| t.get("deviceId")) + .and_then(|d| d.as_str()) { + return device_id.to_string(); + } + } + } + } + } + + // Generate stable device ID + let mut hasher = Sha256::new(); + if let Ok(hostname) = std::env::var("COMPUTERNAME") { + hasher.update(hostname.as_bytes()); + } + if let Ok(username) = std::env::var("USERNAME") { + hasher.update(username.as_bytes()); + } + hasher.update(b"opennow-streamer"); + hex::encode(hasher.finalize()) +} + +/// Exchange authorization code for tokens +pub async fn exchange_code(code: &str, verifier: &str, port: u16) -> Result { + let redirect_uri = format!("http://localhost:{}", port); + + info!("Exchanging authorization code for tokens..."); + + let client = reqwest::Client::builder() + .user_agent(GFN_USER_AGENT) + .build()?; + + // Official client does NOT include client_id in token request + let params = [ + ("grant_type", "authorization_code"), + ("code", code), + ("redirect_uri", redirect_uri.as_str()), + ("code_verifier", verifier), + ]; + + let response = client + .post("https://login.nvidia.com/token") + .header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") + .header("Origin", CEF_ORIGIN) + .header("Referer", format!("{}/", CEF_ORIGIN)) + .header("Accept", "application/json, text/plain, */*") + .form(¶ms) + .send() + .await + .context("Token exchange request failed")?; + + if !response.status().is_success() { + let status = response.status(); + let error_text = response.text().await.unwrap_or_default(); + return Err(anyhow::anyhow!("Token exchange failed: {} - {}", status, error_text)); + } + + #[derive(Deserialize)] + struct TokenResponse { + access_token: String, + refresh_token: Option, + id_token: Option, + expires_in: Option, + } + + let token_response: TokenResponse = response.json().await + .context("Failed to parse token response")?; + + let expires_at = chrono::Utc::now().timestamp() + + token_response.expires_in.unwrap_or(86400); + + info!("Token exchange successful!"); + + Ok(AuthTokens { + access_token: token_response.access_token, + refresh_token: token_response.refresh_token, + id_token: token_response.id_token, + expires_at, + }) +} + +/// Refresh an expired token +pub async fn refresh_token(refresh_token: &str) -> Result { + let client = reqwest::Client::builder() + .user_agent(GFN_USER_AGENT) + .build()?; + + let params = [ + ("grant_type", "refresh_token"), + ("refresh_token", refresh_token), + ("client_id", CLIENT_ID), + ]; + + let response = client + .post("https://login.nvidia.com/token") + .header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") + .header("Origin", CEF_ORIGIN) + .header("Accept", "application/json, text/plain, */*") + .form(¶ms) + .send() + .await + .context("Token refresh request failed")?; + + if !response.status().is_success() { + let error_text = response.text().await.unwrap_or_default(); + return Err(anyhow::anyhow!("Token refresh failed: {}", error_text)); + } + + #[derive(Deserialize)] + struct TokenResponse { + access_token: String, + refresh_token: Option, + id_token: Option, + expires_in: Option, + } + + let token_response: TokenResponse = response.json().await + .context("Failed to parse refresh response")?; + + let expires_at = chrono::Utc::now().timestamp() + + token_response.expires_in.unwrap_or(86400); + + Ok(AuthTokens { + access_token: token_response.access_token, + refresh_token: token_response.refresh_token, + id_token: token_response.id_token, + expires_at, + }) +} + +/// Decode JWT and extract user info +pub fn decode_jwt_user_info(token: &str) -> Result { + let parts: Vec<&str> = token.split('.').collect(); + if parts.len() != 3 { + return Err(anyhow::anyhow!("Invalid JWT format")); + } + + let payload_b64 = parts[1]; + let padded = match payload_b64.len() % 4 { + 2 => format!("{}==", payload_b64), + 3 => format!("{}=", payload_b64), + _ => payload_b64.to_string(), + }; + + let payload_bytes = URL_SAFE_NO_PAD.decode(&padded) + .or_else(|_| base64::engine::general_purpose::STANDARD.decode(&padded)) + .context("Failed to decode JWT payload")?; + + let payload_str = String::from_utf8(payload_bytes) + .context("Invalid UTF-8 in JWT")?; + + #[derive(Deserialize)] + struct JwtPayload { + sub: String, + email: Option, + preferred_username: Option, + gfn_tier: Option, + picture: Option, + } + + let payload: JwtPayload = serde_json::from_str(&payload_str) + .context("Failed to parse JWT payload")?; + + let display_name = payload.preferred_username + .or_else(|| payload.email.as_ref().map(|e| e.split('@').next().unwrap_or("User").to_string())) + .unwrap_or_else(|| "User".to_string()); + + let membership_tier = payload.gfn_tier.unwrap_or_else(|| "FREE".to_string()); + + Ok(UserInfo { + user_id: payload.sub, + display_name, + email: payload.email, + avatar_url: payload.picture, + membership_tier, + }) +} + +/// Fetch user info from /userinfo endpoint +pub async fn fetch_userinfo(access_token: &str) -> Result { + let client = reqwest::Client::builder() + .user_agent(GFN_USER_AGENT) + .build()?; + + let response = client + .get("https://login.nvidia.com/userinfo") + .header("Authorization", format!("Bearer {}", access_token)) + .header("Origin", CEF_ORIGIN) + .header("Accept", "application/json") + .send() + .await + .context("Userinfo request failed")?; + + if !response.status().is_success() { + return Err(anyhow::anyhow!("Userinfo failed: {}", response.status())); + } + + #[derive(Deserialize)] + struct UserinfoResponse { + sub: String, + preferred_username: Option, + email: Option, + picture: Option, + } + + let userinfo: UserinfoResponse = response.json().await + .context("Failed to parse userinfo")?; + + let display_name = userinfo.preferred_username + .or_else(|| userinfo.email.as_ref().map(|e| e.split('@').next().unwrap_or("User").to_string())) + .unwrap_or_else(|| "User".to_string()); + + Ok(UserInfo { + user_id: userinfo.sub, + display_name, + email: userinfo.email, + avatar_url: userinfo.picture, + membership_tier: "FREE".to_string(), // /userinfo doesn't return tier + }) +} + +/// Get user info from tokens (prefer id_token JWT, fallback to /userinfo) +pub async fn get_user_info(tokens: &AuthTokens) -> Result { + // Try id_token first + if let Some(ref id_token) = tokens.id_token { + if let Ok(user) = decode_jwt_user_info(id_token) { + return Ok(user); + } + } + + // Fallback to /userinfo + fetch_userinfo(&tokens.access_token).await +} + +/// Start OAuth callback server and wait for code +pub async fn start_callback_server(port: u16) -> Result { + use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader}; + use tokio::net::TcpListener; + + let listener = TcpListener::bind(format!("127.0.0.1:{}", port)).await + .context("Failed to bind callback server")?; + + info!("OAuth callback server listening on http://127.0.0.1:{}", port); + + let (mut socket, _) = listener.accept().await + .context("Failed to accept connection")?; + + let mut reader = BufReader::new(&mut socket); + let mut request_line = String::new(); + reader.read_line(&mut request_line).await?; + + // Parse the code from: GET /callback?code=abc123 HTTP/1.1 + let code = request_line + .split_whitespace() + .nth(1) + .and_then(|path| { + path.split('?') + .nth(1) + .and_then(|query| { + query.split('&') + .find(|param| param.starts_with("code=")) + .map(|param| param.trim_start_matches("code=").to_string()) + }) + }) + .context("No authorization code in callback")?; + + // Send success response + let response = r#"HTTP/1.1 200 OK +Content-Type: text/html + + + + + Login Successful + + + +
+

Login Successful!

+

You can close this window and return to OpenNow Streamer.

+
+ + +"#; + + socket.write_all(response.as_bytes()).await?; + + Ok(code) +} diff --git a/opennow-streamer/src/gui/image_cache.rs b/opennow-streamer/src/gui/image_cache.rs new file mode 100644 index 0000000..f6737b6 --- /dev/null +++ b/opennow-streamer/src/gui/image_cache.rs @@ -0,0 +1,170 @@ +//! Image Cache for Game Art +//! +//! Loads and caches game box art images for display in the UI. + +use std::collections::HashMap; +use std::sync::Arc; +use parking_lot::RwLock; +use log::{info, debug, warn}; + +/// Image loading state +#[derive(Clone)] +pub enum ImageState { + /// Not yet requested + NotLoaded, + /// Currently loading + Loading, + /// Successfully loaded (RGBA pixels, width, height) + Loaded(Arc>, u32, u32), + /// Failed to load + Failed, +} + +/// Global image cache +pub struct ImageCache { + /// Map from URL to image state + images: RwLock>, + /// HTTP client for fetching images + client: reqwest::Client, +} + +impl ImageCache { + pub fn new() -> Self { + let client = reqwest::Client::builder() + .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/128.0.0.0") + .build() + .expect("Failed to create HTTP client"); + + Self { + images: RwLock::new(HashMap::new()), + client, + } + } + + /// Get image state for a URL + pub fn get(&self, url: &str) -> ImageState { + let images = self.images.read(); + images.get(url).cloned().unwrap_or(ImageState::NotLoaded) + } + + /// Request loading an image (non-blocking) + pub fn request_load(&self, url: String, runtime: tokio::runtime::Handle) { + // Check if already loading or loaded + { + let images = self.images.read(); + if images.contains_key(&url) { + return; // Already in progress or loaded + } + } + + // Mark as loading + { + let mut images = self.images.write(); + images.insert(url.clone(), ImageState::Loading); + } + + // Spawn async task to load image + let client = self.client.clone(); + let url_clone = url.clone(); + let images = Arc::new(self.images.read().clone()); + + // We need to use a static or leaked reference for the cache update + // For simplicity, we'll use a channel pattern + runtime.spawn(async move { + match Self::load_image_async(&client, &url_clone).await { + Ok((pixels, width, height)) => { + debug!("Loaded image: {} ({}x{})", url_clone, width, height); + LOADED_IMAGES.write().insert(url_clone, ImageState::Loaded(Arc::new(pixels), width, height)); + } + Err(e) => { + warn!("Failed to load image {}: {}", url_clone, e); + LOADED_IMAGES.write().insert(url_clone, ImageState::Failed); + } + } + }); + } + + /// Load an image asynchronously + async fn load_image_async(client: &reqwest::Client, url: &str) -> anyhow::Result<(Vec, u32, u32)> { + use anyhow::Context; + + let response = client.get(url) + .header("Accept", "image/webp,image/png,image/jpeg,*/*") + .header("Referer", "https://play.geforcenow.com/") + .send() + .await + .context("Failed to fetch image")?; + + if !response.status().is_success() { + return Err(anyhow::anyhow!("Image fetch failed: {}", response.status())); + } + + let bytes = response.bytes().await + .context("Failed to read image bytes")?; + + // Decode image + let img = image::load_from_memory(&bytes) + .context("Failed to decode image")?; + + let rgba = img.to_rgba8(); + let width = rgba.width(); + let height = rgba.height(); + let pixels = rgba.into_raw(); + + Ok((pixels, width, height)) + } + + /// Check for newly loaded images and update cache + pub fn update(&self) { + let loaded = LOADED_IMAGES.read().clone(); + if !loaded.is_empty() { + let mut images = self.images.write(); + for (url, state) in loaded.iter() { + images.insert(url.clone(), state.clone()); + } + } + } +} + +impl Default for ImageCache { + fn default() -> Self { + Self::new() + } +} + +// Global storage for loaded images (workaround for async updates) +lazy_static::lazy_static! { + static ref LOADED_IMAGES: RwLock> = RwLock::new(HashMap::new()); +} + +/// Global image cache instance +lazy_static::lazy_static! { + pub static ref IMAGE_CACHE: ImageCache = ImageCache::new(); +} + +/// Convenience function to get an image (returns None if not loaded yet) +pub fn get_image(url: &str) -> Option<(Arc>, u32, u32)> { + // First check the global loaded images + { + let loaded = LOADED_IMAGES.read(); + if let Some(ImageState::Loaded(pixels, w, h)) = loaded.get(url) { + return Some((pixels.clone(), *w, *h)); + } + } + + // Then check the main cache + match IMAGE_CACHE.get(url) { + ImageState::Loaded(pixels, w, h) => Some((pixels, w, h)), + _ => None, + } +} + +/// Request loading an image +pub fn request_image(url: &str, runtime: &tokio::runtime::Handle) { + IMAGE_CACHE.request_load(url.to_string(), runtime.clone()); +} + +/// Update the image cache (call from main loop) +pub fn update_cache() { + IMAGE_CACHE.update(); +} diff --git a/opennow-streamer/src/gui/mod.rs b/opennow-streamer/src/gui/mod.rs new file mode 100644 index 0000000..2a03063 --- /dev/null +++ b/opennow-streamer/src/gui/mod.rs @@ -0,0 +1,13 @@ +//! GUI Module +//! +//! Window management, rendering, and stats overlay. + +mod renderer; +mod stats_panel; +pub mod image_cache; + +pub use renderer::Renderer; +pub use stats_panel::StatsPanel; +pub use image_cache::{get_image, request_image, update_cache}; + +use winit::dpi::PhysicalSize; diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs new file mode 100644 index 0000000..a268da2 --- /dev/null +++ b/opennow-streamer/src/gui/renderer.rs @@ -0,0 +1,2411 @@ +//! GPU Renderer +//! +//! wgpu-based rendering for video frames and UI overlays. + +use anyhow::{Result, Context}; +use log::{info, debug, warn}; +use std::sync::Arc; +use winit::dpi::PhysicalSize; +use winit::event::WindowEvent; +use winit::event_loop::ActiveEventLoop; +use winit::window::{Window, WindowAttributes, Fullscreen, CursorGrabMode}; + +use crate::app::{App, AppState, UiAction, GamesTab, SettingChange}; +use crate::media::VideoFrame; +use super::StatsPanel; +use super::image_cache; +use std::collections::HashMap; + +/// WGSL shader for full-screen video quad with YUV to RGB conversion +/// Uses 3 separate textures (Y, U, V) for GPU-accelerated color conversion +/// This eliminates the CPU bottleneck of converting ~600M pixels/sec at 1440p165 +const VIDEO_SHADER: &str = r#" +struct VertexOutput { + @builtin(position) position: vec4, + @location(0) tex_coord: vec2, +}; + +@vertex +fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { + // Full-screen quad (2 triangles = 6 vertices) + var positions = array, 6>( + vec2(-1.0, -1.0), // bottom-left + vec2( 1.0, -1.0), // bottom-right + vec2(-1.0, 1.0), // top-left + vec2(-1.0, 1.0), // top-left + vec2( 1.0, -1.0), // bottom-right + vec2( 1.0, 1.0), // top-right + ); + + var tex_coords = array, 6>( + vec2(0.0, 1.0), // bottom-left + vec2(1.0, 1.0), // bottom-right + vec2(0.0, 0.0), // top-left + vec2(0.0, 0.0), // top-left + vec2(1.0, 1.0), // bottom-right + vec2(1.0, 0.0), // top-right + ); + + var output: VertexOutput; + output.position = vec4(positions[vertex_index], 0.0, 1.0); + output.tex_coord = tex_coords[vertex_index]; + return output; +} + +// YUV planar textures (Y = full res, U/V = half res) +@group(0) @binding(0) +var y_texture: texture_2d; +@group(0) @binding(1) +var u_texture: texture_2d; +@group(0) @binding(2) +var v_texture: texture_2d; +@group(0) @binding(3) +var video_sampler: sampler; + +@fragment +fn fs_main(input: VertexOutput) -> @location(0) vec4 { + // Sample Y, U, V planes + // Y is full resolution, U/V are half resolution (4:2:0 subsampling) + // The sampler handles the upscaling of U/V automatically + let y = textureSample(y_texture, video_sampler, input.tex_coord).r; + let u = textureSample(u_texture, video_sampler, input.tex_coord).r - 0.5; + let v = textureSample(v_texture, video_sampler, input.tex_coord).r - 0.5; + + // BT.601 YUV to RGB conversion (full range) + // R = Y + 1.402 * V + // G = Y - 0.344 * U - 0.714 * V + // B = Y + 1.772 * U + let r = y + 1.402 * v; + let g = y - 0.344 * u - 0.714 * v; + let b = y + 1.772 * u; + + return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); +} +"#; + +/// Main renderer +pub struct Renderer { + window: Arc, + surface: wgpu::Surface<'static>, + device: wgpu::Device, + queue: wgpu::Queue, + config: wgpu::SurfaceConfiguration, + size: PhysicalSize, + + // egui integration + egui_ctx: egui::Context, + egui_state: egui_winit::State, + egui_renderer: egui_wgpu::Renderer, + + // Video rendering pipeline (GPU YUV->RGB conversion) + video_pipeline: wgpu::RenderPipeline, + video_bind_group_layout: wgpu::BindGroupLayout, + video_sampler: wgpu::Sampler, + // YUV planar textures (Y = full res, U/V = half res for 4:2:0) + y_texture: Option, + u_texture: Option, + v_texture: Option, + video_bind_group: Option, + video_size: (u32, u32), + + // Stats panel + stats_panel: StatsPanel, + + // Fullscreen state + fullscreen: bool, + + // Swapchain error recovery state + // Tracks consecutive Outdated errors to avoid panic-fixing with wrong resolution + consecutive_surface_errors: u32, + + // Game art texture cache (URL -> TextureHandle) + game_textures: HashMap, +} + +impl Renderer { + /// Create a new renderer + pub async fn new(event_loop: &ActiveEventLoop) -> Result { + // Create window attributes + let window_attrs = WindowAttributes::default() + .with_title("OpenNOW") + .with_inner_size(PhysicalSize::new(1280, 720)) + .with_min_inner_size(PhysicalSize::new(640, 480)) + .with_resizable(true); + + // Create window and wrap in Arc for surface creation + let window = Arc::new( + event_loop.create_window(window_attrs) + .context("Failed to create window")? + ); + + let size = window.inner_size(); + + info!("Window created: {}x{}", size.width, size.height); + + // Create wgpu instance + // Force DX12 on Windows for better exclusive fullscreen support and lower latency + // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition + #[cfg(target_os = "windows")] + let backends = wgpu::Backends::DX12; + #[cfg(not(target_os = "windows"))] + let backends = wgpu::Backends::all(); + + info!("Using wgpu backend: {:?}", backends); + + let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor { + backends, + ..Default::default() + }); + + // Create surface from Arc + let surface = instance.create_surface(window.clone()) + .context("Failed to create surface")?; + + // Get adapter + let adapter = instance + .request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::HighPerformance, + compatible_surface: Some(&surface), + force_fallback_adapter: false, + }) + .await + .context("Failed to find GPU adapter")?; + + let adapter_info = adapter.get_info(); + info!("GPU: {} (Backend: {:?}, Driver: {})", + adapter_info.name, + adapter_info.backend, + adapter_info.driver_info + ); + + // Print to console directly for visibility (bypasses log filter) + crate::utils::console_print(&format!( + "[GPU] {} using {:?} backend", + adapter_info.name, + adapter_info.backend + )); + + // Create device and queue + let (device, queue) = adapter + .request_device(&wgpu::DeviceDescriptor::default()) + .await + .context("Failed to create device")?; + + // Configure surface + let surface_caps = surface.get_capabilities(&adapter); + let surface_format = surface_caps + .formats + .iter() + .find(|f| f.is_srgb()) + .copied() + .unwrap_or(surface_caps.formats[0]); + + // Use Immediate present mode for lowest latency (no VSync) + // Fall back to Mailbox if Immediate not available, then Fifo (VSync) + let present_mode = if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { + wgpu::PresentMode::Immediate + } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Mailbox) { + wgpu::PresentMode::Mailbox + } else { + wgpu::PresentMode::Fifo + }; + info!("Using present mode: {:?}", present_mode); + + let config = wgpu::SurfaceConfiguration { + usage: wgpu::TextureUsages::RENDER_ATTACHMENT, + format: surface_format, + width: size.width, + height: size.height, + present_mode, + alpha_mode: surface_caps.alpha_modes[0], + view_formats: vec![], + desired_maximum_frame_latency: 1, // Minimize frame queue for lower latency + }; + + surface.configure(&device, &config); + + // Create egui context + let egui_ctx = egui::Context::default(); + + // Create egui-winit state (egui 0.33 API) + let egui_state = egui_winit::State::new( + egui_ctx.clone(), + egui::ViewportId::default(), + &window, + Some(window.scale_factor() as f32), + None, + None, + ); + + // Create egui-wgpu renderer (egui 0.33 API) + let egui_renderer = egui_wgpu::Renderer::new( + &device, + surface_format, + egui_wgpu::RendererOptions::default(), + ); + + // Create video rendering pipeline + let video_shader = device.create_shader_module(wgpu::ShaderModuleDescriptor { + label: Some("Video Shader"), + source: wgpu::ShaderSource::Wgsl(VIDEO_SHADER.into()), + }); + + // Bind group layout for YUV planar textures (GPU color conversion) + let video_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { + label: Some("Video YUV Bind Group Layout"), + entries: &[ + // Y texture (full resolution) + wgpu::BindGroupLayoutEntry { + binding: 0, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Texture { + sample_type: wgpu::TextureSampleType::Float { filterable: true }, + view_dimension: wgpu::TextureViewDimension::D2, + multisampled: false, + }, + count: None, + }, + // U texture (half resolution) + wgpu::BindGroupLayoutEntry { + binding: 1, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Texture { + sample_type: wgpu::TextureSampleType::Float { filterable: true }, + view_dimension: wgpu::TextureViewDimension::D2, + multisampled: false, + }, + count: None, + }, + // V texture (half resolution) + wgpu::BindGroupLayoutEntry { + binding: 2, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Texture { + sample_type: wgpu::TextureSampleType::Float { filterable: true }, + view_dimension: wgpu::TextureViewDimension::D2, + multisampled: false, + }, + count: None, + }, + // Sampler + wgpu::BindGroupLayoutEntry { + binding: 3, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering), + count: None, + }, + ], + }); + + let video_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { + label: Some("Video Pipeline Layout"), + bind_group_layouts: &[&video_bind_group_layout], + push_constant_ranges: &[], + }); + + let video_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { + label: Some("Video Pipeline"), + layout: Some(&video_pipeline_layout), + vertex: wgpu::VertexState { + module: &video_shader, + entry_point: Some("vs_main"), + buffers: &[], + compilation_options: Default::default(), + }, + fragment: Some(wgpu::FragmentState { + module: &video_shader, + entry_point: Some("fs_main"), + targets: &[Some(wgpu::ColorTargetState { + format: surface_format, + blend: Some(wgpu::BlendState::REPLACE), + write_mask: wgpu::ColorWrites::ALL, + })], + compilation_options: Default::default(), + }), + primitive: wgpu::PrimitiveState { + topology: wgpu::PrimitiveTopology::TriangleList, + strip_index_format: None, + front_face: wgpu::FrontFace::Ccw, + cull_mode: None, + polygon_mode: wgpu::PolygonMode::Fill, + unclipped_depth: false, + conservative: false, + }, + depth_stencil: None, + multisample: wgpu::MultisampleState::default(), + multiview: None, + cache: None, + }); + + let video_sampler = device.create_sampler(&wgpu::SamplerDescriptor { + label: Some("Video Sampler"), + address_mode_u: wgpu::AddressMode::ClampToEdge, + address_mode_v: wgpu::AddressMode::ClampToEdge, + address_mode_w: wgpu::AddressMode::ClampToEdge, + mag_filter: wgpu::FilterMode::Linear, + min_filter: wgpu::FilterMode::Linear, + mipmap_filter: wgpu::FilterMode::Nearest, + ..Default::default() + }); + + // Create stats panel + let stats_panel = StatsPanel::new(); + + Ok(Self { + window, + surface, + device, + queue, + config, + size, + egui_ctx, + egui_state, + egui_renderer, + video_pipeline, + video_bind_group_layout, + video_sampler, + y_texture: None, + u_texture: None, + v_texture: None, + video_bind_group: None, + video_size: (0, 0), + stats_panel, + fullscreen: false, + consecutive_surface_errors: 0, + game_textures: HashMap::new(), + }) + } + + /// Get window reference + pub fn window(&self) -> &Window { + &self.window + } + + /// Handle window event + pub fn handle_event(&mut self, event: &WindowEvent) -> bool { + let response = self.egui_state.on_window_event(&self.window, event); + response.consumed + } + + /// Resize the renderer + /// Filters out spurious resize events that occur during fullscreen transitions + pub fn resize(&mut self, new_size: PhysicalSize) { + if new_size.width == 0 || new_size.height == 0 { + return; + } + + // If we're in fullscreen mode, STRICTLY enforce that the resize matches the monitor + // This prevents the race condition where the old windowed size (e.g., 1296x759) + // is briefly reported during the fullscreen transition, causing DWM composition. + if self.fullscreen { + if let Some(monitor) = self.window.current_monitor() { + let monitor_size = monitor.size(); + + // Calculate deviation from monitor size (must be within 5%) + let width_ratio = new_size.width as f32 / monitor_size.width as f32; + let height_ratio = new_size.height as f32 / monitor_size.height as f32; + + // Reject if not within 95-105% of monitor resolution + if width_ratio < 0.95 || width_ratio > 1.05 || height_ratio < 0.95 || height_ratio > 1.05 { + debug!( + "Ignoring resize to {}x{} while in fullscreen (monitor: {}x{}, ratio: {:.2}x{:.2})", + new_size.width, new_size.height, + monitor_size.width, monitor_size.height, + width_ratio, height_ratio + ); + return; + } + } + } + + self.size = new_size; + self.configure_surface(); + } + + /// Configure the surface with current size and optimal present mode + /// Called on resize and to recover from swapchain errors + fn configure_surface(&mut self) { + self.config.width = self.size.width; + self.config.height = self.size.height; + self.surface.configure(&self.device, &self.config); + info!( + "Surface configured: {}x{} @ {:?} (frame latency: {})", + self.config.width, + self.config.height, + self.config.present_mode, + self.config.desired_maximum_frame_latency + ); + } + + /// Recover from swapchain errors (Outdated/Lost) + /// Returns true if recovery was successful + fn recover_swapchain(&mut self) -> bool { + // Get current window size - it may have changed (e.g., fullscreen toggle) + let current_size = self.window.inner_size(); + if current_size.width == 0 || current_size.height == 0 { + warn!("Cannot recover swapchain: window size is zero"); + return false; + } + + // Update size and reconfigure + self.size = current_size; + self.configure_surface(); + info!( + "Swapchain recovered: {}x{} @ {:?}", + self.size.width, + self.size.height, + self.config.present_mode + ); + true + } + + /// Toggle fullscreen with high refresh rate support + /// Uses exclusive fullscreen to bypass the desktop compositor (DWM) for lowest latency + /// and selects the highest available refresh rate for the current resolution + pub fn toggle_fullscreen(&mut self) { + self.fullscreen = !self.fullscreen; + + if self.fullscreen { + // Try to find the best video mode (highest refresh rate at current resolution) + let current_monitor = self.window.current_monitor(); + + if let Some(monitor) = current_monitor { + let current_size = self.window.inner_size(); + let mut best_mode: Option = None; + let mut best_refresh_rate: u32 = 0; + + info!("Searching for video modes on monitor: {:?}", monitor.name()); + info!("Current window size: {}x{}", current_size.width, current_size.height); + + // Log all available video modes for debugging + let mut mode_count = 0; + for mode in monitor.video_modes() { + let mode_size = mode.size(); + let refresh_rate = mode.refresh_rate_millihertz() / 1000; // Convert to Hz + + // Log high refresh rate modes (>= 100Hz) or modes matching our resolution + if refresh_rate >= 100 || (mode_size.width == current_size.width && mode_size.height == current_size.height) { + debug!( + " Available mode: {}x{} @ {}Hz ({}mHz)", + mode_size.width, + mode_size.height, + refresh_rate, + mode.refresh_rate_millihertz() + ); + } + mode_count += 1; + + // Match resolution (or close to it) and pick highest refresh rate + if mode_size.width >= current_size.width && mode_size.height >= current_size.height { + if refresh_rate > best_refresh_rate { + best_refresh_rate = refresh_rate; + best_mode = Some(mode); + } + } + } + info!("Total video modes available: {}", mode_count); + + // If we found a high refresh rate mode, use exclusive fullscreen + if let Some(mode) = best_mode { + let refresh_hz = mode.refresh_rate_millihertz() / 1000; + info!( + "SELECTED exclusive fullscreen: {}x{} @ {}Hz ({}mHz)", + mode.size().width, + mode.size().height, + refresh_hz, + mode.refresh_rate_millihertz() + ); + + // Use exclusive fullscreen for lowest latency (bypasses DWM compositor) + self.window.set_fullscreen(Some(Fullscreen::Exclusive(mode))); + return; + } else { + info!("No suitable exclusive fullscreen mode found"); + } + } else { + info!("No current monitor detected"); + } + + // Fallback to borderless if no suitable mode found + info!("Entering borderless fullscreen (DWM compositor active - may limit to 60fps)"); + self.window.set_fullscreen(Some(Fullscreen::Borderless(None))); + } else { + info!("Exiting fullscreen"); + self.window.set_fullscreen(None); + } + } + + /// Enter fullscreen with a specific target refresh rate + /// Useful when the stream FPS is known (e.g., 120fps stream -> 120Hz mode) + pub fn set_fullscreen_with_refresh(&mut self, target_fps: u32) { + let current_monitor = self.window.current_monitor(); + + if let Some(monitor) = current_monitor { + let current_size = self.window.inner_size(); + let mut best_mode: Option = None; + let mut best_refresh_diff: i32 = i32::MAX; + + // Find mode closest to target FPS + for mode in monitor.video_modes() { + let mode_size = mode.size(); + let refresh_rate = mode.refresh_rate_millihertz() / 1000; + + if mode_size.width >= current_size.width && mode_size.height >= current_size.height { + let diff = (refresh_rate as i32 - target_fps as i32).abs(); + // Prefer modes >= target FPS + let adjusted_diff = if refresh_rate >= target_fps { diff } else { diff + 1000 }; + + if adjusted_diff < best_refresh_diff { + best_refresh_diff = adjusted_diff; + best_mode = Some(mode); + } + } + } + + if let Some(mode) = best_mode { + let refresh_hz = mode.refresh_rate_millihertz() / 1000; + info!( + "Entering exclusive fullscreen for {}fps stream: {}x{} @ {}Hz", + target_fps, + mode.size().width, + mode.size().height, + refresh_hz + ); + self.fullscreen = true; + self.window.set_fullscreen(Some(Fullscreen::Exclusive(mode))); + return; + } + } + + // Fallback + self.fullscreen = true; + self.window.set_fullscreen(Some(Fullscreen::Borderless(None))); + } + + /// Lock cursor for streaming (captures mouse) + pub fn lock_cursor(&self) { + // Try confined first, then locked mode + if let Err(e) = self.window.set_cursor_grab(CursorGrabMode::Confined) { + info!("Confined cursor grab failed ({}), trying locked mode", e); + if let Err(e) = self.window.set_cursor_grab(CursorGrabMode::Locked) { + log::warn!("Failed to lock cursor: {}", e); + } + } + self.window.set_cursor_visible(false); + info!("Cursor locked for streaming"); + } + + /// Unlock cursor + pub fn unlock_cursor(&self) { + let _ = self.window.set_cursor_grab(CursorGrabMode::None); + self.window.set_cursor_visible(true); + info!("Cursor unlocked"); + } + + /// Check if fullscreen + pub fn is_fullscreen(&self) -> bool { + self.fullscreen + } + + /// Update video textures from frame (GPU YUV->RGB conversion) + /// Uploads Y, U, V planes directly - NO CPU color conversion! + pub fn update_video(&mut self, frame: &VideoFrame) { + let uv_width = frame.width / 2; + let uv_height = frame.height / 2; + + // Check if we need to recreate textures + if self.video_size != (frame.width, frame.height) { + // Y texture (full resolution, single channel) + let y_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("Y Texture"), + size: wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + // U texture (half resolution, single channel) + let u_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("U Texture"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + // V texture (half resolution, single channel) + let v_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("V Texture"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + // Create bind group with all 3 textures + let y_view = y_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let u_view = u_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let v_view = v_texture.create_view(&wgpu::TextureViewDescriptor::default()); + + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("Video YUV Bind Group"), + layout: &self.video_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&y_view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::TextureView(&u_view), + }, + wgpu::BindGroupEntry { + binding: 2, + resource: wgpu::BindingResource::TextureView(&v_view), + }, + wgpu::BindGroupEntry { + binding: 3, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); + + self.y_texture = Some(y_texture); + self.u_texture = Some(u_texture); + self.v_texture = Some(v_texture); + self.video_bind_group = Some(bind_group); + self.video_size = (frame.width, frame.height); + + info!("Video YUV textures created: {}x{} (UV: {}x{}) - GPU color conversion enabled", + frame.width, frame.height, uv_width, uv_height); + } + + // Upload Y plane directly (no conversion!) + if let Some(ref texture) = self.y_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.y_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.y_stride), + rows_per_image: Some(frame.height), + }, + wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + ); + } + + // Upload U plane directly + if let Some(ref texture) = self.u_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.u_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.u_stride), + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } + + // Upload V plane directly + if let Some(ref texture) = self.v_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.v_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.v_stride), + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } + } + + /// Render video frame to screen + fn render_video(&self, encoder: &mut wgpu::CommandEncoder, view: &wgpu::TextureView) { + if let Some(ref bind_group) = self.video_bind_group { + let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Video Pass"), + color_attachments: &[Some(wgpu::RenderPassColorAttachment { + view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), + store: wgpu::StoreOp::Store, + }, + depth_slice: None, + })], + depth_stencil_attachment: None, + ..Default::default() + }); + + render_pass.set_pipeline(&self.video_pipeline); + render_pass.set_bind_group(0, bind_group, &[]); + render_pass.draw(0..6, 0..1); // Draw 6 vertices (2 triangles = 1 quad) + } + } + + /// Render frame and return UI actions + pub fn render(&mut self, app: &App) -> Result> { + // Get surface texture with SMART error recovery for swapchain issues + // Key insight: During fullscreen transitions, the window size updates AFTER + // the surface error occurs. If we immediately "recover" with the old size, + // we force DWM composition (scaling), causing 60Hz lock and input lag. + // Instead, we YIELD to the event loop to let the Resized event propagate. + let output = match self.surface.get_current_texture() { + Ok(texture) => { + // Success - reset error counter + self.consecutive_surface_errors = 0; + texture + } + Err(wgpu::SurfaceError::Outdated) | Err(wgpu::SurfaceError::Lost) => { + self.consecutive_surface_errors += 1; + + // Check if window size differs from our config (resize pending) + let current_window_size = self.window.inner_size(); + let config_matches_window = + current_window_size.width == self.config.width && + current_window_size.height == self.config.height; + + if !config_matches_window { + // Window size changed - resize event should handle this + // Call resize directly to sync up + debug!( + "Swapchain outdated: window {}x{} != config {}x{} - resizing", + current_window_size.width, current_window_size.height, + self.config.width, self.config.height + ); + self.resize(current_window_size); + + // Retry after resize + match self.surface.get_current_texture() { + Ok(texture) => { + self.consecutive_surface_errors = 0; + info!("Swapchain recovered after resize to {}x{}", + current_window_size.width, current_window_size.height); + texture + } + Err(e) => { + debug!("Still failing after resize: {} - yielding", e); + return Ok(vec![]); + } + } + } else if self.consecutive_surface_errors < 10 { + // Sizes match but surface is outdated - likely a race condition + // YIELD to event loop to let Resized event arrive with correct size + debug!( + "Swapchain outdated (attempt {}/10): sizes match {}x{} - yielding to event loop", + self.consecutive_surface_errors, + self.config.width, self.config.height + ); + return Ok(vec![]); + } else { + // Persistent error (10+ frames) - force recovery as fallback + warn!( + "Swapchain persistently outdated ({} attempts) - forcing recovery", + self.consecutive_surface_errors + ); + if !self.recover_swapchain() { + return Ok(vec![]); + } + match self.surface.get_current_texture() { + Ok(texture) => { + self.consecutive_surface_errors = 0; + texture + } + Err(e) => { + warn!("Failed to get texture after forced recovery: {}", e); + return Ok(vec![]); + } + } + } + } + Err(wgpu::SurfaceError::Timeout) => { + // GPU is busy, skip this frame + debug!("Surface timeout - skipping frame"); + return Ok(vec![]); + } + Err(e) => { + // Fatal error (e.g., OutOfMemory) + return Err(anyhow::anyhow!("Surface error: {}", e)); + } + }; + + let view = output.texture.create_view(&wgpu::TextureViewDescriptor::default()); + + let mut encoder = self.device.create_command_encoder(&wgpu::CommandEncoderDescriptor { + label: Some("Render Encoder"), + }); + + // Update video texture if we have a frame + if let Some(ref frame) = app.current_frame { + self.update_video(frame); + } + + // Render video or clear based on state + if app.state == AppState::Streaming && self.video_bind_group.is_some() { + // Render video full-screen + self.render_video(&mut encoder, &view); + } else { + // Clear pass for non-streaming states + let _render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Clear Pass"), + color_attachments: &[Some(wgpu::RenderPassColorAttachment { + view: &view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Clear(wgpu::Color { + r: 0.08, + g: 0.08, + b: 0.12, + a: 1.0, + }), + store: wgpu::StoreOp::Store, + }, + depth_slice: None, + })], + depth_stencil_attachment: None, + ..Default::default() + }); + } + + // Draw egui UI and collect actions + let raw_input = self.egui_state.take_egui_input(&self.window); + let mut actions: Vec = Vec::new(); + + // Extract state needed for UI rendering + let app_state = app.state; + let stats = app.stats.clone(); + let show_stats = app.show_stats; + let status_message = app.status_message.clone(); + let error_message = app.error_message.clone(); + let selected_game = app.selected_game.clone(); + let stats_position = self.stats_panel.position; + let stats_visible = self.stats_panel.visible; + let show_settings = app.show_settings; + let settings = app.settings.clone(); + let login_providers = app.login_providers.clone(); + let selected_provider_index = app.selected_provider_index; + let is_loading = app.is_loading; + let mut search_query = app.search_query.clone(); + let runtime = app.runtime.clone(); + + // New state for tabs, subscription, library, popup + let current_tab = app.current_tab; + let subscription = app.subscription.clone(); + let selected_game_popup = app.selected_game_popup.clone(); + + // Server/region state + let servers = app.servers.clone(); + let selected_server_index = app.selected_server_index; + let auto_server_selection = app.auto_server_selection; + let ping_testing = app.ping_testing; + let show_settings_modal = app.show_settings_modal; + + // Get games based on current tab + let games_list: Vec<_> = match current_tab { + GamesTab::AllGames => { + app.filtered_games().into_iter() + .map(|(i, g)| (i, g.clone())) + .collect() + } + GamesTab::MyLibrary => { + let query = app.search_query.to_lowercase(); + app.library_games.iter() + .enumerate() + .filter(|(_, g)| query.is_empty() || g.title.to_lowercase().contains(&query)) + .map(|(i, g)| (i, g.clone())) + .collect() + } + }; + + // Clone texture map for rendering (avoid borrow issues) + let game_textures = self.game_textures.clone(); + let mut new_textures: Vec<(String, egui::TextureHandle)> = Vec::new(); + + let full_output = self.egui_ctx.run(raw_input, |ctx| { + // Custom styling + let mut style = (*ctx.style()).clone(); + style.visuals.window_fill = egui::Color32::from_rgb(20, 20, 30); + style.visuals.panel_fill = egui::Color32::from_rgb(25, 25, 35); + style.visuals.widgets.noninteractive.bg_fill = egui::Color32::from_rgb(35, 35, 50); + style.visuals.widgets.inactive.bg_fill = egui::Color32::from_rgb(45, 45, 65); + style.visuals.widgets.hovered.bg_fill = egui::Color32::from_rgb(60, 60, 90); + style.visuals.widgets.active.bg_fill = egui::Color32::from_rgb(80, 180, 80); + style.visuals.selection.bg_fill = egui::Color32::from_rgb(60, 120, 60); + ctx.set_style(style); + + match app_state { + AppState::Login => { + self.render_login_screen(ctx, &login_providers, selected_provider_index, &status_message, is_loading, &mut actions); + } + AppState::Games => { + // Update image cache for async loading + image_cache::update_cache(); + self.render_games_screen( + ctx, + &games_list, + &mut search_query, + &status_message, + show_settings, + &settings, + &runtime, + &game_textures, + &mut new_textures, + current_tab, + subscription.as_ref(), + selected_game_popup.as_ref(), + &servers, + selected_server_index, + auto_server_selection, + ping_testing, + show_settings_modal, + &mut actions + ); + } + AppState::Session => { + self.render_session_screen(ctx, &selected_game, &status_message, &error_message, &mut actions); + } + AppState::Streaming => { + // Render stats overlay + if show_stats && stats_visible { + render_stats_panel(ctx, &stats, stats_position); + } + + // Small overlay hint + egui::Area::new(egui::Id::new("stream_hint")) + .anchor(egui::Align2::CENTER_TOP, [0.0, 10.0]) + .interactable(false) + .show(ctx, |ui| { + ui.label( + egui::RichText::new("Ctrl+Shift+Q to stop • F3 stats • F11 fullscreen") + .color(egui::Color32::from_rgba_unmultiplied(255, 255, 255, 100)) + .size(12.0) + ); + }); + } + } + }); + + // Check if search query changed + if search_query != app.search_query { + actions.push(UiAction::UpdateSearch(search_query)); + } + + // Apply newly loaded textures to the cache + for (url, texture) in new_textures { + self.game_textures.insert(url, texture); + } + + self.egui_state.handle_platform_output(&self.window, full_output.platform_output); + + let clipped_primitives = self.egui_ctx.tessellate(full_output.shapes, full_output.pixels_per_point); + + // Update egui textures + for (id, image_delta) in &full_output.textures_delta.set { + self.egui_renderer.update_texture(&self.device, &self.queue, *id, image_delta); + } + + // Render egui + let screen_descriptor = egui_wgpu::ScreenDescriptor { + size_in_pixels: [self.size.width, self.size.height], + pixels_per_point: self.window.scale_factor() as f32, + }; + + self.egui_renderer.update_buffers( + &self.device, + &self.queue, + &mut encoder, + &clipped_primitives, + &screen_descriptor, + ); + + { + let render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Egui Pass"), + color_attachments: &[Some(wgpu::RenderPassColorAttachment { + view: &view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Load, + store: wgpu::StoreOp::Store, + }, + depth_slice: None, + })], + depth_stencil_attachment: None, + ..Default::default() + }); + + // forget_lifetime is safe here as render_pass is dropped before encoder.finish() + let mut render_pass = render_pass.forget_lifetime(); + self.egui_renderer.render(&mut render_pass, &clipped_primitives, &screen_descriptor); + } + + // Free egui textures + for id in &full_output.textures_delta.free { + self.egui_renderer.free_texture(id); + } + + self.queue.submit(std::iter::once(encoder.finish())); + output.present(); + + Ok(actions) + } + + fn render_login_screen( + &self, + ctx: &egui::Context, + login_providers: &[crate::auth::LoginProvider], + selected_provider_index: usize, + status_message: &str, + is_loading: bool, + actions: &mut Vec + ) { + egui::CentralPanel::default().show(ctx, |ui| { + let available_height = ui.available_height(); + let content_height = 400.0; + let top_padding = ((available_height - content_height) / 2.0).max(40.0); + + ui.vertical_centered(|ui| { + ui.add_space(top_padding); + + // Logo/Title with gradient-like effect + ui.label( + egui::RichText::new("OpenNOW") + .size(48.0) + .color(egui::Color32::from_rgb(118, 185, 0)) // NVIDIA green + .strong() + ); + + ui.add_space(8.0); + ui.label( + egui::RichText::new("GeForce NOW Client") + .size(14.0) + .color(egui::Color32::from_rgb(150, 150, 150)) + ); + + ui.add_space(60.0); + + // Login card container + egui::Frame::new() + .fill(egui::Color32::from_rgb(30, 30, 40)) + .corner_radius(12.0) + .inner_margin(egui::Margin { left: 40, right: 40, top: 30, bottom: 30 }) + .show(ui, |ui| { + ui.set_min_width(320.0); + + ui.vertical(|ui| { + // Region selection label - centered + ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { + ui.label( + egui::RichText::new("Select Region") + .size(13.0) + .color(egui::Color32::from_rgb(180, 180, 180)) + ); + }); + + ui.add_space(10.0); + + // Provider dropdown - centered using horizontal with spacing + ui.horizontal(|ui| { + let available_width = ui.available_width(); + let combo_width = 240.0; + let padding = (available_width - combo_width) / 2.0; + ui.add_space(padding.max(0.0)); + + let selected_name = login_providers.get(selected_provider_index) + .map(|p| p.login_provider_display_name.as_str()) + .unwrap_or("NVIDIA (Global)"); + + egui::ComboBox::from_id_salt("provider_select") + .selected_text(selected_name) + .width(combo_width) + .show_ui(ui, |ui| { + for (i, provider) in login_providers.iter().enumerate() { + let is_selected = i == selected_provider_index; + if ui.selectable_label(is_selected, &provider.login_provider_display_name).clicked() { + actions.push(UiAction::SelectProvider(i)); + } + } + }); + }); + + ui.add_space(25.0); + + // Login button or loading state - centered + ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { + if is_loading { + ui.add_space(10.0); + ui.spinner(); + ui.add_space(12.0); + ui.label( + egui::RichText::new("Opening browser...") + .size(13.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + ui.add_space(5.0); + ui.label( + egui::RichText::new("Complete login in your browser") + .size(11.0) + .color(egui::Color32::GRAY) + ); + } else { + let login_btn = egui::Button::new( + egui::RichText::new("Sign In") + .size(15.0) + .color(egui::Color32::WHITE) + .strong() + ) + .fill(egui::Color32::from_rgb(118, 185, 0)) + .corner_radius(6.0); + + if ui.add_sized([240.0, 42.0], login_btn).clicked() { + actions.push(UiAction::StartLogin); + } + + ui.add_space(15.0); + + ui.label( + egui::RichText::new("Sign in with your NVIDIA account") + .size(11.0) + .color(egui::Color32::from_rgb(120, 120, 120)) + ); + } + }); + }); + }); + + ui.add_space(20.0); + + // Status message (if any) + if !status_message.is_empty() && status_message != "Welcome to OpenNOW" { + ui.label( + egui::RichText::new(status_message) + .size(11.0) + .color(egui::Color32::from_rgb(150, 150, 150)) + ); + } + + ui.add_space(40.0); + + // Footer info + ui.label( + egui::RichText::new("Alliance Partners can select their region above") + .size(10.0) + .color(egui::Color32::from_rgb(80, 80, 80)) + ); + }); + }); + } + + fn render_games_screen( + &self, + ctx: &egui::Context, + games: &[(usize, crate::app::GameInfo)], + search_query: &mut String, + _status_message: &str, + _show_settings: bool, + settings: &crate::app::Settings, + _runtime: &tokio::runtime::Handle, + game_textures: &HashMap, + new_textures: &mut Vec<(String, egui::TextureHandle)>, + current_tab: GamesTab, + subscription: Option<&crate::app::SubscriptionInfo>, + selected_game_popup: Option<&crate::app::GameInfo>, + servers: &[crate::app::ServerInfo], + selected_server_index: usize, + auto_server_selection: bool, + ping_testing: bool, + show_settings_modal: bool, + actions: &mut Vec + ) { + // Top bar with tabs, search, and logout - subscription info moved to bottom + egui::TopBottomPanel::top("top_bar") + .frame(egui::Frame::new() + .fill(egui::Color32::from_rgb(22, 22, 30)) + .inner_margin(egui::Margin { left: 0, right: 0, top: 10, bottom: 10 })) + .show(ctx, |ui| { + ui.horizontal(|ui| { + ui.add_space(15.0); + + // Logo + ui.label( + egui::RichText::new("OpenNOW") + .size(24.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + .strong() + ); + + ui.add_space(20.0); + + // Tab buttons - solid style like login button + let all_games_selected = current_tab == GamesTab::AllGames; + let library_selected = current_tab == GamesTab::MyLibrary; + + let all_games_btn = egui::Button::new( + egui::RichText::new("All Games") + .size(13.0) + .color(egui::Color32::WHITE) + .strong() + ) + .fill(if all_games_selected { + egui::Color32::from_rgb(118, 185, 0) + } else { + egui::Color32::from_rgb(50, 50, 65) + }) + .corner_radius(6.0); + + if ui.add_sized([90.0, 32.0], all_games_btn).clicked() && !all_games_selected { + actions.push(UiAction::SwitchTab(GamesTab::AllGames)); + } + + ui.add_space(8.0); + + let library_btn = egui::Button::new( + egui::RichText::new("My Library") + .size(13.0) + .color(egui::Color32::WHITE) + .strong() + ) + .fill(if library_selected { + egui::Color32::from_rgb(118, 185, 0) + } else { + egui::Color32::from_rgb(50, 50, 65) + }) + .corner_radius(6.0); + + if ui.add_sized([90.0, 32.0], library_btn).clicked() && !library_selected { + actions.push(UiAction::SwitchTab(GamesTab::MyLibrary)); + } + + ui.add_space(20.0); + + // Search box in the middle + egui::Frame::new() + .fill(egui::Color32::from_rgb(35, 35, 45)) + .corner_radius(6.0) + .inner_margin(egui::Margin { left: 10, right: 10, top: 6, bottom: 6 }) + .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) + .show(ui, |ui| { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("🔍") + .size(12.0) + .color(egui::Color32::from_rgb(120, 120, 140)) + ); + ui.add_space(6.0); + let search = egui::TextEdit::singleline(search_query) + .hint_text("Search games...") + .desired_width(200.0) + .frame(false) + .text_color(egui::Color32::WHITE); + ui.add(search); + }); + }); + + // Right side content + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + ui.add_space(15.0); + + // Logout button - solid style + let logout_btn = egui::Button::new( + egui::RichText::new("Logout") + .size(13.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::from_rgb(50, 50, 65)) + .corner_radius(6.0); + + if ui.add_sized([80.0, 32.0], logout_btn).clicked() { + actions.push(UiAction::Logout); + } + + ui.add_space(10.0); + + // Settings button - between hours and logout + let settings_btn = egui::Button::new( + egui::RichText::new("⚙") + .size(16.0) + .color(if show_settings_modal { + egui::Color32::from_rgb(118, 185, 0) + } else { + egui::Color32::WHITE + }) + ) + .fill(if show_settings_modal { + egui::Color32::from_rgb(50, 70, 50) + } else { + egui::Color32::from_rgb(50, 50, 65) + }) + .corner_radius(6.0); + + if ui.add_sized([36.0, 32.0], settings_btn).clicked() { + actions.push(UiAction::ToggleSettingsModal); + } + }); + }); + }); + + // Bottom bar with subscription stats + egui::TopBottomPanel::bottom("bottom_bar") + .frame(egui::Frame::new() + .fill(egui::Color32::from_rgb(22, 22, 30)) + .inner_margin(egui::Margin { left: 15, right: 15, top: 8, bottom: 8 })) + .show(ctx, |ui| { + ui.horizontal(|ui| { + if let Some(sub) = subscription { + // Membership tier badge + let (tier_bg, tier_fg) = match sub.membership_tier.as_str() { + "ULTIMATE" => (egui::Color32::from_rgb(80, 50, 120), egui::Color32::from_rgb(200, 150, 255)), + "PERFORMANCE" | "PRIORITY" => (egui::Color32::from_rgb(30, 70, 100), egui::Color32::from_rgb(100, 200, 255)), + _ => (egui::Color32::from_rgb(50, 50, 60), egui::Color32::GRAY), + }; + + egui::Frame::new() + .fill(tier_bg) + .corner_radius(4.0) + .inner_margin(egui::Margin { left: 8, right: 8, top: 4, bottom: 4 }) + .show(ui, |ui| { + ui.label( + egui::RichText::new(&sub.membership_tier) + .size(11.0) + .color(tier_fg) + .strong() + ); + }); + + ui.add_space(20.0); + + // Hours icon and remaining + ui.label( + egui::RichText::new("⏱") + .size(14.0) + .color(egui::Color32::GRAY) + ); + ui.add_space(5.0); + + let hours_color = if sub.remaining_hours > 5.0 { + egui::Color32::from_rgb(118, 185, 0) + } else if sub.remaining_hours > 1.0 { + egui::Color32::from_rgb(255, 200, 50) + } else { + egui::Color32::from_rgb(255, 80, 80) + }; + + ui.label( + egui::RichText::new(format!("{:.1}h", sub.remaining_hours)) + .size(13.0) + .color(hours_color) + .strong() + ); + ui.label( + egui::RichText::new(format!(" / {:.0}h", sub.total_hours)) + .size(12.0) + .color(egui::Color32::GRAY) + ); + + ui.add_space(20.0); + + // Storage icon and space (if available) + if sub.has_persistent_storage { + if let Some(storage_gb) = sub.storage_size_gb { + ui.label( + egui::RichText::new("💾") + .size(14.0) + .color(egui::Color32::GRAY) + ); + ui.add_space(5.0); + ui.label( + egui::RichText::new(format!("{} GB", storage_gb)) + .size(13.0) + .color(egui::Color32::from_rgb(100, 180, 255)) + ); + } + } + } else { + ui.label( + egui::RichText::new("Loading subscription info...") + .size(12.0) + .color(egui::Color32::GRAY) + ); + } + + // Right side: server info + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + // Show selected server + if auto_server_selection { + let best_server = servers.iter() + .filter(|s| s.status == crate::app::ServerStatus::Online && s.ping_ms.is_some()) + .min_by_key(|s| s.ping_ms.unwrap_or(9999)); + + if let Some(server) = best_server { + ui.label( + egui::RichText::new(format!("🌐 Auto: {} ({}ms)", server.name, server.ping_ms.unwrap_or(0))) + .size(12.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + } else if ping_testing { + ui.label( + egui::RichText::new("🌐 Testing servers...") + .size(12.0) + .color(egui::Color32::GRAY) + ); + } else { + ui.label( + egui::RichText::new("🌐 Auto (waiting for ping)") + .size(12.0) + .color(egui::Color32::GRAY) + ); + } + } else if let Some(server) = servers.get(selected_server_index) { + let ping_text = server.ping_ms.map(|p| format!(" ({}ms)", p)).unwrap_or_default(); + ui.label( + egui::RichText::new(format!("🌐 {}{}", server.name, ping_text)) + .size(12.0) + .color(egui::Color32::from_rgb(100, 180, 255)) + ); + } + }); + }); + }); + + // Main content area + egui::CentralPanel::default().show(ctx, |ui| { + ui.add_space(15.0); + + // Games content + let header_text = match current_tab { + GamesTab::AllGames => format!("All Games ({} available)", games.len()), + GamesTab::MyLibrary => format!("My Library ({} games)", games.len()), + }; + + ui.horizontal(|ui| { + ui.add_space(10.0); + ui.label( + egui::RichText::new(header_text) + .size(20.0) + .strong() + .color(egui::Color32::WHITE) + ); + }); + + ui.add_space(20.0); + + if games.is_empty() { + ui.vertical_centered(|ui| { + ui.add_space(100.0); + let empty_text = match current_tab { + GamesTab::AllGames => "No games found", + GamesTab::MyLibrary => "Your library is empty.\nPurchase games from Steam, Epic, or other stores to see them here.", + }; + ui.label( + egui::RichText::new(empty_text) + .size(14.0) + .color(egui::Color32::from_rgb(120, 120, 120)) + ); + }); + } else { + // Games grid - calculate columns based on available width + let available_width = ui.available_width(); + let card_width = 220.0; + let spacing = 16.0; + let num_columns = ((available_width + spacing) / (card_width + spacing)).floor() as usize; + let num_columns = num_columns.max(2).min(6); // Between 2 and 6 columns + + // Collect games to render (avoid borrow issues) + let games_to_render: Vec<_> = games.iter().map(|(idx, game)| (*idx, game.clone())).collect(); + + egui::ScrollArea::vertical() + .auto_shrink([false, false]) + .show(ui, |ui| { + ui.horizontal(|ui| { + ui.add_space(10.0); + ui.vertical(|ui| { + egui::Grid::new("games_grid") + .num_columns(num_columns) + .spacing([spacing, spacing]) + .show(ui, |ui| { + for (col, (idx, game)) in games_to_render.iter().enumerate() { + Self::render_game_card(ui, ctx, *idx, game, _runtime, game_textures, new_textures, actions); + + if (col + 1) % num_columns == 0 { + ui.end_row(); + } + } + }); + }); + }); + }); + } + }); + + // Game detail popup + if let Some(game) = selected_game_popup { + Self::render_game_popup(ctx, game, game_textures, actions); + } + + // Settings modal + if show_settings_modal { + Self::render_settings_modal(ctx, settings, servers, selected_server_index, auto_server_selection, ping_testing, actions); + } + } + + /// Render the Settings modal with region selector and stream settings + fn render_settings_modal( + ctx: &egui::Context, + settings: &crate::app::Settings, + servers: &[crate::app::ServerInfo], + selected_server_index: usize, + auto_server_selection: bool, + ping_testing: bool, + actions: &mut Vec, + ) { + let modal_width = 500.0; + let modal_height = 600.0; + + // Dark overlay + egui::Area::new(egui::Id::new("settings_overlay")) + .fixed_pos(egui::pos2(0.0, 0.0)) + .order(egui::Order::Middle) + .show(ctx, |ui| { + let screen_rect = ctx.screen_rect(); + ui.allocate_response(screen_rect.size(), egui::Sense::click()); + ui.painter().rect_filled( + screen_rect, + 0.0, + egui::Color32::from_rgba_unmultiplied(0, 0, 0, 180), + ); + }); + + // Modal window + let screen_rect = ctx.screen_rect(); + let modal_pos = egui::pos2( + (screen_rect.width() - modal_width) / 2.0, + (screen_rect.height() - modal_height) / 2.0, + ); + + egui::Area::new(egui::Id::new("settings_modal")) + .fixed_pos(modal_pos) + .order(egui::Order::Foreground) + .show(ctx, |ui| { + egui::Frame::new() + .fill(egui::Color32::from_rgb(28, 28, 35)) + .corner_radius(12.0) + .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) + .inner_margin(egui::Margin::same(20)) + .show(ui, |ui| { + ui.set_min_size(egui::vec2(modal_width, modal_height)); + + // Header with close button + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Settings") + .size(20.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + let close_btn = egui::Button::new( + egui::RichText::new("✕") + .size(16.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::TRANSPARENT) + .corner_radius(4.0); + + if ui.add(close_btn).clicked() { + actions.push(UiAction::ToggleSettingsModal); + } + }); + }); + + ui.add_space(15.0); + ui.separator(); + ui.add_space(15.0); + + egui::ScrollArea::vertical() + .max_height(modal_height - 100.0) + .show(ui, |ui| { + // === Stream Settings Section === + ui.label( + egui::RichText::new("Stream Settings") + .size(16.0) + .strong() + .color(egui::Color32::WHITE) + ); + ui.add_space(15.0); + + egui::Grid::new("settings_grid") + .num_columns(2) + .spacing([20.0, 12.0]) + .min_col_width(100.0) + .show(ui, |ui| { + // Resolution dropdown + ui.label( + egui::RichText::new("Resolution") + .size(13.0) + .color(egui::Color32::GRAY) + ); + egui::ComboBox::from_id_salt("resolution_combo") + .selected_text(&settings.resolution) + .width(180.0) + .show_ui(ui, |ui| { + for res in crate::app::config::RESOLUTIONS { + if ui.selectable_label(settings.resolution == res.0, format!("{} ({})", res.0, res.1)).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res.0.to_string()))); + } + } + }); + ui.end_row(); + + // FPS dropdown + ui.label( + egui::RichText::new("FPS") + .size(13.0) + .color(egui::Color32::GRAY) + ); + egui::ComboBox::from_id_salt("fps_combo") + .selected_text(format!("{} FPS", settings.fps)) + .width(180.0) + .show_ui(ui, |ui| { + for fps in crate::app::config::FPS_OPTIONS { + if ui.selectable_label(settings.fps == *fps, format!("{} FPS", fps)).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Fps(*fps))); + } + } + }); + ui.end_row(); + + // Codec dropdown + ui.label( + egui::RichText::new("Video Codec") + .size(13.0) + .color(egui::Color32::GRAY) + ); + egui::ComboBox::from_id_salt("codec_combo") + .selected_text(settings.codec.display_name()) + .width(180.0) + .show_ui(ui, |ui| { + for codec in crate::app::config::VideoCodec::all() { + if ui.selectable_label(settings.codec == *codec, codec.display_name()).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(*codec))); + } + } + }); + ui.end_row(); + + // Max Bitrate slider + ui.label( + egui::RichText::new("Max Bitrate") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.horizontal(|ui| { + ui.label( + egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)) + .size(13.0) + .color(egui::Color32::WHITE) + ); + ui.label( + egui::RichText::new("(200 = unlimited)") + .size(10.0) + .color(egui::Color32::GRAY) + ); + }); + ui.end_row(); + }); + + ui.add_space(25.0); + ui.separator(); + ui.add_space(15.0); + + // === Server Region Section === + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Server Region") + .size(16.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.add_space(20.0); + + // Ping test button + let ping_btn_text = if ping_testing { "Testing..." } else { "Test Ping" }; + let ping_btn = egui::Button::new( + egui::RichText::new(ping_btn_text) + .size(11.0) + .color(egui::Color32::WHITE) + ) + .fill(if ping_testing { + egui::Color32::from_rgb(80, 80, 100) + } else { + egui::Color32::from_rgb(60, 120, 60) + }) + .corner_radius(4.0); + + if ui.add_sized([80.0, 24.0], ping_btn).clicked() && !ping_testing { + actions.push(UiAction::StartPingTest); + } + + if ping_testing { + ui.spinner(); + } + }); + ui.add_space(10.0); + + // Server dropdown with Auto option and best server highlighted + let selected_text = if auto_server_selection { + // Find best server for display + let best = servers.iter() + .filter(|s| s.status == crate::app::ServerStatus::Online && s.ping_ms.is_some()) + .min_by_key(|s| s.ping_ms.unwrap_or(9999)); + if let Some(best_server) = best { + format!("Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) + } else { + "Auto (Best Ping)".to_string() + } + } else { + servers.get(selected_server_index) + .map(|s| { + if let Some(ping) = s.ping_ms { + format!("{} ({}ms)", s.name, ping) + } else { + s.name.clone() + } + }) + .unwrap_or_else(|| "Select a server...".to_string()) + }; + + egui::ComboBox::from_id_salt("server_combo") + .selected_text(selected_text) + .width(300.0) + .show_ui(ui, |ui| { + // Auto option at the top + let auto_label = { + let best = servers.iter() + .filter(|s| s.status == crate::app::ServerStatus::Online && s.ping_ms.is_some()) + .min_by_key(|s| s.ping_ms.unwrap_or(9999)); + if let Some(best_server) = best { + format!("✨ Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) + } else { + "✨ Auto (Best Ping)".to_string() + } + }; + + if ui.selectable_label(auto_server_selection, auto_label).clicked() { + actions.push(UiAction::SetAutoServerSelection(true)); + } + + ui.separator(); + ui.add_space(5.0); + + // Group by region + let regions = ["Europe", "North America", "Canada", "Asia-Pacific", "Other"]; + for region in regions { + let region_servers: Vec<_> = servers + .iter() + .enumerate() + .filter(|(_, s)| s.region == region) + .collect(); + + if region_servers.is_empty() { + continue; + } + + ui.label( + egui::RichText::new(region) + .size(11.0) + .strong() + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + + for (idx, server) in region_servers { + let is_selected = !auto_server_selection && idx == selected_server_index; + let ping_text = match server.status { + crate::app::ServerStatus::Online => { + server.ping_ms.map(|p| format!(" ({}ms)", p)).unwrap_or_default() + } + crate::app::ServerStatus::Testing => " (testing...)".to_string(), + crate::app::ServerStatus::Offline => " (offline)".to_string(), + crate::app::ServerStatus::Unknown => "".to_string(), + }; + + let label = format!(" {}{}", server.name, ping_text); + if ui.selectable_label(is_selected, label).clicked() { + actions.push(UiAction::SelectServer(idx)); + } + } + + ui.add_space(5.0); + } + }); + + ui.add_space(20.0); + }); + }); + }); + } + + /// Render the game detail popup + fn render_game_popup( + ctx: &egui::Context, + game: &crate::app::GameInfo, + game_textures: &HashMap, + actions: &mut Vec, + ) { + let popup_width = 400.0; + let popup_height = 350.0; + + egui::Window::new("Game Details") + .collapsible(false) + .resizable(false) + .fixed_size([popup_width, popup_height]) + .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) + .show(ctx, |ui| { + ui.vertical(|ui| { + // Game image + if let Some(ref image_url) = game.image_url { + if let Some(texture) = game_textures.get(image_url) { + let image_size = egui::vec2(popup_width - 40.0, 150.0); + ui.add(egui::Image::new(texture).fit_to_exact_size(image_size).corner_radius(8.0)); + } else { + // Placeholder + let placeholder_size = egui::vec2(popup_width - 40.0, 150.0); + let (_, rect) = ui.allocate_space(placeholder_size); + ui.painter().rect_filled(rect, 8.0, egui::Color32::from_rgb(50, 50, 70)); + let initial = game.title.chars().next().unwrap_or('?').to_uppercase().to_string(); + ui.painter().text( + rect.center(), + egui::Align2::CENTER_CENTER, + initial, + egui::FontId::proportional(48.0), + egui::Color32::from_rgb(100, 100, 130), + ); + } + } + + ui.add_space(15.0); + + // Game title + ui.label( + egui::RichText::new(&game.title) + .size(20.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.add_space(8.0); + + // Store badge + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Store:") + .size(12.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(&game.store.to_uppercase()) + .size(12.0) + .color(egui::Color32::from_rgb(100, 180, 255)) + .strong() + ); + }); + + // Publisher if available + if let Some(ref publisher) = game.publisher { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Publisher:") + .size(12.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(publisher) + .size(12.0) + .color(egui::Color32::LIGHT_GRAY) + ); + }); + } + + ui.add_space(20.0); + + // Buttons + ui.horizontal(|ui| { + // Play button + let play_btn = egui::Button::new( + egui::RichText::new(" Play Now ") + .size(16.0) + .strong() + ) + .fill(egui::Color32::from_rgb(70, 180, 70)) + .min_size(egui::vec2(120.0, 40.0)); + + if ui.add(play_btn).clicked() { + actions.push(UiAction::LaunchGameDirect(game.clone())); + actions.push(UiAction::CloseGamePopup); + } + + ui.add_space(20.0); + + // Close button + let close_btn = egui::Button::new( + egui::RichText::new(" Close ") + .size(14.0) + ) + .fill(egui::Color32::from_rgb(60, 60, 80)) + .min_size(egui::vec2(80.0, 40.0)); + + if ui.add(close_btn).clicked() { + actions.push(UiAction::CloseGamePopup); + } + }); + }); + }); + } + + fn render_game_card( + ui: &mut egui::Ui, + ctx: &egui::Context, + _idx: usize, + game: &crate::app::GameInfo, + runtime: &tokio::runtime::Handle, + game_textures: &HashMap, + new_textures: &mut Vec<(String, egui::TextureHandle)>, + actions: &mut Vec, + ) { + // Card dimensions - larger for better visibility + let card_width = 220.0; + let image_height = 124.0; // 16:9 aspect ratio + + // Make the entire card clickable + let game_for_click = game.clone(); + + let response = egui::Frame::new() + .fill(egui::Color32::from_rgb(28, 28, 36)) + .corner_radius(8.0) + .inner_margin(0.0) + .show(ui, |ui| { + ui.set_min_width(card_width); + + ui.vertical(|ui| { + // Game box art image - full width, no padding + if let Some(ref image_url) = game.image_url { + // Check if texture is already loaded + if let Some(texture) = game_textures.get(image_url) { + // Display the image with rounded top corners + let size = egui::vec2(card_width, image_height); + ui.add(egui::Image::new(texture) + .fit_to_exact_size(size) + .corner_radius(egui::CornerRadius { nw: 8, ne: 8, sw: 0, se: 0 })); + } else { + // Check if image data is available in cache + if let Some((pixels, width, height)) = image_cache::get_image(image_url) { + // Create egui texture from pixels + let color_image = egui::ColorImage::from_rgba_unmultiplied( + [width as usize, height as usize], + &pixels, + ); + let texture = ctx.load_texture( + image_url, + color_image, + egui::TextureOptions::LINEAR, + ); + new_textures.push((image_url.clone(), texture.clone())); + + // Display immediately + let size = egui::vec2(card_width, image_height); + ui.add(egui::Image::new(&texture) + .fit_to_exact_size(size) + .corner_radius(egui::CornerRadius { nw: 8, ne: 8, sw: 0, se: 0 })); + } else { + // Request loading + image_cache::request_image(image_url, runtime); + + // Show placeholder + let placeholder_rect = ui.allocate_space(egui::vec2(card_width, image_height)); + ui.painter().rect_filled( + placeholder_rect.1, + egui::CornerRadius { nw: 8, ne: 8, sw: 0, se: 0 }, + egui::Color32::from_rgb(40, 40, 55), + ); + // Loading spinner effect + ui.painter().text( + placeholder_rect.1.center(), + egui::Align2::CENTER_CENTER, + "...", + egui::FontId::proportional(16.0), + egui::Color32::from_rgb(80, 80, 100), + ); + } + } + } else { + // No image URL - show placeholder with game initial + let placeholder_rect = ui.allocate_space(egui::vec2(card_width, image_height)); + ui.painter().rect_filled( + placeholder_rect.1, + egui::CornerRadius { nw: 8, ne: 8, sw: 0, se: 0 }, + egui::Color32::from_rgb(45, 45, 65), + ); + // Show first letter of game title + let initial = game.title.chars().next().unwrap_or('?').to_uppercase().to_string(); + ui.painter().text( + placeholder_rect.1.center(), + egui::Align2::CENTER_CENTER, + initial, + egui::FontId::proportional(40.0), + egui::Color32::from_rgb(80, 80, 110), + ); + } + + // Text content area with padding + ui.add_space(10.0); + ui.horizontal(|ui| { + ui.add_space(12.0); + ui.vertical(|ui| { + // Game title (truncated if too long) + let title = if game.title.chars().count() > 24 { + let truncated: String = game.title.chars().take(21).collect(); + format!("{}...", truncated) + } else { + game.title.clone() + }; + ui.label( + egui::RichText::new(title) + .size(13.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.add_space(2.0); + + // Store badge with color coding + let store_color = match game.store.to_lowercase().as_str() { + "steam" => egui::Color32::from_rgb(102, 192, 244), + "epic" => egui::Color32::from_rgb(200, 200, 200), + "ubisoft" | "uplay" => egui::Color32::from_rgb(0, 150, 255), + "xbox" => egui::Color32::from_rgb(16, 124, 16), + "gog" => egui::Color32::from_rgb(190, 130, 255), + _ => egui::Color32::from_rgb(150, 150, 150), + }; + ui.label( + egui::RichText::new(&game.store.to_uppercase()) + .size(10.0) + .color(store_color) + ); + }); + }); + ui.add_space(10.0); + }); + }); + + // Make the card clickable - check for click on the response rect + let card_rect = response.response.rect; + if ui.rect_contains_pointer(card_rect) { + // Change cursor to pointer + ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand); + + // Highlight on hover - subtle glow effect + ui.painter().rect_stroke( + card_rect, + 8.0, + egui::Stroke::new(2.0, egui::Color32::from_rgb(118, 185, 0)), + egui::StrokeKind::Outside + ); + } + + if response.response.interact(egui::Sense::click()).clicked() { + actions.push(UiAction::OpenGamePopup(game_for_click)); + } + } + + fn render_session_screen( + &self, + ctx: &egui::Context, + selected_game: &Option, + status_message: &str, + error_message: &Option, + actions: &mut Vec + ) { + egui::CentralPanel::default().show(ctx, |ui| { + ui.vertical_centered(|ui| { + ui.add_space(120.0); + + // Game title + if let Some(ref game) = selected_game { + ui.label( + egui::RichText::new(&game.title) + .size(28.0) + .strong() + .color(egui::Color32::WHITE) + ); + } + + ui.add_space(40.0); + + // Spinner + ui.spinner(); + + ui.add_space(20.0); + + // Status + ui.label( + egui::RichText::new(status_message) + .size(16.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + // Error message + if let Some(ref error) = error_message { + ui.add_space(20.0); + ui.label( + egui::RichText::new(error) + .size(14.0) + .color(egui::Color32::from_rgb(255, 100, 100)) + ); + } + + ui.add_space(40.0); + + // Cancel button + if ui.button("Cancel").clicked() { + actions.push(UiAction::StopStreaming); + } + }); + }); + } +} + +/// Render stats panel (standalone function) +fn render_stats_panel(ctx: &egui::Context, stats: &crate::media::StreamStats, position: crate::app::StatsPosition) { + use egui::{Align2, Color32, FontId, RichText}; + + let (anchor, offset) = match position { + crate::app::StatsPosition::BottomLeft => (Align2::LEFT_BOTTOM, [10.0, -10.0]), + crate::app::StatsPosition::BottomRight => (Align2::RIGHT_BOTTOM, [-10.0, -10.0]), + crate::app::StatsPosition::TopLeft => (Align2::LEFT_TOP, [10.0, 10.0]), + crate::app::StatsPosition::TopRight => (Align2::RIGHT_TOP, [-10.0, 10.0]), + }; + + egui::Area::new(egui::Id::new("stats_panel")) + .anchor(anchor, offset) + .interactable(false) + .show(ctx, |ui| { + egui::Frame::new() + .fill(Color32::from_rgba_unmultiplied(0, 0, 0, 200)) + .corner_radius(4.0) + .inner_margin(8.0) + .show(ui, |ui| { + ui.set_min_width(200.0); + + // Resolution + let res_text = if stats.resolution.is_empty() { + "Connecting...".to_string() + } else { + stats.resolution.clone() + }; + + ui.label( + RichText::new(res_text) + .font(FontId::monospace(13.0)) + .color(Color32::WHITE) + ); + + // Decoded FPS vs Render FPS (shows if renderer is bottlenecked) + let decode_fps = stats.fps; + let render_fps = stats.render_fps; + let target_fps = stats.target_fps as f32; + + // Decode FPS color + let decode_color = if target_fps > 0.0 { + let ratio = decode_fps / target_fps; + if ratio >= 0.8 { Color32::GREEN } + else if ratio >= 0.5 { Color32::YELLOW } + else { Color32::from_rgb(255, 100, 100) } + } else { Color32::WHITE }; + + // Render FPS color (critical - this is what you actually see) + let render_color = if target_fps > 0.0 { + let ratio = render_fps / target_fps; + if ratio >= 0.8 { Color32::GREEN } + else if ratio >= 0.5 { Color32::YELLOW } + else { Color32::from_rgb(255, 100, 100) } + } else { Color32::WHITE }; + + // Show both FPS values + ui.horizontal(|ui| { + ui.label( + RichText::new(format!("Decode: {:.0}", decode_fps)) + .font(FontId::monospace(11.0)) + .color(decode_color) + ); + ui.label( + RichText::new(format!(" | Render: {:.0}", render_fps)) + .font(FontId::monospace(11.0)) + .color(render_color) + ); + if stats.target_fps > 0 { + ui.label( + RichText::new(format!(" / {} fps", stats.target_fps)) + .font(FontId::monospace(11.0)) + .color(Color32::GRAY) + ); + } + }); + + // Codec and bitrate + if !stats.codec.is_empty() { + ui.label( + RichText::new(format!( + "{} | {:.1} Mbps", + stats.codec, + stats.bitrate_mbps + )) + .font(FontId::monospace(11.0)) + .color(Color32::LIGHT_GRAY) + ); + } + + // Latency (decode pipeline) + let latency_color = if stats.latency_ms < 30.0 { + Color32::GREEN + } else if stats.latency_ms < 60.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("Decode: {:.0} ms", stats.latency_ms)) + .font(FontId::monospace(11.0)) + .color(latency_color) + ); + + // Input latency (event creation to transmission) + if stats.input_latency_ms > 0.0 { + let input_color = if stats.input_latency_ms < 2.0 { + Color32::GREEN + } else if stats.input_latency_ms < 5.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("Input: {:.1} ms", stats.input_latency_ms)) + .font(FontId::monospace(11.0)) + .color(input_color) + ); + } + + if stats.packet_loss > 0.0 { + let loss_color = if stats.packet_loss < 1.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("Packet Loss: {:.1}%", stats.packet_loss)) + .font(FontId::monospace(11.0)) + .color(loss_color) + ); + } + + // Decode and render times + if stats.decode_time_ms > 0.0 || stats.render_time_ms > 0.0 { + ui.label( + RichText::new(format!( + "Decode: {:.1} ms | Render: {:.1} ms", + stats.decode_time_ms, + stats.render_time_ms + )) + .font(FontId::monospace(10.0)) + .color(Color32::GRAY) + ); + } + + // Frame stats + if stats.frames_received > 0 { + ui.label( + RichText::new(format!( + "Frames: {} rx, {} dec, {} drop", + stats.frames_received, + stats.frames_decoded, + stats.frames_dropped + )) + .font(FontId::monospace(10.0)) + .color(Color32::DARK_GRAY) + ); + } + + // GPU and server info + if !stats.gpu_type.is_empty() || !stats.server_region.is_empty() { + let info = format!( + "{}{}{}", + stats.gpu_type, + if !stats.gpu_type.is_empty() && !stats.server_region.is_empty() { " | " } else { "" }, + stats.server_region + ); + + ui.label( + RichText::new(info) + .font(FontId::monospace(10.0)) + .color(Color32::DARK_GRAY) + ); + } + }); + }); +} + diff --git a/opennow-streamer/src/gui/stats_panel.rs b/opennow-streamer/src/gui/stats_panel.rs new file mode 100644 index 0000000..ebe2809 --- /dev/null +++ b/opennow-streamer/src/gui/stats_panel.rs @@ -0,0 +1,169 @@ +//! Stats Panel Overlay +//! +//! Bottom-left stats display matching the web client style. + +use egui::{Align2, Color32, FontId, RichText}; +use crate::media::StreamStats; +use crate::app::StatsPosition; + +/// Stats panel overlay +pub struct StatsPanel { + pub visible: bool, + pub position: StatsPosition, +} + +impl StatsPanel { + pub fn new() -> Self { + Self { + visible: true, + position: StatsPosition::BottomLeft, + } + } + + /// Render the stats panel + pub fn render(&self, ctx: &egui::Context, stats: &StreamStats) { + if !self.visible { + return; + } + + let (anchor, offset) = match self.position { + StatsPosition::BottomLeft => (Align2::LEFT_BOTTOM, [10.0, -10.0]), + StatsPosition::BottomRight => (Align2::RIGHT_BOTTOM, [-10.0, -10.0]), + StatsPosition::TopLeft => (Align2::LEFT_TOP, [10.0, 10.0]), + StatsPosition::TopRight => (Align2::RIGHT_TOP, [-10.0, 10.0]), + }; + + egui::Area::new(egui::Id::new("stats_panel")) + .anchor(anchor, offset) + .interactable(false) + .show(ctx, |ui| { + egui::Frame::new() + .fill(Color32::from_rgba_unmultiplied(0, 0, 0, 200)) + .corner_radius(4.0) + .inner_margin(8.0) + .show(ui, |ui| { + ui.set_min_width(200.0); + + // Resolution and FPS + let res_text = if stats.resolution.is_empty() { + "Connecting...".to_string() + } else { + format!("{} @ {} fps", stats.resolution, stats.fps as u32) + }; + + ui.label( + RichText::new(res_text) + .font(FontId::monospace(13.0)) + .color(Color32::WHITE) + ); + + // Codec and bitrate + if !stats.codec.is_empty() { + ui.label( + RichText::new(format!( + "{} • {:.1} Mbps", + stats.codec, + stats.bitrate_mbps + )) + .font(FontId::monospace(11.0)) + .color(Color32::LIGHT_GRAY) + ); + } + + // Latency and packet loss + let latency_color = if stats.latency_ms < 30.0 { + Color32::GREEN + } else if stats.latency_ms < 60.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!( + "Latency: {:.0} ms", + stats.latency_ms + )) + .font(FontId::monospace(11.0)) + .color(latency_color) + ); + + if stats.packet_loss > 0.0 { + let loss_color = if stats.packet_loss < 1.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!( + "Packet Loss: {:.1}%", + stats.packet_loss + )) + .font(FontId::monospace(11.0)) + .color(loss_color) + ); + } + + // Decode and render times + if stats.decode_time_ms > 0.0 || stats.render_time_ms > 0.0 { + ui.label( + RichText::new(format!( + "Decode: {:.1} ms • Render: {:.1} ms", + stats.decode_time_ms, + stats.render_time_ms + )) + .font(FontId::monospace(10.0)) + .color(Color32::GRAY) + ); + } + + // Frame stats + if stats.frames_received > 0 { + ui.label( + RichText::new(format!( + "Frames: {} rx, {} dec, {} drop", + stats.frames_received, + stats.frames_decoded, + stats.frames_dropped + )) + .font(FontId::monospace(10.0)) + .color(Color32::DARK_GRAY) + ); + } + + // GPU and server info + if !stats.gpu_type.is_empty() || !stats.server_region.is_empty() { + let info = format!( + "{}{}{}", + stats.gpu_type, + if !stats.gpu_type.is_empty() && !stats.server_region.is_empty() { " • " } else { "" }, + stats.server_region + ); + + ui.label( + RichText::new(info) + .font(FontId::monospace(10.0)) + .color(Color32::DARK_GRAY) + ); + } + }); + }); + } + + /// Toggle visibility + pub fn toggle(&mut self) { + self.visible = !self.visible; + } + + /// Set position + pub fn set_position(&mut self, position: StatsPosition) { + self.position = position; + } +} + +impl Default for StatsPanel { + fn default() -> Self { + Self::new() + } +} diff --git a/opennow-streamer/src/input/mod.rs b/opennow-streamer/src/input/mod.rs new file mode 100644 index 0000000..6209d05 --- /dev/null +++ b/opennow-streamer/src/input/mod.rs @@ -0,0 +1,686 @@ +//! Input Handling +//! +//! Cross-platform input capture for mouse and keyboard. +//! +//! Key optimizations for native-feeling input: +//! - Mouse event coalescing (batches events every 4-8ms like official client) +//! - Local cursor rendering (instant visual feedback independent of network) +//! - Queue depth management (prevents server-side buffering) + +#[cfg(target_os = "windows")] +mod windows; +#[cfg(target_os = "macos")] +mod macos; +#[cfg(target_os = "linux")] +mod linux; + +mod protocol; + +pub use protocol::*; + +// Re-export raw input functions for Windows +#[cfg(target_os = "windows")] +pub use windows::{ + start_raw_input, + stop_raw_input, + pause_raw_input, + resume_raw_input, + get_raw_mouse_delta, + is_raw_input_active, + update_raw_input_center, + set_raw_input_sender, + clear_raw_input_sender, + // New coalescing and local cursor functions + set_local_cursor_dimensions, + get_local_cursor_position, + get_local_cursor_normalized, + flush_pending_mouse_events, + get_coalesced_event_count, + reset_coalescing, +}; + +use std::time::{Instant, SystemTime, UNIX_EPOCH}; +use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; +use parking_lot::RwLock; + +/// Session timing state - resettable for each streaming session +/// GFN server expects timestamps relative to session start for proper input timing +struct SessionTiming { + start: Instant, + unix_us: u64, +} + +impl SessionTiming { + fn new() -> Self { + let unix_us = SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|d| d.as_micros() as u64) + .unwrap_or(0); + Self { + start: Instant::now(), + unix_us, + } + } +} + +static SESSION_TIMING: RwLock> = RwLock::new(None); + +/// Initialize session timing (call when streaming starts) +/// This MUST be called before each new streaming session to reset timestamps +pub fn init_session_timing() { + let timing = SessionTiming::new(); + log::info!("Session timing initialized at {} us (new session)", timing.unix_us); + *SESSION_TIMING.write() = Some(timing); +} + +/// Reset session timing (call when streaming stops) +pub fn reset_session_timing() { + *SESSION_TIMING.write() = None; + log::info!("Session timing reset"); +} + +/// Get timestamp in microseconds +/// Uses a hybrid approach: absolute Unix time base + relative offset from session start +/// This provides both accurate server synchronization and consistent timing +#[inline] +pub fn get_timestamp_us() -> u64 { + let timing = SESSION_TIMING.read(); + if let Some(ref t) = *timing { + let elapsed_us = t.start.elapsed().as_micros() as u64; + t.unix_us.wrapping_add(elapsed_us) + } else { + // Fallback if not initialized (shouldn't happen during streaming) + SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|d| d.as_micros() as u64) + .unwrap_or(0) + } +} + +/// Get elapsed time since session start (for coalescing decisions) +#[inline] +pub fn session_elapsed_us() -> u64 { + let timing = SESSION_TIMING.read(); + if let Some(ref t) = *timing { + t.start.elapsed().as_micros() as u64 + } else { + 0 + } +} + +// Stubs for non-Windows platforms +#[cfg(not(target_os = "windows"))] +pub fn start_raw_input() -> Result<(), String> { + Err("Raw input only supported on Windows".to_string()) +} +#[cfg(not(target_os = "windows"))] +pub fn stop_raw_input() {} +#[cfg(not(target_os = "windows"))] +pub fn pause_raw_input() {} +#[cfg(not(target_os = "windows"))] +pub fn resume_raw_input() {} +#[cfg(not(target_os = "windows"))] +pub fn get_raw_mouse_delta() -> (i32, i32) { (0, 0) } +#[cfg(not(target_os = "windows"))] +pub fn is_raw_input_active() -> bool { false } +#[cfg(not(target_os = "windows"))] +pub fn update_raw_input_center() {} +#[cfg(not(target_os = "windows"))] +pub fn set_raw_input_sender(_sender: tokio::sync::mpsc::Sender) {} +#[cfg(not(target_os = "windows"))] +pub fn clear_raw_input_sender() {} +// New stubs for non-Windows +#[cfg(not(target_os = "windows"))] +pub fn set_local_cursor_dimensions(_width: u32, _height: u32) {} +#[cfg(not(target_os = "windows"))] +pub fn get_local_cursor_position() -> (i32, i32) { (0, 0) } +#[cfg(not(target_os = "windows"))] +pub fn get_local_cursor_normalized() -> (f32, f32) { (0.5, 0.5) } +#[cfg(not(target_os = "windows"))] +pub fn flush_pending_mouse_events() {} +#[cfg(not(target_os = "windows"))] +pub fn get_coalesced_event_count() -> u64 { 0 } +#[cfg(not(target_os = "windows"))] +pub fn reset_coalescing() {} + +use std::collections::HashSet; +use std::sync::atomic::{AtomicBool, AtomicI32, Ordering}; +use parking_lot::Mutex; +use tokio::sync::mpsc; +use winit::event::{ElementState, MouseButton}; + +use crate::webrtc::{InputEvent, InputEncoder}; + +/// Mouse event coalescing interval in microseconds +/// Official client uses 4-16ms depending on browser, we use 4ms for lowest latency +pub const MOUSE_COALESCE_INTERVAL_US: u64 = 4_000; // 4ms = 250Hz effective rate + +/// Maximum input queue depth before throttling +/// Official client maintains 4-8 events ahead of consumption +pub const MAX_INPUT_QUEUE_DEPTH: usize = 8; + +/// Mouse event coalescer - batches high-frequency mouse events +/// Similar to official GFN client's getCoalescedEvents() handling +pub struct MouseCoalescer { + /// Accumulated delta X + accumulated_dx: AtomicI32, + /// Accumulated delta Y + accumulated_dy: AtomicI32, + /// Last send timestamp (microseconds since session start) + last_send_us: std::sync::atomic::AtomicU64, + /// Coalescing interval in microseconds + coalesce_interval_us: u64, + /// Count of coalesced events (for stats) + coalesced_count: std::sync::atomic::AtomicU64, +} + +impl MouseCoalescer { + pub fn new() -> Self { + Self::with_interval(MOUSE_COALESCE_INTERVAL_US) + } + + pub fn with_interval(interval_us: u64) -> Self { + use std::sync::atomic::AtomicU64; + Self { + accumulated_dx: AtomicI32::new(0), + accumulated_dy: AtomicI32::new(0), + last_send_us: AtomicU64::new(0), + coalesce_interval_us: interval_us, + coalesced_count: AtomicU64::new(0), + } + } + + /// Accumulate mouse delta, returns Some if enough time has passed to send + /// Returns (dx, dy, timestamp_us) if ready to send, None if still accumulating + #[inline] + pub fn accumulate(&self, dx: i32, dy: i32) -> Option<(i16, i16, u64)> { + // Accumulate the delta + self.accumulated_dx.fetch_add(dx, Ordering::Relaxed); + self.accumulated_dy.fetch_add(dy, Ordering::Relaxed); + self.coalesced_count.fetch_add(1, Ordering::Relaxed); + + let now_us = session_elapsed_us(); + let last_us = self.last_send_us.load(Ordering::Acquire); + + // Check if enough time has passed since last send + if now_us.saturating_sub(last_us) >= self.coalesce_interval_us { + self.flush_internal(now_us) + } else { + None + } + } + + /// Force flush accumulated events (call periodically or on button events) + pub fn flush(&self) -> Option<(i16, i16, u64)> { + let now_us = session_elapsed_us(); + self.flush_internal(now_us) + } + + #[inline] + fn flush_internal(&self, now_us: u64) -> Option<(i16, i16, u64)> { + // Atomically take the accumulated deltas + let dx = self.accumulated_dx.swap(0, Ordering::AcqRel); + let dy = self.accumulated_dy.swap(0, Ordering::AcqRel); + + // Only send if there's actual movement + if dx != 0 || dy != 0 { + self.last_send_us.store(now_us, Ordering::Release); + let timestamp_us = get_timestamp_us(); + Some((dx as i16, dy as i16, timestamp_us)) + } else { + None + } + } + + /// Get count of coalesced events (for stats) + pub fn coalesced_count(&self) -> u64 { + self.coalesced_count.load(Ordering::Relaxed) + } + + /// Reset the coalescer state + pub fn reset(&self) { + self.accumulated_dx.store(0, Ordering::Release); + self.accumulated_dy.store(0, Ordering::Release); + self.last_send_us.store(0, Ordering::Release); + self.coalesced_count.store(0, Ordering::Release); + } +} + +impl Default for MouseCoalescer { + fn default() -> Self { + Self::new() + } +} + +/// Local cursor position tracker for instant visual feedback +/// Updates immediately on raw input, independent of network latency +pub struct LocalCursor { + /// Current X position (screen coordinates) + x: AtomicI32, + /// Current Y position (screen coordinates) + y: AtomicI32, + /// Stream width for bounds + stream_width: AtomicI32, + /// Stream height for bounds + stream_height: AtomicI32, + /// Whether cursor is visible/active + active: AtomicBool, +} + +impl LocalCursor { + pub fn new() -> Self { + Self { + x: AtomicI32::new(0), + y: AtomicI32::new(0), + stream_width: AtomicI32::new(1920), + stream_height: AtomicI32::new(1080), + active: AtomicBool::new(false), + } + } + + /// Set stream dimensions (for cursor bounds) + pub fn set_dimensions(&self, width: u32, height: u32) { + self.stream_width.store(width as i32, Ordering::Release); + self.stream_height.store(height as i32, Ordering::Release); + } + + /// Apply relative movement to cursor position + #[inline] + pub fn apply_delta(&self, dx: i32, dy: i32) { + let width = self.stream_width.load(Ordering::Acquire); + let height = self.stream_height.load(Ordering::Acquire); + + // Update X with clamping + let old_x = self.x.load(Ordering::Acquire); + let new_x = (old_x + dx).clamp(0, width); + self.x.store(new_x, Ordering::Release); + + // Update Y with clamping + let old_y = self.y.load(Ordering::Acquire); + let new_y = (old_y + dy).clamp(0, height); + self.y.store(new_y, Ordering::Release); + } + + /// Get current cursor position (normalized 0.0-1.0) + pub fn position_normalized(&self) -> (f32, f32) { + let x = self.x.load(Ordering::Acquire) as f32; + let y = self.y.load(Ordering::Acquire) as f32; + let w = self.stream_width.load(Ordering::Acquire) as f32; + let h = self.stream_height.load(Ordering::Acquire) as f32; + (x / w.max(1.0), y / h.max(1.0)) + } + + /// Get current cursor position (screen coordinates) + pub fn position(&self) -> (i32, i32) { + ( + self.x.load(Ordering::Acquire), + self.y.load(Ordering::Acquire), + ) + } + + /// Set absolute cursor position + pub fn set_position(&self, x: i32, y: i32) { + let width = self.stream_width.load(Ordering::Acquire); + let height = self.stream_height.load(Ordering::Acquire); + self.x.store(x.clamp(0, width), Ordering::Release); + self.y.store(y.clamp(0, height), Ordering::Release); + } + + /// Center the cursor + pub fn center(&self) { + let width = self.stream_width.load(Ordering::Acquire); + let height = self.stream_height.load(Ordering::Acquire); + self.x.store(width / 2, Ordering::Release); + self.y.store(height / 2, Ordering::Release); + } + + pub fn set_active(&self, active: bool) { + self.active.store(active, Ordering::Release); + } + + pub fn is_active(&self) -> bool { + self.active.load(Ordering::Acquire) + } +} + +impl Default for LocalCursor { + fn default() -> Self { + Self::new() + } +} + +/// Cross-platform input handler with coalescing and local cursor support +pub struct InputHandler { + /// Input event sender + event_tx: Mutex>>, + + /// Input encoder + encoder: Mutex, + + /// Whether cursor is captured + cursor_captured: AtomicBool, + + /// Currently pressed keys (for releasing on focus loss) + pressed_keys: Mutex>, + + /// Mouse event coalescer for batching high-frequency events + mouse_coalescer: MouseCoalescer, + + /// Local cursor for instant visual feedback + local_cursor: LocalCursor, + + /// Input queue depth estimate (for throttling) + queue_depth: std::sync::atomic::AtomicU64, + + /// Accumulated mouse delta (legacy, for fallback) + accumulated_dx: AtomicI32, + accumulated_dy: AtomicI32, + + /// Last known cursor position + last_x: AtomicI32, + last_y: AtomicI32, +} + +impl InputHandler { + pub fn new() -> Self { + use std::sync::atomic::AtomicU64; + Self { + event_tx: Mutex::new(None), + encoder: Mutex::new(InputEncoder::new()), + cursor_captured: AtomicBool::new(false), + pressed_keys: Mutex::new(HashSet::new()), + mouse_coalescer: MouseCoalescer::new(), + local_cursor: LocalCursor::new(), + queue_depth: AtomicU64::new(0), + accumulated_dx: AtomicI32::new(0), + accumulated_dy: AtomicI32::new(0), + last_x: AtomicI32::new(0), + last_y: AtomicI32::new(0), + } + } + + /// Set the event sender channel (can be called on Arc) + pub fn set_event_sender(&self, tx: mpsc::Sender) { + *self.event_tx.lock() = Some(tx); + } + + /// Get local cursor for rendering + pub fn local_cursor(&self) -> &LocalCursor { + &self.local_cursor + } + + /// Get mouse coalescer stats + pub fn coalesced_event_count(&self) -> u64 { + self.mouse_coalescer.coalesced_count() + } + + /// Set stream dimensions for local cursor + pub fn set_stream_dimensions(&self, width: u32, height: u32) { + self.local_cursor.set_dimensions(width, height); + self.local_cursor.center(); + self.local_cursor.set_active(true); + } + + /// Update queue depth estimate (call from WebRTC layer) + pub fn update_queue_depth(&self, depth: u64) { + self.queue_depth.store(depth, Ordering::Release); + } + + /// Handle mouse button event + /// Flushes any accumulated mouse movement before button event for proper ordering + pub fn handle_mouse_button(&self, button: MouseButton, state: ElementState) { + // Flush accumulated mouse movement BEFORE button event + // This ensures proper event ordering (move -> click, not click -> move) + if let Some((dx, dy, timestamp_us)) = self.mouse_coalescer.flush() { + self.send_event(InputEvent::MouseMove { dx, dy, timestamp_us }); + } + + // GFN uses 1-based button indices: 1=Left, 2=Middle, 3=Right + let btn = match button { + MouseButton::Left => 1, + MouseButton::Middle => 2, + MouseButton::Right => 3, + MouseButton::Back => 4, + MouseButton::Forward => 5, + MouseButton::Other(n) => (n + 1) as u8, + }; + + let timestamp_us = get_timestamp_us(); + let event = match state { + ElementState::Pressed => InputEvent::MouseButtonDown { button: btn, timestamp_us }, + ElementState::Released => InputEvent::MouseButtonUp { button: btn, timestamp_us }, + }; + + self.send_event(event); + } + + /// Handle cursor move (for non-captured mode) + pub fn handle_cursor_move(&self, x: f64, y: f64) { + if !self.cursor_captured.load(Ordering::Relaxed) { + return; + } + + let x = x as i32; + let y = y as i32; + + let last_x = self.last_x.swap(x, Ordering::Relaxed); + let last_y = self.last_y.swap(y, Ordering::Relaxed); + + if last_x != 0 || last_y != 0 { + let dx = x - last_x; + let dy = y - last_y; + + if dx != 0 || dy != 0 { + // Update local cursor for instant feedback + self.local_cursor.apply_delta(dx, dy); + + // Use coalescer for network events + if let Some((cdx, cdy, timestamp_us)) = self.mouse_coalescer.accumulate(dx, dy) { + self.send_event(InputEvent::MouseMove { + dx: cdx, + dy: cdy, + timestamp_us, + }); + } + } + } + } + + /// Handle raw mouse delta (for captured mode) - WITH COALESCING + /// This is the primary path for mouse input during streaming + pub fn handle_mouse_delta(&self, dx: i16, dy: i16) { + if dx == 0 && dy == 0 { + return; + } + + // Update local cursor immediately for instant visual feedback + self.local_cursor.apply_delta(dx as i32, dy as i32); + + // Check queue depth - throttle if queue is getting full + let depth = self.queue_depth.load(Ordering::Acquire); + if depth > MAX_INPUT_QUEUE_DEPTH as u64 { + // Queue is full, still accumulate but may decimate + self.mouse_coalescer.accumulate(dx as i32, dy as i32); + return; + } + + // Use coalescer for batching - sends every 4ms instead of every event + if let Some((cdx, cdy, timestamp_us)) = self.mouse_coalescer.accumulate(dx as i32, dy as i32) { + self.send_event(InputEvent::MouseMove { dx: cdx, dy: cdy, timestamp_us }); + } + } + + /// Handle raw mouse delta WITHOUT coalescing (for immediate events) + /// Use this for single-shot movements or when you need immediate transmission + pub fn handle_mouse_delta_immediate(&self, dx: i16, dy: i16) { + if dx == 0 && dy == 0 { + return; + } + + // Update local cursor + self.local_cursor.apply_delta(dx as i32, dy as i32); + + // Send immediately without coalescing + self.send_event(InputEvent::MouseMove { dx, dy, timestamp_us: get_timestamp_us() }); + } + + /// Flush any pending coalesced mouse events + /// Call this periodically (e.g., every frame) to ensure events don't get stuck + pub fn flush_mouse_events(&self) { + if let Some((dx, dy, timestamp_us)) = self.mouse_coalescer.flush() { + self.send_event(InputEvent::MouseMove { dx, dy, timestamp_us }); + } + } + + /// Reset input state (call when streaming stops) + pub fn reset(&self) { + self.mouse_coalescer.reset(); + self.local_cursor.set_active(false); + self.queue_depth.store(0, Ordering::Release); + self.pressed_keys.lock().clear(); + } + + /// Handle keyboard event + /// keycode is the Windows Virtual Key code (VK code) + pub fn handle_key(&self, keycode: u16, pressed: bool, modifiers: u16) { + // Track key state to prevent duplicate events and enable proper release + let mut pressed_keys = self.pressed_keys.lock(); + + if pressed { + // Only send key down if not already pressed (prevents duplicates) + if !pressed_keys.insert(keycode) { + // Key was already pressed, skip to avoid duplicates + return; + } + } else { + // Only send key up if key was actually pressed + if !pressed_keys.remove(&keycode) { + // Key wasn't tracked as pressed, but send release anyway to be safe + } + } + drop(pressed_keys); + + let timestamp_us = get_timestamp_us(); + // GFN uses keycode (VK code), scancode is set to 0 + let event = if pressed { + InputEvent::KeyDown { + keycode, + scancode: 0, + modifiers, + timestamp_us, + } + } else { + InputEvent::KeyUp { + keycode, + scancode: 0, + modifiers, + timestamp_us, + } + }; + + self.send_event(event); + } + + /// Release all currently pressed keys (call when focus is lost) + pub fn release_all_keys(&self) { + let mut pressed_keys = self.pressed_keys.lock(); + let keys_to_release: Vec = pressed_keys.drain().collect(); + drop(pressed_keys); + + let timestamp_us = get_timestamp_us(); + for keycode in keys_to_release { + log::debug!("Releasing stuck key: 0x{:02X}", keycode); + let event = InputEvent::KeyUp { + keycode, + scancode: 0, + modifiers: 0, + timestamp_us, + }; + self.send_event(event); + } + } + + /// Handle mouse wheel + pub fn handle_wheel(&self, delta: i16) { + self.send_event(InputEvent::MouseWheel { delta, timestamp_us: get_timestamp_us() }); + } + + /// Set cursor capture state + pub fn set_cursor_captured(&self, captured: bool) { + self.cursor_captured.store(captured, Ordering::Relaxed); + + if captured { + // Reset last position + self.last_x.store(0, Ordering::Relaxed); + self.last_y.store(0, Ordering::Relaxed); + } + } + + /// Check if cursor is captured + pub fn is_cursor_captured(&self) -> bool { + self.cursor_captured.load(Ordering::Relaxed) + } + + /// Get and reset accumulated mouse delta + pub fn take_accumulated_delta(&self) -> (i32, i32) { + let dx = self.accumulated_dx.swap(0, Ordering::Relaxed); + let dy = self.accumulated_dy.swap(0, Ordering::Relaxed); + (dx, dy) + } + + /// Accumulate mouse delta + pub fn accumulate_delta(&self, dx: i32, dy: i32) { + self.accumulated_dx.fetch_add(dx, Ordering::Relaxed); + self.accumulated_dy.fetch_add(dy, Ordering::Relaxed); + } + + /// Send input event - uses blocking send to ensure events aren't dropped + fn send_event(&self, event: InputEvent) { + if let Some(ref tx) = *self.event_tx.lock() { + // Use blocking_send would require async context + // For now, use try_send with larger buffer - critical events are tracked + if tx.try_send(event).is_err() { + log::warn!("Input channel full - event may be dropped"); + } + } + } + + /// Encode and send input directly (for WebRTC data channel) + pub fn encode_and_send(&self, event: &InputEvent) -> Vec { + let mut encoder = self.encoder.lock(); + encoder.encode(event) + } +} + +impl Default for InputHandler { + fn default() -> Self { + Self::new() + } +} + +/// Convert winit scancode to GFN scancode +pub fn convert_scancode(scancode: u32) -> u16 { + // Winit uses platform-specific scancodes + // For now, pass through directly + scancode as u16 +} + +/// Get current modifier state +pub fn get_modifiers(modifiers: &winit::keyboard::ModifiersState) -> u16 { + let mut result = 0u16; + + if modifiers.shift_key() { + result |= 0x01; + } + if modifiers.control_key() { + result |= 0x02; + } + if modifiers.alt_key() { + result |= 0x04; + } + if modifiers.super_key() { + result |= 0x08; + } + + result +} diff --git a/opennow-streamer/src/input/protocol.rs b/opennow-streamer/src/input/protocol.rs new file mode 100644 index 0000000..7f025a1 --- /dev/null +++ b/opennow-streamer/src/input/protocol.rs @@ -0,0 +1,103 @@ +//! Input Protocol Constants +//! +//! GFN input protocol definitions. + +/// Input event types +pub mod event_types { + pub const HEARTBEAT: u32 = 2; + pub const KEY_UP: u32 = 3; + pub const KEY_DOWN: u32 = 4; + pub const MOUSE_ABS: u32 = 5; + pub const MOUSE_REL: u32 = 7; + pub const MOUSE_BUTTON_DOWN: u32 = 8; + pub const MOUSE_BUTTON_UP: u32 = 9; + pub const MOUSE_WHEEL: u32 = 10; +} + +/// Mouse button indices +pub mod mouse_buttons { + pub const LEFT: u8 = 0; + pub const RIGHT: u8 = 1; + pub const MIDDLE: u8 = 2; + pub const BACK: u8 = 3; + pub const FORWARD: u8 = 4; +} + +/// Keyboard modifier flags +pub mod modifiers { + pub const SHIFT: u16 = 0x01; + pub const CTRL: u16 = 0x02; + pub const ALT: u16 = 0x04; + pub const META: u16 = 0x08; + pub const CAPS_LOCK: u16 = 0x10; + pub const NUM_LOCK: u16 = 0x20; +} + +/// Common scancodes (USB HID) +pub mod scancodes { + pub const A: u16 = 0x04; + pub const B: u16 = 0x05; + pub const C: u16 = 0x06; + pub const D: u16 = 0x07; + pub const E: u16 = 0x08; + pub const F: u16 = 0x09; + pub const G: u16 = 0x0A; + pub const H: u16 = 0x0B; + pub const I: u16 = 0x0C; + pub const J: u16 = 0x0D; + pub const K: u16 = 0x0E; + pub const L: u16 = 0x0F; + pub const M: u16 = 0x10; + pub const N: u16 = 0x11; + pub const O: u16 = 0x12; + pub const P: u16 = 0x13; + pub const Q: u16 = 0x14; + pub const R: u16 = 0x15; + pub const S: u16 = 0x16; + pub const T: u16 = 0x17; + pub const U: u16 = 0x18; + pub const V: u16 = 0x19; + pub const W: u16 = 0x1A; + pub const X: u16 = 0x1B; + pub const Y: u16 = 0x1C; + pub const Z: u16 = 0x1D; + + pub const NUM_1: u16 = 0x1E; + pub const NUM_2: u16 = 0x1F; + pub const NUM_3: u16 = 0x20; + pub const NUM_4: u16 = 0x21; + pub const NUM_5: u16 = 0x22; + pub const NUM_6: u16 = 0x23; + pub const NUM_7: u16 = 0x24; + pub const NUM_8: u16 = 0x25; + pub const NUM_9: u16 = 0x26; + pub const NUM_0: u16 = 0x27; + + pub const ENTER: u16 = 0x28; + pub const ESCAPE: u16 = 0x29; + pub const BACKSPACE: u16 = 0x2A; + pub const TAB: u16 = 0x2B; + pub const SPACE: u16 = 0x2C; + + pub const F1: u16 = 0x3A; + pub const F2: u16 = 0x3B; + pub const F3: u16 = 0x3C; + pub const F4: u16 = 0x3D; + pub const F5: u16 = 0x3E; + pub const F6: u16 = 0x3F; + pub const F7: u16 = 0x40; + pub const F8: u16 = 0x41; + pub const F9: u16 = 0x42; + pub const F10: u16 = 0x43; + pub const F11: u16 = 0x44; + pub const F12: u16 = 0x45; + + pub const LEFT_CTRL: u16 = 0xE0; + pub const LEFT_SHIFT: u16 = 0xE1; + pub const LEFT_ALT: u16 = 0xE2; + pub const LEFT_META: u16 = 0xE3; + pub const RIGHT_CTRL: u16 = 0xE4; + pub const RIGHT_SHIFT: u16 = 0xE5; + pub const RIGHT_ALT: u16 = 0xE6; + pub const RIGHT_META: u16 = 0xE7; +} diff --git a/opennow-streamer/src/input/windows.rs b/opennow-streamer/src/input/windows.rs new file mode 100644 index 0000000..920ca34 --- /dev/null +++ b/opennow-streamer/src/input/windows.rs @@ -0,0 +1,563 @@ +//! Windows Raw Input API +//! +//! Provides hardware-level mouse input without OS acceleration. +//! Uses WM_INPUT messages to get raw mouse deltas directly from hardware. +//! Events are coalesced (batched) every 4ms like the official GFN client +//! to prevent server-side buffering while maintaining responsiveness. + +use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, Ordering}; +use std::ffi::c_void; +use std::mem::size_of; +use log::{info, error, debug}; +use tokio::sync::mpsc; +use parking_lot::Mutex; + +use crate::webrtc::InputEvent; +use super::{get_timestamp_us, session_elapsed_us, MOUSE_COALESCE_INTERVAL_US}; + +// Static state +static RAW_INPUT_REGISTERED: AtomicBool = AtomicBool::new(false); +static RAW_INPUT_ACTIVE: AtomicBool = AtomicBool::new(false); +static ACCUMULATED_DX: AtomicI32 = AtomicI32::new(0); +static ACCUMULATED_DY: AtomicI32 = AtomicI32::new(0); +static MESSAGE_WINDOW: Mutex> = Mutex::new(None); + +// Coalescing state - accumulates events for 4ms batches (like official GFN client) +static COALESCE_DX: AtomicI32 = AtomicI32::new(0); +static COALESCE_DY: AtomicI32 = AtomicI32::new(0); +static COALESCE_LAST_SEND_US: AtomicU64 = AtomicU64::new(0); +static COALESCED_EVENT_COUNT: AtomicU64 = AtomicU64::new(0); + +// Local cursor tracking for instant visual feedback (updated on every event) +static LOCAL_CURSOR_X: AtomicI32 = AtomicI32::new(960); +static LOCAL_CURSOR_Y: AtomicI32 = AtomicI32::new(540); +static LOCAL_CURSOR_WIDTH: AtomicI32 = AtomicI32::new(1920); +static LOCAL_CURSOR_HEIGHT: AtomicI32 = AtomicI32::new(1080); + +// Direct event sender for immediate mouse events +// Using parking_lot::Mutex for fast, non-blocking access +static EVENT_SENDER: Mutex>> = Mutex::new(None); + +// Win32 types +type HWND = isize; +type WPARAM = usize; +type LPARAM = isize; +type LRESULT = isize; +type HINSTANCE = isize; +type ATOM = u16; + +// Window messages +const WM_INPUT: u32 = 0x00FF; +const WM_DESTROY: u32 = 0x0002; + +// Raw input constants +const RIDEV_REMOVE: u32 = 0x00000001; +const RID_INPUT: u32 = 0x10000003; +const RIM_TYPEMOUSE: u32 = 0; +const MOUSE_MOVE_RELATIVE: u16 = 0x00; + +// HID usage page and usage for mouse +const HID_USAGE_PAGE_GENERIC: u16 = 0x01; +const HID_USAGE_GENERIC_MOUSE: u16 = 0x02; + +// Center position for cursor recentering +static CENTER_X: AtomicI32 = AtomicI32::new(0); +static CENTER_Y: AtomicI32 = AtomicI32::new(0); + +#[repr(C)] +#[derive(Clone, Copy)] +struct RAWINPUTDEVICE { + usage_page: u16, + usage: u16, + flags: u32, + hwnd_target: HWND, +} + +#[repr(C)] +#[derive(Clone, Copy)] +struct RAWINPUTHEADER { + dw_type: u32, + dw_size: u32, + h_device: *mut c_void, + w_param: WPARAM, +} + +#[repr(C)] +#[derive(Clone, Copy)] +struct RAWMOUSE { + flags: u16, + button_flags: u16, + button_data: u16, + raw_buttons: u32, + last_x: i32, + last_y: i32, + extra_information: u32, +} + +#[repr(C)] +#[derive(Clone, Copy)] +union RAWINPUT_DATA { + mouse: RAWMOUSE, + keyboard: [u8; 24], + hid: [u8; 40], +} + +#[repr(C)] +#[derive(Clone, Copy)] +struct RAWINPUT { + header: RAWINPUTHEADER, + data: RAWINPUT_DATA, +} + +#[repr(C)] +struct WNDCLASSEXW { + cb_size: u32, + style: u32, + lpfn_wnd_proc: Option LRESULT>, + cb_cls_extra: i32, + cb_wnd_extra: i32, + h_instance: HINSTANCE, + h_icon: *mut c_void, + h_cursor: *mut c_void, + hbr_background: *mut c_void, + lpsz_menu_name: *const u16, + lpsz_class_name: *const u16, + h_icon_sm: *mut c_void, +} + +#[repr(C)] +struct MSG { + hwnd: HWND, + message: u32, + w_param: WPARAM, + l_param: LPARAM, + time: u32, + pt_x: i32, + pt_y: i32, +} + +#[repr(C)] +struct POINT { + x: i32, + y: i32, +} + +#[repr(C)] +struct RECT { + left: i32, + top: i32, + right: i32, + bottom: i32, +} + +#[link(name = "user32")] +extern "system" { + fn RegisterRawInputDevices(devices: *const RAWINPUTDEVICE, num_devices: u32, size: u32) -> i32; + fn GetRawInputData(raw_input: *mut c_void, command: u32, data: *mut c_void, size: *mut u32, header_size: u32) -> u32; + fn DefWindowProcW(hwnd: HWND, msg: u32, wparam: WPARAM, lparam: LPARAM) -> LRESULT; + fn RegisterClassExW(wc: *const WNDCLASSEXW) -> ATOM; + fn CreateWindowExW(ex_style: u32, class_name: *const u16, window_name: *const u16, style: u32, x: i32, y: i32, width: i32, height: i32, parent: HWND, menu: *mut c_void, instance: HINSTANCE, param: *mut c_void) -> HWND; + fn DestroyWindow(hwnd: HWND) -> i32; + fn GetMessageW(msg: *mut MSG, hwnd: HWND, filter_min: u32, filter_max: u32) -> i32; + fn TranslateMessage(msg: *const MSG) -> i32; + fn DispatchMessageW(msg: *const MSG) -> LRESULT; + fn PostMessageW(hwnd: HWND, msg: u32, wparam: WPARAM, lparam: LPARAM) -> i32; + fn GetModuleHandleW(module_name: *const u16) -> HINSTANCE; + fn PostQuitMessage(exit_code: i32); + fn SetCursorPos(x: i32, y: i32) -> i32; + fn GetForegroundWindow() -> isize; + fn GetClientRect(hwnd: isize, rect: *mut RECT) -> i32; + fn ClientToScreen(hwnd: isize, point: *mut POINT) -> i32; +} + +/// Convert a Rust string to a null-terminated wide string +fn to_wide(s: &str) -> Vec { + s.encode_utf16().chain(std::iter::once(0)).collect() +} + +/// Update the center position based on current window +fn update_center() -> bool { + unsafe { + let hwnd = GetForegroundWindow(); + if hwnd == 0 { + return false; + } + let mut rect = RECT { left: 0, top: 0, right: 0, bottom: 0 }; + if GetClientRect(hwnd, &mut rect) == 0 { + return false; + } + let mut center = POINT { + x: rect.right / 2, + y: rect.bottom / 2, + }; + if ClientToScreen(hwnd, &mut center) == 0 { + return false; + } + CENTER_X.store(center.x, Ordering::SeqCst); + CENTER_Y.store(center.y, Ordering::SeqCst); + true + } +} + +/// Recenter the cursor to prevent it from hitting screen edges +#[inline] +fn recenter_cursor() { + let cx = CENTER_X.load(Ordering::SeqCst); + let cy = CENTER_Y.load(Ordering::SeqCst); + if cx != 0 && cy != 0 { + unsafe { + SetCursorPos(cx, cy); + } + } +} + +/// Register for raw mouse input +fn register_raw_mouse(hwnd: HWND) -> bool { + let device = RAWINPUTDEVICE { + usage_page: HID_USAGE_PAGE_GENERIC, + usage: HID_USAGE_GENERIC_MOUSE, + flags: 0, // Only receive input when window is focused + hwnd_target: hwnd, + }; + + unsafe { + RegisterRawInputDevices(&device, 1, size_of::() as u32) != 0 + } +} + +/// Unregister raw mouse input +fn unregister_raw_mouse() -> bool { + let device = RAWINPUTDEVICE { + usage_page: HID_USAGE_PAGE_GENERIC, + usage: HID_USAGE_GENERIC_MOUSE, + flags: RIDEV_REMOVE, + hwnd_target: 0, + }; + + unsafe { + RegisterRawInputDevices(&device, 1, size_of::() as u32) != 0 + } +} + +/// Process a WM_INPUT message and extract mouse delta +fn process_raw_input(lparam: LPARAM) -> Option<(i32, i32)> { + unsafe { + // Use a properly aligned buffer for RAWINPUT struct + #[repr(C, align(8))] + struct AlignedBuffer { + data: [u8; 64], + } + + let mut buffer = AlignedBuffer { data: [0; 64] }; + let mut size: u32 = buffer.data.len() as u32; + + let result = GetRawInputData( + lparam as *mut c_void, + RID_INPUT, + buffer.data.as_mut_ptr() as *mut c_void, + &mut size, + size_of::() as u32, + ); + + if result == u32::MAX || result == 0 { + return None; + } + + // Parse the raw input + let raw = &*(buffer.data.as_ptr() as *const RAWINPUT); + + // Check if it's mouse input + if raw.header.dw_type != RIM_TYPEMOUSE { + return None; + } + + let mouse = &raw.data.mouse; + + // Only process relative mouse movement + if mouse.flags == MOUSE_MOVE_RELATIVE { + if mouse.last_x != 0 || mouse.last_y != 0 { + return Some((mouse.last_x, mouse.last_y)); + } + } + + None + } +} + +/// Flush coalesced mouse events - sends accumulated deltas if any +#[inline] +fn flush_coalesced_events() { + let dx = COALESCE_DX.swap(0, Ordering::AcqRel); + let dy = COALESCE_DY.swap(0, Ordering::AcqRel); + + if dx != 0 || dy != 0 { + let timestamp_us = get_timestamp_us(); + let now_us = session_elapsed_us(); + COALESCE_LAST_SEND_US.store(now_us, Ordering::Release); + + let guard = EVENT_SENDER.lock(); + if let Some(ref sender) = *guard { + let _ = sender.try_send(InputEvent::MouseMove { + dx: dx as i16, + dy: dy as i16, + timestamp_us, + }); + } + } +} + +/// Window procedure for the message-only window +/// Implements event coalescing: accumulates mouse deltas and sends every 4ms +/// This matches official GFN client behavior and prevents server-side buffering +unsafe extern "system" fn raw_input_wnd_proc( + hwnd: HWND, + msg: u32, + wparam: WPARAM, + lparam: LPARAM, +) -> LRESULT { + match msg { + WM_INPUT => { + if RAW_INPUT_ACTIVE.load(Ordering::SeqCst) { + if let Some((dx, dy)) = process_raw_input(lparam) { + // 1. Update local cursor IMMEDIATELY for instant visual feedback + // This happens on every event regardless of coalescing + let width = LOCAL_CURSOR_WIDTH.load(Ordering::Acquire); + let height = LOCAL_CURSOR_HEIGHT.load(Ordering::Acquire); + let old_x = LOCAL_CURSOR_X.load(Ordering::Acquire); + let old_y = LOCAL_CURSOR_Y.load(Ordering::Acquire); + LOCAL_CURSOR_X.store((old_x + dx).clamp(0, width), Ordering::Release); + LOCAL_CURSOR_Y.store((old_y + dy).clamp(0, height), Ordering::Release); + + // 2. Accumulate delta for coalescing + COALESCE_DX.fetch_add(dx, Ordering::Relaxed); + COALESCE_DY.fetch_add(dy, Ordering::Relaxed); + COALESCED_EVENT_COUNT.fetch_add(1, Ordering::Relaxed); + + // 3. Check if enough time has passed to send batch (4ms default) + let now_us = session_elapsed_us(); + let last_us = COALESCE_LAST_SEND_US.load(Ordering::Acquire); + + if now_us.saturating_sub(last_us) >= MOUSE_COALESCE_INTERVAL_US { + flush_coalesced_events(); + } + } + } + 0 + } + WM_DESTROY => { + PostQuitMessage(0); + 0 + } + _ => DefWindowProcW(hwnd, msg, wparam, lparam), + } +} + +/// Start raw input capture +pub fn start_raw_input() -> Result<(), String> { + // No cursor recentering - cursor is hidden during streaming + // Recentering causes jitter and feedback loops + + if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + info!("Raw input resumed"); + return Ok(()); + } + + // Spawn a thread to handle the message loop + std::thread::spawn(|| { + unsafe { + let class_name = to_wide("OpenNOW_RawInput_Streamer"); + let h_instance = GetModuleHandleW(std::ptr::null()); + + // Register window class + let wc = WNDCLASSEXW { + cb_size: std::mem::size_of::() as u32, + style: 0, + lpfn_wnd_proc: Some(raw_input_wnd_proc), + cb_cls_extra: 0, + cb_wnd_extra: 0, + h_instance, + h_icon: std::ptr::null_mut(), + h_cursor: std::ptr::null_mut(), + hbr_background: std::ptr::null_mut(), + lpsz_menu_name: std::ptr::null(), + lpsz_class_name: class_name.as_ptr(), + h_icon_sm: std::ptr::null_mut(), + }; + + if RegisterClassExW(&wc) == 0 { + error!("Failed to register raw input window class"); + return; + } + + // Create message-only window (HWND_MESSAGE = -3) + let hwnd = CreateWindowExW( + 0, + class_name.as_ptr(), + std::ptr::null(), + 0, + 0, 0, 0, 0, + -3isize, // HWND_MESSAGE + std::ptr::null_mut(), + h_instance, + std::ptr::null_mut(), + ); + + if hwnd == 0 { + error!("Failed to create raw input window"); + return; + } + + *MESSAGE_WINDOW.lock() = Some(hwnd); + + // Register for raw mouse input + if !register_raw_mouse(hwnd) { + error!("Failed to register raw mouse input"); + DestroyWindow(hwnd); + return; + } + + RAW_INPUT_REGISTERED.store(true, Ordering::SeqCst); + RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + info!("Raw input started - receiving hardware mouse deltas (no acceleration)"); + + // Message loop + let mut msg: MSG = std::mem::zeroed(); + while GetMessageW(&mut msg, 0, 0, 0) > 0 { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + + // Cleanup + RAW_INPUT_REGISTERED.store(false, Ordering::SeqCst); + RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + *MESSAGE_WINDOW.lock() = None; + info!("Raw input thread stopped"); + } + }); + + // Wait for the thread to start + std::thread::sleep(std::time::Duration::from_millis(50)); + + if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + Ok(()) + } else { + Err("Failed to start raw input".to_string()) + } +} + +/// Pause raw input capture +pub fn pause_raw_input() { + RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + ACCUMULATED_DX.store(0, Ordering::SeqCst); + ACCUMULATED_DY.store(0, Ordering::SeqCst); + debug!("Raw input paused"); +} + +/// Resume raw input capture +pub fn resume_raw_input() { + if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + // Update center when resuming (window may have moved) + update_center(); + ACCUMULATED_DX.store(0, Ordering::SeqCst); + ACCUMULATED_DY.store(0, Ordering::SeqCst); + RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + debug!("Raw input resumed"); + } +} + +/// Stop raw input completely +pub fn stop_raw_input() { + RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + unregister_raw_mouse(); + + let guard = MESSAGE_WINDOW.lock(); + if let Some(hwnd) = *guard { + unsafe { + PostMessageW(hwnd, WM_DESTROY, 0, 0); + } + } + drop(guard); + info!("Raw input stopped"); +} + +/// Get accumulated mouse deltas and reset +pub fn get_raw_mouse_delta() -> (i32, i32) { + let dx = ACCUMULATED_DX.swap(0, Ordering::SeqCst); + let dy = ACCUMULATED_DY.swap(0, Ordering::SeqCst); + (dx, dy) +} + +/// Check if raw input is active +pub fn is_raw_input_active() -> bool { + RAW_INPUT_ACTIVE.load(Ordering::SeqCst) +} + +/// Update center position (call when window moves/resizes) +pub fn update_raw_input_center() { + update_center(); +} + +/// Set the event sender for direct mouse event delivery +/// This allows raw input to send events directly to the streaming loop +/// for minimal latency instead of polling accumulated deltas +pub fn set_raw_input_sender(sender: mpsc::Sender) { + let mut guard = EVENT_SENDER.lock(); + *guard = Some(sender); + info!("Raw input direct sender configured"); +} + +/// Clear the event sender +pub fn clear_raw_input_sender() { + let mut guard = EVENT_SENDER.lock(); + *guard = None; +} + +/// Set local cursor dimensions (call when stream starts or resolution changes) +pub fn set_local_cursor_dimensions(width: u32, height: u32) { + LOCAL_CURSOR_WIDTH.store(width as i32, Ordering::Release); + LOCAL_CURSOR_HEIGHT.store(height as i32, Ordering::Release); + // Center cursor when dimensions change + LOCAL_CURSOR_X.store(width as i32 / 2, Ordering::Release); + LOCAL_CURSOR_Y.store(height as i32 / 2, Ordering::Release); + info!("Local cursor dimensions set to {}x{}", width, height); +} + +/// Get local cursor position (for rendering) +/// Returns (x, y) in stream coordinates +pub fn get_local_cursor_position() -> (i32, i32) { + ( + LOCAL_CURSOR_X.load(Ordering::Acquire), + LOCAL_CURSOR_Y.load(Ordering::Acquire), + ) +} + +/// Get local cursor position normalized (0.0-1.0) +pub fn get_local_cursor_normalized() -> (f32, f32) { + let x = LOCAL_CURSOR_X.load(Ordering::Acquire) as f32; + let y = LOCAL_CURSOR_Y.load(Ordering::Acquire) as f32; + let w = LOCAL_CURSOR_WIDTH.load(Ordering::Acquire) as f32; + let h = LOCAL_CURSOR_HEIGHT.load(Ordering::Acquire) as f32; + (x / w.max(1.0), y / h.max(1.0)) +} + +/// Flush any pending coalesced mouse events +/// Call this before button events to ensure proper ordering +pub fn flush_pending_mouse_events() { + flush_coalesced_events(); +} + +/// Get count of coalesced events (for stats) +pub fn get_coalesced_event_count() -> u64 { + COALESCED_EVENT_COUNT.load(Ordering::Relaxed) +} + +/// Reset coalescing state (call when streaming stops) +pub fn reset_coalescing() { + COALESCE_DX.store(0, Ordering::Release); + COALESCE_DY.store(0, Ordering::Release); + COALESCE_LAST_SEND_US.store(0, Ordering::Release); + COALESCED_EVENT_COUNT.store(0, Ordering::Release); + LOCAL_CURSOR_X.store(960, Ordering::Release); + LOCAL_CURSOR_Y.store(540, Ordering::Release); +} diff --git a/opennow-streamer/src/lib.rs b/opennow-streamer/src/lib.rs new file mode 100644 index 0000000..c1dae1b --- /dev/null +++ b/opennow-streamer/src/lib.rs @@ -0,0 +1,14 @@ +//! OpenNow Streamer Library +//! +//! Core components for the native GeForce NOW streaming client. + +pub mod app; +pub mod api; +pub mod auth; +pub mod gui; +pub mod input; +pub mod media; +pub mod webrtc; +pub mod utils; + +pub use app::{App, AppState}; diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs new file mode 100644 index 0000000..75e8eac --- /dev/null +++ b/opennow-streamer/src/main.rs @@ -0,0 +1,432 @@ +//! OpenNow Streamer - Native GeForce NOW Client +//! +//! A high-performance, cross-platform streaming client for GFN. + +mod app; +mod api; +mod auth; +mod gui; +mod input; +mod media; +mod webrtc; +mod utils; + +use anyhow::Result; +use log::info; +use std::sync::Arc; +use parking_lot::Mutex; +use winit::application::ApplicationHandler; +use winit::event_loop::{ControlFlow, EventLoop, ActiveEventLoop}; +use winit::event::{WindowEvent, KeyEvent, ElementState, DeviceEvent, DeviceId, Modifiers}; +use winit::keyboard::{Key, NamedKey, PhysicalKey, KeyCode}; +use winit::platform::scancode::PhysicalKeyExtScancode; +use winit::window::WindowId; + +use app::{App, AppState}; +use gui::Renderer; + +/// Application handler for winit 0.30+ +struct OpenNowApp { + /// Tokio runtime handle + runtime: tokio::runtime::Handle, + /// Application state (shared) + app: Arc>, + /// Renderer (created after window is available) + renderer: Option, + /// Current modifier state + modifiers: Modifiers, + /// Track if we were streaming (for cursor lock state changes) + was_streaming: bool, +} + +/// Convert winit KeyCode to Windows Virtual Key code +fn keycode_to_vk(key: PhysicalKey) -> u16 { + match key { + PhysicalKey::Code(code) => match code { + // Letters + KeyCode::KeyA => 0x41, KeyCode::KeyB => 0x42, KeyCode::KeyC => 0x43, + KeyCode::KeyD => 0x44, KeyCode::KeyE => 0x45, KeyCode::KeyF => 0x46, + KeyCode::KeyG => 0x47, KeyCode::KeyH => 0x48, KeyCode::KeyI => 0x49, + KeyCode::KeyJ => 0x4A, KeyCode::KeyK => 0x4B, KeyCode::KeyL => 0x4C, + KeyCode::KeyM => 0x4D, KeyCode::KeyN => 0x4E, KeyCode::KeyO => 0x4F, + KeyCode::KeyP => 0x50, KeyCode::KeyQ => 0x51, KeyCode::KeyR => 0x52, + KeyCode::KeyS => 0x53, KeyCode::KeyT => 0x54, KeyCode::KeyU => 0x55, + KeyCode::KeyV => 0x56, KeyCode::KeyW => 0x57, KeyCode::KeyX => 0x58, + KeyCode::KeyY => 0x59, KeyCode::KeyZ => 0x5A, + // Numbers + KeyCode::Digit1 => 0x31, KeyCode::Digit2 => 0x32, KeyCode::Digit3 => 0x33, + KeyCode::Digit4 => 0x34, KeyCode::Digit5 => 0x35, KeyCode::Digit6 => 0x36, + KeyCode::Digit7 => 0x37, KeyCode::Digit8 => 0x38, KeyCode::Digit9 => 0x39, + KeyCode::Digit0 => 0x30, + // Function keys + KeyCode::F1 => 0x70, KeyCode::F2 => 0x71, KeyCode::F3 => 0x72, + KeyCode::F4 => 0x73, KeyCode::F5 => 0x74, KeyCode::F6 => 0x75, + KeyCode::F7 => 0x76, KeyCode::F8 => 0x77, KeyCode::F9 => 0x78, + KeyCode::F10 => 0x79, KeyCode::F11 => 0x7A, KeyCode::F12 => 0x7B, + // Special keys + KeyCode::Escape => 0x1B, + KeyCode::Tab => 0x09, + KeyCode::CapsLock => 0x14, + KeyCode::ShiftLeft => 0xA0, KeyCode::ShiftRight => 0xA1, + KeyCode::ControlLeft => 0xA2, KeyCode::ControlRight => 0xA3, + KeyCode::AltLeft => 0xA4, KeyCode::AltRight => 0xA5, + KeyCode::SuperLeft => 0x5B, KeyCode::SuperRight => 0x5C, + KeyCode::Space => 0x20, + KeyCode::Enter => 0x0D, + KeyCode::Backspace => 0x08, + KeyCode::Delete => 0x2E, + KeyCode::Insert => 0x2D, + KeyCode::Home => 0x24, + KeyCode::End => 0x23, + KeyCode::PageUp => 0x21, + KeyCode::PageDown => 0x22, + // Arrow keys + KeyCode::ArrowUp => 0x26, + KeyCode::ArrowDown => 0x28, + KeyCode::ArrowLeft => 0x25, + KeyCode::ArrowRight => 0x27, + // Numpad + KeyCode::Numpad0 => 0x60, KeyCode::Numpad1 => 0x61, KeyCode::Numpad2 => 0x62, + KeyCode::Numpad3 => 0x63, KeyCode::Numpad4 => 0x64, KeyCode::Numpad5 => 0x65, + KeyCode::Numpad6 => 0x66, KeyCode::Numpad7 => 0x67, KeyCode::Numpad8 => 0x68, + KeyCode::Numpad9 => 0x69, + KeyCode::NumpadAdd => 0x6B, + KeyCode::NumpadSubtract => 0x6D, + KeyCode::NumpadMultiply => 0x6A, + KeyCode::NumpadDivide => 0x6F, + KeyCode::NumpadDecimal => 0x6E, + KeyCode::NumpadEnter => 0x0D, + KeyCode::NumLock => 0x90, + // Punctuation + KeyCode::Minus => 0xBD, + KeyCode::Equal => 0xBB, + KeyCode::BracketLeft => 0xDB, + KeyCode::BracketRight => 0xDD, + KeyCode::Backslash => 0xDC, + KeyCode::Semicolon => 0xBA, + KeyCode::Quote => 0xDE, + KeyCode::Backquote => 0xC0, + KeyCode::Comma => 0xBC, + KeyCode::Period => 0xBE, + KeyCode::Slash => 0xBF, + KeyCode::ScrollLock => 0x91, + KeyCode::Pause => 0x13, + KeyCode::PrintScreen => 0x2C, + _ => 0, + }, + PhysicalKey::Unidentified(_) => 0, + } +} + +impl OpenNowApp { + fn new(runtime: tokio::runtime::Handle) -> Self { + let app = Arc::new(Mutex::new(App::new(runtime.clone()))); + Self { + runtime, + app, + renderer: None, + modifiers: Modifiers::default(), + was_streaming: false, + } + } + + /// Get GFN modifier flags from current modifier state + fn get_modifier_flags(&self) -> u16 { + let state = self.modifiers.state(); + let mut flags = 0u16; + if state.shift_key() { flags |= 0x01; } // GFN_MOD_SHIFT + if state.control_key() { flags |= 0x02; } // GFN_MOD_CTRL + if state.alt_key() { flags |= 0x04; } // GFN_MOD_ALT + if state.super_key() { flags |= 0x08; } // GFN_MOD_META + flags + } +} + +impl ApplicationHandler for OpenNowApp { + fn resumed(&mut self, event_loop: &ActiveEventLoop) { + // Create renderer when window is available + if self.renderer.is_none() { + info!("Creating renderer..."); + match pollster::block_on(Renderer::new(event_loop)) { + Ok(renderer) => { + info!("Renderer initialized"); + self.renderer = Some(renderer); + } + Err(e) => { + log::error!("Failed to create renderer: {}", e); + event_loop.exit(); + } + } + } + } + + fn window_event(&mut self, event_loop: &ActiveEventLoop, _window_id: WindowId, event: WindowEvent) { + let Some(renderer) = self.renderer.as_mut() else { + return; + }; + + // Let egui handle events first + let _ = renderer.handle_event(&event); + + match event { + WindowEvent::CloseRequested => { + info!("Window close requested"); + event_loop.exit(); + } + WindowEvent::Resized(size) => { + renderer.resize(size); + } + // Ctrl+Shift+Q to stop streaming (instead of ESC to avoid accidental stops) + WindowEvent::KeyboardInput { + event: KeyEvent { + physical_key: PhysicalKey::Code(KeyCode::KeyQ), + state: ElementState::Pressed, + .. + }, + .. + } if self.modifiers.state().control_key() && self.modifiers.state().shift_key() => { + let mut app = self.app.lock(); + if app.state == AppState::Streaming { + info!("Ctrl+Shift+Q pressed - stopping stream"); + app.stop_streaming(); + } + } + WindowEvent::KeyboardInput { + event: KeyEvent { + logical_key: Key::Named(NamedKey::F11), + state: ElementState::Pressed, + .. + }, + .. + } => { + renderer.toggle_fullscreen(); + // Lock cursor when entering fullscreen during streaming + let app = self.app.lock(); + if app.state == AppState::Streaming { + if renderer.is_fullscreen() { + renderer.lock_cursor(); + } else { + renderer.unlock_cursor(); + } + } + } + WindowEvent::KeyboardInput { + event: KeyEvent { + logical_key: Key::Named(NamedKey::F3), + state: ElementState::Pressed, + .. + }, + .. + } => { + let mut app = self.app.lock(); + app.toggle_stats(); + } + WindowEvent::ModifiersChanged(new_modifiers) => { + self.modifiers = new_modifiers; + } + WindowEvent::KeyboardInput { + event, + .. + } => { + // Forward keyboard input to InputHandler when streaming + let app = self.app.lock(); + if app.state == AppState::Streaming && app.cursor_captured { + // Skip key repeat events (they cause sticky keys) + if event.repeat { + return; + } + + if let Some(ref input_handler) = app.input_handler { + // Convert to Windows VK code (GFN expects VK codes, not scancodes) + let vk_code = keycode_to_vk(event.physical_key); + let pressed = event.state == ElementState::Pressed; + + // Don't include modifier flags when the key itself is a modifier + let is_modifier_key = matches!( + event.physical_key, + PhysicalKey::Code(KeyCode::ShiftLeft) | + PhysicalKey::Code(KeyCode::ShiftRight) | + PhysicalKey::Code(KeyCode::ControlLeft) | + PhysicalKey::Code(KeyCode::ControlRight) | + PhysicalKey::Code(KeyCode::AltLeft) | + PhysicalKey::Code(KeyCode::AltRight) | + PhysicalKey::Code(KeyCode::SuperLeft) | + PhysicalKey::Code(KeyCode::SuperRight) + ); + let modifiers = if is_modifier_key { 0 } else { self.get_modifier_flags() }; + + // Only send if we have a valid VK code + if vk_code != 0 { + input_handler.handle_key(vk_code, pressed, modifiers); + } + } + } + } + WindowEvent::Focused(focused) => { + // Release all keys when focus is lost to prevent sticky keys + if !focused { + let app = self.app.lock(); + if app.state == AppState::Streaming { + if let Some(ref input_handler) = app.input_handler { + log::info!("Window lost focus - releasing all keys"); + input_handler.release_all_keys(); + } + } + } + } + WindowEvent::MouseWheel { delta, .. } => { + let app = self.app.lock(); + if app.state == AppState::Streaming { + if let Some(ref input_handler) = app.input_handler { + let wheel_delta = match delta { + winit::event::MouseScrollDelta::LineDelta(_, y) => (y * 120.0) as i16, + winit::event::MouseScrollDelta::PixelDelta(pos) => pos.y as i16, + }; + input_handler.handle_wheel(wheel_delta); + } + } + } + WindowEvent::RedrawRequested => { + let mut app_guard = self.app.lock(); + app_guard.update(); + + // Check for streaming state change to lock/unlock cursor and start/stop raw input + let is_streaming = app_guard.state == AppState::Streaming; + if is_streaming && !self.was_streaming { + // Just started streaming - lock cursor and start raw input + renderer.lock_cursor(); + self.was_streaming = true; + + // Start Windows Raw Input for unaccelerated mouse movement + #[cfg(target_os = "windows")] + { + match input::start_raw_input() { + Ok(()) => info!("Raw input enabled - mouse acceleration disabled"), + Err(e) => log::warn!("Failed to start raw input: {} - using winit fallback", e), + } + } + } else if !is_streaming && self.was_streaming { + // Just stopped streaming - unlock cursor and stop raw input + renderer.unlock_cursor(); + self.was_streaming = false; + + // Stop raw input + #[cfg(target_os = "windows")] + { + input::stop_raw_input(); + } + } + + match renderer.render(&app_guard) { + Ok(actions) => { + // Apply UI actions to app state + for action in actions { + app_guard.handle_action(action); + } + } + Err(e) => { + log::error!("Render error: {}", e); + } + } + + drop(app_guard); + renderer.window().request_redraw(); + } + WindowEvent::MouseInput { state, button, .. } => { + let app = self.app.lock(); + if app.state == AppState::Streaming { + if let Some(ref input_handler) = app.input_handler { + input_handler.handle_mouse_button(button, state); + } + } + } + WindowEvent::CursorMoved { position, .. } => { + let app = self.app.lock(); + if app.state == AppState::Streaming { + if let Some(ref input_handler) = app.input_handler { + input_handler.handle_cursor_move(position.x, position.y); + } + } + } + _ => {} + } + } + + fn device_event(&mut self, _event_loop: &ActiveEventLoop, _device_id: DeviceId, event: DeviceEvent) { + // Only use winit's MouseMotion as fallback when raw input is not active + #[cfg(target_os = "windows")] + if input::is_raw_input_active() { + return; // Raw input handles mouse movement + } + + if let DeviceEvent::MouseMotion { delta } = event { + let app = self.app.lock(); + if app.state == AppState::Streaming && app.cursor_captured { + if let Some(ref input_handler) = app.input_handler { + input_handler.handle_mouse_delta(delta.0 as i16, delta.1 as i16); + } + } + } + } + + fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) { + let Some(ref mut renderer) = self.renderer else { return }; + + let mut app_guard = self.app.lock(); + let is_streaming = app_guard.state == AppState::Streaming; + + if is_streaming { + // NOTE: Mouse input is handled directly by the raw input thread via set_raw_input_sender() + // No polling needed here - raw input sends directly to the WebRTC input channel + // This keeps mouse latency minimal and independent of render rate + + // CRITICAL: Render directly here during streaming! + // This bypasses request_redraw() which is tied to monitor refresh rate. + // With ControlFlow::Poll + Immediate present mode, this renders as fast as possible. + app_guard.update(); + + match renderer.render(&app_guard) { + Ok(actions) => { + for action in actions { + app_guard.handle_action(action); + } + } + Err(e) => { + // Surface errors are normal during resize, just log at debug + log::debug!("Render error: {}", e); + } + } + } else { + // Non-streaming: use normal request_redraw for UI updates + drop(app_guard); + renderer.window().request_redraw(); + } + } +} + +fn main() -> Result<()> { + // Initialize logging + env_logger::Builder::from_env( + env_logger::Env::default().default_filter_or("info") + ).init(); + + info!("OpenNow Streamer v{}", env!("CARGO_PKG_VERSION")); + info!("Platform: {}", std::env::consts::OS); + + // Create tokio runtime for async operations + let runtime = tokio::runtime::Builder::new_multi_thread() + .enable_all() + .build()?; + + // Create event loop + let event_loop = EventLoop::new()?; + event_loop.set_control_flow(ControlFlow::Poll); + + // Create application handler + let mut app = OpenNowApp::new(runtime.handle().clone()); + + // Run event loop with application handler + event_loop.run_app(&mut app)?; + + Ok(()) +} diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs new file mode 100644 index 0000000..8a473f7 --- /dev/null +++ b/opennow-streamer/src/media/audio.rs @@ -0,0 +1,161 @@ +//! Audio Decoder and Player +//! +//! Decode Opus audio and play through cpal. +//! NOTE: Opus decoding is stubbed - will add proper decoder later. + +use anyhow::{Result, Context}; +use log::{info, warn, error}; +use std::sync::Arc; +use parking_lot::Mutex; + +/// Audio decoder (stubbed - no opus decoding yet) +pub struct AudioDecoder { + sample_rate: u32, + channels: u32, +} + +impl AudioDecoder { + /// Create a new audio decoder (stubbed) + pub fn new(sample_rate: u32, channels: u32) -> Result { + info!("Creating audio decoder (stubbed): {}Hz, {} channels", sample_rate, channels); + warn!("Opus decoding not yet implemented - audio will be silent"); + + Ok(Self { + sample_rate, + channels, + }) + } + + /// Decode an Opus packet (stubbed - returns silence) + pub fn decode(&mut self, data: &[u8]) -> Result> { + // Return silence for now + // Each Opus frame is typically 20ms at 48kHz = 960 samples + let samples_per_frame = (self.sample_rate / 50) as usize; // 20ms frame + let total_samples = samples_per_frame * self.channels as usize; + Ok(vec![0i16; total_samples]) + } + + /// Get sample rate + pub fn sample_rate(&self) -> u32 { + self.sample_rate + } + + /// Get channel count + pub fn channels(&self) -> u32 { + self.channels + } +} + +/// Audio player using cpal +pub struct AudioPlayer { + sample_rate: u32, + channels: u32, + buffer: Arc>, + _stream: Option, +} + +struct AudioBuffer { + samples: Vec, + read_pos: usize, + write_pos: usize, + capacity: usize, +} + +impl AudioBuffer { + fn new(capacity: usize) -> Self { + Self { + samples: vec![0i16; capacity], + read_pos: 0, + write_pos: 0, + capacity, + } + } + + fn write(&mut self, data: &[i16]) { + for &sample in data { + self.samples[self.write_pos] = sample; + self.write_pos = (self.write_pos + 1) % self.capacity; + } + } + + fn read(&mut self, out: &mut [i16]) -> usize { + let mut count = 0; + for sample in out.iter_mut() { + if self.read_pos == self.write_pos { + *sample = 0; // Underrun - output silence + } else { + *sample = self.samples[self.read_pos]; + self.read_pos = (self.read_pos + 1) % self.capacity; + count += 1; + } + } + count + } +} + +impl AudioPlayer { + /// Create a new audio player + pub fn new(sample_rate: u32, channels: u32) -> Result { + use cpal::traits::{DeviceTrait, HostTrait, StreamTrait}; + + info!("Creating audio player: {}Hz, {} channels", sample_rate, channels); + + let host = cpal::default_host(); + + let device = host.default_output_device() + .context("No audio output device found")?; + + info!("Using audio device: {}", device.name().unwrap_or_default()); + + // Buffer for ~200ms of audio + let buffer_size = (sample_rate as usize) * (channels as usize) / 5; + let buffer = Arc::new(Mutex::new(AudioBuffer::new(buffer_size))); + + let config = cpal::StreamConfig { + channels: channels as u16, + sample_rate: cpal::SampleRate(sample_rate), + buffer_size: cpal::BufferSize::Default, + }; + + let buffer_clone = buffer.clone(); + + let stream = device.build_output_stream( + &config, + move |data: &mut [i16], _| { + let mut buf = buffer_clone.lock(); + buf.read(data); + }, + |err| { + error!("Audio stream error: {}", err); + }, + None, + ).context("Failed to create audio stream")?; + + stream.play().context("Failed to start audio playback")?; + + info!("Audio player started"); + + Ok(Self { + sample_rate, + channels, + buffer, + _stream: Some(stream), + }) + } + + /// Push audio samples to the player + pub fn push_samples(&self, samples: &[i16]) { + let mut buffer = self.buffer.lock(); + buffer.write(samples); + } + + /// Get sample rate + pub fn sample_rate(&self) -> u32 { + self.sample_rate + } + + /// Get channel count + pub fn channels(&self) -> u32 { + self.channels + } +} diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs new file mode 100644 index 0000000..b0b33c4 --- /dev/null +++ b/opennow-streamer/src/media/mod.rs @@ -0,0 +1,182 @@ +//! Media Pipeline +//! +//! Video decoding, audio decoding, and rendering. + +mod video; +mod audio; + +pub use video::{VideoDecoder, RtpDepacketizer, DepacketizerCodec, DecodeStats}; +pub use audio::*; + +/// Decoded video frame +#[derive(Debug, Clone)] +pub struct VideoFrame { + pub width: u32, + pub height: u32, + pub y_plane: Vec, + pub u_plane: Vec, + pub v_plane: Vec, + pub y_stride: u32, + pub u_stride: u32, + pub v_stride: u32, + pub timestamp_us: u64, +} + +impl VideoFrame { + /// Create empty frame + pub fn empty(width: u32, height: u32) -> Self { + let y_size = (width * height) as usize; + let uv_size = y_size / 4; + + Self { + width, + height, + y_plane: vec![0; y_size], + u_plane: vec![128; uv_size], + v_plane: vec![128; uv_size], + y_stride: width, + u_stride: width / 2, + v_stride: width / 2, + timestamp_us: 0, + } + } + + /// Convert YUV to RGB (for CPU rendering fallback) + pub fn to_rgb(&self) -> Vec { + let mut rgb = Vec::with_capacity((self.width * self.height * 3) as usize); + + for row in 0..self.height { + for col in 0..self.width { + let yi = (row * self.y_stride + col) as usize; + let ui = ((row / 2) * self.u_stride + col / 2) as usize; + let vi = ((row / 2) * self.v_stride + col / 2) as usize; + + let y = self.y_plane.get(yi).copied().unwrap_or(0) as f32; + let u = self.u_plane.get(ui).copied().unwrap_or(128) as f32 - 128.0; + let v = self.v_plane.get(vi).copied().unwrap_or(128) as f32 - 128.0; + + // BT.601 YUV to RGB + let r = (y + 1.402 * v).clamp(0.0, 255.0) as u8; + let g = (y - 0.344 * u - 0.714 * v).clamp(0.0, 255.0) as u8; + let b = (y + 1.772 * u).clamp(0.0, 255.0) as u8; + + rgb.push(r); + rgb.push(g); + rgb.push(b); + } + } + + rgb + } + + /// Convert YUV to RGBA - optimized with integer math + pub fn to_rgba(&self) -> Vec { + let pixel_count = (self.width * self.height) as usize; + let mut rgba = vec![0u8; pixel_count * 4]; + + // Pre-calculate constants for BT.601 YUV->RGB (scaled by 256 for integer math) + // R = Y + 1.402*V -> Y + (359*V)/256 + // G = Y - 0.344*U - 0.714*V -> Y - (88*U + 183*V)/256 + // B = Y + 1.772*U -> Y + (454*U)/256 + + let width = self.width as usize; + let height = self.height as usize; + let y_stride = self.y_stride as usize; + let u_stride = self.u_stride as usize; + let v_stride = self.v_stride as usize; + + for row in 0..height { + let y_row_offset = row * y_stride; + let uv_row_offset = (row / 2) * u_stride; + let rgba_row_offset = row * width * 4; + + for col in 0..width { + let yi = y_row_offset + col; + let uvi = uv_row_offset + col / 2; + let rgba_i = rgba_row_offset + col * 4; + + // Safe bounds check with defaults + let y = *self.y_plane.get(yi).unwrap_or(&0) as i32; + let u = *self.u_plane.get(uvi).unwrap_or(&128) as i32 - 128; + let v = *self.v_plane.get(uvi).unwrap_or(&128) as i32 - 128; + + // Integer math conversion (faster than float) + let r = (y + ((359 * v) >> 8)).clamp(0, 255) as u8; + let g = (y - ((88 * u + 183 * v) >> 8)).clamp(0, 255) as u8; + let b = (y + ((454 * u) >> 8)).clamp(0, 255) as u8; + + rgba[rgba_i] = r; + rgba[rgba_i + 1] = g; + rgba[rgba_i + 2] = b; + rgba[rgba_i + 3] = 255; + } + } + + rgba + } +} + +/// Stream statistics +#[derive(Debug, Clone, Default)] +pub struct StreamStats { + /// Video resolution + pub resolution: String, + /// Current decoded FPS (frames decoded per second) + pub fps: f32, + /// Render FPS (frames actually rendered to screen per second) + pub render_fps: f32, + /// Target FPS + pub target_fps: u32, + /// Video bitrate in Mbps + pub bitrate_mbps: f32, + /// Network latency in ms + pub latency_ms: f32, + /// Frame decode time in ms + pub decode_time_ms: f32, + /// Frame render time in ms + pub render_time_ms: f32, + /// Input latency in ms (time from event creation to transmission) + pub input_latency_ms: f32, + /// Video codec name + pub codec: String, + /// GPU type + pub gpu_type: String, + /// Server region + pub server_region: String, + /// Packet loss percentage + pub packet_loss: f32, + /// Network jitter in ms + pub jitter_ms: f32, + /// Total frames received + pub frames_received: u64, + /// Total frames decoded + pub frames_decoded: u64, + /// Total frames dropped + pub frames_dropped: u64, + /// Total frames rendered + pub frames_rendered: u64, +} + +impl StreamStats { + pub fn new() -> Self { + Self::default() + } + + /// Format resolution string + pub fn format_resolution(&self) -> String { + if self.resolution.is_empty() { + "N/A".to_string() + } else { + self.resolution.clone() + } + } + + /// Format bitrate string + pub fn format_bitrate(&self) -> String { + if self.bitrate_mbps > 0.0 { + format!("{:.1} Mbps", self.bitrate_mbps) + } else { + "N/A".to_string() + } + } +} diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs new file mode 100644 index 0000000..fd1cb58 --- /dev/null +++ b/opennow-streamer/src/media/video.rs @@ -0,0 +1,845 @@ +//! Video Decoder +//! +//! Hardware-accelerated H.264/H.265/AV1 decoding using FFmpeg. +//! +//! This module provides both blocking and non-blocking decode modes: +//! - Blocking: `decode()` - waits for result (legacy, causes latency) +//! - Non-blocking: `decode_async()` - fire-and-forget, writes to SharedFrame + +use anyhow::{Result, anyhow}; +use log::{info, debug, warn}; +use std::sync::mpsc; +use std::sync::Arc; +use std::thread; +use tokio::sync::mpsc as tokio_mpsc; + +#[cfg(target_os = "windows")] +use std::path::Path; + +use super::VideoFrame; +use crate::app::{VideoCodec, SharedFrame}; + +extern crate ffmpeg_next as ffmpeg; + +use ffmpeg::codec::{decoder, context::Context as CodecContext}; +use ffmpeg::format::Pixel; +use ffmpeg::software::scaling::{context::Context as ScalerContext, flag::Flags as ScalerFlags}; +use ffmpeg::util::frame::video::Video as FfmpegFrame; +use ffmpeg::Packet; + +/// Check if Intel QSV runtime is available on the system +/// Returns true if the required DLLs are found +#[cfg(target_os = "windows")] +fn is_qsv_runtime_available() -> bool { + use std::env; + + // Intel Media SDK / oneVPL runtime DLLs to look for + let runtime_dlls = [ + "libmfx-gen.dll", // Intel oneVPL runtime (11th gen+, newer) + "libmfxhw64.dll", // Intel Media SDK runtime (older) + "mfxhw64.dll", // Alternative naming + "libmfx64.dll", // Another variant + ]; + + // Check common paths where Intel runtimes are installed + let search_paths: Vec = vec![ + // System32 (most common for driver-installed runtimes) + env::var("SystemRoot") + .map(|s| Path::new(&s).join("System32")) + .unwrap_or_default(), + // SysWOW64 for 32-bit + env::var("SystemRoot") + .map(|s| Path::new(&s).join("SysWOW64")) + .unwrap_or_default(), + // Intel Media SDK default install + Path::new("C:\\Program Files\\Intel\\Media SDK 2023 R1\\Software Development Kit\\bin\\x64").to_path_buf(), + Path::new("C:\\Program Files\\Intel\\Media SDK\\bin\\x64").to_path_buf(), + // oneVPL default install + Path::new("C:\\Program Files (x86)\\Intel\\oneAPI\\vpl\\latest\\bin").to_path_buf(), + // Application directory (for bundled DLLs) + env::current_exe() + .ok() + .and_then(|p| p.parent().map(|p| p.to_path_buf())) + .unwrap_or_default(), + ]; + + for dll in &runtime_dlls { + for path in &search_paths { + let full_path = path.join(dll); + if full_path.exists() { + info!("Found Intel QSV runtime: {}", full_path.display()); + return true; + } + } + } + + // Also try loading via Windows DLL search path + // If Intel drivers are installed, the DLLs should be in PATH + if let Ok(output) = std::process::Command::new("where") + .arg("libmfx-gen.dll") + .output() + { + if output.status.success() { + let path = String::from_utf8_lossy(&output.stdout); + info!("Found Intel QSV runtime via PATH: {}", path.trim()); + return true; + } + } + + debug!("Intel QSV runtime not found - QSV decoder will be skipped"); + false +} + +#[cfg(not(target_os = "windows"))] +fn is_qsv_runtime_available() -> bool { + // On Linux, check for libmfx.so or libvpl.so + use std::process::Command; + + if let Ok(output) = Command::new("ldconfig").arg("-p").output() { + let libs = String::from_utf8_lossy(&output.stdout); + if libs.contains("libmfx") || libs.contains("libvpl") { + info!("Found Intel QSV runtime on Linux"); + return true; + } + } + + debug!("Intel QSV runtime not found on Linux"); + false +} + +/// Cached QSV availability check (only check once at startup) +static QSV_AVAILABLE: std::sync::OnceLock = std::sync::OnceLock::new(); + +fn check_qsv_available() -> bool { + *QSV_AVAILABLE.get_or_init(|| { + let available = is_qsv_runtime_available(); + if available { + info!("Intel QuickSync Video (QSV) runtime detected - QSV decoding enabled"); + } else { + info!("Intel QSV runtime not detected - QSV decoding disabled (install Intel GPU drivers for QSV support)"); + } + available + }) +} + +/// Commands sent to the decoder thread +enum DecoderCommand { + /// Decode a packet and return result via channel (blocking mode) + Decode(Vec), + /// Decode a packet and write directly to SharedFrame (non-blocking mode) + DecodeAsync { + data: Vec, + receive_time: std::time::Instant, + }, + Stop, +} + +/// Stats from the decoder thread +#[derive(Debug, Clone)] +pub struct DecodeStats { + /// Time from packet receive to decode complete (ms) + pub decode_time_ms: f32, + /// Whether a frame was produced + pub frame_produced: bool, +} + +/// Video decoder using FFmpeg with hardware acceleration +/// Uses a dedicated thread for decoding since FFmpeg types are not Send +pub struct VideoDecoder { + cmd_tx: mpsc::Sender, + frame_rx: mpsc::Receiver>, + /// Stats receiver for non-blocking mode + stats_rx: Option>, + hw_accel: bool, + frames_decoded: u64, + /// SharedFrame for non-blocking writes (set via set_shared_frame) + shared_frame: Option>, +} + +impl VideoDecoder { + /// Create a new video decoder with hardware acceleration + pub fn new(codec: VideoCodec) -> Result { + // Initialize FFmpeg + ffmpeg::init().map_err(|e| anyhow!("Failed to initialize FFmpeg: {:?}", e))?; + + info!("Creating FFmpeg video decoder for {:?}", codec); + + // Find the decoder + let decoder_id = match codec { + VideoCodec::H264 => ffmpeg::codec::Id::H264, + VideoCodec::H265 => ffmpeg::codec::Id::HEVC, + VideoCodec::AV1 => ffmpeg::codec::Id::AV1, + }; + + // Create channels for communication with decoder thread + let (cmd_tx, cmd_rx) = mpsc::channel::(); + let (frame_tx, frame_rx) = mpsc::channel::>(); + + // Create decoder in a separate thread (FFmpeg types are not Send) + let hw_accel = Self::spawn_decoder_thread(decoder_id, cmd_rx, frame_tx, None, None)?; + + if hw_accel { + info!("Using hardware-accelerated decoder"); + } else { + info!("Using software decoder (hardware acceleration not available)"); + } + + Ok(Self { + cmd_tx, + frame_rx, + stats_rx: None, + hw_accel, + frames_decoded: 0, + shared_frame: None, + }) + } + + /// Create a new video decoder configured for non-blocking async mode + /// Decoded frames are written directly to the SharedFrame + pub fn new_async(codec: VideoCodec, shared_frame: Arc) -> Result<(Self, tokio_mpsc::Receiver)> { + // Initialize FFmpeg + ffmpeg::init().map_err(|e| anyhow!("Failed to initialize FFmpeg: {:?}", e))?; + + info!("Creating FFmpeg video decoder (async mode) for {:?}", codec); + + // Find the decoder + let decoder_id = match codec { + VideoCodec::H264 => ffmpeg::codec::Id::H264, + VideoCodec::H265 => ffmpeg::codec::Id::HEVC, + VideoCodec::AV1 => ffmpeg::codec::Id::AV1, + }; + + // Create channels for communication with decoder thread + let (cmd_tx, cmd_rx) = mpsc::channel::(); + let (frame_tx, frame_rx) = mpsc::channel::>(); + + // Stats channel for async mode (non-blocking stats updates) + let (stats_tx, stats_rx) = tokio_mpsc::channel::(64); + + // Create decoder in a separate thread with SharedFrame + let hw_accel = Self::spawn_decoder_thread( + decoder_id, + cmd_rx, + frame_tx, + Some(shared_frame.clone()), + Some(stats_tx), + )?; + + if hw_accel { + info!("Using hardware-accelerated decoder (async mode)"); + } else { + info!("Using software decoder (async mode)"); + } + + let decoder = Self { + cmd_tx, + frame_rx, + stats_rx: None, // Stats come via the returned receiver + hw_accel, + frames_decoded: 0, + shared_frame: Some(shared_frame), + }; + + Ok((decoder, stats_rx)) + } + + /// Spawn a dedicated decoder thread + fn spawn_decoder_thread( + codec_id: ffmpeg::codec::Id, + cmd_rx: mpsc::Receiver, + frame_tx: mpsc::Sender>, + shared_frame: Option>, + stats_tx: Option>, + ) -> Result { + // Create decoder synchronously to report hw_accel status + let (decoder, hw_accel) = Self::create_decoder(codec_id)?; + + // Spawn thread to handle decoding + thread::spawn(move || { + let mut decoder = decoder; + let mut scaler: Option = None; + let mut width = 0u32; + let mut height = 0u32; + let mut frames_decoded = 0u64; + + while let Ok(cmd) = cmd_rx.recv() { + match cmd { + DecoderCommand::Decode(data) => { + // Blocking mode - send result back via channel + let result = Self::decode_frame( + &mut decoder, + &mut scaler, + &mut width, + &mut height, + &mut frames_decoded, + &data, + ); + let _ = frame_tx.send(result); + } + DecoderCommand::DecodeAsync { data, receive_time } => { + // Non-blocking mode - write directly to SharedFrame + let result = Self::decode_frame( + &mut decoder, + &mut scaler, + &mut width, + &mut height, + &mut frames_decoded, + &data, + ); + + let decode_time_ms = receive_time.elapsed().as_secs_f32() * 1000.0; + let frame_produced = result.is_some(); + + // Write frame directly to SharedFrame (zero-copy handoff) + if let Some(frame) = result { + if let Some(ref sf) = shared_frame { + sf.write(frame); + } + } + + // Send stats update (non-blocking) + if let Some(ref tx) = stats_tx { + let _ = tx.try_send(DecodeStats { + decode_time_ms, + frame_produced, + }); + } + } + DecoderCommand::Stop => break, + } + } + }); + + Ok(hw_accel) + } + + /// Create decoder, trying hardware acceleration first + fn create_decoder(codec_id: ffmpeg::codec::Id) -> Result<(decoder::Video, bool)> { + // Check if Intel QSV runtime is available (cached, only checks once) + let qsv_available = check_qsv_available(); + + // Try hardware decoders in order of preference + // CUVID requires NVIDIA GPU with NVDEC + // QSV requires Intel GPU with Media SDK / oneVPL runtime + // D3D11VA and DXVA2 are Windows-specific generic APIs + // We prioritize NVIDIA (cuvid) since it's most common for gaming PCs + let hw_decoder_names: Vec<&str> = match codec_id { + ffmpeg::codec::Id::H264 => { + let mut decoders = vec!["h264_cuvid"]; // NVIDIA first + if qsv_available { + decoders.push("h264_qsv"); // Intel QSV (only if runtime detected) + } + decoders.push("h264_d3d11va"); // Windows D3D11 (AMD/Intel/NVIDIA) + decoders.push("h264_dxva2"); // Windows DXVA2 (older API) + decoders + } + ffmpeg::codec::Id::HEVC => { + let mut decoders = vec!["hevc_cuvid"]; + if qsv_available { + decoders.push("hevc_qsv"); + } + decoders.push("hevc_d3d11va"); + decoders.push("hevc_dxva2"); + decoders + } + ffmpeg::codec::Id::AV1 => { + let mut decoders = vec!["av1_cuvid"]; + if qsv_available { + decoders.push("av1_qsv"); + } + decoders + } + _ => vec![], + }; + + // Try hardware decoders + for hw_name in &hw_decoder_names { + if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { + // new_with_codec returns Context directly, not Result + let mut ctx = CodecContext::new_with_codec(hw_codec); + ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + match ctx.decoder().video() { + Ok(dec) => { + info!("Successfully created hardware decoder: {}", hw_name); + return Ok((dec, true)); + } + Err(e) => { + debug!("Failed to open hardware decoder {}: {:?}", hw_name, e); + } + } + } + } + + // Fall back to software decoder + info!("Using software decoder (hardware acceleration not available)"); + let codec = ffmpeg::codec::decoder::find(codec_id) + .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; + + let mut ctx = CodecContext::new_with_codec(codec); + ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + let decoder = ctx.decoder().video()?; + Ok((decoder, false)) + } + + /// Decode a single frame (called in decoder thread) + fn decode_frame( + decoder: &mut decoder::Video, + scaler: &mut Option, + width: &mut u32, + height: &mut u32, + frames_decoded: &mut u64, + data: &[u8], + ) -> Option { + // Ensure data starts with start code + let data = if data.len() >= 4 && data[0..4] == [0, 0, 0, 1] { + data.to_vec() + } else if data.len() >= 3 && data[0..3] == [0, 0, 1] { + data.to_vec() + } else { + // Add start code + let mut with_start = vec![0, 0, 0, 1]; + with_start.extend_from_slice(data); + with_start + }; + + // Create packet + let mut packet = Packet::new(data.len()); + if let Some(pkt_data) = packet.data_mut() { + pkt_data.copy_from_slice(&data); + } else { + return None; + } + + // Send packet to decoder + if let Err(e) = decoder.send_packet(&packet) { + // EAGAIN means we need to receive frames first + match e { + ffmpeg::Error::Other { errno } if errno == libc::EAGAIN => {} + _ => debug!("Send packet error: {:?}", e), + } + } + + // Try to receive decoded frame + let mut frame = FfmpegFrame::empty(); + match decoder.receive_frame(&mut frame) { + Ok(_) => { + *frames_decoded += 1; + + let w = frame.width(); + let h = frame.height(); + let format = frame.format(); + + // Create/update scaler if needed (convert to YUV420P) + if scaler.is_none() || *width != w || *height != h { + *width = w; + *height = h; + + match ScalerContext::get( + format, + w, + h, + Pixel::YUV420P, + w, + h, + ScalerFlags::BILINEAR, + ) { + Ok(s) => *scaler = Some(s), + Err(e) => { + warn!("Failed to create scaler: {:?}", e); + return None; + } + } + + if *frames_decoded == 1 { + info!("First decoded frame: {}x{}, format: {:?}", w, h, format); + } + } + + // Convert to YUV420P if needed + let mut yuv_frame = FfmpegFrame::empty(); + if let Some(ref mut s) = scaler { + if let Err(e) = s.run(&frame, &mut yuv_frame) { + warn!("Scaler run failed: {:?}", e); + return None; + } + } else { + yuv_frame = frame; + } + + // Extract YUV planes + let y_plane = yuv_frame.data(0).to_vec(); + let u_plane = yuv_frame.data(1).to_vec(); + let v_plane = yuv_frame.data(2).to_vec(); + + let y_stride = yuv_frame.stride(0) as u32; + let u_stride = yuv_frame.stride(1) as u32; + let v_stride = yuv_frame.stride(2) as u32; + + Some(VideoFrame { + width: w, + height: h, + y_plane, + u_plane, + v_plane, + y_stride, + u_stride, + v_stride, + timestamp_us: 0, + }) + } + Err(ffmpeg::Error::Other { errno }) if errno == libc::EAGAIN => None, + Err(e) => { + debug!("Receive frame error: {:?}", e); + None + } + } + } + + /// Decode a NAL unit - sends to decoder thread and receives result + /// WARNING: This is BLOCKING and will stall the calling thread! + /// For low-latency streaming, use `decode_async()` instead. + pub fn decode(&mut self, data: &[u8]) -> Result> { + // Send decode command + self.cmd_tx.send(DecoderCommand::Decode(data.to_vec())) + .map_err(|_| anyhow!("Decoder thread closed"))?; + + // Receive result (blocking) + match self.frame_rx.recv() { + Ok(frame) => { + if frame.is_some() { + self.frames_decoded += 1; + } + Ok(frame) + } + Err(_) => Err(anyhow!("Decoder thread closed")), + } + } + + /// Decode a NAL unit asynchronously - fire and forget + /// The decoded frame will be written directly to the SharedFrame. + /// Stats are sent via the stats channel returned from `new_async()`. + /// + /// This method NEVER blocks the calling thread, making it ideal for + /// the main streaming loop where input responsiveness is critical. + pub fn decode_async(&mut self, data: &[u8], receive_time: std::time::Instant) -> Result<()> { + self.cmd_tx.send(DecoderCommand::DecodeAsync { + data: data.to_vec(), + receive_time, + }).map_err(|_| anyhow!("Decoder thread closed"))?; + + self.frames_decoded += 1; // Optimistic count + Ok(()) + } + + /// Check if using hardware acceleration + pub fn is_hw_accelerated(&self) -> bool { + self.hw_accel + } + + /// Get number of frames decoded + pub fn frames_decoded(&self) -> u64 { + self.frames_decoded + } +} + +impl Drop for VideoDecoder { + fn drop(&mut self) { + // Signal decoder thread to stop + let _ = self.cmd_tx.send(DecoderCommand::Stop); + } +} + +/// Codec type for depacketizer +#[derive(Debug, Clone, Copy, PartialEq)] +pub enum DepacketizerCodec { + H264, + H265, +} + +/// RTP depacketizer supporting H.264 and H.265/HEVC +pub struct RtpDepacketizer { + codec: DepacketizerCodec, + buffer: Vec, + fragments: Vec>, + in_fragment: bool, + /// Cached VPS NAL unit (H.265 only) + vps: Option>, + /// Cached SPS NAL unit + sps: Option>, + /// Cached PPS NAL unit + pps: Option>, +} + +impl RtpDepacketizer { + pub fn new() -> Self { + Self::with_codec(DepacketizerCodec::H264) + } + + pub fn with_codec(codec: DepacketizerCodec) -> Self { + Self { + codec, + buffer: Vec::with_capacity(64 * 1024), + fragments: Vec::new(), + in_fragment: false, + vps: None, + sps: None, + pps: None, + } + } + + /// Set the codec type + pub fn set_codec(&mut self, codec: DepacketizerCodec) { + self.codec = codec; + // Clear cached parameter sets when codec changes + self.vps = None; + self.sps = None; + self.pps = None; + self.buffer.clear(); + self.in_fragment = false; + } + + /// Process an RTP payload and return complete NAL units + pub fn process(&mut self, payload: &[u8]) -> Vec> { + match self.codec { + DepacketizerCodec::H264 => self.process_h264(payload), + DepacketizerCodec::H265 => self.process_h265(payload), + } + } + + /// Process H.264 RTP payload + fn process_h264(&mut self, payload: &[u8]) -> Vec> { + let mut result = Vec::new(); + + if payload.is_empty() { + return result; + } + + let nal_type = payload[0] & 0x1F; + + match nal_type { + // Single NAL unit (1-23) + 1..=23 => { + // Cache SPS/PPS for later use + if nal_type == 7 { + debug!("H264: Caching SPS ({} bytes)", payload.len()); + self.sps = Some(payload.to_vec()); + } else if nal_type == 8 { + debug!("H264: Caching PPS ({} bytes)", payload.len()); + self.pps = Some(payload.to_vec()); + } + result.push(payload.to_vec()); + } + + // STAP-A (24) - Single-time aggregation packet + 24 => { + let mut offset = 1; + debug!("H264 STAP-A packet: {} bytes total", payload.len()); + + while offset + 2 <= payload.len() { + let size = u16::from_be_bytes([payload[offset], payload[offset + 1]]) as usize; + offset += 2; + + if offset + size > payload.len() { + warn!("H264 STAP-A: invalid size {} at offset {}", size, offset); + break; + } + + let nal_data = payload[offset..offset + size].to_vec(); + let inner_nal_type = nal_data.first().map(|b| b & 0x1F).unwrap_or(0); + + // Cache SPS/PPS + if inner_nal_type == 7 { + self.sps = Some(nal_data.clone()); + } else if inner_nal_type == 8 { + self.pps = Some(nal_data.clone()); + } + + result.push(nal_data); + offset += size; + } + } + + // FU-A (28) - Fragmentation unit + 28 => { + if payload.len() < 2 { + return result; + } + + let fu_header = payload[1]; + let start = (fu_header & 0x80) != 0; + let end = (fu_header & 0x40) != 0; + let inner_nal_type = fu_header & 0x1F; + + if start { + self.buffer.clear(); + self.in_fragment = true; + let nal_header = (payload[0] & 0xE0) | inner_nal_type; + self.buffer.push(nal_header); + self.buffer.extend_from_slice(&payload[2..]); + } else if self.in_fragment { + self.buffer.extend_from_slice(&payload[2..]); + } + + if end && self.in_fragment { + self.in_fragment = false; + let inner_nal_type = self.buffer.first().map(|b| b & 0x1F).unwrap_or(0); + + // For IDR frames, prepend SPS/PPS + if inner_nal_type == 5 { + if let (Some(sps), Some(pps)) = (&self.sps, &self.pps) { + result.push(sps.clone()); + result.push(pps.clone()); + } + } + + result.push(self.buffer.clone()); + } + } + + _ => { + debug!("H264: Unknown NAL type: {}", nal_type); + } + } + + result + } + + /// Process H.265/HEVC RTP payload (RFC 7798) + fn process_h265(&mut self, payload: &[u8]) -> Vec> { + let mut result = Vec::new(); + + if payload.len() < 2 { + return result; + } + + // H.265 NAL unit header is 2 bytes + // Type is in bits 1-6 of first byte: (byte0 >> 1) & 0x3F + let nal_type = (payload[0] >> 1) & 0x3F; + + match nal_type { + // Single NAL unit (0-47, but 48 and 49 are special) + 0..=47 => { + // Cache VPS/SPS/PPS for later use + match nal_type { + 32 => { + debug!("H265: Caching VPS ({} bytes)", payload.len()); + self.vps = Some(payload.to_vec()); + } + 33 => { + debug!("H265: Caching SPS ({} bytes)", payload.len()); + self.sps = Some(payload.to_vec()); + } + 34 => { + debug!("H265: Caching PPS ({} bytes)", payload.len()); + self.pps = Some(payload.to_vec()); + } + _ => {} + } + result.push(payload.to_vec()); + } + + // AP (48) - Aggregation Packet + 48 => { + let mut offset = 2; // Skip the 2-byte NAL unit header + debug!("H265 AP packet: {} bytes total", payload.len()); + + while offset + 2 <= payload.len() { + let size = u16::from_be_bytes([payload[offset], payload[offset + 1]]) as usize; + offset += 2; + + if offset + size > payload.len() { + warn!("H265 AP: invalid size {} at offset {}", size, offset); + break; + } + + let nal_data = payload[offset..offset + size].to_vec(); + + if nal_data.len() >= 2 { + let inner_nal_type = (nal_data[0] >> 1) & 0x3F; + // Cache VPS/SPS/PPS + match inner_nal_type { + 32 => self.vps = Some(nal_data.clone()), + 33 => self.sps = Some(nal_data.clone()), + 34 => self.pps = Some(nal_data.clone()), + _ => {} + } + } + + result.push(nal_data); + offset += size; + } + } + + // FU (49) - Fragmentation Unit + 49 => { + if payload.len() < 3 { + return result; + } + + // FU header is at byte 2 + let fu_header = payload[2]; + let start = (fu_header & 0x80) != 0; + let end = (fu_header & 0x40) != 0; + let inner_nal_type = fu_header & 0x3F; + + if start { + self.buffer.clear(); + self.in_fragment = true; + + // Reconstruct NAL unit header from original header + inner type + // H265 NAL header: forbidden_zero_bit(1) | nal_unit_type(6) | nuh_layer_id(6) | nuh_temporal_id_plus1(3) + // First byte: (forbidden_zero_bit << 7) | (inner_nal_type << 1) | (layer_id >> 5) + // Second byte: (layer_id << 3) | temporal_id + let layer_id = payload[0] & 0x01; // lowest bit of first byte + let temporal_id = payload[1]; // second byte + + let nal_header_byte0 = (inner_nal_type << 1) | layer_id; + let nal_header_byte1 = temporal_id; + + self.buffer.push(nal_header_byte0); + self.buffer.push(nal_header_byte1); + self.buffer.extend_from_slice(&payload[3..]); + } else if self.in_fragment { + self.buffer.extend_from_slice(&payload[3..]); + } + + if end && self.in_fragment { + self.in_fragment = false; + + if self.buffer.len() >= 2 { + let inner_nal_type = (self.buffer[0] >> 1) & 0x3F; + + // For IDR frames (types 19 and 20), prepend VPS/SPS/PPS + if inner_nal_type == 19 || inner_nal_type == 20 { + if let Some(vps) = &self.vps { + result.push(vps.clone()); + } + if let Some(sps) = &self.sps { + result.push(sps.clone()); + } + if let Some(pps) = &self.pps { + result.push(pps.clone()); + } + } + } + + result.push(self.buffer.clone()); + } + } + + _ => { + debug!("H265: Unknown NAL type: {}", nal_type); + } + } + + result + } +} + +impl Default for RtpDepacketizer { + fn default() -> Self { + Self::new() + } +} diff --git a/opennow-streamer/src/utils/logging.rs b/opennow-streamer/src/utils/logging.rs new file mode 100644 index 0000000..e26b9e3 --- /dev/null +++ b/opennow-streamer/src/utils/logging.rs @@ -0,0 +1,157 @@ +//! Logging Utilities +//! +//! File-based and console logging. + +use std::fs::{File, OpenOptions}; +use std::io::Write; +use std::path::PathBuf; +use std::sync::Mutex; +use log::{Log, Metadata, Record, Level, LevelFilter}; + +/// Get the log file path +pub fn get_log_file_path() -> PathBuf { + super::get_app_data_dir().join("streamer.log") +} + +/// Simple file logger +pub struct FileLogger { + file: Mutex>, + console: bool, +} + +impl FileLogger { + pub fn new(console: bool) -> Self { + let file = Self::open_log_file(); + Self { + file: Mutex::new(file), + console, + } + } + + fn open_log_file() -> Option { + let path = get_log_file_path(); + + // Ensure directory exists + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + + OpenOptions::new() + .create(true) + .append(true) + .open(&path) + .ok() + } +} + +impl Log for FileLogger { + fn enabled(&self, metadata: &Metadata) -> bool { + let target = metadata.target(); + let level = metadata.level(); + + // STRICT filtering to prevent log spam from external crates + // This is CRITICAL for performance - even file I/O has overhead + + // Our crate: allow INFO and above (DEBUG only if explicitly needed) + if target.starts_with("opennow_streamer") { + level <= Level::Info + } else { + // External crates: WARN and ERROR only + // This silences: webrtc_sctp, webrtc_ice, webrtc, wgpu, wgpu_hal, etc. + level <= Level::Warn + } + } + + fn log(&self, record: &Record) { + let target = record.target(); + let level = record.level(); + + // Double-check filtering (belt and suspenders) + // External crates are restricted to WARN level + if !target.starts_with("opennow_streamer") && level > Level::Warn { + return; + } + + // Our crate allows DEBUG + if target.starts_with("opennow_streamer") && level > Level::Debug { + return; + } + + let timestamp = chrono::Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); + let message = record.args(); + + let line = format!("[{}] {} {} - {}\n", timestamp, level, target, message); + + // Write to file + if let Ok(mut guard) = self.file.lock() { + if let Some(ref mut file) = *guard { + let _ = file.write_all(line.as_bytes()); + } + } + + // Write to console if enabled + if self.console { + print!("{}", line); + } + } + + fn flush(&self) { + if let Ok(mut guard) = self.file.lock() { + if let Some(ref mut file) = *guard { + let _ = file.flush(); + } + } + } +} + +/// Initialize the logging system +/// +/// Console logging is DISABLED by default for performance. +/// Windows console I/O is blocking and causes severe frame drops when +/// external crates (webrtc_sctp, wgpu, etc.) spam debug messages. +/// All logs are still written to the log file for debugging. +pub fn init_logging() -> Result<(), log::SetLoggerError> { + // CRITICAL: Console logging disabled for performance + // External crates spam DEBUG logs on every mouse movement + // Console I/O on Windows is blocking, causing "20 fps feel" + let logger = Box::new(FileLogger::new(false)); + log::set_boxed_logger(logger)?; + // Set global max to Info - we don't need DEBUG from external crates + // Our crate can still log at any level via the logger's enabled() check + log::set_max_level(LevelFilter::Info); + Ok(()) +} + +/// Initialize logging with console output (for debugging only) +/// WARNING: This will cause performance issues during streaming! +pub fn init_logging_with_console() -> Result<(), log::SetLoggerError> { + let logger = Box::new(FileLogger::new(true)); + log::set_boxed_logger(logger)?; + log::set_max_level(LevelFilter::Info); + Ok(()) +} + +/// Clear log file +pub fn clear_logs() -> std::io::Result<()> { + let path = get_log_file_path(); + if path.exists() { + std::fs::write(&path, "")?; + } + Ok(()) +} + +/// Export logs to a specific path +pub fn export_logs(dest: &PathBuf) -> std::io::Result<()> { + let src = get_log_file_path(); + if src.exists() { + std::fs::copy(&src, dest)?; + } + Ok(()) +} + +/// Print a message directly to console (bypasses logger) +/// Use sparingly - only for critical startup info +#[inline] +pub fn console_print(msg: &str) { + println!("{}", msg); +} diff --git a/opennow-streamer/src/utils/mod.rs b/opennow-streamer/src/utils/mod.rs new file mode 100644 index 0000000..21dfed7 --- /dev/null +++ b/opennow-streamer/src/utils/mod.rs @@ -0,0 +1,44 @@ +//! Utility Functions +//! +//! Common utilities used throughout the application. + +mod logging; +mod time; + +pub use logging::*; +pub use time::*; + +use std::path::PathBuf; + +/// Get the application data directory +pub fn get_app_data_dir() -> PathBuf { + dirs::config_dir() + .unwrap_or_else(|| PathBuf::from(".")) + .join("opennow-streamer") +} + +/// Get the cache directory +pub fn get_cache_dir() -> PathBuf { + dirs::cache_dir() + .unwrap_or_else(|| PathBuf::from(".")) + .join("opennow-streamer") +} + +/// Ensure a directory exists +pub fn ensure_dir(path: &PathBuf) -> std::io::Result<()> { + if !path.exists() { + std::fs::create_dir_all(path)?; + } + Ok(()) +} + +/// Generate a random peer ID for signaling +pub fn generate_peer_id() -> String { + let random: u64 = rand::random::() % 10_000_000_000; + format!("peer-{}", random) +} + +/// Generate a UUID string +pub fn generate_uuid() -> String { + uuid::Uuid::new_v4().to_string() +} diff --git a/opennow-streamer/src/utils/time.rs b/opennow-streamer/src/utils/time.rs new file mode 100644 index 0000000..b3eb119 --- /dev/null +++ b/opennow-streamer/src/utils/time.rs @@ -0,0 +1,128 @@ +//! Time Utilities +//! +//! High-precision timing for input and frame synchronization. + +use std::time::{Duration, Instant}; + +/// High-precision timer for measuring frame times +pub struct FrameTimer { + start: Instant, + last_frame: Instant, + frame_count: u64, + frame_times: Vec, +} + +impl FrameTimer { + pub fn new() -> Self { + let now = Instant::now(); + Self { + start: now, + last_frame: now, + frame_count: 0, + frame_times: Vec::with_capacity(120), + } + } + + /// Mark a new frame and return delta time + pub fn tick(&mut self) -> Duration { + let now = Instant::now(); + let delta = now - self.last_frame; + self.last_frame = now; + self.frame_count += 1; + + // Keep last 120 frame times for FPS calculation + self.frame_times.push(delta); + if self.frame_times.len() > 120 { + self.frame_times.remove(0); + } + + delta + } + + /// Get current FPS based on recent frame times + pub fn fps(&self) -> f32 { + if self.frame_times.is_empty() { + return 0.0; + } + + let total: Duration = self.frame_times.iter().sum(); + let avg = total.as_secs_f32() / self.frame_times.len() as f32; + + if avg > 0.0 { + 1.0 / avg + } else { + 0.0 + } + } + + /// Get total elapsed time since start + pub fn elapsed(&self) -> Duration { + self.start.elapsed() + } + + /// Get total frame count + pub fn frame_count(&self) -> u64 { + self.frame_count + } + + /// Get average frame time in milliseconds + pub fn avg_frame_time_ms(&self) -> f32 { + if self.frame_times.is_empty() { + return 0.0; + } + + let total: Duration = self.frame_times.iter().sum(); + total.as_secs_f32() * 1000.0 / self.frame_times.len() as f32 + } +} + +impl Default for FrameTimer { + fn default() -> Self { + Self::new() + } +} + +/// Get current timestamp in microseconds (for input events) +pub fn timestamp_us() -> u64 { + std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .map(|d| d.as_micros() as u64) + .unwrap_or(0) +} + +/// Get current timestamp in milliseconds +pub fn timestamp_ms() -> u64 { + std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .map(|d| d.as_millis() as u64) + .unwrap_or(0) +} + +/// Relative timestamp from a start time (in microseconds) +pub struct RelativeTimer { + start: Instant, +} + +impl RelativeTimer { + pub fn new() -> Self { + Self { + start: Instant::now(), + } + } + + /// Get microseconds since start + pub fn elapsed_us(&self) -> u64 { + self.start.elapsed().as_micros() as u64 + } + + /// Get milliseconds since start + pub fn elapsed_ms(&self) -> u64 { + self.start.elapsed().as_millis() as u64 + } +} + +impl Default for RelativeTimer { + fn default() -> Self { + Self::new() + } +} diff --git a/opennow-streamer/src/webrtc/datachannel.rs b/opennow-streamer/src/webrtc/datachannel.rs new file mode 100644 index 0000000..3076823 --- /dev/null +++ b/opennow-streamer/src/webrtc/datachannel.rs @@ -0,0 +1,216 @@ +//! GFN Input Protocol Encoder +//! +//! Binary protocol for sending input events over WebRTC data channel. + +use bytes::{BytesMut, BufMut}; +use std::time::Instant; + +/// Input event type constants +pub const INPUT_HEARTBEAT: u32 = 2; +pub const INPUT_KEY_DOWN: u32 = 3; // Type 3 = Key pressed +pub const INPUT_KEY_UP: u32 = 4; // Type 4 = Key released +pub const INPUT_MOUSE_ABS: u32 = 5; +pub const INPUT_MOUSE_REL: u32 = 7; +pub const INPUT_MOUSE_BUTTON_DOWN: u32 = 8; +pub const INPUT_MOUSE_BUTTON_UP: u32 = 9; +pub const INPUT_MOUSE_WHEEL: u32 = 10; + +/// Mouse buttons +pub const MOUSE_BUTTON_LEFT: u8 = 0; +pub const MOUSE_BUTTON_RIGHT: u8 = 1; +pub const MOUSE_BUTTON_MIDDLE: u8 = 2; + +/// Input events that can be sent to the server +/// Each event carries its own timestamp_us (microseconds since app start) +/// for accurate timing even when events are queued. +#[derive(Debug, Clone)] +pub enum InputEvent { + /// Keyboard key pressed + KeyDown { + keycode: u16, + scancode: u16, + modifiers: u16, + timestamp_us: u64, + }, + /// Keyboard key released + KeyUp { + keycode: u16, + scancode: u16, + modifiers: u16, + timestamp_us: u64, + }, + /// Mouse moved (relative) + MouseMove { + dx: i16, + dy: i16, + timestamp_us: u64, + }, + /// Mouse button pressed + MouseButtonDown { + button: u8, + timestamp_us: u64, + }, + /// Mouse button released + MouseButtonUp { + button: u8, + timestamp_us: u64, + }, + /// Mouse wheel scrolled + MouseWheel { + delta: i16, + timestamp_us: u64, + }, + /// Heartbeat (keep-alive) + Heartbeat, +} + +/// Encoder for GFN input protocol +pub struct InputEncoder { + buffer: BytesMut, + start_time: Instant, + protocol_version: u8, +} + +impl InputEncoder { + pub fn new() -> Self { + Self { + buffer: BytesMut::with_capacity(256), + start_time: Instant::now(), + protocol_version: 2, + } + } + + /// Set protocol version (received from handshake) + pub fn set_protocol_version(&mut self, version: u8) { + self.protocol_version = version; + } + + /// Get timestamp in microseconds since start + fn timestamp_us(&self) -> u64 { + self.start_time.elapsed().as_micros() as u64 + } + + /// Encode an input event to binary format + /// Uses the timestamp embedded in each event (captured at creation time) + pub fn encode(&mut self, event: &InputEvent) -> Vec { + self.buffer.clear(); + + match event { + InputEvent::KeyDown { keycode, scancode, modifiers, timestamp_us } => { + // Type 3 (Key Down): 18 bytes + // [type 4B LE][keycode 2B BE][modifiers 2B BE][scancode 2B BE][timestamp 8B BE] + self.buffer.put_u32_le(INPUT_KEY_DOWN); + self.buffer.put_u16(*keycode); + self.buffer.put_u16(*modifiers); + self.buffer.put_u16(*scancode); + self.buffer.put_u64(*timestamp_us); + } + + InputEvent::KeyUp { keycode, scancode, modifiers, timestamp_us } => { + self.buffer.put_u32_le(INPUT_KEY_UP); + self.buffer.put_u16(*keycode); + self.buffer.put_u16(*modifiers); + self.buffer.put_u16(*scancode); + self.buffer.put_u64(*timestamp_us); + } + + InputEvent::MouseMove { dx, dy, timestamp_us } => { + // Type 7 (Mouse Relative): 22 bytes + // [type 4B LE][dx 2B BE][dy 2B BE][reserved 6B][timestamp 8B BE] + self.buffer.put_u32_le(INPUT_MOUSE_REL); + self.buffer.put_i16(*dx); + self.buffer.put_i16(*dy); + self.buffer.put_u16(0); // Reserved + self.buffer.put_u32(0); // Reserved + self.buffer.put_u64(*timestamp_us); + } + + InputEvent::MouseButtonDown { button, timestamp_us } => { + // Type 8 (Mouse Button Down): 18 bytes + // [type 4B LE][button 1B][pad 1B][reserved 4B][timestamp 8B BE] + self.buffer.put_u32_le(INPUT_MOUSE_BUTTON_DOWN); + self.buffer.put_u8(*button); + self.buffer.put_u8(0); // Padding + self.buffer.put_u32(0); // Reserved + self.buffer.put_u64(*timestamp_us); + } + + InputEvent::MouseButtonUp { button, timestamp_us } => { + self.buffer.put_u32_le(INPUT_MOUSE_BUTTON_UP); + self.buffer.put_u8(*button); + self.buffer.put_u8(0); + self.buffer.put_u32(0); + self.buffer.put_u64(*timestamp_us); + } + + InputEvent::MouseWheel { delta, timestamp_us } => { + // Type 10 (Mouse Wheel): 22 bytes + // [type 4B LE][horiz 2B BE][vert 2B BE][reserved 6B][timestamp 8B BE] + self.buffer.put_u32_le(INPUT_MOUSE_WHEEL); + self.buffer.put_i16(0); // Horizontal (unused) + self.buffer.put_i16(*delta); // Vertical (positive = scroll up) + self.buffer.put_u16(0); // Reserved + self.buffer.put_u32(0); // Reserved + self.buffer.put_u64(*timestamp_us); + } + + InputEvent::Heartbeat => { + // Type 2 (Heartbeat): 4 bytes + self.buffer.put_u32_le(INPUT_HEARTBEAT); + } + } + + // Protocol v3+ requires single event wrapper + // Official client uses: [0x22][payload] for single events + if self.protocol_version > 2 { + let payload = self.buffer.to_vec(); + let mut final_buf = BytesMut::with_capacity(1 + payload.len()); + + // Single event wrapper marker (34 = 0x22) + final_buf.put_u8(0x22); + // Payload (already contains timestamp) + final_buf.extend_from_slice(&payload); + + final_buf.to_vec() + } else { + self.buffer.to_vec() + } + } + + /// Encode handshake response + pub fn encode_handshake_response(major: u8, minor: u8, flags: u8) -> Vec { + vec![0x0e, major, minor, flags] + } +} + +impl Default for InputEncoder { + fn default() -> Self { + Self::new() + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_mouse_move_encoding() { + let mut encoder = InputEncoder::new(); + let event = InputEvent::MouseMove { dx: -1, dy: 5, timestamp_us: 12345 }; + let encoded = encoder.encode(&event); + + assert_eq!(encoded.len(), 22); + // Type 7 in LE + assert_eq!(&encoded[0..4], &[0x07, 0x00, 0x00, 0x00]); + } + + #[test] + fn test_heartbeat_encoding() { + let mut encoder = InputEncoder::new(); + let event = InputEvent::Heartbeat; + let encoded = encoder.encode(&event); + + assert_eq!(encoded.len(), 4); + assert_eq!(&encoded[0..4], &[0x02, 0x00, 0x00, 0x00]); + } +} diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs new file mode 100644 index 0000000..e57588e --- /dev/null +++ b/opennow-streamer/src/webrtc/mod.rs @@ -0,0 +1,668 @@ +//! WebRTC Module +//! +//! WebRTC peer connection, signaling, and data channels for GFN streaming. + +mod signaling; +mod peer; +mod sdp; +mod datachannel; + +pub use signaling::{GfnSignaling, SignalingEvent, IceCandidate}; +pub use peer::{WebRtcPeer, WebRtcEvent}; +pub use sdp::*; +pub use datachannel::*; + +use std::sync::Arc; +use parking_lot::Mutex; +use tokio::sync::mpsc; +use anyhow::{Result, Context}; +use log::{info, warn, error, debug}; +use webrtc::ice_transport::ice_server::RTCIceServer; + +use crate::app::{SessionInfo, Settings, VideoCodec, SharedFrame}; +use crate::media::{VideoFrame, StreamStats, VideoDecoder, AudioDecoder, AudioPlayer, RtpDepacketizer, DepacketizerCodec, DecodeStats}; +use crate::input::InputHandler; + +/// Active streaming session +pub struct StreamingSession { + pub signaling: Option, + pub peer: Option, + pub connected: bool, + pub stats: StreamStats, + pub input_ready: bool, +} + +impl StreamingSession { + pub fn new() -> Self { + Self { + signaling: None, + peer: None, + connected: false, + stats: StreamStats::default(), + input_ready: false, + } + } +} + +impl Default for StreamingSession { + fn default() -> Self { + Self::new() + } +} + +/// Build nvstSdp string with streaming parameters +/// Based on official GFN browser client format +fn build_nvst_sdp( + ice_ufrag: &str, + ice_pwd: &str, + fingerprint: &str, + width: u32, + height: u32, + fps: u32, + max_bitrate_kbps: u32, +) -> String { + let min_bitrate_kbps = std::cmp::min(10000, max_bitrate_kbps / 10); + let initial_bitrate_kbps = max_bitrate_kbps / 2; + + let is_high_fps = fps >= 120; + let is_120_fps = fps == 120; + let is_240_fps = fps >= 240; + + let mut lines = vec![ + "v=0".to_string(), + "o=SdpTest test_id_13 14 IN IPv4 127.0.0.1".to_string(), + "s=-".to_string(), + "t=0 0".to_string(), + format!("a=general.icePassword:{}", ice_pwd), + format!("a=general.iceUserNameFragment:{}", ice_ufrag), + format!("a=general.dtlsFingerprint:{}", fingerprint), + "m=video 0 RTP/AVP".to_string(), + "a=msid:fbc-video-0".to_string(), + // FEC settings + "a=vqos.fec.rateDropWindow:10".to_string(), + "a=vqos.fec.minRequiredFecPackets:2".to_string(), + "a=vqos.fec.repairMinPercent:5".to_string(), + "a=vqos.fec.repairPercent:5".to_string(), + "a=vqos.fec.repairMaxPercent:35".to_string(), + ]; + + // DRC/DFC settings based on FPS + if is_high_fps { + lines.push("a=vqos.drc.enable:0".to_string()); + lines.push("a=vqos.dfc.enable:1".to_string()); + lines.push("a=vqos.dfc.decodeFpsAdjPercent:85".to_string()); + lines.push("a=vqos.dfc.targetDownCooldownMs:250".to_string()); + lines.push("a=vqos.dfc.dfcAlgoVersion:2".to_string()); + lines.push(format!("a=vqos.dfc.minTargetFps:{}", if is_120_fps { 100 } else { 60 })); + } else { + lines.push("a=vqos.drc.minRequiredBitrateCheckEnabled:1".to_string()); + } + + // Video encoder settings + lines.extend(vec![ + "a=video.dx9EnableNv12:1".to_string(), + "a=video.dx9EnableHdr:1".to_string(), + "a=vqos.qpg.enable:1".to_string(), + "a=vqos.resControl.qp.qpg.featureSetting:7".to_string(), + "a=bwe.useOwdCongestionControl:1".to_string(), + "a=video.enableRtpNack:1".to_string(), + "a=vqos.bw.txRxLag.minFeedbackTxDeltaMs:200".to_string(), + "a=vqos.drc.bitrateIirFilterFactor:18".to_string(), + "a=video.packetSize:1140".to_string(), + "a=packetPacing.minNumPacketsPerGroup:15".to_string(), + ]); + + // High FPS optimizations + if is_high_fps { + lines.extend(vec![ + "a=bwe.iirFilterFactor:8".to_string(), + "a=video.encoderFeatureSetting:47".to_string(), + "a=video.encoderPreset:6".to_string(), + "a=vqos.resControl.cpmRtc.badNwSkipFramesCount:600".to_string(), + "a=vqos.resControl.cpmRtc.decodeTimeThresholdMs:9".to_string(), + format!("a=video.fbcDynamicFpsGrabTimeoutMs:{}", if is_120_fps { 6 } else { 18 }), + format!("a=vqos.resControl.cpmRtc.serverResolutionUpdateCoolDownCount:{}", if is_120_fps { 6000 } else { 12000 }), + ]); + } + + // 240+ FPS optimizations + if is_240_fps { + lines.extend(vec![ + "a=video.enableNextCaptureMode:1".to_string(), + "a=vqos.maxStreamFpsEstimate:240".to_string(), + "a=video.videoSplitEncodeStripsPerFrame:3".to_string(), + "a=video.updateSplitEncodeStateDynamically:1".to_string(), + ]); + } + + // Out of focus and additional settings + lines.extend(vec![ + "a=vqos.adjustStreamingFpsDuringOutOfFocus:1".to_string(), + "a=vqos.resControl.cpmRtc.ignoreOutOfFocusWindowState:1".to_string(), + "a=vqos.resControl.perfHistory.rtcIgnoreOutOfFocusWindowState:1".to_string(), + "a=vqos.resControl.cpmRtc.featureMask:3".to_string(), + format!("a=packetPacing.numGroups:{}", if is_120_fps { 3 } else { 5 }), + "a=packetPacing.maxDelayUs:1000".to_string(), + "a=packetPacing.minNumPacketsFrame:10".to_string(), + // NACK settings + "a=video.rtpNackQueueLength:1024".to_string(), + "a=video.rtpNackQueueMaxPackets:512".to_string(), + "a=video.rtpNackMaxPacketCount:25".to_string(), + // Resolution/quality + "a=vqos.drc.qpMaxResThresholdAdj:4".to_string(), + "a=vqos.grc.qpMaxResThresholdAdj:4".to_string(), + "a=vqos.drc.iirFilterFactor:100".to_string(), + // Viewport and FPS + format!("a=video.clientViewportWd:{}", width), + format!("a=video.clientViewportHt:{}", height), + format!("a=video.maxFPS:{}", fps), + // Bitrate + format!("a=video.initialBitrateKbps:{}", initial_bitrate_kbps), + format!("a=video.initialPeakBitrateKbps:{}", initial_bitrate_kbps), + format!("a=vqos.bw.maximumBitrateKbps:{}", max_bitrate_kbps), + format!("a=vqos.bw.minimumBitrateKbps:{}", min_bitrate_kbps), + // Encoder settings + "a=video.maxNumReferenceFrames:4".to_string(), + "a=video.mapRtpTimestampsToFrames:1".to_string(), + "a=video.encoderCscMode:3".to_string(), + "a=video.scalingFeature1:0".to_string(), + "a=video.prefilterParams.prefilterModel:0".to_string(), + // Audio track + "m=audio 0 RTP/AVP".to_string(), + "a=msid:audio".to_string(), + // Mic track + "m=mic 0 RTP/AVP".to_string(), + "a=msid:mic".to_string(), + // Input/application track + "m=application 0 RTP/AVP".to_string(), + "a=msid:input_1".to_string(), + "a=ri.partialReliableThresholdMs:300".to_string(), + "".to_string(), + ]); + + lines.join("\n") +} + +/// Extract ICE credentials from SDP +fn extract_ice_credentials(sdp: &str) -> (String, String, String) { + let ufrag = sdp.lines() + .find(|l| l.starts_with("a=ice-ufrag:")) + .map(|l| l.trim_start_matches("a=ice-ufrag:").to_string()) + .unwrap_or_default(); + + let pwd = sdp.lines() + .find(|l| l.starts_with("a=ice-pwd:")) + .map(|l| l.trim_start_matches("a=ice-pwd:").to_string()) + .unwrap_or_default(); + + let fingerprint = sdp.lines() + .find(|l| l.starts_with("a=fingerprint:sha-256 ")) + .map(|l| l.trim_start_matches("a=fingerprint:sha-256 ").to_string()) + .unwrap_or_default(); + + (ufrag, pwd, fingerprint) +} + +/// Extract public IP from server hostname (e.g., "95-178-87-234.zai..." -> "95.178.87.234") +fn extract_public_ip(server_ip: &str) -> Option { + let re = regex::Regex::new(r"^(\d+-\d+-\d+-\d+)\.").ok()?; + re.captures(server_ip) + .and_then(|c| c.get(1)) + .map(|m| m.as_str().replace('-', ".")) +} + +/// Run the streaming session +pub async fn run_streaming( + session_info: SessionInfo, + settings: Settings, + shared_frame: Arc, + stats_tx: mpsc::Sender, + input_handler: Arc, +) -> Result<()> { + info!("Starting streaming to {} with session {}", session_info.server_ip, session_info.session_id); + + let (width, height) = settings.resolution_tuple(); + let fps = settings.fps; + let max_bitrate = settings.max_bitrate_kbps(); + let codec = settings.codec; + let codec_str = codec.as_str().to_string(); + + // Create signaling client + let (sig_event_tx, mut sig_event_rx) = mpsc::channel::(64); + let server_ip = session_info.signaling_url + .as_ref() + .and_then(|url| { + url.split("://").nth(1).and_then(|s| s.split('/').next()) + }) + .unwrap_or(&session_info.server_ip) + .to_string(); + + let mut signaling = GfnSignaling::new( + server_ip.clone(), + session_info.session_id.clone(), + sig_event_tx, + ); + + // Connect to signaling + signaling.connect().await?; + info!("Signaling connected"); + + // Create WebRTC peer + let (peer_event_tx, mut peer_event_rx) = mpsc::channel(64); + let mut peer = WebRtcPeer::new(peer_event_tx); + + // Video decoder - use async mode for non-blocking decode + // Decoded frames are written directly to SharedFrame by the decoder thread + let (mut video_decoder, mut decode_stats_rx) = VideoDecoder::new_async(codec, shared_frame.clone())?; + + // Create RTP depacketizer with correct codec + let depacketizer_codec = match codec { + VideoCodec::H264 => DepacketizerCodec::H264, + VideoCodec::H265 => DepacketizerCodec::H265, + VideoCodec::AV1 => DepacketizerCodec::H264, // AV1 uses different packetization, fallback for now + }; + let mut rtp_depacketizer = RtpDepacketizer::with_codec(depacketizer_codec); + info!("RTP depacketizer using {:?} mode", depacketizer_codec); + + let mut audio_decoder = AudioDecoder::new(48000, 2)?; + + // Audio player is created in a separate thread due to cpal::Stream not being Send + let (audio_tx, mut audio_rx) = mpsc::channel::>(32); + std::thread::spawn(move || { + if let Ok(audio_player) = AudioPlayer::new(48000, 2) { + info!("Audio player thread started"); + while let Some(samples) = audio_rx.blocking_recv() { + audio_player.push_samples(&samples); + } + } else { + warn!("Failed to create audio player - audio disabled"); + } + }); + + // Stats tracking + let mut stats = StreamStats::default(); + let mut last_stats_time = std::time::Instant::now(); + let mut frames_received: u64 = 0; + let mut frames_decoded: u64 = 0; + let mut frames_dropped: u64 = 0; + let mut bytes_received: u64 = 0; + let mut last_frames_decoded: u64 = 0; // For actual FPS calculation + + // Pipeline latency tracking (receive to decode complete) + let mut pipeline_latency_sum: f64 = 0.0; + let mut pipeline_latency_count: u64 = 0; + + // Input latency tracking (event creation to transmission) + let mut input_latency_sum: f64 = 0.0; + let mut input_latency_count: u64 = 0; + + // Input state - use atomic for cross-task communication + // input_ready_flag and input_protocol_version_shared are created later with the input task + + // Input channel - connect InputHandler to the streaming loop + // Large buffer (1024) to handle high-frequency mouse events without blocking + let (input_event_tx, input_event_rx) = mpsc::channel::(1024); + input_handler.set_event_sender(input_event_tx.clone()); + + // Also set raw input sender for direct mouse events (Windows only) + #[cfg(target_os = "windows")] + crate::input::set_raw_input_sender(input_event_tx); + + info!("Input handler connected to streaming loop"); + + // Channel for input task to send encoded packets to the WebRTC peer + // This decouples input processing from video decoding completely + // Tuple: (encoded_data, is_mouse, latency_us) + let (input_packet_tx, mut input_packet_rx) = mpsc::channel::<(Vec, bool, u64)>(1024); + + // Stats interval timer (must be created OUTSIDE the loop to persist across iterations) + let mut stats_interval = tokio::time::interval(std::time::Duration::from_secs(1)); + + // Spawn dedicated input processing task - completely decoupled from video/signaling + // This ensures mouse/keyboard events are processed immediately without being blocked + // by video decoding or network operations + let input_packet_tx_clone = input_packet_tx.clone(); + let input_ready_flag = Arc::new(std::sync::atomic::AtomicBool::new(false)); + let input_ready_flag_clone = input_ready_flag.clone(); + let input_protocol_version_shared = Arc::new(std::sync::atomic::AtomicU8::new(0)); + let input_protocol_version_clone = input_protocol_version_shared.clone(); + + tokio::spawn(async move { + let mut input_encoder = InputEncoder::new(); + let mut input_event_rx = input_event_rx; + + loop { + match input_event_rx.recv().await { + Some(event) => { + // Only process if input is ready (handshake complete) + if !input_ready_flag_clone.load(std::sync::atomic::Ordering::Acquire) { + continue; + } + + // Update encoder protocol version if changed + let version = input_protocol_version_clone.load(std::sync::atomic::Ordering::Relaxed); + input_encoder.set_protocol_version(version); + + // Extract event timestamp for latency calculation + let event_timestamp_us = match &event { + InputEvent::KeyDown { timestamp_us, .. } | + InputEvent::KeyUp { timestamp_us, .. } | + InputEvent::MouseMove { timestamp_us, .. } | + InputEvent::MouseButtonDown { timestamp_us, .. } | + InputEvent::MouseButtonUp { timestamp_us, .. } | + InputEvent::MouseWheel { timestamp_us, .. } => *timestamp_us, + InputEvent::Heartbeat => 0, + }; + + // Calculate input latency (time from event creation to now) + let now_us = crate::input::get_timestamp_us(); + let latency_us = now_us.saturating_sub(event_timestamp_us); + + // Encode the event + let encoded = input_encoder.encode(&event); + + // Determine if this is a mouse event (for channel selection) + let is_mouse = matches!( + &event, + InputEvent::MouseMove { .. } | + InputEvent::MouseButtonDown { .. } | + InputEvent::MouseButtonUp { .. } | + InputEvent::MouseWheel { .. } + ); + + // Send to main loop for WebRTC transmission + // Use try_send to never block the input thread + if input_packet_tx_clone.try_send((encoded, is_mouse, latency_us)).is_err() { + // Channel full - this is fine, old packets can be dropped for mouse + } + } + None => { + // Channel closed, exit task + break; + } + } + } + debug!("Input processing task ended"); + }); + + // Main event loop - no longer processes input directly + loop { + tokio::select! { + // Process encoded input packets from the input task (high priority) + biased; + + Some((encoded, is_mouse, latency_us)) = input_packet_rx.recv() => { + // Track input latency for stats + if latency_us > 0 { + input_latency_sum += latency_us as f64; + input_latency_count += 1; + } + + if is_mouse { + // Mouse events - use partially reliable channel (8ms lifetime) + let _ = peer.send_mouse_input(&encoded).await; + } else { + // Keyboard events - use reliable channel + let _ = peer.send_input(&encoded).await; + } + } + Some(event) = sig_event_rx.recv() => { + match event { + SignalingEvent::SdpOffer(sdp) => { + info!("Received SDP offer, length: {}", sdp.len()); + + // Extract public IP and modify SDP + let public_ip = extract_public_ip(&server_ip); + let modified_sdp = if let Some(ref ip) = public_ip { + fix_server_ip(&sdp, ip) + } else { + sdp.clone() + }; + + // Prefer codec + let modified_sdp = prefer_codec(&modified_sdp, &codec); + + // CRITICAL: Create input channel BEFORE handling offer (per GFN protocol) + info!("Creating input channel BEFORE SDP negotiation..."); + + // Handle offer and create answer + match peer.handle_offer(&modified_sdp, vec![]).await { + Ok(answer_sdp) => { + // Create input channel + if let Err(e) = peer.create_input_channel().await { + warn!("Failed to create input channel: {}", e); + } + + // Extract ICE credentials from our answer + let (ufrag, pwd, fingerprint) = extract_ice_credentials(&answer_sdp); + + // Build nvstSdp + let nvst_sdp = build_nvst_sdp( + &ufrag, + &pwd, + &fingerprint, + width, + height, + fps, + max_bitrate, + ); + + info!("Sending SDP answer with nvstSdp..."); + signaling.send_answer(&answer_sdp, Some(&nvst_sdp)).await?; + + // Add manual ICE candidate ONLY if we have real port from session API + // Otherwise, rely on trickle ICE from server (has real port) + // SDP port 47998 is a DUMMY - never use it! + if let Some(ref mci) = session_info.media_connection_info { + info!("Using media port {} from session API", mci.port); + let candidate = format!( + "candidate:1 1 udp 2130706431 {} {} typ host", + mci.ip, mci.port + ); + info!("Adding manual ICE candidate: {}", candidate); + if let Err(e) = peer.add_ice_candidate(&candidate, Some("0"), Some(0)).await { + warn!("Failed to add manual ICE candidate: {}", e); + for mid in ["1", "2", "3"] { + if peer.add_ice_candidate(&candidate, Some(mid), Some(mid.parse().unwrap_or(0))).await.is_ok() { + info!("Added ICE candidate with sdpMid={}", mid); + break; + } + } + } + } else { + info!("No media_connection_info - waiting for trickle ICE from server"); + } + + // Update stats with codec info + stats.codec = codec_str.clone(); + stats.resolution = format!("{}x{}", width, height); + stats.target_fps = fps; + } + Err(e) => { + error!("Failed to handle offer: {}", e); + } + } + } + SignalingEvent::IceCandidate(candidate) => { + info!("Received trickle ICE candidate"); + if let Err(e) = peer.add_ice_candidate( + &candidate.candidate, + candidate.sdp_mid.as_deref(), + candidate.sdp_mline_index.map(|i| i as u16), + ).await { + warn!("Failed to add ICE candidate: {}", e); + } + } + SignalingEvent::Connected => { + info!("Signaling connected event"); + } + SignalingEvent::Disconnected(reason) => { + info!("Signaling disconnected: {}", reason); + break; + } + SignalingEvent::Error(e) => { + error!("Signaling error: {}", e); + break; + } + } + } + Some(event) = peer_event_rx.recv() => { + match event { + WebRtcEvent::Connected => { + info!("=== WebRTC CONNECTED ==="); + stats.gpu_type = session_info.gpu_type.clone().unwrap_or_default(); + } + WebRtcEvent::Disconnected => { + warn!("WebRTC disconnected"); + break; + } + WebRtcEvent::VideoFrame { payload, rtp_timestamp: _ } => { + frames_received += 1; + bytes_received += payload.len() as u64; + let packet_receive_time = std::time::Instant::now(); + + // Only log first packet + if frames_received == 1 { + info!("First video RTP packet received: {} bytes", payload.len()); + } + + // Depacketize RTP - may return multiple NAL units (e.g., from STAP-A/AP) + let nal_units = rtp_depacketizer.process(&payload); + for nal_unit in nal_units { + // NON-BLOCKING decode - fire and forget! + // The decoder thread will write directly to SharedFrame + // This ensures the main loop never stalls waiting for decode + if let Err(e) = video_decoder.decode_async(&nal_unit, packet_receive_time) { + warn!("Decode async failed: {}", e); + } + } + } + WebRtcEvent::AudioFrame(rtp_data) => { + // Decode Opus (stubbed for now) + if let Ok(samples) = audio_decoder.decode(&rtp_data) { + let _ = audio_tx.try_send(samples); + } + } + WebRtcEvent::DataChannelOpen(label) => { + info!("Data channel opened: {}", label); + if label.contains("input") { + info!("Input channel ready, waiting for handshake..."); + } + } + WebRtcEvent::DataChannelMessage(label, data) => { + debug!("Data channel '{}' message: {} bytes", label, data.len()); + + // Handle input handshake + if data.len() >= 2 { + let first_word = u16::from_le_bytes([data[0], data.get(1).copied().unwrap_or(0)]); + let mut protocol_version: u16 = 0; + + if first_word == 526 { + // New format: 0x020E (526 LE) + protocol_version = data.get(2..4) + .map(|b| u16::from_le_bytes([b[0], b[1]])) + .unwrap_or(0); + info!("Input handshake (new format), version={}", protocol_version); + } else if data[0] == 0x0e { + // Old format + protocol_version = first_word; + info!("Input handshake (old format), version={}", protocol_version); + } + + // Echo handshake response + let is_ready = input_ready_flag.load(std::sync::atomic::Ordering::Acquire); + if !is_ready && (first_word == 526 || data[0] == 0x0e) { + if let Err(e) = peer.send_input(&data).await { + error!("Failed to send handshake response: {}", e); + } else { + info!("Sent handshake response, input is ready! Protocol version: {}", protocol_version); + + // Update shared protocol version for input task + input_protocol_version_shared.store(protocol_version as u8, std::sync::atomic::Ordering::Release); + + // Signal input task that handshake is complete + input_ready_flag.store(true, std::sync::atomic::Ordering::Release); + + info!("Input encoder protocol version set to {}", protocol_version); + } + } + } + } + WebRtcEvent::IceCandidate(candidate, sdp_mid, sdp_mline_index) => { + // Send our ICE candidate to server + if let Err(e) = signaling.send_ice_candidate( + &candidate, + sdp_mid.as_deref(), + sdp_mline_index.map(|i| i as u32), + ).await { + warn!("Failed to send ICE candidate: {}", e); + } + } + WebRtcEvent::Error(e) => { + error!("WebRTC error: {}", e); + } + } + } + // Receive decode stats from the decoder thread (non-blocking) + Some(decode_stat) = decode_stats_rx.recv() => { + if decode_stat.frame_produced { + frames_decoded += 1; + + // Track decode latency + stats.decode_time_ms = decode_stat.decode_time_ms; + pipeline_latency_sum += decode_stat.decode_time_ms as f64; + pipeline_latency_count += 1; + stats.latency_ms = (pipeline_latency_sum / pipeline_latency_count as f64) as f32; + + // Log first decoded frame + if frames_decoded == 1 { + info!("First frame decoded (async) in {:.1}ms", decode_stat.decode_time_ms); + } + } + } + // Update stats periodically (interval persists across loop iterations) + _ = stats_interval.tick() => { + let now = std::time::Instant::now(); + let elapsed = now.duration_since(last_stats_time).as_secs_f64(); + + // Calculate actual FPS from decoded frames + let frames_this_period = frames_decoded - last_frames_decoded; + stats.fps = (frames_this_period as f64 / elapsed) as f32; + last_frames_decoded = frames_decoded; + + // Calculate bitrate + stats.bitrate_mbps = ((bytes_received as f64 * 8.0) / (elapsed * 1_000_000.0)) as f32; + stats.frames_received = frames_received; + stats.frames_decoded = frames_decoded; + stats.frames_dropped = frames_dropped; + + // Calculate average input latency (microseconds to milliseconds) + if input_latency_count > 0 { + stats.input_latency_ms = (input_latency_sum / input_latency_count as f64 / 1000.0) as f32; + // Reset for next period + input_latency_sum = 0.0; + input_latency_count = 0; + } + + // Log if FPS is significantly below target (more than 20% drop) + if stats.fps > 0.0 && stats.fps < (fps as f32 * 0.8) { + debug!("FPS below target: {:.1} / {} (dropped: {})", stats.fps, fps, frames_dropped); + } + + // Reset counters + bytes_received = 0; + last_stats_time = now; + + // Send stats update + let _ = stats_tx.try_send(stats.clone()); + } + } + } + + // Clean up raw input sender + #[cfg(target_os = "windows")] + crate::input::clear_raw_input_sender(); + + info!("Streaming session ended"); + Ok(()) +} diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs new file mode 100644 index 0000000..f7cedc2 --- /dev/null +++ b/opennow-streamer/src/webrtc/peer.rs @@ -0,0 +1,486 @@ +//! WebRTC Peer Connection +//! +//! Handles WebRTC peer connection, media streams, and data channels. + +use std::sync::Arc; +use tokio::sync::mpsc; +use webrtc::api::media_engine::{MediaEngine, MIME_TYPE_H264, MIME_TYPE_OPUS}; +use webrtc::api::setting_engine::SettingEngine; +use webrtc::api::APIBuilder; +use webrtc::api::interceptor_registry::register_default_interceptors; +use webrtc::data_channel::RTCDataChannel; +use webrtc::dtls_transport::dtls_role::DTLSRole; +use webrtc::ice_transport::ice_server::RTCIceServer; +use webrtc::ice_transport::ice_gatherer_state::RTCIceGathererState; +use webrtc::interceptor::registry::Registry; +use webrtc::peer_connection::RTCPeerConnection; +use webrtc::peer_connection::configuration::RTCConfiguration; +use webrtc::peer_connection::sdp::session_description::RTCSessionDescription; +use webrtc::rtp_transceiver::rtp_codec::{RTCRtpCodecCapability, RTCRtpCodecParameters, RTPCodecType}; +use anyhow::{Result, Context}; +use log::{info, debug, warn, error}; +use bytes::Bytes; + +/// MIME type for H265/HEVC video codec +const MIME_TYPE_H265: &str = "video/H265"; +/// MIME type for AV1 video codec +const MIME_TYPE_AV1: &str = "video/AV1"; + +use super::InputEncoder; +use super::sdp::is_ice_lite; + +/// Events from WebRTC connection +#[derive(Debug)] +pub enum WebRtcEvent { + Connected, + Disconnected, + /// Video frame with RTP timestamp (90kHz clock) + VideoFrame { payload: Vec, rtp_timestamp: u32 }, + AudioFrame(Vec), + DataChannelOpen(String), + DataChannelMessage(String, Vec), + IceCandidate(String, Option, Option), + Error(String), +} + +/// WebRTC peer for GFN streaming +pub struct WebRtcPeer { + peer_connection: Option>, + input_channel: Option>, + /// Partially reliable channel for mouse (lower latency, unordered) + mouse_channel: Option>, + event_tx: mpsc::Sender, + input_encoder: InputEncoder, + handshake_complete: bool, +} + +impl WebRtcPeer { + pub fn new(event_tx: mpsc::Sender) -> Self { + Self { + peer_connection: None, + input_channel: None, + mouse_channel: None, + event_tx, + input_encoder: InputEncoder::new(), + handshake_complete: false, + } + } + + /// Create peer connection and set remote SDP offer + pub async fn handle_offer(&mut self, sdp_offer: &str, ice_servers: Vec) -> Result { + info!("Setting up WebRTC peer connection"); + + // Detect ice-lite BEFORE creating peer connection - this affects DTLS role + let offer_is_ice_lite = is_ice_lite(sdp_offer); + if offer_is_ice_lite { + info!("Server is ice-lite - will configure active DTLS role (Client)"); + } + + // Create media engine with all required codecs + let mut media_engine = MediaEngine::default(); + + // Register default codecs (H264, VP8, VP9, Opus, etc.) + media_engine.register_default_codecs()?; + + // Register H265/HEVC codec (not in default codecs!) + // Use payload_type 0 for dynamic payload type negotiation from SDP + media_engine.register_codec( + RTCRtpCodecParameters { + capability: RTCRtpCodecCapability { + mime_type: MIME_TYPE_H265.to_string(), + clock_rate: 90000, + channels: 0, + sdp_fmtp_line: "".to_string(), + rtcp_feedback: vec![], + }, + payload_type: 0, // Dynamic - will be negotiated from SDP + ..Default::default() + }, + RTPCodecType::Video, + )?; + info!("Registered H265/HEVC codec"); + + // Register AV1 codec (for future use) + media_engine.register_codec( + RTCRtpCodecParameters { + capability: RTCRtpCodecCapability { + mime_type: MIME_TYPE_AV1.to_string(), + clock_rate: 90000, + channels: 0, + sdp_fmtp_line: "".to_string(), + rtcp_feedback: vec![], + }, + payload_type: 0, // Dynamic - will be negotiated from SDP + ..Default::default() + }, + RTPCodecType::Video, + )?; + info!("Registered AV1 codec"); + + // Create interceptor registry + let mut registry = Registry::new(); + registry = register_default_interceptors(registry, &mut media_engine)?; + + // Create setting engine - configure DTLS role for ice-lite + let mut setting_engine = SettingEngine::default(); + if offer_is_ice_lite { + // When server is ice-lite, we MUST be DTLS Client (active/initiator) + // This makes us send the DTLS ClientHello to start the handshake + setting_engine.set_answering_dtls_role(DTLSRole::Client)?; + info!("Configured DTLS role to Client (active) for ice-lite server"); + } + + // Create API with setting engine + let api = APIBuilder::new() + .with_media_engine(media_engine) + .with_interceptor_registry(registry) + .with_setting_engine(setting_engine) + .build(); + + // Create RTCConfiguration + let config = RTCConfiguration { + ice_servers, + ..Default::default() + }; + + // Create peer connection + let peer_connection = Arc::new(api.new_peer_connection(config).await?); + info!("Peer connection created"); + + // Set up event handlers + let event_tx = self.event_tx.clone(); + + // On ICE candidate + let event_tx_ice = event_tx.clone(); + peer_connection.on_ice_candidate(Box::new(move |candidate| { + let tx = event_tx_ice.clone(); + Box::pin(async move { + if let Some(c) = candidate { + let candidate_str = c.to_json().map(|j| j.candidate).unwrap_or_default(); + let sdp_mid = c.to_json().ok().and_then(|j| j.sdp_mid); + let sdp_mline_index = c.to_json().ok().and_then(|j| j.sdp_mline_index); + let _ = tx.send(WebRtcEvent::IceCandidate( + candidate_str, + sdp_mid, + sdp_mline_index, + )).await; + } + }) + })); + + // On ICE connection state change + let event_tx_state = event_tx.clone(); + peer_connection.on_ice_connection_state_change(Box::new(move |state| { + let tx = event_tx_state.clone(); + info!("ICE connection state: {:?}", state); + Box::pin(async move { + match state { + webrtc::ice_transport::ice_connection_state::RTCIceConnectionState::Connected => { + let _ = tx.send(WebRtcEvent::Connected).await; + } + webrtc::ice_transport::ice_connection_state::RTCIceConnectionState::Disconnected | + webrtc::ice_transport::ice_connection_state::RTCIceConnectionState::Failed => { + let _ = tx.send(WebRtcEvent::Disconnected).await; + } + _ => {} + } + }) + })); + + // On peer connection state change (includes DTLS state) + let pc_for_state = peer_connection.clone(); + peer_connection.on_peer_connection_state_change(Box::new(move |state| { + info!("Peer connection state: {:?}", state); + let pc = pc_for_state.clone(); + Box::pin(async move { + match state { + webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Connected => { + info!("=== DTLS HANDSHAKE COMPLETE - FULLY CONNECTED ==="); + } + webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed => { + warn!("Peer connection FAILED (likely DTLS handshake failure)"); + } + _ => {} + } + }) + })); + + // On track (video/audio) + let event_tx_track = event_tx.clone(); + peer_connection.on_track(Box::new(move |track, _receiver, _transceiver| { + let tx = event_tx_track.clone(); + let track = track.clone(); + let track_kind = track.kind(); + let track_id = track.id().to_string(); + info!("Track received: kind={:?}, id={}, codec={:?}", track_kind, track_id, track.codec()); + + // IMPORTANT: Spawn a separate tokio task for reading from the track + // The Future returned from on_track callback may not be properly spawned by webrtc-rs + let tx_clone = tx.clone(); + let track_clone = track.clone(); + let track_id_clone = track_id.clone(); + tokio::spawn(async move { + let mut buffer = vec![0u8; 1500]; + let mut packet_count: u64 = 0; + + info!("=== Starting track read loop for {} ({}) ===", + track_id_clone, + if track_kind == webrtc::rtp_transceiver::rtp_codec::RTPCodecType::Video { "VIDEO" } else { "AUDIO" }); + + loop { + match track_clone.read(&mut buffer).await { + Ok((rtp_packet, _)) => { + packet_count += 1; + + // Only log first packet per track + if packet_count == 1 { + info!("[{}] First RTP packet: {} bytes payload", + track_id_clone, rtp_packet.payload.len()); + } + + if track_kind == webrtc::rtp_transceiver::rtp_codec::RTPCodecType::Video { + if let Err(e) = tx_clone.send(WebRtcEvent::VideoFrame { + payload: rtp_packet.payload.to_vec(), + rtp_timestamp: rtp_packet.header.timestamp, + }).await { + warn!("Failed to send video frame event: {:?}", e); + break; + } + } else { + if let Err(e) = tx_clone.send(WebRtcEvent::AudioFrame(rtp_packet.payload.to_vec())).await { + warn!("Failed to send audio frame event: {:?}", e); + break; + } + } + } + Err(e) => { + warn!("Track {} read error: {}", track_id_clone, e); + break; + } + } + } + info!("Track {} read loop ended after {} packets", track_id_clone, packet_count); + }); + + // Return empty future since we spawned the actual work + Box::pin(async {}) + })); + + // On data channel + let event_tx_dc = event_tx.clone(); + peer_connection.on_data_channel(Box::new(move |dc| { + let tx = event_tx_dc.clone(); + let dc_label = dc.label().to_string(); + info!("Data channel received: {}", dc_label); + + Box::pin(async move { + let label = dc_label.clone(); + + let tx_open = tx.clone(); + let label_open = label.clone(); + dc.on_open(Box::new(move || { + let tx = tx_open.clone(); + let label = label_open.clone(); + Box::pin(async move { + info!("Data channel '{}' opened", label); + let _ = tx.send(WebRtcEvent::DataChannelOpen(label)).await; + }) + })); + + let tx_msg = tx.clone(); + let label_msg = label.clone(); + dc.on_message(Box::new(move |msg| { + let tx = tx_msg.clone(); + let label = label_msg.clone(); + Box::pin(async move { + debug!("Data channel '{}' message: {} bytes", label, msg.data.len()); + let _ = tx.send(WebRtcEvent::DataChannelMessage(label, msg.data.to_vec())).await; + }) + })); + }) + })); + + // Log offer SDP for debugging + debug!("=== OFFER SDP (from server) ==="); + for line in sdp_offer.lines() { + debug!("OFFER: {}", line); + } + debug!("=== END OFFER SDP ==="); + + // Set remote description (offer) + let offer = RTCSessionDescription::offer(sdp_offer.to_string())?; + peer_connection.set_remote_description(offer).await?; + info!("Remote description set"); + + // Wait for ICE gathering + let (gather_tx, gather_rx) = tokio::sync::oneshot::channel::<()>(); + let gather_tx = Arc::new(std::sync::Mutex::new(Some(gather_tx))); + + peer_connection.on_ice_gathering_state_change(Box::new({ + let gather_tx = gather_tx.clone(); + move |state| { + info!("ICE gathering state: {:?}", state); + if state == RTCIceGathererState::Complete { + if let Some(tx) = gather_tx.lock().unwrap().take() { + let _ = tx.send(()); + } + } + Box::pin(async {}) + } + })); + + // Create answer (DTLS role is already configured via SettingEngine if ice-lite) + let answer = peer_connection.create_answer(None).await?; + peer_connection.set_local_description(answer.clone()).await?; + info!("Local description set, waiting for ICE gathering..."); + + // Wait for ICE gathering (with timeout) + let gather_result = tokio::time::timeout( + std::time::Duration::from_secs(5), + gather_rx + ).await; + + match gather_result { + Ok(_) => info!("ICE gathering complete"), + Err(_) => warn!("ICE gathering timeout - proceeding"), + } + + // Get final SDP (already has DTLS setup fixed if ice-lite) + let final_sdp = peer_connection.local_description().await + .map(|d| d.sdp) + .unwrap_or_else(|| answer.sdp.clone()); + + info!("Final SDP length: {}", final_sdp.len()); + + // Log SDP content for debugging + debug!("=== ANSWER SDP ==="); + for line in final_sdp.lines() { + debug!("SDP: {}", line); + } + debug!("=== END SDP ==="); + + self.peer_connection = Some(peer_connection); + + Ok(final_sdp) + } + + /// Create input data channels (reliable for keyboard, partially reliable for mouse) + pub async fn create_input_channel(&mut self) -> Result<()> { + let pc = self.peer_connection.as_ref().context("No peer connection")?; + + // Reliable channel for keyboard and handshake + let dc = pc.create_data_channel( + "input_channel_v1", + Some(webrtc::data_channel::data_channel_init::RTCDataChannelInit { + ordered: Some(true), // Keyboard needs ordering + max_retransmits: Some(0), + ..Default::default() + }), + ).await?; + + info!("Created reliable input channel: {}", dc.label()); + + let event_tx = self.event_tx.clone(); + + dc.on_open(Box::new(move || { + info!("Input channel opened"); + Box::pin(async {}) + })); + + let event_tx_msg = event_tx.clone(); + dc.on_message(Box::new(move |msg| { + let tx = event_tx_msg.clone(); + let data = msg.data.to_vec(); + Box::pin(async move { + debug!("Input channel message: {} bytes", data.len()); + if data.len() >= 2 && data[0] == 0x0e { + let _ = tx.send(WebRtcEvent::DataChannelMessage( + "input_handshake".to_string(), + data, + )).await; + } + }) + })); + + self.input_channel = Some(dc); + + // Partially reliable channel for mouse - lower latency! + // Uses maxPacketLifeTime instead of retransmits for time-sensitive data + let mouse_dc = pc.create_data_channel( + "input_channel_partially_reliable", + Some(webrtc::data_channel::data_channel_init::RTCDataChannelInit { + ordered: Some(false), // Unordered for lower latency + max_packet_life_time: Some(8), // 8ms lifetime for low-latency mouse + ..Default::default() + }), + ).await?; + + info!("Created partially reliable mouse channel: {}", mouse_dc.label()); + + mouse_dc.on_open(Box::new(move || { + info!("Mouse channel opened (partially reliable)"); + Box::pin(async {}) + })); + + self.mouse_channel = Some(mouse_dc); + + Ok(()) + } + + /// Send input event over reliable data channel (keyboard, handshake) + pub async fn send_input(&mut self, data: &[u8]) -> Result<()> { + let dc = self.input_channel.as_ref().context("No input channel")?; + dc.send(&Bytes::copy_from_slice(data)).await?; + Ok(()) + } + + /// Send mouse input over partially reliable channel (lower latency) + /// Falls back to reliable channel if mouse channel not ready + pub async fn send_mouse_input(&mut self, data: &[u8]) -> Result<()> { + // Prefer the partially reliable channel for mouse + if let Some(ref mouse_dc) = self.mouse_channel { + if mouse_dc.ready_state() == webrtc::data_channel::data_channel_state::RTCDataChannelState::Open { + mouse_dc.send(&Bytes::copy_from_slice(data)).await?; + return Ok(()); + } + } + // Fall back to reliable channel + self.send_input(data).await + } + + /// Check if mouse channel is ready + pub fn is_mouse_channel_ready(&self) -> bool { + self.mouse_channel.as_ref() + .map(|dc| dc.ready_state() == webrtc::data_channel::data_channel_state::RTCDataChannelState::Open) + .unwrap_or(false) + } + + /// Send handshake response + pub async fn send_handshake_response(&mut self, major: u8, minor: u8, flags: u8) -> Result<()> { + let response = vec![0x0e, major, minor, flags]; + self.send_input(&response).await?; + self.handshake_complete = true; + info!("Sent handshake response, input ready"); + Ok(()) + } + + /// Add remote ICE candidate + pub async fn add_ice_candidate(&self, candidate: &str, sdp_mid: Option<&str>, sdp_mline_index: Option) -> Result<()> { + let pc = self.peer_connection.as_ref().context("No peer connection")?; + + let candidate = webrtc::ice_transport::ice_candidate::RTCIceCandidateInit { + candidate: candidate.to_string(), + sdp_mid: sdp_mid.map(|s| s.to_string()), + sdp_mline_index, + username_fragment: None, + }; + + pc.add_ice_candidate(candidate).await?; + info!("Added remote ICE candidate"); + Ok(()) + } + + pub fn is_handshake_complete(&self) -> bool { + self.handshake_complete + } +} diff --git a/opennow-streamer/src/webrtc/sdp.rs b/opennow-streamer/src/webrtc/sdp.rs new file mode 100644 index 0000000..1ba66bb --- /dev/null +++ b/opennow-streamer/src/webrtc/sdp.rs @@ -0,0 +1,218 @@ +//! SDP Manipulation +//! +//! Parse and modify SDP for codec preferences and ICE fixes. + +use crate::app::VideoCodec; +use log::{info, debug, warn}; +use std::collections::HashMap; + +/// Fix 0.0.0.0 in SDP with actual server IP +/// NOTE: Do NOT add ICE candidates to the offer SDP! The offer contains the +/// SERVER's candidates. Adding our own candidates here corrupts ICE negotiation. +/// Server candidates should come via trickle ICE through signaling. +pub fn fix_server_ip(sdp: &str, server_ip: &str) -> String { + // Only fix the connection line, don't touch candidates + let modified = sdp.replace("c=IN IP4 0.0.0.0", &format!("c=IN IP4 {}", server_ip)); + info!("Fixed connection IP to {}", server_ip); + modified +} + +/// Normalize codec name (HEVC -> H265) +fn normalize_codec_name(name: &str) -> String { + let upper = name.to_uppercase(); + match upper.as_str() { + "HEVC" => "H265".to_string(), + _ => upper, + } +} + +/// Force a specific video codec in SDP +pub fn prefer_codec(sdp: &str, codec: &VideoCodec) -> String { + let codec_name = match codec { + VideoCodec::H264 => "H264", + VideoCodec::H265 => "H265", + VideoCodec::AV1 => "AV1", + }; + + info!("Forcing codec: {}", codec_name); + + // Detect line ending style + let line_ending = if sdp.contains("\r\n") { "\r\n" } else { "\n" }; + + // Use .lines() which handles both \r\n and \n correctly + let lines: Vec<&str> = sdp.lines().collect(); + let mut result: Vec = Vec::new(); + + // First pass: collect codec -> payload type mapping + // Normalize HEVC -> H265 for consistent lookup + let mut codec_payloads: HashMap> = HashMap::new(); + let mut in_video = false; + + for line in &lines { + if line.starts_with("m=video") { + in_video = true; + } else if line.starts_with("m=") && in_video { + in_video = false; + } + + if in_video { + // Parse a=rtpmap:96 H264/90000 + if let Some(rtpmap) = line.strip_prefix("a=rtpmap:") { + let parts: Vec<&str> = rtpmap.split_whitespace().collect(); + if parts.len() >= 2 { + let pt = parts[0].to_string(); + let raw_codec = parts[1].split('/').next().unwrap_or(""); + let normalized_codec = normalize_codec_name(raw_codec); + debug!("Found codec {} (normalized: {}) with payload type {}", raw_codec, normalized_codec, pt); + codec_payloads.entry(normalized_codec).or_default().push(pt); + } + } + } + } + + info!("Available video codecs in SDP: {:?}", codec_payloads.keys().collect::>()); + + // Get preferred codec payload types + let preferred = codec_payloads.get(codec_name).cloned().unwrap_or_default(); + if preferred.is_empty() { + info!("Codec {} not found in SDP - keeping original SDP unchanged", codec_name); + return sdp.to_string(); + } + + info!("Found {} payload type(s) for {}: {:?}", preferred.len(), codec_name, preferred); + + // Use HashSet for easier comparison + let preferred_set: std::collections::HashSet = preferred.iter().cloned().collect(); + + // Second pass: filter SDP + in_video = false; + for line in &lines { + if line.starts_with("m=video") { + in_video = true; + + // Rewrite m=video line to only include preferred payloads + let parts: Vec<&str> = line.split_whitespace().collect(); + if parts.len() >= 4 { + let header = parts[..3].join(" "); + let payload_types: Vec<&str> = parts[3..] + .iter() + .filter(|pt| preferred_set.contains(&pt.to_string())) + .copied() + .collect(); + + if !payload_types.is_empty() { + let new_line = format!("{} {}", header, payload_types.join(" ")); + debug!("Rewritten m=video line: {}", new_line); + result.push(new_line); + continue; + } else { + // No matching payload types - keep original m=video line + warn!("No matching payload types for {} in m=video line, keeping original", codec_name); + result.push(line.to_string()); + continue; + } + } + } else if line.starts_with("m=") && in_video { + in_video = false; + } + + if in_video { + // Filter rtpmap, fmtp, rtcp-fb lines - only keep lines for preferred codec + if let Some(rest) = line.strip_prefix("a=rtpmap:") + .or_else(|| line.strip_prefix("a=fmtp:")) + .or_else(|| line.strip_prefix("a=rtcp-fb:")) + { + let pt = rest.split_whitespace().next().unwrap_or(""); + if !preferred_set.contains(pt) { + debug!("Filtering out line for payload type {}: {}", pt, line); + continue; // Skip non-preferred codec attributes + } + } + } + + result.push(line.to_string()); + } + + let filtered_sdp = result.join(line_ending); + info!("SDP filtered: {} -> {} bytes", sdp.len(), filtered_sdp.len()); + filtered_sdp +} + +/// Extract video codec from SDP +pub fn extract_video_codec(sdp: &str) -> Option { + let mut in_video = false; + + for line in sdp.lines() { + if line.starts_with("m=video") { + in_video = true; + } else if line.starts_with("m=") && in_video { + break; + } + + if in_video && line.starts_with("a=rtpmap:") { + // a=rtpmap:96 H264/90000 + if let Some(codec_part) = line.split_whitespace().nth(1) { + return Some(codec_part.split('/').next()?.to_string()); + } + } + } + + None +} + +/// Extract resolution from SDP +pub fn extract_resolution(sdp: &str) -> Option<(u32, u32)> { + for line in sdp.lines() { + // Look for a=imageattr or custom resolution attributes + if line.starts_with("a=fmtp:") && line.contains("max-fs=") { + // Parse max-fs for resolution + } + } + None +} + +/// Check if the offer SDP indicates an ice-lite server +pub fn is_ice_lite(sdp: &str) -> bool { + for line in sdp.lines() { + if line.trim() == "a=ice-lite" { + return true; + } + } + false +} + +/// Fix DTLS setup for ice-lite servers +/// +/// When the server is ice-lite and offers `a=setup:actpass`, we MUST respond +/// with `a=setup:active` (not passive). This makes us initiate the DTLS handshake. +/// +/// If we respond with `a=setup:passive`, both sides wait for the other to start +/// DTLS, resulting in a handshake timeout. +pub fn fix_dtls_setup_for_ice_lite(answer_sdp: &str) -> String { + info!("Fixing DTLS setup for ice-lite: changing passive -> active"); + + // Replace all instances of a=setup:passive with a=setup:active + let fixed = answer_sdp.replace("a=setup:passive", "a=setup:active"); + + // Log for debugging + let passive_count = answer_sdp.matches("a=setup:passive").count(); + let active_count = fixed.matches("a=setup:active").count(); + info!("DTLS setup fix: replaced {} passive entries, now have {} active entries", + passive_count, active_count); + + fixed +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_fix_server_ip() { + let sdp = "c=IN IP4 0.0.0.0\r\nm=video 9 UDP/TLS/RTP/SAVPF 96\r\n"; + let fixed = fix_server_ip(sdp, "192.168.1.1"); + assert!(fixed.contains("c=IN IP4 192.168.1.1")); + // Should NOT add candidates - that corrupts ICE negotiation + assert!(!fixed.contains("a=candidate:")); + } +} diff --git a/opennow-streamer/src/webrtc/signaling.rs b/opennow-streamer/src/webrtc/signaling.rs new file mode 100644 index 0000000..98cae8f --- /dev/null +++ b/opennow-streamer/src/webrtc/signaling.rs @@ -0,0 +1,354 @@ +//! GFN WebSocket Signaling Protocol +//! +//! WebSocket-based signaling for WebRTC connection setup. + +use std::sync::Arc; +use tokio::sync::{mpsc, Mutex}; +use tokio_tungstenite::tungstenite::Message; +use futures_util::{StreamExt, SinkExt}; +use serde::{Deserialize, Serialize}; +use serde_json::{json, Value}; +use anyhow::{Result, Context}; +use log::{info, debug, warn, error}; +use base64::{Engine as _, engine::general_purpose::STANDARD}; + +/// Generate WebSocket key for handshake +fn generate_ws_key() -> String { + let random_bytes: [u8; 16] = rand::random(); + STANDARD.encode(random_bytes) +} + +/// Peer info sent to server +#[derive(Debug, Serialize, Deserialize)] +pub struct PeerInfo { + pub browser: String, + #[serde(rename = "browserVersion")] + pub browser_version: String, + pub connected: bool, + pub id: u32, + pub name: String, + pub peer_role: u32, + pub resolution: String, + pub version: u32, +} + +/// Message from signaling server +#[derive(Debug, Deserialize)] +pub struct SignalingMessage { + pub ackid: Option, + pub ack: Option, + pub hb: Option, + pub peer_info: Option, + pub peer_msg: Option, +} + +/// Peer-to-peer message wrapper +#[derive(Debug, Deserialize)] +pub struct PeerMessage { + pub from: u32, + pub to: u32, + pub msg: String, +} + +/// ICE candidate message +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct IceCandidate { + pub candidate: String, + #[serde(rename = "sdpMid")] + pub sdp_mid: Option, + #[serde(rename = "sdpMLineIndex")] + pub sdp_mline_index: Option, +} + +/// Events emitted by the signaling client +#[derive(Debug)] +pub enum SignalingEvent { + Connected, + SdpOffer(String), + IceCandidate(IceCandidate), + Disconnected(String), + Error(String), +} + +/// GFN Signaling Client +pub struct GfnSignaling { + server_ip: String, + session_id: String, + peer_id: u32, + peer_name: String, + ack_counter: Arc>, + event_tx: mpsc::Sender, + message_tx: Option>, +} + +impl GfnSignaling { + pub fn new( + server_ip: String, + session_id: String, + event_tx: mpsc::Sender, + ) -> Self { + let peer_id = 2; // Client is always peer 2 + let random_suffix: u64 = rand::random::() % 10_000_000_000; + let peer_name = format!("peer-{}", random_suffix); + + Self { + server_ip, + session_id, + peer_id, + peer_name, + ack_counter: Arc::new(Mutex::new(0)), + event_tx, + message_tx: None, + } + } + + /// Connect to the signaling server + pub async fn connect(&mut self) -> Result<()> { + let url = format!( + "wss://{}/nvst/sign_in?peer_id={}&version=2", + self.server_ip, self.peer_name + ); + let subprotocol = format!("x-nv-sessionid.{}", self.session_id); + + info!("Connecting to signaling: {}", url); + info!("Using subprotocol: {}", subprotocol); + + // Use TLS connector that accepts self-signed certs + let tls_connector = native_tls::TlsConnector::builder() + .danger_accept_invalid_certs(true) + .danger_accept_invalid_hostnames(true) + .build() + .context("Failed to build TLS connector")?; + + // Connect TCP first + let host = self.server_ip.split(':').next().unwrap_or(&self.server_ip); + let port = 443; + let addr = format!("{}:{}", host, port); + + info!("Connecting TCP to: {}", addr); + let tcp_stream = tokio::net::TcpStream::connect(&addr).await + .context("TCP connection failed")?; + + info!("TCP connected, starting TLS handshake..."); + let tls_stream = tokio_native_tls::TlsConnector::from(tls_connector) + .connect(host, tcp_stream) + .await + .context("TLS handshake failed")?; + + info!("TLS connected, starting WebSocket handshake..."); + + let ws_key = generate_ws_key(); + + let request = http::Request::builder() + .uri(&url) + .header("Host", &self.server_ip) + .header("Connection", "Upgrade") + .header("Upgrade", "websocket") + .header("Sec-WebSocket-Version", "13") + .header("Sec-WebSocket-Key", &ws_key) + .header("Sec-WebSocket-Protocol", &subprotocol) + .header("Origin", "https://play.geforcenow.com") + .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/131.0.0.0") + .body(()) + .context("Failed to build request")?; + + let ws_config = tokio_tungstenite::tungstenite::protocol::WebSocketConfig { + max_message_size: Some(64 << 20), + max_frame_size: Some(16 << 20), + accept_unmasked_frames: false, + ..Default::default() + }; + + let (ws_stream, response) = tokio_tungstenite::client_async_with_config( + request, + tls_stream, + Some(ws_config), + ) + .await + .map_err(|e| { + error!("WebSocket handshake error: {:?}", e); + anyhow::anyhow!("WebSocket handshake failed: {}", e) + })?; + + info!("Connected! Response: {:?}", response.status()); + + let (mut write, mut read) = ws_stream.split(); + + // Channel for sending messages + let (msg_tx, mut msg_rx) = mpsc::channel::(64); + self.message_tx = Some(msg_tx.clone()); + + // Send initial peer_info + let peer_info = self.create_peer_info(); + let peer_info_msg = json!({ + "ackid": self.next_ack_id().await, + "peer_info": peer_info + }); + write.send(Message::Text(peer_info_msg.to_string())).await?; + info!("Sent peer_info"); + + let event_tx = self.event_tx.clone(); + let peer_id = self.peer_id; + + // Spawn message sender task + tokio::spawn(async move { + while let Some(msg) = msg_rx.recv().await { + if let Err(e) = write.send(msg).await { + error!("Failed to send message: {}", e); + break; + } + } + }); + + // Spawn message receiver task + let msg_tx_clone = msg_tx.clone(); + let event_tx_clone = event_tx.clone(); + tokio::spawn(async move { + while let Some(msg_result) = read.next().await { + match msg_result { + Ok(Message::Text(text)) => { + debug!("Received: {}", &text[..text.len().min(200)]); + + if let Ok(msg) = serde_json::from_str::(&text) { + // Send ACK for messages with ackid + if let Some(ackid) = msg.ackid { + if msg.peer_info.as_ref().map(|p| p.id) != Some(peer_id) { + let ack = json!({ "ack": ackid }); + let _ = msg_tx_clone.send(Message::Text(ack.to_string())).await; + } + } + + // Handle heartbeat + if msg.hb.is_some() { + let hb = json!({ "hb": 1 }); + let _ = msg_tx_clone.send(Message::Text(hb.to_string())).await; + continue; + } + + // Handle peer messages + if let Some(peer_msg) = msg.peer_msg { + if let Ok(inner) = serde_json::from_str::(&peer_msg.msg) { + // SDP Offer + if inner.get("type").and_then(|t| t.as_str()) == Some("offer") { + if let Some(sdp) = inner.get("sdp").and_then(|s| s.as_str()) { + info!("Received SDP offer, length: {}", sdp.len()); + let _ = event_tx_clone.send(SignalingEvent::SdpOffer(sdp.to_string())).await; + } + } + // ICE Candidate + else if inner.get("candidate").is_some() { + if let Ok(candidate) = serde_json::from_value::(inner) { + info!("Received ICE candidate: {}", candidate.candidate); + let _ = event_tx_clone.send(SignalingEvent::IceCandidate(candidate)).await; + } + } + } + } + } + } + Ok(Message::Close(frame)) => { + warn!("WebSocket closed: {:?}", frame); + let _ = event_tx_clone.send(SignalingEvent::Disconnected( + frame.map(|f| f.reason.to_string()).unwrap_or_default() + )).await; + break; + } + Err(e) => { + error!("WebSocket error: {}", e); + let _ = event_tx_clone.send(SignalingEvent::Error(e.to_string())).await; + break; + } + _ => {} + } + } + }); + + // Notify connected + self.event_tx.send(SignalingEvent::Connected).await?; + + // Start heartbeat task + let hb_tx = msg_tx.clone(); + tokio::spawn(async move { + let mut interval = tokio::time::interval(std::time::Duration::from_secs(5)); + loop { + interval.tick().await; + let hb = json!({ "hb": 1 }); + if hb_tx.send(Message::Text(hb.to_string())).await.is_err() { + break; + } + } + }); + + Ok(()) + } + + /// Send SDP answer to server + pub async fn send_answer(&self, sdp: &str, nvst_sdp: Option<&str>) -> Result<()> { + let msg_tx = self.message_tx.as_ref().context("Not connected")?; + + let mut answer = json!({ + "type": "answer", + "sdp": sdp + }); + + if let Some(nvst) = nvst_sdp { + answer["nvstSdp"] = json!(nvst); + } + + let peer_msg = json!({ + "peer_msg": { + "from": self.peer_id, + "to": 1, + "msg": answer.to_string() + }, + "ackid": self.next_ack_id().await + }); + + msg_tx.send(Message::Text(peer_msg.to_string())).await?; + info!("Sent SDP answer"); + Ok(()) + } + + /// Send ICE candidate to server + pub async fn send_ice_candidate(&self, candidate: &str, sdp_mid: Option<&str>, sdp_mline_index: Option) -> Result<()> { + let msg_tx = self.message_tx.as_ref().context("Not connected")?; + + let ice = json!({ + "candidate": candidate, + "sdpMid": sdp_mid, + "sdpMLineIndex": sdp_mline_index + }); + + let peer_msg = json!({ + "peer_msg": { + "from": self.peer_id, + "to": 1, + "msg": ice.to_string() + }, + "ackid": self.next_ack_id().await + }); + + msg_tx.send(Message::Text(peer_msg.to_string())).await?; + debug!("Sent ICE candidate"); + Ok(()) + } + + fn create_peer_info(&self) -> PeerInfo { + PeerInfo { + browser: "Chrome".to_string(), + browser_version: "131".to_string(), + connected: true, + id: self.peer_id, + name: self.peer_name.clone(), + peer_role: 0, + resolution: "1920x1080".to_string(), + version: 2, + } + } + + async fn next_ack_id(&self) -> u32 { + let mut counter = self.ack_counter.lock().await; + *counter += 1; + *counter + } +} diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index a99eea5..c9b73b5 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -35,6 +35,40 @@ pub struct Settings { pub auto_refresh_library: bool, /// Enable NVIDIA Reflex low-latency mode (auto-enabled for 120+ FPS) pub reflex: bool, + + // Recording settings + /// Enable recording feature + pub recording_enabled: bool, + /// Recording quality (low, medium, high) + pub recording_quality: RecordingQuality, + /// Recording codec preference (h264 or av1) + pub recording_codec: RecordingCodec, + /// Enable Instant Replay (DVR buffer) + pub instant_replay_enabled: bool, + /// Instant Replay buffer duration in seconds + pub instant_replay_duration: u32, + /// Custom recording output directory (None = Videos/OpenNow) + pub recording_output_dir: Option, +} + +/// Recording quality presets +#[derive(Debug, Clone, Serialize, Deserialize, Default)] +#[serde(rename_all = "lowercase")] +pub enum RecordingQuality { + Low, // 2.5 Mbps + #[default] + Medium, // 5 Mbps + High, // 8 Mbps +} + +/// Recording codec preference +#[derive(Debug, Clone, Serialize, Deserialize, Default)] +#[serde(rename_all = "lowercase")] +pub enum RecordingCodec { + #[default] + Vp8, // Software encoded - no GPU contention (recommended) + H264, // May cause stuttering (competes with stream decoding) + Av1, // Best quality (RTX 40+ only - separate encoder chip) } #[derive(Debug, Clone, Serialize, Deserialize, Default)] @@ -88,6 +122,13 @@ impl Default for Settings { start_minimized: false, auto_refresh_library: true, reflex: true, // Enabled by default for low-latency gaming + // Recording defaults + recording_enabled: true, + recording_quality: RecordingQuality::Medium, + recording_codec: RecordingCodec::Vp8, // VP8 - no GPU contention, no stuttering + instant_replay_enabled: false, + instant_replay_duration: 60, // 60 seconds default + recording_output_dir: None, // Uses Videos/OpenNow by default } } } diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index d035970..255f929 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -25,6 +25,8 @@ mod proxy; mod cursor; #[cfg(feature = "tauri-app")] mod raw_input; +#[cfg(feature = "tauri-app")] +mod recording; #[cfg(feature = "tauri-app")] use tauri::Manager; @@ -37,6 +39,25 @@ pub fn run() { eprintln!("Failed to initialize logger: {}", e); } + // Force hardware video acceleration in WebView2 + // This fixes stuttering by enabling GPU-accelerated video decode + #[cfg(target_os = "windows")] + { + let flags = [ + "--enable-features=VaapiVideoDecoder,VaapiVideoEncoder", + "--enable-accelerated-video-decode", + "--enable-accelerated-video-encode", + "--disable-gpu-driver-bug-workarounds", + "--ignore-gpu-blocklist", + "--enable-gpu-rasterization", + "--enable-zero-copy", + "--disable-features=UseChromeOSDirectVideoDecoder", + ].join(" "); + + std::env::set_var("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", &flags); + log::info!("WebView2 hardware acceleration flags set: {}", flags); + } + tauri::Builder::default() .plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_http::init()) @@ -138,6 +159,13 @@ pub fn run() { logging::get_log_file_path, logging::export_logs, logging::clear_logs, + // Recording commands + recording::get_recordings_dir, + recording::save_recording, + recording::save_screenshot, + recording::open_recordings_folder, + recording::list_recordings, + recording::delete_recording, ]) .run(tauri::generate_context!()) .expect("error while running tauri application"); diff --git a/src-tauri/src/recording.rs b/src-tauri/src/recording.rs new file mode 100644 index 0000000..55eb233 --- /dev/null +++ b/src-tauri/src/recording.rs @@ -0,0 +1,181 @@ +use std::fs; +use std::path::PathBuf; +use tauri::command; + +/// Get the default recordings directory (Videos/OpenNow) +fn get_default_recordings_dir() -> PathBuf { + dirs::video_dir() + .unwrap_or_else(|| dirs::home_dir().unwrap_or_else(|| PathBuf::from("."))) + .join("OpenNow") +} + +/// Get the recordings directory (custom or default) +fn get_recordings_dir_path(custom_dir: Option) -> PathBuf { + match custom_dir { + Some(dir) if !dir.is_empty() => PathBuf::from(dir), + _ => get_default_recordings_dir(), + } +} + +/// Ensure the recordings directory exists +fn ensure_recordings_dir(path: &PathBuf) -> Result<(), String> { + if !path.exists() { + fs::create_dir_all(path) + .map_err(|e| format!("Failed to create recordings directory: {}", e))?; + } + Ok(()) +} + +/// Get the recordings directory path +#[command] +pub async fn get_recordings_dir(custom_dir: Option) -> Result { + let path = get_recordings_dir_path(custom_dir); + ensure_recordings_dir(&path)?; + path.to_str() + .map(|s| s.to_string()) + .ok_or_else(|| "Invalid path encoding".to_string()) +} + +/// Save a recording file (receives raw bytes from frontend) +#[command] +pub async fn save_recording( + data: Vec, + filename: String, + custom_dir: Option, +) -> Result { + let dir = get_recordings_dir_path(custom_dir); + ensure_recordings_dir(&dir)?; + + let file_path = dir.join(&filename); + + fs::write(&file_path, &data) + .map_err(|e| format!("Failed to save recording: {}", e))?; + + log::info!("Recording saved: {:?} ({} bytes)", file_path, data.len()); + + file_path.to_str() + .map(|s| s.to_string()) + .ok_or_else(|| "Invalid path encoding".to_string()) +} + +/// Save a screenshot file (receives raw bytes from frontend) +#[command] +pub async fn save_screenshot( + data: Vec, + filename: String, + custom_dir: Option, +) -> Result { + let dir = get_recordings_dir_path(custom_dir); + ensure_recordings_dir(&dir)?; + + let file_path = dir.join(&filename); + + fs::write(&file_path, &data) + .map_err(|e| format!("Failed to save screenshot: {}", e))?; + + log::info!("Screenshot saved: {:?} ({} bytes)", file_path, data.len()); + + file_path.to_str() + .map(|s| s.to_string()) + .ok_or_else(|| "Invalid path encoding".to_string()) +} + +/// Open the recordings folder in the system file explorer +#[command] +pub async fn open_recordings_folder(custom_dir: Option) -> Result<(), String> { + let dir = get_recordings_dir_path(custom_dir); + ensure_recordings_dir(&dir)?; + + #[cfg(target_os = "windows")] + { + std::process::Command::new("explorer") + .arg(&dir) + .spawn() + .map_err(|e| format!("Failed to open folder: {}", e))?; + } + + #[cfg(target_os = "macos")] + { + std::process::Command::new("open") + .arg(&dir) + .spawn() + .map_err(|e| format!("Failed to open folder: {}", e))?; + } + + #[cfg(target_os = "linux")] + { + std::process::Command::new("xdg-open") + .arg(&dir) + .spawn() + .map_err(|e| format!("Failed to open folder: {}", e))?; + } + + Ok(()) +} + +/// List all recordings in the recordings directory +#[command] +pub async fn list_recordings(custom_dir: Option) -> Result, String> { + let dir = get_recordings_dir_path(custom_dir); + + if !dir.exists() { + return Ok(Vec::new()); + } + + let mut recordings = Vec::new(); + + let entries = fs::read_dir(&dir) + .map_err(|e| format!("Failed to read recordings directory: {}", e))?; + + for entry in entries.flatten() { + let path = entry.path(); + if path.is_file() { + if let Some(ext) = path.extension() { + let ext_str = ext.to_str().unwrap_or(""); + if ext_str == "webm" || ext_str == "png" { + if let Ok(metadata) = fs::metadata(&path) { + recordings.push(RecordingInfo { + filename: path.file_name() + .and_then(|n| n.to_str()) + .unwrap_or("") + .to_string(), + path: path.to_str().unwrap_or("").to_string(), + size_bytes: metadata.len(), + is_screenshot: ext_str == "png", + }); + } + } + } + } + } + + // Sort by filename (which includes timestamp, so newest first) + recordings.sort_by(|a, b| b.filename.cmp(&a.filename)); + + Ok(recordings) +} + +/// Delete a recording file +#[command] +pub async fn delete_recording(filepath: String) -> Result<(), String> { + let path = PathBuf::from(&filepath); + + if !path.exists() { + return Err("File not found".to_string()); + } + + fs::remove_file(&path) + .map_err(|e| format!("Failed to delete recording: {}", e))?; + + log::info!("Recording deleted: {:?}", path); + Ok(()) +} + +/// Recording file information +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] +pub struct RecordingInfo { + pub filename: String, + pub path: String, + pub size_bytes: u64, + pub is_screenshot: bool, +} diff --git a/src/main.ts b/src/main.ts index 0dcb8c8..7c38cf5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -16,8 +16,11 @@ import { isInputReady, getInputDebugInfo, StreamingOptions, + getMediaStream, + getVideoElement, } from "./streaming"; import { initLogging, exportLogs, clearLogs } from "./logging"; +import { getRecordingManager, openRecordingsFolder, testCodecSupport, RecordingState, RecordingCodecType, RecordingMode } from "./recording"; // ============================================ // Custom Dropdown Component @@ -355,6 +358,7 @@ interface Settings { proxy?: string; disable_telemetry: boolean; reflex?: boolean; // NVIDIA Reflex low-latency mode + recording_codec?: string; // Recording codec preference: h264 or av1 } interface ProxyConfig { @@ -446,8 +450,9 @@ let discordShowStats = false; // Show resolution/fps/ms in Discord (default off) let currentQuality = "auto"; // Current quality preset (legacy/fallback) let currentResolution = "1920x1080"; // Current resolution (WxH format) let currentFps = 60; // Current FPS -let currentCodec = "h264"; // Current video codec +let currentCodec = "h264"; // Current video codec (for streaming) let currentAudioCodec = "opus"; // Current audio codec +let currentRecordingCodec: RecordingCodecType = "h264"; // Recording codec preference let currentMaxBitrate = 200; // Max bitrate in Mbps (200 = unlimited) let availableResolutions: string[] = []; // Available resolutions from subscription let availableFpsOptions: number[] = []; // Available FPS options from subscription @@ -1760,6 +1765,13 @@ async function loadSettings() { } setDropdownOptions("audio-codec-setting", audioCodecOptions); + // Load recording codec preference and apply to UI + // VP8 is default - software encoded, no GPU contention with stream + const recCodec = settings.recording_codec; + currentRecordingCodec = (recCodec === "av1" ? "av1" : recCodec === "h264" ? "h264" : "vp8") as RecordingCodecType; + getRecordingManager().setCodecPreference(currentRecordingCodec); + setDropdownValue("recording-codec-setting", currentRecordingCodec); + // Apply dropdown values setDropdownValue("resolution-setting", currentResolution); setDropdownValue("fps-setting", String(currentFps)); @@ -1899,6 +1911,81 @@ function setupModals() { } }); + // Test codecs button + document.getElementById("test-codecs-btn")?.addEventListener("click", () => { + const resultsDiv = document.getElementById("codec-results"); + if (!resultsDiv) return; + + const codecs = testCodecSupport(); + const currentCodec = getRecordingManager().getCurrentCodec(); + const codecPref = getRecordingManager().getCodecPreference(); + + // Clear and show results + resultsDiv.style.display = "block"; + + // Build results using DOM methods + while (resultsDiv.firstChild) { + resultsDiv.removeChild(resultsDiv.firstChild); + } + + // Add header + const header = document.createElement("div"); + header.className = "codec-header"; + header.textContent = "Active codec: " + currentCodec; + resultsDiv.appendChild(header); + + const prefNote = document.createElement("div"); + prefNote.className = "codec-note"; + prefNote.textContent = "Preference: " + (codecPref === "av1" ? "AV1 (Best Quality)" : "H.264 (Best Compatibility)"); + resultsDiv.appendChild(prefNote); + + // Add codec list + const list = document.createElement("div"); + list.className = "codec-list"; + + codecs.forEach(codec => { + const item = document.createElement("div"); + item.className = "codec-item" + (codec.supported ? " supported" : " unsupported"); + if (codec.codec === currentCodec) { + item.className += " active"; + } + + const indicator = document.createElement("span"); + indicator.className = "codec-indicator"; + indicator.textContent = codec.supported ? "✓" : "✗"; + item.appendChild(indicator); + + const info = document.createElement("span"); + info.className = "codec-info"; + + const name = document.createElement("span"); + name.className = "codec-name"; + name.textContent = codec.description; + info.appendChild(name); + + if (codec.hwAccelerated && codec.supported) { + const badge = document.createElement("span"); + badge.className = "codec-badge"; + badge.textContent = "GPU"; + info.appendChild(badge); + } + + item.appendChild(info); + list.appendChild(item); + }); + + resultsDiv.appendChild(list); + }); + + // Open recordings folder button + document.getElementById("open-recordings-btn")?.addEventListener("click", async () => { + try { + await openRecordingsFolder(); + } catch (error) { + console.error("Failed to open recordings folder:", error); + } + }); + // Bitrate slider live update const bitrateSlider = document.getElementById("bitrate-setting") as HTMLInputElement; const bitrateValue = document.getElementById("bitrate-value"); @@ -3710,6 +3797,7 @@ interface StreamingUIState { inputCleanup: (() => void) | null; statsInterval: number | null; escCleanup: (() => void) | null; + recordingCleanup: (() => void) | null; lastDiscordUpdate: number; gameStartTime: number; } @@ -3725,6 +3813,7 @@ let streamingUIState: StreamingUIState = { inputCleanup: null, statsInterval: null, escCleanup: null, + recordingCleanup: null, lastDiscordUpdate: 0, gameStartTime: 0, }; @@ -3993,6 +4082,9 @@ function createStreamingContainer(gameName: string): HTMLElement {
${gameName}
+ + + @@ -4000,6 +4092,8 @@ function createStreamingContainer(gameName: string): HTMLElement {
+ + Region: -- -- FPS -- ms @@ -4150,6 +4244,74 @@ function createStreamingContainer(gameName: string): HTMLElement { .stream-btn-danger:hover { background: rgba(255,0,0,0.5); } + /* Recording button states */ + .stream-btn.recording-active { + background: rgba(255, 0, 0, 0.7); + animation: pulse-recording 1s infinite; + } + .stream-btn.replay-active { + background: rgba(118, 185, 0, 0.5); + } + @keyframes pulse-recording { + 0%, 100% { opacity: 1; } + 50% { opacity: 0.7; } + } + /* Recording indicator in stats bar */ + .recording-indicator { + display: inline-flex; + align-items: center; + gap: 6px; + color: #ff4444; + font-weight: bold; + animation: blink-recording 1s infinite; + } + .rec-dot { + width: 8px; + height: 8px; + background: #ff4444; + border-radius: 50%; + } + @keyframes blink-recording { + 0%, 100% { opacity: 1; } + 50% { opacity: 0.5; } + } + .replay-indicator { + display: inline-flex; + align-items: center; + color: #76b900; + font-weight: bold; + font-size: 11px; + padding: 2px 6px; + background: rgba(118, 185, 0, 0.2); + border-radius: 3px; + } + .recording-toast { + position: fixed; + bottom: 80px; + right: 20px; + background: rgba(20, 20, 20, 0.95); + color: #fff; + padding: 12px 20px; + border-radius: 8px; + font-size: 14px; + z-index: 10010; + display: flex; + align-items: center; + gap: 10px; + animation: toast-slide-in 0.3s ease; + border-left: 3px solid #76b900; + } + .recording-toast.error { + border-left-color: #ff4444; + } + .recording-toast svg { + width: 18px; + height: 18px; + } + @keyframes toast-slide-in { + from { transform: translateX(100%); opacity: 0; } + to { transform: translateX(0); opacity: 1; } + } .stream-stats { position: absolute; bottom: 10px; @@ -4486,6 +4648,190 @@ function createStreamingContainer(gameName: string): HTMLElement { } }); + // ============================================ + // Recording Controls Setup + // ============================================ + const recordingManager = getRecordingManager(); + const recordBtn = document.getElementById("stream-record-btn"); + const screenshotBtn = document.getElementById("stream-screenshot-btn"); + const replayBtn = document.getElementById("stream-replay-btn"); + const recordingIndicator = document.getElementById("stats-recording"); + const recordingDurationEl = document.getElementById("recording-duration"); + const replayIndicator = document.getElementById("stats-replay"); + + // Helper to show toast notifications + const showRecordingToast = (message: string, isError = false) => { + // Remove existing toast + document.querySelector(".recording-toast")?.remove(); + + const toast = document.createElement("div"); + toast.className = `recording-toast${isError ? " error" : ""}`; + + const icon = document.createElement("i"); + icon.setAttribute("data-lucide", isError ? "alert-circle" : "check-circle"); + toast.appendChild(icon); + + const span = document.createElement("span"); + span.textContent = message; + toast.appendChild(span); + + document.body.appendChild(toast); + + if (typeof lucide !== 'undefined') { + lucide.createIcons(); + } + + // Auto-remove after 3 seconds + setTimeout(() => toast.remove(), 3000); + }; + + // Initialize recording manager with stream and video element + const initRecordingManager = () => { + const stream = getMediaStream(); + const video = getVideoElement(); + if (stream) { + recordingManager.setStream(stream); + recordingManager.setVideoElement(video); // For canvas-based recording (no stutter) + recordingManager.setGameName(gameName); + console.log("Recording manager initialized with stream and video element (canvas mode)"); + } else { + console.warn("No media stream available for recording"); + } + }; + + // Update UI based on recording state + const updateRecordingUI = (state: RecordingState) => { + // Update record button + if (state.isRecording) { + recordBtn?.classList.add("recording-active"); + if (recordingIndicator) recordingIndicator.style.display = "inline-flex"; + if (recordingDurationEl) recordingDurationEl.textContent = recordingManager.formatDuration(state.duration); + } else { + recordBtn?.classList.remove("recording-active"); + if (recordingIndicator) recordingIndicator.style.display = "none"; + } + }; + + // Update replay button state + const updateReplayUI = () => { + if (recordingManager.isInstantReplayEnabled) { + replayBtn?.classList.add("replay-active"); + if (replayIndicator) replayIndicator.style.display = "inline-flex"; + } else { + replayBtn?.classList.remove("replay-active"); + if (replayIndicator) replayIndicator.style.display = "none"; + } + }; + + // Set up recording callbacks + recordingManager.onStateChanged(updateRecordingUI); + recordingManager.onSaved((filepath, isScreenshot) => { + const type = isScreenshot ? "Screenshot" : "Recording"; + const filename = filepath.split(/[\\/]/).pop() || filepath; + showRecordingToast(`${type} saved: ${filename}`); + }); + + // Initialize after a short delay to ensure stream is ready + setTimeout(initRecordingManager, 500); + + // Record button click + recordBtn?.addEventListener("click", async () => { + if (!recordingManager.isRecording) { + // Try to initialize stream if not already + if (!getMediaStream()) { + showRecordingToast("No stream available", true); + return; + } + initRecordingManager(); + const success = await recordingManager.startRecording(); + if (success) { + showRecordingToast("Recording started"); + } else { + showRecordingToast("Failed to start recording", true); + } + } else { + await recordingManager.stopRecording(); + showRecordingToast("Recording stopped, saving..."); + } + }); + + // Screenshot button click + screenshotBtn?.addEventListener("click", async () => { + const video = getVideoElement(); + if (!video) { + showRecordingToast("No video available", true); + return; + } + const success = await recordingManager.takeScreenshot(video); + if (!success) { + showRecordingToast("Failed to take screenshot", true); + } + }); + + // Replay button click - toggle instant replay + replayBtn?.addEventListener("click", () => { + if (!recordingManager.isInstantReplayEnabled) { + if (!getMediaStream()) { + showRecordingToast("No stream available", true); + return; + } + initRecordingManager(); + const success = recordingManager.enableInstantReplay(60); + if (success) { + showRecordingToast("Instant Replay enabled (60s buffer)"); + updateReplayUI(); + } else { + showRecordingToast("Failed to enable Instant Replay", true); + } + } else { + recordingManager.disableInstantReplay(); + showRecordingToast("Instant Replay disabled"); + updateReplayUI(); + } + }); + + // Keyboard shortcuts for recording + const recordingKeyHandler = async (e: KeyboardEvent) => { + // Only handle if streaming container is active + if (!document.getElementById("streaming-container")) return; + + switch (e.key) { + case "F9": // Toggle recording + e.preventDefault(); + recordBtn?.click(); + break; + case "F8": // Screenshot + e.preventDefault(); + screenshotBtn?.click(); + break; + case "F7": // Save instant replay + e.preventDefault(); + if (recordingManager.isInstantReplayEnabled) { + const success = await recordingManager.saveInstantReplay(); + if (success) { + showRecordingToast("Instant Replay saved"); + } else { + showRecordingToast("No replay data to save", true); + } + } else { + showRecordingToast("Instant Replay not enabled", true); + } + break; + case "F6": // Toggle instant replay + e.preventDefault(); + replayBtn?.click(); + break; + } + }; + + document.addEventListener("keydown", recordingKeyHandler); + + // Store cleanup function for recording in state + streamingUIState.recordingCleanup = () => { + document.removeEventListener("keydown", recordingKeyHandler); + recordingManager.dispose(); + }; + // Hold ESC to exit fullscreen (1 second hold required) let escHoldStart = 0; let escHoldTimer: number | null = null; @@ -4713,6 +5059,12 @@ async function exitStreaming(): Promise { streamingUIState.escCleanup = null; } + // Stop recording and cleanup + if (streamingUIState.recordingCleanup) { + streamingUIState.recordingCleanup(); + streamingUIState.recordingCleanup = null; + } + // Stop stats monitoring if (streamingUIState.statsInterval) { clearInterval(streamingUIState.statsInterval); @@ -4756,6 +5108,7 @@ async function exitStreaming(): Promise { inputCleanup: null, statsInterval: null, escCleanup: null, + recordingCleanup: null, lastDiscordUpdate: 0, gameStartTime: 0, }; @@ -5083,6 +5436,7 @@ async function saveSettings() { const codec = getDropdownValue("codec-setting") || "h264"; const audioCodec = getDropdownValue("audio-codec-setting") || "opus"; const region = getDropdownValue("region-setting") || "auto"; + const recordingCodec = getDropdownValue("recording-codec-setting") || "h264"; // Update global state discordRpcEnabled = discordEl?.checked || false; @@ -5094,6 +5448,8 @@ async function saveSettings() { currentAudioCodec = audioCodec; currentMaxBitrate = parseInt(bitrateEl?.value || "200", 10); currentRegion = region; + currentRecordingCodec = (recordingCodec === "av1" ? "av1" : recordingCodec === "h264" ? "h264" : "vp8") as RecordingCodecType; + getRecordingManager().setCodecPreference(currentRecordingCodec); // Update status bar with new region selection updateStatusBarLatency(); @@ -5111,6 +5467,7 @@ async function saveSettings() { proxy: proxyEl?.value || undefined, disable_telemetry: telemetryEl?.checked || true, reflex: reflexEnabled, + recording_codec: currentRecordingCodec, }; try { diff --git a/src/recording.ts b/src/recording.ts new file mode 100644 index 0000000..2fe7bdd --- /dev/null +++ b/src/recording.ts @@ -0,0 +1,648 @@ +// Recording Manager for OpenNow GFN Client +// Optimized to minimize impact on WebRTC streaming performance + +import { invoke } from "@tauri-apps/api/core"; + +export const RECORDING_QUALITY = { + low: 1_500_000, // 1.5 Mbps - minimal impact + medium: 3_000_000, // 3 Mbps - balanced + high: 6_000_000, // 6 Mbps - high quality +} as const; + +export type RecordingQualityType = keyof typeof RECORDING_QUALITY; + +// Codec preference +// VP8 is default - software encoded, won't interfere with H.264 stream decoding +// H.264 causes stuttering because encoding/decoding compete for same GPU hardware +// AV1 works well on RTX 40 series (separate encoder chip) +export type RecordingCodecType = "vp8" | "h264" | "av1"; + +// Recording mode +// canvas = captures from video element (decoupled from WebRTC, no stutter) +// stream = direct MediaStream recording (may cause stutter) +export type RecordingMode = "canvas" | "stream"; + +export interface RecordingState { + isRecording: boolean; + isPaused: boolean; + startTime: number | null; + duration: number; + filename: string | null; +} + +export type RecordingSavedCallback = (filepath: string, isScreenshot: boolean) => void; + +export class RecordingManager { + private mediaRecorder: MediaRecorder | null = null; + private recordedChunks: Blob[] = []; + private stream: MediaStream | null = null; + private clonedStream: MediaStream | null = null; + private videoElement: HTMLVideoElement | null = null; + private gameName = "Unknown"; + private customOutputDir: string | null = null; + private quality: RecordingQualityType = "medium"; + private codecPreference: RecordingCodecType = "vp8"; // VP8 default - no GPU contention + private recordingMode: RecordingMode = "canvas"; // Canvas mode by default - no stutter + private recordingFps = 60; // Match stream FPS for smooth recording + private _isRecording = false; + private _isPaused = false; + private recordingStartTime: number | null = null; + private durationInterval: ReturnType | null = null; + private dvrChunks: Blob[] = []; + private dvrEnabled = false; + private dvrDuration = 60; + private dvrCleanupInterval: ReturnType | null = null; + private onRecordingSaved: RecordingSavedCallback | null = null; + private onStateChange: ((state: RecordingState) => void) | null = null; + + // Canvas-based recording (decoupled from WebRTC pipeline) + private canvas: HTMLCanvasElement | OffscreenCanvas | null = null; + private canvasCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D | null = null; + private canvasStream: MediaStream | null = null; + private frameRequestId: number | null = null; + private lastFrameTime = 0; + private frameInterval: number = 0; // ms between frames + + setStream(stream: MediaStream | null) { + this.stream = stream; + // Clean up old cloned stream + if (this.clonedStream) { + this.clonedStream.getTracks().forEach(t => t.stop()); + this.clonedStream = null; + } + } + + setVideoElement(el: HTMLVideoElement | null) { + this.videoElement = el; + } + + setGameName(name: string) { this.gameName = name.replace(/[<>:"/|?*]/g, "_"); } + setOutputDir(dir: string | null) { this.customOutputDir = dir; } + setQuality(quality: RecordingQualityType) { this.quality = quality; } + setCodecPreference(codec: RecordingCodecType) { this.codecPreference = codec; } + getCodecPreference(): RecordingCodecType { return this.codecPreference; } + setRecordingMode(mode: RecordingMode) { this.recordingMode = mode; } + getRecordingMode(): RecordingMode { return this.recordingMode; } + setRecordingFps(fps: number) { this.recordingFps = Math.max(15, Math.min(60, fps)); } + getRecordingFps(): number { return this.recordingFps; } + onSaved(cb: RecordingSavedCallback) { this.onRecordingSaved = cb; } + onStateChanged(cb: (s: RecordingState) => void) { this.onStateChange = cb; } + + getState(): RecordingState { + return { + isRecording: this._isRecording, + isPaused: this._isPaused, + startTime: this.recordingStartTime, + duration: this.recordingStartTime ? Math.floor((Date.now() - this.recordingStartTime) / 1000) : 0, + filename: null, + }; + } + + get isRecording() { return this._isRecording; } + get duration() { return this.recordingStartTime ? Math.floor((Date.now() - this.recordingStartTime) / 1000) : 0; } + formatDuration(s: number) { return Math.floor(s / 60).toString().padStart(2, "0") + ":" + (s % 60).toString().padStart(2, "0"); } + + private genFilename(pre: string, ext: string) { + const ts = new Date().toISOString().replace(/[:.]/g, "-").replace("T", "_").slice(0, 19); + return "OpenNow_" + this.gameName + "_" + pre + ts + "." + ext; + } + + // Get MIME type based on user preference + // VP8 is default - software encoded, won't interfere with stream playback + // H.264 causes stuttering because it competes with stream decoding for GPU + // AV1 works on RTX 40+ (separate encoder chip) + private getMime(): string { + const vp8Codecs = [ + "video/webm;codecs=vp8,opus", + "video/webm;codecs=vp8", + "video/webm", + ]; + + const h264Codecs = [ + "video/webm;codecs=h264,opus", + "video/webm;codecs=h264", + "video/mp4;codecs=h264,aac", + "video/mp4;codecs=avc1.42E01E,mp4a.40.2", + "video/mp4", + ]; + + const av1Codecs = [ + "video/webm;codecs=av1,opus", + "video/mp4;codecs=av01.0.04M.08", + ]; + + // Build codec list based on user preference + let codecs: string[]; + if (this.codecPreference === "av1") { + // AV1 first (RTX 40+), then VP8 fallback + codecs = [...av1Codecs, ...vp8Codecs]; + } else if (this.codecPreference === "h264") { + // H.264 first (may cause stuttering!), then VP8 fallback + codecs = [...h264Codecs, ...vp8Codecs]; + } else { + // VP8 first (default) - software encoded, no GPU contention + codecs = [...vp8Codecs, ...h264Codecs]; + } + + for (const codec of codecs) { + if (MediaRecorder.isTypeSupported(codec)) { + console.log("Recording codec:", codec); + return codec; + } + } + return "video/webm"; + } + + // Get file extension based on mime type + private getFileExtension(): string { + const mime = this.getMime(); + return mime.startsWith("video/mp4") ? "mp4" : "webm"; + } + + // Get stream for recording - canvas mode decouples from WebRTC pipeline + private getRecordingStream(): MediaStream | null { + // Canvas mode: capture from video element (decoupled, no stutter) + if (this.recordingMode === "canvas" && this.videoElement) { + return this.createCanvasStream(); + } + + // Stream mode: clone the MediaStream directly (may cause stutter) + if (!this.stream) return null; + + if (!this.clonedStream) { + try { + this.clonedStream = this.stream.clone(); + } catch { + this.clonedStream = new MediaStream(); + this.stream.getTracks().forEach(track => { + this.clonedStream!.addTrack(track.clone()); + }); + } + } + return this.clonedStream; + } + + // Create a canvas-based stream that captures from the video element + // This completely decouples recording from the WebRTC decode pipeline + private createCanvasStream(): MediaStream | null { + if (!this.videoElement || !this.videoElement.videoWidth) { + console.warn("[Recording] Video element not ready for canvas capture"); + return null; + } + + const width = this.videoElement.videoWidth; + const height = this.videoElement.videoHeight; + + // Use regular canvas for captureStream compatibility + this.canvas = document.createElement("canvas"); + this.canvas.width = width; + this.canvas.height = height; + + // Get context with performance optimizations + this.canvasCtx = this.canvas.getContext("2d", { + alpha: false, + desynchronized: true, // Don't sync with compositor - reduces latency + willReadFrequently: false, // We're writing, not reading + }); + + if (!this.canvasCtx) { + console.error("[Recording] Failed to create canvas context"); + return null; + } + + // Disable image smoothing for faster draws + this.canvasCtx.imageSmoothingEnabled = false; + + // Create stream from canvas - let it capture at native rate + // The FPS limiting happens in our frame loop + this.canvasStream = this.canvas.captureStream(0); // 0 = manual frame capture + + // Add audio track from original stream if available + if (this.stream) { + const audioTracks = this.stream.getAudioTracks(); + audioTracks.forEach(track => { + this.canvasStream!.addTrack(track.clone()); + }); + } + + // Calculate frame interval + this.frameInterval = 1000 / this.recordingFps; + this.lastFrameTime = 0; + + // Start frame capture loop using requestAnimationFrame (smoother than setInterval) + this.startCanvasCapture(); + + console.log(`[Recording] Canvas capture started at ${this.recordingFps}fps, ${width}x${height}`); + return this.canvasStream; + } + + // Capture frames using requestAnimationFrame for smooth, jank-free capture + private startCanvasCapture() { + const captureFrame = (timestamp: number) => { + if (!this.canvasCtx || !this.videoElement || !this.canvas) { + return; // Stop if resources cleaned up + } + + // Throttle to target FPS + const elapsed = timestamp - this.lastFrameTime; + if (elapsed >= this.frameInterval) { + this.lastFrameTime = timestamp - (elapsed % this.frameInterval); + + // Check if video dimensions changed + if (this.canvas.width !== this.videoElement.videoWidth || + this.canvas.height !== this.videoElement.videoHeight) { + this.canvas.width = this.videoElement.videoWidth; + this.canvas.height = this.videoElement.videoHeight; + } + + // Draw current video frame to canvas + this.canvasCtx.drawImage(this.videoElement, 0, 0); + + // Request new frame from canvas stream + const videoTrack = this.canvasStream?.getVideoTracks()[0]; + if (videoTrack && 'requestFrame' in videoTrack) { + (videoTrack as any).requestFrame(); + } + } + + // Continue loop + this.frameRequestId = requestAnimationFrame(captureFrame); + }; + + // Start the loop + this.frameRequestId = requestAnimationFrame(captureFrame); + } + + private stopCanvasCapture() { + if (this.frameRequestId !== null) { + cancelAnimationFrame(this.frameRequestId); + this.frameRequestId = null; + } + if (this.canvasStream) { + this.canvasStream.getTracks().forEach(t => t.stop()); + this.canvasStream = null; + } + this.canvas = null; + this.canvasCtx = null; + this.lastFrameTime = 0; + } + + async startRecording(): Promise { + if (this._isRecording) return false; + + const recordingStream = this.getRecordingStream(); + if (!recordingStream) return false; + + // Try codecs in order based on user preference + const codecsToTry = this.getCodecPriorityList(); + let selectedMime: string | null = null; + + for (const mime of codecsToTry) { + try { + // Test if MediaRecorder can actually be created with this codec + const testRecorder = new MediaRecorder(recordingStream, { + mimeType: mime, + videoBitsPerSecond: RECORDING_QUALITY[this.quality], + }); + testRecorder.stop(); + selectedMime = mime; + console.log("[Recording] Successfully initialized with codec:", mime); + break; + } catch (e) { + console.warn(`[Recording] Codec ${mime} failed:`, e); + // Continue to next codec + } + } + + if (!selectedMime) { + console.error("[Recording] No working codec found"); + return false; + } + + try { + this.mediaRecorder = new MediaRecorder(recordingStream, { + mimeType: selectedMime, + videoBitsPerSecond: RECORDING_QUALITY[this.quality], + }); + + this.recordedChunks = []; + + this.mediaRecorder.ondataavailable = e => { + if (e.data.size > 0) this.recordedChunks.push(e.data); + }; + + this.mediaRecorder.onstop = () => this.saveRecording(); + + // Use 5 second timeslice to reduce encoder pressure + // Shorter timeslices cause more frequent encoding flushes which stutter playback + this.mediaRecorder.start(5000); + + this._isRecording = true; + this.recordingStartTime = Date.now(); + this.durationInterval = setInterval(() => this.notifyStateChange(), 1000); + this.notifyStateChange(); + return true; + } catch (e) { + console.error("Failed to start recording:", e); + return false; + } + } + + // Get list of codecs to try in priority order based on user preference + private getCodecPriorityList(): string[] { + const vp8Codecs = [ + "video/webm;codecs=vp8,opus", + "video/webm;codecs=vp8", + "video/webm", + ]; + + const h264Codecs = [ + "video/webm;codecs=h264,opus", + "video/webm;codecs=h264", + "video/mp4;codecs=avc1.42E01E,mp4a.40.2", + ]; + + const av1Codecs = [ + "video/webm;codecs=av1,opus", + "video/mp4;codecs=av01.0.04M.08", + ]; + + let codecs: string[]; + if (this.codecPreference === "av1") { + codecs = [...av1Codecs, ...vp8Codecs]; + } else if (this.codecPreference === "h264") { + codecs = [...h264Codecs, ...vp8Codecs]; + } else { + // VP8 default + codecs = [...vp8Codecs, ...h264Codecs]; + } + + return codecs.filter(mime => MediaRecorder.isTypeSupported(mime)); + } + + async stopRecording(): Promise { + if (!this._isRecording || !this.mediaRecorder) return false; + + this.mediaRecorder.stop(); + this._isRecording = false; + + // Stop canvas capture if active + this.stopCanvasCapture(); + + if (this.durationInterval) { + clearInterval(this.durationInterval); + this.durationInterval = null; + } + + this.notifyStateChange(); + return true; + } + + async toggleRecording() { + return this._isRecording ? this.stopRecording() : this.startRecording(); + } + + private async saveRecording() { + if (!this.recordedChunks.length) return; + + const mimeType = this.getMime(); + const ext = this.getFileExtension(); + const blob = new Blob(this.recordedChunks, { type: mimeType }); + + // Use requestIdleCallback to defer heavy work, or setTimeout as fallback + const deferredSave = async () => { + const data = Array.from(new Uint8Array(await blob.arrayBuffer())); + const fp = await invoke("save_recording", { + data, + filename: this.genFilename("", ext), + customDir: this.customOutputDir + }); + this.recordedChunks = []; + this.recordingStartTime = null; + if (this.onRecordingSaved) this.onRecordingSaved(fp, false); + }; + + if ('requestIdleCallback' in window) { + (window as any).requestIdleCallback(deferredSave, { timeout: 5000 }); + } else { + setTimeout(deferredSave, 100); + } + } + + async takeScreenshot(vid: HTMLVideoElement): Promise { + if (!vid || !vid.videoWidth) return false; + + // Use OffscreenCanvas if available for better performance + let canvas: HTMLCanvasElement | OffscreenCanvas; + let ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D | null; + + if (typeof OffscreenCanvas !== 'undefined') { + canvas = new OffscreenCanvas(vid.videoWidth, vid.videoHeight); + ctx = canvas.getContext('2d'); + } else { + canvas = document.createElement("canvas"); + canvas.width = vid.videoWidth; + canvas.height = vid.videoHeight; + ctx = canvas.getContext("2d"); + } + + if (!ctx) return false; + ctx.drawImage(vid, 0, 0); + + let blob: Blob | null; + if (canvas instanceof OffscreenCanvas) { + blob = await canvas.convertToBlob({ type: "image/png" }); + } else { + blob = await new Promise(r => canvas.toBlob(r, "image/png")); + } + + if (!blob) return false; + + // Defer to avoid blocking + const data = Array.from(new Uint8Array(await blob.arrayBuffer())); + const fp = await invoke("save_screenshot", { + data, + filename: this.genFilename("", "png"), + customDir: this.customOutputDir + }); + + if (this.onRecordingSaved) this.onRecordingSaved(fp, true); + return true; + } + + enableInstantReplay(dur = 60): boolean { + if (this.dvrEnabled) return false; + + const recordingStream = this.getRecordingStream(); + if (!recordingStream) return false; + + this.dvrDuration = dur; + this.dvrChunks = []; + + // If already recording, share the chunks instead of creating another recorder + if (this._isRecording && this.mediaRecorder) { + // Just enable DVR mode - we'll use the main recorder's chunks + this.dvrEnabled = true; + return true; + } + + // Create a dedicated DVR recorder with lower quality for less impact + try { + const dvrRecorder = new MediaRecorder(recordingStream, { + mimeType: this.getMime(), + videoBitsPerSecond: RECORDING_QUALITY.low, // Use low quality for DVR to reduce impact + }); + + dvrRecorder.ondataavailable = e => { + if (e.data.size > 0) this.dvrChunks.push(e.data); + }; + + // Use 5 second chunks for DVR too + dvrRecorder.start(5000); + + // Cleanup old chunks periodically - check every 5 seconds + this.dvrCleanupInterval = setInterval(() => { + // Each chunk is ~5 seconds, so keep (duration/5) chunks + const maxChunks = Math.ceil(this.dvrDuration / 5); + while (this.dvrChunks.length > maxChunks) { + this.dvrChunks.shift(); + } + }, 5000); + + this.dvrEnabled = true; + // Store recorder reference for cleanup + (this as any)._dvrRecorder = dvrRecorder; + return true; + } catch (e) { + console.error("Failed to enable instant replay:", e); + return false; + } + } + + disableInstantReplay() { + if (!this.dvrEnabled) return; + + const dvrRecorder = (this as any)._dvrRecorder as MediaRecorder | undefined; + if (dvrRecorder && dvrRecorder.state !== "inactive") { + dvrRecorder.stop(); + } + (this as any)._dvrRecorder = null; + + if (this.dvrCleanupInterval) { + clearInterval(this.dvrCleanupInterval); + this.dvrCleanupInterval = null; + } + + this.dvrChunks = []; + this.dvrEnabled = false; + } + + get isInstantReplayEnabled() { return this.dvrEnabled; } + + async saveInstantReplay(): Promise { + if (!this.dvrEnabled) return false; + + // If we're sharing with main recorder, use those chunks + const chunks = this.dvrChunks.length > 0 ? this.dvrChunks : this.recordedChunks; + if (!chunks.length) return false; + + const mimeType = this.getMime(); + const ext = this.getFileExtension(); + const blob = new Blob([...chunks], { type: mimeType }); + + // Defer heavy work + const deferredSave = async () => { + const data = Array.from(new Uint8Array(await blob.arrayBuffer())); + const fp = await invoke("save_recording", { + data, + filename: this.genFilename("Replay_", ext), + customDir: this.customOutputDir + }); + if (this.onRecordingSaved) this.onRecordingSaved(fp, false); + }; + + if ('requestIdleCallback' in window) { + (window as any).requestIdleCallback(deferredSave, { timeout: 5000 }); + } else { + setTimeout(deferredSave, 100); + } + + return true; + } + + private notifyStateChange() { + if (this.onStateChange) this.onStateChange(this.getState()); + } + + // Expose the current codec for UI display + getCurrentCodec(): string { + return this.getMime(); + } + + dispose() { + this.stopRecording(); + this.disableInstantReplay(); + this.stopCanvasCapture(); + + // Clean up cloned stream + if (this.clonedStream) { + this.clonedStream.getTracks().forEach(t => t.stop()); + this.clonedStream = null; + } + + this.stream = null; + this.videoElement = null; + } +} + +let inst: RecordingManager | null = null; +export function getRecordingManager() { + if (!inst) inst = new RecordingManager(); + return inst; +} + +export async function openRecordingsFolder(d?: string) { + await invoke("open_recordings_folder", { customDir: d || null }); +} + +export async function getRecordingsDir(d?: string) { + return invoke("get_recordings_dir", { customDir: d || null }); +} + +// Test all codecs and return support status +export interface CodecSupport { + codec: string; + supported: boolean; + description: string; + hwAccelerated: boolean; +} + +export function testCodecSupport(): CodecSupport[] { + const codecs = [ + // AV1 - best compression, modern GPUs (RTX 40, Intel Arc, AMD RX 7000) + { codec: "video/webm;codecs=av1,opus", description: "AV1 + Opus (WebM) - Best Quality", hwAccelerated: true }, + { codec: "video/mp4;codecs=av01.0.04M.08", description: "AV1 (MP4)", hwAccelerated: true }, + // H.264 - widely supported, hardware accelerated + { codec: "video/webm;codecs=h264,opus", description: "H.264 + Opus (WebM) - Best Compatibility", hwAccelerated: true }, + { codec: "video/webm;codecs=h264", description: "H.264 (WebM)", hwAccelerated: true }, + { codec: "video/mp4;codecs=h264,aac", description: "H.264 + AAC (MP4)", hwAccelerated: true }, + { codec: "video/mp4;codecs=avc1.42E01E,mp4a.40.2", description: "H.264 Baseline (MP4)", hwAccelerated: true }, + { codec: "video/mp4", description: "MP4 (generic)", hwAccelerated: true }, + // VP9/VP8 - software encoded fallbacks + { codec: "video/webm;codecs=vp9,opus", description: "VP9 + Opus (WebM)", hwAccelerated: false }, + { codec: "video/webm;codecs=vp9", description: "VP9 (WebM)", hwAccelerated: false }, + { codec: "video/webm;codecs=vp8,opus", description: "VP8 + Opus (WebM)", hwAccelerated: false }, + { codec: "video/webm;codecs=vp8", description: "VP8 (WebM)", hwAccelerated: false }, + { codec: "video/webm", description: "WebM (generic)", hwAccelerated: false }, + ]; + + return codecs.map(c => ({ + ...c, + supported: MediaRecorder.isTypeSupported(c.codec), + })); +} + +// Get the currently selected codec +export function getCurrentCodec(): string { + return getRecordingManager().getCurrentCodec(); +} diff --git a/src/streaming.ts b/src/streaming.ts index 5790a61..11a170c 100644 --- a/src/streaming.ts +++ b/src/streaming.ts @@ -1233,9 +1233,8 @@ function createVideoElement(): HTMLVideoElement { } }; - // Keep video at live edge - catch up if we fall behind - // Use setInterval instead of requestAnimationFrame to reduce overhead - // Store interval ID in streaming state so it can be cleared on disconnect + // Keep video at live edge - only intervene on major stalls + // Don't be aggressive - let WebRTC handle minor jitter if (streamingState.liveEdgeIntervalId) { clearInterval(streamingState.liveEdgeIntervalId); } @@ -1250,16 +1249,14 @@ function createVideoElement(): HTMLVideoElement { if (video.buffered.length > 0) { const bufferedEnd = video.buffered.end(video.buffered.length - 1); const lag = bufferedEnd - video.currentTime; - // If we're more than 100ms behind live, catch up - if (lag > 0.1) { + // Only intervene on major stalls (>1 second behind) + // Let WebRTC jitter buffer handle normal variation + if (lag > 1.0) { video.currentTime = bufferedEnd; - // Only log significant catch-ups to reduce console spam - if (lag > 0.5) { - console.log(`Caught up to live edge (was ${(lag * 1000).toFixed(0)}ms behind)`); - } + console.log(`Major stall recovery (was ${(lag * 1000).toFixed(0)}ms behind)`); } } - }, 1000); + }, 2000); // Check less frequently - let WebRTC handle it // Handle video events video.onloadedmetadata = () => { @@ -1871,19 +1868,20 @@ function handleTrack(event: RTCTrackEvent): void { console.log("Track received:", event.track.kind, event.track.id, "readyState:", event.track.readyState); console.log("Track settings:", JSON.stringify(event.track.getSettings())); - // === LOW LATENCY: Minimize jitter buffer === + // === LOW LATENCY: Set small jitter buffer === + // Don't set to 0 - causes stalls. Use small buffer for stability. if (event.receiver) { try { - // Set minimum jitter buffer delay for lowest latency - // This may cause more frame drops but reduces latency + // 50ms buffer balances latency vs stability + // 0 = too aggressive (causes FPS drops/stalls) + // 50ms = stable for gaming without noticeable latency if ('jitterBufferTarget' in event.receiver) { - (event.receiver as any).jitterBufferTarget = 0; // Minimum buffering - console.log("Set jitterBufferTarget to 0 for low latency"); + (event.receiver as any).jitterBufferTarget = 0.05; // 50ms + console.log("Set jitterBufferTarget to 50ms"); } - // Also try playoutDelayHint if available if ('playoutDelayHint' in event.receiver) { - (event.receiver as any).playoutDelayHint = 0; - console.log("Set playoutDelayHint to 0 for low latency"); + (event.receiver as any).playoutDelayHint = 0.05; // 50ms + console.log("Set playoutDelayHint to 50ms"); } } catch (e) { console.log("Could not set jitter buffer target:", e); @@ -3338,3 +3336,19 @@ export function toggleMute(): boolean { } return false; } + + +/** + * Get the current media stream for recording + */ +export function getMediaStream(): MediaStream | null { + return sharedMediaStream; +} + +/** + * Get the current video element for screenshot capture + */ +export function getVideoElement(): HTMLVideoElement | null { + return streamingState.videoElement; +} + diff --git a/src/styles/main.css b/src/styles/main.css index 3ac7631..d48d8fb 100644 --- a/src/styles/main.css +++ b/src/styles/main.css @@ -1707,3 +1707,108 @@ select { #submit-token-btn { width: 100%; } + +/* Codec Test Results */ +.codec-results { + margin-top: 12px; + background: var(--bg-primary); + border: 1px solid var(--border-color); + border-radius: var(--radius); + padding: 12px; +} + +.codec-header { + font-size: 12px; + color: var(--accent-green); + font-weight: 600; + margin-bottom: 10px; + padding-bottom: 8px; + border-bottom: 1px solid var(--border-color); +} + +.codec-list { + display: flex; + flex-direction: column; + gap: 6px; + max-height: 300px; + overflow-y: auto; +} + +.codec-item { + display: flex; + align-items: center; + gap: 8px; + padding: 6px 8px; + border-radius: var(--radius-sm); + font-size: 12px; +} + +.codec-item.supported { + background: rgba(118, 185, 0, 0.1); +} + +.codec-item.unsupported { + background: rgba(102, 102, 102, 0.1); + opacity: 0.6; +} + +.codec-item.active { + background: rgba(118, 185, 0, 0.25); + border: 1px solid var(--accent-green); +} + +.codec-indicator { + font-weight: bold; + width: 16px; + text-align: center; +} + +.codec-item.supported .codec-indicator { + color: var(--accent-green); +} + +.codec-item.unsupported .codec-indicator { + color: var(--text-muted); +} + +.codec-info { + display: flex; + align-items: center; + gap: 8px; + flex: 1; +} + +.codec-name { + color: var(--text-primary); +} + +.codec-badge { + font-size: 10px; + padding: 2px 6px; + background: var(--accent-green); + color: #000; + border-radius: 3px; + font-weight: 600; +} + +.codec-note { + margin-top: 10px; + padding-top: 8px; + border-top: 1px solid var(--border-color); + font-size: 11px; + color: var(--text-muted); + font-style: italic; +} + +.codec-section { + margin-top: 12px; + padding-top: 10px; + border-top: 1px solid var(--border-color); +} + +.codec-subheader { + font-size: 11px; + color: var(--text-secondary); + margin-bottom: 8px; + font-weight: 500; +} From dfdeb8b8d64b81c308cb37d8e1d4c0e1a5465f74 Mon Sep 17 00:00:00 2001 From: Zortos Date: Wed, 31 Dec 2025 01:57:20 +0100 Subject: [PATCH 02/67] feat: macOS optimizations and frame rate synchronization Renderer improvements: - Add frame rate limiting to sync render loop with decoded stream FPS - Fix NV12 render path that was skipped due to incorrect bind group check - Add ProMotion support with preferredFrameRateRange for 120Hz displays - Add Core Graphics display mode switching for high refresh rate - Implement macOS high-performance mode (disable App Nap, latency-critical scheduling) Video decoding: - Suppress FFmpeg "no frame" log spam (EAGAIN is normal for H.264 buffering) - Only log decoder recovery for significant failures (>5 packets) - Add VideoToolbox zero-copy infrastructure with CVPixelBuffer wrapper macOS app bundle: - Add Info.plist with GCSupportsGameMode for macOS Game Mode support - Add bundle script for creating .app with proper entitlements - Set GPUSelectionPolicy to highPerformance - Categorize as game app for system optimizations Input handling: - Add macOS raw input support for unaccelerated mouse movement Audio: - Improve audio decoder initialization and error handling --- opennow-streamer/Cargo.lock | 49 +- opennow-streamer/Cargo.toml | 5 +- opennow-streamer/macos/Info.plist | 44 + opennow-streamer/macos/bundle.sh | 38 + opennow-streamer/src/app/mod.rs | 4 +- opennow-streamer/src/gui/renderer.rs | 903 ++++++++++++++++----- opennow-streamer/src/input/macos.rs | 461 +++++++++++ opennow-streamer/src/input/mod.rs | 60 +- opennow-streamer/src/main.rs | 31 +- opennow-streamer/src/media/audio.rs | 401 ++++++++- opennow-streamer/src/media/mod.rs | 27 +- opennow-streamer/src/media/video.rs | 308 ++++++- opennow-streamer/src/media/videotoolbox.rs | 243 ++++++ opennow-streamer/src/webrtc/mod.rs | 13 +- opennow-streamer/src/webrtc/peer.rs | 61 +- opennow-streamer/src/webrtc/signaling.rs | 4 + 16 files changed, 2319 insertions(+), 333 deletions(-) create mode 100644 opennow-streamer/macos/Info.plist create mode 100755 opennow-streamer/macos/bundle.sh create mode 100644 opennow-streamer/src/input/macos.rs create mode 100644 opennow-streamer/src/media/videotoolbox.rs diff --git a/opennow-streamer/Cargo.lock b/opennow-streamer/Cargo.lock index aaf83fd..dbe1d80 100644 --- a/opennow-streamer/Cargo.lock +++ b/opennow-streamer/Cargo.lock @@ -397,24 +397,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" -dependencies = [ - "bitflags 2.10.0", - "cexpr", - "clang-sys", - "itertools", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.111", -] - [[package]] name = "bindgen" version = "0.72.1" @@ -882,7 +864,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6" dependencies = [ - "bindgen 0.72.1", + "bindgen", ] [[package]] @@ -1421,9 +1403,9 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "7.1.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da02698288e0275e442a47fc12ca26d50daf0d48b15398ba5906f20ac2e2a9f9" +checksum = "d658424d233cbd993a972dd73a66ca733acd12a494c68995c9ac32ae1fe65b40" dependencies = [ "bitflags 2.10.0", "ffmpeg-sys-next", @@ -1432,11 +1414,11 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" -version = "7.1.3" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e9c75ebd4463de9d8998fb134ba26347fe5faee62fabf0a4b4d41bd500b4ad" +checksum = "9bca20aa4ee774fe384c2490096c122b0b23cf524a9910add0686691003d797b" dependencies = [ - "bindgen 0.70.1", + "bindgen", "cc", "libc", "num_cpus", @@ -2470,6 +2452,21 @@ dependencies = [ "autocfg", ] +[[package]] +name = "metal" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" +dependencies = [ + "bitflags 2.10.0", + "block", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "log", + "objc", + "paste", +] + [[package]] name = "metal" version = "0.32.0" @@ -3120,6 +3117,7 @@ version = "0.1.0" dependencies = [ "anyhow", "base64 0.22.1", + "block", "bytemuck", "bytes", "chrono", @@ -3141,6 +3139,7 @@ dependencies = [ "lazy_static", "libc", "log", + "metal 0.31.0", "native-tls", "objc", "once_cell", @@ -5598,7 +5597,7 @@ dependencies = [ "libc", "libloading", "log", - "metal", + "metal 0.32.0", "naga", "ndk-sys 0.6.0+11769913", "objc", diff --git a/opennow-streamer/Cargo.toml b/opennow-streamer/Cargo.toml index d2849cb..0058880 100644 --- a/opennow-streamer/Cargo.toml +++ b/opennow-streamer/Cargo.toml @@ -26,7 +26,7 @@ native-tls = "0.2" tokio-native-tls = "0.3" # Video decoding - FFmpeg with hardware acceleration -ffmpeg-next = "7" +ffmpeg-next = "8" # Keep OpenH264 as fallback openh264 = "0.6" @@ -92,6 +92,9 @@ core-foundation = "0.10" core-graphics = "0.24" cocoa = "0.26" objc = "0.2" +# Zero-copy video: VideoToolbox -> IOSurface -> Metal texture +metal = "0.31" +block = "0.1" [target.'cfg(target_os = "linux")'.dependencies] evdev = "0.12" diff --git a/opennow-streamer/macos/Info.plist b/opennow-streamer/macos/Info.plist new file mode 100644 index 0000000..8140a4f --- /dev/null +++ b/opennow-streamer/macos/Info.plist @@ -0,0 +1,44 @@ + + + + + CFBundleName + OpenNOW + CFBundleDisplayName + OpenNOW Streamer + CFBundleIdentifier + com.opennow.streamer + CFBundleVersion + 0.1.0 + CFBundleShortVersionString + 0.1.0 + CFBundleExecutable + opennow-streamer + CFBundlePackageType + APPL + LSMinimumSystemVersion + 12.0 + NSHighResolutionCapable + + + + GCSupportsGameMode + + + + NSSupportsAutomaticTermination + + NSSupportsSuddenTermination + + NSAppSleepDisabled + + + + GPUSelectionPolicy + highPerformance + + + LSApplicationCategoryType + public.app-category.games + + diff --git a/opennow-streamer/macos/bundle.sh b/opennow-streamer/macos/bundle.sh new file mode 100755 index 0000000..07c01d2 --- /dev/null +++ b/opennow-streamer/macos/bundle.sh @@ -0,0 +1,38 @@ +#!/bin/bash +# Bundle opennow-streamer as a macOS .app for Game Mode support + +set -e + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_DIR="$(dirname "$SCRIPT_DIR")" +APP_NAME="OpenNOW.app" +APP_DIR="$PROJECT_DIR/target/release/$APP_NAME" + +# Build release +echo "Building release..." +cd "$PROJECT_DIR" +cargo build --release + +# Create app bundle structure +echo "Creating app bundle..." +rm -rf "$APP_DIR" +mkdir -p "$APP_DIR/Contents/MacOS" +mkdir -p "$APP_DIR/Contents/Resources" + +# Copy binary +cp "$PROJECT_DIR/target/release/opennow-streamer" "$APP_DIR/Contents/MacOS/" + +# Copy Info.plist +cp "$SCRIPT_DIR/Info.plist" "$APP_DIR/Contents/" + +# Create PkgInfo +echo -n "APPL????" > "$APP_DIR/Contents/PkgInfo" + +echo "" +echo "App bundle created: $APP_DIR" +echo "" +echo "To run with Game Mode support:" +echo " open '$APP_DIR'" +echo "" +echo "Or run directly:" +echo " '$APP_DIR/Contents/MacOS/opennow-streamer'" diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index 9f73bef..a7be49e 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -1351,7 +1351,7 @@ impl App { // Set local cursor dimensions for instant visual feedback // Parse resolution from settings (e.g., "1920x1080" -> width, height) let (width, height) = parse_resolution(&self.settings.resolution); - #[cfg(target_os = "windows")] + #[cfg(any(target_os = "windows", target_os = "macos"))] crate::input::set_local_cursor_dimensions(width, height); info!("Input system initialized: session timing + local cursor {}x{}", width, height); @@ -1407,7 +1407,7 @@ impl App { crate::input::reset_session_timing(); // Reset input coalescing and local cursor state - #[cfg(target_os = "windows")] + #[cfg(any(target_os = "windows", target_os = "macos"))] crate::input::reset_coalescing(); self.cursor_captured = false; diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index a268da2..0a7349f 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -10,8 +10,11 @@ use winit::event::WindowEvent; use winit::event_loop::ActiveEventLoop; use winit::window::{Window, WindowAttributes, Fullscreen, CursorGrabMode}; +#[cfg(target_os = "macos")] +use winit::raw_window_handle::{HasWindowHandle, RawWindowHandle}; + use crate::app::{App, AppState, UiAction, GamesTab, SettingChange}; -use crate::media::VideoFrame; +use crate::media::{VideoFrame, PixelFormat}; use super::StatsPanel; use super::image_cache; use std::collections::HashMap; @@ -67,17 +70,90 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4 { // Sample Y, U, V planes // Y is full resolution, U/V are half resolution (4:2:0 subsampling) // The sampler handles the upscaling of U/V automatically - let y = textureSample(y_texture, video_sampler, input.tex_coord).r; - let u = textureSample(u_texture, video_sampler, input.tex_coord).r - 0.5; - let v = textureSample(v_texture, video_sampler, input.tex_coord).r - 0.5; - - // BT.601 YUV to RGB conversion (full range) - // R = Y + 1.402 * V - // G = Y - 0.344 * U - 0.714 * V - // B = Y + 1.772 * U - let r = y + 1.402 * v; - let g = y - 0.344 * u - 0.714 * v; - let b = y + 1.772 * u; + let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; + let u_raw = textureSample(u_texture, video_sampler, input.tex_coord).r; + let v_raw = textureSample(v_texture, video_sampler, input.tex_coord).r; + + // BT.709 YUV to RGB conversion (limited/TV range) + // Video uses limited range: Y [16-235], UV [16-240] + // First convert from limited range to full range + let y = (y_raw - 0.0625) * 1.1644; // (Y - 16/255) * (255/219) + let u = (u_raw - 0.5) * 1.1384; // (U - 128/255) * (255/224) + let v = (v_raw - 0.5) * 1.1384; // (V - 128/255) * (255/224) + + // BT.709 color matrix (HD content: 720p and above) + // R = Y + 1.5748 * V + // G = Y - 0.1873 * U - 0.4681 * V + // B = Y + 1.8556 * U + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; + + return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); +} +"#; + +/// WGSL shader for NV12 format (VideoToolbox on macOS) +/// NV12 has Y plane (R8) and interleaved UV plane (Rg8) +/// This shader deinterleaves UV on the GPU - much faster than CPU scaler +const NV12_SHADER: &str = r#" +struct VertexOutput { + @builtin(position) position: vec4, + @location(0) tex_coord: vec2, +}; + +@vertex +fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { + var positions = array, 6>( + vec2(-1.0, -1.0), + vec2( 1.0, -1.0), + vec2(-1.0, 1.0), + vec2(-1.0, 1.0), + vec2( 1.0, -1.0), + vec2( 1.0, 1.0), + ); + + var tex_coords = array, 6>( + vec2(0.0, 1.0), + vec2(1.0, 1.0), + vec2(0.0, 0.0), + vec2(0.0, 0.0), + vec2(1.0, 1.0), + vec2(1.0, 0.0), + ); + + var output: VertexOutput; + output.position = vec4(positions[vertex_index], 0.0, 1.0); + output.tex_coord = tex_coords[vertex_index]; + return output; +} + +// NV12 textures: Y (R8, full res) and UV (Rg8, half res, interleaved) +@group(0) @binding(0) +var y_texture: texture_2d; +@group(0) @binding(1) +var uv_texture: texture_2d; +@group(0) @binding(2) +var video_sampler: sampler; + +@fragment +fn fs_main(input: VertexOutput) -> @location(0) vec4 { + // Sample Y (full res) and UV (half res, interleaved) + let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; + let uv = textureSample(uv_texture, video_sampler, input.tex_coord); + let u_raw = uv.r; // U is in red channel + let v_raw = uv.g; // V is in green channel + + // BT.709 YUV to RGB conversion (limited/TV range - same as YUV420P path) + // VideoToolbox outputs limited range: Y [16-235], UV [16-240] + let y = (y_raw - 0.0625) * 1.1644; // (Y - 16/255) * (255/219) + let u = (u_raw - 0.5) * 1.1384; // (U - 128/255) * (255/224) + let v = (v_raw - 0.5) * 1.1384; // (V - 128/255) * (255/224) + + // BT.709 color matrix (HD content: 720p and above) + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); } @@ -101,13 +177,22 @@ pub struct Renderer { video_pipeline: wgpu::RenderPipeline, video_bind_group_layout: wgpu::BindGroupLayout, video_sampler: wgpu::Sampler, - // YUV planar textures (Y = full res, U/V = half res for 4:2:0) + // YUV420P planar textures (Y = full res, U/V = half res for 4:2:0) y_texture: Option, u_texture: Option, v_texture: Option, video_bind_group: Option, video_size: (u32, u32), + // NV12 pipeline (for VideoToolbox on macOS - faster than CPU scaler) + nv12_pipeline: wgpu::RenderPipeline, + nv12_bind_group_layout: wgpu::BindGroupLayout, + // NV12 textures: Y (R8) and UV interleaved (Rg8) + uv_texture: Option, + nv12_bind_group: Option, + // Current pixel format + current_format: PixelFormat, + // Stats panel stats_panel: StatsPanel, @@ -142,6 +227,15 @@ impl Renderer { info!("Window created: {}x{}", size.width, size.height); + // On macOS, enable high-performance mode and disable App Nap + #[cfg(target_os = "macos")] + Self::enable_macos_high_performance(); + + // On macOS, set display to 120Hz immediately (before fullscreen) + // This ensures Direct mode uses high refresh rate + #[cfg(target_os = "macos")] + Self::set_macos_display_mode_120hz(); + // Create wgpu instance // Force DX12 on Windows for better exclusive fullscreen support and lower latency // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition @@ -200,8 +294,7 @@ impl Renderer { .copied() .unwrap_or(surface_caps.formats[0]); - // Use Immediate present mode for lowest latency (no VSync) - // Fall back to Mailbox if Immediate not available, then Fifo (VSync) + // Use Immediate for lowest latency - frame pacing is handled by our render loop let present_mode = if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { wgpu::PresentMode::Immediate } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Mailbox) { @@ -219,7 +312,7 @@ impl Renderer { present_mode, alpha_mode: surface_caps.alpha_modes[0], view_formats: vec![], - desired_maximum_frame_latency: 1, // Minimize frame queue for lower latency + desired_maximum_frame_latency: 1, // Minimum latency for streaming }; surface.configure(&device, &config); @@ -348,6 +441,87 @@ impl Renderer { ..Default::default() }); + // Create NV12 pipeline (for VideoToolbox on macOS - GPU deinterleaving) + let nv12_shader = device.create_shader_module(wgpu::ShaderModuleDescriptor { + label: Some("NV12 Shader"), + source: wgpu::ShaderSource::Wgsl(NV12_SHADER.into()), + }); + + let nv12_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { + label: Some("NV12 Bind Group Layout"), + entries: &[ + // Y texture (full resolution, R8) + wgpu::BindGroupLayoutEntry { + binding: 0, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Texture { + sample_type: wgpu::TextureSampleType::Float { filterable: true }, + view_dimension: wgpu::TextureViewDimension::D2, + multisampled: false, + }, + count: None, + }, + // UV texture (half resolution, Rg8 interleaved) + wgpu::BindGroupLayoutEntry { + binding: 1, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Texture { + sample_type: wgpu::TextureSampleType::Float { filterable: true }, + view_dimension: wgpu::TextureViewDimension::D2, + multisampled: false, + }, + count: None, + }, + // Sampler + wgpu::BindGroupLayoutEntry { + binding: 2, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering), + count: None, + }, + ], + }); + + let nv12_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { + label: Some("NV12 Pipeline Layout"), + bind_group_layouts: &[&nv12_bind_group_layout], + push_constant_ranges: &[], + }); + + let nv12_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { + label: Some("NV12 Pipeline"), + layout: Some(&nv12_pipeline_layout), + vertex: wgpu::VertexState { + module: &nv12_shader, + entry_point: Some("vs_main"), + buffers: &[], + compilation_options: Default::default(), + }, + fragment: Some(wgpu::FragmentState { + module: &nv12_shader, + entry_point: Some("fs_main"), + targets: &[Some(wgpu::ColorTargetState { + format: surface_format, + blend: Some(wgpu::BlendState::REPLACE), + write_mask: wgpu::ColorWrites::ALL, + })], + compilation_options: Default::default(), + }), + primitive: wgpu::PrimitiveState { + topology: wgpu::PrimitiveTopology::TriangleList, + strip_index_format: None, + front_face: wgpu::FrontFace::Ccw, + cull_mode: None, + polygon_mode: wgpu::PolygonMode::Fill, + unclipped_depth: false, + conservative: false, + }, + depth_stencil: None, + multisample: wgpu::MultisampleState::default(), + multiview: None, + cache: None, + }); + // Create stats panel let stats_panel = StatsPanel::new(); @@ -369,6 +543,11 @@ impl Renderer { v_texture: None, video_bind_group: None, video_size: (0, 0), + nv12_pipeline, + nv12_bind_group_layout, + uv_texture: None, + nv12_bind_group: None, + current_format: PixelFormat::YUV420P, stats_panel, fullscreen: false, consecutive_surface_errors: 0, @@ -435,6 +614,11 @@ impl Renderer { self.config.present_mode, self.config.desired_maximum_frame_latency ); + + // On macOS, set ProMotion frame rate and disable VSync on every configure + // This ensures the Metal layer always requests 120fps from ProMotion + #[cfg(target_os = "macos")] + Self::disable_macos_vsync(&self.window); } /// Recover from swapchain errors (Outdated/Lost) @@ -466,69 +650,73 @@ impl Renderer { self.fullscreen = !self.fullscreen; if self.fullscreen { - // Try to find the best video mode (highest refresh rate at current resolution) - let current_monitor = self.window.current_monitor(); - - if let Some(monitor) = current_monitor { - let current_size = self.window.inner_size(); - let mut best_mode: Option = None; - let mut best_refresh_rate: u32 = 0; - - info!("Searching for video modes on monitor: {:?}", monitor.name()); - info!("Current window size: {}x{}", current_size.width, current_size.height); - - // Log all available video modes for debugging - let mut mode_count = 0; - for mode in monitor.video_modes() { - let mode_size = mode.size(); - let refresh_rate = mode.refresh_rate_millihertz() / 1000; // Convert to Hz - - // Log high refresh rate modes (>= 100Hz) or modes matching our resolution - if refresh_rate >= 100 || (mode_size.width == current_size.width && mode_size.height == current_size.height) { - debug!( - " Available mode: {}x{} @ {}Hz ({}mHz)", - mode_size.width, - mode_size.height, - refresh_rate, - mode.refresh_rate_millihertz() - ); - } - mode_count += 1; + // On macOS, use Core Graphics to force 120Hz display mode + #[cfg(target_os = "macos")] + Self::set_macos_display_mode_120hz(); + + // Use borderless fullscreen on macOS (exclusive doesn't work well) + // The display mode is set separately via Core Graphics + #[cfg(target_os = "macos")] + { + info!("Entering borderless fullscreen with 120Hz display mode"); + self.window.set_fullscreen(Some(Fullscreen::Borderless(None))); + Self::disable_macos_vsync(&self.window); + return; + } + + // On other platforms, try exclusive fullscreen + #[cfg(not(target_os = "macos"))] + { + let current_monitor = self.window.current_monitor(); + + if let Some(monitor) = current_monitor { + let current_size = self.window.inner_size(); + let mut best_mode: Option = None; + let mut best_refresh_rate: u32 = 0; + + info!("Searching for video modes on monitor: {:?}", monitor.name()); + info!("Current window size: {}x{}", current_size.width, current_size.height); + + let mut mode_count = 0; + let mut high_refresh_modes = Vec::new(); + for mode in monitor.video_modes() { + let mode_size = mode.size(); + let refresh_rate = mode.refresh_rate_millihertz() / 1000; - // Match resolution (or close to it) and pick highest refresh rate - if mode_size.width >= current_size.width && mode_size.height >= current_size.height { - if refresh_rate > best_refresh_rate { - best_refresh_rate = refresh_rate; - best_mode = Some(mode); + if refresh_rate >= 100 { + high_refresh_modes.push(format!("{}x{}@{}Hz", mode_size.width, mode_size.height, refresh_rate)); } - } - } - info!("Total video modes available: {}", mode_count); - - // If we found a high refresh rate mode, use exclusive fullscreen - if let Some(mode) = best_mode { - let refresh_hz = mode.refresh_rate_millihertz() / 1000; - info!( - "SELECTED exclusive fullscreen: {}x{} @ {}Hz ({}mHz)", - mode.size().width, - mode.size().height, - refresh_hz, - mode.refresh_rate_millihertz() - ); + mode_count += 1; - // Use exclusive fullscreen for lowest latency (bypasses DWM compositor) - self.window.set_fullscreen(Some(Fullscreen::Exclusive(mode))); - return; + if mode_size.width >= current_size.width && mode_size.height >= current_size.height { + if refresh_rate > best_refresh_rate { + best_refresh_rate = refresh_rate; + best_mode = Some(mode); + } + } + } + info!("Total video modes: {} (high refresh >=100Hz: {:?})", mode_count, high_refresh_modes); + + if let Some(mode) = best_mode { + let refresh_hz = mode.refresh_rate_millihertz() / 1000; + info!( + "SELECTED exclusive fullscreen: {}x{} @ {}Hz", + mode.size().width, + mode.size().height, + refresh_hz + ); + self.window.set_fullscreen(Some(Fullscreen::Exclusive(mode))); + return; + } else { + info!("No suitable exclusive fullscreen mode found"); + } } else { - info!("No suitable exclusive fullscreen mode found"); + info!("No current monitor detected"); } - } else { - info!("No current monitor detected"); - } - // Fallback to borderless if no suitable mode found - info!("Entering borderless fullscreen (DWM compositor active - may limit to 60fps)"); - self.window.set_fullscreen(Some(Fullscreen::Borderless(None))); + info!("Entering borderless fullscreen"); + self.window.set_fullscreen(Some(Fullscreen::Borderless(None))); + } } else { info!("Exiting fullscreen"); self.window.set_fullscreen(None); @@ -573,6 +761,10 @@ impl Renderer { ); self.fullscreen = true; self.window.set_fullscreen(Some(Fullscreen::Exclusive(mode))); + + #[cfg(target_os = "macos")] + Self::disable_macos_vsync(&self.window); + return; } } @@ -580,6 +772,200 @@ impl Renderer { // Fallback self.fullscreen = true; self.window.set_fullscreen(Some(Fullscreen::Borderless(None))); + + #[cfg(target_os = "macos")] + Self::disable_macos_vsync(&self.window); + } + + /// Disable VSync on macOS Metal layer for unlimited FPS + /// This prevents the compositor from limiting frame rate + #[cfg(target_os = "macos")] + fn disable_macos_vsync(window: &Window) { + use cocoa::base::id; + use objc::{msg_send, sel, sel_impl}; + + // Get NSView from raw window handle + let ns_view = match window.window_handle() { + Ok(handle) => { + match handle.as_raw() { + RawWindowHandle::AppKit(appkit) => appkit.ns_view.as_ptr() as id, + _ => { + warn!("macOS: Unexpected window handle type"); + return; + } + } + } + Err(e) => { + warn!("macOS: Could not get window handle: {:?}", e); + return; + } + }; + + unsafe { + // Get the layer from NSView + let layer: id = msg_send![ns_view, layer]; + if layer.is_null() { + warn!("macOS: Could not get layer for VSync disable"); + return; + } + + // Check if it's a CAMetalLayer by checking class name + let class: id = msg_send![layer, class]; + let class_name: id = msg_send![class, description]; + let name_cstr: *const i8 = msg_send![class_name, UTF8String]; + + if !name_cstr.is_null() { + let name = std::ffi::CStr::from_ptr(name_cstr).to_string_lossy(); + if name.contains("CAMetalLayer") { + // Set preferredFrameRateRange for ProMotion displays FIRST + // This tells macOS we want 120fps, preventing dynamic drop to 60Hz + #[repr(C)] + struct CAFrameRateRange { + minimum: f32, + maximum: f32, + preferred: f32, + } + + let frame_rate_range = CAFrameRateRange { + minimum: 120.0, // Minimum 120fps - don't allow lower + maximum: 120.0, + preferred: 120.0, + }; + + // Check if the layer responds to setPreferredFrameRateRange: (macOS 12+) + let responds: bool = msg_send![layer, respondsToSelector: sel!(setPreferredFrameRateRange:)]; + if responds { + let _: () = msg_send![layer, setPreferredFrameRateRange: frame_rate_range]; + info!("macOS: Set preferredFrameRateRange to 120fps fixed (ProMotion)"); + } + + // Keep displaySync ENABLED for ProMotion - it needs VSync to pace at 120Hz + // Disabling it causes ProMotion to fall back to 60Hz + let _: () = msg_send![layer, setDisplaySyncEnabled: true]; + info!("macOS: Configured CAMetalLayer for 120Hz ProMotion"); + } + } + } + } + + /// Set macOS display to 120Hz using Core Graphics + /// This bypasses winit's video mode selection which doesn't work well on macOS + #[cfg(target_os = "macos")] + fn set_macos_display_mode_120hz() { + use std::ffi::c_void; + + // Core Graphics FFI + #[link(name = "CoreGraphics", kind = "framework")] + extern "C" { + fn CGMainDisplayID() -> u32; + fn CGDisplayCopyAllDisplayModes(display: u32, options: *const c_void) -> *const c_void; + fn CFArrayGetCount(array: *const c_void) -> isize; + fn CFArrayGetValueAtIndex(array: *const c_void, idx: isize) -> *const c_void; + fn CGDisplayModeGetWidth(mode: *const c_void) -> usize; + fn CGDisplayModeGetHeight(mode: *const c_void) -> usize; + fn CGDisplayModeGetRefreshRate(mode: *const c_void) -> f64; + fn CGDisplaySetDisplayMode(display: u32, mode: *const c_void, options: *const c_void) -> i32; + fn CGDisplayPixelsWide(display: u32) -> usize; + fn CGDisplayPixelsHigh(display: u32) -> usize; + fn CFRelease(cf: *const c_void); + } + + unsafe { + let display_id = CGMainDisplayID(); + let current_width = CGDisplayPixelsWide(display_id); + let current_height = CGDisplayPixelsHigh(display_id); + + info!("macOS: Searching for 120Hz mode on display {} (current: {}x{})", + display_id, current_width, current_height); + + let modes = CGDisplayCopyAllDisplayModes(display_id, std::ptr::null()); + if modes.is_null() { + warn!("macOS: Could not enumerate display modes"); + return; + } + + let count = CFArrayGetCount(modes); + let mut best_mode: *const c_void = std::ptr::null(); + let mut best_refresh: f64 = 0.0; + + for i in 0..count { + let mode = CFArrayGetValueAtIndex(modes, i); + let width = CGDisplayModeGetWidth(mode); + let height = CGDisplayModeGetHeight(mode); + let refresh = CGDisplayModeGetRefreshRate(mode); + + // Look for modes matching current resolution with high refresh rate + if width == current_width && height == current_height { + if refresh > best_refresh { + best_refresh = refresh; + best_mode = mode; + } + if refresh >= 100.0 { + info!(" Found mode: {}x{} @ {:.1}Hz", width, height, refresh); + } + } + } + + if !best_mode.is_null() && best_refresh >= 119.0 { + let width = CGDisplayModeGetWidth(best_mode); + let height = CGDisplayModeGetHeight(best_mode); + info!("macOS: Setting display mode to {}x{} @ {:.1}Hz", width, height, best_refresh); + + let result = CGDisplaySetDisplayMode(display_id, best_mode, std::ptr::null()); + if result == 0 { + info!("macOS: Successfully set 120Hz display mode!"); + } else { + warn!("macOS: Failed to set display mode, error: {}", result); + } + } else if best_refresh > 0.0 { + info!("macOS: No 120Hz mode found, best is {:.1}Hz - display may not support it", best_refresh); + } else { + warn!("macOS: No matching display modes found"); + } + + CFRelease(modes); + } + } + + /// Enable high-performance mode on macOS + /// This disables App Nap and other power throttling that can limit FPS + #[cfg(target_os = "macos")] + fn enable_macos_high_performance() { + use cocoa::base::{id, nil}; + use objc::{msg_send, sel, sel_impl, class}; + + unsafe { + // Get NSProcessInfo + let process_info: id = msg_send![class!(NSProcessInfo), processInfo]; + if process_info == nil { + warn!("macOS: Could not get NSProcessInfo"); + return; + } + + // Activity options for high performance: + // NSActivityUserInitiated = 0x00FFFFFF (prevents App Nap, system sleep) + // NSActivityLatencyCritical = 0xFF00000000 (requests low latency scheduling) + let options: u64 = 0x00FFFFFF | 0xFF00000000; + + // Create reason string + let reason: id = msg_send![class!(NSString), stringWithUTF8String: b"Streaming requires consistent frame timing\0".as_ptr()]; + + // Begin activity - this returns an object we should retain + let activity: id = msg_send![process_info, beginActivityWithOptions:options reason:reason]; + if activity != nil { + // Retain the activity object to keep it alive for the app lifetime + let _: id = msg_send![activity, retain]; + info!("macOS: High-performance mode enabled (App Nap disabled, latency-critical scheduling)"); + } else { + warn!("macOS: Failed to enable high-performance mode"); + } + + // Also try to disable automatic termination + let _: () = msg_send![process_info, disableAutomaticTermination: reason]; + + // Disable sudden termination + let _: () = msg_send![process_info, disableSuddenTermination]; + } } /// Lock cursor for streaming (captures mouse) @@ -608,14 +994,21 @@ impl Renderer { } /// Update video textures from frame (GPU YUV->RGB conversion) - /// Uploads Y, U, V planes directly - NO CPU color conversion! + /// Supports both YUV420P (3 planes) and NV12 (2 planes) formats + /// NV12 is faster on macOS as it skips CPU-based scaler pub fn update_video(&mut self, frame: &VideoFrame) { let uv_width = frame.width / 2; let uv_height = frame.height / 2; - // Check if we need to recreate textures - if self.video_size != (frame.width, frame.height) { - // Y texture (full resolution, single channel) + // Check if we need to recreate textures (size or format change) + let format_changed = self.current_format != frame.format; + let size_changed = self.video_size != (frame.width, frame.height); + + if size_changed || format_changed { + self.current_format = frame.format; + self.video_size = (frame.width, frame.height); + + // Y texture is same for both formats (full resolution, R8) let y_texture = self.device.create_texture(&wgpu::TextureDescriptor { label: Some("Y Texture"), size: wgpu::Extent3d { @@ -631,77 +1024,131 @@ impl Renderer { view_formats: &[], }); - // U texture (half resolution, single channel) - let u_texture = self.device.create_texture(&wgpu::TextureDescriptor { - label: Some("U Texture"), - size: wgpu::Extent3d { - width: uv_width, - height: uv_height, - depth_or_array_layers: 1, - }, - mip_level_count: 1, - sample_count: 1, - dimension: wgpu::TextureDimension::D2, - format: wgpu::TextureFormat::R8Unorm, - usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, - view_formats: &[], - }); + match frame.format { + PixelFormat::NV12 => { + // NV12: UV plane is interleaved (Rg8, 2 bytes per pixel) + let uv_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("UV Texture (NV12)"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::Rg8Unorm, // 2-channel for interleaved UV + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); - // V texture (half resolution, single channel) - let v_texture = self.device.create_texture(&wgpu::TextureDescriptor { - label: Some("V Texture"), - size: wgpu::Extent3d { - width: uv_width, - height: uv_height, - depth_or_array_layers: 1, - }, - mip_level_count: 1, - sample_count: 1, - dimension: wgpu::TextureDimension::D2, - format: wgpu::TextureFormat::R8Unorm, - usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, - view_formats: &[], - }); + let y_view = y_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let uv_view = uv_texture.create_view(&wgpu::TextureViewDescriptor::default()); + + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("NV12 Bind Group"), + layout: &self.nv12_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&y_view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::TextureView(&uv_view), + }, + wgpu::BindGroupEntry { + binding: 2, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); - // Create bind group with all 3 textures - let y_view = y_texture.create_view(&wgpu::TextureViewDescriptor::default()); - let u_view = u_texture.create_view(&wgpu::TextureViewDescriptor::default()); - let v_view = v_texture.create_view(&wgpu::TextureViewDescriptor::default()); - - let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { - label: Some("Video YUV Bind Group"), - layout: &self.video_bind_group_layout, - entries: &[ - wgpu::BindGroupEntry { - binding: 0, - resource: wgpu::BindingResource::TextureView(&y_view), - }, - wgpu::BindGroupEntry { - binding: 1, - resource: wgpu::BindingResource::TextureView(&u_view), - }, - wgpu::BindGroupEntry { - binding: 2, - resource: wgpu::BindingResource::TextureView(&v_view), - }, - wgpu::BindGroupEntry { - binding: 3, - resource: wgpu::BindingResource::Sampler(&self.video_sampler), - }, - ], - }); + self.y_texture = Some(y_texture); + self.uv_texture = Some(uv_texture); + self.nv12_bind_group = Some(bind_group); + // Clear YUV420P textures + self.u_texture = None; + self.v_texture = None; + self.video_bind_group = None; - self.y_texture = Some(y_texture); - self.u_texture = Some(u_texture); - self.v_texture = Some(v_texture); - self.video_bind_group = Some(bind_group); - self.video_size = (frame.width, frame.height); + info!("NV12 textures created: {}x{} (UV: {}x{}) - GPU deinterleaving enabled (CPU scaler bypassed!)", + frame.width, frame.height, uv_width, uv_height); + } + PixelFormat::YUV420P => { + // YUV420P: Separate U and V planes (R8 each) + let u_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("U Texture"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + let v_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("V Texture"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + let y_view = y_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let u_view = u_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let v_view = v_texture.create_view(&wgpu::TextureViewDescriptor::default()); + + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("Video YUV Bind Group"), + layout: &self.video_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&y_view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::TextureView(&u_view), + }, + wgpu::BindGroupEntry { + binding: 2, + resource: wgpu::BindingResource::TextureView(&v_view), + }, + wgpu::BindGroupEntry { + binding: 3, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); + + self.y_texture = Some(y_texture); + self.u_texture = Some(u_texture); + self.v_texture = Some(v_texture); + self.video_bind_group = Some(bind_group); + // Clear NV12 textures + self.uv_texture = None; + self.nv12_bind_group = None; - info!("Video YUV textures created: {}x{} (UV: {}x{}) - GPU color conversion enabled", - frame.width, frame.height, uv_width, uv_height); + info!("YUV420P textures created: {}x{} (UV: {}x{}) - GPU color conversion enabled", + frame.width, frame.height, uv_width, uv_height); + } + } } - // Upload Y plane directly (no conversion!) + // Upload Y plane (same for both formats) if let Some(ref texture) = self.y_texture { self.queue.write_texture( wgpu::TexelCopyTextureInfo { @@ -724,75 +1171,119 @@ impl Renderer { ); } - // Upload U plane directly - if let Some(ref texture) = self.u_texture { - self.queue.write_texture( - wgpu::TexelCopyTextureInfo { - texture, - mip_level: 0, - origin: wgpu::Origin3d::ZERO, - aspect: wgpu::TextureAspect::All, - }, - &frame.u_plane, - wgpu::TexelCopyBufferLayout { - offset: 0, - bytes_per_row: Some(frame.u_stride), - rows_per_image: Some(uv_height), - }, - wgpu::Extent3d { - width: uv_width, - height: uv_height, - depth_or_array_layers: 1, - }, - ); - } + match frame.format { + PixelFormat::NV12 => { + // Upload interleaved UV plane (Rg8) + if let Some(ref texture) = self.uv_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.u_plane, // NV12: u_plane contains interleaved UV data + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.u_stride), // stride for interleaved UV + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } + } + PixelFormat::YUV420P => { + // Upload separate U and V planes + if let Some(ref texture) = self.u_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.u_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.u_stride), + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } - // Upload V plane directly - if let Some(ref texture) = self.v_texture { - self.queue.write_texture( - wgpu::TexelCopyTextureInfo { - texture, - mip_level: 0, - origin: wgpu::Origin3d::ZERO, - aspect: wgpu::TextureAspect::All, - }, - &frame.v_plane, - wgpu::TexelCopyBufferLayout { - offset: 0, - bytes_per_row: Some(frame.v_stride), - rows_per_image: Some(uv_height), - }, - wgpu::Extent3d { - width: uv_width, - height: uv_height, - depth_or_array_layers: 1, - }, - ); + if let Some(ref texture) = self.v_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.v_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.v_stride), + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } + } } } /// Render video frame to screen + /// Automatically selects the correct pipeline based on current pixel format fn render_video(&self, encoder: &mut wgpu::CommandEncoder, view: &wgpu::TextureView) { - if let Some(ref bind_group) = self.video_bind_group { - let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { - label: Some("Video Pass"), - color_attachments: &[Some(wgpu::RenderPassColorAttachment { - view, - resolve_target: None, - ops: wgpu::Operations { - load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), - store: wgpu::StoreOp::Store, - }, - depth_slice: None, - })], - depth_stencil_attachment: None, - ..Default::default() - }); + // Determine which pipeline and bind group to use based on format + let (pipeline, bind_group) = match self.current_format { + PixelFormat::NV12 => { + if let Some(ref bg) = self.nv12_bind_group { + (&self.nv12_pipeline, bg) + } else { + return; // No bind group ready + } + } + PixelFormat::YUV420P => { + if let Some(ref bg) = self.video_bind_group { + (&self.video_pipeline, bg) + } else { + return; // No bind group ready + } + } + }; - render_pass.set_pipeline(&self.video_pipeline); - render_pass.set_bind_group(0, bind_group, &[]); - render_pass.draw(0..6, 0..1); // Draw 6 vertices (2 triangles = 1 quad) - } + let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Video Pass"), + color_attachments: &[Some(wgpu::RenderPassColorAttachment { + view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), + store: wgpu::StoreOp::Store, + }, + depth_slice: None, + })], + depth_stencil_attachment: None, + ..Default::default() + }); + + render_pass.set_pipeline(pipeline); + render_pass.set_bind_group(0, bind_group, &[]); + render_pass.draw(0..6, 0..1); // Draw 6 vertices (2 triangles = 1 quad) } /// Render frame and return UI actions @@ -893,7 +1384,9 @@ impl Renderer { } // Render video or clear based on state - if app.state == AppState::Streaming && self.video_bind_group.is_some() { + // Check for either YUV420P (video_bind_group) or NV12 (nv12_bind_group) + let has_video = self.video_bind_group.is_some() || self.nv12_bind_group.is_some(); + if app.state == AppState::Streaming && has_video { // Render video full-screen self.render_video(&mut encoder, &view); } else { diff --git a/opennow-streamer/src/input/macos.rs b/opennow-streamer/src/input/macos.rs new file mode 100644 index 0000000..11003fd --- /dev/null +++ b/opennow-streamer/src/input/macos.rs @@ -0,0 +1,461 @@ +//! macOS Raw Input API +//! +//! Provides hardware-level mouse input using Core Graphics event taps. +//! Captures mouse deltas directly for responsive input without OS acceleration effects. +//! Events are coalesced (batched) every 4ms like the official GFN client. + +use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, AtomicPtr, Ordering}; +use std::ffi::c_void; +use log::{info, error, debug, warn}; +use tokio::sync::mpsc; +use parking_lot::Mutex; + +use crate::webrtc::InputEvent; +use super::{get_timestamp_us, session_elapsed_us, MOUSE_COALESCE_INTERVAL_US}; + +// Core Graphics bindings +#[link(name = "CoreGraphics", kind = "framework")] +extern "C" { + fn CGEventTapCreate( + tap: CGEventTapLocation, + place: CGEventTapPlacement, + options: CGEventTapOptions, + events_of_interest: CGEventMask, + callback: CGEventTapCallBack, + user_info: *mut c_void, + ) -> CFMachPortRef; + + fn CGEventTapEnable(tap: CFMachPortRef, enable: bool); + fn CGEventGetIntegerValueField(event: CGEventRef, field: CGEventField) -> i64; + fn CGEventGetType(event: CGEventRef) -> CGEventType; + fn CGEventSourceSetLocalEventsSuppressionInterval(source: CGEventSourceRef, seconds: f64); +} + +#[link(name = "CoreFoundation", kind = "framework")] +extern "C" { + fn CFMachPortCreateRunLoopSource( + allocator: CFAllocatorRef, + port: CFMachPortRef, + order: CFIndex, + ) -> CFRunLoopSourceRef; + + fn CFRunLoopGetCurrent() -> CFRunLoopRef; + fn CFRunLoopAddSource(rl: CFRunLoopRef, source: CFRunLoopSourceRef, mode: CFStringRef); + fn CFRunLoopRun(); + fn CFRunLoopStop(rl: CFRunLoopRef); + fn CFRelease(cf: *const c_void); + + static kCFRunLoopCommonModes: CFStringRef; + static kCFAllocatorDefault: CFAllocatorRef; +} + +// Core Graphics types +type CFMachPortRef = *mut c_void; +type CFRunLoopSourceRef = *mut c_void; +type CFRunLoopRef = *mut c_void; +type CFAllocatorRef = *const c_void; +type CFStringRef = *const c_void; +type CFIndex = isize; +type CGEventRef = *mut c_void; +type CGEventSourceRef = *mut c_void; +type CGEventMask = u64; + +type CGEventTapCallBack = extern "C" fn( + proxy: *mut c_void, + event_type: CGEventType, + event: CGEventRef, + user_info: *mut c_void, +) -> CGEventRef; + +#[repr(u32)] +#[derive(Clone, Copy)] +enum CGEventTapLocation { + HIDEventTap = 0, + SessionEventTap = 1, + AnnotatedSessionEventTap = 2, +} + +#[repr(u32)] +#[derive(Clone, Copy)] +enum CGEventTapPlacement { + HeadInsertEventTap = 0, + TailAppendEventTap = 1, +} + +#[repr(u32)] +#[derive(Clone, Copy)] +enum CGEventTapOptions { + Default = 0, + ListenOnly = 1, +} + +#[repr(u32)] +#[derive(Clone, Copy, PartialEq, Debug)] +enum CGEventType { + Null = 0, + LeftMouseDown = 1, + LeftMouseUp = 2, + RightMouseDown = 3, + RightMouseUp = 4, + MouseMoved = 5, + LeftMouseDragged = 6, + RightMouseDragged = 7, + KeyDown = 10, + KeyUp = 11, + FlagsChanged = 12, + ScrollWheel = 22, + TabletPointer = 23, + TabletProximity = 24, + OtherMouseDown = 25, + OtherMouseUp = 26, + OtherMouseDragged = 27, + TapDisabledByTimeout = 0xFFFFFFFE, + TapDisabledByUserInput = 0xFFFFFFFF, +} + +#[repr(u32)] +#[derive(Clone, Copy)] +enum CGEventField { + MouseEventDeltaX = 4, + MouseEventDeltaY = 5, + ScrollWheelEventDeltaAxis1 = 11, + KeyboardEventKeycode = 9, +} + +// Event masks +const CGMOUSEDOWN_MASK: u64 = (1 << CGEventType::LeftMouseDown as u64) + | (1 << CGEventType::RightMouseDown as u64) + | (1 << CGEventType::OtherMouseDown as u64); +const CGMOUSEUP_MASK: u64 = (1 << CGEventType::LeftMouseUp as u64) + | (1 << CGEventType::RightMouseUp as u64) + | (1 << CGEventType::OtherMouseUp as u64); +const CGMOUSEMOVED_MASK: u64 = (1 << CGEventType::MouseMoved as u64) + | (1 << CGEventType::LeftMouseDragged as u64) + | (1 << CGEventType::RightMouseDragged as u64) + | (1 << CGEventType::OtherMouseDragged as u64); +const CGSCROLL_MASK: u64 = 1 << CGEventType::ScrollWheel as u64; + +// Static state +static RAW_INPUT_REGISTERED: AtomicBool = AtomicBool::new(false); +static RAW_INPUT_ACTIVE: AtomicBool = AtomicBool::new(false); +static ACCUMULATED_DX: AtomicI32 = AtomicI32::new(0); +static ACCUMULATED_DY: AtomicI32 = AtomicI32::new(0); + +// Coalescing state +static COALESCE_DX: AtomicI32 = AtomicI32::new(0); +static COALESCE_DY: AtomicI32 = AtomicI32::new(0); +static COALESCE_LAST_SEND_US: AtomicU64 = AtomicU64::new(0); +static COALESCED_EVENT_COUNT: AtomicU64 = AtomicU64::new(0); + +// Local cursor tracking +static LOCAL_CURSOR_X: AtomicI32 = AtomicI32::new(960); +static LOCAL_CURSOR_Y: AtomicI32 = AtomicI32::new(540); +static LOCAL_CURSOR_WIDTH: AtomicI32 = AtomicI32::new(1920); +static LOCAL_CURSOR_HEIGHT: AtomicI32 = AtomicI32::new(1080); + +// Event sender +static EVENT_SENDER: Mutex>> = Mutex::new(None); + +// Run loop reference for stopping (use AtomicPtr for thread-safety with raw pointers) +static RUN_LOOP: AtomicPtr = AtomicPtr::new(std::ptr::null_mut()); +static EVENT_TAP: AtomicPtr = AtomicPtr::new(std::ptr::null_mut()); + +/// Flush coalesced mouse events +#[inline] +fn flush_coalesced_events() { + let dx = COALESCE_DX.swap(0, Ordering::AcqRel); + let dy = COALESCE_DY.swap(0, Ordering::AcqRel); + + if dx != 0 || dy != 0 { + let timestamp_us = get_timestamp_us(); + let now_us = session_elapsed_us(); + COALESCE_LAST_SEND_US.store(now_us, Ordering::Release); + + let guard = EVENT_SENDER.lock(); + if let Some(ref sender) = *guard { + let _ = sender.try_send(InputEvent::MouseMove { + dx: dx as i16, + dy: dy as i16, + timestamp_us, + }); + } + } +} + +/// Core Graphics event tap callback +extern "C" fn event_tap_callback( + _proxy: *mut c_void, + event_type: CGEventType, + event: CGEventRef, + _user_info: *mut c_void, +) -> CGEventRef { + // Handle tap being disabled + if event_type == CGEventType::TapDisabledByTimeout + || event_type == CGEventType::TapDisabledByUserInput { + // Re-enable the tap + let tap = EVENT_TAP.load(Ordering::Acquire); + if !tap.is_null() { + unsafe { + CGEventTapEnable(tap, true); + } + } + warn!("Event tap was disabled, re-enabling"); + return event; + } + + if !RAW_INPUT_ACTIVE.load(Ordering::SeqCst) { + return event; + } + + unsafe { + let actual_type = CGEventGetType(event); + + match actual_type { + CGEventType::MouseMoved + | CGEventType::LeftMouseDragged + | CGEventType::RightMouseDragged + | CGEventType::OtherMouseDragged => { + // Get raw mouse delta (unaccelerated on modern macOS) + let dx = CGEventGetIntegerValueField(event, CGEventField::MouseEventDeltaX) as i32; + let dy = CGEventGetIntegerValueField(event, CGEventField::MouseEventDeltaY) as i32; + + if dx != 0 || dy != 0 { + // 1. Update local cursor immediately for visual feedback + let width = LOCAL_CURSOR_WIDTH.load(Ordering::Acquire); + let height = LOCAL_CURSOR_HEIGHT.load(Ordering::Acquire); + let old_x = LOCAL_CURSOR_X.load(Ordering::Acquire); + let old_y = LOCAL_CURSOR_Y.load(Ordering::Acquire); + LOCAL_CURSOR_X.store((old_x + dx).clamp(0, width), Ordering::Release); + LOCAL_CURSOR_Y.store((old_y + dy).clamp(0, height), Ordering::Release); + + // 2. Accumulate for coalescing + COALESCE_DX.fetch_add(dx, Ordering::Relaxed); + COALESCE_DY.fetch_add(dy, Ordering::Relaxed); + COALESCED_EVENT_COUNT.fetch_add(1, Ordering::Relaxed); + + // Also accumulate for legacy API + ACCUMULATED_DX.fetch_add(dx, Ordering::Relaxed); + ACCUMULATED_DY.fetch_add(dy, Ordering::Relaxed); + + // 3. Check if enough time to send batch + let now_us = session_elapsed_us(); + let last_us = COALESCE_LAST_SEND_US.load(Ordering::Acquire); + + if now_us.saturating_sub(last_us) >= MOUSE_COALESCE_INTERVAL_US { + flush_coalesced_events(); + } + } + } + CGEventType::ScrollWheel => { + let delta = CGEventGetIntegerValueField(event, CGEventField::ScrollWheelEventDeltaAxis1) as i16; + if delta != 0 { + let timestamp_us = get_timestamp_us(); + let guard = EVENT_SENDER.lock(); + if let Some(ref sender) = *guard { + // macOS scroll is inverted compared to Windows, and uses different scale + // Multiply by 120 to match Windows WHEEL_DELTA + let _ = sender.try_send(InputEvent::MouseWheel { + delta: delta * 120, + timestamp_us, + }); + } + } + } + _ => {} + } + } + + event +} + +/// Start raw input capture +pub fn start_raw_input() -> Result<(), String> { + if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + info!("Raw input resumed"); + return Ok(()); + } + + // Spawn thread for event tap run loop + std::thread::spawn(|| { + unsafe { + // Create event tap for mouse events + let event_mask: CGEventMask = CGMOUSEMOVED_MASK | CGSCROLL_MASK; + + let tap = CGEventTapCreate( + CGEventTapLocation::HIDEventTap, // Capture at HID level for raw input + CGEventTapPlacement::HeadInsertEventTap, + CGEventTapOptions::ListenOnly, // Don't modify events + event_mask, + event_tap_callback, + std::ptr::null_mut(), + ); + + if tap.is_null() { + error!("Failed to create event tap. Make sure Accessibility permissions are granted in System Preferences > Security & Privacy > Privacy > Accessibility"); + return; + } + + EVENT_TAP.store(tap, Ordering::Release); + + // Create run loop source + let source = CFMachPortCreateRunLoopSource( + kCFAllocatorDefault, + tap, + 0, + ); + + if source.is_null() { + error!("Failed to create run loop source"); + CFRelease(tap); + EVENT_TAP.store(std::ptr::null_mut(), Ordering::Release); + return; + } + + // Get current run loop and add source + let run_loop = CFRunLoopGetCurrent(); + RUN_LOOP.store(run_loop, Ordering::Release); + + CFRunLoopAddSource(run_loop, source, kCFRunLoopCommonModes); + + // Enable the tap + CGEventTapEnable(tap, true); + + RAW_INPUT_REGISTERED.store(true, Ordering::SeqCst); + RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + info!("Raw input started - capturing mouse events via CGEventTap"); + + // Run the loop (blocks until stopped) + CFRunLoopRun(); + + // Cleanup + CGEventTapEnable(tap, false); + CFRelease(source); + CFRelease(tap); + + RAW_INPUT_REGISTERED.store(false, Ordering::SeqCst); + RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + EVENT_TAP.store(std::ptr::null_mut(), Ordering::Release); + RUN_LOOP.store(std::ptr::null_mut(), Ordering::Release); + info!("Raw input thread stopped"); + } + }); + + // Wait for initialization + std::thread::sleep(std::time::Duration::from_millis(100)); + + if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + Ok(()) + } else { + Err("Failed to start raw input. Check Accessibility permissions.".to_string()) + } +} + +/// Pause raw input capture +pub fn pause_raw_input() { + RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + ACCUMULATED_DX.store(0, Ordering::SeqCst); + ACCUMULATED_DY.store(0, Ordering::SeqCst); + debug!("Raw input paused"); +} + +/// Resume raw input capture +pub fn resume_raw_input() { + if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + ACCUMULATED_DX.store(0, Ordering::SeqCst); + ACCUMULATED_DY.store(0, Ordering::SeqCst); + RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + debug!("Raw input resumed"); + } +} + +/// Stop raw input completely +pub fn stop_raw_input() { + RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + + // Stop the run loop + let run_loop = RUN_LOOP.swap(std::ptr::null_mut(), Ordering::AcqRel); + if !run_loop.is_null() { + unsafe { + CFRunLoopStop(run_loop); + } + } + + info!("Raw input stopped"); +} + +/// Get accumulated mouse deltas and reset +pub fn get_raw_mouse_delta() -> (i32, i32) { + let dx = ACCUMULATED_DX.swap(0, Ordering::SeqCst); + let dy = ACCUMULATED_DY.swap(0, Ordering::SeqCst); + (dx, dy) +} + +/// Check if raw input is active +pub fn is_raw_input_active() -> bool { + RAW_INPUT_ACTIVE.load(Ordering::SeqCst) +} + +/// Update center position (no-op on macOS, kept for API compatibility) +pub fn update_raw_input_center() { + // macOS doesn't need cursor recentering with CGEventTap +} + +/// Set the event sender for direct mouse event delivery +pub fn set_raw_input_sender(sender: mpsc::Sender) { + let mut guard = EVENT_SENDER.lock(); + *guard = Some(sender); + info!("Raw input direct sender configured"); +} + +/// Clear the event sender +pub fn clear_raw_input_sender() { + let mut guard = EVENT_SENDER.lock(); + *guard = None; +} + +/// Set local cursor dimensions +pub fn set_local_cursor_dimensions(width: u32, height: u32) { + LOCAL_CURSOR_WIDTH.store(width as i32, Ordering::Release); + LOCAL_CURSOR_HEIGHT.store(height as i32, Ordering::Release); + LOCAL_CURSOR_X.store(width as i32 / 2, Ordering::Release); + LOCAL_CURSOR_Y.store(height as i32 / 2, Ordering::Release); + info!("Local cursor dimensions set to {}x{}", width, height); +} + +/// Get local cursor position +pub fn get_local_cursor_position() -> (i32, i32) { + ( + LOCAL_CURSOR_X.load(Ordering::Acquire), + LOCAL_CURSOR_Y.load(Ordering::Acquire), + ) +} + +/// Get local cursor position normalized (0.0-1.0) +pub fn get_local_cursor_normalized() -> (f32, f32) { + let x = LOCAL_CURSOR_X.load(Ordering::Acquire) as f32; + let y = LOCAL_CURSOR_Y.load(Ordering::Acquire) as f32; + let w = LOCAL_CURSOR_WIDTH.load(Ordering::Acquire) as f32; + let h = LOCAL_CURSOR_HEIGHT.load(Ordering::Acquire) as f32; + (x / w.max(1.0), y / h.max(1.0)) +} + +/// Flush pending coalesced mouse events +pub fn flush_pending_mouse_events() { + flush_coalesced_events(); +} + +/// Get count of coalesced events +pub fn get_coalesced_event_count() -> u64 { + COALESCED_EVENT_COUNT.load(Ordering::Relaxed) +} + +/// Reset coalescing state +pub fn reset_coalescing() { + COALESCE_DX.store(0, Ordering::Release); + COALESCE_DY.store(0, Ordering::Release); + COALESCE_LAST_SEND_US.store(0, Ordering::Release); + COALESCED_EVENT_COUNT.store(0, Ordering::Release); + LOCAL_CURSOR_X.store(960, Ordering::Release); + LOCAL_CURSOR_Y.store(540, Ordering::Release); +} diff --git a/opennow-streamer/src/input/mod.rs b/opennow-streamer/src/input/mod.rs index 6209d05..477d25e 100644 --- a/opennow-streamer/src/input/mod.rs +++ b/opennow-streamer/src/input/mod.rs @@ -11,8 +11,8 @@ mod windows; #[cfg(target_os = "macos")] mod macos; -#[cfg(target_os = "linux")] -mod linux; +// TODO: Implement linux.rs when Linux platform support is added +// For now, stubs are provided below for Linux mod protocol; @@ -30,7 +30,26 @@ pub use windows::{ update_raw_input_center, set_raw_input_sender, clear_raw_input_sender, - // New coalescing and local cursor functions + set_local_cursor_dimensions, + get_local_cursor_position, + get_local_cursor_normalized, + flush_pending_mouse_events, + get_coalesced_event_count, + reset_coalescing, +}; + +// Re-export raw input functions for macOS +#[cfg(target_os = "macos")] +pub use macos::{ + start_raw_input, + stop_raw_input, + pause_raw_input, + resume_raw_input, + get_raw_mouse_delta, + is_raw_input_active, + update_raw_input_center, + set_raw_input_sender, + clear_raw_input_sender, set_local_cursor_dimensions, get_local_cursor_position, get_local_cursor_normalized, @@ -108,39 +127,38 @@ pub fn session_elapsed_us() -> u64 { } } -// Stubs for non-Windows platforms -#[cfg(not(target_os = "windows"))] +// Stubs for Linux (Windows and macOS have native implementations) +#[cfg(target_os = "linux")] pub fn start_raw_input() -> Result<(), String> { - Err("Raw input only supported on Windows".to_string()) + Err("Raw input not yet implemented for Linux".to_string()) } -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn stop_raw_input() {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn pause_raw_input() {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn resume_raw_input() {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn get_raw_mouse_delta() -> (i32, i32) { (0, 0) } -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn is_raw_input_active() -> bool { false } -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn update_raw_input_center() {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn set_raw_input_sender(_sender: tokio::sync::mpsc::Sender) {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn clear_raw_input_sender() {} -// New stubs for non-Windows -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn set_local_cursor_dimensions(_width: u32, _height: u32) {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn get_local_cursor_position() -> (i32, i32) { (0, 0) } -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn get_local_cursor_normalized() -> (f32, f32) { (0.5, 0.5) } -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn flush_pending_mouse_events() {} -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn get_coalesced_event_count() -> u64 { 0 } -#[cfg(not(target_os = "windows"))] +#[cfg(target_os = "linux")] pub fn reset_coalescing() {} use std::collections::HashSet; diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index 75e8eac..6d88e5e 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -37,6 +37,8 @@ struct OpenNowApp { modifiers: Modifiers, /// Track if we were streaming (for cursor lock state changes) was_streaming: bool, + /// Last frame time for frame rate limiting + last_frame_time: std::time::Instant, } /// Convert winit KeyCode to Windows Virtual Key code @@ -127,6 +129,7 @@ impl OpenNowApp { renderer: None, modifiers: Modifiers::default(), was_streaming: false, + last_frame_time: std::time::Instant::now(), } } @@ -287,6 +290,26 @@ impl ApplicationHandler for OpenNowApp { } } WindowEvent::RedrawRequested => { + // Frame rate limiting - sync to stream target FPS when streaming + let mut app_guard = self.app.lock(); + let target_fps = if app_guard.state == AppState::Streaming { + app_guard.stats.target_fps.max(60) // Use stream's target FPS (min 60) + } else { + 60 // UI mode: 60fps is enough + }; + drop(app_guard); + + let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps as f64); + let elapsed = self.last_frame_time.elapsed(); + if elapsed < frame_duration { + // Sleep for remaining time (avoid busy loop) + let sleep_time = frame_duration - elapsed; + if sleep_time.as_micros() > 500 { + std::thread::sleep(sleep_time - std::time::Duration::from_micros(500)); + } + } + self.last_frame_time = std::time::Instant::now(); + let mut app_guard = self.app.lock(); app_guard.update(); @@ -297,8 +320,8 @@ impl ApplicationHandler for OpenNowApp { renderer.lock_cursor(); self.was_streaming = true; - // Start Windows Raw Input for unaccelerated mouse movement - #[cfg(target_os = "windows")] + // Start Raw Input for unaccelerated mouse movement (Windows/macOS) + #[cfg(any(target_os = "windows", target_os = "macos"))] { match input::start_raw_input() { Ok(()) => info!("Raw input enabled - mouse acceleration disabled"), @@ -311,7 +334,7 @@ impl ApplicationHandler for OpenNowApp { self.was_streaming = false; // Stop raw input - #[cfg(target_os = "windows")] + #[cfg(any(target_os = "windows", target_os = "macos"))] { input::stop_raw_input(); } @@ -354,7 +377,7 @@ impl ApplicationHandler for OpenNowApp { fn device_event(&mut self, _event_loop: &ActiveEventLoop, _device_id: DeviceId, event: DeviceEvent) { // Only use winit's MouseMotion as fallback when raw input is not active - #[cfg(target_os = "windows")] + #[cfg(any(target_os = "windows", target_os = "macos"))] if input::is_raw_input_active() { return; // Raw input handles mouse movement } diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index 8a473f7..c37b60b 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -1,38 +1,222 @@ //! Audio Decoder and Player //! -//! Decode Opus audio and play through cpal. -//! NOTE: Opus decoding is stubbed - will add proper decoder later. +//! Decode Opus audio using FFmpeg and play through cpal. -use anyhow::{Result, Context}; -use log::{info, warn, error}; +use anyhow::{Result, Context, anyhow}; +use log::{info, warn, error, debug}; use std::sync::Arc; +use std::sync::mpsc; +use std::thread; use parking_lot::Mutex; -/// Audio decoder (stubbed - no opus decoding yet) +extern crate ffmpeg_next as ffmpeg; + +use ffmpeg::codec::{decoder, context::Context as CodecContext}; +use ffmpeg::Packet; + +/// Audio decoder using FFmpeg for Opus pub struct AudioDecoder { + cmd_tx: mpsc::Sender, + frame_rx: mpsc::Receiver>, sample_rate: u32, channels: u32, } +enum AudioCommand { + Decode(Vec), + Stop, +} + impl AudioDecoder { - /// Create a new audio decoder (stubbed) + /// Create a new Opus audio decoder using FFmpeg pub fn new(sample_rate: u32, channels: u32) -> Result { - info!("Creating audio decoder (stubbed): {}Hz, {} channels", sample_rate, channels); - warn!("Opus decoding not yet implemented - audio will be silent"); + info!("Creating Opus audio decoder: {}Hz, {} channels", sample_rate, channels); + + // Initialize FFmpeg (may already be initialized by video decoder) + let _ = ffmpeg::init(); + + // Create channels for thread communication + let (cmd_tx, cmd_rx) = mpsc::channel::(); + let (frame_tx, frame_rx) = mpsc::channel::>(); + + // Spawn decoder thread (FFmpeg types are not Send) + let sample_rate_clone = sample_rate; + let channels_clone = channels; + + thread::spawn(move || { + // Find Opus decoder + let codec = match ffmpeg::codec::decoder::find(ffmpeg::codec::Id::OPUS) { + Some(c) => c, + None => { + error!("Opus decoder not found in FFmpeg"); + return; + } + }; + + let mut ctx = CodecContext::new_with_codec(codec); + + // Set parameters for Opus + // Note: FFmpeg Opus decoder auto-detects most parameters from the bitstream + + let mut decoder = match ctx.decoder().audio() { + Ok(d) => d, + Err(e) => { + error!("Failed to create Opus decoder: {:?}", e); + return; + } + }; + + info!("Opus audio decoder initialized"); + + while let Ok(cmd) = cmd_rx.recv() { + match cmd { + AudioCommand::Decode(data) => { + let samples = Self::decode_opus_packet(&mut decoder, &data, sample_rate_clone, channels_clone); + let _ = frame_tx.send(samples); + } + AudioCommand::Stop => break, + } + } + + debug!("Audio decoder thread stopped"); + }); Ok(Self { + cmd_tx, + frame_rx, sample_rate, channels, }) } - /// Decode an Opus packet (stubbed - returns silence) + /// Decode an Opus packet from RTP payload + fn decode_opus_packet( + decoder: &mut decoder::Audio, + data: &[u8], + target_sample_rate: u32, + target_channels: u32, + ) -> Vec { + if data.is_empty() { + return Vec::new(); + } + + // Create packet from raw Opus data + let mut packet = Packet::new(data.len()); + if let Some(pkt_data) = packet.data_mut() { + pkt_data.copy_from_slice(data); + } else { + return Vec::new(); + } + + // Send packet to decoder + if let Err(e) = decoder.send_packet(&packet) { + match e { + ffmpeg::Error::Other { errno } if errno == libc::EAGAIN => {} + _ => debug!("Audio send packet error: {:?}", e), + } + } + + // Receive decoded audio frame + let mut frame = ffmpeg::frame::Audio::empty(); + match decoder.receive_frame(&mut frame) { + Ok(_) => { + // Convert frame to i16 samples + let samples = Self::frame_to_samples(&frame, target_sample_rate, target_channels); + samples + } + Err(ffmpeg::Error::Other { errno }) if errno == libc::EAGAIN => { + Vec::new() + } + Err(e) => { + debug!("Audio receive frame error: {:?}", e); + Vec::new() + } + } + } + + /// Convert FFmpeg audio frame to i16 samples + fn frame_to_samples( + frame: &ffmpeg::frame::Audio, + _target_sample_rate: u32, + target_channels: u32, + ) -> Vec { + use ffmpeg::format::Sample; + + let nb_samples = frame.samples(); + let channels = frame.channels() as usize; + + if nb_samples == 0 || channels == 0 { + return Vec::new(); + } + + let format = frame.format(); + let mut output = Vec::with_capacity(nb_samples * target_channels as usize); + + // Handle different sample formats + match format { + Sample::I16(planar) => { + if planar == ffmpeg::format::sample::Type::Planar { + // Planar format - interleave channels + for i in 0..nb_samples { + for ch in 0..channels.min(target_channels as usize) { + let plane = frame.plane::(ch); + if i < plane.len() { + output.push(plane[i]); + } + } + // Fill remaining channels with zeros if needed + for _ in channels..target_channels as usize { + output.push(0); + } + } + } else { + // Packed format - already interleaved + let data = frame.plane::(0); + output.extend_from_slice(&data[..nb_samples * channels]); + } + } + Sample::F32(planar) => { + // Convert f32 to i16 + if planar == ffmpeg::format::sample::Type::Planar { + for i in 0..nb_samples { + for ch in 0..channels.min(target_channels as usize) { + let plane = frame.plane::(ch); + if i < plane.len() { + let sample = (plane[i] * 32767.0).clamp(-32768.0, 32767.0) as i16; + output.push(sample); + } + } + for _ in channels..target_channels as usize { + output.push(0); + } + } + } else { + let data = frame.plane::(0); + for sample in &data[..nb_samples * channels] { + let s = (*sample * 32767.0).clamp(-32768.0, 32767.0) as i16; + output.push(s); + } + } + } + _ => { + // For other formats, try to get as bytes and convert + debug!("Unsupported audio format: {:?}, returning silence", format); + output.resize(nb_samples * target_channels as usize, 0); + } + } + + output + } + + /// Decode an Opus packet (sends to decoder thread) pub fn decode(&mut self, data: &[u8]) -> Result> { - // Return silence for now - // Each Opus frame is typically 20ms at 48kHz = 960 samples - let samples_per_frame = (self.sample_rate / 50) as usize; // 20ms frame - let total_samples = samples_per_frame * self.channels as usize; - Ok(vec![0i16; total_samples]) + self.cmd_tx.send(AudioCommand::Decode(data.to_vec())) + .map_err(|_| anyhow!("Audio decoder thread closed"))?; + + match self.frame_rx.recv() { + Ok(samples) => Ok(samples), + Err(_) => Err(anyhow!("Audio decoder thread closed")), + } } /// Get sample rate @@ -46,6 +230,12 @@ impl AudioDecoder { } } +impl Drop for AudioDecoder { + fn drop(&mut self) { + let _ = self.cmd_tx.send(AudioCommand::Stop); + } +} + /// Audio player using cpal pub struct AudioPlayer { sample_rate: u32, @@ -59,6 +249,8 @@ struct AudioBuffer { read_pos: usize, write_pos: usize, capacity: usize, + total_written: u64, + total_read: u64, } impl AudioBuffer { @@ -68,13 +260,28 @@ impl AudioBuffer { read_pos: 0, write_pos: 0, capacity, + total_written: 0, + total_read: 0, + } + } + + fn available(&self) -> usize { + if self.write_pos >= self.read_pos { + self.write_pos - self.read_pos + } else { + self.capacity - self.read_pos + self.write_pos } } fn write(&mut self, data: &[i16]) { for &sample in data { - self.samples[self.write_pos] = sample; - self.write_pos = (self.write_pos + 1) % self.capacity; + let next_pos = (self.write_pos + 1) % self.capacity; + // Don't overwrite unread data (drop samples if buffer is full) + if next_pos != self.read_pos { + self.samples[self.write_pos] = sample; + self.write_pos = next_pos; + self.total_written += 1; + } } } @@ -87,6 +294,7 @@ impl AudioBuffer { *sample = self.samples[self.read_pos]; self.read_pos = (self.read_pos + 1) % self.capacity; count += 1; + self.total_read += 1; } } count @@ -97,6 +305,7 @@ impl AudioPlayer { /// Create a new audio player pub fn new(sample_rate: u32, channels: u32) -> Result { use cpal::traits::{DeviceTrait, HostTrait, StreamTrait}; + use cpal::SampleFormat; info!("Creating audio player: {}Hz, {} channels", sample_rate, channels); @@ -107,37 +316,151 @@ impl AudioPlayer { info!("Using audio device: {}", device.name().unwrap_or_default()); + // Query supported configurations + let supported_configs: Vec<_> = device.supported_output_configs() + .map(|configs| configs.collect()) + .unwrap_or_default(); + + if supported_configs.is_empty() { + return Err(anyhow!("No supported audio configurations found")); + } + + // Log available configurations for debugging + for cfg in &supported_configs { + debug!("Supported config: {:?} channels, {:?}-{:?} Hz, format {:?}", + cfg.channels(), cfg.min_sample_rate().0, cfg.max_sample_rate().0, cfg.sample_format()); + } + + // Find best matching configuration + // Prefer: f32 format (most compatible), matching channels, matching sample rate + let target_rate = cpal::SampleRate(sample_rate); + let target_channels = channels as u16; + + // Try to find a config that supports our sample rate and channel count + let mut best_config = None; + let mut best_score = 0i32; + + for cfg in &supported_configs { + let mut score = 0i32; + + // Prefer f32 format (most widely supported) + if cfg.sample_format() == SampleFormat::F32 { + score += 100; + } else if cfg.sample_format() == SampleFormat::I16 { + score += 50; + } + + // Prefer matching channel count + if cfg.channels() == target_channels { + score += 50; + } else if cfg.channels() >= target_channels { + score += 25; + } + + // Check if sample rate is in range + if target_rate >= cfg.min_sample_rate() && target_rate <= cfg.max_sample_rate() { + score += 100; + } else if cfg.max_sample_rate().0 >= 44100 { + score += 25; // At least supports reasonable rates + } + + if score > best_score { + best_score = score; + best_config = Some(cfg.clone()); + } + } + + let supported_range = best_config + .ok_or_else(|| anyhow!("No suitable audio configuration found"))?; + + // Determine actual sample rate to use + let actual_rate = if target_rate >= supported_range.min_sample_rate() + && target_rate <= supported_range.max_sample_rate() { + target_rate + } else if cpal::SampleRate(48000) >= supported_range.min_sample_rate() + && cpal::SampleRate(48000) <= supported_range.max_sample_rate() { + cpal::SampleRate(48000) + } else if cpal::SampleRate(44100) >= supported_range.min_sample_rate() + && cpal::SampleRate(44100) <= supported_range.max_sample_rate() { + cpal::SampleRate(44100) + } else { + supported_range.max_sample_rate() + }; + + let actual_channels = supported_range.channels(); + let sample_format = supported_range.sample_format(); + + info!("Using audio config: {}Hz, {} channels, format {:?}", + actual_rate.0, actual_channels, sample_format); + // Buffer for ~200ms of audio - let buffer_size = (sample_rate as usize) * (channels as usize) / 5; + let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) / 5; let buffer = Arc::new(Mutex::new(AudioBuffer::new(buffer_size))); - let config = cpal::StreamConfig { - channels: channels as u16, - sample_rate: cpal::SampleRate(sample_rate), - buffer_size: cpal::BufferSize::Default, - }; + let config = supported_range.with_sample_rate(actual_rate).into(); let buffer_clone = buffer.clone(); - let stream = device.build_output_stream( - &config, - move |data: &mut [i16], _| { - let mut buf = buffer_clone.lock(); - buf.read(data); - }, - |err| { - error!("Audio stream error: {}", err); - }, - None, - ).context("Failed to create audio stream")?; + // Build stream based on sample format + let stream = match sample_format { + SampleFormat::F32 => { + device.build_output_stream( + &config, + move |data: &mut [f32], _| { + let mut buf = buffer_clone.lock(); + // Read i16 samples and convert to f32 + for sample in data.iter_mut() { + let mut i16_sample = [0i16; 1]; + buf.read(&mut i16_sample); + *sample = i16_sample[0] as f32 / 32768.0; + } + }, + |err| { + error!("Audio stream error: {}", err); + }, + None, + ).context("Failed to create f32 audio stream")? + } + SampleFormat::I16 => { + device.build_output_stream( + &config, + move |data: &mut [i16], _| { + let mut buf = buffer_clone.lock(); + buf.read(data); + }, + |err| { + error!("Audio stream error: {}", err); + }, + None, + ).context("Failed to create i16 audio stream")? + } + _ => { + // Fallback: try f32 anyway + device.build_output_stream( + &config, + move |data: &mut [f32], _| { + let mut buf = buffer_clone.lock(); + for sample in data.iter_mut() { + let mut i16_sample = [0i16; 1]; + buf.read(&mut i16_sample); + *sample = i16_sample[0] as f32 / 32768.0; + } + }, + |err| { + error!("Audio stream error: {}", err); + }, + None, + ).context("Failed to create audio stream with fallback format")? + } + }; stream.play().context("Failed to start audio playback")?; - info!("Audio player started"); + info!("Audio player started successfully"); Ok(Self { - sample_rate, - channels, + sample_rate: actual_rate.0, + channels: actual_channels as u32, buffer, _stream: Some(stream), }) @@ -149,6 +472,12 @@ impl AudioPlayer { buffer.write(samples); } + /// Get buffer status (for debugging) + pub fn buffer_status(&self) -> (usize, u64, u64) { + let buffer = self.buffer.lock(); + (buffer.available(), buffer.total_written, buffer.total_read) + } + /// Get sample rate pub fn sample_rate(&self) -> u32 { self.sample_rate diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs index b0b33c4..4e7bfa7 100644 --- a/opennow-streamer/src/media/mod.rs +++ b/opennow-streamer/src/media/mod.rs @@ -5,25 +5,49 @@ mod video; mod audio; +#[cfg(target_os = "macos")] +pub mod videotoolbox; + pub use video::{VideoDecoder, RtpDepacketizer, DepacketizerCodec, DecodeStats}; pub use audio::*; +#[cfg(target_os = "macos")] +pub use videotoolbox::{ZeroCopyFrame, ZeroCopyTextureManager, CVPixelBufferWrapper}; + +/// Pixel format of decoded video frame +#[derive(Debug, Clone, Copy, PartialEq, Default)] +pub enum PixelFormat { + /// YUV 4:2:0 planar (Y, U, V separate planes) + #[default] + YUV420P, + /// NV12 semi-planar (Y plane + interleaved UV plane) + /// More efficient on macOS VideoToolbox - skip CPU conversion + NV12, +} + /// Decoded video frame #[derive(Debug, Clone)] pub struct VideoFrame { pub width: u32, pub height: u32, + /// Y plane (luma) - full resolution pub y_plane: Vec, + /// U plane (Cb chroma) - for YUV420P: half resolution + /// For NV12: this contains interleaved UV data pub u_plane: Vec, + /// V plane (Cr chroma) - for YUV420P: half resolution + /// For NV12: this is empty (UV is interleaved in u_plane) pub v_plane: Vec, pub y_stride: u32, pub u_stride: u32, pub v_stride: u32, pub timestamp_us: u64, + /// Pixel format (YUV420P or NV12) + pub format: PixelFormat, } impl VideoFrame { - /// Create empty frame + /// Create empty frame (YUV420P format) pub fn empty(width: u32, height: u32) -> Self { let y_size = (width * height) as usize; let uv_size = y_size / 4; @@ -38,6 +62,7 @@ impl VideoFrame { u_stride: width / 2, v_stride: width / 2, timestamp_us: 0, + format: PixelFormat::YUV420P, } } diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index fd1cb58..17f225b 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -16,7 +16,7 @@ use tokio::sync::mpsc as tokio_mpsc; #[cfg(target_os = "windows")] use std::path::Path; -use super::VideoFrame; +use super::{VideoFrame, PixelFormat}; use crate::app::{VideoCodec, SharedFrame}; extern crate ffmpeg_next as ffmpeg; @@ -141,6 +141,8 @@ pub struct DecodeStats { pub decode_time_ms: f32, /// Whether a frame was produced pub frame_produced: bool, + /// Whether a keyframe is needed (too many consecutive decode failures) + pub needs_keyframe: bool, } /// Video decoder using FFmpeg with hardware acceleration @@ -162,6 +164,11 @@ impl VideoDecoder { // Initialize FFmpeg ffmpeg::init().map_err(|e| anyhow!("Failed to initialize FFmpeg: {:?}", e))?; + // Suppress FFmpeg's "no frame" info messages (EAGAIN is normal for H.264) + unsafe { + ffmpeg::ffi::av_log_set_level(ffmpeg::ffi::AV_LOG_ERROR as i32); + } + info!("Creating FFmpeg video decoder for {:?}", codec); // Find the decoder @@ -200,6 +207,11 @@ impl VideoDecoder { // Initialize FFmpeg ffmpeg::init().map_err(|e| anyhow!("Failed to initialize FFmpeg: {:?}", e))?; + // Suppress FFmpeg's "no frame" info messages (EAGAIN is normal for H.264) + unsafe { + ffmpeg::ffi::av_log_set_level(ffmpeg::ffi::AV_LOG_ERROR as i32); + } + info!("Creating FFmpeg video decoder (async mode) for {:?}", codec); // Find the decoder @@ -261,6 +273,9 @@ impl VideoDecoder { let mut width = 0u32; let mut height = 0u32; let mut frames_decoded = 0u64; + let mut consecutive_failures = 0u32; + let mut packets_received = 0u64; + const KEYFRAME_REQUEST_THRESHOLD: u32 = 10; // Request keyframe after 10 consecutive failures (was 30) while let Ok(cmd) = cmd_rx.recv() { match cmd { @@ -277,6 +292,8 @@ impl VideoDecoder { let _ = frame_tx.send(result); } DecoderCommand::DecodeAsync { data, receive_time } => { + packets_received += 1; + // Non-blocking mode - write directly to SharedFrame let result = Self::decode_frame( &mut decoder, @@ -290,6 +307,37 @@ impl VideoDecoder { let decode_time_ms = receive_time.elapsed().as_secs_f32() * 1000.0; let frame_produced = result.is_some(); + // Track consecutive decode failures for PLI request + // Note: EAGAIN (no frame) is normal for H.264 - decoder buffers B-frames + let needs_keyframe = if frame_produced { + // Only log recovery for significant failures (>5), not normal buffering + if consecutive_failures > 5 { + info!("Decoder: recovered after {} packets without output", consecutive_failures); + } + consecutive_failures = 0; + false + } else { + consecutive_failures += 1; + + // Only log at higher thresholds - low counts are normal H.264 buffering + if consecutive_failures == 30 { + debug!("Decoder: {} packets without frame (packets: {}, decoded: {})", + consecutive_failures, packets_received, frames_decoded); + } + + if consecutive_failures == KEYFRAME_REQUEST_THRESHOLD { + warn!("Decoder: {} consecutive frames without output - requesting keyframe (packets: {}, decoded: {})", + consecutive_failures, packets_received, frames_decoded); + true + } else if consecutive_failures > KEYFRAME_REQUEST_THRESHOLD && consecutive_failures % 20 == 0 { + // Keep requesting every 20 frames if still failing (~166ms at 120fps) + warn!("Decoder: still failing after {} frames - requesting keyframe again", consecutive_failures); + true + } else { + false + } + }; + // Write frame directly to SharedFrame (zero-copy handoff) if let Some(frame) = result { if let Some(ref sf) = shared_frame { @@ -302,6 +350,7 @@ impl VideoDecoder { let _ = tx.try_send(DecodeStats { decode_time_ms, frame_produced, + needs_keyframe, }); } } @@ -315,44 +364,143 @@ impl VideoDecoder { /// Create decoder, trying hardware acceleration first fn create_decoder(codec_id: ffmpeg::codec::Id) -> Result<(decoder::Video, bool)> { + // On macOS, try VideoToolbox hardware acceleration + #[cfg(target_os = "macos")] + { + info!("macOS detected - attempting VideoToolbox hardware acceleration"); + + // Try to set up VideoToolbox hwaccel using FFmpeg's device API + unsafe { + use ffmpeg::ffi::*; + use std::ptr; + + // Find the standard decoder + let codec = ffmpeg::codec::decoder::find(codec_id) + .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; + + let mut ctx = CodecContext::new_with_codec(codec); + + // Get raw pointer to AVCodecContext + let raw_ctx = ctx.as_mut_ptr(); + + // Create VideoToolbox hardware device context + let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); + let ret = av_hwdevice_ctx_create( + &mut hw_device_ctx, + AVHWDeviceType::AV_HWDEVICE_TYPE_VIDEOTOOLBOX, + ptr::null(), + ptr::null_mut(), + 0, + ); + + if ret >= 0 && !hw_device_ctx.is_null() { + // Attach hardware device context to codec context + (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); + + // Enable multi-threading + (*raw_ctx).thread_count = 4; + + match ctx.decoder().video() { + Ok(decoder) => { + info!("VideoToolbox hardware decoder created successfully"); + // Don't free hw_device_ctx - it's now owned by the codec context + return Ok((decoder, true)); + } + Err(e) => { + warn!("Failed to open VideoToolbox decoder: {:?}", e); + av_buffer_unref(&mut hw_device_ctx); + } + } + } else { + warn!("Failed to create VideoToolbox device context (error {})", ret); + } + } + + // Fall back to software decoder on macOS + info!("Falling back to software decoder on macOS"); + let codec = ffmpeg::codec::decoder::find(codec_id) + .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; + + let mut ctx = CodecContext::new_with_codec(codec); + ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + let decoder = ctx.decoder().video()?; + return Ok((decoder, false)); + } + // Check if Intel QSV runtime is available (cached, only checks once) + #[cfg(not(target_os = "macos"))] let qsv_available = check_qsv_available(); // Try hardware decoders in order of preference - // CUVID requires NVIDIA GPU with NVDEC - // QSV requires Intel GPU with Media SDK / oneVPL runtime - // D3D11VA and DXVA2 are Windows-specific generic APIs - // We prioritize NVIDIA (cuvid) since it's most common for gaming PCs + // Platform-specific hardware decoders: + // - Windows: CUVID (NVIDIA), QSV (Intel), D3D11VA, DXVA2 + // - Linux: CUVID, VAAPI, QSV + #[cfg(not(target_os = "macos"))] let hw_decoder_names: Vec<&str> = match codec_id { ffmpeg::codec::Id::H264 => { - let mut decoders = vec!["h264_cuvid"]; // NVIDIA first - if qsv_available { - decoders.push("h264_qsv"); // Intel QSV (only if runtime detected) + #[cfg(target_os = "windows")] + { + let mut decoders = vec!["h264_cuvid"]; // NVIDIA first + if qsv_available { + decoders.push("h264_qsv"); // Intel QSV (only if runtime detected) + } + decoders.push("h264_d3d11va"); // Windows D3D11 (AMD/Intel/NVIDIA) + decoders.push("h264_dxva2"); // Windows DXVA2 (older API) + decoders + } + #[cfg(target_os = "linux")] + { + let mut decoders = vec!["h264_cuvid", "h264_vaapi"]; + if qsv_available { + decoders.push("h264_qsv"); + } + decoders } - decoders.push("h264_d3d11va"); // Windows D3D11 (AMD/Intel/NVIDIA) - decoders.push("h264_dxva2"); // Windows DXVA2 (older API) - decoders } ffmpeg::codec::Id::HEVC => { - let mut decoders = vec!["hevc_cuvid"]; - if qsv_available { - decoders.push("hevc_qsv"); + #[cfg(target_os = "windows")] + { + let mut decoders = vec!["hevc_cuvid"]; + if qsv_available { + decoders.push("hevc_qsv"); + } + decoders.push("hevc_d3d11va"); + decoders.push("hevc_dxva2"); + decoders + } + #[cfg(target_os = "linux")] + { + let mut decoders = vec!["hevc_cuvid", "hevc_vaapi"]; + if qsv_available { + decoders.push("hevc_qsv"); + } + decoders } - decoders.push("hevc_d3d11va"); - decoders.push("hevc_dxva2"); - decoders } ffmpeg::codec::Id::AV1 => { - let mut decoders = vec!["av1_cuvid"]; - if qsv_available { - decoders.push("av1_qsv"); + #[cfg(target_os = "windows")] + { + let mut decoders = vec!["av1_cuvid"]; + if qsv_available { + decoders.push("av1_qsv"); + } + decoders + } + #[cfg(target_os = "linux")] + { + let mut decoders = vec!["av1_cuvid", "av1_vaapi"]; + if qsv_available { + decoders.push("av1_qsv"); + } + decoders } - decoders } _ => vec![], }; - // Try hardware decoders + // Try hardware decoders (Windows/Linux) + #[cfg(not(target_os = "macos"))] for hw_name in &hw_decoder_names { if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { // new_with_codec returns Context directly, not Result @@ -383,6 +531,62 @@ impl VideoDecoder { Ok((decoder, false)) } + /// Check if a pixel format is a hardware format + fn is_hw_pixel_format(format: Pixel) -> bool { + matches!( + format, + Pixel::VIDEOTOOLBOX + | Pixel::CUDA + | Pixel::VAAPI + | Pixel::VDPAU + | Pixel::QSV + | Pixel::D3D11 + | Pixel::DXVA2_VLD + | Pixel::D3D11VA_VLD + | Pixel::D3D12 + | Pixel::VULKAN + ) + } + + /// Transfer hardware frame to system memory if needed + fn transfer_hw_frame_if_needed(frame: &FfmpegFrame) -> Option { + let format = frame.format(); + + if !Self::is_hw_pixel_format(format) { + // Not a hardware frame, no transfer needed + return None; + } + + debug!("Transferring hardware frame (format: {:?}) to system memory", format); + + unsafe { + use ffmpeg::ffi::*; + + // Create a new frame for the software copy + let sw_frame_ptr = av_frame_alloc(); + if sw_frame_ptr.is_null() { + warn!("Failed to allocate software frame"); + return None; + } + + // Transfer data from hardware frame to software frame + let ret = av_hwframe_transfer_data(sw_frame_ptr, frame.as_ptr(), 0); + if ret < 0 { + warn!("Failed to transfer hardware frame to software (error {})", ret); + av_frame_free(&mut (sw_frame_ptr as *mut _)); + return None; + } + + // Copy frame properties + (*sw_frame_ptr).width = frame.width() as i32; + (*sw_frame_ptr).height = frame.height() as i32; + + // Wrap in FFmpeg frame type + // Note: This creates an owned frame that will be freed when dropped + Some(FfmpegFrame::wrap(sw_frame_ptr)) + } + } + /// Decode a single frame (called in decoder thread) fn decode_frame( decoder: &mut decoder::Video, @@ -431,13 +635,58 @@ impl VideoDecoder { let h = frame.height(); let format = frame.format(); - // Create/update scaler if needed (convert to YUV420P) + // Check if this is a hardware frame (e.g., VideoToolbox, CUDA, etc.) + // Hardware frames need to be transferred to system memory + let sw_frame = Self::transfer_hw_frame_if_needed(&frame); + let frame_to_use = sw_frame.as_ref().unwrap_or(&frame); + let actual_format = frame_to_use.format(); + + if *frames_decoded == 1 { + info!("First decoded frame: {}x{}, format: {:?} (hw: {:?})", w, h, actual_format, format); + } + + // Check if frame is NV12 - skip CPU scaler and pass directly to GPU + // NV12 has Y plane (full res) and UV plane (half res, interleaved) + // GPU shader will deinterleave UV - much faster than CPU scaler + if actual_format == Pixel::NV12 { + *width = w; + *height = h; + + // Extract Y plane (plane 0) + let y_plane = frame_to_use.data(0).to_vec(); + let y_stride = frame_to_use.stride(0) as u32; + + // Extract interleaved UV plane (plane 1) + // NV12: UV plane is half height, full width, 2 bytes per pixel (U, V interleaved) + let uv_plane = frame_to_use.data(1).to_vec(); + let uv_stride = frame_to_use.stride(1) as u32; + + if *frames_decoded == 1 { + info!("NV12 direct path: Y {}x{} stride {}, UV stride {} - GPU will handle conversion", + w, h, y_stride, uv_stride); + } + + return Some(VideoFrame { + width: w, + height: h, + y_plane, + u_plane: uv_plane, // Interleaved UV data + v_plane: Vec::new(), // Empty for NV12 + y_stride, + u_stride: uv_stride, + v_stride: 0, + timestamp_us: 0, + format: PixelFormat::NV12, + }); + } + + // For other formats, use scaler to convert to YUV420P if scaler.is_none() || *width != w || *height != h { *width = w; *height = h; match ScalerContext::get( - format, + actual_format, w, h, Pixel::YUV420P, @@ -451,21 +700,17 @@ impl VideoDecoder { return None; } } - - if *frames_decoded == 1 { - info!("First decoded frame: {}x{}, format: {:?}", w, h, format); - } } - // Convert to YUV420P if needed + // Convert to YUV420P let mut yuv_frame = FfmpegFrame::empty(); if let Some(ref mut s) = scaler { - if let Err(e) = s.run(&frame, &mut yuv_frame) { + if let Err(e) = s.run(frame_to_use, &mut yuv_frame) { warn!("Scaler run failed: {:?}", e); return None; } } else { - yuv_frame = frame; + return None; } // Extract YUV planes @@ -487,6 +732,7 @@ impl VideoDecoder { u_stride, v_stride, timestamp_us: 0, + format: PixelFormat::YUV420P, }) } Err(ffmpeg::Error::Other { errno }) if errno == libc::EAGAIN => None, diff --git a/opennow-streamer/src/media/videotoolbox.rs b/opennow-streamer/src/media/videotoolbox.rs new file mode 100644 index 0000000..380ac10 --- /dev/null +++ b/opennow-streamer/src/media/videotoolbox.rs @@ -0,0 +1,243 @@ +//! VideoToolbox Zero-Copy Support (macOS only) +//! +//! Provides zero-copy video frame handling by keeping decoded frames on GPU. +//! Instead of copying pixel data from VideoToolbox to CPU memory, we: +//! 1. Extract the CVPixelBuffer from the decoded AVFrame +//! 2. Retain it and pass to the renderer +//! 3. Create Metal textures directly from the IOSurface +//! 4. Use those textures in wgpu for rendering +//! +//! This eliminates ~360MB/sec of memory copies at 1080p@120fps. + +#![cfg(target_os = "macos")] + +use std::ffi::c_void; +use std::sync::Arc; +use log::{info, debug, warn}; + +// Core Video FFI +#[link(name = "CoreVideo", kind = "framework")] +extern "C" { + fn CVPixelBufferRetain(buffer: *mut c_void) -> *mut c_void; + fn CVPixelBufferRelease(buffer: *mut c_void); + fn CVPixelBufferGetWidth(buffer: *mut c_void) -> usize; + fn CVPixelBufferGetHeight(buffer: *mut c_void) -> usize; + fn CVPixelBufferGetPixelFormatType(buffer: *mut c_void) -> u32; + fn CVPixelBufferGetIOSurface(buffer: *mut c_void) -> *mut c_void; +} + +// IOSurface FFI +#[link(name = "IOSurface", kind = "framework")] +extern "C" { + fn IOSurfaceGetWidth(surface: *mut c_void) -> usize; + fn IOSurfaceGetHeight(surface: *mut c_void) -> usize; + fn IOSurfaceIncrementUseCount(surface: *mut c_void); + fn IOSurfaceDecrementUseCount(surface: *mut c_void); +} + +// NV12 format constants +const K_CV_PIXEL_FORMAT_TYPE_420_YP_CB_CR_8_BI_PLANAR_VIDEO_RANGE: u32 = 0x34323076; // '420v' +const K_CV_PIXEL_FORMAT_TYPE_420_YP_CB_CR_8_BI_PLANAR_FULL_RANGE: u32 = 0x34323066; // '420f' + +/// Wrapper around CVPixelBuffer that handles retain/release +/// This allows passing the GPU buffer between threads safely +pub struct CVPixelBufferWrapper { + buffer: *mut c_void, + width: u32, + height: u32, + is_nv12: bool, +} + +// CVPixelBuffer is reference-counted and thread-safe +unsafe impl Send for CVPixelBufferWrapper {} +unsafe impl Sync for CVPixelBufferWrapper {} + +impl CVPixelBufferWrapper { + /// Create a new wrapper, retaining the CVPixelBuffer + /// + /// # Safety + /// The provided pointer must be a valid CVPixelBufferRef + pub unsafe fn new(buffer: *mut c_void) -> Option { + if buffer.is_null() { + return None; + } + + // Retain the buffer so it stays valid + CVPixelBufferRetain(buffer); + + let width = CVPixelBufferGetWidth(buffer) as u32; + let height = CVPixelBufferGetHeight(buffer) as u32; + let format = CVPixelBufferGetPixelFormatType(buffer); + + // Check if it's NV12 format (what VideoToolbox typically outputs) + let is_nv12 = format == K_CV_PIXEL_FORMAT_TYPE_420_YP_CB_CR_8_BI_PLANAR_VIDEO_RANGE + || format == K_CV_PIXEL_FORMAT_TYPE_420_YP_CB_CR_8_BI_PLANAR_FULL_RANGE; + + if !is_nv12 { + debug!("CVPixelBuffer format is not NV12: {:#x}", format); + } + + Some(Self { + buffer, + width, + height, + is_nv12, + }) + } + + pub fn width(&self) -> u32 { + self.width + } + + pub fn height(&self) -> u32 { + self.height + } + + pub fn is_nv12(&self) -> bool { + self.is_nv12 + } + + /// Get the IOSurface backing this pixel buffer + /// Returns None if the buffer is not backed by an IOSurface + pub fn io_surface(&self) -> Option<*mut c_void> { + unsafe { + let surface = CVPixelBufferGetIOSurface(self.buffer); + if surface.is_null() { + None + } else { + Some(surface) + } + } + } + + /// Get the raw CVPixelBufferRef (for FFI) + pub fn as_raw(&self) -> *mut c_void { + self.buffer + } +} + +impl Drop for CVPixelBufferWrapper { + fn drop(&mut self) { + unsafe { + CVPixelBufferRelease(self.buffer); + } + } +} + +impl Clone for CVPixelBufferWrapper { + fn clone(&self) -> Self { + unsafe { + CVPixelBufferRetain(self.buffer); + } + Self { + buffer: self.buffer, + width: self.width, + height: self.height, + is_nv12: self.is_nv12, + } + } +} + +/// Extract CVPixelBuffer from an FFmpeg hardware frame +/// +/// # Safety +/// The AVFrame must be a VideoToolbox hardware frame (format = AV_PIX_FMT_VIDEOTOOLBOX) +/// The frame_data_3 parameter should be frame.data[3] from the AVFrame +pub unsafe fn extract_cv_pixel_buffer_from_data(frame_data_3: *mut u8) -> Option { + // For VideoToolbox frames, data[3] contains the CVPixelBufferRef + // This is FFmpeg's convention for VideoToolbox hardware frames + let cv_buffer = frame_data_3 as *mut c_void; + CVPixelBufferWrapper::new(cv_buffer) +} + +/// Zero-copy video frame that holds GPU buffer reference +#[derive(Clone)] +pub struct ZeroCopyFrame { + pub buffer: Arc, +} + +impl ZeroCopyFrame { + pub fn new(buffer: CVPixelBufferWrapper) -> Self { + Self { + buffer: Arc::new(buffer), + } + } + + pub fn width(&self) -> u32 { + self.buffer.width() + } + + pub fn height(&self) -> u32 { + self.buffer.height() + } +} + +impl std::fmt::Debug for ZeroCopyFrame { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("ZeroCopyFrame") + .field("width", &self.buffer.width()) + .field("height", &self.buffer.height()) + .field("is_nv12", &self.buffer.is_nv12()) + .finish() + } +} + +/// IOSurface wrapper for safe handling +pub struct IOSurfaceWrapper { + surface: *mut c_void, +} + +unsafe impl Send for IOSurfaceWrapper {} +unsafe impl Sync for IOSurfaceWrapper {} + +impl IOSurfaceWrapper { + pub unsafe fn new(surface: *mut c_void) -> Option { + if surface.is_null() { + return None; + } + IOSurfaceIncrementUseCount(surface); + Some(Self { surface }) + } + + pub fn as_ptr(&self) -> *mut c_void { + self.surface + } + + pub fn width(&self) -> u32 { + unsafe { IOSurfaceGetWidth(self.surface) as u32 } + } + + pub fn height(&self) -> u32 { + unsafe { IOSurfaceGetHeight(self.surface) as u32 } + } +} + +impl Drop for IOSurfaceWrapper { + fn drop(&mut self) { + unsafe { + IOSurfaceDecrementUseCount(self.surface); + } + } +} + +// Note: Full zero-copy texture integration with wgpu requires using +// Metal's newTextureWithIOSurface API and wgpu's hal layer. +// This is complex due to wgpu's hal API requirements. +// For now, the NV12 direct path (skipping CPU scaler) provides significant savings. +// TODO: Implement ZeroCopyTextureManager using objc/metal directly + +/// Placeholder for future zero-copy texture manager +pub struct ZeroCopyTextureManager { + _initialized: bool, +} + +impl ZeroCopyTextureManager { + /// Create a new texture manager from wgpu device + /// Returns None if zero-copy is not supported or available + pub fn new(_wgpu_device: &wgpu::Device) -> Option { + // TODO: Implement using Metal API directly via objc + // For now, return None to use fallback CPU path + info!("ZeroCopyTextureManager: Not yet implemented, using CPU path"); + None + } +} diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index e57588e..b771f32 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -8,7 +8,7 @@ mod sdp; mod datachannel; pub use signaling::{GfnSignaling, SignalingEvent, IceCandidate}; -pub use peer::{WebRtcPeer, WebRtcEvent}; +pub use peer::{WebRtcPeer, WebRtcEvent, request_keyframe}; pub use sdp::*; pub use datachannel::*; @@ -304,8 +304,8 @@ pub async fn run_streaming( let (input_event_tx, input_event_rx) = mpsc::channel::(1024); input_handler.set_event_sender(input_event_tx.clone()); - // Also set raw input sender for direct mouse events (Windows only) - #[cfg(target_os = "windows")] + // Also set raw input sender for direct mouse events (Windows/macOS) + #[cfg(any(target_os = "windows", target_os = "macos"))] crate::input::set_raw_input_sender(input_event_tx); info!("Input handler connected to streaming loop"); @@ -619,6 +619,11 @@ pub async fn run_streaming( info!("First frame decoded (async) in {:.1}ms", decode_stat.decode_time_ms); } } + + // Request keyframe if decoder is failing + if decode_stat.needs_keyframe { + request_keyframe().await; + } } // Update stats periodically (interval persists across loop iterations) _ = stats_interval.tick() => { @@ -660,7 +665,7 @@ pub async fn run_streaming( } // Clean up raw input sender - #[cfg(target_os = "windows")] + #[cfg(any(target_os = "windows", target_os = "macos"))] crate::input::clear_raw_input_sender(); info!("Streaming session ended"); diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs index f7cedc2..a72ad2b 100644 --- a/opennow-streamer/src/webrtc/peer.rs +++ b/opennow-streamer/src/webrtc/peer.rs @@ -4,6 +4,7 @@ use std::sync::Arc; use tokio::sync::mpsc; +use parking_lot::Mutex; use webrtc::api::media_engine::{MediaEngine, MIME_TYPE_H264, MIME_TYPE_OPUS}; use webrtc::api::setting_engine::SettingEngine; use webrtc::api::APIBuilder; @@ -17,6 +18,7 @@ use webrtc::peer_connection::RTCPeerConnection; use webrtc::peer_connection::configuration::RTCConfiguration; use webrtc::peer_connection::sdp::session_description::RTCSessionDescription; use webrtc::rtp_transceiver::rtp_codec::{RTCRtpCodecCapability, RTCRtpCodecParameters, RTPCodecType}; +use webrtc::rtcp::payload_feedbacks::picture_loss_indication::PictureLossIndication; use anyhow::{Result, Context}; use log::{info, debug, warn, error}; use bytes::Bytes; @@ -43,6 +45,11 @@ pub enum WebRtcEvent { Error(String), } +/// Shared peer connection for PLI requests (static to allow access from decoder) +static PEER_CONNECTION: Mutex>> = Mutex::new(None); +/// Track SSRC for PLI +static VIDEO_SSRC: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); + /// WebRTC peer for GFN streaming pub struct WebRtcPeer { peer_connection: Option>, @@ -54,6 +61,31 @@ pub struct WebRtcPeer { handshake_complete: bool, } +/// Request a keyframe (PLI - Picture Loss Indication) +/// Call this when decode errors occur to recover the stream +pub async fn request_keyframe() { + let pc = PEER_CONNECTION.lock().clone(); + let ssrc = VIDEO_SSRC.load(std::sync::atomic::Ordering::Relaxed); + + if let Some(pc) = pc { + if ssrc != 0 { + let pli = PictureLossIndication { + sender_ssrc: 0, + media_ssrc: ssrc, + }; + + match pc.write_rtcp(&[Box::new(pli)]).await { + Ok(_) => info!("Sent PLI (keyframe request) for SSRC {}", ssrc), + Err(e) => warn!("Failed to send PLI: {:?}", e), + } + } else { + debug!("Cannot send PLI: no video SSRC yet"); + } + } else { + debug!("Cannot send PLI: no peer connection"); + } +} + impl WebRtcPeer { pub fn new(event_tx: mpsc::Sender) -> Self { Self { @@ -232,10 +264,30 @@ impl WebRtcPeer { Ok((rtp_packet, _)) => { packet_count += 1; - // Only log first packet per track + // Store SSRC for PLI on first video packet if packet_count == 1 { - info!("[{}] First RTP packet: {} bytes payload", - track_id_clone, rtp_packet.payload.len()); + info!("[{}] First RTP packet: {} bytes payload, SSRC: {}", + track_id_clone, rtp_packet.payload.len(), rtp_packet.header.ssrc); + + if track_kind == webrtc::rtp_transceiver::rtp_codec::RTPCodecType::Video { + VIDEO_SSRC.store(rtp_packet.header.ssrc, std::sync::atomic::Ordering::Relaxed); + + // Request keyframe immediately when video track starts + // This ensures we get an IDR frame to begin decoding + info!("Video track started - requesting initial keyframe"); + let pc_clone = PEER_CONNECTION.lock().clone(); + if let Some(pc) = pc_clone { + let pli = PictureLossIndication { + sender_ssrc: 0, + media_ssrc: rtp_packet.header.ssrc, + }; + if let Err(e) = pc.write_rtcp(&[Box::new(pli)]).await { + warn!("Failed to send initial PLI: {:?}", e); + } else { + info!("Sent initial PLI for SSRC {}", rtp_packet.header.ssrc); + } + } + } } if track_kind == webrtc::rtp_transceiver::rtp_codec::RTPCodecType::Video { @@ -359,6 +411,9 @@ impl WebRtcPeer { } debug!("=== END SDP ==="); + // Store in static for PLI requests + *PEER_CONNECTION.lock() = Some(peer_connection.clone()); + self.peer_connection = Some(peer_connection); Ok(final_sdp) diff --git a/opennow-streamer/src/webrtc/signaling.rs b/opennow-streamer/src/webrtc/signaling.rs index 98cae8f..f2f6c8d 100644 --- a/opennow-streamer/src/webrtc/signaling.rs +++ b/opennow-streamer/src/webrtc/signaling.rs @@ -232,6 +232,10 @@ impl GfnSignaling { if inner.get("type").and_then(|t| t.as_str()) == Some("offer") { if let Some(sdp) = inner.get("sdp").and_then(|s| s.as_str()) { info!("Received SDP offer, length: {}", sdp.len()); + // Log full SDP for debugging (color space info, codec params) + for line in sdp.lines() { + debug!("SDP: {}", line); + } let _ = event_tx_clone.send(SignalingEvent::SdpOffer(sdp.to_string())).await; } } From f01428bb6d625f4924fab985cd885c6daca178ac Mon Sep 17 00:00:00 2001 From: zortos293 Date: Wed, 31 Dec 2025 01:35:51 +0000 Subject: [PATCH 03/67] Rewrite CI workflow to build opennow-streamer native client with FFmpeg - Remove Tauri/Bun dependencies (tauri-action, setup-bun) - Update version management to only modify opennow-streamer/Cargo.toml - Install FFmpeg dev libraries per platform: - Windows: Download shared build from gyan.dev - macOS: Install via Homebrew with pkg-config - Linux x64: Install libav* packages via apt - Linux ARM64: Cross-compile with ARM64 FFmpeg libraries - Build native client with cargo instead of Tauri - Bundle FFmpeg runtime libraries: - Windows: Copy DLLs to release directory - macOS: Bundle dylibs with rpath fixes - Linux: Rely on system FFmpeg (documented in release notes) - Update artifact and release upload paths to opennow-streamer/target/ - Update Rust cache workspace to opennow-streamer - Add Native branch to workflow triggers - Update release notes prompt to mention Rust instead of Tauri --- .github/workflows/auto-build.yml | 487 ++++++++++++++++++++----------- 1 file changed, 313 insertions(+), 174 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 1c89d43..1f82cec 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -5,6 +5,7 @@ on: branches: - main - dev + - Native workflow_dispatch: permissions: @@ -102,7 +103,7 @@ jobs: VERSION: ${{ steps.get_version.outputs.version }} run: | # Create the prompt for OpenRouter (commits are safely passed via env var) - PROMPT="You are a release notes generator for OpenNOW, an open source GeForce NOW client built with Tauri. Generate clean, user-friendly release notes from these git commits. Categorize them into sections: Added (new features), Changed (updates/improvements), Fixed (bug fixes), and Removed (if any). Keep descriptions concise and user-focused. If a commit doesn't fit these categories, skip it. Only include sections that have items. Format in markdown. Do not include any introduction or conclusion text, just the categorized list." + PROMPT="You are a release notes generator for OpenNOW, an open source native GeForce NOW client built with Rust. Generate clean, user-friendly release notes from these git commits. Categorize them into sections: Added (new features), Changed (updates/improvements), Fixed (bug fixes), and Removed (if any). Keep descriptions concise and user-focused. If a commit doesn't fit these categories, skip it. Only include sections that have items. Format in markdown. Do not include any introduction or conclusion text, just the categorized list." PROMPT=$(printf "%s\n\nGit commits:\n%s" "$PROMPT" "$COMMITS") # Build JSON payload safely using jq @@ -157,7 +158,7 @@ jobs: - platform: macos-latest target: macos arch: universal - rust_target: aarch64-apple-darwin + rust_target: universal - platform: windows-latest target: windows arch: x86_64 @@ -173,7 +174,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Update version in all config files + - name: Update version in opennow-streamer/Cargo.toml shell: bash run: | VERSION="${{ needs.get-version.outputs.version_number }}" @@ -185,39 +186,97 @@ jobs: VERSION="0.1.0" fi - # Update package.json + # Update opennow-streamer/Cargo.toml if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" package.json - sed -i '' "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" src-tauri/tauri.conf.json - sed -i '' "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" src-tauri/Cargo.toml + sed -i '' "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" opennow-streamer/Cargo.toml else - sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" package.json - sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" src-tauri/tauri.conf.json - sed -i "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" src-tauri/Cargo.toml + sed -i "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" opennow-streamer/Cargo.toml fi - # Verify the versions were set correctly - echo "=== Verifying versions ===" - echo "package.json: $(grep '"version"' package.json | head -1)" - echo "tauri.conf.json: $(grep '"version"' src-tauri/tauri.conf.json | head -1)" - echo "Cargo.toml: $(grep '^version' src-tauri/Cargo.toml | head -1)" + # Verify the version was set correctly + echo "=== Verifying version ===" + echo "opennow-streamer/Cargo.toml: $(grep '^version' opennow-streamer/Cargo.toml | head -1)" - # Linux x86_64 dependencies - - name: Install Linux dependencies (x86_64) + - name: Install Rust stable + uses: dtolnay/rust-toolchain@stable + + - name: Add macOS targets (universal build) + if: matrix.target == 'macos' + run: | + rustup target add aarch64-apple-darwin + rustup target add x86_64-apple-darwin + + - name: Add Linux ARM64 target + if: matrix.target == 'linux-arm64' + run: rustup target add aarch64-unknown-linux-gnu + + - name: Add Windows ARM64 target + if: matrix.target == 'windows-arm64' + run: rustup target add aarch64-pc-windows-msvc + + - name: Rust cache + uses: Swatinem/rust-cache@v2 + with: + workspaces: 'opennow-streamer -> target' + key: ${{ matrix.target }} + + # ==================== FFmpeg Installation ==================== + + - name: Install FFmpeg (Windows) + if: matrix.target == 'windows' || matrix.target == 'windows-arm64' + shell: pwsh + run: | + # Download shared FFmpeg build from gyan.dev (includes all DLLs and dev files) + $ffmpegUrl = "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z" + Write-Host "Downloading FFmpeg from $ffmpegUrl..." + Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.7z + + Write-Host "Extracting FFmpeg..." + 7z x ffmpeg.7z -offmpeg + $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName + Write-Host "FFmpeg extracted to: $ffmpegDir" + + # Set environment variables for ffmpeg-next crate + echo "FFMPEG_DIR=$ffmpegDir" >> $env:GITHUB_ENV + echo "PATH=$ffmpegDir\bin;$env:PATH" >> $env:GITHUB_ENV + + # Store path for later bundling + echo "FFMPEG_BIN_DIR=$ffmpegDir\bin" >> $env:GITHUB_ENV + + Write-Host "FFmpeg setup complete" + Write-Host "FFMPEG_DIR: $ffmpegDir" + Write-Host "FFMPEG_BIN_DIR: $ffmpegDir\bin" + + - name: Install FFmpeg (macOS) + if: matrix.target == 'macos' + run: | + brew install ffmpeg pkg-config + echo "FFmpeg installed via Homebrew" + + - name: Install FFmpeg (Linux x64) if: matrix.target == 'linux' run: | sudo apt-get update sudo apt-get install -y \ - libwebkit2gtk-4.1-dev \ - librsvg2-dev \ - patchelf \ - libssl-dev \ - libgtk-3-dev \ - libayatana-appindicator3-dev \ - libasound2-dev - - # Linux ARM64 cross-compilation dependencies - - name: Install Linux ARM64 cross-compilation dependencies + libavcodec-dev \ + libavformat-dev \ + libavutil-dev \ + libswscale-dev \ + libswresample-dev \ + libavfilter-dev \ + libavdevice-dev \ + pkg-config \ + libasound2-dev \ + libx11-dev \ + libxrandr-dev \ + libxi-dev \ + libgl1-mesa-dev \ + libudev-dev \ + clang \ + libclang-dev + echo "FFmpeg development libraries installed" + + - name: Install FFmpeg (Linux ARM64) if: matrix.target == 'linux-arm64' run: | sudo apt-get update @@ -235,221 +294,301 @@ jobs: sudo apt-get install -y \ gcc-aarch64-linux-gnu \ g++-aarch64-linux-gnu \ - pkg-config + pkg-config \ + clang \ + libclang-dev - # Install ARM64 libraries (some may not be available, continue on error) + # Install ARM64 FFmpeg libraries (some may not be available, continue on error) sudo apt-get install -y \ - libwebkit2gtk-4.1-dev:arm64 \ - librsvg2-dev:arm64 \ - libssl-dev:arm64 \ - libgtk-3-dev:arm64 \ - libayatana-appindicator3-dev:arm64 \ - libasound2-dev:arm64 || echo "Warning: Some ARM64 packages may not be available" - - # Verify critical packages are installed - dpkg -l | grep -E "libwebkit2gtk.*arm64|libgtk-3.*arm64" || echo "Warning: Critical ARM64 packages may be missing" + libavcodec-dev:arm64 \ + libavformat-dev:arm64 \ + libavutil-dev:arm64 \ + libswscale-dev:arm64 \ + libswresample-dev:arm64 \ + libavfilter-dev:arm64 \ + libasound2-dev:arm64 \ + libx11-dev:arm64 || echo "Warning: Some ARM64 packages may not be available" # Set up pkg-config for cross-compilation echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV + + # Set cross-compilation environment + echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV + echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - - name: Setup Bun - # Note: oven-sh/setup-bun@v2 enables Bun and dependency caching by default. - uses: oven-sh/setup-bun@v2 - - - name: Install Rust stable - uses: dtolnay/rust-toolchain@stable + # ==================== Build Native Client ==================== - - name: Add macOS targets (universal build) - if: matrix.target == 'macos' + - name: Build native client (Windows x64) + if: matrix.target == 'windows' + shell: bash + working-directory: opennow-streamer run: | - rustup target add aarch64-apple-darwin - rustup target add x86_64-apple-darwin + echo "Building for Windows x64..." + cargo build --release --verbose - - name: Add Linux ARM64 target - if: matrix.target == 'linux-arm64' - run: rustup target add aarch64-unknown-linux-gnu - - - name: Add Windows ARM64 target + - name: Build native client (Windows ARM64) if: matrix.target == 'windows-arm64' - run: rustup target add aarch64-pc-windows-msvc - - - name: Rust cache - uses: Swatinem/rust-cache@v2 - with: - workspaces: 'src-tauri -> target' - key: ${{ matrix.target }} - - - name: Install dependencies - run: bun install --frozen-lockfile + shell: bash + working-directory: opennow-streamer + run: | + echo "Building for Windows ARM64..." + cargo build --release --target aarch64-pc-windows-msvc --verbose - # Generate macOS .icns icon from PNG - - name: Generate macOS icon + - name: Build native client (macOS Universal) if: matrix.target == 'macos' + shell: bash + working-directory: opennow-streamer run: | - mkdir -p src-tauri/icons/icon.iconset - sips -z 16 16 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_16x16.png - sips -z 32 32 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_16x16@2x.png - sips -z 32 32 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_32x32.png - sips -z 64 64 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_32x32@2x.png - sips -z 128 128 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_128x128.png - sips -z 256 256 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_128x128@2x.png - sips -z 256 256 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_256x256.png - sips -z 512 512 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_256x256@2x.png - sips -z 512 512 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_512x512.png - sips -z 1024 1024 src-tauri/icons/icon.png --out src-tauri/icons/icon.iconset/icon_512x512@2x.png - iconutil -c icns src-tauri/icons/icon.iconset -o src-tauri/icons/icon.icns - rm -rf src-tauri/icons/icon.iconset - # Add icon.icns to tauri.conf.json - sed -i '' 's/"icons\/icon.png"/"icons\/icon.png", "icons\/icon.icns"/' src-tauri/tauri.conf.json - - # Set cross-compilation environment for Linux ARM64 - - name: Set Linux ARM64 cross-compile env - if: matrix.target == 'linux-arm64' - run: | - echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV - echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "Building for macOS (Universal Binary)..." + + # Build for both architectures + cargo build --release --target aarch64-apple-darwin --verbose + cargo build --release --target x86_64-apple-darwin --verbose + + # Create universal binary using lipo + mkdir -p target/release + lipo -create \ + target/aarch64-apple-darwin/release/opennow-streamer \ + target/x86_64-apple-darwin/release/opennow-streamer \ + -output target/release/opennow-streamer + + echo "Universal binary created at target/release/opennow-streamer" + lipo -info target/release/opennow-streamer - # Set Windows static CRT linking to fix "app can't run on your PC" error - # This embeds the Visual C++ runtime into the executable - - name: Set Windows RUSTFLAGS for static CRT - if: matrix.target == 'windows' || matrix.target == 'windows-arm64' + - name: Build native client (Linux x64) + if: matrix.target == 'linux' shell: bash - run: echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV - - # Build with release creation (main branch only) - - name: Build Tauri app (with release) - if: github.ref == 'refs/heads/main' - uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RUSTFLAGS: ${{ env.RUSTFLAGS }} - with: - tagName: ${{ needs.get-version.outputs.version }} - releaseName: 'OpenNOW ${{ needs.get-version.outputs.version }}' - releaseBody: | - ## OpenNOW ${{ needs.get-version.outputs.version }} + working-directory: opennow-streamer + run: | + echo "Building for Linux x64..." + cargo build --release --verbose - Open source GeForce NOW client. + - name: Build native client (Linux ARM64) + if: matrix.target == 'linux-arm64' + shell: bash + working-directory: opennow-streamer + run: | + echo "Building for Linux ARM64..." + cargo build --release --target aarch64-unknown-linux-gnu --verbose - ${{ needs.get-version.outputs.release_notes }} + # ==================== Bundle FFmpeg Libraries ==================== - --- + - name: Bundle FFmpeg DLLs (Windows x64) + if: matrix.target == 'windows' + shell: pwsh + run: | + $targetDir = "opennow-streamer/target/release" + + Write-Host "Copying FFmpeg DLLs to $targetDir..." + Copy-Item "$env:FFMPEG_BIN_DIR\*.dll" -Destination $targetDir -Verbose + + Write-Host "`n=== Bundled FFmpeg DLLs ===" + Get-ChildItem $targetDir -Filter "*.dll" | ForEach-Object { Write-Host " - $($_.Name)" } - ### Downloads - - **Windows x64**: `.msi` or `.exe` installer - - **Windows ARM64**: `.msi` or `.exe` installer (for ARM devices) - - **macOS**: `.dmg` disk image (Universal - Intel + Apple Silicon) - - **Linux x64**: `.deb` or `.AppImage` - - **Linux ARM64**: `.deb` or `.rpm` (Raspberry Pi, ARM servers) + - name: Bundle FFmpeg DLLs (Windows ARM64) + if: matrix.target == 'windows-arm64' + shell: pwsh + run: | + $targetDir = "opennow-streamer/target/aarch64-pc-windows-msvc/release" + + Write-Host "Copying FFmpeg DLLs to $targetDir..." + Copy-Item "$env:FFMPEG_BIN_DIR\*.dll" -Destination $targetDir -Verbose + + Write-Host "`n=== Bundled FFmpeg DLLs ===" + Get-ChildItem $targetDir -Filter "*.dll" | ForEach-Object { Write-Host " - $($_.Name)" } - [Sponsor this project](https://github.com/sponsors/zortos293) - releaseDraft: false - prerelease: true - args: ${{ matrix.target == 'linux-arm64' && '--target aarch64-unknown-linux-gnu --bundles deb,rpm' || (matrix.target == 'windows-arm64' && '--target aarch64-pc-windows-msvc' || '') }} + - name: Bundle FFmpeg dylibs (macOS) + if: matrix.target == 'macos' + shell: bash + run: | + cd opennow-streamer + + BINARY="target/release/opennow-streamer" + BUNDLE_DIR="target/release/bundle" + + echo "Creating bundle directory structure..." + mkdir -p "$BUNDLE_DIR/libs" + + # Copy the binary + cp "$BINARY" "$BUNDLE_DIR/" + chmod +x "$BUNDLE_DIR/opennow-streamer" + + # Find and copy FFmpeg dylibs + echo "" + echo "=== Finding FFmpeg dependencies ===" + FFMPEG_LIBS=$(otool -L "$BINARY" | grep -E 'libav|libsw|libpostproc' | awk '{print $1}') + + for lib in $FFMPEG_LIBS; do + if [ -f "$lib" ]; then + libname=$(basename "$lib") + echo "Copying: $libname" + cp "$lib" "$BUNDLE_DIR/libs/" + + # Update rpath in the binary + install_name_tool -change "$lib" "@executable_path/libs/$libname" "$BUNDLE_DIR/opennow-streamer" + fi + done + + # Also handle Homebrew paths + for lib in $(otool -L "$BUNDLE_DIR/opennow-streamer" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + if [[ "$lib" == *libav* ]] || [[ "$lib" == *libsw* ]] || [[ "$lib" == *libpostproc* ]]; then + libname=$(basename "$lib") + if [ -f "$lib" ] && [ ! -f "$BUNDLE_DIR/libs/$libname" ]; then + echo "Copying Homebrew lib: $libname" + cp "$lib" "$BUNDLE_DIR/libs/" + install_name_tool -change "$lib" "@executable_path/libs/$libname" "$BUNDLE_DIR/opennow-streamer" + fi + fi + done + + echo "" + echo "=== Bundled libraries ===" + ls -lh "$BUNDLE_DIR/libs/" + + echo "" + echo "=== Final binary dependencies ===" + otool -L "$BUNDLE_DIR/opennow-streamer" - # Build without release creation (dev branch - artifacts only) - - name: Build Tauri app (dev - no release) - if: github.ref != 'refs/heads/main' - uses: tauri-apps/tauri-action@v0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RUSTFLAGS: ${{ env.RUSTFLAGS }} - with: - args: ${{ matrix.target == 'linux-arm64' && '--target aarch64-unknown-linux-gnu --bundles deb,rpm' || (matrix.target == 'windows-arm64' && '--target aarch64-pc-windows-msvc' || '') }} + # ==================== Upload Artifacts ==================== - name: Upload Windows x64 artifacts if: matrix.target == 'windows' uses: actions/upload-artifact@v4 with: - name: opennow-${{ needs.get-version.outputs.version }}-windows-x64 + name: opennow-streamer-${{ needs.get-version.outputs.version }}-windows-x64 path: | - src-tauri/target/release/bundle/msi/*.msi - src-tauri/target/release/bundle/nsis/*.exe + opennow-streamer/target/release/opennow-streamer.exe + opennow-streamer/target/release/*.dll retention-days: 30 - - name: Upload Windows x64 portable exe to release - if: matrix.target == 'windows' && github.ref == 'refs/heads/main' - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ needs.get-version.outputs.version }} - files: src-tauri/target/release/opennow.exe - fail_on_unmatched_files: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Windows ARM64 artifacts if: matrix.target == 'windows-arm64' uses: actions/upload-artifact@v4 with: - name: opennow-${{ needs.get-version.outputs.version }}-windows-arm64 + name: opennow-streamer-${{ needs.get-version.outputs.version }}-windows-arm64 path: | - src-tauri/target/aarch64-pc-windows-msvc/release/bundle/msi/*.msi - src-tauri/target/aarch64-pc-windows-msvc/release/bundle/nsis/*.exe + opennow-streamer/target/aarch64-pc-windows-msvc/release/opennow-streamer.exe + opennow-streamer/target/aarch64-pc-windows-msvc/release/*.dll retention-days: 30 - - name: Upload Windows ARM64 portable exe to release - if: matrix.target == 'windows-arm64' && github.ref == 'refs/heads/main' - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ needs.get-version.outputs.version }} - files: src-tauri/target/aarch64-pc-windows-msvc/release/opennow.exe - fail_on_unmatched_files: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload macOS artifacts if: matrix.target == 'macos' uses: actions/upload-artifact@v4 with: - name: opennow-${{ needs.get-version.outputs.version }}-macos - path: | - src-tauri/target/release/bundle/dmg/*.dmg - src-tauri/target/release/bundle/macos/*.app + name: opennow-streamer-${{ needs.get-version.outputs.version }}-macos + path: opennow-streamer/target/release/bundle/ retention-days: 30 - name: Upload Linux x64 artifacts if: matrix.target == 'linux' uses: actions/upload-artifact@v4 with: - name: opennow-${{ needs.get-version.outputs.version }}-linux-x64 - path: | - src-tauri/target/release/bundle/deb/*.deb - src-tauri/target/release/bundle/appimage/*.AppImage + name: opennow-streamer-${{ needs.get-version.outputs.version }}-linux-x64 + path: opennow-streamer/target/release/opennow-streamer retention-days: 30 - name: Upload Linux ARM64 artifacts if: matrix.target == 'linux-arm64' uses: actions/upload-artifact@v4 with: - name: opennow-${{ needs.get-version.outputs.version }}-linux-arm64 - path: | - src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb - src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/rpm/*.rpm + name: opennow-streamer-${{ needs.get-version.outputs.version }}-linux-arm64 + path: opennow-streamer/target/aarch64-unknown-linux-gnu/release/opennow-streamer retention-days: 30 - # Upload ARM64 builds to release - - name: Upload Linux ARM64 to release - if: matrix.target == 'linux-arm64' && github.ref == 'refs/heads/main' + # ==================== Upload to GitHub Release (main branch only) ==================== + + - name: Create GitHub Release + if: github.ref == 'refs/heads/main' && matrix.target == 'linux' + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{ needs.get-version.outputs.version }} + name: 'OpenNOW ${{ needs.get-version.outputs.version }}' + body: | + ## OpenNOW ${{ needs.get-version.outputs.version }} + + Open source native GeForce NOW client built with Rust. + + ${{ needs.get-version.outputs.release_notes }} + + --- + + ### Downloads + - **Windows x64**: Portable executable with FFmpeg DLLs + - **Windows ARM64**: Portable executable with FFmpeg DLLs (for ARM devices) + - **macOS**: Universal binary (Intel + Apple Silicon) with FFmpeg dylibs + - **Linux x64**: Portable binary (requires system FFmpeg) + - **Linux ARM64**: Portable binary (Raspberry Pi, ARM servers, requires system FFmpeg) + + **Linux users**: Install FFmpeg via your package manager: + ```bash + # Ubuntu/Debian + sudo apt install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev + + # Fedora/RHEL + sudo dnf install ffmpeg-free ffmpeg-free-devel + + # Arch + sudo pacman -S ffmpeg + ``` + + [Sponsor this project](https://github.com/sponsors/zortos293) + draft: false + prerelease: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Windows x64 to release + if: matrix.target == 'windows' && github.ref == 'refs/heads/main' uses: softprops/action-gh-release@v1 with: tag_name: ${{ needs.get-version.outputs.version }} files: | - src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/*.deb - src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/rpm/*.rpm + opennow-streamer/target/release/opennow-streamer.exe + opennow-streamer/target/release/*.dll fail_on_unmatched_files: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Upload Windows ARM64 installers to release + - name: Upload Windows ARM64 to release if: matrix.target == 'windows-arm64' && github.ref == 'refs/heads/main' uses: softprops/action-gh-release@v1 with: tag_name: ${{ needs.get-version.outputs.version }} files: | - src-tauri/target/aarch64-pc-windows-msvc/release/bundle/msi/*.msi - src-tauri/target/aarch64-pc-windows-msvc/release/bundle/nsis/*.exe + opennow-streamer/target/aarch64-pc-windows-msvc/release/opennow-streamer.exe + opennow-streamer/target/aarch64-pc-windows-msvc/release/*.dll + fail_on_unmatched_files: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload macOS to release + if: matrix.target == 'macos' && github.ref == 'refs/heads/main' + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{ needs.get-version.outputs.version }} + files: opennow-streamer/target/release/bundle/* + fail_on_unmatched_files: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Linux x64 to release + if: matrix.target == 'linux' && github.ref == 'refs/heads/main' + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{ needs.get-version.outputs.version }} + files: opennow-streamer/target/release/opennow-streamer + fail_on_unmatched_files: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Linux ARM64 to release + if: matrix.target == 'linux-arm64' && github.ref == 'refs/heads/main' + uses: softprops/action-gh-release@v1 + with: + tag_name: ${{ needs.get-version.outputs.version }} + files: opennow-streamer/target/aarch64-unknown-linux-gnu/release/opennow-streamer fail_on_unmatched_files: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9e536eb5cd9dceb510f2262f3eafd73ef35456e6 Mon Sep 17 00:00:00 2001 From: zortos293 Date: Wed, 31 Dec 2025 02:08:53 +0000 Subject: [PATCH 04/67] Remove Tauri-based frontend and backend, focus on native opennow-streamer - Removed src-tauri/ (old Tauri Rust backend) - Removed src/ (old TypeScript/web frontend) - Removed frontend tooling (Vite, TypeScript configs, bun.lock, index.html) - Updated package.json to focus on native Rust app - Updated README to reflect native-only architecture - Keep opennow-streamer/ as the main native application Co-authored-by: Capy --- README.md | 16 +- bun.lock | 249 - index.html | 492 -- package.json | 27 +- src-tauri/Cargo.lock | 9852 ------------------------- src-tauri/Cargo.toml | 87 - src-tauri/build.rs | 5 - src-tauri/capabilities/default.json | 39 - src-tauri/icons/128x128.png | Bin 2854 -> 0 bytes src-tauri/icons/128x128@2x.png | Bin 6884 -> 0 bytes src-tauri/icons/32x32.png | Bin 796 -> 0 bytes src-tauri/icons/icon.ico | Bin 1086 -> 0 bytes src-tauri/icons/icon.png | Bin 17986 -> 0 bytes src-tauri/src/api.rs | 1911 ----- src-tauri/src/auth.rs | 1300 ---- src-tauri/src/config.rs | 204 - src-tauri/src/cursor.rs | 597 -- src-tauri/src/discord.rs | 356 - src-tauri/src/games.rs | 151 - src-tauri/src/keyboard_hook.rs | 117 - src-tauri/src/lib.rs | 172 - src-tauri/src/logging.rs | 284 - src-tauri/src/main.rs | 6 - src-tauri/src/mouse_capture.rs | 146 - src-tauri/src/native/gui.rs | 1551 ---- src-tauri/src/native/input.rs | 239 - src-tauri/src/native/main.rs | 970 --- src-tauri/src/native/mod.rs | 3 - src-tauri/src/native/signaling.rs | 369 - src-tauri/src/native/webrtc_client.rs | 327 - src-tauri/src/proxy.rs | 187 - src-tauri/src/raw_input.rs | 559 -- src-tauri/src/recording.rs | 181 - src-tauri/src/streaming.rs | 2015 ----- src-tauri/src/utils.rs | 49 - src-tauri/tauri.conf.json | 59 - src/keyboard-lock.d.ts | 11 - src/logging.ts | 102 - src/main.ts | 5550 -------------- src/recording.ts | 648 -- src/streaming.ts | 3354 --------- src/styles/main.css | 1814 ----- tsconfig.json | 19 - vite.config.ts | 24 - 44 files changed, 21 insertions(+), 34021 deletions(-) delete mode 100644 bun.lock delete mode 100644 index.html delete mode 100644 src-tauri/Cargo.lock delete mode 100644 src-tauri/Cargo.toml delete mode 100644 src-tauri/build.rs delete mode 100644 src-tauri/capabilities/default.json delete mode 100644 src-tauri/icons/128x128.png delete mode 100644 src-tauri/icons/128x128@2x.png delete mode 100644 src-tauri/icons/32x32.png delete mode 100644 src-tauri/icons/icon.ico delete mode 100644 src-tauri/icons/icon.png delete mode 100644 src-tauri/src/api.rs delete mode 100644 src-tauri/src/auth.rs delete mode 100644 src-tauri/src/config.rs delete mode 100644 src-tauri/src/cursor.rs delete mode 100644 src-tauri/src/discord.rs delete mode 100644 src-tauri/src/games.rs delete mode 100644 src-tauri/src/keyboard_hook.rs delete mode 100644 src-tauri/src/lib.rs delete mode 100644 src-tauri/src/logging.rs delete mode 100644 src-tauri/src/main.rs delete mode 100644 src-tauri/src/mouse_capture.rs delete mode 100644 src-tauri/src/native/gui.rs delete mode 100644 src-tauri/src/native/input.rs delete mode 100644 src-tauri/src/native/main.rs delete mode 100644 src-tauri/src/native/mod.rs delete mode 100644 src-tauri/src/native/signaling.rs delete mode 100644 src-tauri/src/native/webrtc_client.rs delete mode 100644 src-tauri/src/proxy.rs delete mode 100644 src-tauri/src/raw_input.rs delete mode 100644 src-tauri/src/recording.rs delete mode 100644 src-tauri/src/streaming.rs delete mode 100644 src-tauri/src/utils.rs delete mode 100644 src-tauri/tauri.conf.json delete mode 100644 src/keyboard-lock.d.ts delete mode 100644 src/logging.ts delete mode 100644 src/main.ts delete mode 100644 src/recording.ts delete mode 100644 src/streaming.ts delete mode 100644 src/styles/main.css delete mode 100644 tsconfig.json delete mode 100644 vite.config.ts diff --git a/README.md b/README.md index 6b216c2..bd1fd91 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This is an **independent project** not affiliated with NVIDIA Corporation. Creat ## About -OpenNOW is a custom GeForce NOW client created by reverse engineering the official NVIDIA client. Built with Tauri (Rust + TypeScript), it removes artificial limitations and gives you full control over your cloud gaming experience. +OpenNOW is a custom GeForce NOW client created by reverse engineering the official NVIDIA client. Built as a native Rust application with high-performance GPU rendering (wgpu + egui), it removes artificial limitations and gives you full control over your cloud gaming experience. **Why OpenNOW?** - No artificial limitations on FPS, resolution, or bitrate @@ -99,12 +99,18 @@ OpenNOW is a custom GeForce NOW client created by reverse engineering the offici ```bash git clone https://github.com/zortos293/GFNClient.git -cd GFNClient -bun install -bun run tauri dev +cd GFNClient/opennow-streamer +cargo build --release ``` -**Requirements:** Bun, Rust, Tauri CLI +To run in development mode: + +```bash +cd opennow-streamer +cargo run +``` + +**Requirements:** Rust toolchain (1.70+), FFmpeg development libraries --- diff --git a/bun.lock b/bun.lock deleted file mode 100644 index 6b840b3..0000000 --- a/bun.lock +++ /dev/null @@ -1,249 +0,0 @@ -{ - "lockfileVersion": 1, - "configVersion": 1, - "workspaces": { - "": { - "name": "opennow", - "dependencies": { - "@tauri-apps/plugin-http": "^2.0.0", - }, - "devDependencies": { - "@tauri-apps/api": "^2.9.1", - "@tauri-apps/cli": "^2.9.6", - "esbuild": "^0.27.2", - "sharp": "^0.34.5", - "typescript": "^5.9.3", - "vite": "npm:rolldown-vite@^7.3.0", - }, - }, - }, - "packages": { - "@emnapi/core": ["@emnapi/core@1.7.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" } }, "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg=="], - - "@emnapi/runtime": ["@emnapi/runtime@1.7.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA=="], - - "@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.1.0", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ=="], - - "@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.27.2", "", { "os": "aix", "cpu": "ppc64" }, "sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw=="], - - "@esbuild/android-arm": ["@esbuild/android-arm@0.27.2", "", { "os": "android", "cpu": "arm" }, "sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA=="], - - "@esbuild/android-arm64": ["@esbuild/android-arm64@0.27.2", "", { "os": "android", "cpu": "arm64" }, "sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA=="], - - "@esbuild/android-x64": ["@esbuild/android-x64@0.27.2", "", { "os": "android", "cpu": "x64" }, "sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A=="], - - "@esbuild/darwin-arm64": ["@esbuild/darwin-arm64@0.27.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg=="], - - "@esbuild/darwin-x64": ["@esbuild/darwin-x64@0.27.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA=="], - - "@esbuild/freebsd-arm64": ["@esbuild/freebsd-arm64@0.27.2", "", { "os": "freebsd", "cpu": "arm64" }, "sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g=="], - - "@esbuild/freebsd-x64": ["@esbuild/freebsd-x64@0.27.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA=="], - - "@esbuild/linux-arm": ["@esbuild/linux-arm@0.27.2", "", { "os": "linux", "cpu": "arm" }, "sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw=="], - - "@esbuild/linux-arm64": ["@esbuild/linux-arm64@0.27.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw=="], - - "@esbuild/linux-ia32": ["@esbuild/linux-ia32@0.27.2", "", { "os": "linux", "cpu": "ia32" }, "sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w=="], - - "@esbuild/linux-loong64": ["@esbuild/linux-loong64@0.27.2", "", { "os": "linux", "cpu": "none" }, "sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg=="], - - "@esbuild/linux-mips64el": ["@esbuild/linux-mips64el@0.27.2", "", { "os": "linux", "cpu": "none" }, "sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw=="], - - "@esbuild/linux-ppc64": ["@esbuild/linux-ppc64@0.27.2", "", { "os": "linux", "cpu": "ppc64" }, "sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ=="], - - "@esbuild/linux-riscv64": ["@esbuild/linux-riscv64@0.27.2", "", { "os": "linux", "cpu": "none" }, "sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA=="], - - "@esbuild/linux-s390x": ["@esbuild/linux-s390x@0.27.2", "", { "os": "linux", "cpu": "s390x" }, "sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w=="], - - "@esbuild/linux-x64": ["@esbuild/linux-x64@0.27.2", "", { "os": "linux", "cpu": "x64" }, "sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA=="], - - "@esbuild/netbsd-arm64": ["@esbuild/netbsd-arm64@0.27.2", "", { "os": "none", "cpu": "arm64" }, "sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw=="], - - "@esbuild/netbsd-x64": ["@esbuild/netbsd-x64@0.27.2", "", { "os": "none", "cpu": "x64" }, "sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA=="], - - "@esbuild/openbsd-arm64": ["@esbuild/openbsd-arm64@0.27.2", "", { "os": "openbsd", "cpu": "arm64" }, "sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA=="], - - "@esbuild/openbsd-x64": ["@esbuild/openbsd-x64@0.27.2", "", { "os": "openbsd", "cpu": "x64" }, "sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg=="], - - "@esbuild/openharmony-arm64": ["@esbuild/openharmony-arm64@0.27.2", "", { "os": "none", "cpu": "arm64" }, "sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag=="], - - "@esbuild/sunos-x64": ["@esbuild/sunos-x64@0.27.2", "", { "os": "sunos", "cpu": "x64" }, "sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg=="], - - "@esbuild/win32-arm64": ["@esbuild/win32-arm64@0.27.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg=="], - - "@esbuild/win32-ia32": ["@esbuild/win32-ia32@0.27.2", "", { "os": "win32", "cpu": "ia32" }, "sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ=="], - - "@esbuild/win32-x64": ["@esbuild/win32-x64@0.27.2", "", { "os": "win32", "cpu": "x64" }, "sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ=="], - - "@img/colour": ["@img/colour@1.0.0", "", {}, "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw=="], - - "@img/sharp-darwin-arm64": ["@img/sharp-darwin-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-arm64": "1.2.4" }, "os": "darwin", "cpu": "arm64" }, "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w=="], - - "@img/sharp-darwin-x64": ["@img/sharp-darwin-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-darwin-x64": "1.2.4" }, "os": "darwin", "cpu": "x64" }, "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw=="], - - "@img/sharp-libvips-darwin-arm64": ["@img/sharp-libvips-darwin-arm64@1.2.4", "", { "os": "darwin", "cpu": "arm64" }, "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g=="], - - "@img/sharp-libvips-darwin-x64": ["@img/sharp-libvips-darwin-x64@1.2.4", "", { "os": "darwin", "cpu": "x64" }, "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg=="], - - "@img/sharp-libvips-linux-arm": ["@img/sharp-libvips-linux-arm@1.2.4", "", { "os": "linux", "cpu": "arm" }, "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A=="], - - "@img/sharp-libvips-linux-arm64": ["@img/sharp-libvips-linux-arm64@1.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw=="], - - "@img/sharp-libvips-linux-ppc64": ["@img/sharp-libvips-linux-ppc64@1.2.4", "", { "os": "linux", "cpu": "ppc64" }, "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA=="], - - "@img/sharp-libvips-linux-riscv64": ["@img/sharp-libvips-linux-riscv64@1.2.4", "", { "os": "linux", "cpu": "none" }, "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA=="], - - "@img/sharp-libvips-linux-s390x": ["@img/sharp-libvips-linux-s390x@1.2.4", "", { "os": "linux", "cpu": "s390x" }, "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ=="], - - "@img/sharp-libvips-linux-x64": ["@img/sharp-libvips-linux-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw=="], - - "@img/sharp-libvips-linuxmusl-arm64": ["@img/sharp-libvips-linuxmusl-arm64@1.2.4", "", { "os": "linux", "cpu": "arm64" }, "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw=="], - - "@img/sharp-libvips-linuxmusl-x64": ["@img/sharp-libvips-linuxmusl-x64@1.2.4", "", { "os": "linux", "cpu": "x64" }, "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg=="], - - "@img/sharp-linux-arm": ["@img/sharp-linux-arm@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm": "1.2.4" }, "os": "linux", "cpu": "arm" }, "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw=="], - - "@img/sharp-linux-arm64": ["@img/sharp-linux-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg=="], - - "@img/sharp-linux-ppc64": ["@img/sharp-linux-ppc64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-ppc64": "1.2.4" }, "os": "linux", "cpu": "ppc64" }, "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA=="], - - "@img/sharp-linux-riscv64": ["@img/sharp-linux-riscv64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-riscv64": "1.2.4" }, "os": "linux", "cpu": "none" }, "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw=="], - - "@img/sharp-linux-s390x": ["@img/sharp-linux-s390x@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-s390x": "1.2.4" }, "os": "linux", "cpu": "s390x" }, "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg=="], - - "@img/sharp-linux-x64": ["@img/sharp-linux-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linux-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ=="], - - "@img/sharp-linuxmusl-arm64": ["@img/sharp-linuxmusl-arm64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" }, "os": "linux", "cpu": "arm64" }, "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg=="], - - "@img/sharp-linuxmusl-x64": ["@img/sharp-linuxmusl-x64@0.34.5", "", { "optionalDependencies": { "@img/sharp-libvips-linuxmusl-x64": "1.2.4" }, "os": "linux", "cpu": "x64" }, "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q=="], - - "@img/sharp-wasm32": ["@img/sharp-wasm32@0.34.5", "", { "dependencies": { "@emnapi/runtime": "^1.7.0" }, "cpu": "none" }, "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw=="], - - "@img/sharp-win32-arm64": ["@img/sharp-win32-arm64@0.34.5", "", { "os": "win32", "cpu": "arm64" }, "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g=="], - - "@img/sharp-win32-ia32": ["@img/sharp-win32-ia32@0.34.5", "", { "os": "win32", "cpu": "ia32" }, "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg=="], - - "@img/sharp-win32-x64": ["@img/sharp-win32-x64@0.34.5", "", { "os": "win32", "cpu": "x64" }, "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw=="], - - "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.0", "", { "dependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1", "@tybys/wasm-util": "^0.10.1" } }, "sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA=="], - - "@oxc-project/runtime": ["@oxc-project/runtime@0.101.0", "", {}, "sha512-t3qpfVZIqSiLQ5Kqt/MC4Ge/WCOGrrcagAdzTcDaggupjiGxUx4nJF2v6wUCXWSzWHn5Ns7XLv13fCJEwCOERQ=="], - - "@oxc-project/types": ["@oxc-project/types@0.101.0", "", {}, "sha512-nuFhqlUzJX+gVIPPfuE6xurd4lST3mdcWOhyK/rZO0B9XWMKm79SuszIQEnSMmmDhq1DC8WWVYGVd+6F93o1gQ=="], - - "@rolldown/binding-android-arm64": ["@rolldown/binding-android-arm64@1.0.0-beta.53", "", { "os": "android", "cpu": "arm64" }, "sha512-Ok9V8o7o6YfSdTTYA/uHH30r3YtOxLD6G3wih/U9DO0ucBBFq8WPt/DslU53OgfteLRHITZny9N/qCUxMf9kjQ=="], - - "@rolldown/binding-darwin-arm64": ["@rolldown/binding-darwin-arm64@1.0.0-beta.53", "", { "os": "darwin", "cpu": "arm64" }, "sha512-yIsKqMz0CtRnVa6x3Pa+mzTihr4Ty+Z6HfPbZ7RVbk1Uxnco4+CUn7Qbm/5SBol1JD/7nvY8rphAgyAi7Lj6Vg=="], - - "@rolldown/binding-darwin-x64": ["@rolldown/binding-darwin-x64@1.0.0-beta.53", "", { "os": "darwin", "cpu": "x64" }, "sha512-GTXe+mxsCGUnJOFMhfGWmefP7Q9TpYUseHvhAhr21nCTgdS8jPsvirb0tJwM3lN0/u/cg7bpFNa16fQrjKrCjQ=="], - - "@rolldown/binding-freebsd-x64": ["@rolldown/binding-freebsd-x64@1.0.0-beta.53", "", { "os": "freebsd", "cpu": "x64" }, "sha512-9Tmp7bBvKqyDkMcL4e089pH3RsjD3SUungjmqWtyhNOxoQMh0fSmINTyYV8KXtE+JkxYMPWvnEt+/mfpVCkk8w=="], - - "@rolldown/binding-linux-arm-gnueabihf": ["@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.53", "", { "os": "linux", "cpu": "arm" }, "sha512-a1y5fiB0iovuzdbjUxa7+Zcvgv+mTmlGGC4XydVIsyl48eoxgaYkA3l9079hyTyhECsPq+mbr0gVQsFU11OJAQ=="], - - "@rolldown/binding-linux-arm64-gnu": ["@rolldown/binding-linux-arm64-gnu@1.0.0-beta.53", "", { "os": "linux", "cpu": "arm64" }, "sha512-bpIGX+ov9PhJYV+wHNXl9rzq4F0QvILiURn0y0oepbQx+7stmQsKA0DhPGwmhfvF856wq+gbM8L92SAa/CBcLg=="], - - "@rolldown/binding-linux-arm64-musl": ["@rolldown/binding-linux-arm64-musl@1.0.0-beta.53", "", { "os": "linux", "cpu": "arm64" }, "sha512-bGe5EBB8FVjHBR1mOLOPEFg1Lp3//7geqWkU5NIhxe+yH0W8FVrQ6WRYOap4SUTKdklD/dC4qPLREkMMQ855FA=="], - - "@rolldown/binding-linux-x64-gnu": ["@rolldown/binding-linux-x64-gnu@1.0.0-beta.53", "", { "os": "linux", "cpu": "x64" }, "sha512-qL+63WKVQs1CMvFedlPt0U9PiEKJOAL/bsHMKUDS6Vp2Q+YAv/QLPu8rcvkfIMvQ0FPU2WL0aX4eWwF6e/GAnA=="], - - "@rolldown/binding-linux-x64-musl": ["@rolldown/binding-linux-x64-musl@1.0.0-beta.53", "", { "os": "linux", "cpu": "x64" }, "sha512-VGl9JIGjoJh3H8Mb+7xnVqODajBmrdOOb9lxWXdcmxyI+zjB2sux69br0hZJDTyLJfvBoYm439zPACYbCjGRmw=="], - - "@rolldown/binding-openharmony-arm64": ["@rolldown/binding-openharmony-arm64@1.0.0-beta.53", "", { "os": "none", "cpu": "arm64" }, "sha512-B4iIserJXuSnNzA5xBLFUIjTfhNy7d9sq4FUMQY3GhQWGVhS2RWWzzDnkSU6MUt7/aHUrep0CdQfXUJI9D3W7A=="], - - "@rolldown/binding-wasm32-wasi": ["@rolldown/binding-wasm32-wasi@1.0.0-beta.53", "", { "dependencies": { "@napi-rs/wasm-runtime": "^1.1.0" }, "cpu": "none" }, "sha512-BUjAEgpABEJXilGq/BPh7jeU3WAJ5o15c1ZEgHaDWSz3LB881LQZnbNJHmUiM4d1JQWMYYyR1Y490IBHi2FPJg=="], - - "@rolldown/binding-win32-arm64-msvc": ["@rolldown/binding-win32-arm64-msvc@1.0.0-beta.53", "", { "os": "win32", "cpu": "arm64" }, "sha512-s27uU7tpCWSjHBnxyVXHt3rMrQdJq5MHNv3BzsewCIroIw3DJFjMH1dzCPPMUFxnh1r52Nf9IJ/eWp6LDoyGcw=="], - - "@rolldown/binding-win32-x64-msvc": ["@rolldown/binding-win32-x64-msvc@1.0.0-beta.53", "", { "os": "win32", "cpu": "x64" }, "sha512-cjWL/USPJ1g0en2htb4ssMjIycc36RvdQAx1WlXnS6DpULswiUTVXPDesTifSKYSyvx24E0YqQkEm0K/M2Z/AA=="], - - "@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-beta.53", "", {}, "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ=="], - - "@tauri-apps/api": ["@tauri-apps/api@2.9.1", "", {}, "sha512-IGlhP6EivjXHepbBic618GOmiWe4URJiIeZFlB7x3czM0yDHHYviH1Xvoiv4FefdkQtn6v7TuwWCRfOGdnVUGw=="], - - "@tauri-apps/cli": ["@tauri-apps/cli@2.9.6", "", { "optionalDependencies": { "@tauri-apps/cli-darwin-arm64": "2.9.6", "@tauri-apps/cli-darwin-x64": "2.9.6", "@tauri-apps/cli-linux-arm-gnueabihf": "2.9.6", "@tauri-apps/cli-linux-arm64-gnu": "2.9.6", "@tauri-apps/cli-linux-arm64-musl": "2.9.6", "@tauri-apps/cli-linux-riscv64-gnu": "2.9.6", "@tauri-apps/cli-linux-x64-gnu": "2.9.6", "@tauri-apps/cli-linux-x64-musl": "2.9.6", "@tauri-apps/cli-win32-arm64-msvc": "2.9.6", "@tauri-apps/cli-win32-ia32-msvc": "2.9.6", "@tauri-apps/cli-win32-x64-msvc": "2.9.6" }, "bin": { "tauri": "tauri.js" } }, "sha512-3xDdXL5omQ3sPfBfdC8fCtDKcnyV7OqyzQgfyT5P3+zY6lcPqIYKQBvUasNvppi21RSdfhy44ttvJmftb0PCDw=="], - - "@tauri-apps/cli-darwin-arm64": ["@tauri-apps/cli-darwin-arm64@2.9.6", "", { "os": "darwin", "cpu": "arm64" }, "sha512-gf5no6N9FCk1qMrti4lfwP77JHP5haASZgVbBgpZG7BUepB3fhiLCXGUK8LvuOjP36HivXewjg72LTnPDScnQQ=="], - - "@tauri-apps/cli-darwin-x64": ["@tauri-apps/cli-darwin-x64@2.9.6", "", { "os": "darwin", "cpu": "x64" }, "sha512-oWh74WmqbERwwrwcueJyY6HYhgCksUc6NT7WKeXyrlY/FPmNgdyQAgcLuTSkhRFuQ6zh4Np1HZpOqCTpeZBDcw=="], - - "@tauri-apps/cli-linux-arm-gnueabihf": ["@tauri-apps/cli-linux-arm-gnueabihf@2.9.6", "", { "os": "linux", "cpu": "arm" }, "sha512-/zde3bFroFsNXOHN204DC2qUxAcAanUjVXXSdEGmhwMUZeAQalNj5cz2Qli2elsRjKN/hVbZOJj0gQ5zaYUjSg=="], - - "@tauri-apps/cli-linux-arm64-gnu": ["@tauri-apps/cli-linux-arm64-gnu@2.9.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-pvbljdhp9VOo4RnID5ywSxgBs7qiylTPlK56cTk7InR3kYSTJKYMqv/4Q/4rGo/mG8cVppesKIeBMH42fw6wjg=="], - - "@tauri-apps/cli-linux-arm64-musl": ["@tauri-apps/cli-linux-arm64-musl@2.9.6", "", { "os": "linux", "cpu": "arm64" }, "sha512-02TKUndpodXBCR0oP//6dZWGYcc22Upf2eP27NvC6z0DIqvkBBFziQUcvi2n6SrwTRL0yGgQjkm9K5NIn8s6jw=="], - - "@tauri-apps/cli-linux-riscv64-gnu": ["@tauri-apps/cli-linux-riscv64-gnu@2.9.6", "", { "os": "linux", "cpu": "none" }, "sha512-fmp1hnulbqzl1GkXl4aTX9fV+ubHw2LqlLH1PE3BxZ11EQk+l/TmiEongjnxF0ie4kV8DQfDNJ1KGiIdWe1GvQ=="], - - "@tauri-apps/cli-linux-x64-gnu": ["@tauri-apps/cli-linux-x64-gnu@2.9.6", "", { "os": "linux", "cpu": "x64" }, "sha512-vY0le8ad2KaV1PJr+jCd8fUF9VOjwwQP/uBuTJvhvKTloEwxYA/kAjKK9OpIslGA9m/zcnSo74czI6bBrm2sYA=="], - - "@tauri-apps/cli-linux-x64-musl": ["@tauri-apps/cli-linux-x64-musl@2.9.6", "", { "os": "linux", "cpu": "x64" }, "sha512-TOEuB8YCFZTWVDzsO2yW0+zGcoMiPPwcUgdnW1ODnmgfwccpnihDRoks+ABT1e3fHb1ol8QQWsHSCovb3o2ENQ=="], - - "@tauri-apps/cli-win32-arm64-msvc": ["@tauri-apps/cli-win32-arm64-msvc@2.9.6", "", { "os": "win32", "cpu": "arm64" }, "sha512-ujmDGMRc4qRLAnj8nNG26Rlz9klJ0I0jmZs2BPpmNNf0gM/rcVHhqbEkAaHPTBVIrtUdf7bGvQAD2pyIiUrBHQ=="], - - "@tauri-apps/cli-win32-ia32-msvc": ["@tauri-apps/cli-win32-ia32-msvc@2.9.6", "", { "os": "win32", "cpu": "ia32" }, "sha512-S4pT0yAJgFX8QRCyKA1iKjZ9Q/oPjCZf66A/VlG5Yw54Nnr88J1uBpmenINbXxzyhduWrIXBaUbEY1K80ZbpMg=="], - - "@tauri-apps/cli-win32-x64-msvc": ["@tauri-apps/cli-win32-x64-msvc@2.9.6", "", { "os": "win32", "cpu": "x64" }, "sha512-ldWuWSSkWbKOPjQMJoYVj9wLHcOniv7diyI5UAJ4XsBdtaFB0pKHQsqw/ItUma0VXGC7vB4E9fZjivmxur60aw=="], - - "@tauri-apps/plugin-http": ["@tauri-apps/plugin-http@2.5.4", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-/i4U/9za3mrytTgfRn5RHneKubZE/dwRmshYwyMvNRlkWjvu1m4Ma72kcbVJMZFGXpkbl+qLyWMGrihtWB76Zg=="], - - "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="], - - "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], - - "esbuild": ["esbuild@0.27.2", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.27.2", "@esbuild/android-arm": "0.27.2", "@esbuild/android-arm64": "0.27.2", "@esbuild/android-x64": "0.27.2", "@esbuild/darwin-arm64": "0.27.2", "@esbuild/darwin-x64": "0.27.2", "@esbuild/freebsd-arm64": "0.27.2", "@esbuild/freebsd-x64": "0.27.2", "@esbuild/linux-arm": "0.27.2", "@esbuild/linux-arm64": "0.27.2", "@esbuild/linux-ia32": "0.27.2", "@esbuild/linux-loong64": "0.27.2", "@esbuild/linux-mips64el": "0.27.2", "@esbuild/linux-ppc64": "0.27.2", "@esbuild/linux-riscv64": "0.27.2", "@esbuild/linux-s390x": "0.27.2", "@esbuild/linux-x64": "0.27.2", "@esbuild/netbsd-arm64": "0.27.2", "@esbuild/netbsd-x64": "0.27.2", "@esbuild/openbsd-arm64": "0.27.2", "@esbuild/openbsd-x64": "0.27.2", "@esbuild/openharmony-arm64": "0.27.2", "@esbuild/sunos-x64": "0.27.2", "@esbuild/win32-arm64": "0.27.2", "@esbuild/win32-ia32": "0.27.2", "@esbuild/win32-x64": "0.27.2" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw=="], - - "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], - - "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="], - - "lightningcss": ["lightningcss@1.30.2", "", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.30.2", "lightningcss-darwin-arm64": "1.30.2", "lightningcss-darwin-x64": "1.30.2", "lightningcss-freebsd-x64": "1.30.2", "lightningcss-linux-arm-gnueabihf": "1.30.2", "lightningcss-linux-arm64-gnu": "1.30.2", "lightningcss-linux-arm64-musl": "1.30.2", "lightningcss-linux-x64-gnu": "1.30.2", "lightningcss-linux-x64-musl": "1.30.2", "lightningcss-win32-arm64-msvc": "1.30.2", "lightningcss-win32-x64-msvc": "1.30.2" } }, "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ=="], - - "lightningcss-android-arm64": ["lightningcss-android-arm64@1.30.2", "", { "os": "android", "cpu": "arm64" }, "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A=="], - - "lightningcss-darwin-arm64": ["lightningcss-darwin-arm64@1.30.2", "", { "os": "darwin", "cpu": "arm64" }, "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA=="], - - "lightningcss-darwin-x64": ["lightningcss-darwin-x64@1.30.2", "", { "os": "darwin", "cpu": "x64" }, "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ=="], - - "lightningcss-freebsd-x64": ["lightningcss-freebsd-x64@1.30.2", "", { "os": "freebsd", "cpu": "x64" }, "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA=="], - - "lightningcss-linux-arm-gnueabihf": ["lightningcss-linux-arm-gnueabihf@1.30.2", "", { "os": "linux", "cpu": "arm" }, "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA=="], - - "lightningcss-linux-arm64-gnu": ["lightningcss-linux-arm64-gnu@1.30.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A=="], - - "lightningcss-linux-arm64-musl": ["lightningcss-linux-arm64-musl@1.30.2", "", { "os": "linux", "cpu": "arm64" }, "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA=="], - - "lightningcss-linux-x64-gnu": ["lightningcss-linux-x64-gnu@1.30.2", "", { "os": "linux", "cpu": "x64" }, "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w=="], - - "lightningcss-linux-x64-musl": ["lightningcss-linux-x64-musl@1.30.2", "", { "os": "linux", "cpu": "x64" }, "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA=="], - - "lightningcss-win32-arm64-msvc": ["lightningcss-win32-arm64-msvc@1.30.2", "", { "os": "win32", "cpu": "arm64" }, "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ=="], - - "lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.30.2", "", { "os": "win32", "cpu": "x64" }, "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw=="], - - "nanoid": ["nanoid@3.3.11", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="], - - "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], - - "picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="], - - "postcss": ["postcss@8.5.6", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg=="], - - "rolldown": ["rolldown@1.0.0-beta.53", "", { "dependencies": { "@oxc-project/types": "=0.101.0", "@rolldown/pluginutils": "1.0.0-beta.53" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.0-beta.53", "@rolldown/binding-darwin-arm64": "1.0.0-beta.53", "@rolldown/binding-darwin-x64": "1.0.0-beta.53", "@rolldown/binding-freebsd-x64": "1.0.0-beta.53", "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-beta.53", "@rolldown/binding-linux-arm64-gnu": "1.0.0-beta.53", "@rolldown/binding-linux-arm64-musl": "1.0.0-beta.53", "@rolldown/binding-linux-x64-gnu": "1.0.0-beta.53", "@rolldown/binding-linux-x64-musl": "1.0.0-beta.53", "@rolldown/binding-openharmony-arm64": "1.0.0-beta.53", "@rolldown/binding-wasm32-wasi": "1.0.0-beta.53", "@rolldown/binding-win32-arm64-msvc": "1.0.0-beta.53", "@rolldown/binding-win32-x64-msvc": "1.0.0-beta.53" }, "bin": { "rolldown": "bin/cli.mjs" } }, "sha512-Qd9c2p0XKZdgT5AYd+KgAMggJ8ZmCs3JnS9PTMWkyUfteKlfmKtxJbWTHkVakxwXs1Ub7jrRYVeFeF7N0sQxyw=="], - - "semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="], - - "sharp": ["sharp@0.34.5", "", { "dependencies": { "@img/colour": "^1.0.0", "detect-libc": "^2.1.2", "semver": "^7.7.3" }, "optionalDependencies": { "@img/sharp-darwin-arm64": "0.34.5", "@img/sharp-darwin-x64": "0.34.5", "@img/sharp-libvips-darwin-arm64": "1.2.4", "@img/sharp-libvips-darwin-x64": "1.2.4", "@img/sharp-libvips-linux-arm": "1.2.4", "@img/sharp-libvips-linux-arm64": "1.2.4", "@img/sharp-libvips-linux-ppc64": "1.2.4", "@img/sharp-libvips-linux-riscv64": "1.2.4", "@img/sharp-libvips-linux-s390x": "1.2.4", "@img/sharp-libvips-linux-x64": "1.2.4", "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", "@img/sharp-libvips-linuxmusl-x64": "1.2.4", "@img/sharp-linux-arm": "0.34.5", "@img/sharp-linux-arm64": "0.34.5", "@img/sharp-linux-ppc64": "0.34.5", "@img/sharp-linux-riscv64": "0.34.5", "@img/sharp-linux-s390x": "0.34.5", "@img/sharp-linux-x64": "0.34.5", "@img/sharp-linuxmusl-arm64": "0.34.5", "@img/sharp-linuxmusl-x64": "0.34.5", "@img/sharp-wasm32": "0.34.5", "@img/sharp-win32-arm64": "0.34.5", "@img/sharp-win32-ia32": "0.34.5", "@img/sharp-win32-x64": "0.34.5" } }, "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg=="], - - "source-map-js": ["source-map-js@1.2.1", "", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="], - - "tinyglobby": ["tinyglobby@0.2.15", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.3" } }, "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="], - - "tslib": ["tslib@2.8.1", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="], - - "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], - - "vite": ["rolldown-vite@7.3.0", "", { "dependencies": { "@oxc-project/runtime": "0.101.0", "fdir": "^6.5.0", "lightningcss": "^1.30.2", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rolldown": "1.0.0-beta.53", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "esbuild": "^0.27.0", "jiti": ">=1.21.0", "less": "^4.0.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "esbuild", "jiti", "less", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-5hI5NCJwKBGtzWtdKB3c2fOEpI77Iaa0z4mSzZPU1cJ/OqrGbFafm90edVCd7T9Snz+Sh09TMAv4EQqyVLzuEg=="], - } -} diff --git a/index.html b/index.html deleted file mode 100644 index e17ea65..0000000 --- a/index.html +++ /dev/null @@ -1,492 +0,0 @@ - - - - - - - OpenNOW - - - - -
- -
-
- -
-
-
- - - -
-
-
-
- - -
- -
-
- - -
- -
-
-

Featured Games

- -
- -
-

Recently Added

-
-
- -
-

Free to Play

-
-
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- ● Connected -
-
- Server: Auto - Ping: --ms -
-
-
- - - - diff --git a/package.json b/package.json index c68e8dc..ac74280 100644 --- a/package.json +++ b/package.json @@ -1,23 +1,16 @@ { - "name": "opennow", + "name": "opennow-streamer", "version": "0.1.0", - "description": "OpenNOW - Open source GeForce NOW client", - "type": "module", + "description": "OpenNOW - Native GeForce NOW streaming client built from the ground up", "scripts": { - "dev": "vite", - "build": "tsc && vite build", - "preview": "vite preview", - "tauri": "tauri" + "build": "cd opennow-streamer && cargo build --release", + "dev": "cd opennow-streamer && cargo run", + "test": "cd opennow-streamer && cargo test" }, - "dependencies": { - "@tauri-apps/plugin-http": "^2.0.0" + "repository": { + "type": "git", + "url": "https://github.com/zortos293/GFNClient.git" }, - "devDependencies": { - "@tauri-apps/api": "^2.9.1", - "@tauri-apps/cli": "^2.9.6", - "esbuild": "^0.27.2", - "sharp": "^0.34.5", - "typescript": "^5.9.3", - "vite": "npm:rolldown-vite@^7.3.0" - } + "author": "zortos293", + "license": "MIT" } diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock deleted file mode 100644 index 6c5fb98..0000000 --- a/src-tauri/Cargo.lock +++ /dev/null @@ -1,9852 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 4 - -[[package]] -name = "ab_glyph" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" - -[[package]] -name = "accesskit" -version = "0.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b76d84ee70e30a4a7e39ab9018e2b17a6a09e31084176cc7c0b2dec036ba45" - -[[package]] -name = "accesskit_atspi_common" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5393c75d4666f580f4cac0a968bc97c36076bb536a129f28210dac54ee127ed" -dependencies = [ - "accesskit", - "accesskit_consumer", - "atspi-common", - "serde", - "thiserror 1.0.69", - "zvariant 4.2.0", -] - -[[package]] -name = "accesskit_consumer" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a12dc159d52233c43d9fe5415969433cbdd52c3d6e0df51bda7d447427b9986" -dependencies = [ - "accesskit", - "immutable-chunkmap", -] - -[[package]] -name = "accesskit_macos" -version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc6c1ecd82053d127961ad80a8beaa6004fb851a3a5b96506d7a6bd462403f6" -dependencies = [ - "accesskit", - "accesskit_consumer", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", - "once_cell", -] - -[[package]] -name = "accesskit_unix" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be7f5cf6165be10a54b2655fa2e0e12b2509f38ed6fc43e11c31fdb7ee6230bb" -dependencies = [ - "accesskit", - "accesskit_atspi_common", - "async-channel", - "async-executor", - "async-task", - "atspi", - "futures-lite", - "futures-util", - "serde", - "zbus 4.4.0", -] - -[[package]] -name = "accesskit_windows" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "974e96c347384d9133427167fb8a58c340cb0496988dacceebdc1ed27071023b" -dependencies = [ - "accesskit", - "accesskit_consumer", - "paste", - "static_assertions", - "windows 0.58.0", - "windows-core 0.58.0", -] - -[[package]] -name = "accesskit_winit" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aea3522719f1c44564d03e9469a8e2f3a98b3a8a880bd66d0789c6b9c4a669dd" -dependencies = [ - "accesskit", - "accesskit_macos", - "accesskit_unix", - "accesskit_windows", - "raw-window-handle", - "winit", -] - -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "getrandom 0.3.4", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - -[[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" -dependencies = [ - "alloc-no-stdlib", -] - -[[package]] -name = "alsa" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" -dependencies = [ - "alsa-sys", - "bitflags 2.10.0", - "cfg-if", - "libc", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "android-activity" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" -dependencies = [ - "android-properties", - "bitflags 2.10.0", - "cc", - "cesu8", - "jni", - "jni-sys", - "libc", - "log", - "ndk 0.9.0", - "ndk-context", - "ndk-sys 0.6.0+11769913", - "num_enum", - "thiserror 1.0.69", -] - -[[package]] -name = "android-properties" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", -] - -[[package]] -name = "anyhow" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" - -[[package]] -name = "arboard" -version = "3.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf" -dependencies = [ - "clipboard-win", - "log", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "parking_lot", - "percent-encoding", - "windows-sys 0.60.2", - "x11rb", -] - -[[package]] -name = "arc-swap" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d03449bb8ca2cc2ef70869af31463d1ae5ccc8fa3e334b307203fbf815207e" -dependencies = [ - "rustversion", -] - -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" - -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - -[[package]] -name = "ash" -version = "0.38.0+1.3.281" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" -dependencies = [ - "libloading 0.8.9", -] - -[[package]] -name = "ashpd" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df" -dependencies = [ - "async-fs", - "async-net", - "enumflags2", - "futures-channel", - "futures-util", - "rand 0.9.2", - "raw-window-handle", - "serde", - "serde_repr", - "url", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "zbus 5.12.0", -] - -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive 0.4.0", - "asn1-rs-impl 0.1.0", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror 1.0.69", -] - -[[package]] -name = "asn1-rs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" -dependencies = [ - "asn1-rs-derive 0.5.1", - "asn1-rs-impl 0.2.0", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror 1.0.69", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure 0.12.6", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", - "synstructure 0.13.2", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "async-broadcast" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" -dependencies = [ - "event-listener", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-channel" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-compression" -version = "0.4.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" -dependencies = [ - "compression-codecs", - "compression-core", - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-executor" -version = "1.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "pin-project-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" -dependencies = [ - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix 1.1.3", - "slab", - "windows-sys 0.61.2", -] - -[[package]] -name = "async-lock" -version = "3.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" -dependencies = [ - "event-listener", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-process" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75" -dependencies = [ - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener", - "futures-lite", - "rustix 1.1.3", -] - -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "async-signal" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 1.1.3", - "signal-hook-registry", - "slab", - "windows-sys 0.61.2", -] - -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - -[[package]] -name = "async-trait" -version = "0.1.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "atk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b" -dependencies = [ - "atk-sys", - "glib", - "libc", -] - -[[package]] -name = "atk-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - -[[package]] -name = "atspi" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be534b16650e35237bb1ed189ba2aab86ce65e88cc84c66f4935ba38575cecbf" -dependencies = [ - "atspi-common", - "atspi-connection", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1909ed2dc01d0a17505d89311d192518507e8a056a48148e3598fef5e7bb6ba7" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus 4.4.0", - "zbus-lockstep", - "zbus-lockstep-macros", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - -[[package]] -name = "atspi-connection" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "430c5960624a4baaa511c9c0fcc2218e3b58f5dbcc47e6190cafee344b873333" -dependencies = [ - "atspi-common", - "atspi-proxies", - "futures-lite", - "zbus 4.4.0", -] - -[[package]] -name = "atspi-proxies" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e6c5de3e524cf967569722446bcd458d5032348554d9a17d7d72b041ab7496" -dependencies = [ - "atspi-common", - "serde", - "zbus 4.4.0", - "zvariant 4.2.0", -] - -[[package]] -name = "autocfg" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" - -[[package]] -name = "base16ct" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e050f626429857a27ddccb31e0aca21356bfa709c04041aefddac081a8f068a" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags 2.10.0", - "cexpr", - "clang-sys", - "itertools", - "proc-macro2", - "quote", - "regex", - "rustc-hash 2.1.1", - "shlex", - "syn 2.0.111", -] - -[[package]] -name = "bit-set" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" -dependencies = [ - "serde_core", -] - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" -dependencies = [ - "objc2 0.5.2", -] - -[[package]] -name = "block2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" -dependencies = [ - "objc2 0.6.3", -] - -[[package]] -name = "blocking" -version = "1.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - -[[package]] -name = "brotli" -version = "8.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "bumpalo" -version = "3.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" - -[[package]] -name = "bytemuck" -version = "1.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "byteorder-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" - -[[package]] -name = "bytes" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" -dependencies = [ - "serde", -] - -[[package]] -name = "cairo-rs" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" -dependencies = [ - "bitflags 2.10.0", - "cairo-sys-rs", - "glib", - "libc", - "once_cell", - "thiserror 1.0.69", -] - -[[package]] -name = "cairo-sys-rs" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "calloop" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" -dependencies = [ - "bitflags 2.10.0", - "log", - "polling", - "rustix 0.38.44", - "slab", - "thiserror 1.0.69", -] - -[[package]] -name = "calloop" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9f6e1368bd4621d2c86baa7e37de77a938adf5221e5dd3d6133340101b309e" -dependencies = [ - "bitflags 2.10.0", - "polling", - "rustix 1.1.3", - "slab", - "tracing", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" -dependencies = [ - "calloop 0.13.0", - "rustix 0.38.44", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "calloop-wayland-source" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa" -dependencies = [ - "calloop 0.14.3", - "rustix 1.1.3", - "wayland-backend", - "wayland-client", -] - -[[package]] -name = "camino" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" -dependencies = [ - "serde_core", -] - -[[package]] -name = "cargo-platform" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror 2.0.17", -] - -[[package]] -name = "cargo_toml" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" -dependencies = [ - "serde", - "toml 0.9.10+spec-1.1.0", -] - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cc" -version = "1.2.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f50d563227a1c37cc0a263f64eca3334388c01c5e4c4861a9def205c614383c" -dependencies = [ - "find-msvc-tools", - "jobserver", - "libc", - "shlex", -] - -[[package]] -name = "ccm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847" -dependencies = [ - "aead", - "cipher", - "ctr", - "subtle", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid 1.19.0", -] - -[[package]] -name = "cfg-expr" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" -dependencies = [ - "smallvec", - "target-lexicon", -] - -[[package]] -name = "cfg-if" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - -[[package]] -name = "chrono" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-link 0.2.1", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading 0.8.9", -] - -[[package]] -name = "clap" -version = "4.5.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "clap_lex" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" - -[[package]] -name = "clipboard-win" -version = "5.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4" -dependencies = [ - "error-code", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - -[[package]] -name = "com" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6" -dependencies = [ - "com_macros", -] - -[[package]] -name = "com_macros" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5" -dependencies = [ - "com_macros_support", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "com_macros_support" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "compression-codecs" -version = "0.4.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" -dependencies = [ - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" - -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" -dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" -dependencies = [ - "cookie", - "document-features", - "idna", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - -[[package]] -name = "cookie_store" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc4bff745c9b4c7fb1e97b25d13153da2bc7796260141df62378998d070207f" -dependencies = [ - "cookie", - "document-features", - "idna", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" - -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.10.1", - "core-graphics-types 0.2.0", - "foreign-types 0.5.0", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.10.1", - "libc", -] - -[[package]] -name = "coreaudio-rs" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" -dependencies = [ - "bitflags 1.3.2", - "core-foundation-sys", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" -dependencies = [ - "alsa", - "core-foundation-sys", - "coreaudio-rs", - "dasp_sample", - "jni", - "js-sys", - "libc", - "mach2", - "ndk 0.8.0", - "ndk-context", - "oboe", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows 0.54.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" -dependencies = [ - "libc", -] - -[[package]] -name = "crc" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - -[[package]] -name = "crc32fast" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" - -[[package]] -name = "crypto-bigint" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-common" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" -dependencies = [ - "generic-array", - "rand_core 0.6.4", - "typenum", -] - -[[package]] -name = "cssparser" -version = "0.29.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "matches", - "phf 0.10.1", - "proc-macro2", - "quote", - "smallvec", - "syn 1.0.109", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.111", -] - -[[package]] -name = "ctor" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" -dependencies = [ - "quote", - "syn 2.0.111", -] - -[[package]] -name = "ctor-lite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f791803201ab277ace03903de1594460708d2d54df6053f2d9e82f592b19e3b" - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "cursor-icon" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27ae1dd37df86211c42e150270f82743308803d90a6f6e6651cd730d5e1732f" - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "darling" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.111", -] - -[[package]] -name = "darling_macro" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "dasp_sample" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" - -[[package]] -name = "data-encoding" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" - -[[package]] -name = "data-url" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" - -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs 0.5.2", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "der-parser" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" -dependencies = [ - "asn1-rs 0.6.2", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - -[[package]] -name = "deranged" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" -dependencies = [ - "powerfmt", - "serde_core", -] - -[[package]] -name = "derive_more" -version = "0.99.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.111", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" -dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", -] - -[[package]] -name = "dirs-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.5.2", - "windows-sys 0.61.2", -] - -[[package]] -name = "discord-rich-presence" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75db747ecd252c01bfecaf709b07fcb4c634adf0edb5fed47bc9c3052e7076b" -dependencies = [ - "serde", - "serde_derive", - "serde_json", - "serde_repr", - "uuid 0.8.2", -] - -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dispatch2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" -dependencies = [ - "bitflags 2.10.0", - "block2 0.6.2", - "libc", - "objc2 0.6.3", -] - -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "dlib" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" -dependencies = [ - "libloading 0.8.9", -] - -[[package]] -name = "dlopen2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "document-features" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61" -dependencies = [ - "litrs", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dpi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" -dependencies = [ - "serde", -] - -[[package]] -name = "drm" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80bc8c5c6c2941f70a55c15f8d9f00f9710ebda3ffda98075f996a0e6c92756f" -dependencies = [ - "bitflags 2.10.0", - "bytemuck", - "drm-ffi", - "drm-fourcc", - "libc", - "rustix 0.38.44", -] - -[[package]] -name = "drm-ffi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e41459d99a9b529845f6d2c909eb9adf3b6d2f82635ae40be8de0601726e8b" -dependencies = [ - "drm-sys", - "rustix 0.38.44", -] - -[[package]] -name = "drm-fourcc" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" - -[[package]] -name = "drm-sys" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafb66c8dbc944d69e15cfcc661df7e703beffbaec8bd63151368b06c5f9858c" -dependencies = [ - "libc", - "linux-raw-sys 0.6.5", -] - -[[package]] -name = "dtoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" - -[[package]] -name = "dtoa-short" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" -dependencies = [ - "dtoa", -] - -[[package]] -name = "dunce" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" - -[[package]] -name = "dyn-clone" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" - -[[package]] -name = "ecdsa" -version = "0.16.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" -dependencies = [ - "der", - "digest", - "elliptic-curve", - "rfc6979", - "signature", - "spki", -] - -[[package]] -name = "ecolor" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b" -dependencies = [ - "bytemuck", - "emath", -] - -[[package]] -name = "eframe" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ac2645a9bf4826eb4e91488b1f17b8eaddeef09396706b2f14066461338e24f" -dependencies = [ - "ahash", - "bytemuck", - "document-features", - "egui", - "egui-wgpu", - "egui-winit", - "egui_glow", - "glow 0.14.2", - "glutin", - "glutin-winit", - "image", - "js-sys", - "log", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", - "parking_lot", - "percent-encoding", - "raw-window-handle", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "web-time", - "winapi", - "windows-sys 0.52.0", - "winit", -] - -[[package]] -name = "egui" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974" -dependencies = [ - "accesskit", - "ahash", - "emath", - "epaint", - "log", - "nohash-hasher", -] - -[[package]] -name = "egui-wgpu" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00fd5d06d8405397e64a928fa0ef3934b3c30273ea7603e3dc4627b1f7a1a82" -dependencies = [ - "ahash", - "bytemuck", - "document-features", - "egui", - "epaint", - "log", - "thiserror 1.0.69", - "type-map", - "web-time", - "wgpu", - "winit", -] - -[[package]] -name = "egui-winit" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9c430f4f816340e8e8c1b20eec274186b1be6bc4c7dfc467ed50d57abc36c6" -dependencies = [ - "accesskit_winit", - "ahash", - "arboard", - "egui", - "log", - "raw-window-handle", - "smithay-clipboard", - "web-time", - "webbrowser", - "winit", -] - -[[package]] -name = "egui_extras" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3c1f5cd8dfe2ade470a218696c66cf556fcfd701e7830fa2e9f4428292a2a1" -dependencies = [ - "ahash", - "egui", - "enum-map", - "image", - "log", - "mime_guess2", -] - -[[package]] -name = "egui_glow" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e39bccc683cd43adab530d8f21a13eb91e80de10bcc38c3f1c16601b6f62b26" -dependencies = [ - "ahash", - "bytemuck", - "egui", - "glow 0.14.2", - "log", - "memoffset 0.9.1", - "wasm-bindgen", - "web-sys", - "winit", -] - -[[package]] -name = "either" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" - -[[package]] -name = "elliptic-curve" -version = "0.13.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" -dependencies = [ - "base16ct", - "crypto-bigint", - "digest", - "ff", - "generic-array", - "group", - "hkdf", - "pem-rfc7468", - "pkcs8", - "rand_core 0.6.4", - "sec1", - "subtle", - "zeroize", -] - -[[package]] -name = "emath" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "embed-resource" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a075fc573c64510038d7ee9abc7990635863992f83ebc52c8b433b8411a02e" -dependencies = [ - "cc", - "memchr", - "rustc_version", - "toml 0.9.10+spec-1.1.0", - "vswhom", - "winreg", -] - -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "endi" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" - -[[package]] -name = "enum-map" -version = "2.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" -dependencies = [ - "enum-map-derive", - "serde", -] - -[[package]] -name = "enum-map-derive" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "enumflags2" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef" -dependencies = [ - "enumflags2_derive", - "serde", -] - -[[package]] -name = "enumflags2_derive" -version = "0.7.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "env_filter" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "jiff", - "log", -] - -[[package]] -name = "epaint" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f" -dependencies = [ - "ab_glyph", - "ahash", - "bytemuck", - "ecolor", - "emath", - "epaint_default_fonts", - "log", - "nohash-hasher", - "parking_lot", -] - -[[package]] -name = "epaint_default_fonts" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea" - -[[package]] -name = "equivalent" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" - -[[package]] -name = "erased-serde" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e8918065695684b2b0702da20382d5ae6065cf3327bc2d6436bd49a71ce9f3" -dependencies = [ - "serde", - "serde_core", - "typeid", -] - -[[package]] -name = "errno" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "error-code" -version = "3.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" - -[[package]] -name = "event-listener" -version = "5.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" -dependencies = [ - "event-listener", - "pin-project-lite", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - -[[package]] -name = "fdeflate" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "ff" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "field-offset" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" -dependencies = [ - "memoffset 0.9.1", - "rustc_version", -] - -[[package]] -name = "find-msvc-tools" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" - -[[package]] -name = "flate2" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - -[[package]] -name = "form_urlencoded" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" - -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" - -[[package]] -name = "futures-lite" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "futures-sink" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" - -[[package]] -name = "futures-task" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -[[package]] -name = "futures-util" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "gdk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691" -dependencies = [ - "cairo-rs", - "gdk-pixbuf", - "gdk-sys", - "gio", - "glib", - "libc", - "pango", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec" -dependencies = [ - "gdk-pixbuf-sys", - "gio", - "glib", - "libc", - "once_cell", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gdk-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7" -dependencies = [ - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdkwayland-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69" -dependencies = [ - "gdk-sys", - "glib-sys", - "gobject-sys", - "libc", - "pkg-config", - "system-deps", -] - -[[package]] -name = "gdkx11" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe" -dependencies = [ - "gdk", - "gdkx11-sys", - "gio", - "glib", - "libc", - "x11", -] - -[[package]] -name = "gdkx11-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d" -dependencies = [ - "gdk-sys", - "glib-sys", - "libc", - "system-deps", - "x11", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", - "zeroize", -] - -[[package]] -name = "gethostname" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" -dependencies = [ - "rustix 1.1.3", - "windows-link 0.2.1", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", -] - -[[package]] -name = "getrandom" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "r-efi", - "wasip2", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gio" -version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "gio-sys", - "glib", - "libc", - "once_cell", - "pin-project-lite", - "smallvec", - "thiserror 1.0.69", -] - -[[package]] -name = "gio-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", - "winapi", -] - -[[package]] -name = "gl_generator" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" -dependencies = [ - "khronos_api", - "log", - "xml-rs", -] - -[[package]] -name = "glib" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" -dependencies = [ - "bitflags 2.10.0", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", - "libc", - "memchr", - "once_cell", - "smallvec", - "thiserror 1.0.69", -] - -[[package]] -name = "glib-macros" -version = "0.18.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" -dependencies = [ - "heck 0.4.1", - "proc-macro-crate 2.0.2", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "glib-sys" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" -dependencies = [ - "libc", - "system-deps", -] - -[[package]] -name = "glob" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" - -[[package]] -name = "glow" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glow" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glutin" -version = "0.32.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12124de845cacfebedff80e877bb37b5b75c34c5a4c89e47e1cdd67fb6041325" -dependencies = [ - "bitflags 2.10.0", - "cfg_aliases 0.2.1", - "cgl", - "dispatch2", - "glutin_egl_sys", - "glutin_glx_sys", - "glutin_wgl_sys", - "libloading 0.8.9", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", - "once_cell", - "raw-window-handle", - "wayland-sys", - "windows-sys 0.52.0", - "x11-dl", -] - -[[package]] -name = "glutin-winit" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f" -dependencies = [ - "cfg_aliases 0.2.1", - "glutin", - "raw-window-handle", - "winit", -] - -[[package]] -name = "glutin_egl_sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4680ba6195f424febdc3ba46e7a42a0e58743f2edb115297b86d7f8ecc02d2" -dependencies = [ - "gl_generator", - "windows-sys 0.52.0", -] - -[[package]] -name = "glutin_glx_sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7bb2938045a88b612499fbcba375a77198e01306f52272e692f8c1f3751185" -dependencies = [ - "gl_generator", - "x11-dl", -] - -[[package]] -name = "glutin_wgl_sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ee00b289aba7a9e5306d57c2d05499b2e5dc427f84ac708bd2c090212cf3e" -dependencies = [ - "gl_generator", -] - -[[package]] -name = "gobject-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" -dependencies = [ - "glib-sys", - "libc", - "system-deps", -] - -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.10.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.10.0", -] - -[[package]] -name = "gpu-allocator" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7" -dependencies = [ - "log", - "presser", - "thiserror 1.0.69", - "winapi", - "windows 0.52.0", -] - -[[package]] -name = "gpu-descriptor" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" -dependencies = [ - "bitflags 2.10.0", - "gpu-descriptor-types", - "hashbrown 0.15.5", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.10.0", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core 0.6.4", - "subtle", -] - -[[package]] -name = "gtk" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a" -dependencies = [ - "atk", - "cairo-rs", - "field-offset", - "futures-channel", - "gdk", - "gdk-pixbuf", - "gio", - "glib", - "gtk-sys", - "gtk3-macros", - "libc", - "pango", - "pkg-config", -] - -[[package]] -name = "gtk-sys" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414" -dependencies = [ - "atk-sys", - "cairo-sys-rs", - "gdk-pixbuf-sys", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "pango-sys", - "system-deps", -] - -[[package]] -name = "gtk3-macros" -version = "0.18.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "h2" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http", - "indexmap 2.12.1", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash", -] - -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" - -[[package]] -name = "hassle-rs" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890" -dependencies = [ - "bitflags 2.10.0", - "com", - "libc", - "libloading 0.8.9", - "thiserror 1.0.69", - "widestring", - "winapi", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "hermit-abi" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "html5ever" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c" -dependencies = [ - "log", - "mac", - "markup5ever", - "match_token", -] - -[[package]] -name = "http" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" -dependencies = [ - "bytes", - "itoa", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "hyper" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" -dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "h2", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "pin-utils", - "smallvec", - "tokio", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.27.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" -dependencies = [ - "http", - "hyper", - "hyper-util", - "rustls", - "rustls-pki-types", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "hyper", - "ipnet", - "libc", - "percent-encoding", - "pin-project-lite", - "socket2 0.6.1", - "system-configuration", - "tokio", - "tower-service", - "tracing", - "windows-registry", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "log", - "wasm-bindgen", - "windows-core 0.62.2", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "ico" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" -dependencies = [ - "byteorder", - "png 0.17.16", -] - -[[package]] -name = "icu_collections" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" -dependencies = [ - "displaydoc", - "potential_utf", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" - -[[package]] -name = "icu_properties" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" - -[[package]] -name = "icu_provider" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" -dependencies = [ - "idna_adapter", - "smallvec", - "utf8_iter", -] - -[[package]] -name = "idna_adapter" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" -dependencies = [ - "icu_normalizer", - "icu_properties", -] - -[[package]] -name = "image" -version = "0.25.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6506c6c10786659413faa717ceebcb8f70731c0a60cbae39795fdf114519c1a" -dependencies = [ - "bytemuck", - "byteorder-lite", - "moxcms", - "num-traits", - "png 0.18.0", - "zune-core", - "zune-jpeg", -] - -[[package]] -name = "immutable-chunkmap" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3e98b1520e49e252237edc238a39869da9f3241f2ec19dc788c1d24694d1e4" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" -dependencies = [ - "equivalent", - "hashbrown 0.16.1", - "serde", - "serde_core", -] - -[[package]] -name = "infer" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" -dependencies = [ - "cfb", -] - -[[package]] -name = "inout" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "interceptor" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4705c00485029e738bea8c9505b5ddb1486a8f3627a953e1e77e6abdf5eef90c" -dependencies = [ - "async-trait", - "bytes", - "log", - "portable-atomic", - "rand 0.8.5", - "rtcp", - "rtp", - "thiserror 1.0.69", - "tokio", - "waitgroup", - "webrtc-srtp", - "webrtc-util", -] - -[[package]] -name = "ipnet" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" - -[[package]] -name = "iri-string" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee5b5339afb4c41626dde77b7a611bd4f2c202b897852b4bcf5d03eddc61010" - -[[package]] -name = "javascriptcore-rs" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc" -dependencies = [ - "bitflags 1.3.2", - "glib", - "javascriptcore-rs-sys", -] - -[[package]] -name = "javascriptcore-rs-sys" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "jiff" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35" -dependencies = [ - "jiff-static", - "log", - "portable-atomic", - "portable-atomic-util", - "serde_core", -] - -[[package]] -name = "jiff-static" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" -dependencies = [ - "getrandom 0.3.4", - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - -[[package]] -name = "json-patch" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" -dependencies = [ - "jsonptr", - "serde", - "serde_json", - "thiserror 1.0.69", -] - -[[package]] -name = "jsonptr" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "keyboard-types" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" -dependencies = [ - "bitflags 2.10.0", - "serde", - "unicode-segmentation", -] - -[[package]] -name = "khronos-egl" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" -dependencies = [ - "libc", - "libloading 0.8.9", - "pkg-config", -] - -[[package]] -name = "khronos_api" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" - -[[package]] -name = "kuchikiki" -version = "0.8.8-speedreader" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2" -dependencies = [ - "cssparser", - "html5ever", - "indexmap 2.12.1", - "selectors", -] - -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - -[[package]] -name = "libappindicator" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a" -dependencies = [ - "glib", - "gtk", - "gtk-sys", - "libappindicator-sys", - "log", -] - -[[package]] -name = "libappindicator-sys" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" -dependencies = [ - "gtk-sys", - "libloading 0.7.4", - "once_cell", -] - -[[package]] -name = "libc" -version = "0.2.178" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libloading" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" -dependencies = [ - "cfg-if", - "windows-link 0.2.1", -] - -[[package]] -name = "libredox" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df15f6eac291ed1cf25865b1ee60399f57e7c227e7f51bdbd4c5270396a9ed50" -dependencies = [ - "bitflags 2.10.0", - "libc", - "redox_syscall 0.6.0", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - -[[package]] -name = "linux-raw-sys" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a385b1be4e5c3e362ad2ffa73c392e53f031eaa5b7d648e64cd87f27f6063d7" - -[[package]] -name = "linux-raw-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" - -[[package]] -name = "litemap" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" - -[[package]] -name = "litrs" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092" - -[[package]] -name = "lock_api" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" - -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "mach2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44" -dependencies = [ - "libc", -] - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18" -dependencies = [ - "log", - "phf 0.11.3", - "phf_codegen 0.11.3", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "match_token" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] -name = "md-5" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -dependencies = [ - "cfg-if", - "digest", -] - -[[package]] -name = "memchr" -version = "2.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" - -[[package]] -name = "memmap2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744133e4a0e0a658e1374cf3bf8e415c4052a15a111acd372764c55b4177d490" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" -dependencies = [ - "bitflags 2.10.0", - "block", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess2" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1706dc14a2e140dec0a7a07109d9a3d5890b81e85bd6c60b906b249a77adf0ca" -dependencies = [ - "mime", - "phf 0.11.3", - "phf_shared 0.11.3", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" -dependencies = [ - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.61.2", -] - -[[package]] -name = "moxcms" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97" -dependencies = [ - "num-traits", - "pxfm", -] - -[[package]] -name = "muda" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a" -dependencies = [ - "crossbeam-channel", - "dpi", - "gtk", - "keyboard-types", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", - "once_cell", - "png 0.17.16", - "serde", - "thiserror 2.0.17", - "windows-sys 0.60.2", -] - -[[package]] -name = "naga" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" -dependencies = [ - "arrayvec", - "bit-set", - "bitflags 2.10.0", - "cfg_aliases 0.1.1", - "codespan-reporting", - "hexf-parse", - "indexmap 2.12.1", - "log", - "rustc-hash 1.1.0", - "spirv", - "termcolor", - "thiserror 1.0.69", - "unicode-xid", -] - -[[package]] -name = "nasm-rs" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f676553b60ccbb76f41f9ae8f2428dac3f259ff8f1c2468a174778d06a1af9" -dependencies = [ - "log", -] - -[[package]] -name = "native-tls" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" -dependencies = [ - "bitflags 2.10.0", - "jni-sys", - "log", - "ndk-sys 0.5.0+25.2.9519653", - "num_enum", - "thiserror 1.0.69", -] - -[[package]] -name = "ndk" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" -dependencies = [ - "bitflags 2.10.0", - "jni-sys", - "log", - "ndk-sys 0.6.0+11769913", - "num_enum", - "raw-window-handle", - "thiserror 1.0.69", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "ndk-sys" -version = "0.6.0+11769913" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", - "memoffset 0.9.1", -] - -[[package]] -name = "nix" -version = "0.30.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "cfg_aliases 0.2.1", - "libc", - "memoffset 0.9.1", -] - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" -dependencies = [ - "num-integer", - "num-traits", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-derive" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_enum" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" -dependencies = [ - "num_enum_derive", - "rustversion", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" -dependencies = [ - "proc-macro-crate 3.4.0", - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" - -[[package]] -name = "objc2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" -dependencies = [ - "objc-sys", - "objc2-encode", -] - -[[package]] -name = "objc2" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" -dependencies = [ - "objc2-encode", - "objc2-exception-helper", -] - -[[package]] -name = "objc2-app-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "libc", - "objc2 0.5.2", - "objc2-core-data 0.2.2", - "objc2-core-image 0.2.2", - "objc2-foundation 0.2.2", - "objc2-quartz-core 0.2.2", -] - -[[package]] -name = "objc2-app-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" -dependencies = [ - "bitflags 2.10.0", - "block2 0.6.2", - "libc", - "objc2 0.6.3", - "objc2-cloud-kit 0.3.2", - "objc2-core-data 0.3.2", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-core-image 0.3.2", - "objc2-core-text", - "objc2-core-video", - "objc2-foundation 0.3.2", - "objc2-quartz-core 0.3.2", -] - -[[package]] -name = "objc2-cloud-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-core-location", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-cloud-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-contacts" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-core-data" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-core-data" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-core-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" -dependencies = [ - "bitflags 2.10.0", - "dispatch2", - "objc2 0.6.3", -] - -[[package]] -name = "objc2-core-graphics" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" -dependencies = [ - "bitflags 2.10.0", - "dispatch2", - "objc2 0.6.3", - "objc2-core-foundation", - "objc2-io-surface", -] - -[[package]] -name = "objc2-core-image" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-metal", -] - -[[package]] -name = "objc2-core-image" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" -dependencies = [ - "objc2 0.6.3", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-core-location" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-contacts", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-core-text" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-core-foundation", - "objc2-core-graphics", -] - -[[package]] -name = "objc2-core-video" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d425caf1df73233f29fd8a5c3e5edbc30d2d4307870f802d18f00d83dc5141a6" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-io-surface", -] - -[[package]] -name = "objc2-encode" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" - -[[package]] -name = "objc2-exception-helper" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a" -dependencies = [ - "cc", -] - -[[package]] -name = "objc2-foundation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "dispatch", - "libc", - "objc2 0.5.2", -] - -[[package]] -name = "objc2-foundation" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" -dependencies = [ - "bitflags 2.10.0", - "block2 0.6.2", - "libc", - "objc2 0.6.3", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-io-surface" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-javascript-core" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1e6550c4caed348956ce3370c9ffeca70bb1dbed4fa96112e7c6170e074586" -dependencies = [ - "objc2 0.6.3", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-link-presentation" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-metal" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", - "objc2-metal", -] - -[[package]] -name = "objc2-quartz-core" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-core-foundation", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-security" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-core-foundation", -] - -[[package]] -name = "objc2-symbols" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" -dependencies = [ - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-ui-kit" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-cloud-kit 0.2.2", - "objc2-core-data 0.2.2", - "objc2-core-image 0.2.2", - "objc2-core-location", - "objc2-foundation 0.2.2", - "objc2-link-presentation", - "objc2-quartz-core 0.2.2", - "objc2-symbols", - "objc2-uniform-type-identifiers", - "objc2-user-notifications", -] - -[[package]] -name = "objc2-ui-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" -dependencies = [ - "bitflags 2.10.0", - "objc2 0.6.3", - "objc2-core-foundation", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-uniform-type-identifiers" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" -dependencies = [ - "block2 0.5.1", - "objc2 0.5.2", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-user-notifications" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" -dependencies = [ - "bitflags 2.10.0", - "block2 0.5.1", - "objc2 0.5.2", - "objc2-core-location", - "objc2-foundation 0.2.2", -] - -[[package]] -name = "objc2-web-kit" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" -dependencies = [ - "bitflags 2.10.0", - "block2 0.6.2", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", - "objc2-javascript-core", - "objc2-security", -] - -[[package]] -name = "oboe" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" -dependencies = [ - "jni", - "ndk 0.8.0", - "ndk-context", - "num-derive", - "num-traits", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" -dependencies = [ - "cc", -] - -[[package]] -name = "oid-registry" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" -dependencies = [ - "asn1-rs 0.6.2", -] - -[[package]] -name = "once_cell" -version = "1.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" - -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - -[[package]] -name = "opaque-debug" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" - -[[package]] -name = "open" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" -dependencies = [ - "dunce", - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "openh264" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c1af3a4d35290ba7a46d1ce69cb13ae740a2d72cc2ee00abee3c84bed3dbe5d" -dependencies = [ - "openh264-sys2", - "wide", -] - -[[package]] -name = "openh264-sys2" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a77c1e18503537113d77b1b1d05274e81fa9f44843c06be2d735adb19f7c9d" -dependencies = [ - "cc", - "nasm-rs", - "walkdir", -] - -[[package]] -name = "opennow" -version = "0.1.0" -dependencies = [ - "anyhow", - "base64 0.22.1", - "bytes", - "chrono", - "clap", - "core-graphics 0.24.0", - "cpal", - "crossbeam-channel", - "dirs 5.0.1", - "discord-rich-presence", - "eframe", - "egui_extras", - "env_logger", - "futures-util", - "hex", - "http", - "image", - "log", - "native-tls", - "open", - "openh264", - "parking_lot", - "rand 0.8.5", - "regex-lite", - "reqwest", - "rfd", - "serde", - "serde_json", - "sha2", - "softbuffer", - "tauri", - "tauri-build", - "tauri-plugin-http", - "tauri-plugin-shell", - "tauri-plugin-store", - "thiserror 1.0.69", - "tokio", - "tokio-native-tls", - "tokio-tungstenite", - "url", - "urlencoding", - "uuid 1.19.0", - "webrtc", - "winit", -] - -[[package]] -name = "openssl" -version = "0.10.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" -dependencies = [ - "bitflags 2.10.0", - "cfg-if", - "foreign-types 0.3.2", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - -[[package]] -name = "openssl-sys" -version = "0.9.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "orbclient" -version = "0.3.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" -dependencies = [ - "libredox", -] - -[[package]] -name = "ordered-stream" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" -dependencies = [ - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "os_pipe" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "p256" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "p384" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f1670a52a47d448f14b6a5c61dd78fce51856e68edaa38f7ae3a46b8d6b6" -dependencies = [ - "ecdsa", - "elliptic-curve", - "primeorder", - "sha2", -] - -[[package]] -name = "pango" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" -dependencies = [ - "gio", - "glib", - "libc", - "once_cell", - "pango-sys", -] - -[[package]] -name = "pango-sys" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" -dependencies = [ - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "parking" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" - -[[package]] -name = "parking_lot" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.5.18", - "smallvec", - "windows-link 0.2.1", -] - -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - -[[package]] -name = "pathdiff" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" - -[[package]] -name = "pem" -version = "3.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be" -dependencies = [ - "base64 0.22.1", - "serde_core", -] - -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - -[[package]] -name = "percent-encoding" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_macros 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", -] - -[[package]] -name = "phf" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" -dependencies = [ - "phf_macros 0.11.3", - "phf_shared 0.11.3", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_generator" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" -dependencies = [ - "phf_shared 0.11.3", - "rand 0.8.5", -] - -[[package]] -name = "phf_macros" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "phf_macros" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.111", - "unicase", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher 0.3.11", -] - -[[package]] -name = "phf_shared" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" -dependencies = [ - "siphasher 1.0.1", - "unicase", -] - -[[package]] -name = "pin-project" -version = "1.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "piper" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - -[[package]] -name = "plist" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740ebea15c5d1428f910cd1a5f52cebf8d25006245ed8ade92702f4943d91e07" -dependencies = [ - "base64 0.22.1", - "indexmap 2.12.1", - "quick-xml 0.38.4", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "png" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0" -dependencies = [ - "bitflags 2.10.0", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "polling" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi", - "pin-project-lite", - "rustix 1.1.3", - "windows-sys 0.61.2", -] - -[[package]] -name = "pollster" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" - -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f59e70c4aef1e55797c2e8fd94a4f2a973fc972cfde0e0b05f683667b0cd39dd" - -[[package]] -name = "portable-atomic-util" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" -dependencies = [ - "portable-atomic", -] - -[[package]] -name = "potential_utf" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" -dependencies = [ - "zerovec", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" -dependencies = [ - "zerocopy", -] - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "presser" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" - -[[package]] -name = "primeorder" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" -dependencies = [ - "elliptic-curve", -] - -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" -dependencies = [ - "toml_datetime 0.6.3", - "toml_edit 0.20.2", -] - -[[package]] -name = "proc-macro-crate" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" -dependencies = [ - "toml_edit 0.23.10+spec-1.0.0", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] -name = "proc-macro2" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "profiling" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773" - -[[package]] -name = "psl-types" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "publicsuffix" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf" -dependencies = [ - "idna", - "psl-types", -] - -[[package]] -name = "pxfm" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8" -dependencies = [ - "num-traits", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quick-xml" -version = "0.37.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" -dependencies = [ - "memchr", -] - -[[package]] -name = "quinn" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" -dependencies = [ - "bytes", - "cfg_aliases 0.2.1", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash 2.1.1", - "rustls", - "socket2 0.6.1", - "thiserror 2.0.17", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" -dependencies = [ - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand 0.9.2", - "ring", - "rustc-hash 2.1.1", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.17", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases 0.2.1", - "libc", - "once_cell", - "socket2 0.6.1", - "tracing", - "windows-sys 0.60.2", -] - -[[package]] -name = "quote" -version = "1.0.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r-efi" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" -dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.3", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.16", -] - -[[package]] -name = "rand_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" -dependencies = [ - "getrandom 0.3.4", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "raw-window-handle" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" - -[[package]] -name = "rcgen" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e669e5202259b5314d1ea5397316ad400819437857b90861765f24c4cf80a2" -dependencies = [ - "pem", - "ring", - "rustls-pki-types", - "time", - "x509-parser", - "yasna", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" -dependencies = [ - "bitflags 2.10.0", -] - -[[package]] -name = "redox_syscall" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96166dafa0886eb81fe1c0a388bece180fbef2135f97c1e2cf8302e74b43b5" -dependencies = [ - "bitflags 2.10.0", -] - -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 1.0.69", -] - -[[package]] -name = "redox_users" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" -dependencies = [ - "getrandom 0.2.16", - "libredox", - "thiserror 2.0.17", -] - -[[package]] -name = "ref-cast" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "regex" -version = "1.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-lite" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da" - -[[package]] -name = "regex-syntax" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" - -[[package]] -name = "renderdoc-sys" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" - -[[package]] -name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64 0.22.1", - "bytes", - "cookie", - "cookie_store 0.22.0", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-tls", - "hyper-util", - "js-sys", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots", -] - -[[package]] -name = "rfc6979" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" -dependencies = [ - "hmac", - "subtle", -] - -[[package]] -name = "rfd" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed" -dependencies = [ - "ashpd", - "block2 0.6.2", - "dispatch2", - "js-sys", - "log", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", - "pollster", - "raw-window-handle", - "urlencoding", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "windows-sys 0.59.0", -] - -[[package]] -name = "ring" -version = "0.17.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" -dependencies = [ - "cc", - "cfg-if", - "getrandom 0.2.16", - "libc", - "untrusted", - "windows-sys 0.52.0", -] - -[[package]] -name = "rtcp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2" -dependencies = [ - "bytes", - "thiserror 1.0.69", - "webrtc-util", -] - -[[package]] -name = "rtp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6870f09b5db96f8b9e7290324673259fd15519ebb7d55acf8e7eb044a9ead6af" -dependencies = [ - "bytes", - "portable-atomic", - "rand 0.8.5", - "serde", - "thiserror 1.0.69", - "webrtc-util", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.10.0", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.59.0", -] - -[[package]] -name = "rustix" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" -dependencies = [ - "bitflags 2.10.0", - "errno", - "libc", - "linux-raw-sys 0.11.0", - "windows-sys 0.61.2", -] - -[[package]] -name = "rustls" -version = "0.23.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" -dependencies = [ - "once_cell", - "ring", - "rustls-pki-types", - "rustls-webpki", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls-pki-types" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" -dependencies = [ - "web-time", - "zeroize", -] - -[[package]] -name = "rustls-webpki" -version = "0.103.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" -dependencies = [ - "ring", - "rustls-pki-types", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - -[[package]] -name = "ryu" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea" - -[[package]] -name = "safe_arch" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "schemars" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615" -dependencies = [ - "dyn-clone", - "indexmap 1.9.3", - "schemars_derive", - "serde", - "serde_json", - "url", - "uuid 1.19.0", -] - -[[package]] -name = "schemars" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - -[[package]] -name = "schemars" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9558e172d4e8533736ba97870c4b2cd63f84b382a3d6eb063da41b91cce17289" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.111", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sctk-adwaita" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" -dependencies = [ - "ab_glyph", - "log", - "memmap2", - "smithay-client-toolkit 0.19.2", - "tiny-skia", -] - -[[package]] -name = "sdp" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f" -dependencies = [ - "rand 0.8.5", - "substring", - "thiserror 1.0.69", - "url", -] - -[[package]] -name = "sec1" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" -dependencies = [ - "base16ct", - "der", - "generic-array", - "pkcs8", - "subtle", - "zeroize", -] - -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416" -dependencies = [ - "bitflags 1.3.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "phf 0.8.0", - "phf_codegen 0.8.0", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "semver" -version = "1.0.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" -dependencies = [ - "serde", - "serde_core", -] - -[[package]] -name = "serde" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" -dependencies = [ - "serde_core", - "serde_derive", -] - -[[package]] -name = "serde-untagged" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" -dependencies = [ - "erased-serde", - "serde", - "serde_core", - "typeid", -] - -[[package]] -name = "serde_core" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.228" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "serde_derive_internals" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "serde_json" -version = "1.0.146" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217ca874ae0207aac254aa02c957ded05585a90892cc8d87f9e5fa49669dadd8" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", - "serde_core", -] - -[[package]] -name = "serde_repr" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "serde_spanned" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_spanned" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" -dependencies = [ - "serde_core", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_with" -version = "3.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7" -dependencies = [ - "base64 0.22.1", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.12.1", - "schemars 0.9.0", - "schemars 1.1.0", - "serde_core", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a8e3ca0ca629121f70ab50f95249e5a6f925cc0f6ffe8256c45b728875706c" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "serialize-to-javascript" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" -dependencies = [ - "serde", - "serde_json", - "serialize-to-javascript-impl", -] - -[[package]] -name = "serialize-to-javascript-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "servo_arc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741" -dependencies = [ - "nodrop", - "stable_deref_trait", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "shared_child" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7" -dependencies = [ - "libc", - "sigchld", - "windows-sys 0.60.2", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "sigchld" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1" -dependencies = [ - "libc", - "os_pipe", - "signal-hook", -] - -[[package]] -name = "signal-hook" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" -dependencies = [ - "libc", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - -[[package]] -name = "simd-adler32" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - -[[package]] -name = "slab" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" - -[[package]] -name = "slotmap" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" - -[[package]] -name = "smithay-client-toolkit" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" -dependencies = [ - "bitflags 2.10.0", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix 0.38.44", - "thiserror 1.0.69", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0512da38f5e2b31201a93524adb8d3136276fa4fe4aafab4e1f727a82b534cc0" -dependencies = [ - "bitflags 2.10.0", - "calloop 0.14.3", - "calloop-wayland-source 0.4.1", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix 1.1.3", - "thiserror 2.0.17", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-experimental", - "wayland-protocols-misc", - "wayland-protocols-wlr", - "wayland-scanner", - "xkeysym", -] - -[[package]] -name = "smithay-clipboard" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71704c03f739f7745053bde45fa203a46c58d25bc5c4efba1d9a60e9dba81226" -dependencies = [ - "libc", - "smithay-client-toolkit 0.20.0", - "wayland-backend", -] - -[[package]] -name = "smol_str" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" -dependencies = [ - "serde", -] - -[[package]] -name = "socket2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "socket2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" -dependencies = [ - "libc", - "windows-sys 0.60.2", -] - -[[package]] -name = "softbuffer" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3" -dependencies = [ - "as-raw-xcb-connection", - "bytemuck", - "drm", - "fastrand", - "js-sys", - "memmap2", - "ndk 0.9.0", - "objc2 0.6.3", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-foundation 0.3.2", - "objc2-quartz-core 0.3.2", - "raw-window-handle", - "redox_syscall 0.5.18", - "rustix 1.1.3", - "tiny-xlib", - "tracing", - "wasm-bindgen", - "wayland-backend", - "wayland-client", - "wayland-sys", - "web-sys", - "windows-sys 0.61.2", - "x11rb", -] - -[[package]] -name = "soup3" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" -dependencies = [ - "futures-channel", - "gio", - "glib", - "libc", - "soup3-sys", -] - -[[package]] -name = "soup3-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" -dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", - "libc", - "system-deps", -] - -[[package]] -name = "spirv" -version = "0.3.0+sdk-1.3.268.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844" -dependencies = [ - "bitflags 2.10.0", -] - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" - -[[package]] -name = "string_cache" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" -dependencies = [ - "new_debug_unreachable", - "parking_lot", - "phf_shared 0.11.3", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "stun" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fad383a1cc63ae141e84e48eaef44a1063e9d9e55bcb8f51a99b886486e01b" -dependencies = [ - "base64 0.21.7", - "crc", - "lazy_static", - "md-5", - "rand 0.8.5", - "ring", - "subtle", - "thiserror 1.0.69", - "tokio", - "url", - "webrtc-util", -] - -[[package]] -name = "substring" -version = "1.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" -dependencies = [ - "autocfg", -] - -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -[[package]] -name = "swift-rs" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" -dependencies = [ - "base64 0.21.7", - "serde", - "serde_json", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags 2.10.0", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "system-deps" -version = "6.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" -dependencies = [ - "cfg-expr", - "heck 0.5.0", - "pkg-config", - "toml 0.8.2", - "version-compare", -] - -[[package]] -name = "tao" -version = "0.34.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a753bdc39c07b192151523a3f77cd0394aa75413802c883a0f6f6a0e5ee2e7" -dependencies = [ - "bitflags 2.10.0", - "block2 0.6.2", - "core-foundation 0.10.1", - "core-graphics 0.24.0", - "crossbeam-channel", - "dispatch", - "dlopen2", - "dpi", - "gdkwayland-sys", - "gdkx11-sys", - "gtk", - "jni", - "lazy_static", - "libc", - "log", - "ndk 0.9.0", - "ndk-context", - "ndk-sys 0.6.0+11769913", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "once_cell", - "parking_lot", - "raw-window-handle", - "scopeguard", - "tao-macros", - "unicode-segmentation", - "url", - "windows 0.61.3", - "windows-core 0.61.2", - "windows-version", - "x11-dl", -] - -[[package]] -name = "tao-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - -[[package]] -name = "tauri" -version = "2.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033" -dependencies = [ - "anyhow", - "bytes", - "cookie", - "dirs 6.0.0", - "dunce", - "embed_plist", - "getrandom 0.3.4", - "glob", - "gtk", - "heck 0.5.0", - "http", - "jni", - "libc", - "log", - "mime", - "muda", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "objc2-ui-kit 0.3.2", - "objc2-web-kit", - "percent-encoding", - "plist", - "raw-window-handle", - "reqwest", - "serde", - "serde_json", - "serde_repr", - "serialize-to-javascript", - "swift-rs", - "tauri-build", - "tauri-macros", - "tauri-runtime", - "tauri-runtime-wry", - "tauri-utils", - "thiserror 2.0.17", - "tokio", - "tray-icon", - "url", - "webkit2gtk", - "webview2-com", - "window-vibrancy", - "windows 0.61.3", -] - -[[package]] -name = "tauri-build" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs 6.0.0", - "glob", - "heck 0.5.0", - "json-patch", - "schemars 0.8.22", - "semver", - "serde", - "serde_json", - "tauri-utils", - "tauri-winres", - "toml 0.9.10+spec-1.1.0", - "walkdir", -] - -[[package]] -name = "tauri-codegen" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf" -dependencies = [ - "base64 0.22.1", - "brotli", - "ico", - "json-patch", - "plist", - "png 0.17.16", - "proc-macro2", - "quote", - "semver", - "serde", - "serde_json", - "sha2", - "syn 2.0.111", - "tauri-utils", - "thiserror 2.0.17", - "time", - "url", - "uuid 1.19.0", - "walkdir", -] - -[[package]] -name = "tauri-macros" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.111", - "tauri-codegen", - "tauri-utils", -] - -[[package]] -name = "tauri-plugin" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1d0a4860b7ff570c891e1d2a586bf1ede205ff858fbc305e0b5ae5d14c1377" -dependencies = [ - "anyhow", - "glob", - "plist", - "schemars 0.8.22", - "serde", - "serde_json", - "tauri-utils", - "toml 0.9.10+spec-1.1.0", - "walkdir", -] - -[[package]] -name = "tauri-plugin-fs" -version = "2.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47df422695255ecbe7bac7012440eddaeefd026656171eac9559f5243d3230d9" -dependencies = [ - "anyhow", - "dunce", - "glob", - "percent-encoding", - "schemars 0.8.22", - "serde", - "serde_json", - "serde_repr", - "tauri", - "tauri-plugin", - "tauri-utils", - "thiserror 2.0.17", - "toml 0.9.10+spec-1.1.0", - "url", -] - -[[package]] -name = "tauri-plugin-http" -version = "2.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00685aceab12643cf024f712ab0448ba8fcadf86f2391d49d2e5aa732aacc70" -dependencies = [ - "bytes", - "cookie_store 0.21.1", - "data-url", - "http", - "regex", - "reqwest", - "schemars 0.8.22", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "tauri-plugin-fs", - "thiserror 2.0.17", - "tokio", - "url", - "urlpattern", -] - -[[package]] -name = "tauri-plugin-shell" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c374b6db45f2a8a304f0273a15080d98c70cde86178855fc24653ba657a1144c" -dependencies = [ - "encoding_rs", - "log", - "open", - "os_pipe", - "regex", - "schemars 0.8.22", - "serde", - "serde_json", - "shared_child", - "tauri", - "tauri-plugin", - "thiserror 2.0.17", - "tokio", -] - -[[package]] -name = "tauri-plugin-store" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a77036340a97eb5bbe1b3209c31e5f27f75e6f92a52fd9dd4b211ef08bf310" -dependencies = [ - "dunce", - "serde", - "serde_json", - "tauri", - "tauri-plugin", - "thiserror 2.0.17", - "tokio", - "tracing", -] - -[[package]] -name = "tauri-runtime" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892" -dependencies = [ - "cookie", - "dpi", - "gtk", - "http", - "jni", - "objc2 0.6.3", - "objc2-ui-kit 0.3.2", - "objc2-web-kit", - "raw-window-handle", - "serde", - "serde_json", - "tauri-utils", - "thiserror 2.0.17", - "url", - "webkit2gtk", - "webview2-com", - "windows 0.61.3", -] - -[[package]] -name = "tauri-runtime-wry" -version = "2.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065" -dependencies = [ - "gtk", - "http", - "jni", - "log", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "once_cell", - "percent-encoding", - "raw-window-handle", - "softbuffer", - "tao", - "tauri-runtime", - "tauri-utils", - "url", - "webkit2gtk", - "webview2-com", - "windows 0.61.3", - "wry", -] - -[[package]] -name = "tauri-utils" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490" -dependencies = [ - "anyhow", - "brotli", - "cargo_metadata", - "ctor", - "dunce", - "glob", - "html5ever", - "http", - "infer", - "json-patch", - "kuchikiki", - "log", - "memchr", - "phf 0.11.3", - "proc-macro2", - "quote", - "regex", - "schemars 0.8.22", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "swift-rs", - "thiserror 2.0.17", - "toml 0.9.10+spec-1.1.0", - "url", - "urlpattern", - "uuid 1.19.0", - "walkdir", -] - -[[package]] -name = "tauri-winres" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1087b111fe2b005e42dbdc1990fc18593234238d47453b0c99b7de1c9ab2c1e0" -dependencies = [ - "dunce", - "embed-resource", - "toml 0.9.10+spec-1.1.0", -] - -[[package]] -name = "tempfile" -version = "3.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" -dependencies = [ - "fastrand", - "getrandom 0.3.4", - "once_cell", - "rustix 1.1.3", - "windows-sys 0.61.2", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" -dependencies = [ - "thiserror-impl 2.0.17", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "thiserror-impl" -version = "2.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "time" -version = "0.3.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" - -[[package]] -name = "time-macros" -version = "0.2.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-skia" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tiny-xlib" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0324504befd01cab6e0c994f34b2ffa257849ee019d3fb3b64fb2c858887d89e" -dependencies = [ - "as-raw-xcb-connection", - "ctor-lite", - "libloading 0.8.9", - "pkg-config", - "tracing", -] - -[[package]] -name = "tinystr" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" -dependencies = [ - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2 0.6.1", - "tokio-macros", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-macros" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" -dependencies = [ - "futures-util", - "log", - "native-tls", - "tokio", - "tokio-native-tls", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" -dependencies = [ - "serde", - "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "toml_edit 0.20.2", -] - -[[package]] -name = "toml" -version = "0.9.10+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" -dependencies = [ - "indexmap 2.12.1", - "serde_core", - "serde_spanned 1.0.4", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.14", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.12.1", - "toml_datetime 0.6.3", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap 2.12.1", - "serde", - "serde_spanned 0.6.9", - "toml_datetime 0.6.3", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.23.10+spec-1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" -dependencies = [ - "indexmap 2.12.1", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "winnow 0.7.14", -] - -[[package]] -name = "toml_parser" -version = "1.0.6+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" -dependencies = [ - "winnow 0.7.14", -] - -[[package]] -name = "toml_writer" -version = "1.0.6+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" - -[[package]] -name = "tower" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-http" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" -dependencies = [ - "async-compression", - "bitflags 2.10.0", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "iri-string", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -dependencies = [ - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "tracing-core" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tray-icon" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d5572781bee8e3f994d7467084e1b1fd7a93ce66bd480f8156ba89dee55a2b" -dependencies = [ - "crossbeam-channel", - "dirs 6.0.0", - "libappindicator", - "muda", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-core-graphics", - "objc2-foundation 0.3.2", - "once_cell", - "png 0.17.16", - "serde", - "thiserror 2.0.17", - "windows-sys 0.60.2", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "ttf-parser" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31" - -[[package]] -name = "tungstenite" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "native-tls", - "rand 0.8.5", - "sha1", - "thiserror 1.0.69", - "url", - "utf-8", -] - -[[package]] -name = "turn" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b000cebd930420ac1ed842c8128e3b3412512dfd5b82657eab035a3f5126acc" -dependencies = [ - "async-trait", - "base64 0.21.7", - "futures", - "log", - "md-5", - "portable-atomic", - "rand 0.8.5", - "ring", - "stun", - "thiserror 1.0.69", - "tokio", - "tokio-util", - "webrtc-util", -] - -[[package]] -name = "type-map" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb30dbbd9036155e74adad6812e9898d03ec374946234fbcebd5dfc7b9187b90" -dependencies = [ - "rustc-hash 2.1.1", -] - -[[package]] -name = "typeid" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" - -[[package]] -name = "typenum" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" - -[[package]] -name = "uds_windows" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" -dependencies = [ - "memoffset 0.9.1", - "tempfile", - "winapi", -] - -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - -[[package]] -name = "unicase" -version = "2.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" - -[[package]] -name = "unicode-ident" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" - -[[package]] -name = "unicode-segmentation" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "url" -version = "2.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] -name = "urlpattern" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" -dependencies = [ - "regex", - "serde", - "unic-ucd-ident", - "url", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.16", -] - -[[package]] -name = "uuid" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" -dependencies = [ - "getrandom 0.3.4", - "js-sys", - "serde_core", - "wasm-bindgen", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-compare" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e" - -[[package]] -name = "version_check" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" - -[[package]] -name = "vswhom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -dependencies = [ - "libc", - "vswhom-sys", -] - -[[package]] -name = "vswhom-sys" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "waitgroup" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" -dependencies = [ - "atomic-waker", -] - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.11.1+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" - -[[package]] -name = "wasip2" -version = "1.0.1+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasm-bindgen" -version = "0.2.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" -dependencies = [ - "cfg-if", - "js-sys", - "once_cell", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" -dependencies = [ - "bumpalo", - "proc-macro2", - "quote", - "syn 2.0.111", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.106" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "wasm-streams" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-backend" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" -dependencies = [ - "cc", - "downcast-rs", - "rustix 1.1.3", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" -dependencies = [ - "bitflags 2.10.0", - "rustix 1.1.3", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-csd-frame" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" -dependencies = [ - "bitflags 2.10.0", - "cursor-icon", - "wayland-backend", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29" -dependencies = [ - "rustix 1.1.3", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" -dependencies = [ - "bitflags 2.10.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-experimental" -version = "20250721.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a1f863128dcaaec790d7b4b396cc9b9a7a079e878e18c47e6c2d2c5a8dcbb1" -dependencies = [ - "bitflags 2.10.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-misc" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfe33d551eb8bffd03ff067a8b44bb963919157841a99957151299a6307d19c" -dependencies = [ - "bitflags 2.10.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032" -dependencies = [ - "bitflags 2.10.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec" -dependencies = [ - "bitflags 2.10.0", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" -dependencies = [ - "proc-macro2", - "quick-xml 0.37.5", - "quote", -] - -[[package]] -name = "wayland-sys" -version = "0.31.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" -dependencies = [ - "dlib", - "log", - "once_cell", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webbrowser" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f1243ef785213e3a32fa0396093424a3a6ea566f9948497e5a2309261a4c97" -dependencies = [ - "core-foundation 0.10.1", - "jni", - "log", - "ndk-context", - "objc2 0.6.3", - "objc2-foundation 0.3.2", - "url", - "web-sys", -] - -[[package]] -name = "webkit2gtk" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" -dependencies = [ - "bitflags 1.3.2", - "cairo-rs", - "gdk", - "gdk-sys", - "gio", - "gio-sys", - "glib", - "glib-sys", - "gobject-sys", - "gtk", - "gtk-sys", - "javascriptcore-rs", - "libc", - "once_cell", - "soup3", - "webkit2gtk-sys", -] - -[[package]] -name = "webkit2gtk-sys" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" -dependencies = [ - "bitflags 1.3.2", - "cairo-sys-rs", - "gdk-sys", - "gio-sys", - "glib-sys", - "gobject-sys", - "gtk-sys", - "javascriptcore-rs-sys", - "libc", - "pkg-config", - "soup3-sys", - "system-deps", -] - -[[package]] -name = "webpki-roots" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webrtc" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b3a840e31c969844714f93b5a87e73ee49f3bc2a4094ab9132c69497eb31db" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "cfg-if", - "hex", - "interceptor", - "lazy_static", - "log", - "portable-atomic", - "rand 0.8.5", - "rcgen", - "regex", - "ring", - "rtcp", - "rtp", - "rustls", - "sdp", - "serde", - "serde_json", - "sha2", - "smol_str", - "stun", - "thiserror 1.0.69", - "time", - "tokio", - "turn", - "url", - "waitgroup", - "webrtc-data", - "webrtc-dtls", - "webrtc-ice", - "webrtc-mdns", - "webrtc-media", - "webrtc-sctp", - "webrtc-srtp", - "webrtc-util", -] - -[[package]] -name = "webrtc-data" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b7c550f8d35867b72d511640adf5159729b9692899826fe00ba7fa74f0bf70" -dependencies = [ - "bytes", - "log", - "portable-atomic", - "thiserror 1.0.69", - "tokio", - "webrtc-sctp", - "webrtc-util", -] - -[[package]] -name = "webrtc-dtls" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e5eedbb0375aa04da93fc3a189b49ed3ed9ee844b6997d5aade14fc3e2c26e" -dependencies = [ - "aes", - "aes-gcm", - "async-trait", - "bincode", - "byteorder", - "cbc", - "ccm", - "der-parser 8.2.0", - "hkdf", - "hmac", - "log", - "p256", - "p384", - "portable-atomic", - "rand 0.8.5", - "rand_core 0.6.4", - "rcgen", - "ring", - "rustls", - "sec1", - "serde", - "sha1", - "sha2", - "subtle", - "thiserror 1.0.69", - "tokio", - "webrtc-util", - "x25519-dalek", - "x509-parser", -] - -[[package]] -name = "webrtc-ice" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4f0ca6d4df8d1bdd34eece61b51b62540840b7a000397bcfb53a7bfcf347c8" -dependencies = [ - "arc-swap", - "async-trait", - "crc", - "log", - "portable-atomic", - "rand 0.8.5", - "serde", - "serde_json", - "stun", - "thiserror 1.0.69", - "tokio", - "turn", - "url", - "uuid 1.19.0", - "waitgroup", - "webrtc-mdns", - "webrtc-util", -] - -[[package]] -name = "webrtc-mdns" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4" -dependencies = [ - "log", - "socket2 0.5.10", - "thiserror 1.0.69", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-media" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c15b20e98167b22949abc1c20eca7c6d814307d187068fe7a48f0b87a4f6d46" -dependencies = [ - "byteorder", - "bytes", - "rand 0.8.5", - "rtp", - "thiserror 1.0.69", -] - -[[package]] -name = "webrtc-sctp" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d850daa68639b9d7bb16400676e97525d1e52b15b4928240ae2ba0e849817a5" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "crc", - "log", - "portable-atomic", - "rand 0.8.5", - "thiserror 1.0.69", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-srtp" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbec5da43a62c228d321d93fb12cc9b4d9c03c9b736b0c215be89d8bd0774cfe" -dependencies = [ - "aead", - "aes", - "aes-gcm", - "byteorder", - "bytes", - "ctr", - "hmac", - "log", - "rtcp", - "rtp", - "sha1", - "subtle", - "thiserror 1.0.69", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-util" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8d9bc631768958ed97b8d68b5d301e63054ae90b09083d43e2fefb939fd77e" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bytes", - "ipnet", - "lazy_static", - "libc", - "log", - "nix 0.26.4", - "portable-atomic", - "rand 0.8.5", - "thiserror 1.0.69", - "tokio", - "winapi", -] - -[[package]] -name = "webview2-com" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ba622a989277ef3886dd5afb3e280e3dd6d974b766118950a08f8f678ad6a4" -dependencies = [ - "webview2-com-macros", - "webview2-com-sys", - "windows 0.61.3", - "windows-core 0.61.2", - "windows-implement 0.60.2", - "windows-interface 0.59.3", -] - -[[package]] -name = "webview2-com-macros" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "webview2-com-sys" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36695906a1b53a3bf5c4289621efedac12b73eeb0b89e7e1a89b517302d5d75c" -dependencies = [ - "thiserror 2.0.17", - "windows 0.61.3", - "windows-core 0.61.2", -] - -[[package]] -name = "wgpu" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433" -dependencies = [ - "arrayvec", - "cfg_aliases 0.1.1", - "document-features", - "js-sys", - "log", - "parking_lot", - "profiling", - "raw-window-handle", - "smallvec", - "static_assertions", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "22.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a" -dependencies = [ - "arrayvec", - "bit-vec", - "bitflags 2.10.0", - "cfg_aliases 0.1.1", - "document-features", - "indexmap 2.12.1", - "log", - "naga", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle", - "rustc-hash 1.1.0", - "smallvec", - "thiserror 1.0.69", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f" -dependencies = [ - "android_system_properties", - "arrayvec", - "ash", - "bitflags 2.10.0", - "cfg_aliases 0.1.1", - "core-graphics-types 0.1.3", - "glow 0.13.1", - "glutin_wgl_sys", - "gpu-alloc", - "gpu-allocator", - "gpu-descriptor", - "hassle-rs", - "js-sys", - "khronos-egl", - "libc", - "libloading 0.8.9", - "log", - "metal", - "naga", - "ndk-sys 0.5.0+25.2.9519653", - "objc", - "once_cell", - "parking_lot", - "profiling", - "raw-window-handle", - "renderdoc-sys", - "rustc-hash 1.1.0", - "smallvec", - "thiserror 1.0.69", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "22.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d" -dependencies = [ - "bitflags 2.10.0", - "js-sys", - "web-sys", -] - -[[package]] -name = "wide" -version = "0.7.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03" -dependencies = [ - "bytemuck", - "safe_arch", -] - -[[package]] -name = "widestring" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" -dependencies = [ - "windows-sys 0.61.2", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "window-vibrancy" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" -dependencies = [ - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", - "raw-window-handle", - "windows-sys 0.59.0", - "windows-version", -] - -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core 0.52.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" -dependencies = [ - "windows-core 0.54.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows" -version = "0.61.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" -dependencies = [ - "windows-collections", - "windows-core 0.61.2", - "windows-future", - "windows-link 0.1.3", - "windows-numerics", -] - -[[package]] -name = "windows-collections" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" -dependencies = [ - "windows-core 0.61.2", -] - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.54.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" -dependencies = [ - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-core" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" -dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-core" -version = "0.62.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" -dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - -[[package]] -name = "windows-future" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" -dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", - "windows-threading", -] - -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "windows-implement" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "windows-interface" -version = "0.59.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-numerics" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" -dependencies = [ - "windows-core 0.61.2", - "windows-link 0.1.3", -] - -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" -dependencies = [ - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", -] - -[[package]] -name = "windows-result" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" -dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", -] - -[[package]] -name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link 0.2.1", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - -[[package]] -name = "windows-threading" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" -dependencies = [ - "windows-link 0.1.3", -] - -[[package]] -name = "windows-version" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" -dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "winit" -version = "0.30.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.10.0", - "block2 0.5.1", - "bytemuck", - "calloop 0.13.0", - "cfg_aliases 0.2.1", - "concurrent-queue", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "cursor-icon", - "dpi", - "js-sys", - "libc", - "memmap2", - "ndk 0.9.0", - "objc2 0.5.2", - "objc2-app-kit 0.2.2", - "objc2-foundation 0.2.2", - "objc2-ui-kit 0.2.2", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.44", - "sctk-adwaita", - "smithay-client-toolkit 0.19.2", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.52.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" -dependencies = [ - "cfg-if", - "windows-sys 0.59.0", -] - -[[package]] -name = "wit-bindgen" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" - -[[package]] -name = "writeable" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" - -[[package]] -name = "wry" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" -dependencies = [ - "base64 0.22.1", - "block2 0.6.2", - "cookie", - "crossbeam-channel", - "dirs 6.0.0", - "dpi", - "dunce", - "gdkx11", - "gtk", - "html5ever", - "http", - "javascriptcore-rs", - "jni", - "kuchikiki", - "libc", - "ndk 0.9.0", - "objc2 0.6.3", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-foundation 0.3.2", - "objc2-ui-kit 0.3.2", - "objc2-web-kit", - "once_cell", - "percent-encoding", - "raw-window-handle", - "sha2", - "soup3", - "tao-macros", - "thiserror 2.0.17", - "url", - "webkit2gtk", - "webkit2gtk-sys", - "webview2-com", - "windows 0.61.3", - "windows-core 0.61.2", - "windows-version", - "x11-dl", -] - -[[package]] -name = "x11" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "x11-dl" -version = "2.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" -dependencies = [ - "libc", - "once_cell", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "libloading 0.8.9", - "once_cell", - "rustix 1.1.3", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core 0.6.4", - "serde", - "zeroize", -] - -[[package]] -name = "x509-parser" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" -dependencies = [ - "asn1-rs 0.6.2", - "data-encoding", - "der-parser 9.0.0", - "lazy_static", - "nom", - "oid-registry", - "ring", - "rusticata-macros", - "thiserror 1.0.69", - "time", -] - -[[package]] -name = "xcursor" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" - -[[package]] -name = "xdg-home" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "xkbcommon-dl" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" -dependencies = [ - "bitflags 2.10.0", - "dlib", - "log", - "once_cell", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" - -[[package]] -name = "xml-rs" -version = "0.8.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f" - -[[package]] -name = "yasna" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" -dependencies = [ - "time", -] - -[[package]] -name = "yoke" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", - "synstructure 0.13.2", -] - -[[package]] -name = "zbus" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725" -dependencies = [ - "async-broadcast", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener", - "futures-core", - "futures-sink", - "futures-util", - "hex", - "nix 0.29.0", - "ordered-stream", - "rand 0.8.5", - "serde", - "serde_repr", - "sha1", - "static_assertions", - "tracing", - "uds_windows", - "windows-sys 0.52.0", - "xdg-home", - "zbus_macros 4.4.0", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - -[[package]] -name = "zbus" -version = "5.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91" -dependencies = [ - "async-broadcast", - "async-executor", - "async-io", - "async-lock", - "async-process", - "async-recursion", - "async-task", - "async-trait", - "blocking", - "enumflags2", - "event-listener", - "futures-core", - "futures-lite", - "hex", - "nix 0.30.1", - "ordered-stream", - "serde", - "serde_repr", - "tracing", - "uds_windows", - "uuid 1.19.0", - "windows-sys 0.61.2", - "winnow 0.7.14", - "zbus_macros 5.12.0", - "zbus_names 4.2.0", - "zvariant 5.8.0", -] - -[[package]] -name = "zbus-lockstep" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca2c5dceb099bddaade154055c926bb8ae507a18756ba1d8963fd7b51d8ed1d" -dependencies = [ - "zbus_xml", - "zvariant 4.2.0", -] - -[[package]] -name = "zbus-lockstep-macros" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709ab20fc57cb22af85be7b360239563209258430bccf38d8b979c5a2ae3ecce" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", - "zbus-lockstep", - "zbus_xml", - "zvariant 4.2.0", -] - -[[package]] -name = "zbus_macros" -version = "4.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e" -dependencies = [ - "proc-macro-crate 3.4.0", - "proc-macro2", - "quote", - "syn 2.0.111", - "zvariant_utils 2.1.0", -] - -[[package]] -name = "zbus_macros" -version = "5.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314" -dependencies = [ - "proc-macro-crate 3.4.0", - "proc-macro2", - "quote", - "syn 2.0.111", - "zbus_names 4.2.0", - "zvariant 5.8.0", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zbus_names" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" -dependencies = [ - "serde", - "static_assertions", - "zvariant 4.2.0", -] - -[[package]] -name = "zbus_names" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" -dependencies = [ - "serde", - "static_assertions", - "winnow 0.7.14", - "zvariant 5.8.0", -] - -[[package]] -name = "zbus_xml" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f374552b954f6abb4bd6ce979e6c9b38fb9d0cd7cc68a7d796e70c9f3a233" -dependencies = [ - "quick-xml 0.30.0", - "serde", - "static_assertions", - "zbus_names 3.0.0", - "zvariant 4.2.0", -] - -[[package]] -name = "zerocopy" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "zerofrom" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", - "synstructure 0.13.2", -] - -[[package]] -name = "zeroize" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "zerotrie" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "zune-core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111f7d9820f05fd715df3144e254d6fc02ee4088b0644c0ffd0efc9e6d9d2773" - -[[package]] -name = "zune-jpeg" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5" -dependencies = [ - "zune-core", -] - -[[package]] -name = "zvariant" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe" -dependencies = [ - "endi", - "enumflags2", - "serde", - "static_assertions", - "zvariant_derive 4.2.0", -] - -[[package]] -name = "zvariant" -version = "5.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c" -dependencies = [ - "endi", - "enumflags2", - "serde", - "url", - "winnow 0.7.14", - "zvariant_derive 5.8.0", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zvariant_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449" -dependencies = [ - "proc-macro-crate 3.4.0", - "proc-macro2", - "quote", - "syn 2.0.111", - "zvariant_utils 2.1.0", -] - -[[package]] -name = "zvariant_derive" -version = "5.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006" -dependencies = [ - "proc-macro-crate 3.4.0", - "proc-macro2", - "quote", - "syn 2.0.111", - "zvariant_utils 3.2.1", -] - -[[package]] -name = "zvariant_utils" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - -[[package]] -name = "zvariant_utils" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "syn 2.0.111", - "winnow 0.7.14", -] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml deleted file mode 100644 index d5482b7..0000000 --- a/src-tauri/Cargo.toml +++ /dev/null @@ -1,87 +0,0 @@ -[package] -name = "opennow" -version = "0.1.0" -description = "OpenNOW - Open source GeForce NOW client" -authors = ["zortos293"] -edition = "2021" -default-run = "opennow" - -[lib] -name = "opennow_lib" -crate-type = ["lib", "cdylib", "staticlib"] - -# Tauri app binary (main) -[[bin]] -name = "opennow" -path = "src/main.rs" - - -[build-dependencies] -tauri-build = { version = "2.0", features = [], optional = true } - -[dependencies] -tauri = { version = "2.0", features = ["devtools"], optional = true } -tauri-plugin-shell = { version = "2.0", optional = true } -tauri-plugin-http = { version = "2.0", optional = true } -tauri-plugin-store = { version = "2.0", optional = true } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -tokio = { version = "1.0", features = ["full"] } -reqwest = { version = "0.12", features = ["json", "cookies", "socks", "gzip", "deflate"] } -url = "2.5" -base64 = "0.22" -sha2 = "0.10" -chrono = { version = "0.4", features = ["serde"] } -thiserror = "1.0" -log = "0.4" -env_logger = "0.11" -regex-lite = "0.1" -urlencoding = "2.1.3" -open = "5.3" -hex = "0.4" -discord-rich-presence = "0.2" -uuid = { version = "1.19.0", features = ["v4"] } -dirs = "5.0" -tokio-tungstenite = { version = "0.21", features = ["native-tls"] } -native-tls = "0.2" -tokio-native-tls = "0.3" -futures-util = "0.3" -http = "1.0" -rand = "0.8" - -# Native client dependencies (winit is pure Rust - no CMake needed) -winit = "0.30" -softbuffer = "0.4" -webrtc = "0.11" -bytes = "1.5" -anyhow = "1.0" - -# Full native client dependencies -clap = { version = "4.4", features = ["derive"] } -openh264 = "0.6" -cpal = "0.15" -parking_lot = "0.12" -crossbeam-channel = "0.5" - -# GUI dependencies -eframe = "0.29" -egui_extras = { version = "0.29", features = ["image"] } -image = { version = "0.25", default-features = false, features = ["png", "jpeg"] } -rfd = "0.15" - -# macOS specific -[target.'cfg(target_os = "macos")'.dependencies] -core-graphics = "0.24" - -[features] -default = ["tauri-app"] -tauri-app = ["tauri", "tauri-plugin-shell", "tauri-plugin-http", "tauri-plugin-store", "custom-protocol", "tauri-build"] -custom-protocol = ["tauri/custom-protocol"] -native-client = [] - -[profile.release] -panic = "abort" -codegen-units = 1 -lto = true -opt-level = "z" -strip = true diff --git a/src-tauri/build.rs b/src-tauri/build.rs deleted file mode 100644 index 932e4c3..0000000 --- a/src-tauri/build.rs +++ /dev/null @@ -1,5 +0,0 @@ -fn main() { - // Only run tauri build when building the Tauri app - #[cfg(feature = "tauri-app")] - tauri_build::build(); -} diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json deleted file mode 100644 index 57c0b08..0000000 --- a/src-tauri/capabilities/default.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "identifier": "default", - "description": "Default capabilities for the main window", - "windows": ["main"], - "permissions": [ - "core:default", - "core:window:default", - "core:window:allow-set-fullscreen", - "core:window:allow-is-fullscreen", - "core:window:allow-minimize", - "core:window:allow-maximize", - "core:window:allow-unmaximize", - "core:window:allow-close", - "core:window:allow-show", - "core:window:allow-hide", - "core:window:allow-set-focus", - "core:window:allow-center", - "core:window:allow-set-size", - "core:window:allow-set-position", - "core:window:allow-set-title", - "core:window:allow-set-resizable", - "core:window:allow-set-decorations", - "core:window:allow-set-always-on-top", - "core:window:allow-request-user-attention", - "shell:allow-open", - { - "identifier": "http:default", - "allow": [ - { "url": "https://remote.printedwaste.com/*" }, - { "url": "https://api.printedwaste.com/*" }, - { "url": "https://*.nvidia.com/*" }, - { "url": "https://*.nvidiagrid.net/*" }, - { "url": "https://*.geforce.com/*" }, - { "url": "https://*.geforcenow.com/*" } - ] - }, - "store:default" - ] -} diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png deleted file mode 100644 index 94cf88525a9cdc7392c9e48db85b5ab0ee845001..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2854 zcmZuzdpOg58~@E>Y_f`(X{0BaL!K!m!iEw{WjRZk9HSh1&=Y1GIaD$p%0v#O$Dso& zN;=FrdWar*Bh==6ZX3mK8s4Al{rCOjd$_Le{k@N$`}*A1sVD6=Bh`@r0Bok%A8~?C z*2a>TgZ5_9xen-1h_LsJ1OSxs#)1KPchvv@*-trQ?Q-Sr{7~FQ=ROUDh^Dsrk&90M zAbxRJ}4SQ#!Y(Lkp#1OT^ z^F<+ugd`w=YOhw6iJ-{CYzmSxQ<=kaN=REqjHXv9A^D zx2@;?-lisn!Ky!+E*2=W$F2y>NKPza`nyf8({8yK46jR}zVlLp1{>`%l7RvKb9BlD z=i}`UDuD%E3aj`Xv%?U>Wx+`iWLHPk^R|ysmXV(0}(KqVe7{tBl5?FyCs*$N3+Wn zBOIQ?3l~>cT5+VcyW#F6-a$G0CCeqVdpV8^fCD(DPqk#6OYNQ?{L+ZMkEnemKhf0x zP?OgG)HsQ(>Z{IBbKTo(vjm%(n3XhW^1OAeuzCRh zy`SF}8amfa5k98L5{^B6nku~R0r1jMo-J5ZgZM93`aOWY{JT+FmA;Z2z>D7Q+31MU z1={R#M5`O`2k11IDe2iYqAF{2*CWsx)zCcyGX{fg9aUJPaA%MqD*zktyjlRiBew;M zY!D}S(w_p-am99hMo7Di=wPH43aogYh=INvfC-Rv`!*hPLuHE405YR0Zk36k`(yZC zz?vq>XB#=1pv7gcvjg^3L(){;wYY$4D($se#%j2+_xA{&+FA7_GB0CS$>AwnMoN9t zw}ip|pIilEw5doip26kDk}3`JA9+Z}8M0J0#!_L$c{5HzD7vd;`&ZMy{vC=`e-dOY z{%UEgk}Nb}C5qe!N_|>67cTjfWBn{s>=5Gfp90T>=9kJtK_Hv>OZ?iWgVC5#%UDF% zXqg?u!IJS&=Hs>crYzR4?Q4l)%etf|do5Pf{&XWgP-n&rE6WydC3mb@e6Bq$_EfBm zQ%Qdw+&l6M!#XNGK6_AP^UIr_gdr<^Cg{`xleGNm^C*O1Z1%xZ60Gfqj`NQ-2Lo; zy#~(%K#KcreP~&0Th<=Uyk2y+Ox5SzcS=?eXo3fE-onZpDeh`>e0g;|M_(GS6Q#9C zDKs_=d~XyKc4zOWeY+n{e~nu7f6Q~!l2q#xE6b2fPiwABJDz!Uu`MfT>7hFL-OZjP zg%9%=(iJ@TzMLO18gDrjP3S$WPBG==*C9QHk{6yks*?*`b1J}yV&|U8%CF1t5C}(B zFp`AtSnAiDj#v$SIbd?2^ik}@r@YJ}yF#tJxET@n9}Uo2;#l6ejA6;pvwEsSDD^ge zXG1zUQSRRvFhuIvCjH;)%q#|OrP>lWf>eZeqoUt$uAKOF8ET^A!ub3RE*O8+GB=oV zvm=&~6QF)OBle!?t!y!jd3!#Fl6`#F~c449Qne9wTa*xPa2C3yt&nj_W!>F$R`_Vo3+(`jv)g~BRlg->q zx_)an|8?aozMguBR|V{ABLvS`sJ#FTm%A3W^JJz$Uzo00&85Zf6nY2bI^Q!uG?ecx2gi;;&#Rl)8w2bM` z%Bw4m4V-4ZC7F*T7p$n7n_R{#<-ho~`4q;g5_~UdL~0$TXJK9|Cs%xnD7p7!PuQba z2~E0p1ag_o1@^TrAOF6;hLgOykZLD)>3MYQnVhJ_U3*wV;#HJZBz;@t*{M*^(Y7@d zGaahc+GG#P3J&E@MUXu;$8Ws%m)$woiYEVX!F+3O_(VI$1HkA3vKz^4T(%hO`_}7V zV;a}7ZLz>Y;)J4F+(B-{KAe5g!W6xWRKB$&^vpQ+vn>s(CSjf60rS5pq{Po^zTXW> z|1s%RBb<<@1>H%X^je~`1wuMm0^n5wUIaC>?(fkub&QN2f$17=u zb}DzR+U}Dgp&V~uO;}e=48KDDP34b)+KCj+TFq5>U@i~0jXbyyp7tnPJY@Kq@6~c& zAL@vB*Hm`VGQ{$2ge$I~f!f^o8czW_{OeprMYhckLvy}zLsU} zjzcF*Gxf?Yz4($6Y_441fYt?0fQ3_!iO9)?!k=my8t)bsXUm&tuj0?Z&bKUEOa|rf zSlB^>A{^t_Y8u$R&{tkJ7qvHNRnQ6hJ0)GqQ3K#q4 zB&5QZZdz~Jh~6cCPvXBH;;9^1(d!+WM>H>EtagHve-&0&bA1NmtlBF^xaGzw>i|JkLf23THdg%3_Q2g?Zipm{*QNK z&3#JmapAF6^jRQTkeWB_6|&#jj}Sr=U`{M^DF?l0Bs(hMg-VyGgT%d-k@mvM@Ik(H z_n$(UNYDnhP%PhbqIklq7BaB2j*G9+xpG}Nh)@-OMb$RqwGLlMQD>Zo_cwMc|GrMx z1mRf6ewc8Xg@bN&++Hu1#Ld1puQ+)}pNxrUvDgzD7_N#BhbG!eA8T@1jtc~Nll?m7 zBZvdmU%)zn{0*W?17N)W=#-!=%K8o%^YMAq_D-ZHFr32OX*iT^*#97TicBR&S>|b#6xo+B^^|NyD0{S!Y}t2aNKdjvA+k<|glu^%k!G?c zYswzRO!k-=+uU-`%zF*}kK_O0{rG;EaUezi!nvz~nG2&qp8KZLw$m&I zTj)=fRs3)9jnrk__E8)Al~QpnqqF>)ewB-A>*Ag2!KTEH&bW&TdVfo+HF1fz>Xz+F zMCghd9&lDt)cad-hw~Hlxbm~)GWCwfyIXE}Ju=k$p-1gk&H374nUf|tJD)wfI9(LX zqTyZ}5b{H630TZ4wYO=C&YzR5gS`u*vbzfMQ19mNdKpP5I}Vuo_)BDU6y(KcYLK6N z-=0`}q$t_Z#na{1CBMJTk{ujZ9C)2{;;ba~UiY4i&2IZt5F>BMla_nL@YVDX>1xaK zm>!4YZR8n!WPF{6o9tZK`<^t8nnHdHg#m=2%nb0MN6|2vn963#~md(>Eg)I zFZ8BxNyuwbbqCAW1aVH^$0W5=XP1hURZIP4yi|Shc;DCa?C&1F%}{sVWP3i1og7D zy0VqTN^uRDVYfQ}MhK!8B1?bkEy&>TmhH1KefnwXjd-ie0n@>s_XwaZu(s=7lTw|u zeBNejBY%3!Wg)n`_|=Aw)^`Lv_%rgd_Pzkvd9vR5%kjL4LUQ*~&*Ary!@MxKEm;p@ z4!Qb#yIn|PyGv-L&%aEFKtmDuy?Y39f*LNB-~K9q6jQ&Qwp}l;Mu%)jm(v+db1$?g zGP7JkNOrtGfC@c84e|(fIMGK>{ej^DvD@@SKFHZirf0-C>i&W;q(0DMj`w4-6f9_WpK5bC-$)YmJ-=H1j2Stby7knEarfPD zL|wT09=g-OHx!Iyo$lb_(FAg8BvJLJ2M-0mVUM#UgM}gbHT1oWwksB_Cw1Wpzs)RR z#qqolAiH=O42Qdf`Amnq zuvP)`6DIHB#T)lHT%>Uk0tI`N4??s(Ubm1J18)1Ojx8rm&>1a8{lt09xYu>Haz3Zk zn@I^H+n_Kj@#nJ%6~8@iA^oB9Xxeg6Z+Jd4useY(+wB+}!HwY9iHaDo69h+o8GCSg zT);xA7`N_m7;PRiLu`7;>qhD+1lUTFG9z1^WDf-q}`j@BPZX~1J!#}tlY9eKlzgLi4QN!|9^JAJYa z?^C!q-6kABe)~~jnS@4HBEs#fA)msB^h`g@&zObT4{OAEctYyg4{v`(yxVxY(-|9R zX>~cYV*Wss&FGI#iGeOp*9|*u-(Vh`=iB?^LkuU`afR&Zx6Fg=s=0GU0Z&z#@rwdp93N9U{+ZLl3Wlr6AsJT{3p7^Z<2~Pmk2}$BUJ;c*=i;HTCHbkVzF52IS z%^8V7i6O^dGlqpw9O1DZv=DAkaDk<3!B*263FSG?;!ZX98fWf>kSCBpr^c4B+yE|$ zfe(&atu?BmPJgJxwEVz^+?qh{L(rs-u%r#CQ>%Q_-T?uq`LJlGeN+i+Vwy06+!LSJ zMC6#Qu^#L*zH{(D}eX3>$1DH+q!x{0Q>Sz6q) z{kcAmdq}A@Ajjh15ffk%mCg8yU)t1fVTvbBJau-psTGwT!EPEhI2<5@o}x@+928HP zaIbadcwKSQ52bNTz4R2zs?vV>Ubix3@6prjQG5m~c`T5G+*+D;m7K1~(jDrUpL=Ww zlM4x|3wuU|$PYLUL8yY7&Bv;`4%63CcN>PBFXg&a$E$gRiunHw|2S5R@XhS z&Pb2-oa8J4pCPQ3{;op%v zs%Am1e>(xVy#2;yZNmTu=a@NYUE;$;kEZNUW`|tA)~7V#03A3RGy1Hl!aOX?P$hq< zj*lO5*wF4|*>~G&bnNeX33b}P)dqHNx#xBYUt)n$`zt4JPXV=-`MkdIDY5F3LSzBu zbm@=PGubA~&w8XWTD02|Q*>)4qvmDMQ$|GAaFMr-h$JLjlz_A4y#E*^CAa@etK6?E zOc%C)qaN0u?jF_}vTHZa^Yyi`ry14;*Rn7@Ud4~4-cwt?v2OX%H-L7OHwr!0yKMV< zY~N!eWU8DVM9J;IdD`Ko`NqPSE~f@W#Ozjui()Zr+(dVFINjKO{V)6auO&NE4!iHt z3~PSG;tMutkxQI9(q*@VKx;6wPq1H`E%2!qhyFFTj4Fu2{di>wuHlQb&n?fh6h1B{ z*g35)9B?;&9Pe~JV5ushFDQrJa)upqSzBjr!om(g#2kkeT?q}>M^*E93dR{OKjp_x zP#Dxfw9f*Nq;2kv-KWZW=!l^kJHV{Bm@B)N376eYYWNhS zVKl3fEfxc_QE%BtF&3+$G$1kpN1ICUp*qZU>0Rtqo7AA;CAlM-*r%!U*)fpE`#!%& z8@a{F*M}W#%TFaO_p_4o%>`N+u+E&;LIMz=oG@KieR>7X?IJ37Xu zwhzb!8t=5O#^4QA9+OjD@MM93EYT^GeYnkJSpex697xKG?@a%=WHL%ZrInLiVcWhO zsIXMcYtvZrD5=av+<05?^@&zdxn5q@6Koxyzm#Mzy#@vC*-C)Yt zoHT-z8p}@b8-EhKfxoUSV1X5&ISfJdKqB7s*kt9$Ddq^>ZWVyVDh@!;P>5se$6Mr< z7C(hL^Oglu4WUktrLUuuYYiB46D|bq5~S0_Sbt|e(ZX)v!H}GkX}TZ}C+sKaO|Mq; z?!0kvH5DKO3#>U0?k5P0Toc^|2aW;pWn^VeNZz*yt62a?7$9L|{)P`#jIT>M^LmmS zj6m8q=f^>u6BLxycNzweGIo_vStmuHi~i-Pg8hOPTT^Y7Cro^OSZ8n|DxdjQgp;mV z=P0OxG3JN=xGn1$!fw>&B5gqF1qcc|Su4#=^MV~u%@KWd*{x&P57SPSG>*6BO`wJb zVH9A{O}FF@dhJo$7FQ7$F-6A5uunVpPO~lC@VP@4VZqXfU$n!{ zP^)a5DT0U=!_w0h`xDypm|yFv^IX^TOC8?tf?f{t7 z+zp3u+&0Sof&ewSvj11eQ$3g6tLlQnWFxWQ3Xl68jol?eFQ4z@CDG>lQ zm9;tbKst7IOk^)>rgZcd$=50ISWcZE0BPOtXbH36?$rDC4s(g!hRjAbGp1EJZKO1o zb2@t50#M#Xz@(OBr>sR`JeUMm@4LDUsIzJBxKA%3y2}$eVCLA55wr}}%e0%7@AgK*OfAjS32+kn-NHkf}RLvd95X&n0s}Lu!n@!^Fj) z{B6;d)88~kNx-J6NZdq03{VpgmYf7(@Z*^_t>iN$SvS*)X!Z89-0TaLfU=bc2Wk^e zKuoJ@oNT)-KqU0!FE@82*gxA;(-McC%#<7l;?0p5POVbcPKFc@E6cp3w*m}@e@0>eNL&WD0L2UcRato@K_pddoNMQ4A}=T_wreK6bNV*yaWsYLRVY8=>{?u_u9#A zB_Vkf+{d{h+j<|7YJ2rI>k^LFYKp>P;Erp})b6ze8KrYR3wNYcC8Q}q^VpUoTZZ6Y zIO`#I*t9d?y~~CY3;N|BKQPDfq{wD8V7qh&_NlZm!^=iD_H}q|t%tXvjgW^L?U=>A zj4%BCY^m-wINaWPb)T{Qnj`D>Y5>%oP4)RSj4v;ejvQEQr_|&7m;1z0)%KWk>W+3I z8W`<>00Bd8*Y=|Ena6<#p5*7?cY7b0buy5F>aE@(=9P61(;>34K(s%OBD~@z9z*-l zHq6G9zSh0ulYun?y?LC}qj+#HL*blpPOK}H#j>U9<6G#3?t6QeUDU32IIq1V+P@Lp zjCI2#M(amsrSZAiJsv(g%9|o}TaU?Lmr;eW1Wr}qPT#1eb=fh)`l@>892eA0x(UUB z;t+q|X8DBChM4P(F{Si!A9UG}`E;d^n}=w(P;62-;fmO1L z2|;OEb@r2OlZ~`&!WA3%AmA`M0;5(6urWx+j)zM!t`7u_ehkv=W9s~($;2U9pfq7M zHB!e3cspzqg9q)U_hwK3f(@Q@lt7dHST68of9tsmiK&Zu1R8Ay%;#8)`xvE zdO0oA#2@)_&gQu&r+7;W-7A9g^ge+mPoj+&*{J6;^GmDzA7;z4>>03Vqo&9)NtOvG zuhtULuzqPVEGYYfMt~>E9YdGcai3pMNtZA3JWz6zcN)5h)ZRGAG1-!&}a&G&EUyNuk~+ zB&UY5(Mzuw*>@Nz`nDCzyjTX28%rhqb5FyxYb3!uIDb8cEn?xr6*^mGTcsLDQ8i~j z&%dVKm6CWw{3|oXizWknWI&na>9f)J`hpc`WbEfAyaW2?RQkiuIFXlA>Wc|;K)~jt z!lo~BD)$+v@lRd4pT+=j4ix-O6(ml?IF$ryPLUIlaKOKaE0-*Ay|ckGh4*jG5Y=`5TM(_NVPr-Xy9_3e&Oo|PNLo%{eOKCAf|vgFWy^bd!1HtdGkXNUfXV6+e_kO z{j*FqUI65fHrrE3$t|KGe+xa!yJN3I#kcw|w?pJI7QSH0Kpg@4V1pyw z7eC>xcXK)k9DVKB%&;6K9st{G-iU$LCKA7rI7`c)GE*J;@jY4wlf6a>!78A@y6+=y zwSPyjALbfQBRLb+ZBwrrLGOqGKmU3DPNSUnSxuh77(Og$R?6EssK8_?qKFA17U07( z@ae{cj(-7QFyi#MuAxCQC_KN7hT5I~^P7NykD0>QGUz0NzFGk-_6Vw{R5~X!yU8L9 zD&xzkYr6{RT)yy)M4%_*6ed1!J`s|_Y zfwvx_jb@KFl8w9a`3p+FYK855G3`Wbe?At=m96$FLm(Q{Y=OY#vdk|^?=qIj7mQnM zSs8n>H&EtDxk1J0;FfLqr(2$ThC9uX=mGH^`BA@5g=bsb_mQtg=hQ{u1^yk+&Iu*z+#m)Ea2hKKz8w)OEsRvn1oJ5n2IUBAJ7c=g)YK7(XP+C8q1%)}KvR zPkK1`#aS_az9Cu*>NKux#V6|Ss^4HelP!w;_-rcID6=n$QcEKyti%xxJIaP>9fRwS zUNO4uc}1#guJIeTR|-3x#CF>L0P|+sFSR@rpC9=edKQV3JoV~RiS#qy)XGd1@}qm8 zJ;i`?#bD|6m9d$Q=8l3#yHtnd=$)9P6dmCPp0P4r9vVLm1gx-X{WM|CtgoD&b&r-x zN>MoAES+<}P zv^JRCTLM3*_${DBRLl#P%@eue>cS;qaOy?N_fYRV;D25hsu{^+mVEwtuORk`bINLd U4LBa~w-rKP$LK=IKR53G4`#F6IRF3v diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png deleted file mode 100644 index 377bac86b64f22607621c3a0c9da9cd931dbad02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 796 zcmV+%1LOROP)H zbXY`aNfZ;e#AsX+s3M?%w54c)ve}^!5)LAZYzBxYAkjb%Vx-1oIw`dM%$q6G05N%O zgqh?^n#|$%y?Jlm^bxTOlu+fNe3MACCXr;5NHDq8RDK{-_7f^t`Up3A)s*){(oMMT zQd8DNDC;DYvUCtiorDsW_k`kiN@Ss(W{h^qWu{`YA7&4=nFk0g`-nqmCkPIL(LpG( zlT9hXMt;z^v5jD~E6FAE0L|!u7qM7riuQTV|Bc%S1+C;Kz3@V-8qyOlXpI!m3om#} zAU$!lfR1>63xVRn%R7&t?&B4>zEq%p{x(`C47le`jv3EyW(8uzYep{Pm-G$0uQ0+G zU225jIK++Tu>!H+Plqoe7z!xhZ@(9#OAQbg?_+uWlU77rc)*S4HAM>W&iR^eUO`rV zj-kqxv}4Z4ms^y38`3HS`(Z9T_YHw~@kc}FwNXABPT8~IOwJ_S=}U%SPvpj<1vpl_ zb<&{Cb-D9cTnlbDp7WX&;C$6OX3LZUn?V`Hjsy+=>K)v(AfFGVa^Xq=-uJwDEKLKd zTqm@V&wcNL6xe_i@I?y@rgGsqjgbO8o6N1=QwWDc3eYr~w&$^%oX2+*;K8#S2o%c> zx9D{%fKOV(L-B%!8*PbbpDc+M@T79#YJnKG*Xo`#_#^*NkgZSvE9>J}SariEc{Mz+ zCE;%OIW9b_oy7MeIp7n|qi1Wi@cAmr&&n484 zT*YHC1%mY`_haA2GnE4W>8lnGo>@mAJ@L$!tbmTVffdjbH@r{_$a>)!7V?weplO|O zWYp4UV#gz0a0}s@g|d~yDLW`0G@f2V>_2hzgj{H&oFW@d7g|Z)FFd`Lx#lFaYH+z|OM&45N573`Wzyh)e?j DG2|~H diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png deleted file mode 100644 index 3c42dc2ed397fa0ba315e97ce2ce07c12648bed6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17986 zcmch<2{e>@{69WYq>_762{CmmE^ekQNn+Y=r9@fFHkA-UNJ2bHrClWnF>SI_ge1mN zgizM3Gxm&S#y;!w{6Eh#+&JIw|9{T^oZtDKW7J&aqi+Z*Ohg*l!-?!WJ(zD@q zvGZn4;S8kr)<${t34dv2WV*JTSmGZT)1<$n-FINSzK>$N$0kD`#j3&2f5?hySg+rz zuVy&3MyG^$|G+iZ2cKUL96GpX-5-yZ{S0ypb`@z|qb{?o^r>&`wd2T+6$`FaKOA{m zlkdn%OCp6=roF_Ou`{Ri{L?qD7*jqQCei*wRcm!lh0*Pn*UuA<$Sa=(+`F3LzI|$?N>!?kX#xAAzpYi5 z?tQEfq28*uNTKem0^88(y!K?Zw3Bk?w~aMQ-dp?k*~SdztVj$?_4OWeer*{0Ejj$` zYeV^p#Nfpgy;kymvNUsd`} z6f%cXcqiDIW7EYI#L@bxih)m-C**Hc?A6X1+v^gtz5V_%kNOYnF{yu3ADPuFEM3yt zd;D159a`p?V=LJe%H}suNi2a|!oKGAG*yc^JKcf%ye*BrP=m@xZrwBT5q z!lvuP85AiFt>y}GInRR@Dh%x=G9wQ0CLgW6Uw`O?t!aUz-%XPfk_umYue*94J{JAy z=(!L*RxlC!qWH50zm(sraCw-}w(V4+wZ1xSHSch5$@O8iq=X|K?`Wb>8pop{G&#_E za%ry_-;oYAJ;hVLOmG{%07gYqBr763G4Ru{?{vj+l5`3pvFhh^ux~Qn7+`8eI z^pOn@3=*x)+msRC(c5^Q^jOIQ{0-ig9>w>219yf(Jud+(4jZQONOsAcZ%sY&F6Sp4 ziOpXbILmRzUJ2N?jOgjH;phfJzjwdYd*+G=3@}C?Xdl?6K8}faGJMPqft*ISO zb#&&P&VBL0CMgCGJ%f^I9r$6#yx!KONBmKz~rNSjxA;=}uG32jc1f1gU|a>z|fI1TA;W)>E$+Q%QjU-^w-$ey~_*<8CbKuJn>0b?lJcDg)eTmZ0yqb8R8C~ z<7N)mWD{F~8WfRK+r_p=TWz-cTw~Uz&@FnEEDWJoB~p3X%(86grv;n~WH5abpPXPb zA`Gcp!E0IFg?Lf;^!BwsXLNh#kT9&7eXnrgsL86F^5cNxhFq@}ave-_AM%H8n!~vP zM6oudzyzJx$Cqd10R$7#GfIpYa+X%KP3zhwZQQ2d$nFF8isx$&*Ej(^JHfv5C$9#- zY=S-<)O9iUR&t;~ZykGUD#+oKHCAj=?ZRib>%S6j_ABtR%JqK3413^d8KvK0*S(>t zTNP4Y)HC_5y_64Ug8Np$69IE5A2Np-JniS&sp*Sj{c9uE z6Whl7PvPaKI#1z8*j^2UC^cT*Ba=-&uNNUN&Dq?pi`pgEh&Oo5Bz!t&Gzq^q@Iyb@ zl2@aNlWPtigN$z@tS_E>fyN5MG>Mt7N1i-_^MY+srj?UQF1XvRaWXTa0|MOS%JR{~ zwMRZ&!CTteTlU{)Xaw6rib}JY=bdDh)cf+ue}^+-0Dga#WeYuZRJD6nJLK8d;`qM& z+t#pShEAT^nLvoBHR<(RjCeIa(LR#ql`8bNbC{Cg#E5M|rLp6^W<%hYHAiOVgAuK-+X#sVU9&BnYou#C<=*nQClZk_@{M+q6N!t>aD1ltpA(z7GY z_MT?7;=4Sed(cmvLop`|r2yb6+O|*S=tyk&E4KkLW;5fO;N!sF3vh!Oj;<3t|FlJ` zAAb#5;f7n%YQK`@h1y#n(x1=l08s&EF~jo}W!Qeg!HD zn5qknu7Yh6A8&rr>!F4Fk~&77BO|zklB6Tnz8EmN7bsIK5!LD%U0{E=b{bv2h2(x( zBL!b~9Xs+Hj?K06$`w6Tf|M}se!0(b?hbVP;30A7Pd3KK5iW?T@R=^ zYuQny@pGdD5TvZiDnEvj224~dEOilgx>OE0^QKEuh*yr#{T97HOzRbpWwTmVQ$f1Q ztfIo|yTW;P)L~?s?^A&X2mBR9K`~6Y@|k+bJbdTL9ATz16<`Yh5%|d#V9^WMhu4kP zjOd9nJsAzip4>NY&30@T=#xhcIXMuBwvfC~5*c|`ts0hG17NVU2R~z?fej{Iy$ks$ z_vA^rBh+#;BIbO>pk?gN_e2Z+#-A)7vhauQF5#fe4=6T9*g&9Sko9DDECn#%s~_jA z>W1q${Z(Rb;F__Lb5JSQvxY1NT`8kh4EBrSq=~q%*N6(d(YF#3+%2u(H+QGaB)Z&t zCukzl8?SF3qZE=y3+_$><(8j1RgBN%Z~CQzER9qmy~{@2PxaQEgB-ZyuLak~(ql@(3Z&v1_5L)u6{VkMvLYanuuKw8 zI$eTT0~}vZ9h0%(3)n4sb|q%L=*E9AMUe{N6_+FnT?+9B9I3#jY$@ERS=imUvCz-~wLZy#n0Q6u?Zbo@g-Dxpkm2AmoCNoL zL#RJ&!0JxI$MbXP7IMpZ{w_n4eG zsoMRlw##!?46zeHY0+=g*OHoH*75bP*RA(!An5!s{i%Tirp{w{@jTPv&>CNOM)gF| zI0{E_W5?-Wh&*!>BITH0d{J+`j^pdZS-sAh()arUw6i38j8XTSM4*p=Z6!s-I|`$@K$p#FSC&+>Nc1E!8ag895)-Y z6Im{QjQY%f;5H>--U(-T+--9&wY!WmUxFe$!aTZ96;bl$k|iz)@0ShoFm&?J9v@b3 zH0_J5TobR6_bhix+EvZ#+nL8EQP$PxxGSF;yo&76iTfXdy7lx>y@B5qfR$~$Oa~d~ z-{g3?oS~VvDwdfhecPx*W63)G{#6m_@^z?oE~R%EOrxZ^_Zr;;- z^E7I~z5j5G#nqdbtm%2L0G4AO%u0eGi+Oia=EcYc{eOr3Mpw!;qVx+)WULMIz4k{{ z{G(p(b;xFku?zWT;=ZblO-h^P{}+Iy+m=9|mubyC+Jexk}h-M$G;2l=AMvD z9Su#N$FT+QySea7-(5t^o_i_HgDi>p)>j;X=Q5&c-Tx)?{O*lfjrIQw*D#waQ?-$* zB(56Yp}paV{gcQZ?Kss%iCIRUOEi(C0uk@FkoiGj>CDiDZ) z)J1$V>byB>{9PK)ufuU7b`iPB-}2-5V4so8vAVL4#b{9ERYO{E3-S~k;V*)0y@zk) zT2fwzJ%M+*m@jL})?(C2X&Kd-wMJhk5k2f(c180e@-xpbsXIZzIKF0WlU@9j4_~Hr zD*vT>K~oaJHSznGLHYVOX4fs*wXU4c8PSski%5-EImsZ%LW>#SCbq%11h^ot=9O); zO_lhE^Jc%r-S2UOhcEEc;wNdNG4!|{b-tFw?VoH()UA}{-8a*|)*c{pVpmteYb0S1 zKwP6pcN7xe30P=y1JT_KC7KbajagAt@3S$nx~++UshNJ}RN};wg11gl=9FhIrZ=;0 z_chp-ULuup)jE9k(?>&RVgZX$LM(S{>LuTVf{e{cqW2l!pEvyo^PilQ+uXuxS(ESI z(f@Q9i|1+%io>G<7sgluQ(V~$OYWiUf>GN$u>(8fPNl_&Hqnc-rU&=lp{O%QKw!c| z-Syd*tg;Tw&Qgv6ifvvsRE7+^(XEMVwXSLG*kE;G^kc|G$0CvlWINeyMv?9_pVb`q zWr!%5^Q7Q|eN^nP?a$mu0p1r+wsY@f4ds#tzJ63W!3Ghg5vTf~JaR>#IYu%Fk5hS} zB9rKl<^Fv6+SV6KZOPAls@Vp{_jaY3I2%8>Q!tKI%r+Ras)$np4u%yIDV?6114f>t z`Hw$trvKU*M{rN9rB-uyvPhpc9JN=-e}m>${Ovu8qq85OT8>hnvztfqtmR@9y$3k@ zmKt11Q1T$wOK_KI)nWug#Vo|BlQh_x7rOvn*)(b*`rgU@#p-(T)2$%GWf>X0#;}T9 zV5?lUNx1agTN_2M~pcVZK0gXYkTj-;Sz^r+6lD?mh+mtpYc^LYm9*i}M=kc@uhNGMtFsas{j zLYMIosfqhCs~mchafTz$c-)``$ml3g(E|U`OxqSgG3K)%I@={84*7%briA6-g_bHksNPVQ;z{T61?+m@y*4;AVOM>WKQk ze17J{OXWANJ!-2>p7+NsV(SmO4QSJg1|hg5X+I z4k>;!c%i>Y>qV%{+Z5kFLUjYwE%<8~$-6&OuxJIycwAPsNvp#}Y;!=PVramD9D1ol z?2m9pb)!X2|@cH!n%e$94*u?o} z)ha$*qnH^)P{JHWTrBKR8g#uXF!I$r9h_x3kL;_k<`#1Ff}wvZ0u#eYQx z0lQ&fyV(vtoAgV^Kf>jxUNSGOH~r}_q%ZlvURk|r)7^BAxDgI1z+_v2Nrjm7qI z#V*#``+-Z6mE}2oMrsXw`{F;2(<~?b^9x>G4+$tF1z#1Uf5ek4YBP^C`L(>A-oNAg zxjgfN3(>3VNvm{t^2HRz4KC^5e~q2f4WtL96Y~t7B1BAaKsK{<=8ZXHT~7w+{T}ZR zH%0vVP&(KZObup{o{b(M(?44NYVvcl(>CH{45#ld6yzEb>tKn0U@K}YhsrEc;|H|f z8!cgY06MG2&XKBDZ4c(F{n<*A#r;Lf9!Vy8kP1zQlR)2A6Q28N{Ys=D#Oe%&cFPW zGirqd-$9H{Gr4~tv28yl^xLx;nv*7Sdhe{pU5Hrmj_$~7$3n!qYZT2vgmx>29^b+& zGS2rJiQf|f8I?9tpUe6X;{%gw9RsVgL6N4uhLwjUr}1KtimM9*e&x7r=L>db+TzV{ zu4cQm=Ad%`mml9i$ntDGSAYg9{F%^~c#kDjm0M&{!&7Z#Uh1N9g|C4()RW>FBc#MY z?Pc2?8pYSL?7oI_RzaBpN=6yBd}@4PqGA)g)q^E`6FjdKU^y)xaDabw6``#f)#yah zs1}xi#!DkFwebzz@e)b+q~1yDRfx#88*KV${?j&Hi|PW(nB4&l=`&Gv-Cas}qn2U< zo}QS47eUq-=k0tMxTaAf4VDB2h-?byPoxKP&k{67ggcV%n%wj-Q`NDRSbAJ^_>*mK z%`%6tAWlfYj~b<+hI1MRn>(b-ys}N7Uj8Y~P9{wR+3tCuE`BF+u`pvYERtE497sRF zlf)uM-K!MMN%yACoQ6v8u8H+PxuuFgA(uak#G~mE zlTn~lB6)bDU#=UKawy;0ryBkzlka#ts$y~c)2CECvl)&wX+MXCq`KEA;SD-{2@x(; z_Z^rpuwwSVxcCZ(>{ zp4gPvciGk}SydQff}}){{WEs+Qit?1j^$hGNE9RjxSZ*APZ0Wg$MyyI@R9PG5rclG z_IJ>|g7>+`vLw0q(0@1wh~$Z8Xc1K6WXqSe$YyE{ z2ilU`kG`2qzuPEE=H2f*KrBWJfll9-^S)r%@Lvh3+@S{U%D1$dDp-kZAYLBFUs5d` zGI9bgL=3T>lJ`AeL1|6d>@w1zR0-QKqPP(|2P(q~WNy^Wgpcy2)Q?<7uc(~@aomon z^@&rHI#SKCIV{TK<}AN4vh#yEslz(X%lv+m;**Y-|K3C5w5B57pxLQ$J?He zL_?aAr7Hc3v)>N9O5xc6Tc`gDYjx4m1=%l|<}QwmI_GC(t>zVhzAPx3rl<1=LugpW zU5Gr)+y}A>i}c3s%D~TBpu-4s6zGQ#R3>tAPFH2vhr33y8k~xruhfhnSnh_d@!tJo8 zMkzOA%!1hIo-HV_*?flDhFrq@7ME6W?6?-7FZTfN0J?{0ZLQ=u>f{)I0onR;6eds0 z>5cAYL?9pNWoWG%M6yxSqgojKc|h22%)0BxsfeIA8P66L7#w6J&E1}@V@CgC$!g@& zKn?>+j_)ZP`&Oy}dOG$CQX3%sP;(FfKe4pQxM>jc#}Qs{6V0FG+#gVRhh^AejP?`E#ZQAptly9^2n=XOdMLol7r6 zyKFlLk^?_eb1@UW7&g}f`Dy-f=p5oQg4Rgg;Wsit15?s&%5}v7G{S~An337b>aSX% zd(oNV_pY>ty>f3L*5N>H85Jv(O|Jn#vIV_4Glu>}`KjhjF;D<^{6tWJfYHv!oJMG; zyZz;H#fCffnwx+*PXeum=Bb(qrI~sY=tWv4zi{-pTJX5O?ch~b!SY@Ouc|n+yM%d+e zjStWK`Y!=&LzXOWfW4gs>gQQ?xQ!$`=V4hK3L@xD8MEeZ_3x-m^R83EMWq4`=O6bE zJtwvn*1(Nm=~|@xXW{_Hg(JLi`aXOB$DiI1feXGt6c54*Sj4(lEX4-wh}8pTs<6&BS(C46{y&#neji z!q^Sb!Xe=FNbDnZqB8}~_!STVTCn{RFTb$UNch3!d)pdt-!vlrH1z0}CNV82G&~lh zlbv~a5<-Eb{No3VM#ND%(qrly|`0pw# z!0>fuh9+VRb`=%Ml?gsX$RDP@2V;bN|9+jZ}XfPFLV$~TuHHhf~*B1(A?ub40O{QK00ESzf%^&j#A(4NHuFN7F>c8hQxAdQ0X#8Ii$-5s7>DwX(&j(Ywb8vni6Ae` zE)|lh7hkdrh*K4VWpBr4L5UxYBX|YF`zM|GZbis4^objod^{Ol&|Ax)?YhB(~ zLq9QjI-EF-zfuHVgJqng5!V?Fljx>~1(*3GNhRA?>0%FHX+3EqfY~Q_dX7b{N=tEdfO5He!qJ#Or zQ-IDFlTf0C%a}S*9DQN{iyhUCuL&y2)J441o+g__PzyOqXzcQq5M2O3If1cRTIn;t`fVe{JEToWt9h5es;H zOnn_MEksxtJTw5>dC!b4#(bPUEvK7nG43Mj(L%N7@mo;6bG)<|Va>Q0Y8Xh|P1DVr zGl~64KH8f^*7dT4cIFN0D^?AiXz3zTs3hMTg~|FSxD{JcV7RY?M*% zFKTO%ZhoL&iSIft1twz_@$%b%`*6lNe0V1Ce&06LDVf+9<_4%4lpdH-#el2OM&*|G z8AtQ2lRIKck^@yiWG6<%0At@#GNX?hc&T^YIcJ)tFA|zI+(E7=28ef)d*d;!{uVvc zY7Mvn88x0G$J?gagfzPBZa?6sCDbrgzBN4QWH$pVyHmd9q1|>6T5f!N)cgv8)!@I`ro=jyGC;!k$l4Cw`cFow+4l;i5J(Yr+VENLty>@9BAKB z2K`)#y@g6(O~3YSh@nrmK^0N$;)AU8Ng8CpKYFK8@9P!H#!(4-RDdMs)yOy| z0`h2%+9_CS5>#a-_co}8o^K(F@%CbQNkmi`X!-;4z$~6r+QMzg_zGv!BwLwkGs?nI zJe5VgP?F}Txe^n4q7K?JLTwWQ(A+DLN}8-vEj*!{tVwVLBLs%L!x3hzU6+w z6{ne$b}S?%I{+Q?w0gyfOL4F-T}nCq)o2+@YF~PtV`D^OQziBciLMGepcsTgft)*@ zq@M+;5j`R!Fg>es{3)|Z0uI%klx+9!k(=BrjajtAz{O%Q0To0{v6XkC9h0c^W^wx+ zYCHa}?+zeT$%&I2BDR?&l9jQLf}){0({A?v15%+l!Hkw4zQ%m>=!?YkFZamHbm50d zyLY&-&*}~YH!l~^P+Q+A=xQ;J0TOc19JdF5b}>VN;-G2#>N?cX^Yw{{A+`w!C9m2AbrcOBN26CQr@>6OSq`SF( z_m86VSn-hWWB1bXcxZ>_xw)W%>f|>Xnu@_g3D!-tdKkYu5rhVu+P*{llB?>-9)Su%yl?S6pPHSLYr%*bkBBXX&b2GP=X^QW zK2bDoL*7zsDvUXexQ;>!g0hjgj%B5Ej`d-LIF%;yE~Q4;eb_o>Qf2=j!xGNvGbP0u z^A0rFriZPjrVOVe`dW;@A6ks9ud%@a!sK$e8iQ*PlTp6+j@wwnQ`)}4pNagBe%zg| zm+VvYSUovZ~$@Ybl0G&fsspQao(Kxp0;@~0l^`!l1Iv&|VrHYJxFQrEr$uf2o!(pe?>>bp;De09_j|)FQr^QSd&mO)}t27vUW*l*~zD4mHYr5y%CM}l( z{fQS^ce6k2(9wC{m1_WWa#9k`G1`WO?%Y*KticIRx`vSH9uU$d=w-83qff}f`k1`~ zrNEqzI-s1L8LQ{DKqT?$VDMg9@8UKJ7(+vw#Dd1dNe325rNV??;?AtPUj#o@;lxw6-l(s z;xZlbp&}}}@AC>|oU@PW{INd#BR^ekON+(~qIh z_3oJlt^spp!8aiTjP=JyDcgi!K1Ii_u~*T*JRMJN-a9 zyWqAgF%h&tmlq4APD`ZK)ou#r7K4PFNf2+WfC|yu<9XbXg+1mZw6x^lc`}Ip^_H&X z^w`;|v=1wIk|!oJL200i@e_?9f+2*w5PnN@;Z)1VuAK5h>#VXQrN)P5O+QO&D)79+ z!MS5TSa}XiE2|5cwU?)UG;q{|WF3Vsf9N7p=(d{^3Ob|%L84oGvRmMVM3J9N%Jwhf zcN-ve2?lTv0w<3k!oK;POt$LmuLk8T@JB7fK#>`!US5h;J=E+ECQZaN!P453+95d=UjB(d<5wj4GNC{7*EWRu&QAEj;x# z)Cp9*UvrjhwwY45p}07GbX|5X2K0N~^K*{J|HGE3O8lT4$O61RToQt~V%-}eOSXuj z*xWzX+D90y8$2{&TK4WjwDe6sMqx`@9gpJ1yL|drFv#!YI=@idQN5Ia(`b-KX#;Y- z+IQHn-ItkqL6)A^0$s>c^&3BxpUzGX+Y6>uC>m|7X~A?6)ti@R?7M!tI`5d3Ikk0? zzSf=u;MW-6_~aKqmHHz^IwJB4HpPCpBzdpto4Gvk94z?d5Z4=dFsdqH>BvI{lRksklmT@32y;5`a;o z;uD^!R0=yLEifl{aM!7_$S`_bMj)|uI<;|?75&19i_gI0O~g9tH<-6*h#<}yWIDB% zUpVwKeG-gtx58om-Lr!(X`NKXRbZC>lQpEv_2T?0#-E*tyQyl)eXB|}P9D6d7l)c^ zkYv##tLsV?hEJ%lQ6Xc8TKO!-$2y}u*JOP&hLR?dKpa79Uea@X9qHh`qk|R zYCgjG;i4^WwZw184fx|I!P|7=hThw<6~IPH3PD@1&JN<}-h-_5alTCa8eemm2Kh%> zzMg3>9-ZD!}@ z{;T{8ihV^S{%z!h#=r;u@+mcb<=M4Be#GxHV#L4lT&ASRuC6>yV&mKeK|*P0}%g`JBxeY0-W zRJmGsWS?5GlDc*E1u$U}?$q~a;BlgAe4C!Mf{BAdexWENE(=rqzU}(W0Ah-%NcBo? zo10o#RZn(MH~GTv-$}q-I=rxX!-kh{LB(@#e#d>(2rG5X(mtvQgMEY<&H!Z~6qFIu z1XfWXp-q3V%H~bAEfhhpPAtJ8yb#!7Ym2+*__V&U2lsYZ1F< z9s10fVmoJg7qfsoN`q#Gzyv=L6Nhc)l65$N38rG{#t$sH`wTWYE94p`>hDe(4zp7h zlxJ4HF4jBoMy<|z|91Num62}b&NpgR)@m_o4ZV+B6-&-kd^_{h$}aB1DK$829XCZ%tSM*6f@4 zrt+c?vA%DmgA4gN<&!9sATV5FGuHa>Q)bRZ-16f(IDb~31RM|*RPq0x_d7d1WMf{BPI?u)r5oPQ%P*k0$q{>)B321R0IraTV5ENqK?y2Yb9fw zVE=9Oh>60D(m@A$D~-P^;KBN8-OiyBbPsGxPsn=WGByYY7s?|q!g}gyVrmCdZr7Jb zf1;ONA}R2|^vUd|jT|Ir{8w@wlh}l-AA3#6gFRee0KiSqH4g0Ch9VpG^yLLl zH)_SW<4U)EJuvpt^ESG{g%0!)XTF6Mc2T`?%v0>IY!O~Db&+K`2uLk@>@rf4Cl(m#MfUO&_z66j(qvrc>`KDA}xE!V-$LXVtijC5JKXLnBj=ei* zY6vFb(2XI0F_6`q02@K(aQ|r=g!{ox_`I9c^B6I~x}+%l6J1furYu|p$*CRdtK1cC zv7rQPW?{R$Eg&VqR!J6sH4~AOzkp4 zCxyRzuYPV`ap`9WwpbF2u7oiGa7VS^b{~ZN;J8YjIeY_vw7&)g9oRCdgRLheN!`TP z`zE9|jcMMB_k1;`X2enJ2|*|Ex?{mm%ZGk2XivR3g#?j>UaGM!3;!{*-+}IZfvJ(a z1F%|8KkwQuu#wc$Z&6fA-NBn?0H=a3!W}f-c7+JWoPLHhgMAjeuM(2*XNVQ?)uGZ; z|F!4KM}VcxFo1Z89$4f>Py6D|8hoJtXu~b@CgI(hW2&G@IRw^vz$55JlUgf@7mVy{ z-f`*bvPWl>jW^_iohmcRHJKpHkt&cGy|XGzDZ30;A$!y|HOsWE3-)}K0s6l?2bRL^ zdAOPG1o#11O*Nx@?}S`#o#S;Z%r!PJMVFBcxnvg{SW#$I3RgOKJ>c%zDLb%--21ZB z*g*lEScZ->@sEC$Bd~JL{wE$_p{WS0wKb*f$qgt(UV1Gs8S=_2|NQP_|0(i$8Z@}i z*V4ek_8!ms_5SMff<4G=K1gzfuh59hD@A27<0>X%)C%MqL7~Fp%RR83Y6lDf+AA&q zJBXslYqy0#6qz!L|0MGEgIQ!<&yGBoD?m2U0_mbd2ei{0UY*0?7PX;&7l1Huf<0}` z^|wx2rKOUy-%SMFO`-uwUmgdkPdMc@)QS|-5yeNhZ|{q{8V*juwu!(HLKS$Yz7D+i z(3z;$NnOnKAeK*Ef!%5)9ynf~R%2V+_Kw$@I4-*o>aO8GN3lHoVnWR5kNppnt3 znccMq&%&ODZ{*1>q)}^NPS|3Gj07fe{A? zTY%?Hu7&+W3?4;qycsSTPUx%uY6W&_hq1j?0615$uzkk@arbj8Cd;~u_Lv?P#unQ! zhln21JS8<44UN;(a(C}J)~IsT%=3U@_yw>LJjLMF45oYNt*U(JUNnD_15yk=EA|LZiNwGagY&VS$2n8*s1S&ls?s z5T{^#giGCUx}$RPez)qhN2&iI3I(v_Q681u`)Z6ZFx6Noy6~`PQqM9Kbn!6>54I-J zg-f9#irv9mJJlw3=PI;U`xX2ZK1R$)?$yuc10$yx0CpQu*iCA}lJ@1OM%N7|F_d!- z1;(0ejs`n`$$=Z*98L$p{&vbBn02S}&D?Q9uANsYaZusOcl{|yA>}s(y7WyuRanHbtYAgCj0iwZYnOb*| z#21@t)y}+Jmi0|c_mgc(r%7*jZup}}8>R6KmEOgY=;kCk>kj6YDv0ZOiWPqjzKDGx zxv9IceC*u??*1?S=igewO38=h-&QX>V^Qt|0x}x-s};afqjBKg;ZCA`Kpo!rFGzle zKKxKPKq%>*_}IgtC2TkI@V19G>wgR#IuT~06mJtfPC7;Y#{}%#V%82_6;ur7)7OW+ zcKEe1*Y4}aTqkD9*ux7t|HfUa-Zf>wK4gBq?U|X9?}=4oyUgQE9W4%7naBN8llJ&X zb9e?JdC!!i*;fx{e-f!rBlnM-*sHjNd2UvX>M=7)H`=cCJCI1u#n9Ul=o{rIQz64Bl;@JC^A`u`g4OWSku G>i+{&tf&Y8 diff --git a/src-tauri/src/api.rs b/src-tauri/src/api.rs deleted file mode 100644 index 34779eb..0000000 --- a/src-tauri/src/api.rs +++ /dev/null @@ -1,1911 +0,0 @@ -use serde::{Deserialize, Serialize}; -use tauri::command; -use reqwest::Client; -use std::sync::Arc; -use tokio::sync::Mutex; - -// Import auth module for streaming base URL -use crate::auth; - -/// Game variant (different store versions) -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct GameVariant { - pub id: String, - pub store_type: StoreType, - pub supported_controls: Vec, -} - -/// Game information -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct Game { - pub id: String, - pub title: String, - pub publisher: Option, - pub developer: Option, - pub genres: Vec, - pub images: GameImages, - pub store: StoreInfo, - pub status: GameStatus, - pub supported_controls: Vec, - #[serde(default)] - pub variants: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct GameImages { - pub box_art: Option, - pub hero: Option, - pub thumbnail: Option, - pub screenshots: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct StoreInfo { - pub store_type: StoreType, - pub store_id: String, - pub store_url: Option, -} - -#[derive(Debug, Clone, PartialEq)] -pub enum StoreType { - Steam, - Epic, - Ubisoft, - Origin, - GoG, - Xbox, - EaApp, - Other(String), -} - -impl Serialize for StoreType { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - serializer.serialize_str(&self.to_string()) - } -} - -impl<'de> Deserialize<'de> for StoreType { - fn deserialize(deserializer: D) -> Result - where - D: serde::Deserializer<'de>, - { - let s = String::deserialize(deserializer)?; - Ok(StoreType::from(s.as_str())) - } -} - -impl std::fmt::Display for StoreType { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { - StoreType::Steam => write!(f, "Steam"), - StoreType::Epic => write!(f, "Epic"), - StoreType::Ubisoft => write!(f, "Ubisoft"), - StoreType::Origin => write!(f, "Origin"), - StoreType::GoG => write!(f, "GOG"), - StoreType::Xbox => write!(f, "Xbox"), - StoreType::EaApp => write!(f, "EA"), - StoreType::Other(s) => write!(f, "{}", s), - } - } -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum GameStatus { - Available, - Maintenance, - Unavailable, -} - -/// Server information -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct Server { - pub id: String, - pub name: String, - pub region: String, - pub country: String, - pub ping_ms: Option, - pub queue_size: Option, - pub status: ServerStatus, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum ServerStatus { - Online, - Busy, - Maintenance, - Offline, -} - -/// Game library response -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct GamesResponse { - pub games: Vec, - pub total_count: u32, - pub page: u32, - pub page_size: u32, -} - -/// API endpoints discovered from GFN client analysis -/// GraphQL endpoint (uses persisted queries with GET) -const GRAPHQL_URL: &str = "https://games.geforce.com/graphql"; -/// Static JSON endpoint for game list (public, no auth required) -const STATIC_GAMES_URL: &str = "https://static.nvidiagrid.net/supported-public-game-list/locales/gfnpc-en-US.json"; -/// LCARS Client ID -const LCARS_CLIENT_ID: &str = "ec7e38d4-03af-4b58-b131-cfb0495903ab"; - -/// GFN client version -const GFN_CLIENT_VERSION: &str = "2.0.80.173"; - -/// MES (Membership/Subscription) API URL -const MES_URL: &str = "https://mes.geforcenow.com/v4/subscriptions"; - -/// GFN CEF User-Agent (native client) -const GFN_CEF_USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173"; - -/// Persisted query hash for panels (MAIN, LIBRARY, etc.) -const PANELS_QUERY_HASH: &str = "f8e26265a5db5c20e1334a6872cf04b6e3970507697f6ae55a6ddefa5420daf0"; -/// Persisted query hash for search -const SEARCH_QUERY_HASH: &str = "7581d1b6e4d87013ac88e58bff8294b5a9fb4dee1aa0d98c1719dac9d8e9dcf7"; - -/// GraphQL query for detailed app/game data -/// Based on GetAppDataQueryForAppId from GFN client -const GET_APP_DATA_QUERY: &str = r#" -query GetAppDataQueryForAppId($vpcId: String!, $locale: String!, $appIds: [String!]!) { - apps(vpcId: $vpcId, locale: $locale, appIds: $appIds) { - id - title - shortDescription - longDescription - publisherName - developerName - genres - contentRatings { - categoryKey - contentDescriptorKeys - } - images { - GAME_BOX_ART - HERO_IMAGE - GAME_LOGO - SCREENSHOTS - KEY_ART - } - variants { - id - shortName - appStore - supportedControls - gfn { - status - installTimeInMinutes - } - libraryStatus { - installed - status - selected - } - } - gfn { - playabilityState - minimumMembershipTierLabel - catalogSkuStrings - } - maxLocalPlayers - maxOnlinePlayers - releaseDate - itemMetadata { - favorited - } - } -} -"#; - -/// Default VPC ID for general access (from GFN config) -const DEFAULT_VPC_ID: &str = "GFN-PC"; -/// Default locale -const DEFAULT_LOCALE: &str = "en_US"; - -// ============================================ -// Dynamic Server Info & VPC ID Support -// ============================================ - -/// Server info response from /v2/serverInfo endpoint -#[derive(Debug, Clone, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ServerInfoResponse { - version: Option, - #[serde(default)] - meta_data: Vec, - #[serde(default)] - monitor_settings: Vec, - request_status: Option, -} - -#[derive(Debug, Clone, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ServerVersion { - build_version: Option, - name: Option, -} - -#[derive(Debug, Clone, Deserialize)] -struct ServerMetaData { - key: String, - value: String, -} - -#[derive(Debug, Clone, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ServerInfoRequestStatus { - status_code: i32, - server_id: Option, -} - -/// Cached server info (VPC ID and region mappings) -#[derive(Debug, Clone, Default)] -pub struct CachedServerInfo { - /// The VPC ID (serverId from serverInfo response) - pub vpc_id: Option, - /// Region name to URL mappings from metaData - pub regions: Vec<(String, String)>, - /// The base streaming URL for this provider - pub base_url: Option, -} - -/// Global storage for cached server info -static CACHED_SERVER_INFO: std::sync::OnceLock>> = std::sync::OnceLock::new(); - -fn get_server_info_storage() -> Arc> { - CACHED_SERVER_INFO.get_or_init(|| Arc::new(Mutex::new(CachedServerInfo::default()))).clone() -} - -/// Fetch server info from the provider's /v2/serverInfo endpoint -/// This discovers the VPC ID and available regions for the current provider -#[command] -pub async fn fetch_server_info(access_token: Option) -> Result { - let base_url = auth::get_streaming_base_url().await; - // Ensure base_url ends with / for proper path joining - let base_url = if base_url.ends_with('/') { base_url } else { format!("{}/", base_url) }; - let url = format!("{}v2/serverInfo", base_url); - - log::info!("Fetching server info from: {}", url); - - let client = Client::builder() - .user_agent(GFN_CEF_USER_AGENT) - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - let mut request = client - .get(&url) - .header("Accept", "application/json") - .header("nv-client-id", LCARS_CLIENT_ID) - .header("nv-client-type", "BROWSER") - .header("nv-client-version", GFN_CLIENT_VERSION) - .header("nv-client-streamer", "WEBRTC") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP"); - - if let Some(token) = &access_token { - request = request.header("Authorization", format!("GFNJWT {}", token)); - } - - let response = request - .send() - .await - .map_err(|e| format!("Failed to fetch server info: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("Server info request failed with status {}: {}", status, body)); - } - - let server_info: ServerInfoResponse = response - .json() - .await - .map_err(|e| format!("Failed to parse server info: {}", e))?; - - // Extract VPC ID from requestStatus.serverId - let vpc_id = server_info.request_status - .as_ref() - .and_then(|s| s.server_id.clone()); - - log::info!("Discovered VPC ID: {:?}", vpc_id); - - // Extract region mappings from metaData - // Format: key="REGION NAME", value="https://region-url.nvidiagrid.net" - // Also look for "gfn-regions" which lists available regions - let mut regions: Vec<(String, String)> = Vec::new(); - let mut gfn_regions: Vec = Vec::new(); - - for meta in &server_info.meta_data { - if meta.key == "gfn-regions" { - // Split comma-separated region names - gfn_regions = meta.value.split(',').map(|s| s.trim().to_string()).collect(); - } else if meta.value.starts_with("https://") { - // This is a region URL mapping - regions.push((meta.key.clone(), meta.value.clone())); - } - } - - log::info!("Discovered {} regions: {:?}", regions.len(), gfn_regions); - - // Cache the server info - let cached = CachedServerInfo { - vpc_id, - regions, - base_url: Some(base_url), - }; - - { - let storage = get_server_info_storage(); - let mut guard = storage.lock().await; - *guard = cached.clone(); - } - - Ok(cached) -} - -/// Get the current VPC ID (fetches server info if not cached) -pub async fn get_current_vpc_id(access_token: Option<&str>) -> String { - // First check cache - { - let storage = get_server_info_storage(); - let guard = storage.lock().await; - if let Some(vpc_id) = &guard.vpc_id { - return vpc_id.clone(); - } - } - - // Try to fetch server info - if let Ok(info) = fetch_server_info(access_token.map(|s| s.to_string())).await { - if let Some(vpc_id) = info.vpc_id { - return vpc_id; - } - } - - // Fallback to default - DEFAULT_VPC_ID.to_string() -} - -/// Get cached server info -#[command] -pub async fn get_cached_server_info() -> Result { - let storage = get_server_info_storage(); - let guard = storage.lock().await; - Ok(guard.clone()) -} - -/// Clear cached server info (call on logout or provider change) -#[command] -pub async fn clear_server_info_cache() -> Result<(), String> { - let storage = get_server_info_storage(); - let mut guard = storage.lock().await; - *guard = CachedServerInfo::default(); - log::info!("Cleared server info cache"); - Ok(()) -} - -/// Serialization support for CachedServerInfo -impl Serialize for CachedServerInfo { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut state = serializer.serialize_struct("CachedServerInfo", 3)?; - state.serialize_field("vpcId", &self.vpc_id)?; - state.serialize_field("regions", &self.regions)?; - state.serialize_field("baseUrl", &self.base_url)?; - state.end() - } -} - -/// GraphQL response wrapper -#[derive(Debug, Deserialize)] -struct GraphQLResponse { - data: Option, - errors: Option>, -} - -#[derive(Debug, Deserialize)] -struct GraphQLError { - message: String, -} - -/// Static JSON game entry from nvidiagrid.net -/// Format: { "id": 100932911, "title": "41 Hours", "sortName": "41_hours", "isFullyOptimized": false, -/// "steamUrl": "https://...", "store": "Steam", "publisher": "...", "genres": [...], "status": "AVAILABLE" } -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct StaticGameEntry { - id: i64, - title: String, - #[serde(default)] - sort_name: String, - #[serde(default)] - is_fully_optimized: bool, - #[serde(default)] - steam_url: Option, - #[serde(default)] - store: Option, - #[serde(default)] - publisher: Option, - #[serde(default)] - genres: Vec, - #[serde(default)] - status: Option, -} - -/// Convert StaticGameEntry to Game struct -fn static_game_to_game(entry: StaticGameEntry) -> Game { - let store_type = entry.store.as_deref() - .map(StoreType::from) - .unwrap_or(StoreType::Other("Unknown".to_string())); - - // Extract store ID from Steam URL if available - let store_id = entry.steam_url.as_ref() - .and_then(|url| url.split('/').last()) - .map(|s| s.to_string()) - .unwrap_or_else(|| entry.id.to_string()); - - let status = match entry.status.as_deref() { - Some("AVAILABLE") => GameStatus::Available, - Some("MAINTENANCE") => GameStatus::Maintenance, - _ => GameStatus::Unavailable, - }; - - let game_id_str = entry.id.to_string(); - - // NOTE: static.nvidiagrid.net returns 403 due to referrer policy - // Don't generate URLs - let frontend use placeholders - // Images should come from fetch_main_games or fetch_library instead - - Game { - id: game_id_str, - title: entry.title, - publisher: entry.publisher, - developer: None, - genres: entry.genres, - images: GameImages { - box_art: None, // Let frontend use placeholder - hero: None, - thumbnail: None, - screenshots: vec![], - }, - store: StoreInfo { - store_type, - store_id, - store_url: entry.steam_url, - }, - status, - supported_controls: vec!["keyboard".to_string(), "gamepad".to_string()], - variants: vec![], - } -} - -/// Detailed app variant (for get_game_details) -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct AppVariant { - id: String, - #[allow(dead_code)] - short_name: Option, - app_store: String, - supported_controls: Option>, -} - -/// GFN status info (for get_game_details) -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct GfnStatus { - playability_state: Option, - #[allow(dead_code)] - minimum_membership_tier_label: Option, -} - - -/// Fetch games from the public static JSON API -/// This endpoint is publicly available and returns all GFN-supported games -#[command] -pub async fn fetch_games( - limit: Option, - offset: Option, - _access_token: Option, -) -> Result { - let client = Client::new(); - - let response = client - .get(STATIC_GAMES_URL) - .header("Accept", "application/json") - .send() - .await - .map_err(|e| format!("Failed to fetch games: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("API request failed with status {}: {}", status, body)); - } - - let game_entries: Vec = response - .json() - .await - .map_err(|e| format!("Failed to parse response: {}", e))?; - - let total_available = game_entries.len() as u32; - - // Apply offset and limit - let offset_val = offset.unwrap_or(0) as usize; - let limit_val = limit.unwrap_or(50) as usize; - - let games: Vec = game_entries - .into_iter() - .skip(offset_val) - .take(limit_val) - .map(static_game_to_game) - .collect(); - - let page = offset_val / limit_val; - - Ok(GamesResponse { - total_count: total_available, - games, - page: page as u32, - page_size: limit_val as u32, - }) -} - -/// Search games by title - filters from the full games list -/// The static JSON endpoint doesn't support search, so we fetch all and filter client-side -#[command] -pub async fn search_games( - query: String, - limit: Option, - _access_token: Option, -) -> Result { - let client = Client::new(); - - let response = client - .get(STATIC_GAMES_URL) - .header("Accept", "application/json") - .send() - .await - .map_err(|e| format!("Failed to fetch games: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("API request failed with status {}: {}", status, body)); - } - - let game_entries: Vec = response - .json() - .await - .map_err(|e| format!("Failed to parse response: {}", e))?; - - let query_lower = query.to_lowercase(); - let limit_val = limit.unwrap_or(20) as usize; - - let filtered: Vec = game_entries - .into_iter() - .filter(|g| g.title.to_lowercase().contains(&query_lower)) - .take(limit_val) - .map(static_game_to_game) - .collect(); - - let total_count = filtered.len() as u32; - - Ok(GamesResponse { - total_count, - games: filtered, - page: 0, - page_size: limit_val as u32, - }) -} - -/// Optimize image URL with webp format and size -/// GFN CDN supports: ;f=webp;w=272 format -fn optimize_image_url(url: &str, width: u32) -> String { - if url.contains("img.nvidiagrid.net") { - format!("{};f=webp;w={}", url, width) - } else { - url.to_string() - } -} - -/// Response structure for library GraphQL query -#[derive(Debug, Deserialize)] -struct LibraryPanelsData { - panels: Vec, -} - -#[derive(Debug, Deserialize)] -struct LibraryPanel { - #[allow(dead_code)] - id: Option, - name: String, - #[serde(default)] - sections: Vec, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct LibrarySection { - #[allow(dead_code)] - id: Option, - #[allow(dead_code)] - title: Option, - #[serde(default)] - render_directives: Option, - #[serde(default)] - see_more_info: Option, - #[serde(default)] - items: Vec, -} - -#[derive(Debug, Deserialize)] -#[serde(tag = "__typename")] -enum LibraryItem { - GameItem { app: LibraryApp }, - #[serde(other)] - Other, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct LibraryApp { - id: String, - title: String, - #[serde(default)] - images: Option, - #[serde(default)] - library: Option, - #[serde(default)] - item_metadata: Option, - #[serde(default)] - variants: Option>, - #[serde(default)] - gfn: Option, -} - -/// Image URLs from GraphQL - uses literal field names -#[derive(Debug, Deserialize)] -struct LibraryImages { - #[serde(rename = "GAME_BOX_ART")] - game_box_art: Option, - #[serde(rename = "TV_BANNER")] - tv_banner: Option, - #[serde(rename = "HERO_IMAGE")] - hero_image: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct LibraryVariant { - id: String, - #[allow(dead_code)] - #[serde(default)] - short_name: Option, - app_store: String, - #[serde(default)] - supported_controls: Option>, - #[serde(default)] - minimum_size_in_bytes: Option, - #[serde(default)] - gfn: Option, -} - -#[derive(Debug, Deserialize)] -struct LibraryVariantGfn { - #[serde(default)] - status: Option, - #[serde(default)] - library: Option, -} - -#[derive(Debug, Deserialize)] -struct LibraryVariantLibrary { - #[allow(dead_code)] - #[serde(default)] - status: Option, - #[serde(default)] - selected: Option, - #[serde(default)] - installed: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct LibraryGfnStatus { - #[serde(default)] - playability_state: Option, - #[allow(dead_code)] - #[serde(default)] - play_type: Option, - #[serde(default)] - minimum_membership_tier_label: Option, - #[serde(default)] - catalog_sku_strings: Option, -} - -/// Generate a random huId (hash ID) for requests -fn generate_hu_id() -> String { - use std::time::{SystemTime, UNIX_EPOCH}; - let timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap_or_default() - .as_nanos(); - format!("{:x}", timestamp) -} - -/// Fetch panels using persisted query (GET request) -/// This is the correct way to fetch from GFN API - uses persisted queries -async fn fetch_panels_persisted( - client: &Client, - panel_names: Vec<&str>, - vpc_id: &str, - access_token: Option<&str>, -) -> Result, String> { - let variables = serde_json::json!({ - "vpcId": vpc_id, - "locale": DEFAULT_LOCALE, - "panelNames": panel_names, - }); - - let extensions = serde_json::json!({ - "persistedQuery": { - "sha256Hash": PANELS_QUERY_HASH - } - }); - - // Build request type based on panel names - let request_type = if panel_names.contains(&"LIBRARY") { - "panels/Library" - } else { - "panels/MainV2" - }; - - // URL encode the parameters - let variables_str = serde_json::to_string(&variables) - .map_err(|e| format!("Failed to serialize variables: {}", e))?; - let extensions_str = serde_json::to_string(&extensions) - .map_err(|e| format!("Failed to serialize extensions: {}", e))?; - - // Generate huId for this request - let hu_id = generate_hu_id(); - - // Use games.geforce.com endpoint with all required params - let url = format!( - "{}?requestType={}&extensions={}&huId={}&variables={}", - GRAPHQL_URL, - urlencoding::encode(request_type), - urlencoding::encode(&extensions_str), - urlencoding::encode(&hu_id), - urlencoding::encode(&variables_str) - ); - - log::info!("Fetching panels from: {}", url); - - let mut request = client - .get(&url) - .header("Accept", "application/json, text/plain, */*") - .header("Content-Type", "application/graphql") - .header("Origin", "https://play.geforcenow.com") - .header("Referer", "https://play.geforcenow.com/") - // GFN client headers - .header("nv-client-id", LCARS_CLIENT_ID) - .header("nv-client-type", "NATIVE") - .header("nv-client-version", GFN_CLIENT_VERSION) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP") - .header("nv-device-make", "UNKNOWN") - .header("nv-device-model", "UNKNOWN") - .header("nv-browser-type", "CHROME"); - - if let Some(token) = access_token { - request = request.header("Authorization", format!("GFNJWT {}", token)); - } - - let response = request - .send() - .await - .map_err(|e| format!("Failed to fetch panels: {}", e))?; - - let status = response.status(); - if !status.is_success() { - let body = response.text().await.unwrap_or_default(); - log::error!("Panels API failed: {} - {}", status, body); - return Err(format!("API request failed with status {}: {}", status, body)); - } - - let body_text = response.text().await - .map_err(|e| format!("Failed to read response: {}", e))?; - - log::debug!("Panels response: {}", &body_text[..body_text.len().min(500)]); - - let graphql_response: GraphQLResponse = serde_json::from_str(&body_text) - .map_err(|e| format!("Failed to parse response: {} - body: {}", e, &body_text[..body_text.len().min(200)]))?; - - if let Some(errors) = graphql_response.errors { - let error_msg = errors.iter().map(|e| e.message.clone()).collect::>().join(", "); - return Err(format!("GraphQL errors: {}", error_msg)); - } - - Ok(graphql_response.data - .map(|d| d.panels) - .unwrap_or_default()) -} - -/// Convert LibraryApp to Game struct -fn library_app_to_game(app: LibraryApp) -> Game { - // Find selected variant (the one marked as selected, or first available) - let selected_variant = app.variants.as_ref() - .and_then(|vars| vars.iter().find(|v| { - v.gfn.as_ref() - .and_then(|g| g.library.as_ref()) - .and_then(|l| l.selected) - .unwrap_or(false) - })) - .or_else(|| app.variants.as_ref().and_then(|v| v.first())); - - let store_type = selected_variant - .map(|v| StoreType::from(v.app_store.as_str())) - .unwrap_or(StoreType::Other("Unknown".to_string())); - - // Use variant ID as the game ID for launching (e.g., "102217611") - // The app.id is a UUID which is not used for launching - let variant_id = selected_variant - .map(|v| v.id.clone()) - .unwrap_or_default(); - - let supported_controls = selected_variant - .and_then(|v| v.supported_controls.clone()) - .unwrap_or_default(); - - // Collect all variants for store selection - let variants: Vec = app.variants.as_ref() - .map(|vars| vars.iter().map(|v| GameVariant { - id: v.id.clone(), - store_type: StoreType::from(v.app_store.as_str()), - supported_controls: v.supported_controls.clone().unwrap_or_default(), - }).collect()) - .unwrap_or_default(); - - // Optimize image URLs (272px width for cards, webp format) - // Prefer GAME_BOX_ART over TV_BANNER for better quality box art - let box_art = app.images.as_ref() - .and_then(|i| i.game_box_art.as_ref().or(i.tv_banner.as_ref())) - .map(|url| optimize_image_url(url, 272)); - - let hero = app.images.as_ref() - .and_then(|i| i.hero_image.as_ref()) - .map(|url| optimize_image_url(url, 1920)); - - let status = match app.gfn.as_ref() - .and_then(|g| g.playability_state.as_deref()) { - Some("PLAYABLE") => GameStatus::Available, - Some("MAINTENANCE") => GameStatus::Maintenance, - _ => GameStatus::Unavailable, - }; - - Game { - id: variant_id.clone(), // Use variant ID for launching games - title: app.title, - publisher: None, - developer: None, - genres: vec![], - images: GameImages { - box_art, - hero, - thumbnail: None, - screenshots: vec![], - }, - store: StoreInfo { - store_type, - store_id: variant_id, // Same as game ID - store_url: None, - }, - status, - supported_controls, - variants, - } -} - -/// Fetch user's game library using persisted query API -#[command] -pub async fn fetch_library( - access_token: String, - vpc_id: Option, -) -> Result { - let client = Client::new(); - - // Use provided vpc_id, or fetch dynamically from server info - let vpc = match vpc_id { - Some(v) => v, - None => get_current_vpc_id(Some(&access_token)).await, - }; - - log::info!("fetch_library: Using VPC ID: {}", vpc); - - let panels = fetch_panels_persisted( - &client, - vec!["LIBRARY"], - &vpc, - Some(&access_token), - ).await?; - - // Extract games from LIBRARY panel - let mut games = Vec::new(); - - for panel in panels { - if panel.name == "LIBRARY" { - for section in panel.sections { - for item in section.items { - if let LibraryItem::GameItem { app } = item { - games.push(library_app_to_game(app)); - } - } - } - } - } - - let total_count = games.len() as u32; - - Ok(GamesResponse { - total_count, - games, - page: 0, - page_size: total_count, - }) -} - -/// Fetch main panel games (featured, popular, etc.) using persisted query API -#[command] -pub async fn fetch_main_games( - access_token: Option, - vpc_id: Option, -) -> Result { - let client = Client::new(); - - // Use provided vpc_id, or fetch dynamically from server info - let vpc = match vpc_id { - Some(v) => v, - None => get_current_vpc_id(access_token.as_deref()).await, - }; - - log::info!("fetch_main_games: Starting with vpc={}", vpc); - - let panels = match fetch_panels_persisted( - &client, - vec!["MAIN"], - &vpc, - access_token.as_deref(), - ).await { - Ok(p) => { - log::info!("fetch_main_games: Got {} panels", p.len()); - p - } - Err(e) => { - log::error!("fetch_main_games: Failed to fetch panels: {}", e); - return Err(e); - } - }; - - // Extract games from all sections - let mut games = Vec::new(); - - for panel in panels { - log::info!("fetch_main_games: Panel {} has {} sections", panel.name, panel.sections.len()); - for section in panel.sections { - log::debug!("fetch_main_games: Section has {} items", section.items.len()); - for item in section.items { - if let LibraryItem::GameItem { app } = item { - log::debug!("fetch_main_games: Found game: {} with images: {:?}", app.title, app.images); - games.push(library_app_to_game(app)); - } - } - } - } - - let total_count = games.len() as u32; - - Ok(GamesResponse { - total_count, - games, - page: 0, - page_size: total_count, - }) -} - -/// Response for GetAppDataQueryForAppId -#[derive(Debug, Deserialize)] -struct AppsData { - apps: Vec, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct DetailedAppData { - id: String, - title: String, - short_description: Option, - long_description: Option, - publisher_name: Option, - developer_name: Option, - genres: Option>, - images: Option, - variants: Option>, - gfn: Option, - max_local_players: Option, - max_online_players: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "SCREAMING_SNAKE_CASE")] -struct DetailedAppImages { - game_box_art: Option, - hero_image: Option, - game_logo: Option, - screenshots: Option>, - key_art: Option, -} - -/// Get detailed information about a specific game -#[command] -pub async fn get_game_details( - game_id: String, - access_token: Option, -) -> Result { - let client = Client::new(); - - let variables = serde_json::json!({ - "vpcId": DEFAULT_VPC_ID, - "locale": DEFAULT_LOCALE, - "appIds": [game_id], - }); - - let body = serde_json::json!({ - "query": GET_APP_DATA_QUERY, - "variables": variables, - }); - - let mut request = client - .post(GRAPHQL_URL) - .header("Content-Type", "application/json") - .header("X-Client-Id", LCARS_CLIENT_ID); - - if let Some(token) = &access_token { - request = request.header("Authorization", format!("GFNJWT {}", token)); - } - - let response = request - .json(&body) - .send() - .await - .map_err(|e| format!("Failed to get game details: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("API request failed with status {}: {}", status, body)); - } - - let graphql_response: GraphQLResponse = response - .json() - .await - .map_err(|e| format!("Failed to parse response: {}", e))?; - - if let Some(errors) = graphql_response.errors { - let error_msg = errors.iter().map(|e| e.message.clone()).collect::>().join(", "); - return Err(format!("GraphQL errors: {}", error_msg)); - } - - let app = graphql_response.data - .and_then(|d| d.apps.into_iter().next()) - .ok_or("Game not found")?; - - // Convert detailed app to Game - let variant = app.variants.as_ref().and_then(|v| v.first()); - - let store_type = variant - .map(|v| StoreType::from(v.app_store.as_str())) - .unwrap_or(StoreType::Other("Unknown".to_string())); - - let store_id = variant.map(|v| v.id.clone()).unwrap_or_default(); - - let images = app.images.map(|img| GameImages { - box_art: img.game_box_art, - hero: img.hero_image.or(img.key_art), - thumbnail: img.game_logo, - screenshots: img.screenshots.unwrap_or_default(), - }).unwrap_or(GameImages { - box_art: None, - hero: None, - thumbnail: None, - screenshots: vec![], - }); - - let status = match app.gfn.as_ref().and_then(|g| g.playability_state.as_deref()) { - Some("PLAYABLE") => GameStatus::Available, - Some("MAINTENANCE") => GameStatus::Maintenance, - _ => GameStatus::Unavailable, - }; - - let supported_controls = variant - .and_then(|v| v.supported_controls.clone()) - .unwrap_or_default(); - - // Collect all variants for store selection - let variants: Vec = app.variants.as_ref() - .map(|vars| vars.iter().map(|v| GameVariant { - id: v.id.clone(), - store_type: StoreType::from(v.app_store.as_str()), - supported_controls: v.supported_controls.clone().unwrap_or_default(), - }).collect()) - .unwrap_or_default(); - - Ok(Game { - id: app.id, - title: app.title, - publisher: app.publisher_name, - developer: app.developer_name, - genres: app.genres.unwrap_or_default(), - images, - store: StoreInfo { - store_type, - store_id, - store_url: None, - }, - status, - supported_controls, - variants, - }) -} - -/// Known GFN server zones discovered from network test results -const SERVER_ZONES: &[(&str, &str, &str)] = &[ - // Europe - ("eu-netherlands-north", "Netherlands North", "Europe"), - ("eu-netherlands-south", "Netherlands South", "Europe"), - ("eu-united-kingdom-1", "United Kingdom 1", "Europe"), - ("eu-united-kingdom-2", "United Kingdom 2", "Europe"), - ("eu-france-1", "France 1", "Europe"), - ("eu-france-2", "France 2", "Europe"), - ("eu-germany", "Germany", "Europe"), - ("eu-sweden", "Sweden", "Europe"), - ("eu-poland", "Poland", "Europe"), - ("eu-bulgaria", "Bulgaria", "Europe"), - // North America - ("us-california-north", "California North", "North America"), - ("us-california-south", "California South", "North America"), - ("us-oregon", "Oregon", "North America"), - ("us-arizona", "Arizona", "North America"), - ("us-texas", "Texas", "North America"), - ("us-florida", "Florida", "North America"), - ("us-georgia", "Georgia", "North America"), - ("us-illinois", "Illinois", "North America"), - ("us-virginia", "Virginia", "North America"), - ("us-new-jersey", "New Jersey", "North America"), - // Canada - ("ca-quebec", "Quebec", "Canada"), - // Asia-Pacific - ("ap-japan", "Japan", "Asia-Pacific"), -]; - -/// Test a single server's latency using TCP connect time (measures TCP handshake RTT) -async fn test_server_latency( - client: &Client, - zone_id: &str, - name: &str, - region: &str, -) -> Server { - let hostname = format!("{}.cloudmatchbeta.nvidiagrid.net", zone_id); - let server_url = format!("https://{}/v2/serverInfo", hostname); - - // Measure TCP connect time to port 443 (HTTPS) - // This gives accurate network latency by timing the TCP handshake - let tcp_ping = async { - use tokio::net::TcpStream; - use std::net::ToSocketAddrs; - - // Resolve hostname to IP first - let addr = format!("{}:443", hostname); - let socket_addr = tokio::task::spawn_blocking(move || { - addr.to_socket_addrs().ok().and_then(|mut addrs| addrs.next()) - }).await.ok().flatten(); - - if let Some(socket_addr) = socket_addr { - // Measure TCP connect time (SYN -> SYN-ACK) - let start = std::time::Instant::now(); - match tokio::time::timeout( - std::time::Duration::from_secs(5), - TcpStream::connect(socket_addr) - ).await { - Ok(Ok(_stream)) => { - let elapsed = start.elapsed().as_millis() as u32; - // TCP handshake is 1 RTT, so this is accurate latency - Some(elapsed) - } - _ => None, - } - } else { - None - } - }; - - // Run TCP ping and HTTP status check in parallel - let (ping_ms, http_result) = tokio::join!( - tcp_ping, - client.get(&server_url).timeout(std::time::Duration::from_secs(5)).send() - ); - - let status = match http_result { - Ok(response) if response.status().is_success() => ServerStatus::Online, - Ok(_) => ServerStatus::Maintenance, - Err(_) => { - if ping_ms.is_some() { - ServerStatus::Online - } else { - ServerStatus::Offline - } - } - }; - - Server { - id: zone_id.to_string(), - name: name.to_string(), - region: region.to_string(), - country: zone_id.split('-').nth(1).unwrap_or("Unknown").to_string(), - ping_ms, - queue_size: None, - status, - } -} - -/// Get available servers with ping information -/// Uses CloudMatch API to get server status - runs tests in parallel for speed -/// Dynamically fetches server regions from /v2/serverInfo endpoint -#[command] -pub async fn get_servers(access_token: Option) -> Result, String> { - let client = Client::new(); - - // Check if we have cached provider-specific regions - let mut cached_info = { - let storage = get_server_info_storage(); - let guard = storage.lock().await; - guard.clone() - }; - - // If no cached regions, fetch from serverInfo endpoint - // This works for both NVIDIA (prod.cloudmatchbeta) and Alliance Partners - if cached_info.regions.is_empty() { - log::info!("No cached server regions, fetching from serverInfo endpoint..."); - - // Fetch server info (this will use the correct base URL based on selected provider) - match fetch_server_info(access_token).await { - Ok(info) => { - log::info!("Fetched {} regions from serverInfo", info.regions.len()); - cached_info = info; - } - Err(e) => { - log::warn!("Failed to fetch serverInfo: {}, falling back to hardcoded zones", e); - } - } - } - - // If we have dynamic regions (from serverInfo), use those - if !cached_info.regions.is_empty() { - log::info!("Using {} dynamic server regions", cached_info.regions.len()); - - let futures: Vec<_> = cached_info.regions - .iter() - .map(|(region_name, region_url)| { - let client = client.clone(); - let name = region_name.clone(); - let url = region_url.clone(); - async move { - test_provider_server_latency(&client, &name, &url).await - } - }) - .collect(); - - let mut servers: Vec = futures_util::future::join_all(futures).await; - - // Sort by ping (online servers first, then by ping) - servers.sort_by(|a, b| { - match (&a.status, &b.status) { - (ServerStatus::Online, ServerStatus::Online) => { - a.ping_ms.cmp(&b.ping_ms) - } - (ServerStatus::Online, _) => std::cmp::Ordering::Less, - (_, ServerStatus::Online) => std::cmp::Ordering::Greater, - _ => std::cmp::Ordering::Equal, - } - }); - - return Ok(servers); - } - - // Fall back to hardcoded NVIDIA server zones (only if serverInfo fetch failed) - log::info!("Using hardcoded NVIDIA server zones as fallback"); - - // Test all servers in parallel for fast results - let futures: Vec<_> = SERVER_ZONES - .iter() - .map(|(zone_id, name, region)| { - let client = client.clone(); - async move { - test_server_latency(&client, zone_id, name, region).await - } - }) - .collect(); - - let mut servers: Vec = futures_util::future::join_all(futures).await; - - // Sort by ping (online servers first, then by ping) - servers.sort_by(|a, b| { - match (&a.status, &b.status) { - (ServerStatus::Online, ServerStatus::Online) => { - a.ping_ms.cmp(&b.ping_ms) - } - (ServerStatus::Online, _) => std::cmp::Ordering::Less, - (_, ServerStatus::Online) => std::cmp::Ordering::Greater, - _ => std::cmp::Ordering::Equal, - } - }); - - Ok(servers) -} - -/// Test latency for a provider-specific server (uses full URL) -async fn test_provider_server_latency( - client: &Client, - region_name: &str, - region_url: &str, -) -> Server { - // Ensure region_url ends with / for proper path joining - let region_url_normalized = if region_url.ends_with('/') { - region_url.to_string() - } else { - format!("{}/", region_url) - }; - let server_url = format!("{}v2/serverInfo", region_url_normalized); - - // Extract hostname from URL for TCP ping - let hostname = region_url - .trim_start_matches("https://") - .trim_start_matches("http://") - .trim_end_matches('/'); - - // Extract server ID from URL - // For NVIDIA cloudmatchbeta URLs like "https://eu-netherlands-south.cloudmatchbeta.nvidiagrid.net" - // we need to extract "eu-netherlands-south" as the server ID for session URLs - // For other providers, fall back to name-based ID - let server_id = if hostname.contains(".cloudmatchbeta.nvidiagrid.net") { - // Extract subdomain (e.g., "eu-netherlands-south" from "eu-netherlands-south.cloudmatchbeta.nvidiagrid.net") - hostname.split('.').next().unwrap_or(hostname).to_string() - } else { - // For non-NVIDIA providers, use name-based ID - region_name.to_lowercase().replace(' ', "-") - }; - - log::debug!("Server {} -> ID: {} (from URL: {})", region_name, server_id, region_url); - - // Measure TCP connect time to port 443 (HTTPS) - let tcp_ping = async { - use tokio::net::TcpStream; - use std::net::ToSocketAddrs; - - let addr = format!("{}:443", hostname); - let socket_addr = tokio::task::spawn_blocking(move || { - addr.to_socket_addrs().ok().and_then(|mut addrs| addrs.next()) - }).await.ok().flatten(); - - if let Some(socket_addr) = socket_addr { - let start = std::time::Instant::now(); - match tokio::time::timeout( - std::time::Duration::from_secs(5), - TcpStream::connect(socket_addr) - ).await { - Ok(Ok(_stream)) => { - let elapsed = start.elapsed().as_millis() as u32; - Some(elapsed) - } - _ => None, - } - } else { - None - } - }; - - // Run TCP ping and HTTP status check in parallel - let (ping_ms, http_result) = tokio::join!( - tcp_ping, - client.get(&server_url).timeout(std::time::Duration::from_secs(5)).send() - ); - - let status = match http_result { - Ok(response) if response.status().is_success() => ServerStatus::Online, - Ok(_) => ServerStatus::Maintenance, - Err(_) => { - if ping_ms.is_some() { - ServerStatus::Online - } else { - ServerStatus::Offline - } - } - }; - - Server { - id: server_id, - name: region_name.to_string(), - region: region_name.to_string(), - country: region_name.to_string(), - ping_ms, - queue_size: None, - status, - } -} - -/// Parse store type from string -impl From<&str> for StoreType { - fn from(s: &str) -> Self { - match s.to_lowercase().as_str() { - "steam" => StoreType::Steam, - "epic" | "epicgames" => StoreType::Epic, - "ubisoft" | "uplay" => StoreType::Ubisoft, - "origin" => StoreType::Origin, - "gog" => StoreType::GoG, - "xbox" => StoreType::Xbox, - "ea_app" | "ea" => StoreType::EaApp, - other => StoreType::Other(other.to_string()), - } - } -} - -/// Resolution option from subscription features -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct ResolutionOption { - #[serde(rename = "heightInPixels", default)] - pub height: u32, - #[serde(rename = "widthInPixels", default)] - pub width: u32, - #[serde(rename = "framesPerSecond", default)] - pub fps: u32, - #[serde(rename = "isEntitled", default)] - pub is_entitled: bool, -} - -/// Feature key-value from subscription -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct FeatureOption { - #[serde(default)] - pub key: Option, - #[serde(rename = "textValue", default)] - pub text_value: Option, - #[serde(rename = "setValue", default)] - pub set_value: Option>, - #[serde(rename = "booleanValue", default)] - pub boolean_value: Option, -} - -/// Subscription features containing resolutions and feature flags -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct SubscriptionFeatures { - #[serde(default)] - pub resolutions: Vec, - #[serde(default)] - pub features: Vec, -} - -/// Streaming quality profile -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct StreamingQualityProfile { - #[serde(rename = "clientStreamingQualityMode", default)] - pub mode: Option, - #[serde(rename = "maxBitRate", default)] - pub max_bitrate: Option, - #[serde(default)] - pub resolution: Option, - #[serde(default)] - pub features: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct BitrateConfig { - #[serde(rename = "bitrateOption", default)] - pub bitrate_option: bool, - #[serde(rename = "bitrateValue", default)] - pub bitrate_value: u32, - #[serde(rename = "minBitrateValue", default)] - pub min_bitrate_value: u32, - #[serde(rename = "maxBitrateValue", default)] - pub max_bitrate_value: u32, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct ResolutionConfig { - #[serde(rename = "heightInPixels", default)] - pub height: u32, - #[serde(rename = "widthInPixels", default)] - pub width: u32, - #[serde(rename = "framesPerSecond", default)] - pub fps: u32, -} - -/// Storage addon attribute -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct AddonAttribute { - #[serde(default)] - pub key: Option, - #[serde(rename = "textValue", default)] - pub text_value: Option, -} - -/// Subscription addon (e.g., permanent storage) -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct SubscriptionAddon { - #[serde(default)] - pub uri: Option, - #[serde(default)] - pub id: Option, - #[serde(rename = "type", default)] - pub addon_type: Option, - #[serde(rename = "subType", default)] - pub sub_type: Option, - #[serde(rename = "autoPayEnabled", default)] - pub auto_pay_enabled: Option, - #[serde(default)] - pub attributes: Vec, - #[serde(default)] - pub status: Option, -} - -/// Subscription info response -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct SubscriptionInfo { - #[serde(rename = "membershipTier", default = "default_membership_tier")] - pub membership_tier: String, - #[serde(rename = "remainingTimeInMinutes")] - pub remaining_time_minutes: Option, - #[serde(rename = "totalTimeInMinutes")] - pub total_time_minutes: Option, - #[serde(rename = "renewalDateTime")] - pub renewal_date: Option, - #[serde(rename = "type")] - pub subscription_type: Option, - #[serde(rename = "subType")] - pub sub_type: Option, - /// Subscription features including resolutions and feature flags - #[serde(default)] - pub features: Option, - /// Streaming quality profiles (BALANCED, DATA_SAVER, COMPETITIVE, CINEMATIC) - #[serde(rename = "streamingQualities", default)] - pub streaming_qualities: Vec, - /// Subscription addons (e.g., permanent storage) - #[serde(default)] - pub addons: Vec, -} - -fn default_membership_tier() -> String { - "FREE".to_string() -} - -/// Fetch subscription/membership info from MES API -#[command] -pub async fn fetch_subscription( - access_token: String, - user_id: String, - vpc_id: Option, -) -> Result { - let client = Client::builder() - .user_agent(GFN_CEF_USER_AGENT) - .gzip(true) - .deflate(true) - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - let vpc = vpc_id.as_deref().unwrap_or("NP-AMS-05"); - - let url = format!( - "{}?serviceName=gfn_pc&languageCode=en_US&vpcId={}&userId={}", - MES_URL, vpc, user_id - ); - - log::info!("Fetching subscription from: {}", url); - - let response = client - .get(&url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Accept", "application/json, text/plain, */*") - .header("Accept-Encoding", "gzip, deflate") - .header("nv-client-id", LCARS_CLIENT_ID) - .header("nv-client-type", "NATIVE") - .header("nv-client-version", GFN_CLIENT_VERSION) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP") - .header("nv-device-make", "UNKNOWN") - .header("nv-device-model", "UNKNOWN") - .send() - .await - .map_err(|e| format!("Failed to fetch subscription: {}", e))?; - - let status = response.status(); - let content_type = response.headers() - .get("content-type") - .and_then(|v| v.to_str().ok()) - .unwrap_or("unknown") - .to_string(); - - log::debug!("Subscription response status: {}, content-type: {}", status, content_type); - - let body = response.text().await - .map_err(|e| format!("Failed to read subscription response body: {}", e))?; - - if !status.is_success() { - log::error!("Subscription API failed with status {}: {}", status, body); - return Err(format!("Subscription API failed with status {}: {}", status, body)); - } - - // Log raw response for debugging - log::debug!("Subscription raw response: {}", body); - - let subscription: SubscriptionInfo = serde_json::from_str(&body) - .map_err(|e| { - log::error!("Failed to parse subscription response: {}. Raw response: {}", e, body); - format!("Failed to parse subscription response: {}. Check logs for raw response.", e) - })?; - - log::info!("Subscription tier: {}, type: {:?}, subType: {:?}", - subscription.membership_tier, - subscription.subscription_type, - subscription.sub_type - ); - - Ok(subscription) -} - -/// Search result item from GraphQL -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SearchResultItem { - id: String, - title: String, - #[serde(default)] - images: Option, - #[serde(default)] - variants: Option>, - #[serde(default)] - gfn: Option, -} - -#[derive(Debug, Deserialize)] -struct SearchImages { - #[serde(rename = "GAME_BOX_ART")] - game_box_art: Option, - #[serde(rename = "TV_BANNER")] - tv_banner: Option, - #[serde(rename = "HERO_IMAGE")] - hero_image: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SearchVariant { - id: String, - app_store: String, - #[serde(default)] - supported_controls: Option>, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SearchGfnStatus { - #[serde(default)] - playability_state: Option, -} - -#[derive(Debug, Deserialize)] -struct SearchData { - apps: AppsSearchResults, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct AppsSearchResults { - #[serde(default)] - items: Vec, - #[serde(default)] - number_returned: i32, - #[serde(default)] - number_supported: i32, - page_info: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct PageInfo { - has_next_page: bool, - end_cursor: Option, - total_count: i32, -} - -/// Search games using GraphQL persisted query -#[command] -pub async fn search_games_graphql( - query: String, - limit: Option, - access_token: Option, - vpc_id: Option, -) -> Result { - let client = Client::new(); - - // Use provided vpc_id, or fetch dynamically from server info - let vpc = match vpc_id { - Some(v) => v, - None => get_current_vpc_id(access_token.as_deref()).await, - }; - - let fetch_count = limit.unwrap_or(20) as i32; - - let variables = serde_json::json!({ - "searchString": query, - "vpcId": &vpc, - "locale": DEFAULT_LOCALE, - "fetchCount": fetch_count, - "sortString": "itemMetadata.relevance:DESC,sortName:ASC", - "cursor": "", - "filters": {} - }); - - let extensions = serde_json::json!({ - "persistedQuery": { - "sha256Hash": SEARCH_QUERY_HASH - } - }); - - let variables_str = serde_json::to_string(&variables) - .map_err(|e| format!("Failed to serialize variables: {}", e))?; - let extensions_str = serde_json::to_string(&extensions) - .map_err(|e| format!("Failed to serialize extensions: {}", e))?; - - let hu_id = generate_hu_id(); - - let url = format!( - "{}?requestType=apps&extensions={}&huId={}&variables={}", - GRAPHQL_URL, - urlencoding::encode(&extensions_str), - urlencoding::encode(&hu_id), - urlencoding::encode(&variables_str) - ); - - log::info!("Searching games: {}", query); - - let mut request = client - .get(&url) - .header("Accept", "application/json, text/plain, */*") - .header("Content-Type", "application/graphql") - .header("Origin", "https://play.geforcenow.com") - .header("Referer", "https://play.geforcenow.com/") - .header("nv-client-id", LCARS_CLIENT_ID) - .header("nv-client-type", "NATIVE") - .header("nv-client-version", GFN_CLIENT_VERSION) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP") - .header("nv-device-make", "UNKNOWN") - .header("nv-device-model", "UNKNOWN") - .header("nv-browser-type", "CHROME"); - - if let Some(token) = access_token { - request = request.header("Authorization", format!("GFNJWT {}", token)); - } - - let response = request - .send() - .await - .map_err(|e| format!("Failed to search games: {}", e))?; - - let status = response.status(); - if !status.is_success() { - let body = response.text().await.unwrap_or_default(); - log::error!("Search API failed: {} - {}", status, body); - return Err(format!("API request failed with status {}: {}", status, body)); - } - - let body_text = response.text().await - .map_err(|e| format!("Failed to read response: {}", e))?; - - let graphql_response: GraphQLResponse = serde_json::from_str(&body_text) - .map_err(|e| format!("Failed to parse search response: {}", e))?; - - if let Some(errors) = graphql_response.errors { - let error_msg = errors.iter().map(|e| e.message.clone()).collect::>().join(", "); - return Err(format!("GraphQL errors: {}", error_msg)); - } - - let search_results = graphql_response.data - .map(|d| d.apps) - .ok_or("No search results")?; - - // Get total count before consuming items - let total_count = search_results.page_info - .as_ref() - .map(|p| p.total_count as u32) - .unwrap_or(search_results.number_supported as u32); - - // Convert search results to Game structs - let games: Vec = search_results.items.into_iter().map(|item| { - let variant = item.variants.as_ref().and_then(|v| v.first()); - - let store_type = variant - .map(|v| StoreType::from(v.app_store.as_str())) - .unwrap_or(StoreType::Other("Unknown".to_string())); - - let variant_id = variant.map(|v| v.id.clone()).unwrap_or_default(); - - let supported_controls = variant - .and_then(|v| v.supported_controls.clone()) - .unwrap_or_default(); - - // Collect all variants for store selection - let variants: Vec = item.variants.as_ref() - .map(|vars| vars.iter().map(|v| GameVariant { - id: v.id.clone(), - store_type: StoreType::from(v.app_store.as_str()), - supported_controls: v.supported_controls.clone().unwrap_or_default(), - }).collect()) - .unwrap_or_default(); - - // Prefer GAME_BOX_ART over TV_BANNER for better quality box art - let box_art = item.images.as_ref() - .and_then(|i| i.game_box_art.as_ref().or(i.tv_banner.as_ref())) - .map(|url| optimize_image_url(url, 272)); - - let hero = item.images.as_ref() - .and_then(|i| i.hero_image.as_ref()) - .map(|url| optimize_image_url(url, 1920)); - - let status = match item.gfn.as_ref() - .and_then(|g| g.playability_state.as_deref()) { - Some("PLAYABLE") => GameStatus::Available, - Some("MAINTENANCE") => GameStatus::Maintenance, - _ => GameStatus::Unavailable, - }; - - Game { - id: variant_id.clone(), - title: item.title, - publisher: None, - developer: None, - genres: vec![], - images: GameImages { - box_art, - hero, - thumbnail: None, - screenshots: vec![], - }, - store: StoreInfo { - store_type, - store_id: variant_id, - store_url: None, - }, - status, - supported_controls, - variants, - } - }).collect(); - - Ok(GamesResponse { - total_count, - games, - page: 0, - page_size: fetch_count as u32, - }) -} diff --git a/src-tauri/src/auth.rs b/src-tauri/src/auth.rs deleted file mode 100644 index bb7d82a..0000000 --- a/src-tauri/src/auth.rs +++ /dev/null @@ -1,1300 +0,0 @@ -use serde::{Deserialize, Serialize}; -use tauri::command; -use reqwest::Client; -use chrono::{DateTime, Utc}; -use std::sync::Arc; -use tokio::sync::Mutex; -use tokio::io::{AsyncReadExt, AsyncWriteExt}; -use tokio::net::TcpListener; -use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; -use sha2::{Sha256, Digest}; -use std::path::PathBuf; -use std::fs; - -// ============================================ -// Multi-Region / Alliance Partner Support -// ============================================ - -/// Service URLs API endpoint -const SERVICE_URLS_ENDPOINT: &str = "https://pcs.geforcenow.com/v1/serviceUrls"; - -/// Login provider/endpoint from serviceUrls API -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct LoginProvider { - /// Unique IDP ID used in OAuth authorization URL - pub idp_id: String, - /// Provider code (e.g., "NVIDIA", "KDD", "TWM") - pub login_provider_code: String, - /// Display name shown to users (e.g., "NVIDIA", "au", "Taiwan Mobile") - pub login_provider_display_name: String, - /// Internal provider name - pub login_provider: String, - /// Streaming service base URL for this provider - pub streaming_service_url: String, - /// Priority for sorting (lower = higher priority) - #[serde(default)] - pub login_provider_priority: i32, -} - -/// Response from /v1/serviceUrls endpoint -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ServiceUrlsResponse { - request_status: RequestStatus, - gfn_service_info: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct RequestStatus { - status_code: i32, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct GfnServiceInfo { - default_provider: Option, - gfn_service_endpoints: Vec, - #[serde(default)] - login_preferred_providers: Vec, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ServiceEndpoint { - idp_id: String, - login_provider_code: String, - login_provider_display_name: String, - login_provider: String, - streaming_service_url: String, - #[serde(default)] - login_provider_priority: i32, -} - -/// Currently selected login provider (stored in memory) -static SELECTED_PROVIDER: std::sync::OnceLock>>> = std::sync::OnceLock::new(); - -fn get_selected_provider_storage() -> Arc>> { - SELECTED_PROVIDER.get_or_init(|| Arc::new(Mutex::new(None))).clone() -} - -/// Get the currently selected provider's IDP ID (defaults to NVIDIA) -pub async fn get_selected_idp_id() -> String { - let storage = get_selected_provider_storage(); - let guard = storage.lock().await; - guard.as_ref() - .map(|p| p.idp_id.clone()) - .unwrap_or_else(|| IDP_ID.to_string()) -} - -/// Get the currently selected provider's streaming service URL -pub async fn get_streaming_base_url() -> String { - let storage = get_selected_provider_storage(); - let guard = storage.lock().await; - guard.as_ref() - .map(|p| p.streaming_service_url.clone()) - .unwrap_or_else(|| "https://prod.cloudmatchbeta.nvidiagrid.net/".to_string()) -} - -/// Fetch available login providers from GFN service URLs API -#[command] -pub async fn fetch_login_providers() -> Result, String> { - log::info!("Fetching login providers from {}", SERVICE_URLS_ENDPOINT); - - let client = Client::builder() - .user_agent(GFN_CEF_USER_AGENT) - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - let response = client - .get(SERVICE_URLS_ENDPOINT) - .header("Accept", "application/json") - .send() - .await - .map_err(|e| format!("Failed to fetch service URLs: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("Service URLs request failed with status {}: {}", status, body)); - } - - let service_response: ServiceUrlsResponse = response - .json() - .await - .map_err(|e| format!("Failed to parse service URLs response: {}", e))?; - - if service_response.request_status.status_code != 1 { - return Err(format!("Service URLs API returned error status: {}", service_response.request_status.status_code)); - } - - let service_info = service_response.gfn_service_info - .ok_or("No service info in response")?; - - // Convert endpoints to LoginProvider structs - let mut providers: Vec = service_info.gfn_service_endpoints - .into_iter() - .map(|ep| { - // Rename "Brothers Pictures" to "bro.game" for better user recognition - // API returns login_provider_code="BPC" for this provider - let display_name = if ep.login_provider_code == "BPC" { - "bro.game".to_string() - } else { - ep.login_provider_display_name - }; - LoginProvider { - idp_id: ep.idp_id, - login_provider_code: ep.login_provider_code, - login_provider_display_name: display_name, - login_provider: ep.login_provider, - streaming_service_url: ep.streaming_service_url, - login_provider_priority: ep.login_provider_priority, - } - }) - .collect(); - - // Sort by priority (lower = higher priority) - providers.sort_by_key(|p| p.login_provider_priority); - - log::info!("Found {} login providers", providers.len()); - for provider in &providers { - log::debug!(" - {} ({}): {}", provider.login_provider_display_name, provider.login_provider_code, provider.idp_id); - } - - Ok(providers) -} - -/// Set the login provider to use for authentication -#[command] -pub async fn set_login_provider(provider: LoginProvider) -> Result<(), String> { - log::info!("Setting login provider to: {} ({})", provider.login_provider_display_name, provider.idp_id); - - let storage = get_selected_provider_storage(); - let mut guard = storage.lock().await; - *guard = Some(provider); - - Ok(()) -} - -/// Get the currently selected login provider -#[command] -pub async fn get_selected_provider() -> Result, String> { - let storage = get_selected_provider_storage(); - let guard = storage.lock().await; - Ok(guard.clone()) -} - -/// Clear the selected login provider (reset to default NVIDIA) -#[command] -pub async fn clear_login_provider() -> Result<(), String> { - log::info!("Clearing login provider (resetting to NVIDIA default)"); - - let storage = get_selected_provider_storage(); - let mut guard = storage.lock().await; - *guard = None; - - Ok(()) -} - -/// Authentication state -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct AuthState { - pub is_authenticated: bool, - pub user: Option, - pub tokens: Option, - /// The login provider used for authentication (persisted for session restore) - #[serde(default)] - pub provider: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct User { - pub user_id: String, - pub display_name: String, - pub email: Option, - pub avatar_url: Option, - pub membership_tier: MembershipTier, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum MembershipTier { - Free, - Priority, - Ultimate, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct Tokens { - pub access_token: String, - pub refresh_token: Option, - pub id_token: Option, - pub expires_at: DateTime, -} - -/// OAuth login response from Starfleet -#[derive(Debug, Deserialize)] -struct StarfleetTokenResponse { - access_token: String, - #[allow(dead_code)] - token_type: String, - expires_in: i64, - refresh_token: Option, - id_token: Option, -} - -/// Jarvis user info response -#[allow(dead_code)] -#[derive(Debug, Deserialize)] -struct JarvisUserInfo { - sub: String, - preferred_username: String, - email: Option, - picture: Option, -} - -/// OAuth configuration for NVIDIA Starfleet -/// The official GFN client uses static-login.nvidia.com which redirects to the proper OAuth flow -#[allow(dead_code)] -const STARFLEET_AUTH_URL: &str = "https://static-login.nvidia.com/service/gfn/login-start"; - -// Token endpoint - discovered from Burp Suite capture of official client -// The official client POSTs to https://login.nvidia.com/token (NOT /oauth/token!) -const STARFLEET_TOKEN_URL: &str = "https://login.nvidia.com/token"; - -const LOGOUT_URL: &str = "https://static-login.nvidia.com/service/gfn/logout-start"; - -/// Starfleet Client ID from GFN client - this is for the public NVIDIA login -const STARFLEET_CLIENT_ID: &str = "ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ"; - -/// OAuth scopes required by GFN -const OAUTH_SCOPES: &str = "openid consent email tk_client age"; - -/// Available redirect ports (from GFN config) -const REDIRECT_PORTS: [u16; 5] = [2259, 6460, 7119, 8870, 9096]; - -/// Token refresh duration: 27 days in milliseconds -#[allow(dead_code)] -const TOKEN_REFRESH_DURATION_MS: i64 = 2332800000; -/// Refresh threshold: 30% of remaining lifetime -#[allow(dead_code)] -const REFRESH_THRESHOLD_PERCENT: f64 = 0.30; - -/// CEF Origin used by official client (required for CORS to work) -const CEF_ORIGIN: &str = "https://nvfile"; - -/// GFN CEF User-Agent (from Burp capture) -const GFN_CEF_USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173"; - -/// IDP ID for NVIDIA identity provider -const IDP_ID: &str = "PDiAhv2kJTFeQ7WOPqiQ2tRZ7lGhR2X11dXvM4TZSxg"; - -/// Userinfo endpoint (from Burp capture - used when id_token is not available) -const USERINFO_URL: &str = "https://login.nvidia.com/userinfo"; - -/// Get or generate a stable device ID (SHA256 hash) -fn get_device_id() -> String { - // Try to read device_id from official GFN client config - if let Some(app_data) = std::env::var_os("LOCALAPPDATA") { - let gfn_config = std::path::PathBuf::from(app_data) - .join("NVIDIA Corporation") - .join("GeForceNOW") - .join("sharedstorage.json"); - - if gfn_config.exists() { - if let Ok(content) = std::fs::read_to_string(&gfn_config) { - if let Ok(json) = serde_json::from_str::(&content) { - if let Some(device_id) = json.get("gfnTelemetry") - .and_then(|t| t.get("deviceId")) - .and_then(|d| d.as_str()) { - log::info!("Using device_id from official GFN client: {}", device_id); - return device_id.to_string(); - } - } - } - } - } - - // Generate a stable device ID based on machine info - generate_stable_device_id() -} - -/// Generate a stable device ID based on machine identifiers -fn generate_stable_device_id() -> String { - let mut hasher = Sha256::new(); - - // Use hostname and username for a semi-stable ID - if let Ok(hostname) = std::env::var("COMPUTERNAME") { - hasher.update(hostname.as_bytes()); - } - if let Ok(username) = std::env::var("USERNAME") { - hasher.update(username.as_bytes()); - } - // Add a salt specific to this app - hasher.update(b"gfn-custom-client"); - - let result = hasher.finalize(); - hex::encode(result) -} - -/// Find an available port from the allowed redirect ports -fn find_available_port() -> Option { - for port in REDIRECT_PORTS { - if std::net::TcpListener::bind(format!("127.0.0.1:{}", port)).is_ok() { - return Some(port); - } - } - None -} - -/// Generate a random string of specified length (for PKCE and state) -fn generate_random_string(len: usize) -> String { - use std::time::{SystemTime, UNIX_EPOCH}; - - // Use timestamp + counter for pseudo-randomness - let timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_nanos(); - - // Create a longer seed by hashing - let mut hasher = Sha256::new(); - hasher.update(timestamp.to_le_bytes()); - hasher.update(std::process::id().to_le_bytes()); - let hash = hasher.finalize(); - - URL_SAFE_NO_PAD.encode(&hash[..len.min(32)]) - .chars() - .take(len) - .collect() -} - -/// Generate PKCE code verifier (43-128 characters) -fn generate_code_verifier() -> String { - // Generate a 64 character random string - let mut result = generate_random_string(32); - // Append more randomness - result.push_str(&generate_random_string(32)); - result.chars().take(64).collect() -} - -/// Generate PKCE code challenge from verifier (S256 method) -fn generate_code_challenge(verifier: &str) -> String { - let mut hasher = Sha256::new(); - hasher.update(verifier.as_bytes()); - let hash = hasher.finalize(); - URL_SAFE_NO_PAD.encode(hash) -} - -/// Generate a nonce for OpenID Connect (UUID format like official client) -fn generate_nonce() -> String { - // Generate UUID-like format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx - use std::time::{SystemTime, UNIX_EPOCH}; - - let timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_nanos(); - - let mut hasher = Sha256::new(); - hasher.update(timestamp.to_le_bytes()); - hasher.update(std::process::id().to_le_bytes()); - hasher.update(b"nonce"); - let hash = hasher.finalize(); - - // Format as UUID - format!( - "{:08x}-{:04x}-{:04x}-{:04x}-{:012x}", - u32::from_le_bytes([hash[0], hash[1], hash[2], hash[3]]), - u16::from_le_bytes([hash[4], hash[5]]), - u16::from_le_bytes([hash[6], hash[7]]), - u16::from_le_bytes([hash[8], hash[9]]), - u64::from_le_bytes([hash[10], hash[11], hash[12], hash[13], hash[14], hash[15], 0, 0]) & 0xffffffffffff - ) -} - -/// Global auth state storage -static AUTH_STATE: std::sync::OnceLock>>> = std::sync::OnceLock::new(); - -fn get_auth_storage() -> Arc>> { - AUTH_STATE.get_or_init(|| { - // Try to load saved auth state on first access - let saved_state = load_auth_from_file(); - Arc::new(Mutex::new(saved_state)) - }).clone() -} - -/// Get the path to the auth storage file -fn get_auth_file_path() -> PathBuf { - crate::utils::get_app_data_dir().join("auth.json") -} - -/// Save auth state to file -fn save_auth_to_file(state: &AuthState) { - let path = get_auth_file_path(); - if let Ok(json) = serde_json::to_string_pretty(state) { - if let Err(e) = fs::write(&path, json) { - log::warn!("Failed to save auth state: {}", e); - } else { - log::info!("Auth state saved to {:?}", path); - } - } -} - -/// Load auth state from file -fn load_auth_from_file() -> Option { - let path = get_auth_file_path(); - if path.exists() { - match fs::read_to_string(&path) { - Ok(json) => { - match serde_json::from_str::(&json) { - Ok(state) => { - // Validate the token is not expired - if let Some(tokens) = &state.tokens { - if tokens.expires_at > Utc::now() { - log::info!("Loaded saved auth state from {:?}", path); - return Some(state); - } else { - log::info!("Saved token expired, clearing auth file"); - // Clear the expired auth file - if let Err(e) = fs::remove_file(&path) { - log::warn!("Failed to remove expired auth file: {}", e); - } - } - } - } - Err(e) => log::warn!("Failed to parse auth file: {}", e), - } - } - Err(e) => log::warn!("Failed to read auth file: {}", e), - } - } - None -} - -/// Clear saved auth state -fn clear_auth_file() { - let path = get_auth_file_path(); - if path.exists() { - if let Err(e) = fs::remove_file(&path) { - log::warn!("Failed to remove auth file: {}", e); - } - } -} - -/// Parse query string from URL -fn parse_query_string(query: &str) -> std::collections::HashMap { - query - .split('&') - .filter_map(|pair| { - let mut parts = pair.splitn(2, '='); - let key = parts.next()?; - let value = parts.next().unwrap_or(""); - Some(( - urlencoding::decode(key).ok()?.into_owned(), - urlencoding::decode(value).ok()?.into_owned(), - )) - }) - .collect() -} - -/// HTML response for successful login -const SUCCESS_HTML: &str = r#" - - - Login Successful - - - -
-

Login Successful!

-

You can close this window and return to the GFN Client.

-
- - -"#; - -/// HTML response for failed login -const ERROR_HTML: &str = r#" - - - Login Failed - - - -
-
✗
-

Login Failed

-

Please try again or check your credentials.

-
- -"#; - -/// Start OAuth login flow - opens GFN web to let user login -/// Then user can extract their session tokens from the browser -#[command] -pub async fn login() -> Result { - log::info!("Starting OAuth login flow (GFN Web Login)"); - - // Open the GFN web client for user to login - // The user will login there and we'll provide instructions to extract tokens - let gfn_url = "https://play.geforcenow.com"; - - log::info!("Opening GFN web client for authentication"); - if let Err(e) = open::that(gfn_url) { - log::warn!("Failed to open browser: {}", e); - } - - // For now, return a message indicating manual token entry is needed - // In a future update, we could use browser automation or extension - Err("Please login at play.geforcenow.com, then use 'Set Token' in settings to enter your access token. You can find it in browser DevTools > Application > Local Storage > NVAUTHTOKEN".to_string()) -} - -/// Set access token manually (for users who extract it from browser) -#[command] -pub async fn set_access_token(token: String) -> Result { - log::info!("Setting access token manually"); - - // Try to get user info - first try JWT decode, then /userinfo endpoint - let user = match decode_jwt_user_info(&token) { - Ok(user) => user, - Err(_) => { - log::info!("Token is not a JWT, trying /userinfo endpoint..."); - fetch_userinfo(&token).await? - } - }; - - // Get the currently selected provider to save with auth state - let current_provider = { - let provider_storage = get_selected_provider_storage(); - let provider_guard = provider_storage.lock().await; - provider_guard.clone() - }; - - let auth_state = AuthState { - is_authenticated: true, - user: Some(user), - tokens: Some(Tokens { - access_token: token, - refresh_token: None, - id_token: None, - expires_at: Utc::now() + chrono::Duration::days(27), // Assume 27 day expiry - }), - provider: current_provider, - }; - - // Store auth state in memory - { - let storage = get_auth_storage(); - let mut guard = storage.lock().await; - *guard = Some(auth_state.clone()); - } - - // Persist to file - save_auth_to_file(&auth_state); - - log::info!("Token validated and stored successfully"); - Ok(auth_state) -} - -/// Get the current access token if authenticated -/// Note: For GFN API calls, use get_gfn_jwt() instead which returns the id_token -#[command] -pub async fn get_access_token() -> Result { - let storage = get_auth_storage(); - let guard = storage.lock().await; - - guard.as_ref() - .and_then(|state| state.tokens.as_ref()) - .map(|tokens| tokens.access_token.clone()) - .ok_or_else(|| "Not authenticated - please login first".to_string()) -} - -/// Get the GFN JWT token for API calls (this is the id_token, which is a JWT) -/// The GFN API (games.geforce.com) expects a JWT with the GFNJWT auth scheme -#[command] -pub async fn get_gfn_jwt() -> Result { - let storage = get_auth_storage(); - let guard = storage.lock().await; - - guard.as_ref() - .and_then(|state| state.tokens.as_ref()) - .and_then(|tokens| tokens.id_token.clone()) - .ok_or_else(|| "Not authenticated or no JWT token available - please login first".to_string()) -} - -/// OAuth callback result - can be either authorization code or implicit token -enum OAuthCallbackResult { - Code(String), - Token { access_token: String, expires_in: Option, id_token: Option }, -} - -/// Extract OAuth callback data - handles both code and token responses -fn extract_oauth_callback(request: &str) -> Option { - // Parse the GET request line - let first_line = request.lines().next()?; - let path = first_line.split_whitespace().nth(1)?; - - // The token might be in a URL fragment (#) which browsers don't send to server - // So we serve an HTML page that extracts it and posts it back - - // Check for query string - let query_start = match path.find('?') { - Some(pos) => pos, - None => return None, - }; - - let query = &path[query_start + 1..]; - let params = parse_query_string(query); - - log::debug!("Parsing OAuth callback, path: {}, params: {:?}", path, params.keys().collect::>()); - - // Check for error response first - if let Some(error) = params.get("error") { - log::error!("OAuth error: {}", error); - if let Some(desc) = params.get("error_description") { - log::error!("Error description: {}", desc); - } - return None; - } - - // Check for implicit token first (from our /callback redirect) - // This is higher priority since implicit flow should return token directly - if let Some(token) = params.get("access_token") { - log::info!("Found access_token in callback params"); - let expires_in = params.get("expires_in").and_then(|s| s.parse().ok()); - let id_token = params.get("id_token").cloned(); - return Some(OAuthCallbackResult::Token { - access_token: token.clone(), - expires_in, - id_token, - }); - } - - // Check for authorization code (fallback if NVIDIA returns code instead of token) - if let Some(code) = params.get("code") { - log::info!("Found authorization code in callback params"); - return Some(OAuthCallbackResult::Code(code.clone())); - } - - None -} - -/// NVIDIA OAuth login flow with localhost callback -/// Uses authorization code flow with PKCE (same as official GFN client) -/// Supports multi-region login via selected provider's idp_id -#[command] -pub async fn login_oauth() -> Result { - // Get the selected provider's IDP ID (defaults to NVIDIA if none selected) - let selected_idp_id = get_selected_idp_id().await; - log::info!("=== Starting OAuth login flow (Authorization Code + PKCE) ==="); - log::info!("Using IDP ID: {}", selected_idp_id); - - // Find an available redirect port - log::info!("Finding available port from: {:?}", REDIRECT_PORTS); - let port = find_available_port() - .ok_or_else(|| { - log::error!("No available ports found!"); - "No available ports for OAuth callback. Ports 2259, 6460, 7119, 8870, 9096 are all in use.".to_string() - })?; - log::info!("Found available port: {}", port); - - let redirect_uri = format!("http://localhost:{}", port); - let nonce = generate_nonce(); - - // Generate PKCE code verifier and challenge (required by NVIDIA OAuth) - let code_verifier = generate_code_verifier(); - let code_challenge = generate_code_challenge(&code_verifier); - - // Get device ID (from official client or generate) - let device_id = get_device_id(); - log::info!("Using device_id: {}", device_id); - - // Build OAuth authorization URL using authorization code flow with PKCE - // Uses the selected provider's idp_id for multi-region/alliance partner support - let auth_url = format!( - "https://login.nvidia.com/authorize?response_type=code&device_id={}&scope={}&client_id={}&redirect_uri={}&ui_locales=en_US&nonce={}&prompt=select_account&code_challenge={}&code_challenge_method=S256&idp_id={}", - device_id, - urlencoding::encode(OAUTH_SCOPES), - STARFLEET_CLIENT_ID, - urlencoding::encode(&redirect_uri), - nonce, - code_challenge, - selected_idp_id - ); - - log::info!("OAuth URL: {}", auth_url); - - // Start TCP listener FIRST so it's ready when browser redirects back - log::info!("Starting OAuth callback server on port {}", port); - let listener = TcpListener::bind(format!("127.0.0.1:{}", port)) - .await - .map_err(|e| { - log::error!("Failed to bind to port {}: {}", port, e); - format!("Failed to start callback server on port {}: {}", port, e) - })?; - log::info!("Callback server listening on port {}", port); - - // Open browser with auth URL - log::info!("Opening browser for authentication..."); - log::info!("Full OAuth URL: {}", auth_url); - - // Use open crate which handles URL escaping properly on all platforms - match open::that(&auth_url) { - Ok(_) => log::info!("Browser opened successfully"), - Err(e) => { - log::error!("Failed to open browser: {}", e); - return Err(format!("Failed to open browser: {}. Please open manually: {}", e, auth_url)); - } - } - - log::info!("Waiting for OAuth callback..."); - - // Clone values needed inside the async block - let redirect_uri_clone = redirect_uri.clone(); - let code_verifier_clone = code_verifier.clone(); - - // Wait for callback (with 5 minute timeout) - let callback_result = tokio::time::timeout( - std::time::Duration::from_secs(300), - async move { - loop { - let (mut socket, _) = listener.accept().await - .map_err(|e| format!("Failed to accept connection: {}", e))?; - - let mut buffer = vec![0u8; 8192]; - let n = socket.read(&mut buffer).await - .map_err(|e| format!("Failed to read request: {}", e))?; - - let request = String::from_utf8_lossy(&buffer[..n]); - log::debug!("Received callback request: {}", &request[..request.len().min(200)]); - - // Check if this is a valid OAuth callback with authorization code - if let Some(result) = extract_oauth_callback(&request) { - match result { - OAuthCallbackResult::Token { access_token, expires_in, id_token } => { - log::info!("Received access token directly"); - - // Send success response - let response = format!( - "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\n\r\n{}", - SUCCESS_HTML.len(), - SUCCESS_HTML - ); - let _ = socket.write_all(response.as_bytes()).await; - - let expires_at = Utc::now() + chrono::Duration::seconds(expires_in.unwrap_or(86400)); - return Ok::(Tokens { - access_token, - refresh_token: None, - id_token, - expires_at, - }); - } - OAuthCallbackResult::Code(code) => { - log::info!("Received authorization code, attempting token exchange with PKCE verifier"); - - // Try token exchange with the PKCE code_verifier - match exchange_code(&code, &redirect_uri_clone, &code_verifier_clone).await { - Ok(tokens) => { - let response = format!( - "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\n\r\n{}", - SUCCESS_HTML.len(), - SUCCESS_HTML - ); - let _ = socket.write_all(response.as_bytes()).await; - return Ok(tokens); - } - Err(e) => { - log::error!("Token exchange failed: {}", e); - let response = format!( - "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\n\r\n{}", - ERROR_HTML.len(), - ERROR_HTML - ); - let _ = socket.write_all(response.as_bytes()).await; - return Err(format!("Token exchange failed: {}. Please use manual token entry.", e)); - } - } - } - } - } - - // Handle favicon and other requests - just return 200 for the main page - let first_line = request.lines().next().unwrap_or(""); - let path = first_line.split_whitespace().nth(1).unwrap_or(""); - - if path == "/favicon.ico" { - let response = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"; - let _ = socket.write_all(response.as_bytes()).await; - } else { - // For any other request, return a simple waiting page - let waiting_html = r#"Processing...

Processing login...

"#; - let response = format!( - "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: {}\r\n\r\n{}", - waiting_html.len(), - waiting_html - ); - let _ = socket.write_all(response.as_bytes()).await; - } - } - } - ).await; - - let tokens = match callback_result { - Ok(Ok(tokens)) => tokens, - Ok(Err(e)) => return Err(e), - Err(_) => return Err("Login timeout - please try again".to_string()), - }; - - log::info!("Tokens received, fetching user info"); - - // Get user info from tokens (prefer id_token which is JWT, fallback to /userinfo endpoint) - let user = get_user_info_from_tokens(&tokens).await?; - - // Get the currently selected provider to save with auth state - let current_provider = { - let provider_storage = get_selected_provider_storage(); - let provider_guard = provider_storage.lock().await; - provider_guard.clone() - }; - - let auth_state = AuthState { - is_authenticated: true, - user: Some(user), - tokens: Some(tokens), - provider: current_provider, - }; - - // Store auth state - { - let storage = get_auth_storage(); - let mut guard = storage.lock().await; - *guard = Some(auth_state.clone()); - } - - // Persist to file - save_auth_to_file(&auth_state); - - log::info!("Login successful"); - Ok(auth_state) -} - -/// Exchange authorization code for tokens (with PKCE code_verifier) -/// Uses exact same request format as official GFN client (captured via Burp Suite) -async fn exchange_code(code: &str, redirect_uri: &str, code_verifier: &str) -> Result { - log::info!("Exchanging authorization code for tokens..."); - log::info!("Token endpoint: {}", STARFLEET_TOKEN_URL); - log::info!("Redirect URI: {}", redirect_uri); - - let client = Client::builder() - .user_agent(GFN_CEF_USER_AGENT) - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - // NOTE: Official client does NOT include client_id in token request! - // Only: grant_type, code, redirect_uri, code_verifier - let params = [ - ("grant_type", "authorization_code"), - ("code", code), - ("redirect_uri", redirect_uri), - ("code_verifier", code_verifier), - ]; - - log::info!("Sending token exchange request..."); - - let response = client - .post(STARFLEET_TOKEN_URL) - .header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") - .header("Origin", CEF_ORIGIN) - .header("Referer", format!("{}/", CEF_ORIGIN)) - .header("Accept", "application/json, text/plain, */*") - .header("Sec-Fetch-Site", "cross-site") - .header("Sec-Fetch-Mode", "cors") - .header("Sec-Fetch-Dest", "empty") - .form(¶ms) - .send() - .await; - - match response { - Ok(resp) => { - let status = resp.status(); - log::info!("Token exchange response status: {}", status); - - if status.is_success() { - let token_response: StarfleetTokenResponse = resp - .json() - .await - .map_err(|e| format!("Failed to parse token response: {}", e))?; - - let expires_at = Utc::now() + chrono::Duration::seconds(token_response.expires_in); - - log::info!("Token exchange successful! Token expires in {} seconds", token_response.expires_in); - return Ok(Tokens { - access_token: token_response.access_token, - refresh_token: token_response.refresh_token, - id_token: token_response.id_token, - expires_at, - }); - } else { - let body = resp.text().await.unwrap_or_default(); - let error_msg = format!("Token exchange failed with status {}: {}", status, body); - log::error!("{}", error_msg); - return Err(error_msg); - } - } - Err(e) => { - let error_msg = format!("Token exchange request failed: {}", e); - log::error!("{}", error_msg); - return Err(error_msg); - } - } -} - -/// JWT payload structure (decoded from id_token) -#[derive(Debug, Deserialize)] -struct JwtPayload { - sub: String, - email: Option, - preferred_username: Option, - #[serde(default)] - exp: i64, - // GFN-specific claims - #[serde(rename = "gfn_tier")] - gfn_tier: Option, - picture: Option, -} - -/// Userinfo endpoint response (from /userinfo API call) -#[derive(Debug, Deserialize)] -struct UserinfoResponse { - sub: String, - preferred_username: Option, - email: Option, - email_verified: Option, - picture: Option, -} - -/// Get user info from tokens - prefer id_token (JWT), fallback to /userinfo endpoint -/// NVIDIA's access_token is NOT a JWT, but id_token is -async fn get_user_info_from_tokens(tokens: &Tokens) -> Result { - // First try to decode id_token if available (it's a JWT) - if let Some(id_token) = &tokens.id_token { - log::info!("Attempting to decode id_token as JWT..."); - match decode_jwt_user_info(id_token) { - Ok(user) => { - log::info!("Successfully decoded user info from id_token"); - return Ok(user); - } - Err(e) => { - log::warn!("Failed to decode id_token: {}, falling back to /userinfo endpoint", e); - } - } - } else { - log::info!("No id_token available, will call /userinfo endpoint"); - } - - // Fallback: call /userinfo endpoint with access_token as Bearer - log::info!("Fetching user info from /userinfo endpoint..."); - fetch_userinfo(&tokens.access_token).await -} - -/// Fetch user info from NVIDIA's /userinfo endpoint -async fn fetch_userinfo(access_token: &str) -> Result { - let client = Client::builder() - .user_agent(GFN_CEF_USER_AGENT) - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - let response = client - .get(USERINFO_URL) - .header("Authorization", format!("Bearer {}", access_token)) - .header("Origin", CEF_ORIGIN) - .header("Referer", format!("{}/", CEF_ORIGIN)) - .header("Accept", "application/json, text/plain, */*") - .send() - .await - .map_err(|e| format!("Failed to fetch userinfo: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("Userinfo request failed with status {}: {}", status, body)); - } - - let userinfo: UserinfoResponse = response - .json() - .await - .map_err(|e| format!("Failed to parse userinfo response: {}", e))?; - - log::info!("Userinfo response: user_id={}, username={:?}", userinfo.sub, userinfo.preferred_username); - - // Convert to User struct - let display_name = userinfo.preferred_username - .or_else(|| userinfo.email.as_ref().map(|e| e.split('@').next().unwrap_or("User").to_string())) - .unwrap_or_else(|| "User".to_string()); - - Ok(User { - user_id: userinfo.sub, - display_name, - email: userinfo.email, - avatar_url: userinfo.picture, - membership_tier: MembershipTier::Free, // /userinfo doesn't return tier, default to Free - }) -} - -/// Decode JWT and extract user info (used for id_token) -fn decode_jwt_user_info(token: &str) -> Result { - // JWT format: header.payload.signature - let parts: Vec<&str> = token.split('.').collect(); - - if parts.len() != 3 { - return Err("Invalid JWT token format".to_string()); - } - - // Decode the payload (second part) - let payload_b64 = parts[1]; - - // Add padding if needed for base64 decoding - let padded = match payload_b64.len() % 4 { - 2 => format!("{}==", payload_b64), - 3 => format!("{}=", payload_b64), - _ => payload_b64.to_string(), - }; - - // Use URL-safe base64 decoding (JWT uses URL-safe base64) - let payload_bytes = URL_SAFE_NO_PAD.decode(&padded) - .or_else(|_| base64::engine::general_purpose::STANDARD.decode(&padded)) - .map_err(|e| format!("Failed to decode JWT payload: {}", e))?; - - let payload_str = String::from_utf8(payload_bytes) - .map_err(|e| format!("Invalid UTF-8 in JWT payload: {}", e))?; - - let payload: JwtPayload = serde_json::from_str(&payload_str) - .map_err(|e| format!("Failed to parse JWT payload: {}", e))?; - - // Check if token is expired - let now = Utc::now().timestamp(); - if payload.exp > 0 && payload.exp < now { - return Err("Token has expired".to_string()); - } - - // Parse membership tier from JWT claims - let membership_tier = match payload.gfn_tier.as_deref() { - Some("PRIORITY") | Some("priority") => MembershipTier::Priority, - Some("ULTIMATE") | Some("ultimate") => MembershipTier::Ultimate, - _ => MembershipTier::Free, - }; - - // Extract display name from email or preferred_username - let display_name = payload.preferred_username - .or_else(|| payload.email.as_ref().map(|e| e.split('@').next().unwrap_or("User").to_string())) - .unwrap_or_else(|| "User".to_string()); - - Ok(User { - user_id: payload.sub, - display_name, - email: payload.email, - avatar_url: payload.picture, - membership_tier, - }) -} - -/// Logout and clear tokens -#[command] -pub async fn logout() -> Result<(), String> { - log::info!("Logging out"); - - // Clear stored auth state - { - let storage = get_auth_storage(); - let mut guard = storage.lock().await; - *guard = None; - } - - // Clear saved auth file - clear_auth_file(); - - // Optionally open NVIDIA logout URL - let _ = open::that(LOGOUT_URL); - - Ok(()) -} - -/// Get current authentication status -#[command] -pub async fn get_auth_status() -> Result { - // First, check if we need to refresh the token - let needs_refresh = { - let storage = get_auth_storage(); - let guard = storage.lock().await; - - match &*guard { - Some(state) => { - if let Some(tokens) = &state.tokens { - if should_refresh_token(tokens) { - tokens.refresh_token.clone() - } else { - None - } - } else { - None - } - } - None => None, - } - }; - - // If we need to refresh, do it outside the lock - if let Some(refresh) = needs_refresh { - match refresh_token(refresh).await { - Ok(new_tokens) => { - let storage = get_auth_storage(); - let mut guard = storage.lock().await; - if let Some(state) = guard.as_mut() { - state.tokens = Some(new_tokens); - } - } - Err(_) => { - // Refresh failed, need to re-login - return Ok(AuthState { - is_authenticated: false, - user: None, - tokens: None, - provider: None, - }); - } - } - } - - // Now return the current state - let storage = get_auth_storage(); - let guard = storage.lock().await; - - match &*guard { - Some(state) => { - // Restore the provider to memory if it was saved with auth state - if let Some(provider) = &state.provider { - let provider_storage = get_selected_provider_storage(); - let mut provider_guard = provider_storage.lock().await; - if provider_guard.is_none() { - log::info!("Restoring saved login provider: {}", provider.login_provider_display_name); - *provider_guard = Some(provider.clone()); - } - } - Ok(state.clone()) - } - None => Ok(AuthState { - is_authenticated: false, - user: None, - tokens: None, - provider: None, - }), - } -} - -/// Check if token needs refresh based on GFN refresh threshold (30% remaining) -pub fn should_refresh_token(tokens: &Tokens) -> bool { - let now = Utc::now(); - let total_lifetime = chrono::Duration::milliseconds(TOKEN_REFRESH_DURATION_MS); - let remaining = tokens.expires_at - now; - - if remaining <= chrono::Duration::zero() { - return true; // Already expired - } - - let threshold = total_lifetime.num_milliseconds() as f64 * REFRESH_THRESHOLD_PERCENT; - remaining.num_milliseconds() < threshold as i64 -} - -/// Refresh access token using Starfleet -#[command] -pub async fn refresh_token(refresh_token: String) -> Result { - let client = Client::builder() - .user_agent(GFN_CEF_USER_AGENT) - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - // Refresh token request - may need client_id, keeping for now - let params = [ - ("grant_type", "refresh_token"), - ("refresh_token", &refresh_token), - ("client_id", STARFLEET_CLIENT_ID), - ]; - - let response = client - .post(STARFLEET_TOKEN_URL) - .header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") - .header("Origin", CEF_ORIGIN) - .header("Referer", format!("{}/", CEF_ORIGIN)) - .header("Accept", "application/json, text/plain, */*") - .form(¶ms) - .send() - .await - .map_err(|e| format!("Token refresh failed: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - return Err(format!("Token refresh failed with status {}: {}", status, body)); - } - - let token_response: StarfleetTokenResponse = response - .json() - .await - .map_err(|e| format!("Failed to parse token response: {}", e))?; - - let expires_at = Utc::now() + chrono::Duration::seconds(token_response.expires_in); - - Ok(Tokens { - access_token: token_response.access_token, - refresh_token: token_response.refresh_token, - id_token: token_response.id_token, - expires_at, - }) -} diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs deleted file mode 100644 index c9b73b5..0000000 --- a/src-tauri/src/config.rs +++ /dev/null @@ -1,204 +0,0 @@ -use serde::{Deserialize, Serialize}; -use tauri::command; -use std::path::PathBuf; -use std::fs; - -/// Application settings -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(default)] -pub struct Settings { - /// Preferred streaming quality (legacy, kept for backward compatibility) - pub quality: StreamQuality, - /// Custom resolution (e.g., "1920x1080") - pub resolution: Option, - /// Custom FPS - pub fps: Option, - /// Preferred video codec - pub codec: VideoCodecSetting, - /// Preferred audio codec - pub audio_codec: AudioCodecSetting, - /// Max bitrate in Mbps (200 = unlimited) - pub max_bitrate_mbps: u32, - /// Preferred server region - pub region: Option, - /// Enable Discord Rich Presence - pub discord_rpc: bool, - /// Show stats (resolution, fps, ms) in Discord presence - pub discord_show_stats: Option, - /// Custom proxy URL - pub proxy: Option, - /// Disable telemetry - pub disable_telemetry: bool, - /// Window behavior - pub start_minimized: bool, - /// Auto-update games library - pub auto_refresh_library: bool, - /// Enable NVIDIA Reflex low-latency mode (auto-enabled for 120+ FPS) - pub reflex: bool, - - // Recording settings - /// Enable recording feature - pub recording_enabled: bool, - /// Recording quality (low, medium, high) - pub recording_quality: RecordingQuality, - /// Recording codec preference (h264 or av1) - pub recording_codec: RecordingCodec, - /// Enable Instant Replay (DVR buffer) - pub instant_replay_enabled: bool, - /// Instant Replay buffer duration in seconds - pub instant_replay_duration: u32, - /// Custom recording output directory (None = Videos/OpenNow) - pub recording_output_dir: Option, -} - -/// Recording quality presets -#[derive(Debug, Clone, Serialize, Deserialize, Default)] -#[serde(rename_all = "lowercase")] -pub enum RecordingQuality { - Low, // 2.5 Mbps - #[default] - Medium, // 5 Mbps - High, // 8 Mbps -} - -/// Recording codec preference -#[derive(Debug, Clone, Serialize, Deserialize, Default)] -#[serde(rename_all = "lowercase")] -pub enum RecordingCodec { - #[default] - Vp8, // Software encoded - no GPU contention (recommended) - H264, // May cause stuttering (competes with stream decoding) - Av1, // Best quality (RTX 40+ only - separate encoder chip) -} - -#[derive(Debug, Clone, Serialize, Deserialize, Default)] -#[serde(rename_all = "lowercase")] -pub enum StreamQuality { - #[default] - Auto, - Custom, // Use explicit resolution/fps values - Low, // 720p 30fps - Medium, // 1080p 60fps - High, // 1440p 60fps - Ultra, // 4K 60fps - High120, // 1080p 120fps - Ultra120, // 1440p 120fps - Competitive, // 1080p 240fps - Extreme, // 1080p 360fps -} - -#[derive(Debug, Clone, Serialize, Deserialize, Default)] -#[serde(rename_all = "lowercase")] -pub enum VideoCodecSetting { - #[default] - H264, - H265, - Av1, -} - -#[derive(Debug, Clone, Serialize, Deserialize, Default)] -#[serde(rename_all = "kebab-case")] -pub enum AudioCodecSetting { - #[default] - Opus, - #[serde(rename = "opus-stereo")] - OpusStereo, -} - -impl Default for Settings { - fn default() -> Self { - Self { - quality: StreamQuality::Auto, - resolution: Some("1920x1080".to_string()), - fps: Some(60), - codec: VideoCodecSetting::H264, - audio_codec: AudioCodecSetting::Opus, - max_bitrate_mbps: 200, // 200 = unlimited - region: None, - discord_rpc: false, - discord_show_stats: Some(false), - proxy: None, - disable_telemetry: true, - start_minimized: false, - auto_refresh_library: true, - reflex: true, // Enabled by default for low-latency gaming - // Recording defaults - recording_enabled: true, - recording_quality: RecordingQuality::Medium, - recording_codec: RecordingCodec::Vp8, // VP8 - no GPU contention, no stuttering - instant_replay_enabled: false, - instant_replay_duration: 60, // 60 seconds default - recording_output_dir: None, // Uses Videos/OpenNow by default - } - } -} - -/// GFN API Configuration endpoints -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct GfnConfig { - /// Starfleet OAuth base URL - pub starfleet_url: String, - /// Jarvis session API URL - pub jarvis_url: String, - /// NES/LCARS API URL (game library) - pub nes_url: String, - /// GraphQL endpoint - pub graphql_url: String, - /// Image CDN base URL - pub image_cdn: String, - /// Session control API - pub session_url: String, -} - -impl Default for GfnConfig { - fn default() -> Self { - Self { - starfleet_url: "https://accounts.nvgs.nvidia.com".to_string(), - jarvis_url: "https://jarvis.nvidia.com".to_string(), - nes_url: "https://nes.nvidia.com".to_string(), - graphql_url: "https://api.gdn.nvidia.com".to_string(), - image_cdn: "https://img.nvidiagrid.net".to_string(), - session_url: "https://pcs.geforcenow.com".to_string(), - } - } -} - -/// Get the path to the settings file -fn get_settings_file_path() -> PathBuf { - crate::utils::get_app_data_dir().join("settings.json") -} - -#[command] -pub async fn get_settings() -> Result { - let path = get_settings_file_path(); - if path.exists() { - match fs::read_to_string(&path) { - Ok(json) => { - match serde_json::from_str::(&json) { - Ok(settings) => { - log::info!("Loaded settings from {:?}", path); - return Ok(settings); - } - Err(e) => log::warn!("Failed to parse settings file: {}", e), - } - } - Err(e) => log::warn!("Failed to read settings file: {}", e), - } - } - Ok(Settings::default()) -} - -#[command] -pub async fn save_settings(settings: Settings) -> Result<(), String> { - let path = get_settings_file_path(); - log::info!("Saving settings: {:?}", settings); - - let json = serde_json::to_string_pretty(&settings) - .map_err(|e| format!("Failed to serialize settings: {}", e))?; - - fs::write(&path, json) - .map_err(|e| format!("Failed to write settings file: {}", e))?; - - log::info!("Settings saved to {:?}", path); - Ok(()) -} diff --git a/src-tauri/src/cursor.rs b/src-tauri/src/cursor.rs deleted file mode 100644 index 8948374..0000000 --- a/src-tauri/src/cursor.rs +++ /dev/null @@ -1,597 +0,0 @@ -//! Native cursor/mouse capture for macOS and Windows -//! Uses Core Graphics APIs (macOS) or Win32 Raw Input API (Windows) to properly capture mouse input - -use tauri::command; -use std::sync::atomic::{AtomicBool, Ordering}; - -#[cfg(target_os = "windows")] -use crate::raw_input; - -static CURSOR_CAPTURED: AtomicBool = AtomicBool::new(false); - -#[cfg(target_os = "macos")] -mod macos { - use core_graphics::display::{CGDisplay, CGPoint}; - use core_graphics::event::{CGEvent, CGEventType}; - use core_graphics::event_source::{CGEventSource, CGEventSourceStateID}; - - #[link(name = "CoreGraphics", kind = "framework")] - extern "C" { - fn CGAssociateMouseAndMouseCursorPosition(connected: bool) -> i32; - fn CGDisplayHideCursor(display: u32) -> i32; - fn CGDisplayShowCursor(display: u32) -> i32; - fn CGWarpMouseCursorPosition(point: CGPoint) -> i32; - } - - /// Disassociate mouse from cursor position (allows unlimited movement) - pub fn set_mouse_cursor_association(associated: bool) -> bool { - unsafe { - CGAssociateMouseAndMouseCursorPosition(associated) == 0 - } - } - - /// Hide the cursor on the main display - pub fn hide_cursor() -> bool { - unsafe { - CGDisplayHideCursor(CGDisplay::main().id) == 0 - } - } - - /// Show the cursor on the main display - pub fn show_cursor() -> bool { - unsafe { - CGDisplayShowCursor(CGDisplay::main().id) == 0 - } - } - - /// Warp cursor to center of main display - pub fn center_cursor() -> bool { - let display = CGDisplay::main(); - let bounds = display.bounds(); - let center = CGPoint::new( - bounds.origin.x + bounds.size.width / 2.0, - bounds.origin.y + bounds.size.height / 2.0, - ); - unsafe { - CGWarpMouseCursorPosition(center) == 0 - } - } - - /// Warp cursor to a specific position - pub fn warp_cursor(x: f64, y: f64) -> bool { - let point = CGPoint::new(x, y); - unsafe { - CGWarpMouseCursorPosition(point) == 0 - } - } -} - -#[cfg(target_os = "windows")] -mod windows { - use std::ptr::null_mut; - use std::mem::zeroed; - use std::sync::atomic::{AtomicI32, AtomicIsize, AtomicBool, Ordering}; - - // Store window center for recentering - pub static CENTER_X: AtomicI32 = AtomicI32::new(0); - pub static CENTER_Y: AtomicI32 = AtomicI32::new(0); - // Store the original cursor to restore later - pub static ORIGINAL_CURSOR: AtomicIsize = AtomicIsize::new(0); - // Store original mouse acceleration settings - pub static ACCEL_DISABLED: AtomicBool = AtomicBool::new(false); - static mut ORIGINAL_MOUSE_PARAMS: [i32; 3] = [0, 0, 0]; - - #[repr(C)] - #[derive(Copy, Clone)] - struct POINT { - x: i32, - y: i32, - } - - #[repr(C)] - #[derive(Copy, Clone)] - struct RECT { - left: i32, - top: i32, - right: i32, - bottom: i32, - } - - type HWND = *mut std::ffi::c_void; - type HCURSOR = *mut std::ffi::c_void; - type LONG_PTR = isize; - - const GCLP_HCURSOR: i32 = -12; - const IDC_ARROW: *const u16 = 32512 as *const u16; - - // SystemParametersInfo constants for mouse acceleration - const SPI_GETMOUSE: u32 = 0x0003; - const SPI_SETMOUSE: u32 = 0x0004; - const SPIF_SENDCHANGE: u32 = 0x0002; - - #[link(name = "user32")] - unsafe extern "system" { - fn GetCursorPos(lpPoint: *mut POINT) -> i32; - fn SetCursorPos(x: i32, y: i32) -> i32; - fn ShowCursor(bShow: i32) -> i32; - fn ClipCursor(lpRect: *const RECT) -> i32; - fn GetForegroundWindow() -> HWND; - fn GetWindowRect(hWnd: HWND, lpRect: *mut RECT) -> i32; - fn SetCursor(hCursor: HCURSOR) -> HCURSOR; - fn GetClientRect(hWnd: HWND, lpRect: *mut RECT) -> i32; - fn ClientToScreen(hWnd: HWND, lpPoint: *mut POINT) -> i32; - fn GetClassLongPtrW(hWnd: HWND, nIndex: i32) -> LONG_PTR; - fn SetClassLongPtrW(hWnd: HWND, nIndex: i32, dwNewLong: LONG_PTR) -> LONG_PTR; - fn LoadCursorW(hInstance: *mut std::ffi::c_void, lpCursorName: *const u16) -> HCURSOR; - fn SystemParametersInfoW(uiAction: u32, uiParam: u32, pvParam: *mut std::ffi::c_void, fWinIni: u32) -> i32; - } - - /// Disable Windows mouse acceleration (Enhance pointer precision) - /// Stores original settings to restore later - pub fn disable_mouse_acceleration() { - if ACCEL_DISABLED.load(Ordering::SeqCst) { - return; // Already disabled - } - - unsafe { - // Get current mouse parameters [threshold1, threshold2, acceleration] - let mut params: [i32; 3] = [0, 0, 0]; - if SystemParametersInfoW(SPI_GETMOUSE, 0, params.as_mut_ptr() as *mut _, 0) != 0 { - // Save original settings - ORIGINAL_MOUSE_PARAMS = params; - - // Disable acceleration by setting acceleration to 0 - // params[2] is the acceleration flag (0 = disabled, 1 = enabled) - if params[2] != 0 { - let new_params: [i32; 3] = [0, 0, 0]; // Disable acceleration - if SystemParametersInfoW(SPI_SETMOUSE, 0, new_params.as_ptr() as *mut _, SPIF_SENDCHANGE) != 0 { - ACCEL_DISABLED.store(true, Ordering::SeqCst); - log::info!("Mouse acceleration disabled (was: {:?})", ORIGINAL_MOUSE_PARAMS); - } - } else { - log::info!("Mouse acceleration already disabled"); - } - } - } - } - - /// Restore original Windows mouse acceleration settings - pub fn restore_mouse_acceleration() { - if !ACCEL_DISABLED.load(Ordering::SeqCst) { - return; // Not disabled by us - } - - unsafe { - if SystemParametersInfoW(SPI_SETMOUSE, 0, ORIGINAL_MOUSE_PARAMS.as_ptr() as *mut _, SPIF_SENDCHANGE) != 0 { - ACCEL_DISABLED.store(false, Ordering::SeqCst); - log::info!("Mouse acceleration restored to: {:?}", ORIGINAL_MOUSE_PARAMS); - } - } - } - - /// Hide the cursor completely by setting class cursor to NULL - pub fn hide_cursor() { - unsafe { - let hwnd = GetForegroundWindow(); - if !hwnd.is_null() { - // Save original cursor - let original = GetClassLongPtrW(hwnd, GCLP_HCURSOR); - if original != 0 { - ORIGINAL_CURSOR.store(original, Ordering::SeqCst); - } - // Set class cursor to NULL - this prevents cursor from flickering back - SetClassLongPtrW(hwnd, GCLP_HCURSOR, 0); - } - // Also set current cursor to NULL - SetCursor(null_mut()); - // Decrement show counter - let mut count = ShowCursor(0); - while count >= 0 { - count = ShowCursor(0); - } - } - } - - /// Show the cursor by restoring the class cursor - pub fn show_cursor() { - unsafe { - let hwnd = GetForegroundWindow(); - if !hwnd.is_null() { - // Restore original cursor or use arrow - let original = ORIGINAL_CURSOR.load(Ordering::SeqCst); - if original != 0 { - SetClassLongPtrW(hwnd, GCLP_HCURSOR, original); - } else { - // Load default arrow cursor - let arrow = LoadCursorW(null_mut(), IDC_ARROW); - SetClassLongPtrW(hwnd, GCLP_HCURSOR, arrow as LONG_PTR); - } - } - // Increment counter until visible - let mut count = ShowCursor(1); - while count < 0 { - count = ShowCursor(1); - } - } - } - - /// Clip cursor to the foreground window - pub fn clip_cursor_to_window() -> bool { - unsafe { - let hwnd = GetForegroundWindow(); - if hwnd.is_null() { - return false; - } - let mut rect: RECT = zeroed(); - if GetWindowRect(hwnd, &mut rect) == 0 { - return false; - } - ClipCursor(&rect) != 0 - } - } - - /// Release cursor clipping - pub fn release_clip() -> bool { - unsafe { - ClipCursor(null_mut()) != 0 - } - } - - /// Get current cursor position - pub fn get_cursor_pos() -> Option<(i32, i32)> { - unsafe { - let mut point: POINT = zeroed(); - if GetCursorPos(&mut point) != 0 { - Some((point.x, point.y)) - } else { - None - } - } - } - - /// Set cursor position - pub fn set_cursor_pos(x: i32, y: i32) -> bool { - unsafe { - SetCursorPos(x, y) != 0 - } - } - - /// Get window client area center (screen coordinates) - pub fn get_window_center() -> Option<(i32, i32)> { - unsafe { - let hwnd = GetForegroundWindow(); - if hwnd.is_null() { - return None; - } - let mut client_rect: RECT = zeroed(); - if GetClientRect(hwnd, &mut client_rect) == 0 { - return None; - } - // Get center of client area - let mut center = POINT { - x: client_rect.right / 2, - y: client_rect.bottom / 2, - }; - // Convert to screen coordinates - if ClientToScreen(hwnd, &mut center) == 0 { - return None; - } - Some((center.x, center.y)) - } - } - - /// Update stored center position - pub fn update_center() -> bool { - if let Some((x, y)) = get_window_center() { - CENTER_X.store(x, Ordering::SeqCst); - CENTER_Y.store(y, Ordering::SeqCst); - true - } else { - false - } - } - - /// Get stored center position - pub fn get_stored_center() -> (i32, i32) { - (CENTER_X.load(Ordering::SeqCst), CENTER_Y.load(Ordering::SeqCst)) - } - - /// Center cursor in window - pub fn center_cursor() -> bool { - let (cx, cy) = get_stored_center(); - if cx != 0 && cy != 0 { - set_cursor_pos(cx, cy) - } else if let Some((x, y)) = get_window_center() { - CENTER_X.store(x, Ordering::SeqCst); - CENTER_Y.store(y, Ordering::SeqCst); - set_cursor_pos(x, y) - } else { - false - } - } - - /// Get mouse delta from center and recenter cursor - /// Returns (dx, dy) - the movement since last center - pub fn get_delta_and_recenter() -> (i32, i32) { - let (cx, cy) = get_stored_center(); - if cx == 0 && cy == 0 { - return (0, 0); - } - - if let Some((x, y)) = get_cursor_pos() { - let dx = x - cx; - let dy = y - cy; - - // Only recenter if there was movement - if dx != 0 || dy != 0 { - set_cursor_pos(cx, cy); - // Hide cursor again after repositioning - unsafe { SetCursor(null_mut()); } - } - - (dx, dy) - } else { - (0, 0) - } - } -} - -/// Capture the mouse cursor (hide cursor and allow unlimited movement) -/// Uses native OS APIs: Core Graphics on macOS, Win32 on Windows -#[command] -pub async fn capture_cursor() -> Result { - #[cfg(target_os = "macos")] - { - if CURSOR_CAPTURED.load(Ordering::SeqCst) { - return Ok(true); // Already captured - } - - // First, center the cursor - macos::center_cursor(); - - // Hide the cursor - if !macos::hide_cursor() { - return Err("Failed to hide cursor".to_string()); - } - - // Disassociate mouse from cursor position (this is the key!) - // This allows the mouse to move infinitely without hitting screen edges - if !macos::set_mouse_cursor_association(false) { - macos::show_cursor(); // Restore cursor on failure - return Err("Failed to disassociate mouse from cursor".to_string()); - } - - CURSOR_CAPTURED.store(true, Ordering::SeqCst); - log::info!("Cursor captured (macOS native)"); - Ok(true) - } - - #[cfg(target_os = "windows")] - { - if CURSOR_CAPTURED.load(Ordering::SeqCst) { - return Ok(true); // Already captured - } - - // Start raw input to receive hardware mouse deltas - if let Err(e) = raw_input::start_raw_input() { - log::warn!("Failed to start raw input: {}, falling back to recentering", e); - // Fallback to old recentering method - if !windows::update_center() { - return Err("Failed to get window center".to_string()); - } - windows::disable_mouse_acceleration(); - windows::center_cursor(); - } - - // Hide the cursor - windows::hide_cursor(); - - // Clip cursor to window to prevent it from going to other monitors - windows::clip_cursor_to_window(); - - CURSOR_CAPTURED.store(true, Ordering::SeqCst); - log::info!("Cursor captured (Windows native with Raw Input API)"); - Ok(true) - } - - #[cfg(not(any(target_os = "macos", target_os = "windows")))] - { - // On other platforms, return false to indicate native capture not available - Ok(false) - } -} - -/// Release the mouse cursor (show cursor and restore normal behavior) -#[command] -pub async fn release_cursor() -> Result { - #[cfg(target_os = "macos")] - { - if !CURSOR_CAPTURED.load(Ordering::SeqCst) { - return Ok(true); // Already released - } - - // Re-associate mouse with cursor position - macos::set_mouse_cursor_association(true); - - // Show the cursor - macos::show_cursor(); - - // Center cursor so it appears in a reasonable position - macos::center_cursor(); - - CURSOR_CAPTURED.store(false, Ordering::SeqCst); - log::info!("Cursor released (macOS native)"); - Ok(true) - } - - #[cfg(target_os = "windows")] - { - if !CURSOR_CAPTURED.load(Ordering::SeqCst) { - return Ok(true); // Already released - } - - // Pause raw input (keep window alive for quick resume) - raw_input::pause_raw_input(); - - // Restore mouse acceleration settings (if we used fallback) - windows::restore_mouse_acceleration(); - - // Release cursor clipping - windows::release_clip(); - - // Show the cursor - windows::show_cursor(); - - // Center cursor so it appears in a reasonable position - windows::center_cursor(); - - CURSOR_CAPTURED.store(false, Ordering::SeqCst); - log::info!("Cursor released (Windows native)"); - Ok(true) - } - - #[cfg(not(any(target_os = "macos", target_os = "windows")))] - { - Ok(true) - } -} - -/// Check if cursor is currently captured -#[command] -pub async fn is_cursor_captured() -> Result { - Ok(CURSOR_CAPTURED.load(Ordering::SeqCst)) -} - -/// Get mouse delta from center and recenter cursor (Windows only) -/// Returns (dx, dy) - the movement since cursor was last at center -/// This enables FPS-style infinite mouse movement -#[command] -pub fn get_mouse_delta() -> (i32, i32) { - #[cfg(target_os = "windows")] - { - if !CURSOR_CAPTURED.load(Ordering::SeqCst) { - return (0, 0); - } - windows::get_delta_and_recenter() - } - - #[cfg(not(target_os = "windows"))] - { - (0, 0) - } -} - -/// Recenter cursor without getting delta (useful after window resize) -#[command] -pub fn recenter_cursor() -> bool { - #[cfg(target_os = "windows")] - { - if !CURSOR_CAPTURED.load(Ordering::SeqCst) { - return false; - } - // Update center position (in case window moved/resized) - windows::update_center(); - windows::center_cursor() - } - - #[cfg(not(target_os = "windows"))] - { - false - } -} - -/// Start high-frequency mouse polling (Windows only) -/// Now uses Raw Input API for hardware-level mouse deltas -#[command] -pub fn start_mouse_polling() -> bool { - #[cfg(target_os = "windows")] - { - if !CURSOR_CAPTURED.load(Ordering::SeqCst) { - return false; // Need cursor captured first - } - - // Raw input is already started by capture_cursor, just ensure it's active - raw_input::resume_raw_input(); - log::info!("Mouse polling active (Raw Input API)"); - true - } - - #[cfg(not(target_os = "windows"))] - { - false - } -} - -/// Stop high-frequency mouse polling -#[command] -pub fn stop_mouse_polling() { - #[cfg(target_os = "windows")] - { - raw_input::pause_raw_input(); - } -} - -/// Get accumulated mouse deltas and reset accumulators -/// Returns (dx, dy) accumulated since last call -#[command] -pub fn get_accumulated_mouse_delta() -> (i32, i32) { - #[cfg(target_os = "windows")] - { - raw_input::get_raw_mouse_delta() - } - - #[cfg(not(target_os = "windows"))] - { - (0, 0) - } -} - -/// Check if mouse polling is active -#[command] -pub fn is_mouse_polling_active() -> bool { - #[cfg(target_os = "windows")] - { - raw_input::is_raw_input_active() - } - - #[cfg(not(target_os = "windows"))] - { - false - } -} - -/// Clip cursor to the current window (prevents escape) -#[command] -pub fn clip_cursor() -> bool { - #[cfg(target_os = "windows")] - { - let result = windows::clip_cursor_to_window(); - if result { - log::info!("Cursor clipped to window"); - } - result - } - - #[cfg(not(target_os = "windows"))] - { - false - } -} - -/// Release cursor clipping (allow cursor to move freely) -#[command] -pub fn unclip_cursor() -> bool { - #[cfg(target_os = "windows")] - { - let result = windows::release_clip(); - if result { - log::info!("Cursor clip released"); - } - result - } - - #[cfg(not(target_os = "windows"))] - { - true - } -} diff --git a/src-tauri/src/discord.rs b/src-tauri/src/discord.rs deleted file mode 100644 index 780fe18..0000000 --- a/src-tauri/src/discord.rs +++ /dev/null @@ -1,356 +0,0 @@ -use discord_rich_presence::{activity, DiscordIpc, DiscordIpcClient}; -use serde::{Deserialize, Serialize}; -use std::sync::Mutex; -use tauri::command; - -/// Discord Application ID for OpenNOW -/// Created at https://discord.com/developers/applications -const DISCORD_APP_ID: &str = "1453497742662959145"; // Replace with your Discord App ID - -/// GitHub repository URL -const GITHUB_URL: &str = "https://github.com/zortos293/GFNClient"; - -/// Discord presence state -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct PresenceState { - pub enabled: bool, - pub current_game: Option, - pub details: Option, - pub start_time: Option, -} - -/// Global Discord client - using std::sync::Mutex since DiscordIpcClient is not Send -static DISCORD_CLIENT: std::sync::OnceLock>> = - std::sync::OnceLock::new(); - -fn get_discord_client() -> &'static Mutex> { - DISCORD_CLIENT.get_or_init(|| Mutex::new(None)) -} - -/// Initialize Discord Rich Presence -#[command] -pub async fn init_discord() -> Result { - log::info!("Initializing Discord Rich Presence"); - - // Run Discord connection in blocking task since it's not async - let result = tokio::task::spawn_blocking(|| { - let mut client = DiscordIpcClient::new(DISCORD_APP_ID) - .map_err(|e| format!("Failed to create Discord client: {}", e))?; - - match client.connect() { - Ok(_) => { - log::info!("Discord Rich Presence connected"); - - // Set initial presence - let _ = client.set_activity( - activity::Activity::new() - .state("Browsing games") - .assets( - activity::Assets::new() - .large_image("gfn_logo") - .large_text("OpenNOW"), - ) - .buttons(vec![ - activity::Button::new("GitHub", GITHUB_URL), - ]), - ); - - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - *lock = Some(client); - - Ok(true) - } - Err(e) => { - log::warn!("Discord not available: {}", e); - Ok(false) - } - } - }) - .await - .map_err(|e| format!("Task error: {}", e))?; - - result -} - -/// Update Discord presence when playing a game -#[command] -pub async fn set_game_presence( - game_name: String, - region: Option, - resolution: Option, - fps: Option, - latency_ms: Option, -) -> Result<(), String> { - tokio::task::spawn_blocking(move || { - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - - if let Some(client) = lock.as_mut() { - let start_time = std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap() - .as_secs() as i64; - - // Build stats string: "1080p 120fps 15ms" - let mut stats_parts: Vec = Vec::new(); - if let Some(res) = &resolution { - stats_parts.push(res.clone()); - } - if let Some(f) = fps { - stats_parts.push(format!("{}fps", f)); - } - if let Some(ms) = latency_ms { - stats_parts.push(format!("{}ms", ms)); - } - - // State shows region + stats - let state = if let Some(reg) = ®ion { - if stats_parts.is_empty() { - reg.clone() - } else { - format!("{} | {}", reg, stats_parts.join(" ")) - } - } else if !stats_parts.is_empty() { - stats_parts.join(" ") - } else { - "Playing".to_string() - }; - - let activity = activity::Activity::new() - .state(&state) - .details(&game_name) - .assets( - activity::Assets::new() - .large_image("gfn_logo") - .large_text("OpenNOW") - .small_image("playing") - .small_text("Playing"), - ) - .timestamps(activity::Timestamps::new().start(start_time)) - .buttons(vec![ - activity::Button::new("GitHub", GITHUB_URL), - ]); - - client - .set_activity(activity) - .map_err(|e| format!("Failed to set presence: {}", e))?; - - log::info!("Discord presence updated: playing {} ({})", game_name, state); - } - - Ok(()) - }) - .await - .map_err(|e| format!("Task error: {}", e))? -} - -/// Update Discord presence with streaming stats (call periodically during gameplay) -#[command] -pub async fn update_game_stats( - game_name: String, - region: Option, - resolution: Option, - fps: Option, - latency_ms: Option, - start_time: Option, -) -> Result<(), String> { - tokio::task::spawn_blocking(move || { - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - - if let Some(client) = lock.as_mut() { - // Build stats string - let mut stats_parts: Vec = Vec::new(); - if let Some(res) = &resolution { - stats_parts.push(res.clone()); - } - if let Some(f) = fps { - stats_parts.push(format!("{}fps", f)); - } - if let Some(ms) = latency_ms { - stats_parts.push(format!("{}ms", ms)); - } - - let state = if let Some(reg) = ®ion { - if stats_parts.is_empty() { - reg.clone() - } else { - format!("{} | {}", reg, stats_parts.join(" ")) - } - } else if !stats_parts.is_empty() { - stats_parts.join(" ") - } else { - "Playing".to_string() - }; - - // Use provided start_time to preserve elapsed time - let timestamp = start_time.unwrap_or_else(|| { - std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap() - .as_secs() as i64 - }); - - let activity = activity::Activity::new() - .state(&state) - .details(&game_name) - .assets( - activity::Assets::new() - .large_image("gfn_logo") - .large_text("OpenNOW") - .small_image("playing") - .small_text("Playing"), - ) - .timestamps(activity::Timestamps::new().start(timestamp)) - .buttons(vec![ - activity::Button::new("GitHub", GITHUB_URL), - ]); - - client - .set_activity(activity) - .map_err(|e| format!("Failed to set presence: {}", e))?; - } - - Ok(()) - }) - .await - .map_err(|e| format!("Task error: {}", e))? -} - -/// Update Discord presence when in queue -#[command] -pub async fn set_queue_presence( - game_name: String, - queue_position: Option, - eta_seconds: Option, -) -> Result<(), String> { - tokio::task::spawn_blocking(move || { - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - - if let Some(client) = lock.as_mut() { - let state = match queue_position { - Some(pos) => format!("In queue: #{}", pos), - None => "Waiting in queue".to_string(), - }; - - let details = format!("Waiting to play {}", game_name); - let mut activity = activity::Activity::new() - .state(&state) - .details(&details) - .assets( - activity::Assets::new() - .large_image("gfn_logo") - .large_text("OpenNOW") - .small_image("queue") - .small_text("In Queue"), - ) - .buttons(vec![ - activity::Button::new("GitHub", GITHUB_URL), - ]); - - // Add ETA if available - if let Some(eta) = eta_seconds { - let end_time = std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .unwrap() - .as_secs() as i64 - + eta as i64; - activity = activity.timestamps(activity::Timestamps::new().end(end_time)); - } - - client - .set_activity(activity) - .map_err(|e| format!("Failed to set presence: {}", e))?; - - log::info!("Discord presence updated: in queue for {}", game_name); - } - - Ok(()) - }) - .await - .map_err(|e| format!("Task error: {}", e))? -} - -/// Update Discord presence when browsing -#[command] -pub async fn set_browsing_presence() -> Result<(), String> { - tokio::task::spawn_blocking(|| { - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - - if let Some(client) = lock.as_mut() { - client - .set_activity( - activity::Activity::new() - .state("Browsing games") - .assets( - activity::Assets::new() - .large_image("gfn_logo") - .large_text("OpenNOW"), - ) - .buttons(vec![ - activity::Button::new("GitHub", GITHUB_URL), - ]), - ) - .map_err(|e| format!("Failed to set presence: {}", e))?; - - log::info!("Discord presence updated: browsing"); - } - - Ok(()) - }) - .await - .map_err(|e| format!("Task error: {}", e))? -} - -/// Clear Discord presence -#[command] -pub async fn clear_discord_presence() -> Result<(), String> { - tokio::task::spawn_blocking(|| { - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - - if let Some(client) = lock.as_mut() { - client - .clear_activity() - .map_err(|e| format!("Failed to clear presence: {}", e))?; - - log::info!("Discord presence cleared"); - } - - Ok(()) - }) - .await - .map_err(|e| format!("Task error: {}", e))? -} - -/// Disconnect from Discord -#[command] -pub async fn disconnect_discord() -> Result<(), String> { - tokio::task::spawn_blocking(|| { - let guard = get_discord_client(); - let mut lock = guard.lock().map_err(|e| format!("Lock error: {}", e))?; - - if let Some(mut client) = lock.take() { - let _ = client.close(); - log::info!("Discord Rich Presence disconnected"); - } - - Ok::<(), String>(()) - }) - .await - .map_err(|e| format!("Task error: {}", e))? -} - -/// Check if Discord is connected -#[command] -pub async fn is_discord_connected() -> bool { - let guard = get_discord_client(); - let lock = match guard.lock() { - Ok(l) => l, - Err(_) => return false, - }; - lock.is_some() -} diff --git a/src-tauri/src/games.rs b/src-tauri/src/games.rs deleted file mode 100644 index 1acc2ce..0000000 --- a/src-tauri/src/games.rs +++ /dev/null @@ -1,151 +0,0 @@ -use serde::{Deserialize, Serialize}; -use crate::api::{Game, StoreType}; - -/// User's game library -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct GameLibrary { - pub owned_games: Vec, - pub favorites: Vec, // Game IDs - pub recently_played: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct LibraryGame { - pub game: Game, - pub is_favorite: bool, - pub last_played: Option>, - pub total_playtime_minutes: u64, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct RecentGame { - pub game_id: String, - pub title: String, - pub thumbnail: Option, - pub last_played: chrono::DateTime, - pub playtime_minutes: u64, -} - -/// Game categories for browsing -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct GameCategory { - pub id: String, - pub name: String, - pub description: Option, - pub games: Vec, -} - -/// Featured games section -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct FeaturedSection { - pub section_type: FeaturedType, - pub title: String, - pub games: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum FeaturedType { - Hero, // Large hero banner - Featured, // Featured games row - NewReleases, // Newly added games - Popular, // Popular games - FreeToPlay, // Free-to-play games - OptimizedFor, // Games optimized for GFN - Category(String), -} - -/// Store connection status -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct StoreConnection { - pub store_type: StoreType, - pub is_connected: bool, - pub username: Option, - pub game_count: Option, -} - -/// Game launch options -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct LaunchOptions { - pub game_id: String, - pub store_type: StoreType, - pub store_id: String, - /// Preferred server region - pub region: Option, - /// Custom launch parameters - pub launch_params: Option, -} - -impl GameLibrary { - pub fn new() -> Self { - Self { - owned_games: vec![], - favorites: vec![], - recently_played: vec![], - } - } - - pub fn add_favorite(&mut self, game_id: String) { - if !self.favorites.contains(&game_id) { - self.favorites.push(game_id); - } - } - - pub fn remove_favorite(&mut self, game_id: &str) { - self.favorites.retain(|id| id != game_id); - } - - pub fn add_recent(&mut self, game: RecentGame) { - // Remove existing entry for this game - self.recently_played.retain(|g| g.game_id != game.game_id); - - // Add to front - self.recently_played.insert(0, game); - - // Keep only last 20 games - self.recently_played.truncate(20); - } -} - -impl Default for GameLibrary { - fn default() -> Self { - Self::new() - } -} - -/// Deep link URL schemes for launching games -pub mod deep_link { - use super::StoreType; - - /// Generate a deep link URL for launching a game - pub fn generate_launch_url(store_type: &StoreType, store_id: &str) -> String { - match store_type { - StoreType::Steam => format!("steam://run/{}", store_id), - StoreType::Epic => format!("com.epicgames.launcher://apps/{}?action=launch", store_id), - StoreType::Ubisoft => format!("uplay://launch/{}", store_id), - StoreType::Origin => format!("origin://launchgame/{}", store_id), - StoreType::GoG => format!("goggalaxy://openGameView/{}", store_id), - StoreType::Xbox => format!("msxbox://game/?productId={}", store_id), - StoreType::EaApp => format!("origin://launchgame/{}", store_id), - StoreType::Other(_) => format!("gfn://launch/{}", store_id), - } - } - - /// GFN-specific deep link for direct game launch - pub fn generate_gfn_launch_url(game_id: &str, store_type: &StoreType) -> String { - let store_param = match store_type { - StoreType::Steam => "STEAM", - StoreType::Epic => "EPIC", - StoreType::Ubisoft => "UBISOFT", - StoreType::Origin => "ORIGIN", - StoreType::GoG => "GOG", - StoreType::Xbox => "XBOX", - StoreType::EaApp => "EA_APP", - StoreType::Other(name) => name, - }; - - format!( - "geforcenow://game/?game_id={}&store_type={}", - game_id, store_param - ) - } -} diff --git a/src-tauri/src/keyboard_hook.rs b/src-tauri/src/keyboard_hook.rs deleted file mode 100644 index 176569a..0000000 --- a/src-tauri/src/keyboard_hook.rs +++ /dev/null @@ -1,117 +0,0 @@ -// Windows keyboard hook to block Escape key during streaming -// This prevents the browser from exiting pointer lock when ESC is pressed - -#[cfg(windows)] -use std::sync::atomic::{AtomicBool, Ordering}; -#[cfg(windows)] -use std::sync::OnceLock; - -#[cfg(windows)] -use windows::Win32::Foundation::{LPARAM, LRESULT, WPARAM}; -#[cfg(windows)] -use windows::Win32::UI::WindowsAndMessaging::{ - CallNextHookEx, SetWindowsHookExW, UnhookWindowsHookEx, HHOOK, KBDLLHOOKSTRUCT, - WH_KEYBOARD_LL, WM_KEYDOWN, WM_SYSKEYDOWN, -}; -#[cfg(windows)] -use windows::Win32::UI::Input::KeyboardAndMouse::VK_ESCAPE; - -#[cfg(windows)] -static ESCAPE_BLOCKED: AtomicBool = AtomicBool::new(false); -#[cfg(windows)] -static HOOK_HANDLE: OnceLock>> = OnceLock::new(); - -#[cfg(windows)] -unsafe extern "system" fn keyboard_hook_proc(code: i32, wparam: WPARAM, lparam: LPARAM) -> LRESULT { - if code >= 0 && ESCAPE_BLOCKED.load(Ordering::SeqCst) { - let kb_struct = &*(lparam.0 as *const KBDLLHOOKSTRUCT); - - // Check if it's Escape key (VK_ESCAPE = 0x1B = 27) - if kb_struct.vkCode == VK_ESCAPE.0 as u32 { - let msg_type = wparam.0 as u32; - if msg_type == WM_KEYDOWN || msg_type == WM_SYSKEYDOWN { - log::debug!("Blocking Escape key at OS level"); - // Return 1 to block the key - return LRESULT(1); - } - } - } - - // Call next hook in chain - CallNextHookEx(HHOOK::default(), code, wparam, lparam) -} - -#[cfg(windows)] -fn ensure_hook_installed() { - let mutex = HOOK_HANDLE.get_or_init(|| std::sync::Mutex::new(None)); - let mut guard = mutex.lock().unwrap(); - - if guard.is_none() { - unsafe { - let hook = SetWindowsHookExW( - WH_KEYBOARD_LL, - Some(keyboard_hook_proc), - None, - 0, - ); - - match hook { - Ok(h) => { - log::info!("Keyboard hook installed successfully"); - *guard = Some(h); - } - Err(e) => { - log::error!("Failed to install keyboard hook: {:?}", e); - } - } - } - } -} - -#[cfg(windows)] -pub fn block_escape_key(block: bool) { - ensure_hook_installed(); - ESCAPE_BLOCKED.store(block, Ordering::SeqCst); - log::info!("Escape key blocking: {}", if block { "enabled" } else { "disabled" }); -} - -#[cfg(windows)] -pub fn cleanup_hook() { - if let Some(mutex) = HOOK_HANDLE.get() { - let mut guard = mutex.lock().unwrap(); - if let Some(hook) = guard.take() { - unsafe { - let _ = UnhookWindowsHookEx(hook); - log::info!("Keyboard hook removed"); - } - } - } - ESCAPE_BLOCKED.store(false, Ordering::SeqCst); -} - -// Non-Windows stubs -#[cfg(not(windows))] -pub fn block_escape_key(_block: bool) { - log::debug!("Escape key blocking not supported on this platform"); -} - -#[cfg(not(windows))] -pub fn cleanup_hook() {} - -// Tauri commands -#[tauri::command] -pub fn set_escape_block(block: bool) { - block_escape_key(block); -} - -#[tauri::command] -pub fn is_escape_blocked() -> bool { - #[cfg(windows)] - { - ESCAPE_BLOCKED.load(Ordering::SeqCst) - } - #[cfg(not(windows))] - { - false - } -} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs deleted file mode 100644 index 255f929..0000000 --- a/src-tauri/src/lib.rs +++ /dev/null @@ -1,172 +0,0 @@ -// Native client modules (only when native-client feature enabled) -#[cfg(feature = "native-client")] -pub mod native; - -// Logging module (always available) -mod utils; -mod logging; - -// Tauri app modules (only when tauri-app feature enabled) -#[cfg(feature = "tauri-app")] -mod auth; -#[cfg(feature = "tauri-app")] -mod api; -#[cfg(feature = "tauri-app")] -mod games; -#[cfg(feature = "tauri-app")] -mod streaming; -#[cfg(feature = "tauri-app")] -mod config; -#[cfg(feature = "tauri-app")] -mod discord; -#[cfg(feature = "tauri-app")] -mod proxy; -#[cfg(feature = "tauri-app")] -mod cursor; -#[cfg(feature = "tauri-app")] -mod raw_input; -#[cfg(feature = "tauri-app")] -mod recording; - -#[cfg(feature = "tauri-app")] -use tauri::Manager; - -#[cfg(feature = "tauri-app")] -#[cfg_attr(mobile, tauri::mobile_entry_point)] -pub fn run() { - // Initialize custom file logger instead of env_logger - if let Err(e) = logging::init() { - eprintln!("Failed to initialize logger: {}", e); - } - - // Force hardware video acceleration in WebView2 - // This fixes stuttering by enabling GPU-accelerated video decode - #[cfg(target_os = "windows")] - { - let flags = [ - "--enable-features=VaapiVideoDecoder,VaapiVideoEncoder", - "--enable-accelerated-video-decode", - "--enable-accelerated-video-encode", - "--disable-gpu-driver-bug-workarounds", - "--ignore-gpu-blocklist", - "--enable-gpu-rasterization", - "--enable-zero-copy", - "--disable-features=UseChromeOSDirectVideoDecoder", - ].join(" "); - - std::env::set_var("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", &flags); - log::info!("WebView2 hardware acceleration flags set: {}", flags); - } - - tauri::Builder::default() - .plugin(tauri_plugin_shell::init()) - .plugin(tauri_plugin_http::init()) - .plugin(tauri_plugin_store::Builder::new().build()) - .setup(|_app| { - #[cfg(debug_assertions)] - { - if let Some(window) = _app.get_webview_window("main") { - let _ = window.open_devtools(); - } - } - - // Initialize Discord Rich Presence in background - tauri::async_runtime::spawn(async { - if let Err(e) = discord::init_discord().await { - log::warn!("Failed to initialize Discord: {}", e); - } - }); - - Ok(()) - }) - .invoke_handler(tauri::generate_handler![ - // Auth commands - auth::login, - auth::login_oauth, - auth::set_access_token, - auth::get_access_token, - auth::get_gfn_jwt, - auth::logout, - auth::get_auth_status, - auth::refresh_token, - // Multi-region login commands - auth::fetch_login_providers, - auth::set_login_provider, - auth::get_selected_provider, - auth::clear_login_provider, - // API commands - api::fetch_games, - api::fetch_library, - api::fetch_main_games, - api::search_games, - api::search_games_graphql, - api::get_game_details, - api::get_servers, - api::fetch_subscription, - // Dynamic server info commands - api::fetch_server_info, - api::get_cached_server_info, - api::clear_server_info_cache, - // Streaming commands - streaming::start_session, - streaming::stop_session, - streaming::poll_session_until_ready, - streaming::cancel_polling, - streaming::is_polling_active, - streaming::get_queue_status, - streaming::get_webrtc_config, - streaming::start_streaming_flow, - streaming::stop_streaming_flow, - // Session detection commands - streaming::get_active_sessions, - streaming::terminate_session, - streaming::setup_reconnect_session, - streaming::claim_session, - // Config commands - config::get_settings, - config::save_settings, - // Discord commands - discord::init_discord, - discord::set_game_presence, - discord::update_game_stats, - discord::set_queue_presence, - discord::set_browsing_presence, - discord::clear_discord_presence, - discord::disconnect_discord, - discord::is_discord_connected, - // Proxy commands - proxy::get_proxy_settings, - proxy::set_proxy_settings, - proxy::enable_proxy, - proxy::disable_proxy, - proxy::test_proxy, - // Cursor capture commands (macOS and Windows native) - cursor::capture_cursor, - cursor::release_cursor, - cursor::is_cursor_captured, - cursor::get_mouse_delta, - cursor::recenter_cursor, - // High-frequency mouse polling (Windows) - cursor::start_mouse_polling, - cursor::stop_mouse_polling, - cursor::get_accumulated_mouse_delta, - cursor::is_mouse_polling_active, - // Cursor clipping (Windows) - cursor::clip_cursor, - cursor::unclip_cursor, - // Logging commands - logging::log_frontend, - logging::get_log_file_path, - logging::export_logs, - logging::clear_logs, - // Recording commands - recording::get_recordings_dir, - recording::save_recording, - recording::save_screenshot, - recording::open_recordings_folder, - recording::list_recordings, - recording::delete_recording, - ]) - .run(tauri::generate_context!()) - .expect("error while running tauri application"); -} diff --git a/src-tauri/src/logging.rs b/src-tauri/src/logging.rs deleted file mode 100644 index 431e564..0000000 --- a/src-tauri/src/logging.rs +++ /dev/null @@ -1,284 +0,0 @@ -use chrono::Local; -use log::{Level, LevelFilter, Log, Metadata, Record, SetLoggerError}; -use std::fs::{self, File, OpenOptions}; -use std::io::Write; -use std::path::PathBuf; -use std::sync::Mutex; - -#[cfg(feature = "tauri-app")] -use tauri::command; - -// ============================================================================ -// Sensitive Data Sanitization -// ============================================================================ - -/// Sanitize log content by redacting sensitive information -fn sanitize_logs(content: &str) -> String { - let mut sanitized = content.to_string(); - - // Redact JWT tokens (format: xxxxx.xxxxx.xxxxx) - let jwt_regex = regex_lite::Regex::new(r"eyJ[A-Za-z0-9_-]*\.eyJ[A-Za-z0-9_-]*\.[A-Za-z0-9_-]*").unwrap(); - sanitized = jwt_regex.replace_all(&sanitized, "[REDACTED_JWT]").to_string(); - - // Redact Bearer tokens - let bearer_regex = regex_lite::Regex::new(r"(?i)bearer\s+[A-Za-z0-9_\-\.]+").unwrap(); - sanitized = bearer_regex.replace_all(&sanitized, "Bearer [REDACTED]").to_string(); - - // Redact common token patterns in JSON (e.g., "access_token": "value") - let json_token_regex = regex_lite::Regex::new( - r#"(?i)["']?(access_token|refresh_token|id_token|auth_token|token|apikey|api_key|secret|password|nvauthtoken)["']?\s*[:=]\s*["']?[A-Za-z0-9_\-\.]+["']?"# - ).unwrap(); - sanitized = json_token_regex.replace_all(&sanitized, |caps: ®ex_lite::Captures| { - // Extract the key name and redact only the value - let full_match = caps.get(0).unwrap().as_str(); - if let Some(key) = caps.get(1) { - format!("\"{}\":\"[REDACTED]\"", key.as_str()) - } else { - full_match.to_string() - } - }).to_string(); - - // Redact email addresses - let email_regex = regex_lite::Regex::new(r"[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}").unwrap(); - sanitized = email_regex.replace_all(&sanitized, "[REDACTED_EMAIL]").to_string(); - - // Redact long hex strings (potential tokens/keys, 32+ chars) - let hex_regex = regex_lite::Regex::new(r"\b[a-fA-F0-9]{32,}\b").unwrap(); - sanitized = hex_regex.replace_all(&sanitized, "[REDACTED_HEX]").to_string(); - - // Redact base64-like strings that are long (potential tokens, 40+ chars) - let base64_regex = regex_lite::Regex::new(r"\b[A-Za-z0-9+/]{40,}={0,2}\b").unwrap(); - sanitized = base64_regex.replace_all(&sanitized, "[REDACTED_TOKEN]").to_string(); - - // Redact IP addresses (keep for debugging but anonymize last octet) - let ip_regex = regex_lite::Regex::new( - r"\b((?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.(?:25[0-5]|2[0-4]\d|1?\d?\d)\.)(?:25[0-5]|2[0-4]\d|1?\d?\d)\b" - ).unwrap(); - sanitized = ip_regex.replace_all(&sanitized, "${1}xxx").to_string(); - - // Add header noting sanitization - let header = "=== LOGS SANITIZED FOR PRIVACY ===\n\ - === Sensitive data (tokens, emails, etc.) has been redacted ===\n\n"; - - format!("{}{}", header, sanitized) -} - -/// Global file logger instance -static FILE_LOGGER: std::sync::OnceLock = std::sync::OnceLock::new(); - -/// Get the log file path in the user's data directory -pub fn get_log_path() -> PathBuf { - crate::utils::get_app_data_dir().join("opennow.log") -} - -/// Custom file logger that writes to both console and file -pub struct FileLogger { - file: Mutex>, - log_path: PathBuf, -} - -impl FileLogger { - pub fn new() -> Self { - let log_path = get_log_path(); - - // Clear log if it's too large (> 10MB) - if let Ok(metadata) = fs::metadata(&log_path) { - if metadata.len() > 10 * 1024 * 1024 { - // Clear the file instead of rotating - let _ = File::create(&log_path); - } - } - - let file = OpenOptions::new() - .create(true) - .append(true) - .open(&log_path) - .ok(); - - // Write session start marker - if let Some(ref mut f) = file.as_ref() { - let timestamp = Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - let _ = writeln!( - &mut f.try_clone().unwrap(), - "\n========== OpenNOW Session Started at {} ==========\n", - timestamp - ); - } - - FileLogger { - file: Mutex::new(file), - log_path, - } - } - - /// Write a log entry to the file - pub fn write_to_file(&self, level: &str, target: &str, message: &str) { - if let Ok(mut guard) = self.file.lock() { - // Check file size and clear if > 10MB - if let Ok(metadata) = fs::metadata(&self.log_path) { - if metadata.len() > 10 * 1024 * 1024 { - // Reopen file in truncate mode to clear it - if let Ok(new_file) = File::create(&self.log_path) { - *guard = Some(new_file); - if let Some(ref mut f) = *guard { - let timestamp = Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - let _ = writeln!(f, "=== Log cleared (exceeded 10MB) at {} ===\n", timestamp); - } - } - } - } - - if let Some(ref mut file) = *guard { - let timestamp = Local::now().format("%Y-%m-%d %H:%M:%S%.3f"); - let _ = writeln!(file, "[{}] [{}] [{}] {}", timestamp, level, target, message); - let _ = file.flush(); - } - } - } - - /// Get the path to the log file - pub fn path(&self) -> &PathBuf { - &self.log_path - } -} - -impl Log for FileLogger { - fn enabled(&self, metadata: &Metadata) -> bool { - metadata.level() <= Level::Debug - } - - fn log(&self, record: &Record) { - if self.enabled(record.metadata()) { - let level = record.level(); - let target = record.target(); - let message = format!("{}", record.args()); - - // Write to file - self.write_to_file(&level.to_string(), target, &message); - - // Also print to console (stderr for errors/warnings, stdout for others) - let timestamp = Local::now().format("%H:%M:%S%.3f"); - let formatted = format!("[{}] [{}] [{}] {}", timestamp, level, target, message); - - match level { - Level::Error | Level::Warn => eprintln!("{}", formatted), - _ => println!("{}", formatted), - } - } - } - - fn flush(&self) { - if let Ok(mut guard) = self.file.lock() { - if let Some(ref mut file) = *guard { - let _ = file.flush(); - } - } - } -} - -/// Initialize the custom file logger -pub fn init() -> Result<(), SetLoggerError> { - let logger = FILE_LOGGER.get_or_init(FileLogger::new); - - log::set_logger(logger)?; - log::set_max_level(LevelFilter::Debug); - - log::info!("Logging initialized, log file: {:?}", logger.path()); - - Ok(()) -} - -/// Get the global logger instance -pub fn get_logger() -> Option<&'static FileLogger> { - FILE_LOGGER.get() -} - -// ============================================================================ -// Tauri Commands -// ============================================================================ - -/// Log a message from the frontend -#[cfg(feature = "tauri-app")] -#[command] -pub fn log_frontend(level: String, message: String) { - if let Some(logger) = get_logger() { - logger.write_to_file(&level, "frontend", &message); - } - - // Also log through the standard log macros for console output - match level.to_lowercase().as_str() { - "error" => log::error!(target: "frontend", "{}", message), - "warn" => log::warn!(target: "frontend", "{}", message), - "debug" => log::debug!(target: "frontend", "{}", message), - _ => log::info!(target: "frontend", "{}", message), - } -} - -/// Get the current log file path -#[cfg(feature = "tauri-app")] -#[command] -pub fn get_log_file_path() -> Result { - let path = get_log_path(); - path.to_str() - .map(|s| s.to_string()) - .ok_or_else(|| "Failed to get log path".to_string()) -} - -/// Export logs to a user-selected location -#[cfg(feature = "tauri-app")] -#[command] -pub async fn export_logs() -> Result { - let log_path = get_log_path(); - - if !log_path.exists() { - return Err("No log file found".to_string()); - } - - // Generate default filename with timestamp - let timestamp = Local::now().format("%Y%m%d_%H%M%S"); - let default_name = format!("opennow_logs_{}.log", timestamp); - - // Open save dialog using rfd - let save_path = rfd::AsyncFileDialog::new() - .set_title("Export OpenNOW Logs") - .set_file_name(&default_name) - .add_filter("Log Files", &["log", "txt"]) - .save_file() - .await; - - match save_path { - Some(handle) => { - let dest_path = handle.path(); - - // Read the log file content - let content = fs::read_to_string(&log_path) - .map_err(|e| format!("Failed to read log file: {}", e))?; - - // Sanitize sensitive data before exporting - let sanitized_content = sanitize_logs(&content); - - // Write sanitized content to the selected location - fs::write(dest_path, sanitized_content) - .map_err(|e| format!("Failed to write log file: {}", e))?; - - log::info!("Logs exported (sanitized) to: {:?}", dest_path); - - Ok(dest_path.to_string_lossy().to_string()) - } - None => Err("Export cancelled".to_string()), - } -} - -/// Clear the current log file -#[cfg(feature = "tauri-app")] -#[command] -pub fn clear_logs() -> Result<(), String> { - let log_path = get_log_path(); - - // Truncate the file - File::create(&log_path).map_err(|e| format!("Failed to clear logs: {}", e))?; - - log::info!("Log file cleared"); - - Ok(()) -} diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs deleted file mode 100644 index c08841e..0000000 --- a/src-tauri/src/main.rs +++ /dev/null @@ -1,6 +0,0 @@ -// Prevents additional console window on Windows in release -#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] - -fn main() { - opennow_lib::run() -} diff --git a/src-tauri/src/mouse_capture.rs b/src-tauri/src/mouse_capture.rs deleted file mode 100644 index 61bb22d..0000000 --- a/src-tauri/src/mouse_capture.rs +++ /dev/null @@ -1,146 +0,0 @@ -// Native mouse capture - bypasses browser's pointer lock and its "press Esc" message -// Uses Windows raw input API to capture mouse movements - -#[cfg(windows)] -use std::sync::atomic::{AtomicBool, Ordering}; -#[cfg(windows)] -use std::sync::Mutex; - -#[cfg(windows)] -use windows::Win32::Foundation::{HWND, POINT, RECT}; -#[cfg(windows)] -use windows::Win32::UI::WindowsAndMessaging::{ - ClipCursor, GetCursorPos, SetCursorPos, ShowCursor, GetForegroundWindow, - GetWindowRect, -}; - -#[cfg(windows)] -static MOUSE_CAPTURED: AtomicBool = AtomicBool::new(false); -#[cfg(windows)] -static LAST_CURSOR_POS: Mutex> = Mutex::new(None); -#[cfg(windows)] -static CENTER_POS: Mutex> = Mutex::new(None); - -#[cfg(windows)] -pub fn capture_mouse(capture: bool) -> Result<(), String> { - unsafe { - if capture { - // Get the foreground window - let hwnd: HWND = GetForegroundWindow(); - if hwnd.0.is_null() { - return Err("No foreground window".to_string()); - } - - // Get window rect - let mut rect = RECT::default(); - if GetWindowRect(hwnd, &mut rect).is_err() { - return Err("Failed to get window rect".to_string()); - } - - // Calculate center of window - let center_x = (rect.left + rect.right) / 2; - let center_y = (rect.top + rect.bottom) / 2; - - // Store center position - *CENTER_POS.lock().unwrap() = Some((center_x, center_y)); - - // Get current cursor position - let mut pos = POINT::default(); - let _ = GetCursorPos(&mut pos); - *LAST_CURSOR_POS.lock().unwrap() = Some((pos.x, pos.y)); - - // Clip cursor to window - let _ = ClipCursor(Some(&rect)); - - // Hide cursor - ShowCursor(false); - - // Move cursor to center - let _ = SetCursorPos(center_x, center_y); - - MOUSE_CAPTURED.store(true, Ordering::SeqCst); - log::info!("Mouse captured natively, center: ({}, {})", center_x, center_y); - Ok(()) - } else { - // Restore cursor - if let Some((x, y)) = LAST_CURSOR_POS.lock().unwrap().take() { - let _ = SetCursorPos(x, y); - } - - // Unclip cursor - let _ = ClipCursor(None); - - // Show cursor - ShowCursor(true); - - MOUSE_CAPTURED.store(false, Ordering::SeqCst); - *CENTER_POS.lock().unwrap() = None; - log::info!("Mouse released"); - Ok(()) - } - } -} - -#[cfg(windows)] -pub fn get_mouse_delta() -> Option<(i32, i32)> { - if !MOUSE_CAPTURED.load(Ordering::SeqCst) { - return None; - } - - unsafe { - let center = CENTER_POS.lock().unwrap(); - let (center_x, center_y) = center.as_ref()?; - - let mut pos = POINT::default(); - if GetCursorPos(&mut pos).is_err() { - return None; - } - - let delta_x = pos.x - center_x; - let delta_y = pos.y - center_y; - - // Reset cursor to center if it moved - if delta_x != 0 || delta_y != 0 { - let _ = SetCursorPos(*center_x, *center_y); - } - - Some((delta_x, delta_y)) - } -} - -#[cfg(windows)] -pub fn is_mouse_captured() -> bool { - MOUSE_CAPTURED.load(Ordering::SeqCst) -} - -// Non-Windows stubs -#[cfg(not(windows))] -pub fn capture_mouse(_capture: bool) -> Result<(), String> { - Err("Native mouse capture not supported on this platform".to_string()) -} - -#[cfg(not(windows))] -pub fn get_mouse_delta() -> Option<(i32, i32)> { - None -} - -#[cfg(not(windows))] -pub fn is_mouse_captured() -> bool { - false -} - -// Tauri commands -#[tauri::command] -pub fn set_mouse_capture(capture: bool) -> Result<(), String> { - capture_mouse(capture) -} - -#[tauri::command] -pub fn get_native_mouse_delta() -> Option<(i32, i32)> { - get_mouse_delta() -} - -#[tauri::command] -pub fn is_native_mouse_captured() -> bool { - is_mouse_captured() -} diff --git a/src-tauri/src/native/gui.rs b/src-tauri/src/native/gui.rs deleted file mode 100644 index 2a3d015..0000000 --- a/src-tauri/src/native/gui.rs +++ /dev/null @@ -1,1551 +0,0 @@ -//! GFN Native GUI Client -//! -//! A complete GUI application for GeForce NOW streaming. -//! Handles login, game browsing, session launching, and streaming. - -mod input; -mod signaling; -mod webrtc_client; - -use std::sync::Arc; -use std::time::{Duration, Instant}; - -use eframe::egui; -use log::{info, warn, error, debug}; -use parking_lot::Mutex; -use serde::{Deserialize, Serialize}; -use tokio::sync::mpsc; - -use input::{InputEncoder, InputEvent}; -use signaling::{GfnSignaling, SignalingEvent}; -use webrtc_client::{WebRtcClient, WebRtcEvent}; -use webrtc::ice_transport::ice_server::RTCIceServer; -use openh264::formats::YUVSource; - -// ============================================================================ -// Data Structures -// ============================================================================ - -#[derive(Debug, Clone, Serialize, Deserialize)] -struct AuthTokens { - access_token: String, - refresh_token: Option, - expires_at: i64, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -struct GameInfo { - id: String, - title: String, - publisher: Option, - image_url: Option, - store: String, - #[serde(rename = "cmsId")] - cms_id: Option, - #[serde(default)] - app_id: Option, // GFN internal app ID -} - -// CloudMatch API request structure -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct CloudMatchRequest { - session_request_data: SessionRequestData, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct SessionRequestData { - app_id: i64, - internal_title: Option, - available_supported_controllers: Vec, - preferred_controller: i32, - network_test_session_id: Option, - parent_session_id: Option, - client_identification: String, - device_hash_id: String, - client_version: String, - sdk_version: String, - streamer_version: String, - client_platform_name: String, - client_request_monitor_settings: Vec, - use_ops: bool, - audio_mode: i32, - meta_data: Vec, - sdr_hdr_mode: i32, - surround_audio_info: i32, - remote_controllers_bitmap: i32, - client_timezone_offset: i64, - enhanced_stream_mode: i32, - app_launch_mode: i32, - secure_rtsp_supported: bool, - partner_custom_data: Option, - account_linked: bool, - enable_persisting_in_game_settings: bool, - requested_audio_format: i32, - user_age: i32, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct MonitorSettings { - monitor_id: i32, - position_x: i32, - position_y: i32, - width_in_pixels: u32, - height_in_pixels: u32, - dpi: i32, - frames_per_second: u32, - sdr_hdr_mode: i32, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct MetaDataEntry { - key: String, - value: String, -} - -// CloudMatch API response structures -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct CloudMatchResponse { - session: CloudMatchSession, - request_status: RequestStatus, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct CloudMatchSession { - session_id: String, - #[serde(default)] - seat_setup_info: Option, - #[serde(default)] - session_control_info: Option, - #[serde(default)] - connection_info: Option>, - #[serde(default)] - gpu_type: Option, - #[serde(default)] - status: i32, - #[serde(default)] - error_code: i32, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SeatSetupInfo { - #[serde(default)] - queue_position: i32, - #[serde(default)] - seat_setup_eta: i32, - #[serde(default)] - seat_setup_step: i32, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SessionControlInfo { - #[serde(default)] - ip: Option, - #[serde(default)] - port: u16, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ConnectionInfoData { - #[serde(default)] - ip: Option, - #[serde(default)] - port: u16, - #[serde(default)] - resource_path: Option, - #[serde(default)] - usage: i32, // 14 = streaming/signaling server -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct RequestStatus { - status_code: i32, - #[serde(default)] - status_description: Option, - #[serde(default)] - unified_error_code: i32, -} - -#[derive(Debug, Clone)] -struct SessionInfo { - session_id: String, - server_ip: String, - zone: String, - state: SessionState, - gpu_type: Option, - signaling_url: Option, -} - -#[derive(Debug, Clone, PartialEq)] -enum SessionState { - Requesting, // Calling CloudMatch API - Launching, // Session created, seat being set up - InQueue { position: u32, eta_secs: u32 }, - Ready, - Streaming, - Error(String), -} - -// Shared session state for async updates -#[derive(Default)] -struct SessionUpdate { - session: Option, - error: Option, -} - -#[derive(Debug, Clone, PartialEq)] -enum AppScreen { - Login, - Games, - Session, - Streaming, -} - -// ============================================================================ -// App State -// ============================================================================ - -struct GfnGuiApp { - // Runtime - runtime: tokio::runtime::Runtime, - - // Auth - auth_tokens: Option, - login_url: Option, - auth_code: String, - - // Games - shared state for async loading - games: Vec, - games_loading: bool, - games_shared: Arc>>>, - search_query: String, - selected_game: Option, - - // Session - shared state for async session updates - current_session: Option, - session_shared: Arc>, - session_polling: bool, - - // Streaming - streaming_state: Arc>, - input_tx: Option>, - - // UI - current_screen: AppScreen, - status_message: String, - error_message: Option, - - // Texture cache for game images - texture_cache: std::collections::HashMap, -} - -#[derive(Default)] -struct StreamingState { - connected: bool, - video_frame: Option, - frames_received: u64, - status: String, -} - -struct VideoFrame { - width: u32, - height: u32, - pixels: Vec, -} - -impl Default for GfnGuiApp { - fn default() -> Self { - Self { - runtime: tokio::runtime::Runtime::new().unwrap(), - auth_tokens: None, - login_url: None, - auth_code: String::new(), - games: Vec::new(), - games_loading: false, - games_shared: Arc::new(Mutex::new(None)), - search_query: String::new(), - selected_game: None, - current_session: None, - session_shared: Arc::new(Mutex::new(SessionUpdate::default())), - session_polling: false, - streaming_state: Arc::new(Mutex::new(StreamingState::default())), - input_tx: None, - current_screen: AppScreen::Login, - status_message: "Welcome to GFN Native Client".to_string(), - error_message: None, - texture_cache: std::collections::HashMap::new(), - } - } -} - -impl GfnGuiApp { - fn new(_cc: &eframe::CreationContext<'_>) -> Self { - // Load saved tokens if available - let mut app = Self::default(); - - if let Ok(tokens_json) = std::fs::read_to_string("gfn_tokens.json") { - if let Ok(tokens) = serde_json::from_str::(&tokens_json) { - // Check if token is still valid - let now = chrono::Utc::now().timestamp(); - if tokens.expires_at > now { - app.auth_tokens = Some(tokens); - app.current_screen = AppScreen::Games; - app.status_message = "Logged in".to_string(); - app.fetch_games(); - } - } - } - - app - } - - fn save_tokens(&self) { - if let Some(tokens) = &self.auth_tokens { - if let Ok(json) = serde_json::to_string_pretty(tokens) { - let _ = std::fs::write("gfn_tokens.json", json); - } - } - } - - fn logout(&mut self) { - self.auth_tokens = None; - self.games.clear(); - self.current_session = None; - self.current_screen = AppScreen::Login; - let _ = std::fs::remove_file("gfn_tokens.json"); - self.status_message = "Logged out".to_string(); - } - - fn start_oauth_flow(&mut self) { - // Generate PKCE code verifier and challenge - let code_verifier: String = (0..64) - .map(|_| { - let idx = rand::random::() % 62; - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" - .chars() - .nth(idx) - .unwrap() - }) - .collect(); - - use sha2::{Sha256, Digest}; - use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; - - let mut hasher = Sha256::new(); - hasher.update(code_verifier.as_bytes()); - let code_challenge = URL_SAFE_NO_PAD.encode(hasher.finalize()); - - // Build OAuth URL - let client_id = "ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ"; - let redirect_uri = "http://127.0.0.1:8080/callback"; - let scopes = "openid consent email tk_client age"; - - let auth_url = format!( - "https://login.nvidia.com/oauth/authorize?\ - client_id={}&\ - redirect_uri={}&\ - response_type=code&\ - scope={}&\ - code_challenge={}&\ - code_challenge_method=S256", - urlencoding::encode(client_id), - urlencoding::encode(redirect_uri), - urlencoding::encode(scopes), - code_challenge - ); - - self.login_url = Some(auth_url.clone()); - - // Open browser - if let Err(e) = open::that(&auth_url) { - self.error_message = Some(format!("Failed to open browser: {}", e)); - } else { - self.status_message = "Opening browser for login...".to_string(); - } - } - - fn exchange_code_for_tokens(&mut self, code: &str) { - let code = code.to_string(); - let streaming_state = self.streaming_state.clone(); - - self.runtime.spawn(async move { - let client = reqwest::Client::new(); - - let params = [ - ("grant_type", "authorization_code"), - ("code", &code), - ("client_id", "ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ"), - ("redirect_uri", "http://127.0.0.1:8080/callback"), - ]; - - match client - .post("https://login.nvidia.com/oauth/token") - .form(¶ms) - .send() - .await - { - Ok(resp) => { - if let Ok(text) = resp.text().await { - info!("Token response: {}", text); - } - } - Err(e) => { - error!("Token exchange failed: {}", e); - } - } - }); - - self.status_message = "Exchanging code for tokens...".to_string(); - } - - fn set_access_token(&mut self, token: String) { - let expires_at = chrono::Utc::now().timestamp() + 3600 * 24; // 24 hours - self.auth_tokens = Some(AuthTokens { - access_token: token, - refresh_token: None, - expires_at, - }); - self.save_tokens(); - self.current_screen = AppScreen::Games; - self.status_message = "Logged in".to_string(); - self.fetch_games(); - } - - fn fetch_games(&mut self) { - if self.games_loading { - return; - } - - self.games_loading = true; - self.status_message = "Loading games...".to_string(); - - let games_shared = self.games_shared.clone(); - let runtime = self.runtime.handle().clone(); - - // Fetch from static games list (no auth required) - runtime.spawn(async move { - let client = reqwest::Client::new(); - let url = "https://static.nvidiagrid.net/supported-public-game-list/locales/gfnpc-en-US.json"; - - match client.get(url).send().await { - Ok(resp) => { - if let Ok(text) = resp.text().await { - info!("Fetched {} bytes of games data", text.len()); - - // Parse the JSON array of games - if let Ok(games_json) = serde_json::from_str::>(&text) { - let games: Vec = games_json.iter() - .filter_map(|g| { - let title = g.get("title")?.as_str()?.to_string(); - let id = g.get("id") - .and_then(|v| v.as_str()) - .or_else(|| g.get("cmsId").and_then(|v| v.as_str())) - .unwrap_or(&title) - .to_string(); - let publisher = g.get("publisher").and_then(|v| v.as_str()).map(|s| s.to_string()); - let image_url = g.get("imageUrl").and_then(|v| v.as_str()).map(|s| s.to_string()); - let store = g.get("store").and_then(|v| v.as_str()).unwrap_or("Unknown").to_string(); - let cms_id = g.get("cmsId").and_then(|v| v.as_str()).map(|s| s.to_string()); - // Get appId (the GFN internal app ID used for session requests) - let app_id = g.get("appId") - .and_then(|v| v.as_i64()) - .or_else(|| g.get("id").and_then(|v| v.as_i64())); - - Some(GameInfo { - id, - title, - publisher, - image_url, - store, - cms_id, - app_id, - }) - }) - .collect(); - - info!("Parsed {} games", games.len()); - - // Store in shared state - let mut shared = games_shared.lock(); - *shared = Some(games); - } else { - error!("Failed to parse games JSON"); - } - } - } - Err(e) => { - error!("Failed to fetch games: {}", e); - } - } - }); - } - - fn launch_game(&mut self, game: &GameInfo) { - let Some(tokens) = &self.auth_tokens else { - self.error_message = Some("Not logged in".to_string()); - return; - }; - - info!("Launching game: {} (id: {})", game.title, game.id); - - self.selected_game = Some(game.clone()); - self.current_screen = AppScreen::Session; - self.status_message = format!("Requesting session for {}...", game.title); - self.error_message = None; - - // Set initial session state - self.current_session = Some(SessionInfo { - session_id: String::new(), - server_ip: String::new(), - zone: "eu-west".to_string(), - state: SessionState::Requesting, - gpu_type: None, - signaling_url: None, - }); - self.session_polling = true; - - // Start async session request - let access_token = tokens.access_token.clone(); - let game_id = game.id.clone(); - let game_title = game.title.clone(); - let app_id = game.app_id.unwrap_or_else(|| { - // Try to parse game_id as app_id - game.id.parse::().unwrap_or(0) - }); - let session_shared = self.session_shared.clone(); - - self.runtime.spawn(async move { - info!("Starting session request for app_id: {}", app_id); - - match request_gfn_session(&access_token, app_id, &game_title).await { - Ok(session) => { - info!("Session created: {} on {}", session.session_id, session.server_ip); - let mut shared = session_shared.lock(); - shared.session = Some(session); - shared.error = None; - } - Err(e) => { - error!("Session request failed: {}", e); - let mut shared = session_shared.lock(); - shared.error = Some(e); - } - } - }); - } - - fn start_streaming(&mut self, server_ip: String, session_id: String) { - self.current_screen = AppScreen::Streaming; - - let streaming_state = self.streaming_state.clone(); - let (input_tx, input_rx) = mpsc::channel::(256); - self.input_tx = Some(input_tx); - - self.runtime.spawn(async move { - if let Err(e) = run_streaming_session(server_ip, session_id, streaming_state, input_rx).await { - error!("Streaming error: {}", e); - } - }); - } - - fn render_login_screen(&mut self, ui: &mut egui::Ui) { - ui.vertical_centered(|ui| { - ui.add_space(50.0); - - ui.heading("GFN Native Client"); - ui.add_space(20.0); - - ui.label("Login with your NVIDIA account to access GeForce NOW"); - ui.add_space(30.0); - - if ui.button("🔐 Login with NVIDIA").clicked() { - self.start_oauth_flow(); - } - - ui.add_space(20.0); - ui.separator(); - ui.add_space(20.0); - - ui.label("Or paste your access token:"); - ui.add_space(10.0); - - ui.horizontal(|ui| { - ui.text_edit_singleline(&mut self.auth_code); - if ui.button("Set Token").clicked() && !self.auth_code.is_empty() { - let token = self.auth_code.clone(); - self.auth_code.clear(); - self.set_access_token(token); - } - }); - - if let Some(url) = &self.login_url { - ui.add_space(20.0); - ui.label("If browser didn't open, visit:"); - if ui.link(url).clicked() { - let _ = open::that(url); - } - } - }); - } - - fn render_games_screen(&mut self, ui: &mut egui::Ui) { - // Top bar - ui.horizontal(|ui| { - ui.heading("🎮 Games Library"); - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - if ui.button("🚪 Logout").clicked() { - self.logout(); - } - if ui.button("🔄 Refresh").clicked() { - self.fetch_games(); - } - }); - }); - - ui.separator(); - - // Search bar - ui.horizontal(|ui| { - ui.label("🔍"); - ui.text_edit_singleline(&mut self.search_query); - }); - - ui.add_space(10.0); - - // Games grid - if self.games_loading { - ui.centered_and_justified(|ui| { - ui.spinner(); - ui.label("Loading games..."); - }); - } else if self.games.is_empty() { - ui.vertical_centered(|ui| { - ui.add_space(50.0); - ui.label("No games found"); - ui.add_space(10.0); - - // Demo games for testing - ui.label("Demo games (for testing):"); - ui.add_space(10.0); - - let demo_games = vec![ - ("Cyberpunk 2077", "CD Projekt Red"), - ("Fortnite", "Epic Games"), - ("Counter-Strike 2", "Valve"), - ("Destiny 2", "Bungie"), - ]; - - for (title, publisher) in demo_games { - if ui.button(format!("▶ {}", title)).clicked() { - let game = GameInfo { - id: uuid::Uuid::new_v4().to_string(), - title: title.to_string(), - publisher: Some(publisher.to_string()), - image_url: None, - store: "Steam".to_string(), - cms_id: None, - app_id: None, - }; - self.launch_game(&game); - } - } - }); - } else { - // Clone games to avoid borrow issues - let search_lower = self.search_query.to_lowercase(); - let filtered_games: Vec = self.games - .iter() - .filter(|g| { - search_lower.is_empty() || - g.title.to_lowercase().contains(&search_lower) - }) - .cloned() - .collect(); - - let mut clicked_game: Option = None; - - egui::ScrollArea::vertical().show(ui, |ui| { - egui::Grid::new("games_grid") - .num_columns(4) - .spacing([10.0, 10.0]) - .show(ui, |ui| { - for (i, game) in filtered_games.iter().enumerate() { - ui.vertical(|ui| { - // Game card - let response = ui.allocate_response( - egui::vec2(150.0, 200.0), - egui::Sense::click(), - ); - - if response.clicked() { - clicked_game = Some(game.clone()); - } - - let rect = response.rect; - ui.painter().rect_filled( - rect, - 5.0, - egui::Color32::from_rgb(40, 40, 50), - ); - - // Title - ui.painter().text( - rect.center_bottom() - egui::vec2(0.0, 20.0), - egui::Align2::CENTER_BOTTOM, - &game.title, - egui::FontId::proportional(12.0), - egui::Color32::WHITE, - ); - - if response.hovered() { - ui.painter().rect_stroke( - rect, - 5.0, - egui::Stroke::new(2.0, egui::Color32::from_rgb(118, 185, 0)), - ); - } - }); - - if (i + 1) % 4 == 0 { - ui.end_row(); - } - } - }); - }); - - // Handle clicked game after the UI - if let Some(game) = clicked_game { - self.launch_game(&game); - } - } - } - - fn render_session_screen(&mut self, ui: &mut egui::Ui) { - ui.vertical_centered(|ui| { - ui.add_space(50.0); - - if let Some(game) = &self.selected_game { - ui.heading(&game.title); - } - - ui.add_space(30.0); - - if let Some(session) = &self.current_session { - // Show session ID if we have one - if !session.session_id.is_empty() { - ui.label(format!("Session: {}", &session.session_id[..std::cmp::min(8, session.session_id.len())])); - ui.add_space(10.0); - } - - match &session.state { - SessionState::Requesting => { - ui.spinner(); - ui.label("Requesting session from CloudMatch..."); - } - SessionState::Launching => { - ui.spinner(); - ui.label("Setting up session..."); - if let Some(ref gpu) = session.gpu_type { - ui.label(format!("GPU: {}", gpu)); - } - } - SessionState::InQueue { position, eta_secs } => { - ui.spinner(); - ui.label(format!("In queue: position {}", position)); - ui.label(format!("Estimated wait: {} seconds", eta_secs)); - } - SessionState::Ready => { - ui.colored_label(egui::Color32::GREEN, "✅ Session ready!"); - ui.add_space(10.0); - - if let Some(ref gpu) = session.gpu_type { - ui.label(format!("GPU: {}", gpu)); - } - if !session.server_ip.is_empty() { - ui.label(format!("Server: {}", session.server_ip)); - } - - ui.add_space(20.0); - - if ui.button("▶ Start Streaming").clicked() { - let server = session.server_ip.clone(); - let sid = session.session_id.clone(); - self.start_streaming(server, sid); - } - } - SessionState::Streaming => { - ui.label("🎮 Streaming..."); - } - SessionState::Error(e) => { - ui.colored_label(egui::Color32::RED, format!("Error: {}", e)); - ui.add_space(10.0); - if ui.button("Retry").clicked() { - if let Some(game) = self.selected_game.clone() { - self.launch_game(&game); - } - } - } - } - } else { - ui.label("No session"); - } - - ui.add_space(30.0); - - if ui.button("← Back to Games").clicked() { - self.current_session = None; - self.session_polling = false; - self.error_message = None; - self.current_screen = AppScreen::Games; - } - - // Manual connect section - ui.add_space(30.0); - ui.separator(); - ui.add_space(10.0); - ui.label("Manual Connect (for testing):"); - - ui.horizontal(|ui| { - ui.label("Server IP:"); - static mut DEMO_SERVER: String = String::new(); - static mut DEMO_SESSION: String = String::new(); - - unsafe { - ui.text_edit_singleline(&mut DEMO_SERVER); - ui.label("Session ID:"); - ui.text_edit_singleline(&mut DEMO_SESSION); - - if ui.button("Connect").clicked() && !DEMO_SERVER.is_empty() && !DEMO_SESSION.is_empty() { - let server = DEMO_SERVER.clone(); - let session = DEMO_SESSION.clone(); - self.start_streaming(server, session); - } - } - }); - }); - } - - fn render_streaming_screen(&mut self, ctx: &egui::Context, ui: &mut egui::Ui) { - let state = self.streaming_state.lock(); - - // Full screen video - let available = ui.available_size(); - - if let Some(frame) = &state.video_frame { - // Create texture from video frame - let pixels: Vec = frame.pixels.clone(); - let image = egui::ColorImage { - size: [frame.width as usize, frame.height as usize], - pixels, - }; - - let texture = ctx.load_texture( - "video_frame", - image, - egui::TextureOptions::LINEAR, - ); - - ui.image(&texture); - } else { - // Show status overlay - ui.centered_and_justified(|ui| { - ui.vertical_centered(|ui| { - if state.connected { - ui.spinner(); - ui.label("Waiting for video..."); - } else { - ui.label(&state.status); - } - - ui.add_space(20.0); - ui.label(format!("Frames: {}", state.frames_received)); - }); - }); - } - - drop(state); - - // Overlay controls (ESC to exit) - egui::Area::new(egui::Id::new("streaming_overlay")) - .anchor(egui::Align2::LEFT_TOP, [10.0, 10.0]) - .show(ctx, |ui| { - ui.horizontal(|ui| { - if ui.button("⬅ Exit").clicked() { - self.current_screen = AppScreen::Games; - self.input_tx = None; - } - - let state = self.streaming_state.lock(); - if state.connected { - ui.label("🟢 Connected"); - } else { - ui.label("🔴 Connecting..."); - } - }); - }); - } -} - -impl eframe::App for GfnGuiApp { - fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) { - // Check for loaded games from async task - { - let mut games_shared = self.games_shared.lock(); - if let Some(games) = games_shared.take() { - self.games = games; - self.games_loading = false; - self.status_message = format!("Logged in - {} games available", self.games.len()); - } - } - - // Check for session updates from async task - { - let mut session_shared = self.session_shared.lock(); - - // Check for errors - if let Some(error) = session_shared.error.take() { - self.error_message = Some(error.clone()); - self.status_message = format!("Session error: {}", error); - if let Some(ref mut session) = self.current_session { - session.state = SessionState::Error(error); - } - self.session_polling = false; - } - - // Check for session updates - if let Some(new_session) = session_shared.session.take() { - info!("Session update received: {:?}", new_session.state); - - // If session was just created (Launching state), start polling - let should_poll = matches!(new_session.state, SessionState::Launching | SessionState::InQueue { .. }); - let session_id = new_session.session_id.clone(); - let zone = new_session.zone.clone(); - - self.current_session = Some(new_session.clone()); - - match &new_session.state { - SessionState::Ready => { - self.status_message = format!("Session ready! GPU: {}", - new_session.gpu_type.as_deref().unwrap_or("Unknown")); - self.session_polling = false; - } - SessionState::InQueue { position, eta_secs } => { - self.status_message = format!("In queue: position {} (ETA: {}s)", position, eta_secs); - } - SessionState::Launching => { - self.status_message = "Setting up session...".to_string(); - } - _ => {} - } - - // Start polling if session is not ready yet - if should_poll && self.session_polling { - if let Some(tokens) = &self.auth_tokens { - let access_token = tokens.access_token.clone(); - let session_shared = self.session_shared.clone(); - - self.runtime.spawn(async move { - poll_session_status(&access_token, &session_id, &zone, session_shared).await; - }); - } - } - } - } - - // Handle keyboard input for streaming - if self.current_screen == AppScreen::Streaming { - ctx.input(|i| { - if i.key_pressed(egui::Key::Escape) { - self.current_screen = AppScreen::Games; - self.input_tx = None; - } - }); - } - - egui::CentralPanel::default().show(ctx, |ui| { - // Status bar - ui.horizontal(|ui| { - ui.label(&self.status_message); - - if let Some(err) = &self.error_message { - ui.colored_label(egui::Color32::RED, err); - } - }); - ui.separator(); - - // Main content - match self.current_screen { - AppScreen::Login => self.render_login_screen(ui), - AppScreen::Games => self.render_games_screen(ui), - AppScreen::Session => self.render_session_screen(ui), - AppScreen::Streaming => self.render_streaming_screen(ctx, ui), - } - }); - - // Request continuous repaint during streaming, loading games, or session polling - if self.current_screen == AppScreen::Streaming || self.games_loading || self.session_polling { - ctx.request_repaint(); - } - } -} - -// ============================================================================ -// GFN Session API -// ============================================================================ - -/// Request a new GFN session via CloudMatch API -async fn request_gfn_session( - access_token: &str, - app_id: i64, - game_title: &str, -) -> Result { - info!("Requesting GFN session for app_id: {}, title: {}", app_id, game_title); - - let client = reqwest::Client::builder() - .danger_accept_invalid_certs(true) // GFN servers may have self-signed certs - .build() - .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - - let zone = "eu-west"; // TODO: Make configurable - let device_id = uuid::Uuid::new_v4().to_string(); - let client_id = uuid::Uuid::new_v4().to_string(); - let sub_session_id = uuid::Uuid::new_v4().to_string(); - - // Build CloudMatch request - let request = CloudMatchRequest { - session_request_data: SessionRequestData { - app_id, - internal_title: Some(game_title.to_string()), - available_supported_controllers: vec![], - preferred_controller: 0, - network_test_session_id: Some("00000000-0000-0000-0000-000000000000".to_string()), - parent_session_id: None, - client_identification: "GFN-PC".to_string(), - device_hash_id: device_id.clone(), - client_version: "30.0".to_string(), - sdk_version: "1.0".to_string(), - streamer_version: "1".to_string(), - client_platform_name: "windows".to_string(), - client_request_monitor_settings: vec![MonitorSettings { - monitor_id: 0, - position_x: 0, - position_y: 0, - width_in_pixels: 1920, - height_in_pixels: 1080, - dpi: 96, - frames_per_second: 60, - sdr_hdr_mode: 0, - }], - use_ops: false, - audio_mode: 0, - meta_data: vec![ - MetaDataEntry { key: "SubSessionId".to_string(), value: sub_session_id }, - MetaDataEntry { key: "wssignaling".to_string(), value: "1".to_string() }, - MetaDataEntry { key: "GSStreamerType".to_string(), value: "WebRTC".to_string() }, - MetaDataEntry { key: "networkType".to_string(), value: "Unknown".to_string() }, - ], - sdr_hdr_mode: 0, - surround_audio_info: 0, - remote_controllers_bitmap: 0, - client_timezone_offset: 0, - enhanced_stream_mode: 1, - app_launch_mode: 1, - secure_rtsp_supported: false, - partner_custom_data: Some("".to_string()), - account_linked: false, - enable_persisting_in_game_settings: true, // Enable persistent in-game settings - requested_audio_format: 0, - user_age: 0, - }, - }; - - let session_url = format!( - "https://{}.cloudmatchbeta.nvidiagrid.net/v2/session?keyboardLayout=en-US&languageCode=en_US", - zone - ); - - info!("Sending session request to: {}", session_url); - - let response = client - .post(&session_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("nv-browser-type", "CHROME") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-client-type", "NATIVE") - .header("nv-client-version", "2.0.80.173") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP") - .header("x-device-id", &device_id) - .json(&request) - .send() - .await - .map_err(|e| format!("Request failed: {}", e))?; - - let status = response.status(); - let response_text = response.text().await - .map_err(|e| format!("Failed to read response: {}", e))?; - - info!("CloudMatch response status: {}", status); - info!("CloudMatch response: {}", &response_text[..std::cmp::min(500, response_text.len())]); - - if !status.is_success() { - return Err(format!("CloudMatch request failed: {} - {}", status, response_text)); - } - - let api_response: CloudMatchResponse = serde_json::from_str(&response_text) - .map_err(|e| format!("Failed to parse response: {} - {}", e, &response_text[..std::cmp::min(200, response_text.len())]))?; - - if api_response.request_status.status_code != 1 { - let error_desc = api_response.request_status.status_description - .unwrap_or_else(|| "Unknown error".to_string()); - return Err(format!("CloudMatch error: {} (code: {})", - error_desc, api_response.request_status.status_code)); - } - - let session_data = api_response.session; - info!("Session allocated: {} (status: {})", session_data.session_id, session_data.status); - - // Determine session state - let state = if session_data.status == 2 { - SessionState::Ready - } else if let Some(ref seat_info) = session_data.seat_setup_info { - if seat_info.queue_position > 0 { - SessionState::InQueue { - position: seat_info.queue_position as u32, - eta_secs: (seat_info.seat_setup_eta / 1000) as u32, - } - } else { - SessionState::Launching - } - } else { - SessionState::Launching - }; - - // Use connection_info with usage=14 for streaming (the WebRTC signaling server) - let streaming_conn = session_data.connection_info - .as_ref() - .and_then(|conns| conns.iter().find(|c| c.usage == 14)); - - let server_ip = streaming_conn - .and_then(|conn| conn.ip.clone()) - .or_else(|| session_data.session_control_info.as_ref().and_then(|sci| sci.ip.clone())) - .unwrap_or_default(); - - let signaling_url = streaming_conn - .and_then(|conn| conn.resource_path.clone()); - - info!("Stream server IP: {}, signaling path: {:?}", server_ip, signaling_url); - - // Debug: log all connection_info entries - if let Some(conns) = &session_data.connection_info { - for (i, c) in conns.iter().enumerate() { - info!(" connection_info[{}]: ip={:?}, port={}, usage={}, path={:?}", - i, c.ip, c.port, c.usage, c.resource_path); - } - } - - Ok(SessionInfo { - session_id: session_data.session_id, - server_ip, - zone: zone.to_string(), - state, - gpu_type: session_data.gpu_type, - signaling_url, - }) -} - -/// Poll session status until ready -async fn poll_session_status( - access_token: &str, - session_id: &str, - zone: &str, - session_shared: Arc>, -) { - info!("Starting session polling for: {}", session_id); - - let client = reqwest::Client::builder() - .danger_accept_invalid_certs(true) - .build() - .unwrap(); - - let poll_url = format!( - "https://{}.cloudmatchbeta.nvidiagrid.net/v2/session/{}", - zone, session_id - ); - - let device_id = uuid::Uuid::new_v4().to_string(); - let client_id = uuid::Uuid::new_v4().to_string(); - - for poll_count in 0..120 { // Max 3 minutes - tokio::time::sleep(tokio::time::Duration::from_millis(1500)).await; - - let response = match client - .get(&poll_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-client-type", "NATIVE") - .header("x-device-id", &device_id) - .send() - .await - { - Ok(r) => r, - Err(e) => { - error!("Poll request failed: {}", e); - continue; - } - }; - - let response_text = match response.text().await { - Ok(t) => t, - Err(e) => { - error!("Failed to read poll response: {}", e); - continue; - } - }; - - let poll_response: CloudMatchResponse = match serde_json::from_str(&response_text) { - Ok(r) => r, - Err(e) => { - error!("Failed to parse poll response: {}", e); - continue; - } - }; - - if poll_response.request_status.status_code != 1 { - let error = poll_response.request_status.status_description - .unwrap_or_else(|| "Unknown error".to_string()); - error!("Session poll error: {}", error); - let mut shared = session_shared.lock(); - shared.error = Some(error); - return; - } - - let session = poll_response.session; - let status = session.status; - let seat_info = session.seat_setup_info.as_ref(); - let step = seat_info.map(|s| s.seat_setup_step).unwrap_or(0); - let queue_pos = seat_info.map(|s| s.queue_position).unwrap_or(0); - let eta = seat_info.map(|s| s.seat_setup_eta).unwrap_or(0); - - info!("Poll {}: status={}, step={}, queue={}, eta={}ms, gpu={:?}", - poll_count, status, step, queue_pos, eta, session.gpu_type); - - // Status 2 = ready - if status == 2 { - info!("Session ready! GPU: {:?}", session.gpu_type); - - // Debug: log all connection_info entries - if let Some(conns) = &session.connection_info { - for (i, c) in conns.iter().enumerate() { - info!(" connection_info[{}]: ip={:?}, port={}, usage={}, path={:?}", - i, c.ip, c.port, c.usage, c.resource_path); - } - } - - // Use connection_info with usage=14 for streaming (the WebRTC signaling server) - let streaming_conn = session.connection_info - .as_ref() - .and_then(|conns| conns.iter().find(|c| c.usage == 14)); - - let server_ip = streaming_conn - .and_then(|conn| conn.ip.clone()) - .or_else(|| session.session_control_info.as_ref().and_then(|c| c.ip.clone())) - .unwrap_or_default(); - - let signaling_url = streaming_conn - .and_then(|conn| conn.resource_path.clone()); - - info!("Stream server: {}, signaling: {:?}", server_ip, signaling_url); - - let mut shared = session_shared.lock(); - shared.session = Some(SessionInfo { - session_id: session.session_id, - server_ip, - zone: zone.to_string(), - state: SessionState::Ready, - gpu_type: session.gpu_type, - signaling_url, - }); - return; - } - - // Update queue position - if queue_pos > 0 { - let mut shared = session_shared.lock(); - if let Some(ref mut s) = shared.session { - s.state = SessionState::InQueue { - position: queue_pos as u32, - eta_secs: (eta / 1000) as u32, - }; - } - } - - // Status <= 0 with error_code != 1 = failed - if status <= 0 && session.error_code != 1 { - let mut shared = session_shared.lock(); - shared.error = Some(format!("Session failed with error code: {}", session.error_code)); - return; - } - } - - let mut shared = session_shared.lock(); - shared.error = Some("Session polling timeout".to_string()); -} - -// ============================================================================ -// Streaming Logic -// ============================================================================ - -async fn run_streaming_session( - server: String, - session_id: String, - state: Arc>, - mut input_rx: mpsc::Receiver, -) -> anyhow::Result<()> { - info!("Starting streaming to {} with session {}", server, session_id); - - { - let mut s = state.lock(); - s.status = "Connecting to signaling...".to_string(); - } - - // Create signaling client - let (sig_tx, mut sig_rx) = mpsc::channel::(64); - let mut signaling = GfnSignaling::new(server.clone(), session_id.clone(), sig_tx); - - // Connect - signaling.connect().await?; - info!("Signaling connected"); - - { - let mut s = state.lock(); - s.status = "Waiting for offer...".to_string(); - } - - // WebRTC client - let (webrtc_tx, mut webrtc_rx) = mpsc::channel::(64); - let mut webrtc_client = WebRtcClient::new(webrtc_tx); - - // Input encoder - let mut input_encoder = InputEncoder::new(); - - // H.264 decoder - let mut decoder = openh264::decoder::Decoder::new().ok(); - - loop { - tokio::select! { - Some(event) = sig_rx.recv() => { - match event { - SignalingEvent::SdpOffer(sdp) => { - info!("Received SDP offer, length: {}", sdp.len()); - - // Resolve server hostname to IP - let mut server_ip_str = String::new(); - let server_clone = server.clone(); - if let Ok(addrs) = tokio::net::lookup_host(format!("{}:443", server_clone)).await { - for addr in addrs { - if addr.is_ipv4() { - server_ip_str = addr.ip().to_string(); - break; - } - } - } - info!("Resolved server IP: {}", server_ip_str); - - // Modify SDP to replace 0.0.0.0 with actual server IP - // and add ICE candidates directly to the SDP - let modified_sdp = if !server_ip_str.is_empty() { - // Extract port from first media line - let server_port: u16 = sdp.lines() - .find(|l| l.starts_with("m=")) - .and_then(|l| l.split_whitespace().nth(1)) - .and_then(|p| p.parse().ok()) - .unwrap_or(47998); - - // Replace 0.0.0.0 with actual server IP - let sdp_with_ip = sdp.replace("c=IN IP4 0.0.0.0", &format!("c=IN IP4 {}", server_ip_str)); - - // Add ICE candidate to each media section - let candidate_line = format!( - "a=candidate:1 1 udp 2130706431 {} {} typ host\r\n", - server_ip_str, server_port - ); - - // Insert candidate after each c= line - let mut result = String::new(); - for line in sdp_with_ip.lines() { - result.push_str(line); - result.push_str("\r\n"); - if line.starts_with("c=IN IP4") { - result.push_str(&candidate_line); - } - } - - info!("Modified SDP with server IP and candidates"); - result - } else { - warn!("Could not resolve server IP, using original SDP"); - sdp.clone() - }; - - // Log key SDP lines for debugging - info!("=== Modified SDP Offer ==="); - for line in modified_sdp.lines() { - if line.starts_with("m=") || line.starts_with("c=") || - line.starts_with("a=ice") || line.starts_with("a=candidate") { - info!(" {}", line); - } - } - info!("=== End SDP ==="); - - // For GFN ice-lite, don't use external STUN servers - let ice_servers = vec![]; - - match webrtc_client.handle_offer(&modified_sdp, ice_servers).await { - Ok(answer) => { - info!("Generated answer, length: {}", answer.len()); - - // Log our candidates - let our_candidates: Vec<&str> = answer.lines() - .filter(|l| l.starts_with("a=candidate:")) - .collect(); - info!("Our ICE candidates in answer: {}", our_candidates.len()); - - let _ = signaling.send_answer(&answer, None).await; - let _ = webrtc_client.create_input_channel().await; - } - Err(e) => { - error!("Failed to handle offer: {}", e); - } - } - } - SignalingEvent::IceCandidate(c) => { - let _ = webrtc_client.add_ice_candidate( - &c.candidate, - c.sdp_mid.as_deref(), - c.sdp_mline_index.map(|i| i as u16), - ).await; - } - SignalingEvent::Disconnected(_) => { - // Signaling WebSocket closed - this is expected for ice-lite - // Continue running to handle WebRTC events - info!("Signaling disconnected (expected for ice-lite mode)"); - } - _ => {} - } - } - - Some(event) = webrtc_rx.recv() => { - match event { - WebRtcEvent::Connected => { - let mut s = state.lock(); - s.connected = true; - s.status = "Connected".to_string(); - } - WebRtcEvent::VideoFrame(data) => { - let mut s = state.lock(); - s.frames_received += 1; - - // Decode H.264 - if let Some(ref mut dec) = decoder { - let data = if data.len() >= 4 && data[0..4] == [0, 0, 0, 1] { - data - } else { - let mut with_start = vec![0, 0, 0, 1]; - with_start.extend_from_slice(&data); - with_start - }; - - if let Ok(Some(yuv)) = dec.decode(&data) { - let (w, h) = yuv.dimensions(); - let y = yuv.y(); - let u = yuv.u(); - let v = yuv.v(); - let (ys, us, vs) = yuv.strides(); - - let mut pixels = Vec::with_capacity(w * h); - for row in 0..h { - for col in 0..w { - let yi = row * ys + col; - let ui = (row/2) * us + col/2; - let vi = (row/2) * vs + col/2; - - let yv = y.get(yi).copied().unwrap_or(0) as f32; - let uv = u.get(ui).copied().unwrap_or(128) as f32 - 128.0; - let vv = v.get(vi).copied().unwrap_or(128) as f32 - 128.0; - - let r = (yv + 1.402 * vv).clamp(0.0, 255.0) as u8; - let g = (yv - 0.344 * uv - 0.714 * vv).clamp(0.0, 255.0) as u8; - let b = (yv + 1.772 * uv).clamp(0.0, 255.0) as u8; - - pixels.push(egui::Color32::from_rgb(r, g, b)); - } - } - - s.video_frame = Some(VideoFrame { - width: w as u32, - height: h as u32, - pixels, - }); - } - } - } - WebRtcEvent::DataChannelMessage(_, data) => { - if data.len() == 4 && data[0] == 0x0e { - let _ = webrtc_client.send_handshake_response(data[1], data[2], data[3]).await; - } - } - WebRtcEvent::IceCandidate(c, mid, idx) => { - let _ = signaling.send_ice_candidate(&c, mid.as_deref(), idx.map(|i| i as u32)).await; - } - _ => {} - } - } - - Some(event) = input_rx.recv() => { - if webrtc_client.is_handshake_complete() { - let encoded = input_encoder.encode(&event); - let _ = webrtc_client.send_input(&encoded).await; - } - } - - else => break, - } - } - - Ok(()) -} - -// ============================================================================ -// Main -// ============================================================================ - -fn main() -> eframe::Result<()> { - env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init(); - - let options = eframe::NativeOptions { - viewport: egui::ViewportBuilder::default() - .with_inner_size([1280.0, 720.0]) - .with_min_inner_size([800.0, 600.0]) - .with_title("GFN Native Client"), - ..Default::default() - }; - - eframe::run_native( - "GFN Native Client", - options, - Box::new(|cc| Ok(Box::new(GfnGuiApp::new(cc)))), - ) -} diff --git a/src-tauri/src/native/input.rs b/src-tauri/src/native/input.rs deleted file mode 100644 index 63a66ac..0000000 --- a/src-tauri/src/native/input.rs +++ /dev/null @@ -1,239 +0,0 @@ -//! GFN Input Protocol Encoder -//! -//! Binary protocol format discovered from vendor.js: -//! - Event type: 4 bytes, Little Endian -//! - Data fields: Big Endian -//! - Timestamp: 8 bytes, Big Endian, in microseconds - -use bytes::{BytesMut, BufMut}; - -/// Input event type constants -pub const INPUT_HEARTBEAT: u32 = 2; -pub const INPUT_KEY_UP: u32 = 3; -pub const INPUT_KEY_DOWN: u32 = 4; -pub const INPUT_MOUSE_ABS: u32 = 5; -pub const INPUT_MOUSE_REL: u32 = 7; -pub const INPUT_MOUSE_BUTTON_DOWN: u32 = 8; -pub const INPUT_MOUSE_BUTTON_UP: u32 = 9; -pub const INPUT_MOUSE_WHEEL: u32 = 10; - -/// Input events that can be sent to the server -#[derive(Debug, Clone)] -pub enum InputEvent { - /// Keyboard key pressed - KeyDown { - keycode: u16, - scancode: u16, - modifiers: u16, - timestamp_us: u64, - }, - /// Keyboard key released - KeyUp { - keycode: u16, - scancode: u16, - modifiers: u16, - timestamp_us: u64, - }, - /// Mouse moved (relative) - MouseMove { - dx: i16, - dy: i16, - timestamp_us: u64, - }, - /// Mouse button pressed - MouseButtonDown { - button: u8, - timestamp_us: u64, - }, - /// Mouse button released - MouseButtonUp { - button: u8, - timestamp_us: u64, - }, - /// Mouse wheel scrolled - MouseWheel { - delta: i16, - timestamp_us: u64, - }, - /// Heartbeat (keep-alive) - Heartbeat, -} - -/// Encoder for GFN input protocol -pub struct InputEncoder { - buffer: BytesMut, -} - -impl InputEncoder { - pub fn new() -> Self { - Self { - buffer: BytesMut::with_capacity(256), - } - } - - /// Encode an input event to binary format - /// - /// Format from vendor.js analysis: - /// - Type: 4 bytes LE - /// - Data: varies by type, Big Endian for multi-byte values - /// - Timestamp: 8 bytes BE, microseconds - pub fn encode(&mut self, event: &InputEvent) -> Vec { - self.buffer.clear(); - - match event { - InputEvent::KeyDown { keycode, scancode, modifiers, timestamp_us } => { - // Keyboard (Yc): 18 bytes - // [type 4B LE][keycode 2B BE][modifiers 2B BE][scancode 2B BE][timestamp 8B BE] - self.buffer.put_u32_le(INPUT_KEY_DOWN); - self.buffer.put_u16(*keycode); // BE (default) - self.buffer.put_u16(*modifiers); // BE - self.buffer.put_u16(*scancode); // BE - self.buffer.put_u64(*timestamp_us); // BE - } - - InputEvent::KeyUp { keycode, scancode, modifiers, timestamp_us } => { - // Same format as KeyDown but with type 3 - self.buffer.put_u32_le(INPUT_KEY_UP); - self.buffer.put_u16(*keycode); - self.buffer.put_u16(*modifiers); - self.buffer.put_u16(*scancode); - self.buffer.put_u64(*timestamp_us); - } - - InputEvent::MouseMove { dx, dy, timestamp_us } => { - // Mouse Relative (Gc): 22 bytes - // [type 4B LE][dx 2B BE][dy 2B BE][reserved 2B][reserved 4B][timestamp 8B BE] - self.buffer.put_u32_le(INPUT_MOUSE_REL); - self.buffer.put_i16(*dx); // BE - self.buffer.put_i16(*dy); // BE - self.buffer.put_u16(0); // Reserved - self.buffer.put_u32(0); // Reserved - self.buffer.put_u64(*timestamp_us); // BE - } - - InputEvent::MouseButtonDown { button, timestamp_us } => { - // Mouse Button (xc): 18 bytes - // [type 4B LE][button 1B][pad 1B][reserved 4B][timestamp 8B BE] - self.buffer.put_u32_le(INPUT_MOUSE_BUTTON_DOWN); - self.buffer.put_u8(*button); - self.buffer.put_u8(0); // Padding - self.buffer.put_u32(0); // Reserved - self.buffer.put_u64(*timestamp_us); // BE - } - - InputEvent::MouseButtonUp { button, timestamp_us } => { - // Same format as MouseButtonDown but with type 9 - self.buffer.put_u32_le(INPUT_MOUSE_BUTTON_UP); - self.buffer.put_u8(*button); - self.buffer.put_u8(0); - self.buffer.put_u32(0); - self.buffer.put_u64(*timestamp_us); - } - - InputEvent::MouseWheel { delta, timestamp_us } => { - // Mouse Wheel (Lc): 22 bytes - // [type 4B LE][horiz 2B BE][vert 2B BE][reserved 2B BE][reserved 4B][timestamp 8B BE] - self.buffer.put_u32_le(INPUT_MOUSE_WHEEL); - self.buffer.put_i16(0); // Horizontal (unused) - self.buffer.put_i16(-*delta); // Vertical (negated per vendor.js) - self.buffer.put_u16(0); // Reserved - self.buffer.put_u32(0); // Reserved - self.buffer.put_u64(*timestamp_us); // BE - } - - InputEvent::Heartbeat => { - // Heartbeat (Jc): 4 bytes - // [type 4B LE] - self.buffer.put_u32_le(INPUT_HEARTBEAT); - } - } - - self.buffer.to_vec() - } - - /// Encode the protocol handshake response - /// - /// When server sends [0x0e, major, minor, flags], we echo it back - pub fn encode_handshake_response(major: u8, minor: u8, flags: u8) -> Vec { - vec![0x0e, major, minor, flags] - } -} - -impl Default for InputEncoder { - fn default() -> Self { - Self::new() - } -} - -#[cfg(test)] -mod tests { - use super::*; - - #[test] - fn test_mouse_move_encoding() { - let mut encoder = InputEncoder::new(); - let event = InputEvent::MouseMove { - dx: -1, - dy: 5, - timestamp_us: 1000000, // 1 second - }; - - let encoded = encoder.encode(&event); - - assert_eq!(encoded.len(), 22); - // Type 7 in LE - assert_eq!(&encoded[0..4], &[0x07, 0x00, 0x00, 0x00]); - // dx = -1 in BE = 0xFFFF - assert_eq!(&encoded[4..6], &[0xFF, 0xFF]); - // dy = 5 in BE - assert_eq!(&encoded[6..8], &[0x00, 0x05]); - } - - #[test] - fn test_mouse_button_encoding() { - let mut encoder = InputEncoder::new(); - let event = InputEvent::MouseButtonDown { - button: 0, - timestamp_us: 500000, - }; - - let encoded = encoder.encode(&event); - - assert_eq!(encoded.len(), 18); - // Type 8 in LE - assert_eq!(&encoded[0..4], &[0x08, 0x00, 0x00, 0x00]); - // Button 0 - assert_eq!(encoded[4], 0x00); - } - - #[test] - fn test_keyboard_encoding() { - let mut encoder = InputEncoder::new(); - let event = InputEvent::KeyDown { - keycode: 68, // 'D' - scancode: 0, - modifiers: 0, - timestamp_us: 750000, - }; - - let encoded = encoder.encode(&event); - - assert_eq!(encoded.len(), 18); - // Type 4 in LE (keydown) - assert_eq!(&encoded[0..4], &[0x04, 0x00, 0x00, 0x00]); - // Keycode 68 in BE - assert_eq!(&encoded[4..6], &[0x00, 0x44]); - } - - #[test] - fn test_heartbeat_encoding() { - let mut encoder = InputEncoder::new(); - let event = InputEvent::Heartbeat; - - let encoded = encoder.encode(&event); - - assert_eq!(encoded.len(), 4); - // Type 2 in LE - assert_eq!(&encoded[0..4], &[0x02, 0x00, 0x00, 0x00]); - } -} diff --git a/src-tauri/src/native/main.rs b/src-tauri/src/native/main.rs deleted file mode 100644 index ecb1212..0000000 --- a/src-tauri/src/native/main.rs +++ /dev/null @@ -1,970 +0,0 @@ -//! GFN Native Streaming Client -//! -//! A full-featured native client for GeForce NOW streaming. -//! Handles signaling, WebRTC, video decoding, audio playback, and input. - -mod input; -mod signaling; -mod webrtc_client; - -use std::num::NonZeroU32; -use std::sync::Arc; -use std::time::Instant; - -use anyhow::Result; -use openh264::formats::YUVSource; -use clap::Parser; -use log::{info, warn, error, debug}; -use parking_lot::Mutex; -use tokio::sync::mpsc; -use winit::application::ApplicationHandler; -use winit::dpi::LogicalSize; -use winit::event::{DeviceEvent, ElementState, WindowEvent, MouseButton}; -use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop}; -use winit::keyboard::{KeyCode, PhysicalKey}; -use winit::window::{CursorGrabMode, Window, WindowId}; - -use input::{InputEncoder, InputEvent}; -use signaling::{GfnSignaling, SignalingEvent, IceCandidate}; -use webrtc_client::{WebRtcClient, WebRtcEvent}; -use webrtc::ice_transport::ice_server::RTCIceServer; - -/// GFN Native Streaming Client -#[derive(Parser, Debug, Clone)] -#[command(author, version, about, long_about = None)] -struct Args { - /// GFN streaming server IP address - #[arg(short, long)] - server: String, - - /// Session ID from GFN - #[arg(short = 'i', long)] - session_id: String, - - /// Window width - #[arg(long, default_value = "1920")] - width: u32, - - /// Window height - #[arg(long, default_value = "1080")] - height: u32, - - /// Enable debug logging - #[arg(short, long)] - debug: bool, -} - -/// Video frame for rendering -struct VideoFrame { - width: u32, - height: u32, - data: Vec, // ARGB pixels -} - -/// Shared state between async tasks and window -struct SharedState { - video_frame: Option, - connected: bool, - signaling_connected: bool, - webrtc_connected: bool, - input_ready: bool, - stats: StreamingStats, - status_message: String, -} - -impl Default for SharedState { - fn default() -> Self { - Self { - video_frame: None, - connected: false, - signaling_connected: false, - webrtc_connected: false, - input_ready: false, - stats: StreamingStats::default(), - status_message: "Initializing...".to_string(), - } - } -} - -#[derive(Default)] -struct StreamingStats { - frames_received: u64, - frames_decoded: u64, - bytes_received: u64, - audio_packets: u64, -} - -/// Main application state -struct GfnApp { - window: Option>, - surface: Option, Arc>>, - shared_state: Arc>, - input_tx: mpsc::Sender, - mouse_captured: bool, - start_time: Instant, - args: Args, -} - -impl GfnApp { - fn new(args: Args, input_tx: mpsc::Sender, shared_state: Arc>) -> Self { - Self { - window: None, - surface: None, - shared_state, - input_tx, - mouse_captured: false, - start_time: Instant::now(), - args, - } - } - - fn get_timestamp_us(&self) -> u64 { - self.start_time.elapsed().as_micros() as u64 - } - - fn capture_mouse(&mut self) { - if let Some(window) = &self.window { - // Try confined first, then locked - if window.set_cursor_grab(CursorGrabMode::Confined).is_err() { - let _ = window.set_cursor_grab(CursorGrabMode::Locked); - } - window.set_cursor_visible(false); - self.mouse_captured = true; - info!("Mouse captured"); - } - } - - fn release_mouse(&mut self) { - if let Some(window) = &self.window { - let _ = window.set_cursor_grab(CursorGrabMode::None); - window.set_cursor_visible(true); - self.mouse_captured = false; - info!("Mouse released"); - } - } - - fn render_frame(&mut self) { - let Some(surface) = &mut self.surface else { return }; - let Some(window) = &self.window else { return }; - - let size = window.inner_size(); - if size.width == 0 || size.height == 0 { - return; - } - - // Resize surface if needed - let _ = surface.resize( - NonZeroU32::new(size.width).unwrap(), - NonZeroU32::new(size.height).unwrap(), - ); - - let mut buffer = match surface.buffer_mut() { - Ok(b) => b, - Err(e) => { - warn!("Failed to get buffer: {}", e); - return; - } - }; - - // Get video frame if available - let state = self.shared_state.lock(); - - if let Some(frame) = &state.video_frame { - // Scale and blit video frame to window - let scale_x = frame.width as f32 / size.width as f32; - let scale_y = frame.height as f32 / size.height as f32; - - for y in 0..size.height { - for x in 0..size.width { - let src_x = ((x as f32 * scale_x) as u32).min(frame.width - 1); - let src_y = ((y as f32 * scale_y) as u32).min(frame.height - 1); - let src_idx = (src_y * frame.width + src_x) as usize; - let dst_idx = (y * size.width + x) as usize; - - if src_idx < frame.data.len() && dst_idx < buffer.len() { - buffer[dst_idx] = frame.data[src_idx]; - } - } - } - } else { - // Show status screen - let status = state.status_message.clone(); - let signaling = state.signaling_connected; - let webrtc = state.webrtc_connected; - let input_ready = state.input_ready; - let stats = &state.stats; - let frames = stats.frames_received; - drop(state); - - // Draw status screen - for (i, pixel) in buffer.iter_mut().enumerate() { - let x = i as u32 % size.width; - let y = i as u32 / size.width; - - // Background gradient - let brightness = 0x1a + (y as u32 * 0x10 / size.height).min(0x10) as u8; - *pixel = 0xFF000000 | ((brightness as u32) << 16) | ((brightness as u32) << 8) | (brightness as u32 + 0x10); - - // Status indicator box in center - let cx = size.width / 2; - let cy = size.height / 2; - let box_w = 400; - let box_h = 200; - - if x >= cx - box_w/2 && x <= cx + box_w/2 && y >= cy - box_h/2 && y <= cy + box_h/2 { - // Status box background - *pixel = 0xFF2a2a3a; - - // Border - if x == cx - box_w/2 || x == cx + box_w/2 || y == cy - box_h/2 || y == cy + box_h/2 { - *pixel = if webrtc { 0xFF00AA00 } else if signaling { 0xFFAAAA00 } else { 0xFF666666 }; - } - } - - // Connection status dots - let dot_y = cy - 50; - let dot_radius = 8u32; - - // Signaling dot - let dot1_x = cx - 60; - let dist1 = ((x as i32 - dot1_x as i32).pow(2) + (y as i32 - dot_y as i32).pow(2)) as u32; - if dist1 <= dot_radius * dot_radius { - *pixel = if signaling { 0xFF00FF00 } else { 0xFF444444 }; - } - - // WebRTC dot - let dot2_x = cx; - let dist2 = ((x as i32 - dot2_x as i32).pow(2) + (y as i32 - dot_y as i32).pow(2)) as u32; - if dist2 <= dot_radius * dot_radius { - *pixel = if webrtc { 0xFF00FF00 } else { 0xFF444444 }; - } - - // Input dot - let dot3_x = cx + 60; - let dist3 = ((x as i32 - dot3_x as i32).pow(2) + (y as i32 - dot_y as i32).pow(2)) as u32; - if dist3 <= dot_radius * dot_radius { - *pixel = if input_ready { 0xFF00FF00 } else { 0xFF444444 }; - } - } - } - - let _ = buffer.present(); - } - - fn handle_keyboard(&mut self, key: PhysicalKey, state: ElementState) { - let PhysicalKey::Code(keycode) = key else { return }; - - // ESC releases mouse or closes window - if keycode == KeyCode::Escape && state == ElementState::Pressed { - if self.mouse_captured { - self.release_mouse(); - } - return; - } - - if !self.mouse_captured { - return; - } - - // Convert to Windows VK code and scancode - let vk = keycode_to_vk(keycode); - let scan = keycode_to_scan(keycode); - - let event = match state { - ElementState::Pressed => InputEvent::KeyDown { - keycode: vk, - scancode: scan, - modifiers: 0, - timestamp_us: self.get_timestamp_us(), - }, - ElementState::Released => InputEvent::KeyUp { - keycode: vk, - scancode: scan, - modifiers: 0, - timestamp_us: self.get_timestamp_us(), - }, - }; - - let _ = self.input_tx.try_send(event); - } - - fn handle_mouse_button(&mut self, button: MouseButton, state: ElementState) { - // Capture on click if not captured - if !self.mouse_captured && state == ElementState::Pressed { - self.capture_mouse(); - return; - } - - if !self.mouse_captured { - return; - } - - let btn = match button { - MouseButton::Left => 0, - MouseButton::Right => 1, - MouseButton::Middle => 2, - MouseButton::Back => 3, - MouseButton::Forward => 4, - MouseButton::Other(n) => n as u8, - }; - - let event = match state { - ElementState::Pressed => InputEvent::MouseButtonDown { - button: btn, - timestamp_us: self.get_timestamp_us(), - }, - ElementState::Released => InputEvent::MouseButtonUp { - button: btn, - timestamp_us: self.get_timestamp_us(), - }, - }; - - let _ = self.input_tx.try_send(event); - } - - fn handle_mouse_wheel(&mut self, delta: f32) { - if !self.mouse_captured { - return; - } - - let event = InputEvent::MouseWheel { - delta: (delta * 120.0) as i16, - timestamp_us: self.get_timestamp_us(), - }; - - let _ = self.input_tx.try_send(event); - } -} - -impl ApplicationHandler for GfnApp { - fn resumed(&mut self, event_loop: &ActiveEventLoop) { - if self.window.is_some() { - return; - } - - let window_attrs = Window::default_attributes() - .with_title(format!("GFN Native Client - {}", self.args.server)) - .with_inner_size(LogicalSize::new(self.args.width, self.args.height)); - - let window = Arc::new(event_loop.create_window(window_attrs).unwrap()); - - // Create software rendering surface - let context = softbuffer::Context::new(window.clone()).unwrap(); - let surface = softbuffer::Surface::new(&context, window.clone()).unwrap(); - - info!("Window created: {}x{}", self.args.width, self.args.height); - info!("Server: {}", self.args.server); - info!("Session: {}", self.args.session_id); - info!("Press ESC to release mouse, click to capture"); - - self.surface = Some(surface); - self.window = Some(window); - } - - fn window_event(&mut self, event_loop: &ActiveEventLoop, _id: WindowId, event: WindowEvent) { - match event { - WindowEvent::CloseRequested => { - info!("Window closed"); - event_loop.exit(); - } - WindowEvent::RedrawRequested => { - self.render_frame(); - } - WindowEvent::KeyboardInput { event, .. } => { - self.handle_keyboard(event.physical_key, event.state); - } - WindowEvent::MouseInput { button, state, .. } => { - self.handle_mouse_button(button, state); - } - WindowEvent::MouseWheel { delta, .. } => { - let y = match delta { - winit::event::MouseScrollDelta::LineDelta(_, y) => y, - winit::event::MouseScrollDelta::PixelDelta(pos) => pos.y as f32 / 120.0, - }; - self.handle_mouse_wheel(y); - } - WindowEvent::Resized(size) => { - if let Some(surface) = &mut self.surface { - if size.width > 0 && size.height > 0 { - let _ = surface.resize( - NonZeroU32::new(size.width).unwrap(), - NonZeroU32::new(size.height).unwrap(), - ); - } - } - } - WindowEvent::Focused(focused) => { - if focused { - // Window regained focus - re-capture mouse if it was captured before - if self.mouse_captured { - info!("Window regained focus - re-capturing mouse"); - // Need to re-apply the cursor grab since Windows releases it on focus loss - if let Some(window) = &self.window { - // Try confined first, then locked - if window.set_cursor_grab(CursorGrabMode::Confined).is_err() { - let _ = window.set_cursor_grab(CursorGrabMode::Locked); - } - window.set_cursor_visible(false); - } - } - } else { - // Window lost focus - cursor grab is automatically released by Windows - if self.mouse_captured { - info!("Window lost focus - cursor grab suspended"); - } - } - } - _ => {} - } - } - - fn device_event(&mut self, _event_loop: &ActiveEventLoop, _device_id: winit::event::DeviceId, event: DeviceEvent) { - if !self.mouse_captured { - return; - } - - if let DeviceEvent::MouseMotion { delta } = event { - let (dx, dy) = delta; - let event = InputEvent::MouseMove { - dx: dx as i16, - dy: dy as i16, - timestamp_us: self.get_timestamp_us(), - }; - let _ = self.input_tx.try_send(event); - } - } - - fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) { - if let Some(window) = &self.window { - window.request_redraw(); - } - } -} - -/// Run the streaming connection -async fn run_streaming( - server: String, - session_id: String, - shared_state: Arc>, - mut input_rx: mpsc::Receiver, -) -> Result<()> { - info!("Starting streaming connection to {}", server); - - { - let mut state = shared_state.lock(); - state.status_message = "Connecting to signaling...".to_string(); - } - - // Create channels for signaling events - let (sig_tx, mut sig_rx) = mpsc::channel::(64); - - // Create signaling client - let mut signaling = GfnSignaling::new(server.clone(), session_id.clone(), sig_tx); - - // Connect to signaling server - match signaling.connect().await { - Ok(_) => { - info!("Connected to signaling server"); - let mut state = shared_state.lock(); - state.signaling_connected = true; - state.status_message = "Signaling connected, waiting for offer...".to_string(); - } - Err(e) => { - error!("Failed to connect to signaling: {}", e); - let mut state = shared_state.lock(); - state.status_message = format!("Signaling failed: {}", e); - return Err(e); - } - } - - // Create WebRTC event channel - let (webrtc_tx, mut webrtc_rx) = mpsc::channel::(64); - let mut webrtc_client = WebRtcClient::new(webrtc_tx); - - // Input encoder - let mut input_encoder = InputEncoder::new(); - - // H.264 decoder - let mut decoder = match openh264::decoder::Decoder::new() { - Ok(d) => { - info!("H.264 decoder initialized"); - Some(d) - } - Err(e) => { - warn!("Failed to create H.264 decoder: {}. Video will not be displayed.", e); - None - } - }; - - // RTP packet assembler for H.264 - let mut h264_buffer: Vec = Vec::with_capacity(1024 * 1024); // 1MB buffer - - // Main event loop - loop { - tokio::select! { - // Handle signaling events - Some(event) = sig_rx.recv() => { - match event { - SignalingEvent::Connected => { - info!("Signaling connected"); - } - SignalingEvent::SdpOffer(sdp) => { - info!("Received SDP offer ({} bytes)", sdp.len()); - - { - let mut state = shared_state.lock(); - state.status_message = "Received offer, creating answer...".to_string(); - } - - // Parse ICE servers - use STUN server - let ice_servers = vec![ - RTCIceServer { - urls: vec!["stun:stun.l.google.com:19302".to_string()], - ..Default::default() - }, - ]; - - match webrtc_client.handle_offer(&sdp, ice_servers).await { - Ok(answer) => { - info!("Created SDP answer, sending to server"); - - { - let mut state = shared_state.lock(); - state.status_message = "Sending answer...".to_string(); - } - - if let Err(e) = signaling.send_answer(&answer, None).await { - error!("Failed to send SDP answer: {}", e); - } - - // Create input channel - if let Err(e) = webrtc_client.create_input_channel().await { - warn!("Failed to create input channel: {}", e); - } - } - Err(e) => { - error!("Failed to handle SDP offer: {}", e); - let mut state = shared_state.lock(); - state.status_message = format!("WebRTC error: {}", e); - } - } - } - SignalingEvent::IceCandidate(candidate) => { - debug!("Received ICE candidate: {}", &candidate.candidate[..candidate.candidate.len().min(50)]); - if let Err(e) = webrtc_client.add_ice_candidate( - &candidate.candidate, - candidate.sdp_mid.as_deref(), - candidate.sdp_mline_index.map(|i| i as u16), - ).await { - warn!("Failed to add ICE candidate: {}", e); - } - } - SignalingEvent::Disconnected(reason) => { - warn!("Signaling disconnected: {}", reason); - let mut state = shared_state.lock(); - state.signaling_connected = false; - state.status_message = format!("Disconnected: {}", reason); - break; - } - SignalingEvent::Error(e) => { - error!("Signaling error: {}", e); - } - } - } - - // Handle WebRTC events - Some(event) = webrtc_rx.recv() => { - match event { - WebRtcEvent::Connected => { - info!("WebRTC connected!"); - let mut state = shared_state.lock(); - state.webrtc_connected = true; - state.connected = true; - state.status_message = "WebRTC connected, waiting for video...".to_string(); - } - WebRtcEvent::Disconnected => { - warn!("WebRTC disconnected"); - let mut state = shared_state.lock(); - state.webrtc_connected = false; - state.connected = false; - state.status_message = "WebRTC disconnected".to_string(); - } - WebRtcEvent::VideoFrame(rtp_payload) => { - // Update stats - { - let mut state = shared_state.lock(); - state.stats.frames_received += 1; - state.stats.bytes_received += rtp_payload.len() as u64; - } - - // Accumulate RTP payload (simplified - real impl needs NAL unit handling) - if !rtp_payload.is_empty() { - // Check for NAL unit start code or marker - let nal_type = rtp_payload[0] & 0x1F; - - // Simple approach: try to decode each packet - // Real implementation would reassemble fragmented NALUs - if let Some(ref mut dec) = decoder { - // Add start code if not present - let data = if rtp_payload.len() >= 3 && - rtp_payload[0] == 0 && rtp_payload[1] == 0 && - (rtp_payload[2] == 1 || (rtp_payload[2] == 0 && rtp_payload.len() >= 4 && rtp_payload[3] == 1)) { - rtp_payload.clone() - } else { - let mut with_start = vec![0, 0, 0, 1]; - with_start.extend_from_slice(&rtp_payload); - with_start - }; - - match dec.decode(&data) { - Ok(Some(yuv)) => { - let (width, height) = yuv.dimensions(); - let width = width as usize; - let height = height as usize; - - // Get YUV data using trait methods - let y_data = yuv.y(); - let u_data = yuv.u(); - let v_data = yuv.v(); - let (y_stride, u_stride, v_stride) = yuv.strides(); - - let mut argb_data = Vec::with_capacity(width * height); - - for row in 0..height { - for col in 0..width { - let y_idx = row * y_stride + col; - let uv_row = row / 2; - let uv_col = col / 2; - let u_idx = uv_row * u_stride + uv_col; - let v_idx = uv_row * v_stride + uv_col; - - let y = y_data.get(y_idx).copied().unwrap_or(0) as f32; - let u = u_data.get(u_idx).copied().unwrap_or(128) as f32 - 128.0; - let v = v_data.get(v_idx).copied().unwrap_or(128) as f32 - 128.0; - - // YUV to RGB conversion - let r = (y + 1.402 * v).clamp(0.0, 255.0) as u32; - let g = (y - 0.344 * u - 0.714 * v).clamp(0.0, 255.0) as u32; - let b = (y + 1.772 * u).clamp(0.0, 255.0) as u32; - - argb_data.push(0xFF000000 | (r << 16) | (g << 8) | b); - } - } - - let mut state = shared_state.lock(); - state.video_frame = Some(VideoFrame { - width: width as u32, - height: height as u32, - data: argb_data, - }); - state.stats.frames_decoded += 1; - state.status_message = format!("Streaming - {}x{}", width, height); - } - Ok(None) => { - // Decoder needs more data - } - Err(_) => { - // Decode error - skip - } - } - } - } - } - WebRtcEvent::AudioFrame(_data) => { - let mut state = shared_state.lock(); - state.stats.audio_packets += 1; - // TODO: Play audio with cpal - } - WebRtcEvent::DataChannelOpen(name) => { - info!("Data channel opened: {}", name); - if name.contains("input") { - let mut state = shared_state.lock(); - state.input_ready = true; - state.status_message = "Input channel ready".to_string(); - } - } - WebRtcEvent::DataChannelMessage(name, data) => { - debug!("Data channel '{}' message: {} bytes", name, data.len()); - - // Handle input handshake - if data.len() == 4 && data[0] == 0x0e { - info!("Received input handshake: v{}.{} flags={}", data[1], data[2], data[3]); - if let Err(e) = webrtc_client.send_handshake_response(data[1], data[2], data[3]).await { - warn!("Failed to send handshake response: {}", e); - } else { - info!("Handshake complete - input ready!"); - } - } - } - WebRtcEvent::IceCandidate(candidate, sdp_mid, sdp_mline_index) => { - debug!("Local ICE candidate generated"); - if let Err(e) = signaling.send_ice_candidate( - &candidate, - sdp_mid.as_deref(), - sdp_mline_index.map(|i| i as u32), - ).await { - warn!("Failed to send ICE candidate: {}", e); - } - } - WebRtcEvent::Error(e) => { - error!("WebRTC error: {}", e); - } - } - } - - // Handle input events - Some(event) = input_rx.recv() => { - let ready = { - let state = shared_state.lock(); - state.input_ready && webrtc_client.is_handshake_complete() - }; - - if ready { - let encoded = input_encoder.encode(&event); - if let Err(e) = webrtc_client.send_input(&encoded).await { - debug!("Failed to send input: {}", e); - } - } - } - - else => break, - } - } - - info!("Streaming ended"); - Ok(()) -} - -/// Convert winit keycode to Windows virtual key code -fn keycode_to_vk(keycode: KeyCode) -> u16 { - match keycode { - KeyCode::Backquote => 0xC0, - KeyCode::Backslash => 0xDC, - KeyCode::BracketLeft => 0xDB, - KeyCode::BracketRight => 0xDD, - KeyCode::Comma => 0xBC, - KeyCode::Digit0 => 0x30, - KeyCode::Digit1 => 0x31, - KeyCode::Digit2 => 0x32, - KeyCode::Digit3 => 0x33, - KeyCode::Digit4 => 0x34, - KeyCode::Digit5 => 0x35, - KeyCode::Digit6 => 0x36, - KeyCode::Digit7 => 0x37, - KeyCode::Digit8 => 0x38, - KeyCode::Digit9 => 0x39, - KeyCode::Equal => 0xBB, - KeyCode::KeyA => 0x41, - KeyCode::KeyB => 0x42, - KeyCode::KeyC => 0x43, - KeyCode::KeyD => 0x44, - KeyCode::KeyE => 0x45, - KeyCode::KeyF => 0x46, - KeyCode::KeyG => 0x47, - KeyCode::KeyH => 0x48, - KeyCode::KeyI => 0x49, - KeyCode::KeyJ => 0x4A, - KeyCode::KeyK => 0x4B, - KeyCode::KeyL => 0x4C, - KeyCode::KeyM => 0x4D, - KeyCode::KeyN => 0x4E, - KeyCode::KeyO => 0x4F, - KeyCode::KeyP => 0x50, - KeyCode::KeyQ => 0x51, - KeyCode::KeyR => 0x52, - KeyCode::KeyS => 0x53, - KeyCode::KeyT => 0x54, - KeyCode::KeyU => 0x55, - KeyCode::KeyV => 0x56, - KeyCode::KeyW => 0x57, - KeyCode::KeyX => 0x58, - KeyCode::KeyY => 0x59, - KeyCode::KeyZ => 0x5A, - KeyCode::Minus => 0xBD, - KeyCode::Period => 0xBE, - KeyCode::Quote => 0xDE, - KeyCode::Semicolon => 0xBA, - KeyCode::Slash => 0xBF, - KeyCode::Backspace => 0x08, - KeyCode::CapsLock => 0x14, - KeyCode::Enter => 0x0D, - KeyCode::Space => 0x20, - KeyCode::Tab => 0x09, - KeyCode::Delete => 0x2E, - KeyCode::End => 0x23, - KeyCode::Home => 0x24, - KeyCode::Insert => 0x2D, - KeyCode::PageDown => 0x22, - KeyCode::PageUp => 0x21, - KeyCode::ArrowDown => 0x28, - KeyCode::ArrowLeft => 0x25, - KeyCode::ArrowRight => 0x27, - KeyCode::ArrowUp => 0x26, - KeyCode::Escape => 0x1B, - KeyCode::F1 => 0x70, - KeyCode::F2 => 0x71, - KeyCode::F3 => 0x72, - KeyCode::F4 => 0x73, - KeyCode::F5 => 0x74, - KeyCode::F6 => 0x75, - KeyCode::F7 => 0x76, - KeyCode::F8 => 0x77, - KeyCode::F9 => 0x78, - KeyCode::F10 => 0x79, - KeyCode::F11 => 0x7A, - KeyCode::F12 => 0x7B, - KeyCode::Numpad0 => 0x60, - KeyCode::Numpad1 => 0x61, - KeyCode::Numpad2 => 0x62, - KeyCode::Numpad3 => 0x63, - KeyCode::Numpad4 => 0x64, - KeyCode::Numpad5 => 0x65, - KeyCode::Numpad6 => 0x66, - KeyCode::Numpad7 => 0x67, - KeyCode::Numpad8 => 0x68, - KeyCode::Numpad9 => 0x69, - KeyCode::NumpadAdd => 0x6B, - KeyCode::NumpadDecimal => 0x6E, - KeyCode::NumpadDivide => 0x6F, - KeyCode::NumpadEnter => 0x0D, - KeyCode::NumpadMultiply => 0x6A, - KeyCode::NumpadSubtract => 0x6D, - KeyCode::ShiftLeft | KeyCode::ShiftRight => 0x10, - KeyCode::ControlLeft | KeyCode::ControlRight => 0x11, - KeyCode::AltLeft | KeyCode::AltRight => 0x12, - KeyCode::SuperLeft => 0x5B, - KeyCode::SuperRight => 0x5C, - _ => 0, - } -} - -/// Convert winit keycode to scan code -fn keycode_to_scan(keycode: KeyCode) -> u16 { - match keycode { - KeyCode::Escape => 0x01, - KeyCode::Digit1 => 0x02, - KeyCode::Digit2 => 0x03, - KeyCode::Digit3 => 0x04, - KeyCode::Digit4 => 0x05, - KeyCode::Digit5 => 0x06, - KeyCode::Digit6 => 0x07, - KeyCode::Digit7 => 0x08, - KeyCode::Digit8 => 0x09, - KeyCode::Digit9 => 0x0A, - KeyCode::Digit0 => 0x0B, - KeyCode::Minus => 0x0C, - KeyCode::Equal => 0x0D, - KeyCode::Backspace => 0x0E, - KeyCode::Tab => 0x0F, - KeyCode::KeyQ => 0x10, - KeyCode::KeyW => 0x11, - KeyCode::KeyE => 0x12, - KeyCode::KeyR => 0x13, - KeyCode::KeyT => 0x14, - KeyCode::KeyY => 0x15, - KeyCode::KeyU => 0x16, - KeyCode::KeyI => 0x17, - KeyCode::KeyO => 0x18, - KeyCode::KeyP => 0x19, - KeyCode::BracketLeft => 0x1A, - KeyCode::BracketRight => 0x1B, - KeyCode::Enter => 0x1C, - KeyCode::ControlLeft => 0x1D, - KeyCode::KeyA => 0x1E, - KeyCode::KeyS => 0x1F, - KeyCode::KeyD => 0x20, - KeyCode::KeyF => 0x21, - KeyCode::KeyG => 0x22, - KeyCode::KeyH => 0x23, - KeyCode::KeyJ => 0x24, - KeyCode::KeyK => 0x25, - KeyCode::KeyL => 0x26, - KeyCode::Semicolon => 0x27, - KeyCode::Quote => 0x28, - KeyCode::Backquote => 0x29, - KeyCode::ShiftLeft => 0x2A, - KeyCode::Backslash => 0x2B, - KeyCode::KeyZ => 0x2C, - KeyCode::KeyX => 0x2D, - KeyCode::KeyC => 0x2E, - KeyCode::KeyV => 0x2F, - KeyCode::KeyB => 0x30, - KeyCode::KeyN => 0x31, - KeyCode::KeyM => 0x32, - KeyCode::Comma => 0x33, - KeyCode::Period => 0x34, - KeyCode::Slash => 0x35, - KeyCode::ShiftRight => 0x36, - KeyCode::Space => 0x39, - KeyCode::CapsLock => 0x3A, - KeyCode::F1 => 0x3B, - KeyCode::F2 => 0x3C, - KeyCode::F3 => 0x3D, - KeyCode::F4 => 0x3E, - KeyCode::F5 => 0x3F, - KeyCode::F6 => 0x40, - KeyCode::F7 => 0x41, - KeyCode::F8 => 0x42, - KeyCode::F9 => 0x43, - KeyCode::F10 => 0x44, - KeyCode::F11 => 0x57, - KeyCode::F12 => 0x58, - KeyCode::ArrowUp => 0x48, - KeyCode::ArrowLeft => 0x4B, - KeyCode::ArrowRight => 0x4D, - KeyCode::ArrowDown => 0x50, - _ => 0, - } -} - -fn main() -> Result<()> { - // Parse arguments - let args = Args::parse(); - - // Initialize logging - if args.debug { - env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("debug")).init(); - } else { - env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init(); - } - - info!("GFN Native Client v{}", env!("CARGO_PKG_VERSION")); - info!("Server: {}", args.server); - info!("Session: {}", args.session_id); - - // Create input channel - let (input_tx, input_rx) = mpsc::channel::(256); - - // Create shared state - let shared_state = Arc::new(Mutex::new(SharedState::default())); - - // Start tokio runtime for async tasks - let runtime = tokio::runtime::Runtime::new()?; - - // Spawn streaming task - let server = args.server.clone(); - let session_id = args.session_id.clone(); - let state_clone = shared_state.clone(); - - runtime.spawn(async move { - if let Err(e) = run_streaming(server, session_id, state_clone, input_rx).await { - error!("Streaming error: {}", e); - } - }); - - // Create event loop - let event_loop = EventLoop::new()?; - event_loop.set_control_flow(ControlFlow::Poll); - - // Create application - let mut app = GfnApp::new(args, input_tx, shared_state); - - // Run event loop (blocking) - event_loop.run_app(&mut app)?; - - // Cleanup - info!("Shutting down..."); - drop(runtime); - - Ok(()) -} diff --git a/src-tauri/src/native/mod.rs b/src-tauri/src/native/mod.rs deleted file mode 100644 index 807dcc8..0000000 --- a/src-tauri/src/native/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod input; -pub mod signaling; -pub mod webrtc_client; diff --git a/src-tauri/src/native/signaling.rs b/src-tauri/src/native/signaling.rs deleted file mode 100644 index 504646d..0000000 --- a/src-tauri/src/native/signaling.rs +++ /dev/null @@ -1,369 +0,0 @@ -//! GFN WebSocket Signaling Protocol -//! -//! Handles the WebSocket-based signaling for WebRTC connection setup. -//! Protocol: wss://{server}/nvst/sign_in?peer_id=peer-{random}&version=2 -//! Auth: WebSocket subprotocol x-nv-sessionid.{session_id} - -use std::sync::Arc; -use tokio::sync::{mpsc, Mutex}; -use tokio_tungstenite::tungstenite::Message; -use futures_util::{StreamExt, SinkExt}; -use serde::{Deserialize, Serialize}; -use serde_json::{json, Value}; -use anyhow::{Result, Context}; -use log::{info, debug, warn, error}; -use base64::{Engine as _, engine::general_purpose::STANDARD}; - -/// Generate WebSocket key for handshake -fn generate_ws_key() -> String { - let random_bytes: [u8; 16] = rand::random(); - STANDARD.encode(random_bytes) -} - -/// Peer info sent to server -#[derive(Debug, Serialize, Deserialize)] -pub struct PeerInfo { - pub browser: String, - #[serde(rename = "browserVersion")] - pub browser_version: String, - pub connected: bool, - pub id: u32, - pub name: String, - pub peer_role: u32, - pub resolution: String, - pub version: u32, -} - -/// Message from signaling server -#[derive(Debug, Deserialize)] -pub struct SignalingMessage { - pub ackid: Option, - pub ack: Option, - pub hb: Option, - pub peer_info: Option, - pub peer_msg: Option, -} - -/// Peer-to-peer message wrapper -#[derive(Debug, Deserialize)] -pub struct PeerMessage { - pub from: u32, - pub to: u32, - pub msg: String, -} - -/// SDP offer/answer content -#[derive(Debug, Serialize, Deserialize)] -pub struct SdpMessage { - #[serde(rename = "type")] - pub msg_type: String, - pub sdp: Option, - #[serde(rename = "nvstSdp")] - pub nvst_sdp: Option, -} - -/// ICE candidate message -#[derive(Debug, Serialize, Deserialize)] -pub struct IceCandidate { - pub candidate: String, - #[serde(rename = "sdpMid")] - pub sdp_mid: Option, - #[serde(rename = "sdpMLineIndex")] - pub sdp_mline_index: Option, -} - -/// Events emitted by the signaling client -#[derive(Debug)] -pub enum SignalingEvent { - Connected, - SdpOffer(String), - IceCandidate(IceCandidate), - Disconnected(String), - Error(String), -} - -/// GFN Signaling Client -pub struct GfnSignaling { - server_ip: String, - session_id: String, - peer_id: u32, - peer_name: String, - ack_counter: Arc>, - event_tx: mpsc::Sender, - message_tx: Option>, -} - -impl GfnSignaling { - pub fn new( - server_ip: String, - session_id: String, - event_tx: mpsc::Sender, - ) -> Self { - let peer_id = 2; // Client is always peer 2 - let random_suffix: u64 = rand::random::() % 10_000_000_000; - let peer_name = format!("peer-{}", random_suffix); - - Self { - server_ip, - session_id, - peer_id, - peer_name, - ack_counter: Arc::new(Mutex::new(0)), - event_tx, - message_tx: None, - } - } - - /// Connect to the signaling server - pub async fn connect(&mut self) -> Result<()> { - let url = format!( - "wss://{}/nvst/sign_in?peer_id={}&version=2", - self.server_ip, self.peer_name - ); - let subprotocol = format!("x-nv-sessionid.{}", self.session_id); - - info!("Connecting to signaling: {}", url); - info!("Using subprotocol: {}", subprotocol); - - // Use TLS connector that accepts self-signed certs - let tls_connector = native_tls::TlsConnector::builder() - .danger_accept_invalid_certs(true) - .danger_accept_invalid_hostnames(true) - .build() - .context("Failed to build TLS connector")?; - - // Connect TCP first - let host = self.server_ip.split(':').next().unwrap_or(&self.server_ip); - let port = 443; - let addr = format!("{}:{}", host, port); - - info!("Connecting TCP to: {}", addr); - let tcp_stream = tokio::net::TcpStream::connect(&addr).await - .context("TCP connection failed")?; - - info!("TCP connected, starting TLS handshake..."); - let tls_stream = tokio_native_tls::TlsConnector::from(tls_connector) - .connect(host, tcp_stream) - .await - .context("TLS handshake failed")?; - - info!("TLS connected, starting WebSocket handshake..."); - - // Generate WebSocket key for handshake - let ws_key = generate_ws_key(); - - let request = http::Request::builder() - .uri(&url) - .header("Host", &self.server_ip) - .header("Connection", "Upgrade") - .header("Upgrade", "websocket") - .header("Sec-WebSocket-Version", "13") - .header("Sec-WebSocket-Key", &ws_key) - .header("Sec-WebSocket-Protocol", &subprotocol) - .header("Origin", "https://play.geforcenow.com") - .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/131.0.0.0") - .body(()) - .context("Failed to build request")?; - - // Configure WebSocket - let ws_config = tokio_tungstenite::tungstenite::protocol::WebSocketConfig { - max_message_size: Some(64 << 20), // 64MB - max_frame_size: Some(16 << 20), // 16MB - accept_unmasked_frames: false, - ..Default::default() - }; - - // Use client_async (NOT client_async_tls) since we already have a TLS stream - let (ws_stream, response) = tokio_tungstenite::client_async_with_config( - request, - tls_stream, - Some(ws_config), - ) - .await - .map_err(|e| { - error!("WebSocket handshake error: {:?}", e); - anyhow::anyhow!("WebSocket handshake failed: {}", e) - })?; - - info!("Connected! Response: {:?}", response.status()); - - let (mut write, mut read) = ws_stream.split(); - - // Channel for sending messages - let (msg_tx, mut msg_rx) = mpsc::channel::(64); - self.message_tx = Some(msg_tx.clone()); - - // Send initial peer_info - let peer_info = self.create_peer_info(); - let peer_info_msg = json!({ - "ackid": self.next_ack_id().await, - "peer_info": peer_info - }); - write.send(Message::Text(peer_info_msg.to_string())).await?; - info!("Sent peer_info"); - - let event_tx = self.event_tx.clone(); - let ack_counter = self.ack_counter.clone(); - let peer_id = self.peer_id; - - // Spawn message sender task - let sender_handle = tokio::spawn(async move { - while let Some(msg) = msg_rx.recv().await { - if let Err(e) = write.send(msg).await { - error!("Failed to send message: {}", e); - break; - } - } - }); - - // Spawn message receiver task - let msg_tx_clone = msg_tx.clone(); - let receiver_handle = tokio::spawn(async move { - while let Some(msg_result) = read.next().await { - match msg_result { - Ok(Message::Text(text)) => { - debug!("Received: {}", &text[..text.len().min(200)]); - - if let Ok(msg) = serde_json::from_str::(&text) { - // Send ACK for messages with ackid (except our own echoes) - if let Some(ackid) = msg.ackid { - if msg.peer_info.as_ref().map(|p| p.id) != Some(peer_id) { - let ack = json!({ "ack": ackid }); - let _ = msg_tx_clone.send(Message::Text(ack.to_string())).await; - } - } - - // Handle heartbeat - if msg.hb.is_some() { - let hb = json!({ "hb": 1 }); - let _ = msg_tx_clone.send(Message::Text(hb.to_string())).await; - continue; - } - - // Handle peer messages (SDP offer, ICE candidates) - if let Some(peer_msg) = msg.peer_msg { - if let Ok(inner) = serde_json::from_str::(&peer_msg.msg) { - // SDP Offer - if inner.get("type").and_then(|t| t.as_str()) == Some("offer") { - if let Some(sdp) = inner.get("sdp").and_then(|s| s.as_str()) { - info!("Received SDP offer, length: {}", sdp.len()); - let _ = event_tx.send(SignalingEvent::SdpOffer(sdp.to_string())).await; - } - } - // ICE Candidate - else if inner.get("candidate").is_some() { - if let Ok(candidate) = serde_json::from_value::(inner) { - info!("Received ICE candidate: {}", &candidate.candidate[..candidate.candidate.len().min(60)]); - let _ = event_tx.send(SignalingEvent::IceCandidate(candidate)).await; - } - } - } - } - } - } - Ok(Message::Close(frame)) => { - warn!("WebSocket closed: {:?}", frame); - let _ = event_tx.send(SignalingEvent::Disconnected( - frame.map(|f| f.reason.to_string()).unwrap_or_default() - )).await; - break; - } - Err(e) => { - error!("WebSocket error: {}", e); - let _ = event_tx.send(SignalingEvent::Error(e.to_string())).await; - break; - } - _ => {} - } - } - }); - - // Notify connected - self.event_tx.send(SignalingEvent::Connected).await?; - - // Start heartbeat task - let hb_tx = msg_tx.clone(); - tokio::spawn(async move { - let mut interval = tokio::time::interval(std::time::Duration::from_secs(5)); - loop { - interval.tick().await; - let hb = json!({ "hb": 1 }); - if hb_tx.send(Message::Text(hb.to_string())).await.is_err() { - break; - } - } - }); - - Ok(()) - } - - /// Send SDP answer to server - pub async fn send_answer(&self, sdp: &str, nvst_sdp: Option<&str>) -> Result<()> { - let msg_tx = self.message_tx.as_ref().context("Not connected")?; - - let mut answer = json!({ - "type": "answer", - "sdp": sdp - }); - - if let Some(nvst) = nvst_sdp { - answer["nvstSdp"] = json!(nvst); - } - - let peer_msg = json!({ - "peer_msg": { - "from": self.peer_id, - "to": 1, - "msg": answer.to_string() - }, - "ackid": self.next_ack_id().await - }); - - msg_tx.send(Message::Text(peer_msg.to_string())).await?; - info!("Sent SDP answer"); - Ok(()) - } - - /// Send ICE candidate to server - pub async fn send_ice_candidate(&self, candidate: &str, sdp_mid: Option<&str>, sdp_mline_index: Option) -> Result<()> { - let msg_tx = self.message_tx.as_ref().context("Not connected")?; - - let ice = json!({ - "candidate": candidate, - "sdpMid": sdp_mid, - "sdpMLineIndex": sdp_mline_index - }); - - let peer_msg = json!({ - "peer_msg": { - "from": self.peer_id, - "to": 1, - "msg": ice.to_string() - }, - "ackid": self.next_ack_id().await - }); - - msg_tx.send(Message::Text(peer_msg.to_string())).await?; - debug!("Sent ICE candidate"); - Ok(()) - } - - fn create_peer_info(&self) -> PeerInfo { - PeerInfo { - browser: "Chrome".to_string(), - browser_version: "131".to_string(), - connected: true, - id: self.peer_id, - name: self.peer_name.clone(), - peer_role: 0, - resolution: "1920x1080".to_string(), - version: 2, - } - } - - async fn next_ack_id(&self) -> u32 { - let mut counter = self.ack_counter.lock().await; - *counter += 1; - *counter - } -} diff --git a/src-tauri/src/native/webrtc_client.rs b/src-tauri/src/native/webrtc_client.rs deleted file mode 100644 index 80458c8..0000000 --- a/src-tauri/src/native/webrtc_client.rs +++ /dev/null @@ -1,327 +0,0 @@ -//! WebRTC Client using webrtc-rs -//! -//! Handles WebRTC peer connection, media streams, and data channels -//! for GFN streaming. - -use std::sync::Arc; -use tokio::sync::{mpsc, oneshot}; -use webrtc::api::media_engine::MediaEngine; -use webrtc::api::APIBuilder; -use webrtc::api::interceptor_registry::register_default_interceptors; -use webrtc::data_channel::RTCDataChannel; -use webrtc::ice_transport::ice_server::RTCIceServer; -use webrtc::ice_transport::ice_gatherer_state::RTCIceGathererState; -use webrtc::interceptor::registry::Registry; -use webrtc::peer_connection::RTCPeerConnection; -use webrtc::peer_connection::configuration::RTCConfiguration; -use webrtc::peer_connection::sdp::session_description::RTCSessionDescription; -use anyhow::{Result, Context}; -use log::{info, debug, warn}; -use bytes::Bytes; - -use super::input::InputEncoder; - -/// Events from WebRTC connection -#[derive(Debug)] -pub enum WebRtcEvent { - Connected, - Disconnected, - VideoFrame(Vec), - AudioFrame(Vec), - DataChannelOpen(String), - DataChannelMessage(String, Vec), - IceCandidate(String, Option, Option), - Error(String), -} - -/// WebRTC client for GFN streaming -pub struct WebRtcClient { - peer_connection: Option>, - input_channel: Option>, - event_tx: mpsc::Sender, - input_encoder: InputEncoder, - handshake_complete: bool, -} - -impl WebRtcClient { - pub fn new(event_tx: mpsc::Sender) -> Self { - Self { - peer_connection: None, - input_channel: None, - event_tx, - input_encoder: InputEncoder::new(), - handshake_complete: false, - } - } - - /// Create peer connection and set remote SDP offer - pub async fn handle_offer(&mut self, sdp_offer: &str, ice_servers: Vec) -> Result { - info!("Setting up WebRTC peer connection"); - - // Create media engine - let mut media_engine = MediaEngine::default(); - - // Register H264 codec - media_engine.register_default_codecs()?; - - // Create interceptor registry - let mut registry = Registry::new(); - registry = register_default_interceptors(registry, &mut media_engine)?; - - // Create API - let api = APIBuilder::new() - .with_media_engine(media_engine) - .with_interceptor_registry(registry) - .build(); - - // Create RTCConfiguration - let config = RTCConfiguration { - ice_servers, - ..Default::default() - }; - - // Create peer connection - let peer_connection = Arc::new(api.new_peer_connection(config).await?); - info!("Peer connection created"); - - // Set up event handlers - let event_tx = self.event_tx.clone(); - - // On ICE candidate - let event_tx_ice = event_tx.clone(); - peer_connection.on_ice_candidate(Box::new(move |candidate| { - let tx = event_tx_ice.clone(); - Box::pin(async move { - if let Some(c) = candidate { - let candidate_str = c.to_json().map(|j| j.candidate).unwrap_or_default(); - let sdp_mid = c.to_json().ok().and_then(|j| j.sdp_mid); - let sdp_mline_index = c.to_json().ok().and_then(|j| j.sdp_mline_index); - let _ = tx.send(WebRtcEvent::IceCandidate( - candidate_str, - sdp_mid, - sdp_mline_index, - )).await; - } - }) - })); - - // On ICE connection state change - let event_tx_state = event_tx.clone(); - peer_connection.on_ice_connection_state_change(Box::new(move |state| { - let tx = event_tx_state.clone(); - info!("ICE connection state: {:?}", state); - Box::pin(async move { - match state { - webrtc::ice_transport::ice_connection_state::RTCIceConnectionState::Connected => { - let _ = tx.send(WebRtcEvent::Connected).await; - } - webrtc::ice_transport::ice_connection_state::RTCIceConnectionState::Disconnected | - webrtc::ice_transport::ice_connection_state::RTCIceConnectionState::Failed => { - let _ = tx.send(WebRtcEvent::Disconnected).await; - } - _ => {} - } - }) - })); - - // On track (video/audio) - let event_tx_track = event_tx.clone(); - peer_connection.on_track(Box::new(move |track, _receiver, _transceiver| { - let tx = event_tx_track.clone(); - let track = track.clone(); - info!("Track received: kind={:?}, id={}", track.kind(), track.id()); - - Box::pin(async move { - // Read RTP packets from track - let mut buffer = vec![0u8; 1500]; - loop { - match track.read(&mut buffer).await { - Ok((rtp_packet, _)) => { - // Send frame data to event handler - // In a real implementation, we'd decode H264 here - if track.kind() == webrtc::rtp_transceiver::rtp_codec::RTPCodecType::Video { - let _ = tx.send(WebRtcEvent::VideoFrame(rtp_packet.payload.to_vec())).await; - } else { - let _ = tx.send(WebRtcEvent::AudioFrame(rtp_packet.payload.to_vec())).await; - } - } - Err(e) => { - warn!("Track read error: {}", e); - break; - } - } - } - }) - })); - - // On data channel - let event_tx_dc = event_tx.clone(); - peer_connection.on_data_channel(Box::new(move |dc| { - let tx = event_tx_dc.clone(); - let dc_label = dc.label().to_string(); - info!("Data channel received: {}", dc_label); - - Box::pin(async move { - let label = dc_label.clone(); - - // On open - let tx_open = tx.clone(); - let label_open = label.clone(); - dc.on_open(Box::new(move || { - let tx = tx_open.clone(); - let label = label_open.clone(); - Box::pin(async move { - info!("Data channel '{}' opened", label); - let _ = tx.send(WebRtcEvent::DataChannelOpen(label)).await; - }) - })); - - // On message - let tx_msg = tx.clone(); - let label_msg = label.clone(); - dc.on_message(Box::new(move |msg| { - let tx = tx_msg.clone(); - let label = label_msg.clone(); - Box::pin(async move { - debug!("Data channel '{}' message: {} bytes", label, msg.data.len()); - let _ = tx.send(WebRtcEvent::DataChannelMessage(label, msg.data.to_vec())).await; - }) - })); - }) - })); - - // Set remote description (offer) - let offer = RTCSessionDescription::offer(sdp_offer.to_string())?; - peer_connection.set_remote_description(offer).await?; - info!("Remote description set"); - - // Set up ICE gathering completion channel - let (gather_tx, gather_rx) = oneshot::channel::<()>(); - let gather_tx = Arc::new(std::sync::Mutex::new(Some(gather_tx))); - - // On ICE gathering state change - peer_connection.on_ice_gathering_state_change(Box::new({ - let gather_tx = gather_tx.clone(); - move |state| { - info!("ICE gathering state: {:?}", state); - if state == RTCIceGathererState::Complete { - if let Some(tx) = gather_tx.lock().unwrap().take() { - let _ = tx.send(()); - } - } - Box::pin(async {}) - } - })); - - // Create answer - let answer = peer_connection.create_answer(None).await?; - peer_connection.set_local_description(answer.clone()).await?; - info!("Local description set, waiting for ICE gathering..."); - - // Wait for ICE gathering to complete (with timeout) - let gather_result = tokio::time::timeout( - std::time::Duration::from_secs(5), - gather_rx - ).await; - - match gather_result { - Ok(_) => info!("ICE gathering complete"), - Err(_) => warn!("ICE gathering timeout - proceeding with current candidates"), - } - - // Get the final SDP with all gathered candidates - let final_sdp = peer_connection.local_description().await - .map(|d| d.sdp) - .unwrap_or_else(|| answer.sdp.clone()); - - info!("Final SDP length: {}", final_sdp.len()); - - self.peer_connection = Some(peer_connection); - - Ok(final_sdp) - } - - /// Create input data channel - pub async fn create_input_channel(&mut self) -> Result<()> { - let pc = self.peer_connection.as_ref().context("No peer connection")?; - - // Create input channel matching GFN protocol - let dc = pc.create_data_channel( - "input_channel_v1", - Some(webrtc::data_channel::data_channel_init::RTCDataChannelInit { - ordered: Some(true), - max_packet_life_time: Some(300), // 300ms partial reliability - ..Default::default() - }), - ).await?; - - info!("Created input data channel: {}", dc.label()); - - // Set up handlers (dc is already Arc) - let event_tx = self.event_tx.clone(); - let dc_for_handler = dc.clone(); - - dc.on_open(Box::new(move || { - info!("Input channel opened"); - Box::pin(async {}) - })); - - let event_tx_msg = event_tx.clone(); - dc.on_message(Box::new(move |msg| { - let tx = event_tx_msg.clone(); - let data = msg.data.to_vec(); - Box::pin(async move { - debug!("Input channel message: {} bytes", data.len()); - - // Check for handshake: [0x0e, major, minor, flags] - if data.len() == 4 && data[0] == 0x0e { - info!("Received input handshake: version {}.{}, flags {}", - data[1], data[2], data[3]); - let _ = tx.send(WebRtcEvent::DataChannelMessage( - "input_handshake".to_string(), - data, - )).await; - } - }) - })); - - self.input_channel = Some(dc_for_handler); - Ok(()) - } - - /// Send input event over data channel - pub async fn send_input(&mut self, data: &[u8]) -> Result<()> { - let dc = self.input_channel.as_ref().context("No input channel")?; - dc.send(&Bytes::copy_from_slice(data)).await?; - Ok(()) - } - - /// Send handshake response - pub async fn send_handshake_response(&mut self, major: u8, minor: u8, flags: u8) -> Result<()> { - let response = InputEncoder::encode_handshake_response(major, minor, flags); - self.send_input(&response).await?; - self.handshake_complete = true; - info!("Sent handshake response, input ready"); - Ok(()) - } - - /// Add remote ICE candidate - pub async fn add_ice_candidate(&self, candidate: &str, sdp_mid: Option<&str>, sdp_mline_index: Option) -> Result<()> { - let pc = self.peer_connection.as_ref().context("No peer connection")?; - - let candidate = webrtc::ice_transport::ice_candidate::RTCIceCandidateInit { - candidate: candidate.to_string(), - sdp_mid: sdp_mid.map(|s| s.to_string()), - sdp_mline_index: sdp_mline_index, - username_fragment: None, - }; - - pc.add_ice_candidate(candidate).await?; - info!("Added remote ICE candidate"); - Ok(()) - } - - pub fn is_handshake_complete(&self) -> bool { - self.handshake_complete - } -} diff --git a/src-tauri/src/proxy.rs b/src-tauri/src/proxy.rs deleted file mode 100644 index e44f8ba..0000000 --- a/src-tauri/src/proxy.rs +++ /dev/null @@ -1,187 +0,0 @@ -use serde::{Deserialize, Serialize}; -use std::sync::Arc; -use tauri::command; -use tokio::sync::Mutex; - -/// Proxy configuration -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct ProxyConfig { - pub enabled: bool, - pub proxy_type: ProxyType, - pub host: String, - pub port: u16, - pub username: Option, - pub password: Option, - pub bypass_local: bool, - pub bypass_list: Vec, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum ProxyType { - Http, - Https, - Socks5, -} - -impl Default for ProxyConfig { - fn default() -> Self { - Self { - enabled: false, - proxy_type: ProxyType::Http, - host: String::new(), - port: 8080, - username: None, - password: None, - bypass_local: true, - bypass_list: vec![ - "localhost".to_string(), - "127.0.0.1".to_string(), - "*.local".to_string(), - ], - } - } -} - -/// Global proxy configuration -static PROXY_CONFIG: std::sync::OnceLock>> = std::sync::OnceLock::new(); - -fn get_proxy_config() -> Arc> { - PROXY_CONFIG - .get_or_init(|| Arc::new(Mutex::new(ProxyConfig::default()))) - .clone() -} - -/// Get current proxy configuration -#[command] -pub async fn get_proxy_settings() -> Result { - let storage = get_proxy_config(); - let config = storage.lock().await; - Ok(config.clone()) -} - -/// Update proxy configuration -#[command] -pub async fn set_proxy_settings(config: ProxyConfig) -> Result<(), String> { - // Validate configuration - if config.enabled { - if config.host.is_empty() { - return Err("Proxy host is required".to_string()); - } - if config.port == 0 { - return Err("Proxy port is required".to_string()); - } - } - - let storage = get_proxy_config(); - let mut guard = storage.lock().await; - *guard = config; - - log::info!("Proxy settings updated"); - Ok(()) -} - -/// Enable proxy -#[command] -pub async fn enable_proxy() -> Result<(), String> { - let storage = get_proxy_config(); - let mut config = storage.lock().await; - - if config.host.is_empty() { - return Err("Proxy host not configured".to_string()); - } - - config.enabled = true; - log::info!("Proxy enabled: {}:{}", config.host, config.port); - Ok(()) -} - -/// Disable proxy -#[command] -pub async fn disable_proxy() -> Result<(), String> { - let storage = get_proxy_config(); - let mut config = storage.lock().await; - config.enabled = false; - log::info!("Proxy disabled"); - Ok(()) -} - -/// Test proxy connection -#[command] -pub async fn test_proxy() -> Result { - let storage = get_proxy_config(); - let config = storage.lock().await; - - if !config.enabled { - return Err("Proxy is not enabled".to_string()); - } - - let proxy_url = build_proxy_url(&config); - - // Create a client with the proxy - let proxy = reqwest::Proxy::all(&proxy_url) - .map_err(|e| format!("Invalid proxy configuration: {}", e))?; - - let client = reqwest::Client::builder() - .proxy(proxy) - .timeout(std::time::Duration::from_secs(10)) - .build() - .map_err(|e| format!("Failed to create client: {}", e))?; - - // Test connection to a known endpoint - let start = std::time::Instant::now(); - let response = client - .get("https://games.geforce.com/graphql") - .header("Content-Type", "application/json") - .body(r#"{"query":"{ __typename }"}"#) - .send() - .await - .map_err(|e| format!("Proxy connection failed: {}", e))?; - - let latency = start.elapsed().as_millis(); - - if response.status().is_success() || response.status().as_u16() == 400 { - // 400 is expected for invalid query, but connection worked - Ok(format!("Proxy working! Latency: {}ms", latency)) - } else { - Err(format!( - "Proxy returned status: {}", - response.status() - )) - } -} - -/// Build proxy URL from configuration -pub fn build_proxy_url(config: &ProxyConfig) -> String { - let scheme = match config.proxy_type { - ProxyType::Http => "http", - ProxyType::Https => "https", - ProxyType::Socks5 => "socks5", - }; - - match (&config.username, &config.password) { - (Some(user), Some(pass)) => { - format!("{}://{}:{}@{}:{}", scheme, user, pass, config.host, config.port) - } - _ => format!("{}://{}:{}", scheme, config.host, config.port), - } -} - -/// Create a reqwest client with proxy configuration -pub async fn create_proxied_client() -> Result { - let storage = get_proxy_config(); - let config = storage.lock().await; - - let mut builder = reqwest::Client::builder() - .timeout(std::time::Duration::from_secs(30)); - - if config.enabled && !config.host.is_empty() { - let proxy_url = build_proxy_url(&config); - let proxy = reqwest::Proxy::all(&proxy_url) - .map_err(|e| format!("Invalid proxy configuration: {}", e))?; - builder = builder.proxy(proxy); - } - - builder - .build() - .map_err(|e| format!("Failed to create client: {}", e)) -} diff --git a/src-tauri/src/raw_input.rs b/src-tauri/src/raw_input.rs deleted file mode 100644 index 4861540..0000000 --- a/src-tauri/src/raw_input.rs +++ /dev/null @@ -1,559 +0,0 @@ -//! Windows Raw Input API for low-latency mouse input -//! Uses WM_INPUT messages to get raw mouse deltas directly from hardware -//! This bypasses the need for cursor recentering and provides true 1:1 input - -#[cfg(target_os = "windows")] -use std::sync::atomic::{AtomicBool, AtomicI32, Ordering}; -#[cfg(target_os = "windows")] -use std::sync::Mutex; - -#[cfg(target_os = "windows")] -static RAW_INPUT_REGISTERED: AtomicBool = AtomicBool::new(false); -#[cfg(target_os = "windows")] -static RAW_INPUT_ACTIVE: AtomicBool = AtomicBool::new(false); -#[cfg(target_os = "windows")] -static ACCUMULATED_DX: AtomicI32 = AtomicI32::new(0); -#[cfg(target_os = "windows")] -static ACCUMULATED_DY: AtomicI32 = AtomicI32::new(0); -#[cfg(target_os = "windows")] -static MESSAGE_WINDOW: Mutex> = Mutex::new(None); - -#[cfg(target_os = "windows")] -mod win32 { - use std::ffi::c_void; - use std::mem::size_of; - use std::sync::atomic::{AtomicI32, Ordering}; - - pub type HWND = isize; - pub type WPARAM = usize; - pub type LPARAM = isize; - pub type LRESULT = isize; - pub type HINSTANCE = isize; - pub type ATOM = u16; - - // Window messages - pub const WM_INPUT: u32 = 0x00FF; - pub const WM_DESTROY: u32 = 0x0002; - - // Raw input constants - pub const RIDEV_INPUTSINK: u32 = 0x00000100; - pub const RIDEV_REMOVE: u32 = 0x00000001; - pub const RID_INPUT: u32 = 0x10000003; - pub const RIM_TYPEMOUSE: u32 = 0; - pub const MOUSE_MOVE_RELATIVE: u16 = 0x00; - - // HID usage page and usage for mouse - pub const HID_USAGE_PAGE_GENERIC: u16 = 0x01; - pub const HID_USAGE_GENERIC_MOUSE: u16 = 0x02; - - // Center position for cursor confinement - pub static CENTER_X: AtomicI32 = AtomicI32::new(0); - pub static CENTER_Y: AtomicI32 = AtomicI32::new(0); - - #[link(name = "user32")] - extern "system" { - pub fn SetCursorPos(x: i32, y: i32) -> i32; - fn GetForegroundWindow() -> isize; - fn GetClientRect(hwnd: isize, rect: *mut RECT) -> i32; - fn ClientToScreen(hwnd: isize, point: *mut POINT) -> i32; - } - - #[repr(C)] - struct POINT { - x: i32, - y: i32, - } - - #[repr(C)] - struct RECT { - left: i32, - top: i32, - right: i32, - bottom: i32, - } - - /// Update the center position based on current window - pub fn update_center() -> bool { - unsafe { - let hwnd = GetForegroundWindow(); - if hwnd == 0 { - return false; - } - let mut rect = RECT { left: 0, top: 0, right: 0, bottom: 0 }; - if GetClientRect(hwnd, &mut rect) == 0 { - return false; - } - let mut center = POINT { - x: rect.right / 2, - y: rect.bottom / 2, - }; - if ClientToScreen(hwnd, &mut center) == 0 { - return false; - } - CENTER_X.store(center.x, Ordering::SeqCst); - CENTER_Y.store(center.y, Ordering::SeqCst); - true - } - } - - /// Recenter the cursor to the stored center position - #[inline] - pub fn recenter_cursor() { - let cx = CENTER_X.load(Ordering::SeqCst); - let cy = CENTER_Y.load(Ordering::SeqCst); - if cx != 0 && cy != 0 { - unsafe { - SetCursorPos(cx, cy); - } - } - } - - #[repr(C)] - #[derive(Clone, Copy)] - pub struct RAWINPUTDEVICE { - pub usage_page: u16, - pub usage: u16, - pub flags: u32, - pub hwnd_target: HWND, - } - - #[repr(C)] - #[derive(Clone, Copy)] - pub struct RAWINPUTHEADER { - pub dw_type: u32, - pub dw_size: u32, - pub h_device: *mut c_void, - pub w_param: WPARAM, - } - - #[repr(C)] - #[derive(Clone, Copy)] - pub struct RAWMOUSE { - pub flags: u16, - pub button_flags: u16, - pub button_data: u16, - pub raw_buttons: u32, - pub last_x: i32, - pub last_y: i32, - pub extra_information: u32, - } - - #[repr(C)] - #[derive(Clone, Copy)] - pub union RAWINPUT_DATA { - pub mouse: RAWMOUSE, - pub keyboard: [u8; 24], // RAWKEYBOARD placeholder - pub hid: [u8; 40], // RAWHID placeholder - } - - #[repr(C)] - #[derive(Clone, Copy)] - pub struct RAWINPUT { - pub header: RAWINPUTHEADER, - pub data: RAWINPUT_DATA, - } - - #[repr(C)] - pub struct WNDCLASSEXW { - pub cb_size: u32, - pub style: u32, - pub lpfn_wnd_proc: Option LRESULT>, - pub cb_cls_extra: i32, - pub cb_wnd_extra: i32, - pub h_instance: HINSTANCE, - pub h_icon: *mut c_void, - pub h_cursor: *mut c_void, - pub hbr_background: *mut c_void, - pub lpsz_menu_name: *const u16, - pub lpsz_class_name: *const u16, - pub h_icon_sm: *mut c_void, - } - - #[repr(C)] - pub struct MSG { - pub hwnd: HWND, - pub message: u32, - pub w_param: WPARAM, - pub l_param: LPARAM, - pub time: u32, - pub pt_x: i32, - pub pt_y: i32, - } - - #[link(name = "user32")] - extern "system" { - pub fn RegisterRawInputDevices( - devices: *const RAWINPUTDEVICE, - num_devices: u32, - size: u32, - ) -> i32; - - pub fn GetRawInputData( - raw_input: *mut c_void, - command: u32, - data: *mut c_void, - size: *mut u32, - header_size: u32, - ) -> u32; - - pub fn DefWindowProcW(hwnd: HWND, msg: u32, wparam: WPARAM, lparam: LPARAM) -> LRESULT; - - pub fn RegisterClassExW(wc: *const WNDCLASSEXW) -> ATOM; - - pub fn CreateWindowExW( - ex_style: u32, - class_name: *const u16, - window_name: *const u16, - style: u32, - x: i32, - y: i32, - width: i32, - height: i32, - parent: HWND, - menu: *mut c_void, - instance: HINSTANCE, - param: *mut c_void, - ) -> HWND; - - pub fn DestroyWindow(hwnd: HWND) -> i32; - - pub fn GetMessageW(msg: *mut MSG, hwnd: HWND, filter_min: u32, filter_max: u32) -> i32; - - pub fn TranslateMessage(msg: *const MSG) -> i32; - - pub fn DispatchMessageW(msg: *const MSG) -> LRESULT; - - pub fn PostMessageW(hwnd: HWND, msg: u32, wparam: WPARAM, lparam: LPARAM) -> i32; - - pub fn GetModuleHandleW(module_name: *const u16) -> HINSTANCE; - - pub fn PostQuitMessage(exit_code: i32); - } - - /// Convert a Rust string to a null-terminated wide string - pub fn to_wide(s: &str) -> Vec { - s.encode_utf16().chain(std::iter::once(0)).collect() - } - - /// Register for raw mouse input - pub fn register_raw_mouse(hwnd: HWND) -> bool { - let device = RAWINPUTDEVICE { - usage_page: HID_USAGE_PAGE_GENERIC, - usage: HID_USAGE_GENERIC_MOUSE, - flags: 0, // Only receive input when window is focused (prevents cursor jump in other apps) - hwnd_target: hwnd, - }; - - unsafe { - RegisterRawInputDevices( - &device, - 1, - size_of::() as u32, - ) != 0 - } - } - - /// Unregister raw mouse input - pub fn unregister_raw_mouse() -> bool { - let device = RAWINPUTDEVICE { - usage_page: HID_USAGE_PAGE_GENERIC, - usage: HID_USAGE_GENERIC_MOUSE, - flags: RIDEV_REMOVE, - hwnd_target: 0, - }; - - unsafe { - RegisterRawInputDevices( - &device, - 1, - size_of::() as u32, - ) != 0 - } - } - - /// Process a WM_INPUT message and extract mouse delta - /// Uses a properly aligned stack buffer to avoid heap allocations - pub fn process_raw_input(lparam: LPARAM) -> Option<(i32, i32)> { - unsafe { - // Use a properly aligned buffer for RAWINPUT struct - // RAWINPUT contains pointers which need 8-byte alignment on x64 - #[repr(C, align(8))] - struct AlignedBuffer { - data: [u8; 64], - } - - let mut buffer = AlignedBuffer { data: [0; 64] }; - let mut size: u32 = buffer.data.len() as u32; - - let result = GetRawInputData( - lparam as *mut c_void, - RID_INPUT, - buffer.data.as_mut_ptr() as *mut c_void, - &mut size, - size_of::() as u32, - ); - - if result == u32::MAX || result == 0 { - return None; - } - - // Parse the raw input - buffer is now properly aligned - let raw = &*(buffer.data.as_ptr() as *const RAWINPUT); - - // Check if it's mouse input - if raw.header.dw_type != RIM_TYPEMOUSE { - return None; - } - - let mouse = &raw.data.mouse; - - // Only process relative mouse movement - if mouse.flags == MOUSE_MOVE_RELATIVE { - if mouse.last_x != 0 || mouse.last_y != 0 { - return Some((mouse.last_x, mouse.last_y)); - } - } - - None - } - } -} - -#[cfg(target_os = "windows")] -use win32::*; - -/// Window procedure for the message-only window -#[cfg(target_os = "windows")] -unsafe extern "system" fn raw_input_wnd_proc( - hwnd: HWND, - msg: u32, - wparam: WPARAM, - lparam: LPARAM, -) -> LRESULT { - match msg { - WM_INPUT => { - if RAW_INPUT_ACTIVE.load(Ordering::SeqCst) { - if let Some((dx, dy)) = process_raw_input(lparam) { - // Accumulate deltas atomically - ACCUMULATED_DX.fetch_add(dx, Ordering::SeqCst); - ACCUMULATED_DY.fetch_add(dy, Ordering::SeqCst); - // Recenter cursor to prevent it from hitting screen edges - recenter_cursor(); - } - } - 0 - } - WM_DESTROY => { - PostQuitMessage(0); - 0 - } - _ => DefWindowProcW(hwnd, msg, wparam, lparam), - } -} - -/// Start raw input capture -/// Creates a message-only window to receive WM_INPUT messages -#[cfg(target_os = "windows")] -pub fn start_raw_input() -> Result<(), String> { - // Initialize center position for cursor confinement - if !update_center() { - return Err("Failed to get window center".to_string()); - } - // Initial recenter - recenter_cursor(); - - if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { - RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); - return Ok(()); - } - - // Spawn a thread to handle the message loop - std::thread::spawn(|| { - unsafe { - let class_name = to_wide("OpenNOW_RawInput"); - let h_instance = GetModuleHandleW(std::ptr::null()); - - // Register window class - let wc = WNDCLASSEXW { - cb_size: std::mem::size_of::() as u32, - style: 0, - lpfn_wnd_proc: Some(raw_input_wnd_proc), - cb_cls_extra: 0, - cb_wnd_extra: 0, - h_instance, - h_icon: std::ptr::null_mut(), - h_cursor: std::ptr::null_mut(), - hbr_background: std::ptr::null_mut(), - lpsz_menu_name: std::ptr::null(), - lpsz_class_name: class_name.as_ptr(), - h_icon_sm: std::ptr::null_mut(), - }; - - if RegisterClassExW(&wc) == 0 { - log::error!("Failed to register raw input window class"); - return; - } - - // Create message-only window (HWND_MESSAGE = -3) - let hwnd = CreateWindowExW( - 0, - class_name.as_ptr(), - std::ptr::null(), - 0, - 0, 0, 0, 0, - -3isize, // HWND_MESSAGE - message-only window - std::ptr::null_mut(), - h_instance, - std::ptr::null_mut(), - ); - - if hwnd == 0 { - log::error!("Failed to create raw input window"); - return; - } - - // Store window handle - *MESSAGE_WINDOW.lock().unwrap() = Some(hwnd); - - // Register for raw mouse input - if !register_raw_mouse(hwnd) { - log::error!("Failed to register raw mouse input"); - DestroyWindow(hwnd); - return; - } - - RAW_INPUT_REGISTERED.store(true, Ordering::SeqCst); - RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); - log::info!("Raw input started - receiving hardware mouse deltas"); - - // Message loop - let mut msg: MSG = std::mem::zeroed(); - while GetMessageW(&mut msg, 0, 0, 0) > 0 { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - // Cleanup - RAW_INPUT_REGISTERED.store(false, Ordering::SeqCst); - RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); - *MESSAGE_WINDOW.lock().unwrap() = None; - log::info!("Raw input thread stopped"); - } - }); - - // Wait a bit for the thread to start - std::thread::sleep(std::time::Duration::from_millis(50)); - - if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { - Ok(()) - } else { - Err("Failed to start raw input".to_string()) - } -} - -/// Stop raw input capture (but keep the window for later reuse) -#[cfg(target_os = "windows")] -pub fn pause_raw_input() { - RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); - ACCUMULATED_DX.store(0, Ordering::SeqCst); - ACCUMULATED_DY.store(0, Ordering::SeqCst); -} - -/// Resume raw input capture -#[cfg(target_os = "windows")] -pub fn resume_raw_input() { - if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { - ACCUMULATED_DX.store(0, Ordering::SeqCst); - ACCUMULATED_DY.store(0, Ordering::SeqCst); - RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); - } -} - -/// Stop raw input completely and destroy the window -#[cfg(target_os = "windows")] -pub fn stop_raw_input() { - RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); - - // Unregister raw input - unregister_raw_mouse(); - - // Post quit message to stop the message loop - if let Some(hwnd) = *MESSAGE_WINDOW.lock().unwrap() { - unsafe { - PostMessageW(hwnd, WM_DESTROY, 0, 0); - } - } -} - -/// Get accumulated mouse deltas and reset -#[cfg(target_os = "windows")] -pub fn get_raw_mouse_delta() -> (i32, i32) { - let dx = ACCUMULATED_DX.swap(0, Ordering::SeqCst); - let dy = ACCUMULATED_DY.swap(0, Ordering::SeqCst); - (dx, dy) -} - -/// Check if raw input is active -#[cfg(target_os = "windows")] -pub fn is_raw_input_active() -> bool { - RAW_INPUT_ACTIVE.load(Ordering::SeqCst) -} - -// Non-Windows stubs -#[cfg(not(target_os = "windows"))] -pub fn start_raw_input() -> Result<(), String> { - Err("Raw input only supported on Windows".to_string()) -} - -#[cfg(not(target_os = "windows"))] -pub fn pause_raw_input() {} - -#[cfg(not(target_os = "windows"))] -pub fn resume_raw_input() {} - -#[cfg(not(target_os = "windows"))] -pub fn stop_raw_input() {} - -#[cfg(not(target_os = "windows"))] -pub fn get_raw_mouse_delta() -> (i32, i32) { - (0, 0) -} - -#[cfg(not(target_os = "windows"))] -pub fn is_raw_input_active() -> bool { - false -} - -// Tauri commands -use tauri::command; - -#[command] -pub fn start_raw_mouse_input() -> Result { - start_raw_input()?; - Ok(true) -} - -#[command] -pub fn stop_raw_mouse_input() { - stop_raw_input(); -} - -#[command] -pub fn pause_raw_mouse_input() { - pause_raw_input(); -} - -#[command] -pub fn resume_raw_mouse_input() { - resume_raw_input(); -} - -#[command] -pub fn get_raw_delta() -> (i32, i32) { - get_raw_mouse_delta() -} - -#[command] -pub fn is_raw_input_running() -> bool { - is_raw_input_active() -} diff --git a/src-tauri/src/recording.rs b/src-tauri/src/recording.rs deleted file mode 100644 index 55eb233..0000000 --- a/src-tauri/src/recording.rs +++ /dev/null @@ -1,181 +0,0 @@ -use std::fs; -use std::path::PathBuf; -use tauri::command; - -/// Get the default recordings directory (Videos/OpenNow) -fn get_default_recordings_dir() -> PathBuf { - dirs::video_dir() - .unwrap_or_else(|| dirs::home_dir().unwrap_or_else(|| PathBuf::from("."))) - .join("OpenNow") -} - -/// Get the recordings directory (custom or default) -fn get_recordings_dir_path(custom_dir: Option) -> PathBuf { - match custom_dir { - Some(dir) if !dir.is_empty() => PathBuf::from(dir), - _ => get_default_recordings_dir(), - } -} - -/// Ensure the recordings directory exists -fn ensure_recordings_dir(path: &PathBuf) -> Result<(), String> { - if !path.exists() { - fs::create_dir_all(path) - .map_err(|e| format!("Failed to create recordings directory: {}", e))?; - } - Ok(()) -} - -/// Get the recordings directory path -#[command] -pub async fn get_recordings_dir(custom_dir: Option) -> Result { - let path = get_recordings_dir_path(custom_dir); - ensure_recordings_dir(&path)?; - path.to_str() - .map(|s| s.to_string()) - .ok_or_else(|| "Invalid path encoding".to_string()) -} - -/// Save a recording file (receives raw bytes from frontend) -#[command] -pub async fn save_recording( - data: Vec, - filename: String, - custom_dir: Option, -) -> Result { - let dir = get_recordings_dir_path(custom_dir); - ensure_recordings_dir(&dir)?; - - let file_path = dir.join(&filename); - - fs::write(&file_path, &data) - .map_err(|e| format!("Failed to save recording: {}", e))?; - - log::info!("Recording saved: {:?} ({} bytes)", file_path, data.len()); - - file_path.to_str() - .map(|s| s.to_string()) - .ok_or_else(|| "Invalid path encoding".to_string()) -} - -/// Save a screenshot file (receives raw bytes from frontend) -#[command] -pub async fn save_screenshot( - data: Vec, - filename: String, - custom_dir: Option, -) -> Result { - let dir = get_recordings_dir_path(custom_dir); - ensure_recordings_dir(&dir)?; - - let file_path = dir.join(&filename); - - fs::write(&file_path, &data) - .map_err(|e| format!("Failed to save screenshot: {}", e))?; - - log::info!("Screenshot saved: {:?} ({} bytes)", file_path, data.len()); - - file_path.to_str() - .map(|s| s.to_string()) - .ok_or_else(|| "Invalid path encoding".to_string()) -} - -/// Open the recordings folder in the system file explorer -#[command] -pub async fn open_recordings_folder(custom_dir: Option) -> Result<(), String> { - let dir = get_recordings_dir_path(custom_dir); - ensure_recordings_dir(&dir)?; - - #[cfg(target_os = "windows")] - { - std::process::Command::new("explorer") - .arg(&dir) - .spawn() - .map_err(|e| format!("Failed to open folder: {}", e))?; - } - - #[cfg(target_os = "macos")] - { - std::process::Command::new("open") - .arg(&dir) - .spawn() - .map_err(|e| format!("Failed to open folder: {}", e))?; - } - - #[cfg(target_os = "linux")] - { - std::process::Command::new("xdg-open") - .arg(&dir) - .spawn() - .map_err(|e| format!("Failed to open folder: {}", e))?; - } - - Ok(()) -} - -/// List all recordings in the recordings directory -#[command] -pub async fn list_recordings(custom_dir: Option) -> Result, String> { - let dir = get_recordings_dir_path(custom_dir); - - if !dir.exists() { - return Ok(Vec::new()); - } - - let mut recordings = Vec::new(); - - let entries = fs::read_dir(&dir) - .map_err(|e| format!("Failed to read recordings directory: {}", e))?; - - for entry in entries.flatten() { - let path = entry.path(); - if path.is_file() { - if let Some(ext) = path.extension() { - let ext_str = ext.to_str().unwrap_or(""); - if ext_str == "webm" || ext_str == "png" { - if let Ok(metadata) = fs::metadata(&path) { - recordings.push(RecordingInfo { - filename: path.file_name() - .and_then(|n| n.to_str()) - .unwrap_or("") - .to_string(), - path: path.to_str().unwrap_or("").to_string(), - size_bytes: metadata.len(), - is_screenshot: ext_str == "png", - }); - } - } - } - } - } - - // Sort by filename (which includes timestamp, so newest first) - recordings.sort_by(|a, b| b.filename.cmp(&a.filename)); - - Ok(recordings) -} - -/// Delete a recording file -#[command] -pub async fn delete_recording(filepath: String) -> Result<(), String> { - let path = PathBuf::from(&filepath); - - if !path.exists() { - return Err("File not found".to_string()); - } - - fs::remove_file(&path) - .map_err(|e| format!("Failed to delete recording: {}", e))?; - - log::info!("Recording deleted: {:?}", path); - Ok(()) -} - -/// Recording file information -#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] -pub struct RecordingInfo { - pub filename: String, - pub path: String, - pub size_bytes: u64, - pub is_screenshot: bool, -} diff --git a/src-tauri/src/streaming.rs b/src-tauri/src/streaming.rs deleted file mode 100644 index ab06ee3..0000000 --- a/src-tauri/src/streaming.rs +++ /dev/null @@ -1,2015 +0,0 @@ -use serde::{Deserialize, Serialize}; -use std::sync::Arc; -use tauri::command; -use tokio::sync::Mutex; - -/// Streaming session state -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct StreamingSession { - pub session_id: String, - pub game_id: String, - pub server: SessionServer, - pub status: SessionStatus, - pub quality: StreamingQuality, - pub stats: Option, - pub webrtc_offer: Option, - pub signaling_url: Option, - /// ICE servers from session API (Alliance Partners like Zain provide TURN servers here) - #[serde(default)] - pub ice_servers: Vec, - /// Media connection info from session API (usage=2 or usage=17) - /// Contains the real UDP port for streaming, instead of the dummy port 47998 in SDP - #[serde(default)] - pub media_connection_info: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct SessionServer { - pub id: String, - pub name: String, - pub region: String, - pub ip: Option, - pub zone: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum SessionStatus { - Queued { position: u32, estimated_wait: u32 }, - Connecting, - Starting, - Running, - Paused, - Resuming, - Stopping, - Stopped, - Error { message: String }, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct StreamingQuality { - pub resolution: Resolution, - pub fps: u32, - pub bitrate_kbps: u32, - pub codec: VideoCodec, - pub hdr_enabled: bool, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum Resolution { - R720p, - R1080p, - R1440p, - R2160p, // 4K -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -pub enum VideoCodec { - H264, - H265, - AV1, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct StreamingStats { - pub fps: f32, - pub latency_ms: u32, - pub packet_loss: f32, - pub bitrate_kbps: u32, - pub resolution: String, - pub codec: String, - pub jitter_ms: Option, - pub round_trip_time_ms: Option, -} - -/// Session start request -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct StartSessionRequest { - pub game_id: String, - pub store_type: String, - pub store_id: String, - pub preferred_server: Option, - pub quality_preset: Option, - pub resolution: Option, - pub fps: Option, - pub codec: Option, - pub max_bitrate_mbps: Option, - /// Enable NVIDIA Reflex low-latency mode - pub reflex: Option, -} - -/// CloudMatch session request - based on GFN native client protocol (from geronimo.log) -/// POST to https://{zone}.cloudmatchbeta.nvidiagrid.net:443/v2/session?keyboardLayout=en-US&languageCode=en_US -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct CloudMatchRequest { - session_request_data: SessionRequestData, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct SessionRequestData { - app_id: String, // GFN internal app ID as STRING (browser format) - internal_title: Option, - available_supported_controllers: Vec, - network_test_session_id: Option, - parent_session_id: Option, - client_identification: String, - device_hash_id: String, - client_version: String, - sdk_version: String, - streamer_version: i32, // NUMBER, not string (browser format) - client_platform_name: String, - client_request_monitor_settings: Vec, - use_ops: bool, - audio_mode: i32, - meta_data: Vec, - sdr_hdr_mode: i32, - client_display_hdr_capabilities: Option, - surround_audio_info: i32, - remote_controllers_bitmap: i32, - client_timezone_offset: i64, - enhanced_stream_mode: i32, - app_launch_mode: i32, - secure_rtsp_supported: bool, - partner_custom_data: Option, - account_linked: bool, - enable_persisting_in_game_settings: bool, - user_age: i32, - requested_streaming_features: Option, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct MonitorSettings { - width_in_pixels: u32, - height_in_pixels: u32, - frames_per_second: u32, - sdr_hdr_mode: i32, - display_data: DisplayDataSimple, - dpi: i32, -} - -/// Simplified DisplayData for browser format -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct DisplayDataSimple { - desired_content_max_luminance: i32, - desired_content_min_luminance: i32, - desired_content_max_frame_average_luminance: i32, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct DisplayData { - display_primary_x0: f32, - display_primary_y0: f32, - display_primary_x1: f32, - display_primary_y1: f32, - display_primary_x2: f32, - display_primary_y2: f32, - display_white_point_x: f32, - display_white_point_y: f32, - desired_content_max_luminance: f32, - desired_content_min_luminance: f32, - desired_content_max_frame_average_luminance: f32, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct HdrCapabilities { - version: i32, - hdr_edr_supported_flags_in_uint32: i32, - static_metadata_descriptor_id: i32, - display_data: Option, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct MetaDataEntry { - key: String, - value: String, -} - -#[derive(Debug, Serialize)] -#[serde(rename_all = "camelCase")] -struct StreamingFeatures { - reflex: bool, - bit_depth: i32, - cloud_gsync: bool, - enabled_l4s: bool, - mouse_movement_flags: i32, - true_hdr: bool, - supported_hid_devices: i32, - profile: i32, - fallback_to_logical_resolution: bool, - hid_devices: Option, - chroma_format: i32, - prefilter_mode: i32, - prefilter_sharpness: i32, - prefilter_noise_reduction: i32, - hud_streaming_mode: i32, -} - -/// Session start response from CloudMatch - matches actual API response -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct CloudMatchApiResponse { - session: SessionData, - request_status: RequestStatus, - #[serde(default)] - other_user_sessions: Option>, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SessionData { - session_id: String, - #[serde(default)] - session_request_data: Option, - #[serde(default)] - seat_setup_info: Option, - #[serde(default)] - session_control_info: Option, - #[serde(default)] - connection_info: Option>, - #[serde(default)] - gpu_type: Option, - #[serde(default)] - status: i32, - #[serde(default)] - error_code: i32, - #[serde(default)] - client_ip: Option, - #[serde(default)] - ice_server_configuration: Option, -} - -/// ICE server configuration from session API (Alliance Partners like Zain provide TURN servers here) -#[derive(Debug, Deserialize, Clone)] -#[serde(rename_all = "camelCase")] -struct IceServerConfiguration { - #[serde(default)] - ice_servers: Vec, -} - -/// Individual ICE server from session API -#[derive(Debug, Deserialize, Clone)] -#[serde(rename_all = "camelCase")] -struct SessionIceServer { - urls: String, // Can be a single URL like "turn:server:3478" - #[serde(default)] - username: Option, - #[serde(default)] - credential: Option, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SeatSetupInfo { - #[serde(default)] - queue_position: i32, - #[serde(default)] - seat_setup_eta: i32, - #[serde(default)] - seat_setup_step: i32, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SessionControlInfo { - #[serde(default)] - ip: Option, - #[serde(default)] - port: u16, - #[serde(default)] - resource_path: Option, -} - -#[derive(Debug, Serialize, Deserialize, Clone)] -#[serde(rename_all = "camelCase")] -pub struct ConnectionInfo { - #[serde(default)] - ip: Option, - #[serde(default)] - port: u16, - #[serde(default)] - resource_path: Option, - /// Usage type for connection routing: - /// - 2: Primary media path (UDP) - used for streaming data - /// - 14: Signaling (WSS) - used for WebRTC negotiation, NOT for media - /// - 17: Alternative media path - used by some Alliance Partners (e.g., Zain) - /// when primary media (usage=2) is not available - #[serde(default)] - usage: i32, - /// Protocol: 1 = TCP/WSS, 2 = UDP - #[serde(default)] - protocol: i32, -} - -/// Media connection info extracted from session API (for Alliance Partners like Zain) -/// The official client uses connectionInfo with usage=2 or usage=17 to get the real media port -/// instead of using the dummy port 47998 from the SDP -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct MediaConnectionInfo { - pub ip: String, - pub port: u16, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct RequestStatus { - status_code: i32, - #[serde(default)] - status_description: Option, - #[serde(default)] - unified_error_code: i32, - #[serde(default)] - request_id: Option, - #[serde(default)] - server_id: Option, -} - -#[derive(Debug, Clone, Deserialize, Serialize)] -#[serde(rename_all = "camelCase")] -pub struct IceServer { - pub urls: Vec, - pub username: Option, - pub credential: Option, -} - -/// WebRTC session info for frontend -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct WebRTCSessionInfo { - pub session_id: String, - pub signaling_url: String, - pub ice_servers: Vec, - pub offer_sdp: Option, -} - -/// Global session storage -static CURRENT_SESSION: std::sync::OnceLock>>> = std::sync::OnceLock::new(); - -fn get_session_storage() -> Arc>> { - CURRENT_SESSION - .get_or_init(|| Arc::new(Mutex::new(None))) - .clone() -} - -// API endpoints - discovered from GFN native client analysis (geronimo.log) -// CloudMatch handles session allocation - regional endpoints -// Format: https://{zone}.cloudmatchbeta.nvidiagrid.net:443/v2/session -// Example zones: eu-netherlands-north, us-california-north, ap-japan, etc. -const CLOUDMATCH_DEFAULT_ZONE: &str = "eu-netherlands-north"; -const CLOUDMATCH_PROD_URL: &str = "https://prod.cloudmatchbeta.nvidiagrid.net"; - -// Server info endpoint to get zone/server details -fn cloudmatch_zone_url(zone: &str) -> String { - format!("https://{}.cloudmatchbeta.nvidiagrid.net", zone) -} - -/// Parse resolution string to width/height -/// Supports formats: "1080p", "1440p", "4k", "2160p", or "WIDTHxHEIGHT" (e.g., "2560x1440") -fn parse_resolution(resolution: Option<&str>) -> (u32, u32) { - match resolution { - Some("720p") => (1280, 720), - Some("1080p") => (1920, 1080), - Some("1440p") => (2560, 1440), - Some("4k") | Some("2160p") => (3840, 2160), - Some(res) if res.contains('x') => { - // Parse "WIDTHxHEIGHT" format - let parts: Vec<&str> = res.split('x').collect(); - if parts.len() == 2 { - let width = parts[0].parse::().unwrap_or(1920); - let height = parts[1].parse::().unwrap_or(1080); - log::info!("Parsed resolution {}x{} from '{}'", width, height, res); - (width, height) - } else { - (1920, 1080) - } - } - _ => (1920, 1080), // Default to 1080p - } -} - -fn parse_codec(codec: Option<&str>) -> VideoCodec { - match codec { - Some("h264") | Some("H264") => VideoCodec::H264, - Some("h265") | Some("H265") | Some("hevc") | Some("HEVC") => VideoCodec::H265, - Some("av1") | Some("AV1") => VideoCodec::AV1, - _ => VideoCodec::H264, // Default to H264 - } -} - -/// Generate a device ID (UUID format like browser client) -fn generate_device_id() -> String { - uuid::Uuid::new_v4().to_string() -} - -/// Get or create a persistent device ID stored in app data -fn get_device_id() -> String { - // For now, generate a new one - in production this should be persisted - generate_device_id() -} - -/// Get client ID (also UUID format) -fn get_client_id() -> String { - uuid::Uuid::new_v4().to_string() -} - -/// Extract media connection info from connectionInfo array -/// Looks for entries with usage=2 (media) or usage=17 (alternative media) -/// These contain the real UDP port for streaming, instead of the dummy port 47998 in SDP -fn extract_media_connection_info(connection_info: Option<&Vec>) -> Option { - connection_info.and_then(|conns| { - // Find connection with usage=2 (media) or usage=17 (alternative media) - // Prefer usage=2, fall back to usage=17 - let media_conn = conns.iter() - .find(|c| c.usage == 2) - .or_else(|| conns.iter().find(|c| c.usage == 17)); - - if let Some(conn) = media_conn { - if let Some(ref ip) = conn.ip { - if conn.port > 0 { - log::debug!("Found media connection info: {}:{} (usage={}, protocol={})", - ip, conn.port, conn.usage, conn.protocol); - return Some(MediaConnectionInfo { - ip: ip.clone(), - port: conn.port, - }); - } - } - } - - // Log all connection info entries for debugging only when media connection not found - log::debug!("No media connection info found, available entries:"); - for conn in conns.iter() { - log::debug!(" - ip={:?}, port={}, usage={}, protocol={}", - conn.ip, conn.port, conn.usage, conn.protocol); - } - - None - }) -} - -/// Start a streaming session with CloudMatch and get WebRTC signaling info -/// Uses the browser client format which works with standard JWT authentication -#[command] -pub async fn start_session( - request: StartSessionRequest, - access_token: String, -) -> Result { - log::info!("Starting session for game: {}", request.game_id); - - // Use proxy-aware client if configured - let client = crate::proxy::create_proxied_client().await?; - - let (width, height) = parse_resolution(request.resolution.as_deref()); - let fps = request.fps.unwrap_or(60); - let codec = parse_codec(request.codec.as_deref()); - let max_bitrate_mbps = request.max_bitrate_mbps.unwrap_or(200); - // Convert to kbps, 200+ means unlimited (use very high value) - let max_bitrate_kbps = if max_bitrate_mbps >= 200 { - 500_000 // 500 Mbps = effectively unlimited - } else { - max_bitrate_mbps * 1000 - }; - - // Reflex: auto-enable for 120+ FPS if not explicitly set, or use user preference - let reflex_enabled = request.reflex.unwrap_or(fps >= 120); - - log::debug!("Using resolution {}x{} @ {} FPS, codec: {:?}, max bitrate: {} kbps, reflex: {}", - width, height, fps, codec, max_bitrate_kbps, reflex_enabled); - - // Determine zone to use (browser uses eu-netherlands-south) - let zone = request.preferred_server.clone() - .unwrap_or_else(|| "eu-netherlands-south".to_string()); - - // Check if we're using an Alliance Partner (non-NVIDIA provider) - // Alliance Partners use their own streaming URLs instead of cloudmatchbeta.nvidiagrid.net - let streaming_base_url = crate::auth::get_streaming_base_url().await; - let is_alliance_partner = !streaming_base_url.contains("cloudmatchbeta.nvidiagrid.net"); - - log::debug!("Streaming base URL: {}", streaming_base_url); - - // Generate device and client IDs (UUID format like browser) - let device_id = get_device_id(); - let client_id = get_client_id(); - let sub_session_id = uuid::Uuid::new_v4().to_string(); - - // Get timezone offset in milliseconds - let timezone_offset_ms = chrono::Local::now().offset().local_minus_utc() as i64 * 1000; - - // Build CloudMatch request matching the BROWSER client format exactly - let cloudmatch_request = CloudMatchRequest { - session_request_data: SessionRequestData { - app_id: request.game_id.clone(), // STRING format like browser ("100013311") - internal_title: None, - available_supported_controllers: vec![], // Browser sends empty - network_test_session_id: None, // Browser sends null - parent_session_id: None, - client_identification: "GFN-PC".to_string(), - device_hash_id: device_id.clone(), // UUID format - client_version: "30.0".to_string(), - sdk_version: "1.0".to_string(), - streamer_version: 1, // NUMBER, not string (browser format) - client_platform_name: "windows".to_string(), // Native Windows client - client_request_monitor_settings: vec![MonitorSettings { - width_in_pixels: width, - height_in_pixels: height, - frames_per_second: fps, - sdr_hdr_mode: 0, - display_data: DisplayDataSimple { - desired_content_max_luminance: 0, - desired_content_min_luminance: 0, - desired_content_max_frame_average_luminance: 0, - }, - dpi: 100, // Browser uses 100 - }], - use_ops: true, // Browser uses true - audio_mode: 2, // 0=UNKNOWN, 1=STEREO, 2=5.1_SURROUND, 3=7.1_SURROUND - meta_data: vec![ - MetaDataEntry { key: "SubSessionId".to_string(), value: sub_session_id }, - MetaDataEntry { key: "wssignaling".to_string(), value: "1".to_string() }, - MetaDataEntry { key: "GSStreamerType".to_string(), value: "WebRTC".to_string() }, - MetaDataEntry { key: "networkType".to_string(), value: "Unknown".to_string() }, - MetaDataEntry { key: "ClientImeSupport".to_string(), value: "0".to_string() }, - MetaDataEntry { key: "clientPhysicalResolution".to_string(), value: format!("{{\"horizontalPixels\":{},\"verticalPixels\":{}}}", width, height) }, - MetaDataEntry { key: "surroundAudioInfo".to_string(), value: "2".to_string() }, - ], - sdr_hdr_mode: 0, - client_display_hdr_capabilities: None, - surround_audio_info: 0, - remote_controllers_bitmap: 0, - client_timezone_offset: timezone_offset_ms, - enhanced_stream_mode: 1, - app_launch_mode: 1, - secure_rtsp_supported: false, - partner_custom_data: Some("".to_string()), - account_linked: true, // Browser uses true - enable_persisting_in_game_settings: true, // Enable persistent in-game settings - user_age: 26, // Use a reasonable default age - requested_streaming_features: Some(StreamingFeatures { - reflex: reflex_enabled, // NVIDIA Reflex low-latency mode - bit_depth: 0, - cloud_gsync: false, - enabled_l4s: false, - mouse_movement_flags: 0, - true_hdr: false, - supported_hid_devices: 0, - profile: 0, - fallback_to_logical_resolution: false, - hid_devices: None, - chroma_format: 0, - prefilter_mode: 0, - prefilter_sharpness: 0, - prefilter_noise_reduction: 0, - hud_streaming_mode: 0, - }), - }, - }; - - log::debug!("Requesting session from zone: {}", zone); - log::debug!("Device ID: {}, Client ID: {}", device_id, client_id); - - // Build the session URL with query params - // For Alliance Partners, use their streaming URL directly - // For NVIDIA, construct from zone - let session_url = if is_alliance_partner { - // Alliance Partners use their streaming URL directly - let base = streaming_base_url.trim_end_matches('/'); - format!("{}/v2/session?keyboardLayout=en-US&languageCode=en_US", base) - } else { - // NVIDIA uses zone-based URLs - format!( - "{}/v2/session?keyboardLayout=en-US&languageCode=en_US", - cloudmatch_zone_url(&zone) - ) - }; - - log::debug!("Session URL: {}", session_url); - - // Request session from CloudMatch with browser-style headers - let response = client - .post(&session_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - // NV-* headers that browser sends - .header("nv-browser-type", "CHROME") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-client-type", "NATIVE") - .header("nv-client-version", "2.0.80.173") - .header("nv-device-make", "UNKNOWN") - .header("nv-device-model", "UNKNOWN") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP") - .header("x-device-id", &device_id) - .json(&cloudmatch_request) - .send() - .await - .map_err(|e| format!("Failed to request session: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - log::error!("CloudMatch request failed: {} - {}", status, body); - - return Err(format!("Session request failed: {} - {}", status, body)); - } - - // First get raw text to debug - let response_text = response.text().await - .map_err(|e| format!("Failed to read response: {}", e))?; - - log::debug!("CloudMatch response length: {} bytes", response_text.len()); - - let api_response: CloudMatchApiResponse = serde_json::from_str(&response_text) - .map_err(|e| format!("Failed to parse CloudMatch response: {} - Response: {}", e, &response_text[..std::cmp::min(500, response_text.len())]))?; - - // Check request status - if api_response.request_status.status_code != 1 { - let error_desc = api_response.request_status.status_description - .unwrap_or_else(|| "Unknown error".to_string()); - return Err(format!("CloudMatch error: {} (code: {}, unified: {})", - error_desc, - api_response.request_status.status_code, - api_response.request_status.unified_error_code)); - } - - let session_data = api_response.session; - log::info!("Session created: {}", session_data.session_id); - - // Determine initial status from seat setup info - let status = if let Some(ref seat_info) = session_data.seat_setup_info { - if seat_info.queue_position > 0 { - SessionStatus::Queued { - position: seat_info.queue_position as u32, - estimated_wait: (seat_info.seat_setup_eta / 1000) as u32, - } - } else { - SessionStatus::Connecting - } - } else { - SessionStatus::Connecting - }; - - let resolution = match (width, height) { - (1280, 720) => Resolution::R720p, - (1920, 1080) => Resolution::R1080p, - (2560, 1440) => Resolution::R1440p, - _ => Resolution::R2160p, - }; - - // Get server info from session control info - let server_ip = session_data.session_control_info - .as_ref() - .and_then(|sci| sci.ip.clone()) - .unwrap_or_else(|| "unknown".to_string()); - - // Get streaming connection info (WebRTC/RTSP endpoint) - let signaling_url = session_data.connection_info - .as_ref() - .and_then(|conns| conns.first()) - .and_then(|conn| conn.resource_path.clone()); - - // Extract ICE servers from session API (Alliance Partners like Zain provide TURN servers here) - let ice_servers: Vec = session_data.ice_server_configuration - .as_ref() - .map(|config| { - config.ice_servers.iter().map(|server| { - log::debug!("ICE server: {} (has credentials: {})", - server.urls, server.username.is_some()); - IceServerConfig { - urls: vec![server.urls.clone()], - username: server.username.clone(), - credential: server.credential.clone(), - } - }).collect() - }) - .unwrap_or_else(|| { - log::debug!("No ICE servers in session API response"); - vec![] - }); - - // Extract media connection info from connectionInfo (usage=2 or usage=17) - // This contains the real UDP port for streaming, instead of the dummy port 47998 in SDP - // The official GFN client uses this to rewrite SDP candidates - let media_connection_info = extract_media_connection_info(session_data.connection_info.as_ref()); - - let session = StreamingSession { - session_id: session_data.session_id.clone(), - game_id: request.game_id, - server: SessionServer { - id: api_response.request_status.server_id.unwrap_or_else(|| "unknown".to_string()), - name: session_data.gpu_type.unwrap_or_else(|| "GFN Server".to_string()), - region: zone.clone(), - ip: Some(server_ip), - zone: Some(zone), - }, - status, - quality: StreamingQuality { - resolution, - fps, - bitrate_kbps: max_bitrate_kbps, - codec, - hdr_enabled: false, - }, - stats: None, - webrtc_offer: None, - signaling_url, - ice_servers, - media_connection_info, - }; - - // Store session - { - let storage = get_session_storage(); - let mut guard = storage.lock().await; - *guard = Some(session.clone()); - } - - Ok(session) -} - -/// Stop a streaming session -#[command] -pub async fn stop_session( - session_id: String, - access_token: String, -) -> Result<(), String> { - log::info!("Stopping session: {}", session_id); - - // Get the session to find the zone - let zone = { - let storage = get_session_storage(); - let guard = storage.lock().await; - guard.as_ref() - .and_then(|s| s.server.zone.clone()) - .unwrap_or_else(|| CLOUDMATCH_DEFAULT_ZONE.to_string()) - }; - - let client = crate::proxy::create_proxied_client().await?; - - // Check if we're using an Alliance Partner - let streaming_base_url = crate::auth::get_streaming_base_url().await; - let is_alliance_partner = !streaming_base_url.contains("cloudmatchbeta.nvidiagrid.net"); - - // DELETE to session endpoint - // For Alliance Partners, use their streaming URL - let delete_url = if is_alliance_partner { - let base = streaming_base_url.trim_end_matches('/'); - format!("{}/v2/session/{}", base, session_id) - } else { - format!("{}/v2/session/{}", cloudmatch_zone_url(&zone), session_id) - }; - - log::debug!("Delete URL: {}", delete_url); - - let response = client - .delete(&delete_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .send() - .await - .map_err(|e| format!("Failed to stop session: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - log::warn!("Session stop returned: {} - {}", status, body); - } - - // Clear stored session - { - let storage = get_session_storage(); - let mut guard = storage.lock().await; - *guard = None; - } - - log::debug!("Session stopped: {}", session_id); - Ok(()) -} - -impl Default for StreamingQuality { - fn default() -> Self { - Self { - resolution: Resolution::R1080p, - fps: 60, - bitrate_kbps: 25000, - codec: VideoCodec::H264, - hdr_enabled: false, - } - } -} - -impl Resolution { - pub fn width(&self) -> u32 { - match self { - Resolution::R720p => 1280, - Resolution::R1080p => 1920, - Resolution::R1440p => 2560, - Resolution::R2160p => 3840, - } - } - - pub fn height(&self) -> u32 { - match self { - Resolution::R720p => 720, - Resolution::R1080p => 1080, - Resolution::R1440p => 1440, - Resolution::R2160p => 2160, - } - } -} - -// ============================================================================ -// SESSION POLLING & STREAMING MANAGEMENT -// ============================================================================ - -use std::sync::atomic::{AtomicBool, AtomicI32, Ordering}; - -/// Global flag to control polling loop -static POLLING_ACTIVE: AtomicBool = AtomicBool::new(false); - -/// Global queue status for frontend to query -static QUEUE_POSITION: AtomicI32 = AtomicI32::new(0); -static QUEUE_ETA_MS: AtomicI32 = AtomicI32::new(0); -static SESSION_STATUS: AtomicI32 = AtomicI32::new(0); - -/// Streaming connection state -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct StreamingConnectionState { - pub session_id: String, - pub phase: StreamingPhase, - pub server_ip: Option, - pub signaling_url: Option, - pub connection_info: Option, - pub gpu_type: Option, - pub error: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)] -pub enum StreamingPhase { - Queued { position: i32, eta_ms: i32 }, - SeatSetup { step: i32, eta_ms: i32 }, - Connecting, - Ready, - Streaming, - Error, - Stopped, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct StreamConnectionInfo { - pub control_ip: String, - pub control_port: u16, - pub stream_ip: Option, - pub stream_port: u16, - pub resource_path: String, -} - -/// Extended session status response for polling -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct PollSessionResponse { - session: PollSessionData, - request_status: RequestStatus, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct PollSessionData { - session_id: String, - #[serde(default)] - seat_setup_info: Option, - #[serde(default)] - session_control_info: Option, - #[serde(default)] - connection_info: Option>, - #[serde(default)] - gpu_type: Option, - #[serde(default)] - status: i32, - #[serde(default)] - error_code: i32, - #[serde(default)] - client_ip: Option, - #[serde(default)] - monitor_settings: Option, - #[serde(default)] - finalized_streaming_features: Option, - #[serde(default)] - ice_server_configuration: Option, -} - -/// Poll session status until ready or error -/// Returns the final streaming connection state -#[command] -pub async fn poll_session_until_ready( - session_id: String, - access_token: String, - poll_interval_ms: Option, -) -> Result { - let interval = poll_interval_ms.unwrap_or(2000); // Default 2 seconds - - log::debug!("Starting session polling for {}", session_id); - POLLING_ACTIVE.store(true, Ordering::SeqCst); - - // Get session info for zone - let (zone, control_server) = { - let storage = get_session_storage(); - let guard = storage.lock().await; - match guard.as_ref() { - Some(session) => ( - session.server.zone.clone().unwrap_or_else(|| "eu-netherlands-south".to_string()), - session.server.ip.clone(), - ), - None => return Err("No active session found".to_string()), - } - }; - - let client = crate::proxy::create_proxied_client().await?; - - // Check if we're using an Alliance Partner - let streaming_base_url = crate::auth::get_streaming_base_url().await; - let is_alliance_partner = !streaming_base_url.contains("cloudmatchbeta.nvidiagrid.net"); - - // Build polling URL using session control server - // For Alliance Partners, prefer their streaming URL - let poll_base = if is_alliance_partner { - streaming_base_url.trim_end_matches('/').to_string() - } else { - control_server - .map(|ip| format!("https://{}", ip)) - .unwrap_or_else(|| cloudmatch_zone_url(&zone)) - }; - - let poll_url = format!("{}/v2/session/{}", poll_base, session_id); - log::debug!("Polling URL: {}", poll_url); - - let device_id = get_device_id(); - let client_id = get_client_id(); - - let mut last_status = -1; - let mut last_step = -1; - let mut last_queue_position = -1; - // Max polls for non-queue scenarios (~3 minutes) - // When in queue, we poll indefinitely until ready or cancelled - let max_non_queue_polls = 120; - let mut poll_count = 0; - let mut in_queue = false; - - loop { - if !POLLING_ACTIVE.load(Ordering::SeqCst) { - return Err("Polling cancelled".to_string()); - } - - poll_count += 1; - - // Only apply timeout if not in queue - // When in queue (free tier users), we wait indefinitely - if !in_queue && poll_count > max_non_queue_polls { - return Err("Session polling timeout - server not ready".to_string()); - } - - // Poll session status - let response = client - .get(&poll_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "NVIDIA-CLASSIC") - .header("nv-client-type", "NATIVE") - .header("nv-client-version", "2.0.80.173") - .header("nv-device-os", "WINDOWS") - .header("nv-device-type", "DESKTOP") - .header("x-device-id", &device_id) - .send() - .await - .map_err(|e| format!("Poll request failed: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - log::error!("Poll failed: {} - {}", status, body); - return Err(format!("Poll failed: {} - {}", status, body)); - } - - let response_text = response.text().await - .map_err(|e| format!("Failed to read poll response: {}", e))?; - - // Log raw response once when status changes to see full API response structure - if last_status == -1 { - // Log first ~2000 chars of response to see what fields are available - let preview = if response_text.len() > 2000 { - format!("{}...", &response_text[..2000]) - } else { - response_text.clone() - }; - log::debug!("Raw session poll response: {}", preview); - - // Check if there's ICE server config in the response - if let Ok(json) = serde_json::from_str::(&response_text) { - if let Some(session) = json.get("session") { - if session.get("iceServerConfiguration").is_some() { - log::debug!("Found iceServerConfiguration in session response"); - } - // Log all top-level keys in session - if let Some(obj) = session.as_object() { - let keys: Vec<_> = obj.keys().collect(); - log::debug!("Session response keys: {:?}", keys); - } - } - } - } - - let poll_response: PollSessionResponse = serde_json::from_str(&response_text) - .map_err(|e| format!("Failed to parse poll response: {}", e))?; - - // Check for API errors - if poll_response.request_status.status_code != 1 { - let error = poll_response.request_status.status_description - .unwrap_or_else(|| "Unknown error".to_string()); - return Err(format!("Session error: {}", error)); - } - - let session = poll_response.session; - let status = session.status; - let seat_info = session.seat_setup_info.as_ref(); - let step = seat_info.map(|s| s.seat_setup_step).unwrap_or(0); - let queue_position = seat_info.map(|s| s.queue_position).unwrap_or(0); - let eta_ms = seat_info.map(|s| s.seat_setup_eta).unwrap_or(0); - - // Detect if we're in a queue (status 1 with queue_position > 0) - if status == 1 && queue_position > 0 { - in_queue = true; - } else if status == 2 || status == 3 { - // No longer in queue once session is ready - in_queue = false; - } - - // Update global queue status for frontend to query - SESSION_STATUS.store(status, Ordering::SeqCst); - QUEUE_POSITION.store(queue_position, Ordering::SeqCst); - QUEUE_ETA_MS.store(eta_ms, Ordering::SeqCst); - - // Log status changes (only when there's a change) - if status != last_status || step != last_step || queue_position != last_queue_position { - if queue_position > 0 || step > 0 { - log::info!("Session: step={}, queue={}", step, queue_position); - } - last_status = status; - last_step = step; - last_queue_position = queue_position; - } - - // Status 2 = ready for streaming - if status == 2 { - log::info!("Session ready: {:?}", session.gpu_type); - - // Extract connection info for WebRTC streaming - // Browser client uses port 443 with /nvst/ path for WebSocket signaling - // Native client uses port 322 for RTSPS - but we're browser-based - let connection = session.connection_info.as_ref() - .and_then(|conns| conns.first()) - .map(|conn| { - // Get the stream IP from connection info or fall back to control IP - let stream_ip = conn.ip.clone().or_else(|| { - session.session_control_info.as_ref() - .and_then(|c| c.ip.clone()) - }); - - // Get the resource path (typically /nvst/ for WebRTC signaling) - let resource_path = conn.resource_path.clone() - .unwrap_or_else(|| "/nvst/".to_string()); - - // Use port 443 for browser WebSocket signaling (not 322 which is RTSPS) - // The browser client always connects on 443 with wss:// - let stream_port = if conn.port == 322 || conn.port == 48322 { - // These are RTSPS ports - use 443 for browser WebSocket instead - 443 - } else if conn.port == 0 { - 443 - } else { - conn.port - }; - - StreamConnectionInfo { - control_ip: session.session_control_info.as_ref() - .and_then(|c| c.ip.clone()) - .unwrap_or_default(), - control_port: session.session_control_info.as_ref() - .map(|c| c.port) - .unwrap_or(443), - stream_ip, - stream_port, - resource_path, - } - }); - - // Update stored session status - { - let storage = get_session_storage(); - let mut guard = storage.lock().await; - if let Some(s) = guard.as_mut() { - s.status = SessionStatus::Running; - - // Update server IP from connection info - if let Some(conn) = connection.as_ref() { - s.server.ip = Some(conn.control_ip.clone()); - } - - // Update signaling URL directly from API response (more reliable than StreamConnectionInfo) - // This stores the raw RTSP/WebRTC signaling URL from the API, which may be malformed for some partners - if let Some(sig_url) = session.connection_info.as_ref() - .and_then(|conns| conns.first()) - .and_then(|conn| conn.resource_path.clone()) - { - log::debug!("Signaling URL: {}", sig_url); - s.signaling_url = Some(sig_url); - } else if let Some(conn) = connection.as_ref() { - // Fallback to StreamConnectionInfo.resource_path - s.signaling_url = Some(conn.resource_path.clone()); - } - - // Update GPU type (stored in server name) - if let Some(gpu) = session.gpu_type.clone() { - s.server.name = gpu; - } - - // Update ICE servers from session API (Alliance Partners like Zain provide TURN servers here) - if let Some(ice_config) = session.ice_server_configuration.as_ref() { - let new_ice_servers: Vec = ice_config.ice_servers.iter().map(|server| { - log::debug!("ICE server (poll): {}", server.urls); - IceServerConfig { - urls: vec![server.urls.clone()], - username: server.username.clone(), - credential: server.credential.clone(), - } - }).collect(); - if !new_ice_servers.is_empty() { - log::debug!("Updated ice_servers: {} servers", new_ice_servers.len()); - s.ice_servers = new_ice_servers; - } - } - - // Update media connection info from connectionInfo (usage=2 or usage=17) - // This contains the real UDP port for streaming, instead of the dummy port 47998 in SDP - let new_media_info = extract_media_connection_info(session.connection_info.as_ref()); - if new_media_info.is_some() { - log::debug!("Updated media_connection_info"); - s.media_connection_info = new_media_info; - } - } - } - - POLLING_ACTIVE.store(false, Ordering::SeqCst); - - let result = StreamingConnectionState { - session_id: session.session_id.clone(), - phase: StreamingPhase::Ready, - server_ip: session.session_control_info.as_ref().and_then(|c| c.ip.clone()), - signaling_url: session.connection_info.as_ref() - .and_then(|c| c.first().and_then(|i| i.resource_path.clone())), - connection_info: connection.clone(), - gpu_type: session.gpu_type.clone(), - error: None, - }; - - log::debug!("Returning StreamingConnectionState: session_id={}", result.session_id); - - return Ok(result); - } - - // Status 1 = queued or setting up - keep polling (don't error out) - // Status 0 or negative = actual error - if status <= 0 && session.error_code != 1 { - POLLING_ACTIVE.store(false, Ordering::SeqCst); - return Err(format!("Session failed with error code: {}", session.error_code)); - } - - // Wait before next poll - consistent 2 second interval - tokio::time::sleep(tokio::time::Duration::from_millis(interval)).await; - } -} - -/// Cancel active polling -#[command] -pub fn cancel_polling() { - log::debug!("Cancelling session polling"); - POLLING_ACTIVE.store(false, Ordering::SeqCst); - // Reset queue status - SESSION_STATUS.store(0, Ordering::SeqCst); - QUEUE_POSITION.store(0, Ordering::SeqCst); - QUEUE_ETA_MS.store(0, Ordering::SeqCst); -} - -/// Check if polling is active -#[command] -pub fn is_polling_active() -> bool { - POLLING_ACTIVE.load(Ordering::SeqCst) -} - -/// Queue status for frontend display -#[derive(Debug, Clone, Serialize, Deserialize)] -pub struct QueueStatus { - pub session_status: i32, - pub queue_position: i32, - pub eta_ms: i32, - pub is_in_queue: bool, -} - -/// Get current queue status (non-blocking, can be called while polling) -#[command] -pub fn get_queue_status() -> QueueStatus { - let session_status = SESSION_STATUS.load(Ordering::SeqCst); - let queue_position = QUEUE_POSITION.load(Ordering::SeqCst); - let eta_ms = QUEUE_ETA_MS.load(Ordering::SeqCst); - - // We're in queue if status is 1 and queue_position > 0 - let is_in_queue = session_status == 1 && queue_position > 0; - - QueueStatus { - session_status, - queue_position, - eta_ms, - is_in_queue, - } -} - -// ============================================================================ -// WEBRTC STREAMING -// ============================================================================ - -/// WebRTC connection configuration -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct WebRtcConfig { - pub session_id: String, - pub signaling_url: String, - pub ice_servers: Vec, - pub video_codec: String, - pub audio_codec: String, - pub max_bitrate_kbps: u32, - /// Media connection info with real UDP port (for Alliance Partners) - /// When present, use this port instead of the SDP port (47998) for ICE candidates - #[serde(default)] - pub media_connection_info: Option, -} - -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct IceServerConfig { - pub urls: Vec, - pub username: Option, - pub credential: Option, -} - -/// Get WebRTC configuration for streaming -/// Returns the signaling URL and ICE servers needed for browser WebRTC connection -/// -/// The `signaling_url_override` parameter allows the frontend to pass the correct -/// signaling URL directly from the StreamingConnectionState, bypassing any stale -/// data in the session storage. -#[command] -pub async fn get_webrtc_config( - session_id: String, - signaling_url_override: Option, -) -> Result { - let storage = get_session_storage(); - let guard = storage.lock().await; - - let session = guard.as_ref() - .ok_or("No active session")?; - - // Use the override URL if provided (from StreamingConnectionState which has the correct URL) - // Otherwise fall back to the stored session's signaling_url - let raw_signaling_url = signaling_url_override - .or_else(|| session.signaling_url.clone()); - - log::debug!("get_webrtc_config: raw_signaling_url={:?}, server_ip={:?}", - raw_signaling_url, session.server.ip); - - // Build signaling URL from session info - // The signaling_url field may contain: - // - A full RTSP URL (from native client): rtsps://80-84-170-155.cloudmatchbeta.nvidiagrid.net:322 - // - A path (from browser client): /nvst/ - // We need to extract the hostname and build a WebSocket URL - let signaling_url = if let Some(ref sig_url) = raw_signaling_url { - if sig_url.starts_with("rtsps://") || sig_url.starts_with("rtsp://") { - // Native client format: extract hostname from RTSP URL - // e.g., rtsps://80-84-170-155.cloudmatchbeta.nvidiagrid.net:322 - let host = sig_url - .strip_prefix("rtsps://") - .or_else(|| sig_url.strip_prefix("rtsp://")) - .and_then(|s| s.split(':').next()) - .or_else(|| sig_url.split("://").nth(1).and_then(|s| s.split('/').next())); - - log::debug!("Extracted host from RTSP URL: {:?}", host); - - // Validate the extracted host - it should not start with a dot (malformed URL) - // e.g., ".zai.geforcenow.nvidiagrid.net" is invalid - let valid_host = host.filter(|h| !h.is_empty() && !h.starts_with('.')); - - if let Some(h) = valid_host { - format!("wss://{}/nvst/", h) - } else { - // Malformed URL (e.g., rtsps://.zai...) - fallback to server IP - log::warn!("Malformed signaling URL '{}', falling back to server IP", sig_url); - session.server.ip.as_ref() - .map(|ip| format!("wss://{}:443/nvst/", ip)) - .ok_or("No signaling URL available")? - } - } else if sig_url.starts_with('/') { - // Browser client format: path like /nvst/ - session.server.ip.as_ref() - .map(|ip| format!("wss://{}:443{}", ip, sig_url)) - .ok_or("No signaling URL available")? - } else { - // Assume it's already a full WebSocket URL - sig_url.clone() - } - } else { - // No signaling URL, use server IP with default path - session.server.ip.as_ref() - .map(|ip| format!("wss://{}:443/nvst/", ip)) - .ok_or("No signaling URL available")? - }; - - log::debug!("WebRTC signaling URL: {}", signaling_url); - - // Build ICE servers list: - // 1. Session API ICE servers first (Alliance Partners like Zain provide TURN servers here) - // 2. Default STUN servers as fallback - let mut ice_servers = Vec::new(); - - // Add ICE servers from session API (these may include TURN servers with credentials) - for server in &session.ice_servers { - ice_servers.push(server.clone()); - } - - // Always add default STUN servers as fallback - ice_servers.push(IceServerConfig { - urls: vec!["stun:s1.stun.gamestream.nvidia.com:19308".to_string()], - username: None, - credential: None, - }); - ice_servers.push(IceServerConfig { - urls: vec![ - "stun:stun.l.google.com:19302".to_string(), - "stun:stun1.l.google.com:19302".to_string(), - ], - username: None, - credential: None, - }); - - // Determine video codec from quality settings - let video_codec = match session.quality.codec { - VideoCodec::H264 => "H264", - VideoCodec::H265 => "H265", - VideoCodec::AV1 => "AV1", - }.to_string(); - - // Log media connection info if available - if let Some(ref mci) = session.media_connection_info { - log::debug!("Media connection info: {}:{}", mci.ip, mci.port); - } - - Ok(WebRtcConfig { - session_id: session.session_id.clone(), - signaling_url, - ice_servers, - video_codec, - audio_codec: "opus".to_string(), - max_bitrate_kbps: session.quality.bitrate_kbps, - media_connection_info: session.media_connection_info.clone(), - }) -} - -/// Active session info returned from the server -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct ActiveSession { - pub session_id: String, - pub app_id: i64, - pub gpu_type: Option, - pub status: i32, - pub server_ip: Option, - pub signaling_url: Option, - pub resolution: Option, - pub fps: Option, -} - -/// Response from GET /v2/session endpoint -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct GetSessionsResponse { - #[serde(default)] - sessions: Vec, - request_status: RequestStatus, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SessionFromApi { - session_id: String, - #[serde(default)] - session_request_data: Option, - #[serde(default)] - gpu_type: Option, - #[serde(default)] - status: i32, - #[serde(default)] - session_control_info: Option, - #[serde(default)] - connection_info: Option>, - #[serde(default)] - monitor_settings: Option>, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct SessionRequestDataFromApi { - #[serde(default)] - app_id: i64, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct MonitorSettingsFromApi { - #[serde(default)] - width_in_pixels: u32, - #[serde(default)] - height_in_pixels: u32, - #[serde(default)] - frames_per_second: u32, -} - -/// Get active sessions from the CloudMatch server -/// This checks if there are any running sessions that can be reconnected to -#[command] -pub async fn get_active_sessions( - access_token: String, -) -> Result, String> { - log::debug!("Checking for active sessions..."); - - let client = crate::proxy::create_proxied_client().await?; - let device_id = get_device_id(); - let client_id = get_client_id(); - - // Use the streaming base URL which handles Alliance Partners - let streaming_base_url = crate::auth::get_streaming_base_url().await; - let session_url = format!("{}/v2/session", streaming_base_url.trim_end_matches('/')); - log::debug!("Session check URL: {}", session_url); - - let response = client - .get(&session_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("Origin", "https://play.geforcenow.com") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "WEBRTC") - .header("nv-client-type", "BROWSER") - .header("nv-client-version", "2.0.80.173") - .header("nv-browser-type", "CHROMIUM") - .header("nv-device-make", "APPLE") - .header("nv-device-model", "UNKNOWN") - .header("nv-device-os", "MACOS") - .header("nv-device-type", "DESKTOP") - .header("x-device-id", &device_id) - .send() - .await - .map_err(|e| format!("Failed to check sessions: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - log::warn!("Get sessions failed: {} - {}", status, body); - return Ok(vec![]); // Return empty on error, don't fail - } - - let response_text = response.text().await - .map_err(|e| format!("Failed to read response: {}", e))?; - - log::debug!("Active sessions response: {} bytes", response_text.len()); - - // Try to parse as generic JSON first to see what we got - if let Ok(json_value) = serde_json::from_str::(&response_text) { - if let Some(sessions_arr) = json_value.get("sessions").and_then(|s| s.as_array()) { - log::debug!("Found {} sessions", sessions_arr.len()); - for (i, session) in sessions_arr.iter().enumerate() { - let status = session.get("status").and_then(|s| s.as_i64()).unwrap_or(-1); - let session_id = session.get("sessionId").and_then(|s| s.as_str()).unwrap_or("unknown"); - log::debug!(" Session {}: id={}, status={}", i, session_id, status); - } - } - } - - let sessions_response: GetSessionsResponse = serde_json::from_str(&response_text) - .map_err(|e| { - log::error!("Failed to parse sessions: {}", e); - format!("Failed to parse sessions response: {}", e) - })?; - - if sessions_response.request_status.status_code != 1 { - log::warn!("Get sessions API error: {:?}", sessions_response.request_status.status_description); - return Ok(vec![]); - } - - log::info!("Parsed {} sessions from response", sessions_response.sessions.len()); - - // Convert to our ActiveSession struct - // Session status values: - // 1 = Queued/Pending - // 2 = Ready/Connecting - // 3 = Running/Streaming (in-game) - // 4+ = Stopping/Stopped/Error - let active_sessions: Vec = sessions_response.sessions - .into_iter() - .filter(|s| { - log::info!("Session {} has status {}", s.session_id, s.status); - s.status == 2 || s.status == 3 // Include both ready and running states - }) - .map(|s| { - let app_id = s.session_request_data - .as_ref() - .map(|d| d.app_id) - .unwrap_or(0); - - let server_ip = s.session_control_info - .as_ref() - .and_then(|c| c.ip.clone()); - - // Try to get signaling URL from connection_info first, then fall back to server_ip - let signaling_url = s.connection_info - .as_ref() - .and_then(|conns| conns.first()) - .and_then(|conn| { - conn.ip.as_ref().map(|ip| format!("wss://{}:443/nvst/", ip)) - }) - .or_else(|| { - // Fall back to server_ip if connection_info doesn't have the IP - server_ip.as_ref().map(|ip| format!("wss://{}:443/nvst/", ip)) - }); - - log::info!("Session {} server_ip: {:?}, signaling_url: {:?}", - s.session_id, server_ip, signaling_url); - - let (resolution, fps) = s.monitor_settings - .as_ref() - .and_then(|ms| ms.first()) - .map(|m| ( - Some(format!("{}x{}", m.width_in_pixels, m.height_in_pixels)), - Some(m.frames_per_second) - )) - .unwrap_or((None, None)); - - ActiveSession { - session_id: s.session_id, - app_id, - gpu_type: s.gpu_type, - status: s.status, - server_ip, - signaling_url, - resolution, - fps, - } - }) - .collect(); - - log::info!("Found {} active session(s) after filtering", active_sessions.len()); - Ok(active_sessions) -} - -/// Claim/Resume an active session by sending a PUT request -/// This is required before connecting to an existing session -/// The browser client makes this request to "activate" the session for streaming -#[command] -pub async fn claim_session( - session_id: String, - server_ip: String, - access_token: String, - app_id: String, - resolution: Option, - fps: Option, -) -> Result { - log::info!("Claiming session: {} on server {} for app {}", session_id, server_ip, app_id); - - let client = crate::proxy::create_proxied_client().await?; - let device_id = get_device_id(); - let client_id = get_client_id(); - let sub_session_id = uuid::Uuid::new_v4().to_string(); - - // Parse resolution - let (width, height) = parse_resolution(resolution.as_deref()); - let fps_val = fps.unwrap_or(60); - - // Get timezone offset in milliseconds - let timezone_offset_ms = chrono::Local::now().offset().local_minus_utc() as i64 * 1000; - - // Build the PUT URL - use the server IP directly like the browser does - // Format: PUT https://{server_ip}/v2/session/{sessionId}?keyboardLayout=m-us&languageCode=en_US - let claim_url = format!( - "https://{}/v2/session/{}?keyboardLayout=m-us&languageCode=en_US", - server_ip, session_id - ); - - log::info!("Claim URL: {}", claim_url); - - // Build the RESUME payload matching browser client format exactly - // Note: appId must be a STRING, not a number - let resume_payload = serde_json::json!({ - "action": 2, - "data": "RESUME", - "sessionRequestData": { - "audioMode": 2, - "remoteControllersBitmap": 0, - "sdrHdrMode": 0, - "networkTestSessionId": null, - "availableSupportedControllers": [], - "clientVersion": "30.0", - "deviceHashId": device_id, - "internalTitle": null, - "clientPlatformName": "browser", - "metaData": [ - {"key": "SubSessionId", "value": sub_session_id}, - {"key": "wssignaling", "value": "1"}, - {"key": "GSStreamerType", "value": "WebRTC"}, - {"key": "networkType", "value": "Unknown"}, - {"key": "ClientImeSupport", "value": "0"}, - {"key": "clientPhysicalResolution", "value": format!("{{\"horizontalPixels\":{},\"verticalPixels\":{}}}", width, height)}, - {"key": "surroundAudioInfo", "value": "2"} - ], - "surroundAudioInfo": 0, - "clientTimezoneOffset": timezone_offset_ms, - "clientIdentification": "GFN-PC", - "parentSessionId": null, - "appId": app_id, // Must be string like "106466949" - "streamerVersion": 1, - "clientRequestMonitorSettings": [{ - "widthInPixels": width, - "heightInPixels": height, - "framesPerSecond": fps_val, - "sdrHdrMode": 0, - "displayData": { - "desiredContentMaxLuminance": 0, - "desiredContentMinLuminance": 0, - "desiredContentMaxFrameAverageLuminance": 0 - }, - "dpi": 100 - }], - "appLaunchMode": 1, - "sdkVersion": "1.0", - "enhancedStreamMode": 1, - "useOps": true, - "clientDisplayHdrCapabilities": null, - "accountLinked": true, - "partnerCustomData": "", - "enablePersistingInGameSettings": true, - "secureRTSPSupported": false, - "userAge": 26, - "requestedStreamingFeatures": { - "reflex": false, - "bitDepth": 0, - "cloudGsync": false, - "enabledL4S": false, - "profile": 1, - "fallbackToLogicalResolution": false, - "chromaFormat": 0, - "prefilterMode": 0, - "hudStreamingMode": 0 - } - }, - "metaData": [] - }); - - log::info!("Sending RESUME payload for session claim: appId={}", app_id); - - let response = client - .put(&claim_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("Origin", "https://play.geforcenow.com") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "WEBRTC") - .header("nv-client-type", "BROWSER") - .header("nv-client-version", "2.0.80.173") - .header("nv-browser-type", "CHROMIUM") - .header("nv-device-os", "MACOS") - .header("nv-device-type", "DESKTOP") - .header("x-device-id", &device_id) - .json(&resume_payload) - .send() - .await - .map_err(|e| format!("Failed to claim session: {}", e))?; - - let status_code = response.status(); - if !status_code.is_success() { - let body = response.text().await.unwrap_or_default(); - log::error!("Claim session failed: {} - {}", status_code, body); - return Err(format!("Claim session failed: {} - {}", status_code, body)); - } - - let response_text = response.text().await - .map_err(|e| format!("Failed to read claim response: {}", e))?; - - log::info!("Claim session response: {}", &response_text[..std::cmp::min(500, response_text.len())]); - - // Parse the response to get updated session info - let claim_response: ClaimSessionApiResponse = serde_json::from_str(&response_text) - .map_err(|e| format!("Failed to parse claim response: {}", e))?; - - if claim_response.request_status.status_code != 1 { - let error = claim_response.request_status.status_description - .unwrap_or_else(|| "Unknown error".to_string()); - return Err(format!("Claim session API error: {}", error)); - } - - let session = claim_response.session; - log::info!("Session claimed! Status: {}, GPU: {:?}", session.status, session.gpu_type); - - // After claiming, we need to poll GET the session info until status changes from 6 to 2 - // The official browser client does this - it waits for the session to be "ready" (status 2) - // before connecting. Status 6 is a transitional state during claim. - log::info!("Polling session info until ready (status 2)..."); - - let get_url = format!( - "https://{}/v2/session/{}", - server_ip, session_id - ); - - let mut updated_session: Option = None; - let max_attempts = 10; - - for attempt in 1..=max_attempts { - log::info!("GET session attempt {}/{}", attempt, max_attempts); - - // Small delay between attempts (except first) - if attempt > 1 { - tokio::time::sleep(tokio::time::Duration::from_millis(500)).await; - } - - let get_response = client - .get(&get_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("Origin", "https://play.geforcenow.com") - .header("nv-client-id", &client_id) - .header("nv-client-streamer", "WEBRTC") - .header("nv-client-type", "BROWSER") - .header("nv-client-version", "2.0.80.173") - .header("nv-browser-type", "CHROMIUM") - .header("nv-device-os", "MACOS") - .header("nv-device-type", "DESKTOP") - .header("x-device-id", &device_id) - .send() - .await - .map_err(|e| format!("Failed to get session info: {}", e))?; - - if !get_response.status().is_success() { - let body = get_response.text().await.unwrap_or_default(); - log::warn!("GET session info failed on attempt {}: {}", attempt, body); - continue; - } - - let get_response_text = get_response.text().await - .map_err(|e| format!("Failed to read GET session response: {}", e))?; - - log::info!("GET session response (attempt {}): {}", attempt, &get_response_text[..std::cmp::min(300, get_response_text.len())]); - - let get_session_response: ClaimSessionApiResponse = match serde_json::from_str(&get_response_text) { - Ok(r) => r, - Err(e) => { - log::warn!("Failed to parse GET session response on attempt {}: {}", attempt, e); - continue; - } - }; - - let sess = get_session_response.session; - log::info!("Session status on attempt {}: {}", attempt, sess.status); - - // Status 2 = Ready, Status 3 = Running - both are good to connect - if sess.status == 2 || sess.status == 3 { - log::info!("Session is ready! Status: {}", sess.status); - updated_session = Some(sess); - break; - } - - // If still status 6, keep polling - if sess.status == 6 { - log::info!("Session still transitioning (status 6), continuing to poll..."); - // Store in case we run out of attempts - updated_session = Some(sess); - } else { - // Some other status, use it - log::info!("Session in status {}, using this", sess.status); - updated_session = Some(sess); - break; - } - } - - // Use the session data we got (either status 2/3 or the last status 6) - let updated_session = updated_session.ok_or_else(|| { - format!("Failed to get session info after {} attempts", max_attempts) - })?; - - log::info!("Final session status: {}, GPU: {:?}", updated_session.status, updated_session.gpu_type); - - // Extract signaling URL from updated connection info - let signaling_url = updated_session.connection_info - .as_ref() - .and_then(|conns| conns.first()) - .and_then(|conn| { - log::info!("Connection info IP from GET response: {:?}", conn.ip); - conn.ip.as_ref().map(|ip| format!("wss://{}:443/nvst/", ip)) - }); - - log::info!("Final signaling URL being returned: {:?}", signaling_url); - - // Log connection info for debugging - if let Some(ref conn_info) = updated_session.connection_info { - for (i, conn) in conn_info.iter().enumerate() { - log::info!("Connection info [{}]: ip={:?} port={:?}", i, conn.ip, conn.port); - } - } - - Ok(ClaimSessionResponse { - session_id: updated_session.session_id.clone(), - status: updated_session.status, - gpu_type: updated_session.gpu_type.clone(), - signaling_url, - server_ip: updated_session.session_control_info - .and_then(|c| c.ip), - connection_info: updated_session.connection_info, - }) -} - -/// Response from claim session -#[derive(Debug, Clone, Serialize, Deserialize)] -#[serde(rename_all = "camelCase")] -pub struct ClaimSessionResponse { - pub session_id: String, - pub status: i32, - pub gpu_type: Option, - pub signaling_url: Option, - pub server_ip: Option, - pub connection_info: Option>, -} - -/// API response for PUT /v2/session/{sessionId} -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ClaimSessionApiResponse { - session: ClaimSessionData, - request_status: RequestStatus, -} - -#[derive(Debug, Deserialize)] -#[serde(rename_all = "camelCase")] -struct ClaimSessionData { - session_id: String, - #[serde(default)] - status: i32, - #[serde(default)] - gpu_type: Option, - #[serde(default)] - session_control_info: Option, - #[serde(default)] - connection_info: Option>, -} - -/// Set up session storage for reconnecting to an existing session -/// This is used when we detect an active session and want to connect to it -#[command] -pub async fn setup_reconnect_session( - session_id: String, - server_ip: String, - signaling_url: String, - _gpu_type: Option, - connection_info: Option>, -) -> Result<(), String> { - log::info!("Setting up reconnect session: {} on {}", session_id, server_ip); - - // Convert connection_info to MediaConnectionInfo if available - // Pick the one with usage=2 (media UDP) - NOT usage=14 (signaling WSS) - let media_connection_info = connection_info.as_ref().and_then(|conns| { - // Find the media connection (usage=2 is primary media, usage=17 is alternative) - let media_conn = conns.iter().find(|c| c.usage == 2) - .or_else(|| conns.iter().find(|c| c.usage == 17)); - - media_conn.and_then(|conn| { - conn.ip.as_ref().map(|ip| { - log::info!("Using media connection info for reconnect: ip={} port={} usage={}", ip, conn.port, conn.usage); - MediaConnectionInfo { - ip: ip.clone(), - port: conn.port, - } - }) - }) - }); - - let session = StreamingSession { - session_id: session_id.clone(), - game_id: String::new(), // Unknown for reconnect - server: SessionServer { - id: String::new(), - name: String::from("Reconnected"), - region: String::new(), - ip: Some(server_ip.clone()), - zone: None, - }, - status: SessionStatus::Running, - quality: StreamingQuality { - resolution: Resolution::R1080p, - fps: 60, - bitrate_kbps: 50000, - codec: VideoCodec::H264, - hdr_enabled: false, - }, - stats: None, - webrtc_offer: None, - signaling_url: Some(signaling_url), - ice_servers: vec![], // Reconnect doesn't have session API ICE servers - media_connection_info, - }; - - let storage = get_session_storage(); - let mut guard = storage.lock().await; - *guard = Some(session); - - log::info!("Reconnect session setup complete"); - Ok(()) -} - -/// Terminate an active session -#[command] -pub async fn terminate_session( - session_id: String, - access_token: String, -) -> Result<(), String> { - log::info!("Terminating session: {}", session_id); - - let client = crate::proxy::create_proxied_client().await?; - let device_id = get_device_id(); - - // Try to delete from prod endpoint - let delete_url = format!("{}/v2/session/{}", CLOUDMATCH_PROD_URL, session_id); - - let response = client - .delete(&delete_url) - .header("Authorization", format!("GFNJWT {}", access_token)) - .header("Content-Type", "application/json") - .header("x-device-id", &device_id) - .send() - .await - .map_err(|e| format!("Failed to terminate session: {}", e))?; - - if !response.status().is_success() { - let status = response.status(); - let body = response.text().await.unwrap_or_default(); - log::warn!("Session termination returned: {} - {}", status, body); - // Don't fail even if termination reports error - session might already be gone - } - - log::info!("Session terminated: {}", session_id); - Ok(()) -} - -/// Start streaming flow - polls session until ready -/// This is the main entry point called by the frontend after start_session -#[command] -pub async fn start_streaming_flow( - session_id: String, - access_token: String, -) -> Result { - log::info!("Starting streaming flow for session: {}", session_id); - - // Poll the session until it's ready - poll_session_until_ready(session_id, access_token, None).await -} - -/// Stop streaming and cleanup -#[command] -pub async fn stop_streaming_flow( - session_id: String, - access_token: String, -) -> Result<(), String> { - log::info!("Stopping streaming flow for session: {}", session_id); - - // Cancel any active polling - cancel_polling(); - - // Stop the session on the server - stop_session(session_id, access_token).await?; - - log::info!("Streaming flow stopped"); - Ok(()) -} diff --git a/src-tauri/src/utils.rs b/src-tauri/src/utils.rs deleted file mode 100644 index b3e5d53..0000000 --- a/src-tauri/src/utils.rs +++ /dev/null @@ -1,49 +0,0 @@ -use std::fs; -use std::path::PathBuf; - -/// Get the application data directory. -/// -/// This function resolves the standard data directory (using `dirs::data_dir()`) -/// and targets the "opennow" directory. -/// -/// It also handles migration from the legacy "gfn-client" directory. -pub fn get_app_data_dir() -> PathBuf { - let data_dir = dirs::data_dir() - .unwrap_or_else(|| PathBuf::from(".")); - let app_dir = data_dir.join("opennow"); - - // Ensure the target directory exists - if let Err(e) = fs::create_dir_all(&app_dir) { - eprintln!("Failed to create app data directory: {}", e); - } - - // Migration logic - if let Some(config_dir) = dirs::config_dir() { - let legacy_dir = config_dir.join("gfn-client"); - if legacy_dir.exists() { - // Copy auth.json if it doesn't exist in the new location - let legacy_auth = legacy_dir.join("auth.json"); - let new_auth = app_dir.join("auth.json"); - if legacy_auth.exists() && !new_auth.exists() { - if let Err(e) = fs::copy(&legacy_auth, &new_auth) { - eprintln!("Failed to migrate auth.json: {}", e); - } else { - println!("Migrated auth.json from legacy directory"); - } - } - - // Copy settings.json if it doesn't exist in the new location - let legacy_settings = legacy_dir.join("settings.json"); - let new_settings = app_dir.join("settings.json"); - if legacy_settings.exists() && !new_settings.exists() { - if let Err(e) = fs::copy(&legacy_settings, &new_settings) { - eprintln!("Failed to migrate settings.json: {}", e); - } else { - println!("Migrated settings.json from legacy directory"); - } - } - } - } - - app_dir -} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json deleted file mode 100644 index b783e16..0000000 --- a/src-tauri/tauri.conf.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "$schema": "https://schema.tauri.app/config/2.0.0", - "productName": "OpenNOW", - "version": "0.1.0", - "identifier": "com.zortos.opennow", - "build": { - "beforeDevCommand": "bun run dev", - "devUrl": "http://localhost:1420", - "beforeBuildCommand": "bun run build", - "frontendDist": "../dist" - }, - "app": { - "withGlobalTauri": true, - "windows": [ - { - "label": "main", - "title": "OpenNOW", - "width": 1280, - "height": 800, - "minWidth": 900, - "minHeight": 600, - "resizable": true, - "fullscreen": false, - "decorations": true, - "transparent": false, - "center": true - } - ], - "security": { - "csp": null - } - }, - "bundle": { - "active": true, - "targets": "all", - "icon": [ - "icons/32x32.png", - "icons/128x128.png", - "icons/128x128@2x.png", - "icons/icon.ico", - "icons/icon.png" - ], - "windows": { - "certificateThumbprint": null, - "digestAlgorithm": "sha256", - "timestampUrl": "", - "nsis": { - "installMode": "both", - "displayLanguageSelector": false, - "compression": "lzma" - } - } - }, - "plugins": { - "shell": { - "open": true - } - } -} diff --git a/src/keyboard-lock.d.ts b/src/keyboard-lock.d.ts deleted file mode 100644 index 4e12b1e..0000000 --- a/src/keyboard-lock.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -// Keyboard Lock API (Experimental) -// https://developer.mozilla.org/en-US/docs/Web/API/Keyboard/lock - -interface Keyboard { - lock(keyCodes?: string[]): Promise; - unlock(): void; -} - -interface Navigator { - readonly keyboard?: Keyboard; -} diff --git a/src/logging.ts b/src/logging.ts deleted file mode 100644 index 0a40e54..0000000 --- a/src/logging.ts +++ /dev/null @@ -1,102 +0,0 @@ -import { invoke } from "@tauri-apps/api/core"; - -// Store original console methods -const originalConsole = { - log: console.log.bind(console), - warn: console.warn.bind(console), - error: console.error.bind(console), - info: console.info.bind(console), - debug: console.debug.bind(console), -}; - -// Flag to prevent recursive logging -let isLogging = false; - -/** - * Send a log message to the backend for file logging - */ -async function sendToBackend(level: string, ...args: unknown[]): Promise { - if (isLogging) return; - - try { - isLogging = true; - const message = args - .map((arg) => { - if (typeof arg === "object") { - try { - return JSON.stringify(arg, null, 2); - } catch { - return String(arg); - } - } - return String(arg); - }) - .join(" "); - - await invoke("log_frontend", { level, message }); - } catch { - // Silently fail - don't want logging errors to break the app - } finally { - isLogging = false; - } -} - -/** - * Initialize frontend logging - * - * NOTE: Console method overrides have been disabled to prevent memory leaks. - * The previous implementation sent every console.log/info/warn/error/debug to - * the backend via IPC, causing excessive memory usage (1GB+) due to: - * - JSON serialization overhead on every log call - * - IPC message queue buildup - * - String allocations that couldn't be GC'd fast enough - * - * Now only critical errors (unhandled exceptions) are sent to the backend. - * Use logToBackend() explicitly for important messages that need file logging. - */ -export function initLogging(): void { - // Only capture unhandled errors - these are critical and infrequent - window.addEventListener("error", (event) => { - sendToBackend( - "error", - `Unhandled error: ${event.message} at ${event.filename}:${event.lineno}:${event.colno}` - ); - }); - - // Capture unhandled promise rejections - window.addEventListener("unhandledrejection", (event) => { - sendToBackend("error", `Unhandled promise rejection: ${event.reason}`); - }); - - originalConsole.log("[Logging] Frontend logging initialized (lightweight mode)"); -} - -/** - * Explicitly log a message to the backend file log - * Use this for important messages that should be persisted - */ -export async function logToBackend(level: "info" | "warn" | "error" | "debug", message: string): Promise { - await sendToBackend(level, message); -} - -/** - * Export logs to a user-selected file - * @returns The path where logs were saved, or throws on error/cancel - */ -export async function exportLogs(): Promise { - return await invoke("export_logs"); -} - -/** - * Get the current log file path - */ -export async function getLogFilePath(): Promise { - return await invoke("get_log_file_path"); -} - -/** - * Clear the current log file - */ -export async function clearLogs(): Promise { - await invoke("clear_logs"); -} diff --git a/src/main.ts b/src/main.ts deleted file mode 100644 index 7c38cf5..0000000 --- a/src/main.ts +++ /dev/null @@ -1,5550 +0,0 @@ -// GFN Custom Client - Main Entry Point -import { invoke } from "@tauri-apps/api/core"; -import { getCurrentWindow } from "@tauri-apps/api/window"; -import { getVersion } from "@tauri-apps/api/app"; -import { fetch as tauriFetch } from "@tauri-apps/plugin-http"; -import { - initializeStreaming, - setupInputCapture, - setInputCaptureMode, - suspendCursorCapture, - resumeCursorCapture, - stopStreaming, - getStreamingStats, - isStreamingActive, - forceInputHandshake, - isInputReady, - getInputDebugInfo, - StreamingOptions, - getMediaStream, - getVideoElement, -} from "./streaming"; -import { initLogging, exportLogs, clearLogs } from "./logging"; -import { getRecordingManager, openRecordingsFolder, testCodecSupport, RecordingState, RecordingCodecType, RecordingMode } from "./recording"; - -// ============================================ -// Custom Dropdown Component -// ============================================ - -interface DropdownChangeCallback { - (value: string, text: string): void; -} - -const dropdownCallbacks: Map = new Map(); - -function initializeDropdowns() { - const dropdowns = document.querySelectorAll('.custom-dropdown'); - - dropdowns.forEach(dropdown => { - const trigger = dropdown.querySelector('.dropdown-trigger') as HTMLElement; - const menu = dropdown.querySelector('.dropdown-menu') as HTMLElement; - const options = dropdown.querySelectorAll('.dropdown-option'); - - if (!trigger || !menu) return; - - // Toggle dropdown on click - trigger.addEventListener('click', (e) => { - e.stopPropagation(); - const isOpen = dropdown.classList.contains('open'); - - // Close all other dropdowns - document.querySelectorAll('.custom-dropdown.open').forEach(d => { - if (d !== dropdown) d.classList.remove('open'); - }); - - dropdown.classList.toggle('open', !isOpen); - }); - - // Keyboard navigation - trigger.addEventListener('keydown', (e) => { - if (e.key === 'Enter' || e.key === ' ') { - e.preventDefault(); - trigger.click(); - } else if (e.key === 'Escape') { - dropdown.classList.remove('open'); - } else if (e.key === 'ArrowDown' && dropdown.classList.contains('open')) { - e.preventDefault(); - const selected = menu.querySelector('.dropdown-option.selected') as HTMLElement; - const next = selected?.nextElementSibling as HTMLElement || menu.querySelector('.dropdown-option') as HTMLElement; - next?.click(); - } else if (e.key === 'ArrowUp' && dropdown.classList.contains('open')) { - e.preventDefault(); - const selected = menu.querySelector('.dropdown-option.selected') as HTMLElement; - const prev = selected?.previousElementSibling as HTMLElement || menu.querySelector('.dropdown-option:last-child') as HTMLElement; - prev?.click(); - } - }); - - // Option selection - options.forEach(option => { - option.addEventListener('click', (e) => { - e.stopPropagation(); - const value = (option as HTMLElement).dataset.value || ''; - const text = option.textContent || ''; - - // Update selected state - options.forEach(o => o.classList.remove('selected')); - option.classList.add('selected'); - - // Update trigger text - const triggerText = trigger.querySelector('.dropdown-text'); - if (triggerText) triggerText.textContent = text; - - // Close dropdown - dropdown.classList.remove('open'); - - // Fire change callbacks - const dropdownId = (dropdown as HTMLElement).dataset.dropdown; - if (dropdownId) { - const callbacks = dropdownCallbacks.get(dropdownId) || []; - callbacks.forEach(cb => cb(value, text)); - } - }); - }); - }); - - // Close dropdowns when clicking outside - document.addEventListener('click', () => { - document.querySelectorAll('.custom-dropdown.open').forEach(d => { - d.classList.remove('open'); - }); - }); -} - -// Get dropdown value -function getDropdownValue(id: string): string { - const dropdown = document.querySelector(`[data-dropdown="${id}"]`); - if (!dropdown) return ''; - const selected = dropdown.querySelector('.dropdown-option.selected') as HTMLElement; - return selected?.dataset.value || ''; -} - -// Set dropdown value -function setDropdownValue(id: string, value: string): void { - const dropdown = document.querySelector(`[data-dropdown="${id}"]`); - if (!dropdown) return; - - const options = dropdown.querySelectorAll('.dropdown-option'); - const trigger = dropdown.querySelector('.dropdown-trigger'); - const triggerText = trigger?.querySelector('.dropdown-text'); - - options.forEach(option => { - const optionEl = option as HTMLElement; - if (optionEl.dataset.value === value) { - options.forEach(o => o.classList.remove('selected')); - optionEl.classList.add('selected'); - if (triggerText) triggerText.textContent = optionEl.textContent || ''; - } - }); -} - -// Add change listener to dropdown -function onDropdownChange(id: string, callback: DropdownChangeCallback): void { - if (!dropdownCallbacks.has(id)) { - dropdownCallbacks.set(id, []); - } - dropdownCallbacks.get(id)!.push(callback); -} - -// Set dropdown options dynamically -function setDropdownOptions(id: string, options: { value: string; text: string; selected?: boolean; className?: string }[]): void { - const dropdown = document.querySelector(`[data-dropdown="${id}"]`); - if (!dropdown) { - console.warn(`Dropdown not found: ${id}`); - return; - } - - const menu = dropdown.querySelector('.dropdown-menu'); - const trigger = dropdown.querySelector('.dropdown-trigger'); - const triggerText = trigger?.querySelector('.dropdown-text'); - - if (!menu) { - console.warn(`Dropdown menu not found for: ${id}`); - return; - } - - // Clear existing options - menu.innerHTML = ''; - - // Add new options - options.forEach(opt => { - const optionEl = document.createElement('div'); - let className = 'dropdown-option'; - if (opt.selected) className += ' selected'; - if (opt.className) className += ' ' + opt.className; - optionEl.className = className; - optionEl.dataset.value = opt.value; - optionEl.textContent = opt.text; - - // Store the option data for the click handler - const optValue = opt.value; - const optText = opt.text; - const optClassName = opt.className; - - // Add click handler - optionEl.addEventListener('click', (e) => { - e.stopPropagation(); - - // Update selected state (preserve custom classes) - menu.querySelectorAll('.dropdown-option').forEach(o => o.classList.remove('selected')); - optionEl.classList.add('selected'); - - // Update trigger text and color - if (triggerText) { - triggerText.textContent = optText; - // Apply color class to trigger if option has one - const triggerEl = dropdown.querySelector('.dropdown-trigger'); - if (triggerEl) { - triggerEl.classList.remove('latency-excellent', 'latency-good', 'latency-fair', 'latency-poor', 'latency-bad'); - if (optClassName) triggerEl.classList.add(optClassName); - } - } - - // Close dropdown - dropdown.classList.remove('open'); - - // Fire change callbacks - const callbacks = dropdownCallbacks.get(id) || []; - callbacks.forEach(cb => cb(optValue, optText)); - }); - - menu.appendChild(optionEl); - - // Update trigger text if this is the selected option - if (opt.selected && triggerText) { - triggerText.textContent = opt.text; - // Apply color class to trigger - const triggerEl = dropdown.querySelector('.dropdown-trigger'); - if (triggerEl && opt.className) { - triggerEl.classList.add(opt.className); - } - } - }); - - console.log(`Set ${options.length} options for dropdown: ${id}`); -} - -// ============================================ -// Types -// ============================================ - -// Types -interface GameVariant { - id: string; - store_type: string; - supported_controls?: string[]; -} - -interface Game { - id: string; - title: string; - publisher?: string; - developer?: string; - genres?: string[]; - images: { - box_art?: string; - hero?: string; - thumbnail?: string; - screenshots?: string[]; - }; - store: { - store_type: string; - store_id: string; - store_url?: string; - }; - status?: string; - supported_controls?: string[]; - variants?: GameVariant[]; -} - -interface AuthState { - is_authenticated: boolean; - user?: { - user_id: string; - display_name: string; - email?: string; - avatar_url?: string; - membership_tier: string; - }; - provider?: LoginProvider; -} - -// Login provider for multi-region support (camelCase to match Rust serde) -interface LoginProvider { - idpId: string; - loginProviderCode: string; - loginProviderDisplayName: string; - loginProvider: string; - streamingServiceUrl: string; - loginProviderPriority: number; -} - -interface ResolutionOption { - heightInPixels: number; - widthInPixels: number; - framesPerSecond: number; - isEntitled: boolean; -} - -interface FeatureOption { - key?: string; - textValue?: string; - setValue?: string[]; - booleanValue?: boolean; -} - -interface SubscriptionFeatures { - resolutions: ResolutionOption[]; - features: FeatureOption[]; -} - -interface BitrateConfig { - bitrateOption: boolean; - bitrateValue: number; - minBitrateValue: number; - maxBitrateValue: number; -} - -interface ResolutionConfig { - heightInPixels: number; - widthInPixels: number; - framesPerSecond: number; -} - -interface StreamingQualityProfile { - clientStreamingQualityMode?: string; - maxBitRate?: BitrateConfig; - resolution?: ResolutionConfig; - features?: FeatureOption[]; -} - -interface AddonAttribute { - key?: string; - textValue?: string; -} - -interface SubscriptionAddon { - uri?: string; - id?: string; - type?: string; - subType?: string; - autoPayEnabled?: boolean; - attributes?: AddonAttribute[]; - status?: string; -} - -interface SubscriptionInfo { - membershipTier: string; - remainingTimeInMinutes?: number; - totalTimeInMinutes?: number; - renewalDateTime?: string; - type?: string; - subType?: string; - features?: SubscriptionFeatures; - streamingQualities?: StreamingQualityProfile[]; - addons?: SubscriptionAddon[]; -} - -interface Settings { - quality: string; - resolution?: string; - fps?: number; - codec: string; - audio_codec?: string; - max_bitrate_mbps: number; - region?: string; - discord_rpc: boolean; - discord_show_stats?: boolean; - proxy?: string; - disable_telemetry: boolean; - reflex?: boolean; // NVIDIA Reflex low-latency mode - recording_codec?: string; // Recording codec preference: h264 or av1 -} - -interface ProxyConfig { - enabled: boolean; - proxy_type: string; - host: string; - port: number; - username?: string; - password?: string; - bypass_local: boolean; - bypass_list: string[]; -} - -interface Server { - id: string; - name: string; - region: string; - country: string; - ping_ms?: number; - queue_size?: number; - status: string; -} - -// PrintedWaste API types for queue times -interface PrintedWasteServerMapping { - title: string; - region: string; - is4080Server: boolean; - is5080Server: boolean; - nuked: boolean; -} - -interface PrintedWasteQueueData { - QueuePosition: number; - "Last Updated": number; - Region: string; - eta?: number; // ETA in milliseconds -} - -interface PrintedWasteQueueResponse { - status: boolean; - error: boolean; - data: { [serverId: string]: PrintedWasteQueueData }; -} - -interface PrintedWasteMappingResponse { - status: boolean; - error: boolean; - data: { [serverId: string]: PrintedWasteServerMapping }; -} - -// Combined server info for queue selection -interface QueueServerInfo { - serverId: string; - displayName: string; // e.g., "Oregon" - region: string; // e.g., "US Northwest" - ping_ms?: number; - queuePosition: number; - etaSeconds?: number; - is4080Server: boolean; - is5080Server: boolean; -} - -interface ActiveSession { - sessionId: string; - appId: number; - gpuType: string | null; - status: number; - serverIp: string | null; - signalingUrl: string | null; - resolution: string | null; - fps: number | null; -} - -// Active session state -let detectedActiveSessions: ActiveSession[] = []; -let pendingGameLaunch: Game | null = null; -let sessionPollingInterval: number | null = null; -const SESSION_POLLING_INTERVAL_MS = 10000; // Check every 10 seconds - -// State -let currentView = "home"; -let isAuthenticated = false; -let currentUser: AuthState["user"] | null = null; -let currentSubscription: SubscriptionInfo | null = null; -let games: Game[] = []; -let discordRpcEnabled = true; // Discord presence toggle (enabled by default) -let discordShowStats = false; // Show resolution/fps/ms in Discord (default off) -let currentQuality = "auto"; // Current quality preset (legacy/fallback) -let currentResolution = "1920x1080"; // Current resolution (WxH format) -let currentFps = 60; // Current FPS -let currentCodec = "h264"; // Current video codec (for streaming) -let currentAudioCodec = "opus"; // Current audio codec -let currentRecordingCodec: RecordingCodecType = "h264"; // Recording codec preference -let currentMaxBitrate = 200; // Max bitrate in Mbps (200 = unlimited) -let availableResolutions: string[] = []; // Available resolutions from subscription -let availableFpsOptions: number[] = []; // Available FPS options from subscription -let currentRegion = "auto"; // Preferred region (auto = lowest ping) -let cachedServers: Server[] = []; // Cached server latency data -let isTestingLatency = false; // Flag to prevent concurrent latency tests -let reflexEnabled = true; // NVIDIA Reflex low-latency mode (auto-enabled for 120+ FPS) - -// PrintedWaste queue data cache -let cachedQueueData: PrintedWasteQueueResponse | null = null; -let cachedServerMapping: PrintedWasteMappingResponse | null = null; -let lastQueueFetch = 0; -const QUEUE_CACHE_TTL_MS = 30000; // 30 second cache for queue data -let selectedQueueServer: string | null = null; // User's selected server for queue -let queueCountdownInterval: number | null = null; // Countdown timer interval -let queueStartEta: number = 0; // Initial ETA when queue started (in seconds) -let queueStartTime: number = 0; // When the queue started (timestamp) - -// Helper to get streaming params - uses direct resolution and fps values -function getStreamingParams(): { resolution: string; fps: number } { - return { resolution: currentResolution, fps: currentFps }; -} - -// Check if user is on free tier -function isFreeTier(subscription: SubscriptionInfo | null): boolean { - if (!subscription) return true; // Assume free if no subscription data - const tier = subscription.membershipTier?.toUpperCase() || "FREE"; - return tier === "FREE" || tier === "FOUNDER"; // FOUNDER is also a free tier variant -} - -// Check if using an Alliance Partner (non-NVIDIA provider) -// PrintedWaste queue data is only available for NVIDIA global servers -function isAlliancePartner(): boolean { - if (!selectedLoginProvider) return false; - return selectedLoginProvider.loginProviderCode !== "NVIDIA"; -} - -// ============================================ -// PrintedWaste Queue API Integration -// ============================================ - -// Get the current app version for user agent -async function getAppVersion(): Promise { - try { - return await getVersion(); - } catch { - return "0.0.12"; // Fallback version - } -} - -// Fetch server mapping from PrintedWaste -async function fetchServerMapping(): Promise { - if (cachedServerMapping) { - return cachedServerMapping; - } - - try { - const version = await getAppVersion(); - const response = await tauriFetch("https://remote.printedwaste.com/config/GFN_SERVERID_TO_REGION_MAPPING", { - headers: { - "User-Agent": `OpenNOW/${version}` - } - }); - - if (!response.ok) { - console.error("Failed to fetch server mapping:", response.status); - return null; - } - - cachedServerMapping = await response.json(); - return cachedServerMapping; - } catch (error) { - console.error("Error fetching server mapping:", error); - return null; - } -} - -// Fetch queue data from PrintedWaste -async function fetchQueueData(): Promise { - const now = Date.now(); - - // Return cached data if still valid - if (cachedQueueData && (now - lastQueueFetch) < QUEUE_CACHE_TTL_MS) { - return cachedQueueData; - } - - try { - const version = await getAppVersion(); - const response = await tauriFetch("https://api.printedwaste.com/gfn/queue/", { - headers: { - "User-Agent": `OpenNOW/${version}` - } - }); - - if (!response.ok) { - console.error("Failed to fetch queue data:", response.status); - return cachedQueueData; // Return stale cache on error - } - - cachedQueueData = await response.json(); - lastQueueFetch = now; - return cachedQueueData; - } catch (error) { - console.error("Error fetching queue data:", error); - return cachedQueueData; // Return stale cache on error - } -} - -// Get combined queue server info with ping data -async function getQueueServersInfo(): Promise { - // Skip PrintedWaste queue for Alliance Partners - they have their own infrastructure - if (isAlliancePartner()) { - console.log("Skipping PrintedWaste queue - using Alliance Partner servers"); - return []; - } - - const [mapping, queueData] = await Promise.all([ - fetchServerMapping(), - fetchQueueData() - ]); - - if (!mapping || !queueData) { - console.error("Failed to fetch queue server info"); - return []; - } - - const servers: QueueServerInfo[] = []; - - for (const [serverId, serverData] of Object.entries(mapping.data)) { - // Skip nuked servers - if (serverData.nuked) continue; - - // Only include RTX 4080 or 5080 servers - if (!serverData.is4080Server && !serverData.is5080Server) continue; - - const queueInfo = queueData.data[serverId]; - if (!queueInfo) continue; // Skip if no queue data - - // Find ping from cached servers (match by region/name) - const cachedServer = cachedServers.find(s => - s.name.toLowerCase().includes(serverData.title.toLowerCase()) || - serverData.title.toLowerCase().includes(s.name.toLowerCase()) || - s.id === serverId - ); - - servers.push({ - serverId, - displayName: serverData.title, - region: serverData.region, - ping_ms: cachedServer?.ping_ms, - queuePosition: queueInfo.QueuePosition, - etaSeconds: queueInfo.eta ? Math.floor(queueInfo.eta / 1000) : undefined, // Convert ms to seconds - is4080Server: serverData.is4080Server, - is5080Server: serverData.is5080Server - }); - } - - // Sort by ping (best first), undefined pings go to end - servers.sort((a, b) => { - if (a.ping_ms === undefined && b.ping_ms === undefined) return 0; - if (a.ping_ms === undefined) return 1; - if (b.ping_ms === undefined) return -1; - return a.ping_ms - b.ping_ms; - }); - - return servers; -} - -// Format ETA in a human-readable format -function formatQueueEta(etaSeconds: number | undefined): string { - if (!etaSeconds || etaSeconds <= 0) return "Unknown"; - - if (etaSeconds < 60) { - return `${etaSeconds}s`; - } else if (etaSeconds < 3600) { - const minutes = Math.floor(etaSeconds / 60); - return `${minutes}m`; - } else if (etaSeconds < 86400) { - const hours = Math.floor(etaSeconds / 3600); - const minutes = Math.floor((etaSeconds % 3600) / 60); - return minutes > 0 ? `${hours}h ${minutes}m` : `${hours}h`; - } else { - const days = Math.floor(etaSeconds / 86400); - const hours = Math.floor((etaSeconds % 86400) / 3600); - return hours > 0 ? `${days}d ${hours}h` : `${days}d`; - } -} - -// Calculate auto-selected server based on ping and queue time -function getAutoSelectedServer(servers: QueueServerInfo[]): QueueServerInfo | null { - if (servers.length === 0) return null; - - // Score each server: lower is better - // We balance ping (important for gameplay) with queue time - // Ping weight: 1.0, Queue ETA weight: 0.1 (per minute) - const scored = servers.map(server => { - const pingScore = server.ping_ms ?? 500; // High penalty for unknown ping - const etaMinutes = (server.etaSeconds ?? 0) / 60; - // Cap ETA penalty to prevent extremely long queues from dominating - const etaScore = Math.min(etaMinutes * 0.1, 50); - return { - server, - score: pingScore + etaScore - }; - }); - - scored.sort((a, b) => a.score - b.score); - return scored[0]?.server ?? null; -} - -// Show the queue server selection modal (for free tier users) -async function showQueueSelectionModal(game: Game): Promise { - return new Promise(async (resolve) => { - // Fetch queue data - const servers = await getQueueServersInfo(); - - if (servers.length === 0) { - // No queue data available, proceed with normal flow - resolve(null); - return; - } - - const autoServer = getAutoSelectedServer(servers); - - // Remove existing modal if any - const existing = document.getElementById("queue-selection-modal"); - if (existing) existing.remove(); - - const modal = document.createElement("div"); - modal.id = "queue-selection-modal"; - modal.className = "modal"; - modal.innerHTML = ` - - `; - - // Add modal styles - const style = document.createElement("style"); - style.id = "queue-modal-style"; - style.textContent = ` - .queue-modal-content { - max-width: 500px; - max-height: 80vh; - overflow: hidden; - display: flex; - flex-direction: column; - } - .queue-modal-subtitle { - color: var(--text-secondary); - font-size: 14px; - margin-bottom: 16px; - } - .queue-server-list { - flex: 1; - overflow-y: auto; - max-height: 350px; - margin-bottom: 16px; - border: 1px solid var(--border-color); - border-radius: var(--radius); - } - .queue-server-item { - display: flex; - justify-content: space-between; - align-items: center; - padding: 12px 16px; - cursor: pointer; - transition: background 0.15s; - border-bottom: 1px solid var(--border-color); - } - .queue-server-item:last-child { - border-bottom: none; - } - .queue-server-item:hover { - background: var(--bg-hover); - } - .queue-server-item.selected { - background: rgba(118, 185, 0, 0.15); - border-left: 3px solid var(--accent-green); - } - .queue-server-info { - display: flex; - flex-direction: column; - gap: 2px; - } - .queue-server-name { - font-weight: 500; - color: var(--text-primary); - } - .queue-server-detail { - font-size: 12px; - color: var(--text-muted); - } - .queue-server-stats { - display: flex; - gap: 16px; - align-items: center; - } - .queue-ping { - font-family: monospace; - font-size: 14px; - min-width: 50px; - text-align: right; - } - .queue-wait { - font-size: 13px; - color: var(--text-secondary); - min-width: 70px; - text-align: right; - } - .queue-modal-actions { - display: flex; - gap: 12px; - margin-bottom: 12px; - } - .queue-modal-actions .btn { - flex: 1; - } - .queue-attribution { - text-align: center; - font-size: 11px; - color: var(--text-muted); - } - .queue-attribution a { - color: var(--accent-green); - text-decoration: none; - } - .queue-attribution a:hover { - text-decoration: underline; - } - `; - - document.head.appendChild(style); - document.body.appendChild(modal); - - // Initialize Lucide icons if available - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - let selectedServerId = "auto"; - let selectedEta = autoServer?.etaSeconds || 0; - - // Handle server selection - const serverItems = modal.querySelectorAll('.queue-server-item'); - serverItems.forEach(item => { - item.addEventListener('click', () => { - serverItems.forEach(i => i.classList.remove('selected')); - item.classList.add('selected'); - selectedServerId = (item as HTMLElement).dataset.serverId || "auto"; - selectedEta = parseInt((item as HTMLElement).dataset.eta || "0", 10); - }); - }); - - // Handle start button - modal.querySelector('#queue-start-btn')?.addEventListener('click', () => { - selectedQueueServer = selectedServerId === "auto" ? (autoServer?.serverId || null) : selectedServerId; - queueStartEta = selectedEta; - queueStartTime = Date.now(); - modal.remove(); - style.remove(); - resolve(selectedQueueServer); - }); - - // Handle cancel button - modal.querySelector('#queue-cancel-btn')?.addEventListener('click', () => { - modal.remove(); - style.remove(); - resolve(null); - }); - - // Handle close button - modal.querySelector('.modal-close')?.addEventListener('click', () => { - modal.remove(); - style.remove(); - resolve(null); - }); - - // Close on background click - modal.addEventListener('click', (e) => { - if (e.target === modal) { - modal.remove(); - style.remove(); - resolve(null); - } - }); - }); -} - -// Start countdown timer for queue ETA -function startQueueCountdown() { - if (queueCountdownInterval) { - clearInterval(queueCountdownInterval); - } - - const updateCountdown = () => { - const queueEtaEl = document.getElementById("queue-eta"); - - if (!queueEtaEl || queueStartEta <= 0) return; - - // Calculate remaining time - const elapsed = Math.floor((Date.now() - queueStartTime) / 1000); - const remaining = Math.max(0, queueStartEta - elapsed); - - queueEtaEl.textContent = formatQueueEta(remaining); - }; - - // Update immediately and then every second - updateCountdown(); - queueCountdownInterval = window.setInterval(updateCountdown, 1000); -} - -// Stop countdown timer -function stopQueueCountdown() { - if (queueCountdownInterval) { - clearInterval(queueCountdownInterval); - queueCountdownInterval = null; - } - - queueStartEta = 0; - queueStartTime = 0; -} - -// Show queue times page (can be accessed from UI) -async function showQueueTimesPage(): Promise { - // Queue times are only available for NVIDIA global servers - if (isAlliancePartner()) { - alert("Queue times are only available for NVIDIA global servers. Alliance Partner servers have their own queue system."); - return; - } - - const servers = await getQueueServersInfo(); - - if (servers.length === 0) { - alert("Unable to fetch queue times. Please try again later."); - return; - } - - // Remove existing modal if any - const existing = document.getElementById("queue-times-modal"); - if (existing) existing.remove(); - - const modal = document.createElement("div"); - modal.id = "queue-times-modal"; - modal.className = "modal"; - modal.innerHTML = ` -
- -

Queue Times

-

Current wait times for RTX 4080/5080 servers, sorted by your ping.

- -
- ${servers.map(server => ` -
-
- ${server.displayName} - ${server.is5080Server ? 'RTX 5080' : 'RTX 4080'} -
-
- ${server.ping_ms ? `${server.ping_ms}ms` : '--'} - ~${formatQueueEta(server.etaSeconds)} - #${server.queuePosition} -
-
- `).join('')} -
- -
- Powered by PrintedWaste -
-
- `; - - // Add modal styles - const style = document.createElement("style"); - style.id = "queue-times-modal-style"; - style.textContent = ` - .queue-times-content { - max-width: 550px; - max-height: 80vh; - overflow: hidden; - display: flex; - flex-direction: column; - } - .queue-times-subtitle { - color: var(--text-secondary); - font-size: 14px; - margin-bottom: 16px; - } - .queue-times-list { - flex: 1; - overflow-y: auto; - max-height: 400px; - margin-bottom: 16px; - border: 1px solid var(--border-color); - border-radius: var(--radius); - } - .queue-times-item { - display: flex; - justify-content: space-between; - align-items: center; - padding: 12px 16px; - border-bottom: 1px solid var(--border-color); - } - .queue-times-item:last-child { - border-bottom: none; - } - .queue-times-item:nth-child(odd) { - background: var(--bg-tertiary); - } - .queue-times-info { - display: flex; - flex-direction: column; - gap: 2px; - } - .queue-times-name { - font-weight: 500; - color: var(--text-primary); - } - .queue-times-gpu { - font-size: 12px; - color: var(--text-muted); - } - .queue-times-stats { - display: flex; - gap: 16px; - align-items: center; - } - .queue-times-ping { - font-family: monospace; - font-size: 14px; - min-width: 55px; - text-align: right; - } - .queue-times-wait { - font-size: 13px; - color: var(--text-secondary); - min-width: 70px; - text-align: right; - } - .queue-times-position { - font-size: 12px; - color: var(--text-muted); - min-width: 40px; - text-align: right; - } - .queue-attribution { - text-align: center; - font-size: 11px; - color: var(--text-muted); - } - .queue-attribution a { - color: var(--accent-green); - text-decoration: none; - } - .queue-attribution a:hover { - text-decoration: underline; - } - `; - - document.head.appendChild(style); - document.body.appendChild(modal); - - // Handle close button - modal.querySelector('.modal-close')?.addEventListener('click', () => { - modal.remove(); - style.remove(); - }); - - // Close on background click - modal.addEventListener('click', (e) => { - if (e.target === modal) { - modal.remove(); - style.remove(); - } - }); -} - -// Check if resolution is above 1080p (considering any aspect ratio) -function isResolutionAbove1080p(resolution: string): boolean { - const parts = resolution.split('x'); - if (parts.length !== 2) return false; - const height = parseInt(parts[1], 10); - // 1080p max height is 1080, anything above is considered premium - // For ultrawide 1080p (2560x1080), height is still 1080 so it's allowed - return height > 1080; -} - -// Populate resolution and FPS dropdowns from subscription data -function populateStreamingOptions(subscription: SubscriptionInfo | null): void { - // Default options if no subscription data - const defaultResolutions = [ - { width: 1280, height: 720 }, - { width: 1920, height: 1080 }, - { width: 2560, height: 1440 }, - { width: 3840, height: 2160 }, - ]; - const defaultFps = [30, 60, 120, 240]; - - // Check if user is on free tier - const isFree = isFreeTier(subscription); - console.log(`User tier: ${subscription?.membershipTier || "FREE"}, isFree: ${isFree}`); - - // Helper to get friendly resolution label - const getResolutionLabel = (res: string, disabled: boolean): string => { - const labels: { [key: string]: string } = { - '1280x720': '1280x720 (720p)', - '1920x1080': '1920x1080 (1080p)', - '2560x1440': '2560x1440 (1440p)', - '3840x2160': '3840x2160 (4K)', - '5120x2880': '5120x2880 (5K)', - '2560x1080': '2560x1080 (UW 1080p)', - '3440x1440': '3440x1440 (UW 1440p)', - '1920x800': '1920x800 (21:9)', - '2560x1600': '2560x1600 (16:10)', - '1680x1050': '1680x1050 (16:10)', - }; - const label = labels[res] || res; - return disabled ? `${label} (Priority/Ultimate)` : label; - }; - - if (subscription?.features?.resolutions && subscription.features.resolutions.length > 0) { - // Extract unique resolutions and FPS from subscription (ignore isEntitled - show all options) - const resolutionSet = new Set(); - const fpsSet = new Set(); - - for (const res of subscription.features.resolutions) { - // Show all resolutions/FPS regardless of entitlement - resolutionSet.add(`${res.widthInPixels}x${res.heightInPixels}`); - fpsSet.add(res.framesPerSecond); - } - - // Convert to sorted arrays - availableResolutions = Array.from(resolutionSet).sort((a, b) => { - const [aW] = a.split('x').map(Number); - const [bW] = b.split('x').map(Number); - return aW - bW; - }); - - // Always include high FPS options even if not in API response (for paid tiers) - if (!isFree) { - fpsSet.add(120); - fpsSet.add(240); - } - - availableFpsOptions = Array.from(fpsSet).sort((a, b) => a - b); - - console.log(`Populated ${availableResolutions.length} resolutions and ${availableFpsOptions.length} FPS options from subscription`); - } else { - // Use defaults - availableResolutions = defaultResolutions.map(r => `${r.width}x${r.height}`); - availableFpsOptions = defaultFps; - console.log("Using default resolution/FPS options (no subscription data)"); - } - - // For free tier, filter out premium options - if (isFree) { - // Filter resolutions: keep only those at or below 1080p height - availableResolutions = availableResolutions.filter(res => !isResolutionAbove1080p(res)); - - // Filter FPS: remove 240 and 360 fps options - availableFpsOptions = availableFpsOptions.filter(fps => fps < 240); - - console.log(`Free tier: Filtered to ${availableResolutions.length} resolutions and ${availableFpsOptions.length} FPS options`); - } - - // Build resolution options for custom dropdown - const resolutionOptions = availableResolutions.map(res => ({ - value: res, - text: getResolutionLabel(res, false), - selected: res === currentResolution - })); - - // If current resolution not in list, select highest available - if (!resolutionOptions.some(o => o.selected) && resolutionOptions.length > 0) { - // Select 1080p if available, otherwise the highest - const preferred = resolutionOptions.find(o => o.value === "1920x1080") || resolutionOptions[resolutionOptions.length - 1]; - preferred.selected = true; - currentResolution = preferred.value; - } - - setDropdownOptions("resolution-setting", resolutionOptions); - - // Build FPS options for custom dropdown - const fpsOptions = availableFpsOptions.map(fps => ({ - value: String(fps), - text: `${fps} FPS`, - selected: fps === currentFps - })); - - // If current FPS not in list, select highest available - if (!fpsOptions.some(o => o.selected) && fpsOptions.length > 0) { - // Select 60 FPS if available, otherwise the highest - const preferred = fpsOptions.find(o => o.value === "60") || fpsOptions[fpsOptions.length - 1]; - preferred.selected = true; - currentFps = parseInt(preferred.value, 10); - } - - setDropdownOptions("fps-setting", fpsOptions); -} - -// Get latency class for color coding based on ping value -function getLatencyClass(pingMs: number | undefined): string { - if (pingMs === undefined) return "latency-offline"; - if (pingMs < 20) return "latency-excellent"; - if (pingMs < 40) return "latency-good"; - if (pingMs < 80) return "latency-fair"; - if (pingMs < 120) return "latency-poor"; - return "latency-bad"; -} - -// Format latency display text -function formatLatency(pingMs: number | undefined, status: string): string { - if (status !== "Online") return status.toLowerCase(); - if (pingMs === undefined) return "---"; - return `${pingMs}ms`; -} - -// Number of latency test rounds to average (ICMP ping is accurate, fewer rounds needed) -const LATENCY_TEST_ROUNDS = 3; - -// Test latency to all regions with multiple rounds for accuracy -async function testLatency(): Promise { - if (isTestingLatency) { - console.log("Latency test already in progress"); - return cachedServers; - } - - isTestingLatency = true; - console.log(`Starting latency test (${LATENCY_TEST_ROUNDS} rounds)...`); - - // Update UI to show testing state - updateLatencyTestingUI(true, 0, LATENCY_TEST_ROUNDS); - - try { - // Store results from all rounds: Map - const allResults: Map = new Map(); - let baseServers: Server[] = []; - - // Run multiple rounds - for (let round = 0; round < LATENCY_TEST_ROUNDS; round++) { - console.log(`Latency test round ${round + 1}/${LATENCY_TEST_ROUNDS}...`); - updateLatencyTestingUI(true, round + 1, LATENCY_TEST_ROUNDS); - - const servers = await invoke("get_servers", { accessToken: null }); - - if (round === 0) { - baseServers = servers; - } - - // Collect ping values - for (const server of servers) { - if (server.status === "Online" && server.ping_ms !== undefined) { - if (!allResults.has(server.id)) { - allResults.set(server.id, []); - } - allResults.get(server.id)!.push(server.ping_ms); - } - } - - // Small delay between rounds to avoid hammering servers - if (round < LATENCY_TEST_ROUNDS - 1) { - await new Promise(resolve => setTimeout(resolve, 500)); - } - } - - // Calculate averaged results - const averagedServers: Server[] = baseServers.map(server => { - const pings = allResults.get(server.id); - if (pings && pings.length > 0) { - // Calculate average, excluding outliers (highest and lowest if we have enough samples) - let avgPing: number; - if (pings.length >= 3) { - // Remove highest and lowest, then average the rest - const sorted = [...pings].sort((a, b) => a - b); - const trimmed = sorted.slice(1, -1); - avgPing = Math.round(trimmed.reduce((a, b) => a + b, 0) / trimmed.length); - } else { - avgPing = Math.round(pings.reduce((a, b) => a + b, 0) / pings.length); - } - return { ...server, ping_ms: avgPing }; - } - return server; - }); - - // Sort by ping - averagedServers.sort((a, b) => { - if (a.status === "Online" && b.status === "Online") { - return (a.ping_ms || 9999) - (b.ping_ms || 9999); - } - if (a.status === "Online") return -1; - if (b.status === "Online") return 1; - return 0; - }); - - cachedServers = averagedServers; - - // Log summary - console.log(`Latency test complete (${LATENCY_TEST_ROUNDS} rounds averaged):`); - console.table(averagedServers.map(s => ({ - Region: s.name, - "Avg Ping (ms)": s.ping_ms || "offline", - Status: s.status, - Samples: allResults.get(s.id)?.length || 0 - }))); - - // Update the region dropdown with averaged latency data - populateRegionDropdown(averagedServers); - - // Update status bar - updateStatusBarLatency(); - - return averagedServers; - } catch (error) { - console.error("Latency test failed:", error); - return cachedServers; - } finally { - isTestingLatency = false; - updateLatencyTestingUI(false, 0, LATENCY_TEST_ROUNDS); - } -} - -// Update UI to show latency testing in progress -function updateLatencyTestingUI(testing: boolean, currentRound: number = 0, totalRounds: number = 1): void { - const pingInfo = document.getElementById("ping-info"); - if (pingInfo) { - if (testing) { - // Clear existing content - while (pingInfo.firstChild) { - pingInfo.removeChild(pingInfo.firstChild); - } - // Add spinner - const spinner = document.createElement("span"); - spinner.className = "region-loading-spinner"; - pingInfo.appendChild(spinner); - // Show progress - const progressText = currentRound > 0 - ? ` Testing ${currentRound}/${totalRounds}...` - : " Testing..."; - pingInfo.appendChild(document.createTextNode(progressText)); - pingInfo.className = ""; - } - } -} - -// Get latency class name for dropdown coloring -function getLatencyClassName(pingMs: number | undefined): string { - if (pingMs === undefined) return ''; - if (pingMs < 20) return 'latency-excellent'; - if (pingMs < 40) return 'latency-good'; - if (pingMs < 80) return 'latency-fair'; - if (pingMs < 120) return 'latency-poor'; - return 'latency-bad'; -} - -// Populate region dropdown with latency data -function populateRegionDropdown(servers: Server[]): void { - // Use the saved currentRegion (from settings) as the source of truth - // Only fall back to dropdown value if currentRegion is not set - // This ensures the saved region persists across app restarts - const currentValue = currentRegion || getDropdownValue("region-setting") || "auto"; - - // Build options array - const options: { value: string; text: string; selected?: boolean; className?: string }[] = []; - - // Add Auto option first - const bestServer = servers.find(s => s.status === "Online"); - const autoText = bestServer && bestServer.ping_ms - ? `Auto (${bestServer.name} - ${bestServer.ping_ms}ms)` - : "Auto (Lowest Ping)"; - options.push({ - value: "auto", - text: autoText, - selected: currentValue === "auto", - className: bestServer ? getLatencyClassName(bestServer.ping_ms) : '' - }); - - // Group servers by region and add them - const regions: { [key: string]: Server[] } = {}; - for (const server of servers) { - if (!regions[server.region]) { - regions[server.region] = []; - } - regions[server.region].push(server); - } - - // Add servers grouped by region - for (const [regionName, regionServers] of Object.entries(regions)) { - for (const server of regionServers) { - if (server.status !== "Online") continue; // Skip offline servers - - const latencyText = formatLatency(server.ping_ms, server.status); - const text = server.ping_ms - ? `${regionName} - ${server.name} (${latencyText})` - : `${regionName} - ${server.name}`; - - options.push({ - value: server.id, - text: text, - selected: currentValue === server.id, - className: getLatencyClassName(server.ping_ms) - }); - } - } - - // Update the dropdown - setDropdownOptions("region-setting", options); - - // Ensure the saved region is selected in the dropdown - // Don't overwrite currentRegion - it should only change when user explicitly selects a new region - if (currentValue && currentValue !== "auto") { - // Check if the saved region exists in the options - const regionExists = options.some(o => o.value === currentValue); - if (regionExists) { - setDropdownValue("region-setting", currentValue); - } else { - // Region no longer exists (server removed), fall back to auto - console.warn(`Saved region "${currentValue}" not found in server list, falling back to auto`); - setDropdownValue("region-setting", "auto"); - currentRegion = "auto"; - } - } -} - -// Get CSS color for latency value -function getLatencyColor(pingMs: number | undefined): string { - if (pingMs === undefined) return "#666666"; - if (pingMs < 20) return "#00c853"; - if (pingMs < 40) return "#76b900"; - if (pingMs < 80) return "#ffc107"; - if (pingMs < 120) return "#ff9800"; - return "#f44336"; -} - -// Update status bar with current region and ping -function updateStatusBarLatency(): void { - const serverInfo = document.getElementById("server-info"); - const pingInfo = document.getElementById("ping-info"); - - if (!serverInfo || !pingInfo) return; - - let displayServer: Server | undefined; - - if (currentRegion === "auto") { - // Find best server (first online one, already sorted by ping) - displayServer = cachedServers.find(s => s.status === "Online"); - serverInfo.textContent = displayServer ? `Server: Auto (${displayServer.name})` : "Server: Auto"; - } else { - // Find selected server - displayServer = cachedServers.find(s => s.id === currentRegion); - serverInfo.textContent = displayServer ? `Server: ${displayServer.name}` : `Server: ${currentRegion}`; - } - - if (displayServer && displayServer.ping_ms !== undefined) { - pingInfo.textContent = `Ping: ${displayServer.ping_ms}ms`; - pingInfo.className = getLatencyClass(displayServer.ping_ms); - } else { - pingInfo.textContent = "Ping: --ms"; - pingInfo.className = ""; - } -} - -// Get the server ID to use for session launch -function getPreferredServerForSession(): string | undefined { - // If a queue server was selected (free tier users), use that - if (selectedQueueServer) { - const server = selectedQueueServer; - // Reset for next launch - selectedQueueServer = null; - return server; - } - - if (currentRegion === "auto") { - // Use the best (lowest ping) online server - const bestServer = cachedServers.find(s => s.status === "Online"); - return bestServer?.id; - } - return currentRegion; -} - -// DOM Elements -const loginBtn = document.getElementById("login-btn")!; -const userMenu = document.getElementById("user-menu")!; -const settingsBtn = document.getElementById("settings-btn")!; -const searchInput = document.getElementById("search-input") as HTMLInputElement; -const navItems = document.querySelectorAll(".nav-item"); - -// Declare Lucide global (loaded via CDN) -declare const lucide: { createIcons: () => void }; - -// Update checker -interface GitHubRelease { - tag_name: string; - name: string; - body: string; - html_url: string; - prerelease: boolean; -} - -async function checkForUpdates(): Promise { - try { - // Use releases list instead of /latest to avoid 404 when no releases exist - const response = await fetch( - "https://api.github.com/repos/zortos293/GFNClient/releases?per_page=1" - ); - - if (!response.ok) { - console.log("Could not check for updates (API error)"); - return; - } - - const releases = await response.json(); - - if (!Array.isArray(releases) || releases.length === 0) { - // No releases published yet - this is expected for new projects - console.log("No releases found - skipping update check"); - return; - } - - // Use the first (most recent) release - await handleReleaseCheck(releases[0]); - } catch (error) { - // Network errors, etc - silently ignore - console.log("Update check skipped:", error instanceof Error ? error.message : "network error"); - } -} - -async function handleReleaseCheck(release: GitHubRelease): Promise { - const latestVersion = release.tag_name.replace(/^v/, ""); - const currentVersion = await getVersion(); - - // First check if latest is actually newer than current - if (!isNewerVersion(latestVersion, currentVersion)) { - console.log("App is up to date:", currentVersion); - // Clear any skipped version since we're now at or past it - localStorage.removeItem("skippedVersion"); - return; - } - - // Latest is newer - check if user explicitly skipped this version - const skippedVersion = localStorage.getItem("skippedVersion"); - if (skippedVersion === latestVersion) { - console.log("User skipped version", latestVersion); - return; - } - - // Show update modal - console.log("Update available:", latestVersion); - showUpdateModal(release, latestVersion); -} - -function isNewerVersion(latest: string, current: string): boolean { - const latestParts = latest.split(".").map(Number); - const currentParts = current.split(".").map(Number); - - for (let i = 0; i < Math.max(latestParts.length, currentParts.length); i++) { - const l = latestParts[i] || 0; - const c = currentParts[i] || 0; - if (l > c) return true; - if (l < c) return false; - } - return false; -} - -function showUpdateModal(release: GitHubRelease, version: string): void { - const modal = document.getElementById("update-modal"); - const versionSpan = document.getElementById("update-version"); - const changelogDiv = document.getElementById("update-changelog-content"); - const downloadBtn = document.getElementById("update-download-btn") as HTMLAnchorElement; - const skipBtn = document.getElementById("update-skip-btn"); - const laterBtn = document.getElementById("update-later-btn"); - - if (!modal || !versionSpan || !changelogDiv || !downloadBtn) return; - - versionSpan.textContent = `v${version}`; - - // Parse changelog from release body - const changelog = release.body || "No changelog available."; - changelogDiv.innerHTML = formatChangelog(changelog); - - // Set download link - downloadBtn.href = release.html_url; - - // Show modal - modal.classList.remove("hidden"); - - // Reinitialize Lucide icons - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - // Skip button - remember to skip this version - skipBtn?.addEventListener("click", () => { - localStorage.setItem("skippedVersion", version); - modal.classList.add("hidden"); - }); - - // Later button - just close - laterBtn?.addEventListener("click", () => { - modal.classList.add("hidden"); - }); - - // Close button - const closeBtn = modal.querySelector(".modal-close"); - closeBtn?.addEventListener("click", () => { - modal.classList.add("hidden"); - }); -} - -function formatChangelog(body: string): string { - // Convert markdown-style changelog to HTML - let html = body - // Convert headers - .replace(/^### (.+)$/gm, "$1") - .replace(/^## (.+)$/gm, "$1") - // Convert bullet points - .replace(/^[*-] (.+)$/gm, "
  • $1
    • ") - // Convert newlines - .replace(/\n\n/g, "

    ") - .replace(/\n/g, " "); - - // Wrap lists - if (html.includes("
  • ")) { - html = html.replace(/(
  • .*<\/li>)/g, "
      $1
    "); - // Clean up consecutive ul tags - html = html.replace(/<\/ul>\s*
      /g, ""); - } - - return html; -} - -// Initialize -document.addEventListener("DOMContentLoaded", async () => { - // Initialize frontend logging first (intercepts console.*) - initLogging(); - - console.log("OpenNOW initialized"); - - // Initialize Lucide icons - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - // Initialize custom dropdowns - initializeDropdowns(); - - // Setup navigation - setupNavigation(); - - // Setup modals - setupModals(); - - // Setup login modal - setupLoginModal(); - - // Setup session modals - setupSessionModals(); - - // Setup queue times nav click handler - const queueTimesNav = document.getElementById("queue-times-nav"); - if (queueTimesNav) { - queueTimesNav.addEventListener("click", (e) => { - e.preventDefault(); - showQueueTimesPage(); - }); - } - - // Setup search - setupSearch(); - - // Load saved settings - await loadSettings(); - - // Check auth status - await checkAuthStatus(); - - // Load initial data - await loadHomeData(); - - // Run latency test in background on startup - testLatency().catch(err => console.error("Initial latency test failed:", err)); - - // Check for updates - checkForUpdates(); - - // Check for active sessions after auth (if authenticated) - if (isAuthenticated) { - const sessions = await checkActiveSessions(); - if (sessions.length > 0) { - // Show navbar indicator and modal - updateNavbarSessionIndicator(sessions[0]); - showActiveSessionModal(sessions[0]); - } - // Start polling for active sessions every 10 seconds - startSessionPolling(); - } - - // Setup region dropdown change handler - onDropdownChange("region-setting", (value) => { - currentRegion = value; - updateStatusBarLatency(); - }); -}); - -// Detect platform -const isMacOS = navigator.platform.toUpperCase().includes("MAC") || - navigator.userAgent.toUpperCase().includes("MAC"); -const isWindows = navigator.platform.toUpperCase().includes("WIN") || - navigator.userAgent.toUpperCase().includes("WIN"); - -// Load settings from backend and apply to UI -async function loadSettings() { - try { - const settings = await invoke("get_settings"); - console.log("Loaded settings:", settings); - - // Apply to global state - currentQuality = settings.quality || "auto"; - currentResolution = settings.resolution || "1920x1080"; - currentFps = settings.fps || 60; - currentCodec = settings.codec || "h264"; - currentAudioCodec = settings.audio_codec || "opus"; - currentMaxBitrate = settings.max_bitrate_mbps || 200; - discordRpcEnabled = settings.discord_rpc !== false; // Default to true - discordShowStats = settings.discord_show_stats === true; // Default to false - currentRegion = settings.region || "auto"; - reflexEnabled = settings.reflex !== false; // Default to true - - // Apply to UI elements (non-dropdown) - const bitrateEl = document.getElementById("bitrate-setting") as HTMLInputElement; - const bitrateValueEl = document.getElementById("bitrate-value"); - const discordEl = document.getElementById("discord-setting") as HTMLInputElement; - const discordStatsEl = document.getElementById("discord-stats-setting") as HTMLInputElement; - const telemetryEl = document.getElementById("telemetry-setting") as HTMLInputElement; - const proxyEl = document.getElementById("proxy-setting") as HTMLInputElement; - - // Update codec dropdown options - // H.265/HEVC only supported on macOS (Windows browser doesn't support HEVC decoding) - // AV1 requires RTX 30+/RX 6000+ for hardware decoding - const codecOptions: { value: string; text: string; selected?: boolean; disabled?: boolean }[] = [ - { value: "h264", text: "H.264 (Best Compatibility)", selected: currentCodec === "h264" }, - ]; - - if (isMacOS) { - codecOptions.push({ value: "h265", text: "H.265/HEVC (Lower Latency)", selected: currentCodec === "h265" }); - } - - codecOptions.push({ value: "av1", text: "AV1 (Requires AV1 Decoder - RTX 30+/RX 6000+)", selected: currentCodec === "av1" }); - - // If user had H.265 selected on Windows, fall back to H.264 - if (isWindows && currentCodec === "h265") { - currentCodec = "h264"; - codecOptions[0].selected = true; - } - - setDropdownOptions("codec-setting", codecOptions); - - // Update audio codec dropdown options based on platform - const audioCodecOptions = [ - { value: "opus", text: "Opus (Default)", selected: currentAudioCodec === "opus" }, - ]; - if (isMacOS) { - audioCodecOptions.push({ - value: "opus-stereo", - text: "Opus Stereo (Better Audio)", - selected: currentAudioCodec === "opus-stereo" - }); - } else if (currentAudioCodec === "opus-stereo") { - // Fall back to Opus if not on macOS - currentAudioCodec = "opus"; - audioCodecOptions[0].selected = true; - } - setDropdownOptions("audio-codec-setting", audioCodecOptions); - - // Load recording codec preference and apply to UI - // VP8 is default - software encoded, no GPU contention with stream - const recCodec = settings.recording_codec; - currentRecordingCodec = (recCodec === "av1" ? "av1" : recCodec === "h264" ? "h264" : "vp8") as RecordingCodecType; - getRecordingManager().setCodecPreference(currentRecordingCodec); - setDropdownValue("recording-codec-setting", currentRecordingCodec); - - // Apply dropdown values - setDropdownValue("resolution-setting", currentResolution); - setDropdownValue("fps-setting", String(currentFps)); - setDropdownValue("region-setting", currentRegion); - - // Apply non-dropdown values - if (bitrateEl) { - bitrateEl.value = String(currentMaxBitrate); - if (bitrateValueEl) { - bitrateValueEl.textContent = currentMaxBitrate >= 200 ? "Unlimited" : `${currentMaxBitrate} Mbps`; - } - } - if (discordEl) discordEl.checked = discordRpcEnabled; - if (discordStatsEl) discordStatsEl.checked = discordShowStats; - if (telemetryEl) telemetryEl.checked = settings.disable_telemetry ?? true; - if (proxyEl && settings.proxy) proxyEl.value = settings.proxy; - - const reflexEl = document.getElementById("reflex-setting") as HTMLInputElement; - if (reflexEl) reflexEl.checked = reflexEnabled; - - } catch (error) { - console.warn("Failed to load settings:", error); - } -} - -// Navigation -function setupNavigation() { - navItems.forEach((item) => { - item.addEventListener("click", (e) => { - e.preventDefault(); - const view = (item as HTMLElement).dataset.view; - if (view) { - switchView(view); - } - }); - }); -} - -function switchView(view: string) { - // Update nav - navItems.forEach((item) => { - item.classList.toggle("active", (item as HTMLElement).dataset.view === view); - }); - - // Update views - only toggle active class, don't use hidden for views - document.querySelectorAll(".view").forEach((v) => { - const isActive = v.id === `${view}-view`; - v.classList.toggle("active", isActive); - // Remove hidden class from views - CSS handles visibility via :not(.active) - v.classList.remove("hidden"); - }); - - // Clear search input and hide search view when navigating away - const searchInput = document.getElementById("search-input") as HTMLInputElement; - if (searchInput) { - searchInput.value = ""; - } - hideSearchDropdown(); - - currentView = view; - - // Load view-specific data - if (view === "library") { - loadLibraryData(); - } else if (view === "store") { - loadStoreData(); - } -} - -// Modals -function setupModals() { - // Settings modal - settingsBtn.addEventListener("click", () => { - showModal("settings-modal"); - }); - - // Close buttons - document.querySelectorAll(".modal-close").forEach((btn) => { - btn.addEventListener("click", () => { - hideAllModals(); - }); - }); - - // Click outside to close - document.querySelectorAll(".modal").forEach((modal) => { - modal.addEventListener("click", (e) => { - if (e.target === modal) { - hideAllModals(); - } - }); - }); - - // Save settings - document.getElementById("save-settings-btn")?.addEventListener("click", saveSettings); - - // Export logs button - document.getElementById("export-logs-btn")?.addEventListener("click", async () => { - const btn = document.getElementById("export-logs-btn") as HTMLButtonElement; - const originalText = btn.textContent; - btn.textContent = "Exporting..."; - btn.disabled = true; - - try { - const savedPath = await exportLogs(); - console.log("Logs exported to:", savedPath); - btn.textContent = "Exported!"; - setTimeout(() => { - btn.textContent = originalText; - btn.disabled = false; - }, 2000); - } catch (error) { - console.error("Failed to export logs:", error); - btn.textContent = originalText; - btn.disabled = false; - // Don't show error for cancelled export - if (error !== "Export cancelled") { - alert("Failed to export logs: " + error); - } - } - }); - - // Clear logs button - document.getElementById("clear-logs-btn")?.addEventListener("click", async () => { - const btn = document.getElementById("clear-logs-btn") as HTMLButtonElement; - const originalText = btn.textContent; - - try { - await clearLogs(); - console.log("Logs cleared"); - btn.textContent = "Cleared!"; - setTimeout(() => { - btn.textContent = originalText; - }, 2000); - } catch (error) { - console.error("Failed to clear logs:", error); - alert("Failed to clear logs: " + error); - } - }); - - // Test codecs button - document.getElementById("test-codecs-btn")?.addEventListener("click", () => { - const resultsDiv = document.getElementById("codec-results"); - if (!resultsDiv) return; - - const codecs = testCodecSupport(); - const currentCodec = getRecordingManager().getCurrentCodec(); - const codecPref = getRecordingManager().getCodecPreference(); - - // Clear and show results - resultsDiv.style.display = "block"; - - // Build results using DOM methods - while (resultsDiv.firstChild) { - resultsDiv.removeChild(resultsDiv.firstChild); - } - - // Add header - const header = document.createElement("div"); - header.className = "codec-header"; - header.textContent = "Active codec: " + currentCodec; - resultsDiv.appendChild(header); - - const prefNote = document.createElement("div"); - prefNote.className = "codec-note"; - prefNote.textContent = "Preference: " + (codecPref === "av1" ? "AV1 (Best Quality)" : "H.264 (Best Compatibility)"); - resultsDiv.appendChild(prefNote); - - // Add codec list - const list = document.createElement("div"); - list.className = "codec-list"; - - codecs.forEach(codec => { - const item = document.createElement("div"); - item.className = "codec-item" + (codec.supported ? " supported" : " unsupported"); - if (codec.codec === currentCodec) { - item.className += " active"; - } - - const indicator = document.createElement("span"); - indicator.className = "codec-indicator"; - indicator.textContent = codec.supported ? "✓" : "✗"; - item.appendChild(indicator); - - const info = document.createElement("span"); - info.className = "codec-info"; - - const name = document.createElement("span"); - name.className = "codec-name"; - name.textContent = codec.description; - info.appendChild(name); - - if (codec.hwAccelerated && codec.supported) { - const badge = document.createElement("span"); - badge.className = "codec-badge"; - badge.textContent = "GPU"; - info.appendChild(badge); - } - - item.appendChild(info); - list.appendChild(item); - }); - - resultsDiv.appendChild(list); - }); - - // Open recordings folder button - document.getElementById("open-recordings-btn")?.addEventListener("click", async () => { - try { - await openRecordingsFolder(); - } catch (error) { - console.error("Failed to open recordings folder:", error); - } - }); - - // Bitrate slider live update - const bitrateSlider = document.getElementById("bitrate-setting") as HTMLInputElement; - const bitrateValue = document.getElementById("bitrate-value"); - bitrateSlider?.addEventListener("input", () => { - const value = parseInt(bitrateSlider.value, 10); - if (bitrateValue) { - bitrateValue.textContent = value >= 200 ? "Unlimited" : `${value} Mbps`; - } - }); - - // Logout button - document.getElementById("logout-btn")?.addEventListener("click", async () => { - try { - await invoke("logout"); - // Reset UI state - isAuthenticated = false; - currentUser = null; - loginBtn.classList.remove("hidden"); - userMenu.classList.add("hidden"); - // Reload the page to reset everything - window.location.reload(); - } catch (error) { - console.error("Logout failed:", error); - } - }); -} - -function showModal(modalId: string) { - document.getElementById(modalId)?.classList.remove("hidden"); -} - -function hideAllModals() { - document.querySelectorAll(".modal").forEach((modal) => { - modal.classList.add("hidden"); - }); -} - -// ============================================================================ -// SESSION DETECTION -// ============================================================================ - -// Check for active sessions on startup or before launching a game -async function checkActiveSessions(): Promise { - try { - console.log("Checking for active sessions..."); - const accessToken = await invoke("get_gfn_jwt"); - console.log("Got JWT token, calling get_active_sessions..."); - const sessions = await invoke("get_active_sessions", { - accessToken, - }); - detectedActiveSessions = sessions; - console.log("Active sessions response:", sessions, `(${sessions.length})`); - if (sessions.length > 0) { - console.log("First session details:", JSON.stringify(sessions[0], null, 2)); - } - return sessions; - } catch (error) { - console.error("Failed to check active sessions:", error); - return []; - } -} - -// Start polling for active sessions (when not streaming) -function startSessionPolling() { - // Don't start if already polling or currently streaming - if (sessionPollingInterval !== null) { - console.log("Session polling already active"); - return; - } - - if (isStreamingActive()) { - console.log("Not starting session polling - currently streaming"); - return; - } - - if (!isAuthenticated) { - console.log("Not starting session polling - not authenticated"); - return; - } - - console.log("Starting session polling (every 10 seconds)"); - - sessionPollingInterval = window.setInterval(async () => { - // Stop polling if we started streaming - if (isStreamingActive()) { - console.log("Stopping session polling - streaming started"); - stopSessionPolling(); - return; - } - - // Don't poll if not authenticated - if (!isAuthenticated) { - console.log("Stopping session polling - no longer authenticated"); - stopSessionPolling(); - return; - } - - const sessions = await checkActiveSessions(); - if (sessions.length > 0) { - // Update navbar indicator if not already showing - const existingIndicator = document.getElementById("active-session-indicator"); - if (!existingIndicator) { - console.log("Active session detected via polling:", sessions[0].sessionId); - updateNavbarSessionIndicator(sessions[0]); - showActiveSessionModal(sessions[0]); - } - } else { - // No active sessions - hide indicator if showing - hideNavbarSessionIndicator(); - } - }, SESSION_POLLING_INTERVAL_MS); -} - -// Stop polling for active sessions -function stopSessionPolling() { - if (sessionPollingInterval !== null) { - console.log("Stopping session polling"); - window.clearInterval(sessionPollingInterval); - sessionPollingInterval = null; - } -} - -// Find game title by app ID -function getGameTitleByAppId(appId: number | undefined): string { - if (!appId) return "Unknown Game"; - const game = games.find((g) => g.id === String(appId)); - return game?.title || `Game ID: ${appId}`; -} - -// Show the active session modal with session info -function showActiveSessionModal(session: ActiveSession) { - const gameEl = document.getElementById("active-session-game"); - const gpuEl = document.getElementById("active-session-gpu"); - const resolutionEl = document.getElementById("active-session-resolution"); - const serverEl = document.getElementById("active-session-server"); - - if (gameEl) gameEl.textContent = getGameTitleByAppId(session.appId); - if (gpuEl) gpuEl.textContent = session.gpuType || "Unknown GPU"; - if (resolutionEl) { - const res = session.resolution || "Unknown"; - const fps = session.fps ? `@ ${session.fps} FPS` : ""; - resolutionEl.textContent = `${res} ${fps}`.trim(); - } - if (serverEl) serverEl.textContent = session.serverIp || "Unknown"; - - // Also update navbar indicator - updateNavbarSessionIndicator(session); - - showModal("active-session-modal"); -} - -// Show the session conflict modal when trying to launch a new game -function showSessionConflictModal(existingSession: ActiveSession, newGame: Game) { - const gameEl = document.getElementById("conflict-session-game"); - const gpuEl = document.getElementById("conflict-session-gpu"); - - if (gameEl) gameEl.textContent = getGameTitleByAppId(existingSession.appId); - if (gpuEl) gpuEl.textContent = existingSession.gpuType || "Unknown GPU"; - - pendingGameLaunch = newGame; - showModal("session-conflict-modal"); -} - -// Store the game for retry -let regionErrorGame: Game | null = null; -let sessionLimitGame: Game | null = null; - -// Show region error modal -function showRegionErrorModal(errorMessage: string, game: Game) { - const errorEl = document.getElementById("region-error-message"); - if (errorEl) { - // Extract the status description from the error message - const match = errorMessage.match(/REGION_NOT_SUPPORTED[_A-Z]*\s*[A-F0-9]*/i); - errorEl.textContent = match ? match[0] : "Region not supported"; - } - regionErrorGame = game; - showModal("region-error-modal"); -} - -// Show session limit exceeded modal -function showSessionLimitModal(errorMessage: string, game: Game) { - const errorEl = document.getElementById("session-limit-error-message"); - if (errorEl) { - // Extract the status description from the error message - const match = errorMessage.match(/SESSION_LIMIT[_A-Z]*\s*[A-F0-9]*/i); - errorEl.textContent = match ? match[0] : "Session limit exceeded"; - } - sessionLimitGame = game; - showModal("session-limit-modal"); -} - -// Update navbar with active session indicator -function updateNavbarSessionIndicator(session: ActiveSession | null) { - let indicator = document.getElementById("active-session-indicator"); - - if (!session) { - // Remove indicator if no session - indicator?.remove(); - return; - } - - // Create indicator if it doesn't exist - if (!indicator) { - indicator = document.createElement("div"); - indicator.id = "active-session-indicator"; - indicator.className = "active-session-indicator"; - - // Insert after nav items - const nav = document.querySelector(".main-nav"); - if (nav) { - nav.appendChild(indicator); - } - } - - // Clear existing content - indicator.replaceChildren(); - - const gameName = getGameTitleByAppId(session.appId); - const shortName = gameName.length > 20 ? gameName.substring(0, 20) + "..." : gameName; - - // Create elements safely - const dot = document.createElement("span"); - dot.className = "session-indicator-dot"; - - const text = document.createElement("span"); - text.className = "session-indicator-text"; - text.textContent = shortName; - - const gpu = document.createElement("span"); - gpu.className = "session-indicator-gpu"; - gpu.textContent = session.gpuType || "GPU"; - - indicator.appendChild(dot); - indicator.appendChild(text); - indicator.appendChild(gpu); - - // Click to show modal - indicator.onclick = () => showActiveSessionModal(session); -} - -// Hide navbar session indicator -function hideNavbarSessionIndicator() { - updateNavbarSessionIndicator(null); -} - -// Update navbar with storage indicator -function updateNavbarStorageIndicator(subscription: SubscriptionInfo | null) { - let indicator = document.getElementById("storage-indicator"); - - // Find permanent storage addon - const storageAddon = subscription?.addons?.find( - (addon) => addon.subType === "PERMANENT_STORAGE" - ); - - if (!storageAddon) { - // Remove indicator if no storage addon - indicator?.remove(); - return; - } - - // Extract storage info from attributes - const totalAttr = storageAddon.attributes?.find(a => a.key === "TOTAL_STORAGE_SIZE_IN_GB"); - const usedAttr = storageAddon.attributes?.find(a => a.key === "USED_STORAGE_SIZE_IN_GB"); - const regionAttr = storageAddon.attributes?.find(a => a.key === "STORAGE_METRO_REGION_NAME"); - - const totalGB = parseInt(totalAttr?.textValue || "0", 10); - const usedGB = parseInt(usedAttr?.textValue || "0", 10); - const region = regionAttr?.textValue || "Unknown"; - - if (totalGB === 0) { - indicator?.remove(); - return; - } - - // Create indicator if it doesn't exist - if (!indicator) { - indicator = document.createElement("div"); - indicator.id = "storage-indicator"; - indicator.className = "storage-indicator"; - - // Insert in the status bar left section - const statusLeft = document.querySelector(".status-left"); - if (statusLeft) { - statusLeft.appendChild(indicator); - } - } - - // Clear existing content - indicator.replaceChildren(); - - // Calculate percentage for coloring - const percentage = Math.round((usedGB / totalGB) * 100); - - // Determine color based on usage - let color = "#76b900"; // green - if (percentage >= 90) { - color = "#f44336"; // red - } else if (percentage >= 75) { - color = "#ffc107"; // yellow - } - - // Create elements with inline color - const icon = document.createElement("i"); - icon.setAttribute("data-lucide", "hard-drive"); - icon.style.width = "12px"; - icon.style.height = "12px"; - icon.style.color = color; - - const text = document.createElement("span"); - text.textContent = `${usedGB} / ${totalGB} GB`; - text.style.color = color; - text.style.fontSize = "12px"; - - indicator.style.color = color; - indicator.appendChild(icon); - indicator.appendChild(text); - indicator.title = `Cloud Storage: ${usedGB} GB used of ${totalGB} GB\nLocation: ${region}`; - - // Re-init Lucide icons for the new icon - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - // Apply color to SVG after Lucide creates it - setTimeout(() => { - const svg = indicator.querySelector("svg"); - if (svg) { - svg.style.color = color; - svg.style.stroke = color; - svg.style.width = "12px"; - svg.style.height = "12px"; - } - }, 10); -} - -// Update status bar with session time remaining -function updateStatusBarSessionTime(subscription: SubscriptionInfo | null) { - let indicator = document.getElementById("session-time-indicator"); - - if (!subscription || !subscription.remainingTimeInMinutes) { - indicator?.remove(); - return; - } - - const remaining = subscription.remainingTimeInMinutes; - const total = subscription.totalTimeInMinutes || 0; - const remainingHrs = Math.floor(remaining / 60); - const totalHrs = Math.floor(total / 60); - const percentRemaining = total > 0 ? Math.round((remaining / total) * 100) : 100; - - // Create indicator if it doesn't exist - if (!indicator) { - indicator = document.createElement("div"); - indicator.id = "session-time-indicator"; - indicator.className = "session-time-indicator"; - - // Insert in the status bar left section - const statusLeft = document.querySelector(".status-left"); - if (statusLeft) { - statusLeft.appendChild(indicator); - } - } - - // Clear existing content - indicator.replaceChildren(); - - // Determine color based on remaining time - let color = "#76b900"; // green - if (percentRemaining <= 10) { - color = "#f44336"; // red - } else if (percentRemaining <= 25) { - color = "#ffc107"; // yellow - } - - // Create elements with inline color - const icon = document.createElement("i"); - icon.setAttribute("data-lucide", "clock"); - icon.style.width = "12px"; - icon.style.height = "12px"; - icon.style.color = color; - - const text = document.createElement("span"); - text.textContent = `${remainingHrs}h / ${totalHrs}h`; - text.style.color = color; - text.style.fontSize = "12px"; - - indicator.style.color = color; - indicator.appendChild(icon); - indicator.appendChild(text); - indicator.title = `Session time: ${remainingHrs} hours remaining of ${totalHrs} hours total`; - - // Re-init Lucide icons - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - // Apply color to SVG after Lucide creates it - setTimeout(() => { - const svg = indicator.querySelector("svg"); - if (svg) { - svg.style.color = color; - svg.style.stroke = color; - svg.style.width = "12px"; - svg.style.height = "12px"; - } - }, 10); -} - -// Update queue times nav visibility (only for free tier users) -function updateQueueTimesLinkVisibility(subscription: SubscriptionInfo | null) { - const navItem = document.getElementById("queue-times-nav"); - if (!navItem) return; - - // Show nav item for free tier users who are authenticated - if (isAuthenticated && isFreeTier(subscription)) { - navItem.classList.remove("hidden"); - } else { - navItem.classList.add("hidden"); - } -} - -// Setup session modal handlers -function setupSessionModals() { - // Active session modal handlers - const connectBtn = document.getElementById("connect-session-btn"); - const terminateBtn = document.getElementById("terminate-session-btn"); - const dismissBtn = document.getElementById("dismiss-session-btn"); - - connectBtn?.addEventListener("click", async () => { - if (detectedActiveSessions.length > 0) { - hideAllModals(); - await connectToExistingSession(detectedActiveSessions[0]); - } - }); - - terminateBtn?.addEventListener("click", async () => { - if (detectedActiveSessions.length > 0) { - try { - const accessToken = await invoke("get_gfn_jwt"); - await invoke("terminate_session", { - sessionId: detectedActiveSessions[0].sessionId, - accessToken, - }); - console.log("Session terminated"); - detectedActiveSessions = []; - hideNavbarSessionIndicator(); - hideAllModals(); - } catch (error) { - console.error("Failed to terminate session:", error); - } - } - }); - - dismissBtn?.addEventListener("click", () => { - hideAllModals(); - }); - - // Session conflict modal handlers - const terminateAndLaunchBtn = document.getElementById("terminate-and-launch-btn"); - const cancelLaunchBtn = document.getElementById("cancel-launch-btn"); - - terminateAndLaunchBtn?.addEventListener("click", async () => { - if (detectedActiveSessions.length > 0 && pendingGameLaunch) { - try { - const accessToken = await invoke("get_gfn_jwt"); - await invoke("terminate_session", { - sessionId: detectedActiveSessions[0].sessionId, - accessToken, - }); - console.log("Session terminated, launching new game"); - detectedActiveSessions = []; - hideNavbarSessionIndicator(); - hideAllModals(); - // Launch the pending game - const gameToLaunch = pendingGameLaunch; - pendingGameLaunch = null; - await launchGame(gameToLaunch); - } catch (error) { - console.error("Failed to terminate session:", error); - } - } - }); - - cancelLaunchBtn?.addEventListener("click", () => { - pendingGameLaunch = null; - hideAllModals(); - }); - - // Region error modal handlers - const regionRetryBtn = document.getElementById("region-error-retry-btn"); - const regionCloseBtn = document.getElementById("region-error-close-btn"); - - regionRetryBtn?.addEventListener("click", async () => { - hideAllModals(); - if (regionErrorGame) { - const gameToRetry = regionErrorGame; - regionErrorGame = null; - await launchGame(gameToRetry); - } - }); - - regionCloseBtn?.addEventListener("click", () => { - regionErrorGame = null; - hideAllModals(); - }); - - // Session limit modal handlers - const sessionLimitTerminateBtn = document.getElementById("session-limit-terminate-btn"); - const sessionLimitCloseBtn = document.getElementById("session-limit-close-btn"); - - sessionLimitTerminateBtn?.addEventListener("click", async () => { - hideAllModals(); - // Try to terminate any active sessions and retry - try { - const accessToken = await invoke("get_gfn_jwt"); - // Check for active sessions - const activeSessions = await invoke("get_active_sessions", { accessToken }); - - if (activeSessions.length > 0) { - // Terminate the first active session - await invoke("terminate_session", { - sessionId: activeSessions[0].sessionId, - accessToken, - }); - console.log("Terminated existing session:", activeSessions[0].sessionId); - detectedActiveSessions = []; - hideNavbarSessionIndicator(); - } - - // Retry launching the game - if (sessionLimitGame) { - const gameToRetry = sessionLimitGame; - sessionLimitGame = null; - await launchGame(gameToRetry); - } - } catch (error) { - console.error("Failed to terminate session:", error); - alert(`Failed to terminate session: ${error}`); - } - }); - - sessionLimitCloseBtn?.addEventListener("click", () => { - sessionLimitGame = null; - hideAllModals(); - }); -} - -// Connect to an existing session -async function connectToExistingSession(session: ActiveSession) { - console.log("Connecting to existing session:", session.sessionId); - - // Stop session polling while we're reconnecting/streaming - stopSessionPolling(); - - // Get the GFN JWT token - let accessToken: string; - try { - accessToken = await invoke("get_gfn_jwt"); - } catch (e) { - console.error("Not authenticated:", e); - startSessionPolling(); // Resume polling since we're not connecting - return; - } - - // Find the game for this session - const game = games.find((g) => g.id === String(session.appId)); - const gameName = game?.title || `Game (${session.appId})`; - - // Show streaming overlay - showStreamingOverlay(gameName, "Connecting to session..."); - - // Update Discord presence (if enabled) - if (discordRpcEnabled) { - try { - streamingUIState.gameStartTime = Math.floor(Date.now() / 1000); - await invoke("set_game_presence", { - gameName: gameName, - region: null, - resolution: discordShowStats ? session.resolution : null, - fps: discordShowStats ? session.fps : null, - latencyMs: null, - }); - } catch (e) { - console.warn("Discord presence update failed:", e); - } - } - - try { - // Set up streaming state - streamingUIState.sessionId = session.sessionId; - streamingUIState.gameName = gameName; - streamingUIState.active = true; - streamingUIState.gpuType = session.gpuType; - streamingUIState.serverIp = session.serverIp; - - // Extract stream IP from signaling URL or connection info - // signalingUrl format: "wss://66-22-147-39.cloudmatchbeta.nvidiagrid.net:443/nvst/" - let streamIp: string | null = session.serverIp; - if (session.signalingUrl) { - const match = session.signalingUrl.match(/wss:\/\/([^:\/]+)/); - if (match) { - streamIp = match[1]; - } - } - - if (!streamIp || !session.signalingUrl) { - throw new Error("Missing stream IP or signaling URL for reconnection"); - } - - // IMPORTANT: Claim the session first with a PUT request - // This is required by the GFN server to "activate" the session for streaming - // Without this, the WebRTC connection will timeout - updateStreamingStatus("Claiming session..."); - console.log("Claiming session with PUT request..."); - - interface ClaimSessionResponse { - sessionId: string; - status: number; - gpuType: string | null; - signalingUrl: string | null; - serverIp: string | null; - connectionInfo: Array<{ ip: string | null; port: number | null; usage: number }> | null; - } - - const claimResult = await invoke("claim_session", { - sessionId: session.sessionId, - serverIp: streamIp, - accessToken: accessToken, - appId: String(session.appId), // Must be string like "106466949" - resolution: session.resolution || "1920x1080", - fps: session.fps || 60, - }); - - console.log("Session claimed successfully:", claimResult); - console.log("Claim result details - signalingUrl:", claimResult.signalingUrl, "serverIp:", claimResult.serverIp); - - // Update streaming state with claimed values - if (claimResult.gpuType) { - streamingUIState.gpuType = claimResult.gpuType; - } - if (claimResult.serverIp) { - streamingUIState.serverIp = claimResult.serverIp; - } - - // Use the signaling URL from the claim response (which is now from the polled GET when status is 2) - // The backend polls until the session transitions from status 6 to status 2/3, then returns - // the correct connectionInfo with the signaling URL. - // Fall back to original if claim response doesn't have one. - const actualSignalingUrl = claimResult.signalingUrl || session.signalingUrl; - console.log("Using signaling URL from claim (polled until ready):", actualSignalingUrl); - console.log("Original session signalingUrl:", session.signalingUrl); - console.log("Claim result status:", claimResult.status); - - // Extract the stream IP from the signaling URL - let actualStreamIp = streamIp; - if (actualSignalingUrl) { - const match = actualSignalingUrl.match(/wss:\/\/([^:\/]+)/); - if (match) { - actualStreamIp = match[1]; - console.log("Extracted stream IP from signaling URL:", actualStreamIp); - } - } - console.log("Final stream IP to use:", actualStreamIp); - - // Set up the backend session storage for reconnection - // This is required for get_webrtc_config and other backend functions to work - // Pass connectionInfo for proper ICE candidate construction with real media ports - await invoke("setup_reconnect_session", { - sessionId: session.sessionId, - serverIp: actualStreamIp, - signalingUrl: actualSignalingUrl, - gpuType: claimResult.gpuType || session.gpuType, - connectionInfo: claimResult.connectionInfo || null, - }); - - console.log("Reconnect session setup complete"); - - // Build the streaming result object to pass to initializeStreaming - // Use type assertion since we're constructing a compatible object - // Use claimed session values which may be updated after the PUT request - // - // connectionInfo contains multiple entries with different usage types: - // - usage=2: Primary media path (UDP) - preferred for streaming - // - usage=17: Alternative media path - used by some Alliance Partners (e.g., Zain) - // when primary media entry is not available - // - usage=14: Signaling (WSS) - MUST NOT be used for media traffic - // - // We prefer usage=2 and fall back to usage=17 for Alliance Partner compatibility - const mediaConn = claimResult.connectionInfo?.find(c => c.usage === 2) - || claimResult.connectionInfo?.find(c => c.usage === 17); - const realMediaPort = mediaConn?.port || 443; - const realMediaIp = mediaConn?.ip || actualStreamIp; - console.log("Using media connection info for reconnect - IP:", realMediaIp, "Port:", realMediaPort, "Usage:", mediaConn?.usage); - - const streamingResult = { - sessionId: session.sessionId, - phase: "Ready" as const, - serverIp: claimResult.serverIp || actualStreamIp, - signalingUrl: actualSignalingUrl, - gpuType: claimResult.gpuType || session.gpuType, - connectionInfo: (actualStreamIp && session.serverIp) ? { - controlIp: (claimResult.serverIp || session.serverIp) as string, - controlPort: 443, - streamIp: realMediaIp, - streamPort: realMediaPort, - resourcePath: "/nvst/", - } : null, - error: null as string | null, - }; - - console.log("Streaming result for reconnect:", streamingResult); - - updateStreamingStatus(`Connected to ${claimResult.gpuType || session.gpuType || "GPU"}`); - showStreamingInfo(streamingResult); - - // Create fullscreen streaming container - const streamContainer = createStreamingContainer(gameName); - - // Initialize WebRTC streaming - const streamingOptions: StreamingOptions = { - resolution: session.resolution || currentResolution, - fps: session.fps || currentFps - }; - await initializeStreaming(streamingResult, accessToken, streamContainer, streamingOptions); - - // Set up input capture - const videoElement = document.getElementById("gfn-stream-video") as HTMLVideoElement; - if (videoElement) { - streamingUIState.inputCleanup = setupInputCapture(videoElement); - } - - // Start stats monitoring - streamingUIState.statsInterval = window.setInterval(async () => { - if (isStreamingActive()) { - const stats = await getStreamingStats(); - if (stats) { - updateStreamingStatsDisplay(stats); - } - } - }, 1000); - - console.log("Connected to existing session successfully"); - } catch (error) { - console.error("Failed to connect to session:", error); - streamingUIState.active = false; - hideStreamingOverlay(); - - // Show a helpful error message - const errorMsg = String(error); - if (errorMsg.includes("timeout") || errorMsg.includes("Timeout")) { - showSessionReconnectError( - "Connection Timeout", - "Could not connect to the session. This usually happens when the session is already streaming to another client (like a browser tab).\n\nPlease close any other GFN clients or browser tabs running this session, then try again." - ); - } else { - showSessionReconnectError("Connection Failed", errorMsg); - } - - if (discordRpcEnabled) { - try { - await invoke("set_browsing_presence"); - } catch (e) { - // Ignore - } - } - - // Resume session polling since reconnection failed - startSessionPolling(); - } -} - -// Show reconnect error message -function showSessionReconnectError(title: string, message: string) { - // Update the active session modal to show error - const gameEl = document.getElementById("active-session-game"); - const gpuEl = document.getElementById("active-session-gpu"); - const resolutionEl = document.getElementById("active-session-resolution"); - const serverEl = document.getElementById("active-session-server"); - - // Create error display - const modal = document.getElementById("active-session-modal"); - if (modal) { - const content = modal.querySelector(".session-modal-content"); - if (content) { - const header = content.querySelector(".session-modal-header h2"); - if (header) header.textContent = title; - - const desc = content.querySelector(".session-modal-description"); - if (desc) desc.textContent = message; - - // Change icon to warning - const icon = content.querySelector(".session-icon"); - if (icon) { - icon.classList.add("warning"); - icon.textContent = "\u26A0"; // Warning symbol - } - } - } - - showModal("active-session-modal"); -} - -// Search -let currentSearchQuery = ""; -let searchResultsCache: Game[] = []; - -function setupSearch() { - let searchTimeout: number; - const searchDropdown = document.getElementById("search-dropdown")!; - - searchInput.addEventListener("input", () => { - clearTimeout(searchTimeout); - const query = searchInput.value.trim(); - - if (query.length < 2) { - hideSearchDropdown(); - currentSearchQuery = ""; - return; - } - - searchTimeout = setTimeout(async () => { - currentSearchQuery = query; - await searchGamesForSuggestions(query); - }, 300); - }); - - // Handle Enter key for full search results - searchInput.addEventListener("keydown", async (e) => { - if (e.key === "Enter") { - e.preventDefault(); - const query = searchInput.value.trim(); - if (query.length >= 2) { - hideSearchDropdown(); - await showFullSearchResults(query); - } - } else if (e.key === "Escape") { - hideSearchDropdown(); - } - }); - - // Close dropdown when clicking outside - document.addEventListener("click", (e) => { - if (!searchInput.contains(e.target as Node) && !searchDropdown.contains(e.target as Node)) { - hideSearchDropdown(); - } - }); -} - -function hideSearchDropdown() { - const searchDropdown = document.getElementById("search-dropdown"); - if (searchDropdown) { - searchDropdown.classList.add("hidden"); - } -} - -function showSearchDropdown(games: Game[]) { - const searchDropdown = document.getElementById("search-dropdown")!; - searchDropdown.replaceChildren(); - - if (games.length === 0) { - const noResults = document.createElement("div"); - noResults.className = "search-dropdown-empty"; - noResults.textContent = "No games found"; - searchDropdown.appendChild(noResults); - } else { - games.forEach((game) => { - const item = document.createElement("div"); - item.className = "search-dropdown-item"; - item.dataset.gameId = game.id; - - const img = document.createElement("img"); - img.className = "search-dropdown-image"; - img.src = game.images.box_art || game.images.thumbnail || getFallbackPlaceholder(game.title); - img.alt = game.title; - img.referrerPolicy = "no-referrer"; - img.onerror = () => { img.src = getFallbackPlaceholder(game.title); }; - - const info = document.createElement("div"); - info.className = "search-dropdown-info"; - - const title = document.createElement("div"); - title.className = "search-dropdown-title"; - title.textContent = game.title; - - const store = document.createElement("div"); - store.className = "search-dropdown-store"; - store.textContent = game.store.store_type; - - info.appendChild(title); - info.appendChild(store); - item.appendChild(img); - item.appendChild(info); - - item.addEventListener("click", () => { - hideSearchDropdown(); - showGameDetail(game.id); - }); - - searchDropdown.appendChild(item); - }); - - // Add "View all results" link if there are more results - if (searchResultsCache.length >= 5) { - const viewAll = document.createElement("div"); - viewAll.className = "search-dropdown-viewall"; - viewAll.textContent = `View all results for "${currentSearchQuery}"`; - viewAll.addEventListener("click", async () => { - hideSearchDropdown(); - await showFullSearchResults(currentSearchQuery); - }); - searchDropdown.appendChild(viewAll); - } - } - - searchDropdown.classList.remove("hidden"); -} - -async function searchGamesForSuggestions(query: string) { - try { - const token = isAuthenticated ? await invoke("get_gfn_jwt").catch(() => null) : null; - const results = await invoke<{ games: Game[] }>("search_games_graphql", { - query, - limit: 5, - accessToken: token, - vpcId: null, - }); - searchResultsCache = results.games; - showSearchDropdown(results.games); - } catch (error) { - console.error("Search failed:", error); - showSearchDropdown([]); - } -} - -async function showFullSearchResults(query: string) { - try { - const token = isAuthenticated ? await invoke("get_gfn_jwt").catch(() => null) : null; - const results = await invoke<{ games: Game[]; total_count: number }>("search_games_graphql", { - query, - limit: 50, - accessToken: token, - vpcId: null, - }); - - // Show search results in main content area - currentView = "search"; - - // Deselect all nav items since search is not a nav view - navItems.forEach((item) => item.classList.remove("active")); - - // Hide all other views - document.querySelectorAll(".view").forEach((v) => { - v.classList.remove("active"); - }); - - // Get or create search results view - let searchView = document.getElementById("search-view"); - if (!searchView) { - searchView = document.createElement("section"); - searchView.id = "search-view"; - searchView.className = "view"; - document.getElementById("main-content")!.appendChild(searchView); - } - - // Clear and populate search view - searchView.innerHTML = ""; - searchView.classList.add("active"); - - // Create search results header - const header = document.createElement("div"); - header.className = "search-results-header"; - header.innerHTML = ` -

      Search results for "${query}"

      - ${results.total_count} games found - `; - searchView.appendChild(header); - - // Create games grid - const grid = document.createElement("div"); - grid.className = "games-grid"; - grid.id = "search-results-grid"; - searchView.appendChild(grid); - - // Store results in cache for showGameDetail - searchResultsCache = results.games; - - // Render games - results.games.forEach((game) => { - grid.appendChild(createGameCard(game)); - }); - - } catch (error) { - console.error("Full search failed:", error); - } -} - -async function searchGames(query: string) { - // Keep legacy function for compatibility - await searchGamesForSuggestions(query); -} - -// Authentication -async function checkAuthStatus() { - let providerVpcId: string | null = null; - - try { - const status = await invoke("get_auth_status"); - isAuthenticated = status.is_authenticated; - currentUser = status.user || null; - - // Restore the login provider from saved auth state - if (status.provider) { - selectedLoginProvider = status.provider; - console.log("Restored login provider:", status.provider.loginProviderDisplayName); - - // Also set it in the backend memory (in case it wasn't restored there) - await invoke("set_login_provider", { provider: status.provider }); - - // Fetch server info for the provider (discovers VPC ID and regions) - try { - const token = await invoke("get_gfn_jwt"); - const serverInfo = await invoke<{ vpcId: string | null; regions: [string, string][]; baseUrl: string | null }>("fetch_server_info", { accessToken: token }); - console.log("Server info fetched for restored provider:", serverInfo); - providerVpcId = serverInfo.vpcId; - } catch (e) { - console.warn("Failed to fetch server info for restored provider:", e); - } - } - - // Fetch real subscription tier from API if authenticated - if (isAuthenticated && currentUser) { - try { - const token = await invoke("get_gfn_jwt"); - const subscription = await invoke("fetch_subscription", { - accessToken: token, - userId: currentUser.user_id, - vpcId: providerVpcId, - }); - // Store subscription and update user's membership tier - currentSubscription = subscription; - currentUser.membership_tier = subscription.membershipTier; - console.log("Subscription:", subscription); - - // Populate resolution and FPS dropdowns from subscription data - populateStreamingOptions(subscription); - - // Update status bar indicators - console.log("Subscription addons:", subscription.addons); - updateNavbarStorageIndicator(subscription); - updateStatusBarSessionTime(subscription); - - // Show queue times link for free tier users - updateQueueTimesLinkVisibility(subscription); - } catch (subError) { - console.warn("Failed to fetch subscription, using default tier:", subError); - currentSubscription = null; - // Use default streaming options - populateStreamingOptions(null); - // Show queue times link (assume free tier on error) - updateQueueTimesLinkVisibility(null); - } - } else { - // Not authenticated - use default streaming options - populateStreamingOptions(null); - // Hide queue times link when not authenticated - updateQueueTimesLinkVisibility(null); - } - - updateAuthUI(); - } catch (error) { - console.error("Failed to check auth status:", error); - } -} - -function updateAuthUI() { - if (isAuthenticated && currentUser) { - loginBtn.classList.add("hidden"); - userMenu.classList.remove("hidden"); - const userName = document.getElementById("user-name"); - if (userName) { - userName.textContent = currentUser.display_name; - } - const userTier = document.getElementById("user-tier"); - if (userTier && currentUser.membership_tier) { - const tier = currentUser.membership_tier.toUpperCase(); - userTier.textContent = tier; - userTier.className = `user-tier tier-${tier.toLowerCase()}`; - } - // Hide user-time from top bar (now shown in status bar) - const userTime = document.getElementById("user-time"); - if (userTime) { - userTime.style.display = "none"; - } - } else { - loginBtn.classList.remove("hidden"); - userMenu.classList.add("hidden"); - } -} - -// Cached login providers -let cachedLoginProviders: LoginProvider[] = []; -let selectedLoginProvider: LoginProvider | null = null; - -// Fetch and populate login providers dropdown -async function fetchAndPopulateLoginProviders(): Promise { - try { - console.log("Fetching login providers..."); - const providers = await invoke("fetch_login_providers"); - cachedLoginProviders = providers; - console.log(`Fetched ${providers.length} login providers:`, providers.map(p => p.loginProviderDisplayName)); - - // Build dropdown options - const options = providers.map(provider => ({ - value: provider.loginProviderCode, - text: provider.loginProviderDisplayName === "NVIDIA" - ? "NVIDIA (Global)" - : provider.loginProviderDisplayName, - selected: provider.loginProviderCode === "NVIDIA" - })); - - console.log("Setting dropdown options:", options); - setDropdownOptions("login-provider", options); - - // Set default provider (NVIDIA) and update button text - const nvidiaProvider = providers.find(p => p.loginProviderCode === "NVIDIA"); - if (nvidiaProvider) { - selectedLoginProvider = nvidiaProvider; - updateLoginButtonText(nvidiaProvider.loginProviderDisplayName); - console.log("Default provider set to:", nvidiaProvider.loginProviderDisplayName); - } else if (providers.length > 0) { - // Fallback to first provider if NVIDIA not found - selectedLoginProvider = providers[0]; - updateLoginButtonText(providers[0].loginProviderDisplayName); - console.log("Fallback provider set to:", providers[0].loginProviderDisplayName); - } - } catch (error) { - console.error("Failed to fetch login providers:", error); - // Keep default NVIDIA option and set button text - updateLoginButtonText("NVIDIA"); - } -} - -// Update login button text based on selected provider -function updateLoginButtonText(providerName: string): void { - const loginBtnText = document.getElementById("login-btn-text"); - if (loginBtnText) { - loginBtnText.textContent = `Sign in with ${providerName}`; - } -} - -// Setup login modal handlers -function setupLoginModal() { - const loginModal = document.getElementById("login-modal"); - const nvidiaLoginBtn = document.getElementById("nvidia-login-btn"); - const tokenLoginBtn = document.getElementById("token-login-btn"); - const tokenEntry = document.getElementById("token-entry"); - const loginOptions = loginModal?.querySelector(".login-options"); - const submitTokenBtn = document.getElementById("submit-token-btn"); - const tokenInput = document.getElementById("token-input") as HTMLTextAreaElement; - - // Handle provider dropdown change - onDropdownChange("login-provider", async (value, text) => { - console.log(`Login provider changed to: ${value} (${text})`); - const provider = cachedLoginProviders.find(p => p.loginProviderCode === value); - if (provider) { - selectedLoginProvider = provider; - await invoke("set_login_provider", { provider }); - updateLoginButtonText(provider.loginProviderDisplayName); - } - }); - - // OAuth login with selected provider - nvidiaLoginBtn?.addEventListener("click", async () => { - const providerName = selectedLoginProvider?.loginProviderDisplayName || "NVIDIA"; - console.log(`Starting OAuth login with provider: ${providerName}...`); - - const loginBtnText = document.getElementById("login-btn-text"); - if (loginBtnText) loginBtnText.textContent = "Signing in..."; - (nvidiaLoginBtn as HTMLButtonElement).disabled = true; - - try { - const result = await invoke("login_oauth"); - if (result.is_authenticated) { - isAuthenticated = true; - currentUser = result.user || null; - hideAllModals(); - console.log("OAuth login successful"); - - // Fetch server info for the selected provider (discovers VPC ID and regions) - try { - const token = await invoke("get_gfn_jwt"); - console.log("Fetching server info for provider..."); - const serverInfo = await invoke<{ vpcId: string | null; regions: [string, string][]; baseUrl: string | null }>("fetch_server_info", { accessToken: token }); - console.log("Server info fetched:", serverInfo); - if (serverInfo.vpcId) { - console.log(`Using VPC ID: ${serverInfo.vpcId}`); - } - if (serverInfo.regions.length > 0) { - console.log(`Provider has ${serverInfo.regions.length} regions:`, serverInfo.regions.map(r => r[0])); - } - } catch (serverInfoError) { - console.warn("Failed to fetch server info (will use defaults):", serverInfoError); - } - - // Refresh subscription info and reload games - await checkAuthStatus(); - await loadHomeData(); - // Re-run latency test with provider-specific servers - testLatency().catch(err => console.error("Latency test after login failed:", err)); - // Start session polling - startSessionPolling(); - } - } catch (error) { - console.error("OAuth login failed:", error); - alert("Login failed: " + error); - } finally { - updateLoginButtonText(providerName); - (nvidiaLoginBtn as HTMLButtonElement).disabled = false; - } - }); - - // Show token entry form - tokenLoginBtn?.addEventListener("click", () => { - if (loginOptions) (loginOptions as HTMLElement).classList.add("hidden"); - if (tokenEntry) tokenEntry.classList.remove("hidden"); - }); - - // Submit token - submitTokenBtn?.addEventListener("click", async () => { - const token = tokenInput?.value.trim(); - if (!token) { - alert("Please enter a token"); - return; - } - - submitTokenBtn.textContent = "Validating..."; - (submitTokenBtn as HTMLButtonElement).disabled = true; - - try { - const result = await invoke("set_access_token", { token }); - if (result.is_authenticated) { - isAuthenticated = true; - currentUser = result.user || null; - hideAllModals(); - // Reset form - if (tokenInput) tokenInput.value = ""; - if (loginOptions) (loginOptions as HTMLElement).classList.remove("hidden"); - if (tokenEntry) tokenEntry.classList.add("hidden"); - console.log("Token login successful"); - - // Fetch server info for the selected provider (discovers VPC ID and regions) - try { - const jwtToken = await invoke("get_gfn_jwt"); - console.log("Fetching server info for provider..."); - const serverInfo = await invoke<{ vpcId: string | null; regions: [string, string][]; baseUrl: string | null }>("fetch_server_info", { accessToken: jwtToken }); - console.log("Server info fetched:", serverInfo); - } catch (serverInfoError) { - console.warn("Failed to fetch server info (will use defaults):", serverInfoError); - } - - // Refresh subscription info and reload games - await checkAuthStatus(); - await loadHomeData(); - // Re-run latency test with provider-specific servers - testLatency().catch(err => console.error("Latency test after login failed:", err)); - // Start session polling - startSessionPolling(); - } - } catch (error) { - console.error("Token validation failed:", error); - alert("Invalid token: " + error); - } finally { - submitTokenBtn.textContent = "Submit Token"; - (submitTokenBtn as HTMLButtonElement).disabled = false; - } - }); - - // Reset login modal when closed - loginModal?.querySelector(".modal-close")?.addEventListener("click", () => { - if (loginOptions) (loginOptions as HTMLElement).classList.remove("hidden"); - if (tokenEntry) tokenEntry.classList.add("hidden"); - if (tokenInput) tokenInput.value = ""; - }); - - // Fetch providers when login button is clicked (to show modal) - loginBtn?.addEventListener("click", async () => { - showModal("login-modal"); - // Fetch providers if not already cached - if (cachedLoginProviders.length === 0) { - await fetchAndPopulateLoginProviders(); - } - // Reinitialize Lucide icons for the modal - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - }); -} - -// Data Loading -async function loadHomeData() { - console.log("Loading home data..."); - - // Show login prompt if not authenticated - if (!isAuthenticated) { - const featuredGames = document.getElementById("featured-games"); - const recentGames = document.getElementById("recent-games"); - const freeGames = document.getElementById("free-games"); - - const loginPrompt = ` - - `; - - if (featuredGames) featuredGames.innerHTML = loginPrompt; - if (recentGames) recentGames.innerHTML = ''; - if (freeGames) freeGames.innerHTML = ''; - - // Hide the other sections when not logged in - const sections = document.querySelectorAll('#home-view .content-section'); - sections.forEach((section, index) => { - if (index > 0) (section as HTMLElement).style.display = 'none'; - }); - - // Reinitialize Lucide icons - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - return; - } - - // Show all sections when logged in - const sections = document.querySelectorAll('#home-view .content-section'); - sections.forEach(section => { - (section as HTMLElement).style.display = ''; - }); - - // Show loading spinners initially - showGridLoading("featured-games"); - showGridLoading("recent-games"); - showGridLoading("free-games"); - - // Try to load library data (requires authentication) - if (isAuthenticated) { - console.log("User is authenticated, trying fetch_main_games..."); - try { - const accessToken = await invoke("get_gfn_jwt"); - console.log("Got GFN JWT token, calling fetch_main_games..."); - const response = await invoke<{ games: Game[] }>("fetch_main_games", { - accessToken, - vpcId: null, // Use default (Amsterdam) - }); - console.log("fetch_main_games response:", response); - if (response.games.length > 0) { - games = response.games; - console.log("Loaded", games.length, "games from main panel with images"); - console.log("First game:", games[0]); - renderGamesGrid("featured-games", games.slice(0, 6)); - renderGamesGrid("recent-games", games.slice(6, 12)); - renderGamesGrid("free-games", games.slice(12, 18)); - } else { - console.log("Main games returned 0 games, trying fetch_library..."); - throw new Error("Empty main games"); - } - } catch (error) { - console.error("Failed to load main games:", error); - // Fall back to library - console.log("Falling back to fetch_library..."); - try { - const accessToken = await invoke("get_gfn_jwt").catch(() => null); - const response = await invoke<{ games: Game[] }>("fetch_library", { - accessToken, - vpcId: null, - }); - console.log("fetch_library response:", response); - if (response.games.length > 0) { - games = response.games; - console.log("Loaded", games.length, "games from library"); - console.log("First game:", games[0]); - renderGamesGrid("featured-games", games.slice(0, 6)); - renderGamesGrid("recent-games", games.slice(6, 12)); - renderGamesGrid("free-games", games.slice(12, 18)); - } - } catch (e) { - console.error("Failed to load library:", e); - // Final fallback to static games - console.log("Falling back to fetch_games (no images)..."); - try { - const response = await invoke<{ games: Game[] }>("fetch_games", { - limit: 50, - offset: 0, - }); - if (response.games.length > 0) { - games = response.games; - renderGamesGrid("featured-games", games.slice(0, 6)); - } - } catch (e2) { - console.error("All game loading failed:", e2); - } - } - } - } -} - -async function loadLibraryData() { - console.log("Loading library data..."); - - // Show loading spinners while loading - showGridLoading("recently-played"); - showGridLoading("my-games"); - - try { - const accessToken = await invoke("get_gfn_jwt"); - console.log("Got GFN JWT token, calling fetch_library for library view..."); - const response = await invoke<{ games: Game[] }>("fetch_library", { - accessToken, - vpcId: null, - }); - console.log("fetch_library response for library view:", response); - - if (response.games.length > 0) { - const libraryGames = response.games; - console.log("Loaded", libraryGames.length, "games for library view"); - - // Recently played: show first 6 games (API returns most recent first) - renderGamesGrid("recently-played", libraryGames.slice(0, 6)); - - // My games: show all library games - renderGamesGrid("my-games", libraryGames); - } else { - console.log("Library returned 0 games"); - // Clear placeholders if no games - renderGamesGrid("recently-played", []); - renderGamesGrid("my-games", []); - } - } catch (error) { - console.error("Failed to load library data:", error); - } -} - -async function loadStoreData() { - console.log("Loading store data..."); - showGridLoading("all-games"); -} - -// Generate fallback placeholder SVG -function getFallbackPlaceholder(title: string): string { - const svg = ` - - - ${title.substring(0, 15)} - `; - return `data:image/svg+xml,${encodeURIComponent(svg)}`; -} - -function getStoreIcon(storeType: string): string { - const iconMap: Record = { - steam: "cloud", - epic: "gamepad-2", - ubisoft: "shield", - gog: "disc", - ea: "zap", - origin: "zap", - }; - return iconMap[storeType] || "store"; -} - -// Safe DOM element creation -function createGameCard(game: Game): HTMLElement { - const card = document.createElement("div"); - card.className = "game-card"; - card.dataset.gameId = game.id; - - const img = document.createElement("img"); - img.className = "game-card-image"; - img.alt = game.title; - img.loading = "lazy"; - img.referrerPolicy = "no-referrer"; // Bypass referrer check for NVIDIA CDN - img.crossOrigin = "anonymous"; // Allow cross-origin loading - - // Use fallback if no image provided - const imageSrc = game.images.box_art || game.images.thumbnail; - if (imageSrc) { - img.src = imageSrc; - img.onerror = () => { - img.src = getFallbackPlaceholder(game.title); - img.onerror = null; // Prevent infinite loop - }; - } else { - img.src = getFallbackPlaceholder(game.title); - } - - const info = document.createElement("div"); - info.className = "game-card-info"; - - const title = document.createElement("div"); - title.className = "game-card-title"; - title.textContent = game.title; - - const store = document.createElement("div"); - store.className = "game-card-store"; - store.textContent = game.store.store_type; - - info.appendChild(title); - info.appendChild(store); - card.appendChild(img); - card.appendChild(info); - - card.addEventListener("click", () => { - showGameDetail(game.id); - }); - - return card; -} - -// Show loading spinner in a grid container -function showGridLoading(containerId: string) { - const container = document.getElementById(containerId); - if (!container) return; - - container.replaceChildren(); - - const loadingDiv = document.createElement("div"); - loadingDiv.className = "grid-loading"; - - const spinner = document.createElement("div"); - spinner.className = "grid-loading-spinner"; - - const text = document.createElement("span"); - text.textContent = "Loading..."; - - loadingDiv.appendChild(spinner); - loadingDiv.appendChild(text); - container.appendChild(loadingDiv); -} - -function renderGamesGrid(containerId: string, gamesList: Game[]) { - const container = document.getElementById(containerId); - if (!container) return; - - // Clear existing content - container.replaceChildren(); - - // Add game cards using safe DOM methods - gamesList.forEach((game) => { - container.appendChild(createGameCard(game)); - }); -} - -function createGameDetailElement(game: Game): HTMLElement { - const wrapper = document.createElement("div"); - wrapper.className = "game-detail-wrapper"; - - // Hero section with gradient overlay - const hero = document.createElement("div"); - hero.className = "game-detail-hero"; - hero.style.backgroundImage = `linear-gradient(to bottom, transparent 0%, rgba(26,26,46,0.7) 50%, rgba(26,26,46,1) 100%), url('${game.images.hero || game.images.box_art || ""}')`; - - // Content container (side by side: box art + info) - const content = document.createElement("div"); - content.className = "game-detail-content"; - - // Box art - const boxArt = document.createElement("img"); - boxArt.className = "game-detail-boxart"; - boxArt.src = game.images.box_art || game.images.thumbnail || getFallbackPlaceholder(game.title); - boxArt.alt = game.title; - boxArt.onerror = () => { boxArt.src = getFallbackPlaceholder(game.title); }; - - // Info section - const info = document.createElement("div"); - info.className = "game-detail-info"; - - const titleEl = document.createElement("h1"); - titleEl.className = "game-detail-title"; - titleEl.textContent = game.title; - - const meta = document.createElement("div"); - meta.className = "game-detail-meta"; - - // Publisher/Developer - if (game.publisher || game.developer) { - const pubDev = document.createElement("span"); - pubDev.textContent = game.developer - ? `${game.developer}${game.publisher && game.publisher !== game.developer ? ` / ${game.publisher}` : ""}` - : game.publisher || ""; - meta.appendChild(pubDev); - } - - // Store badge with icon - const storeBadge = document.createElement("span"); - const storeType = game.store.store_type.toLowerCase(); - storeBadge.className = `store-badge store-${storeType}`; - storeBadge.innerHTML = `${game.store.store_type}`; - meta.appendChild(storeBadge); - - // Status indicator with icon - if (game.status) { - const statusBadge = document.createElement("span"); - statusBadge.className = `status-badge status-${game.status.toLowerCase()}`; - const statusIcon = game.status === "Available" ? "circle-check" : "clock"; - const statusText = game.status === "Available" ? "Ready to Play" : game.status; - statusBadge.innerHTML = `${statusText}`; - meta.appendChild(statusBadge); - } - - info.appendChild(titleEl); - info.appendChild(meta); - - // Genres - if (game.genres && game.genres.length > 0) { - const genres = document.createElement("div"); - genres.className = "game-detail-genres"; - game.genres.slice(0, 4).forEach((genre) => { - const genreTag = document.createElement("span"); - genreTag.className = "genre-tag"; - genreTag.textContent = genre; - genres.appendChild(genreTag); - }); - info.appendChild(genres); - } - - // Controls supported with icons (deduplicated) - if (game.supported_controls && game.supported_controls.length > 0) { - const controls = document.createElement("div"); - controls.className = "game-detail-controls"; - - const controlsLabel = document.createElement("span"); - controlsLabel.className = "controls-label"; - controlsLabel.textContent = "Controls"; - controls.appendChild(controlsLabel); - - const controlIcons = document.createElement("div"); - controlIcons.className = "control-icons"; - - // Deduplicate controls - const controlsLower = game.supported_controls.map(c => c.toLowerCase()); - const hasKeyboard = controlsLower.some(c => c.includes("keyboard") || c.includes("mouse")); - const hasGamepad = controlsLower.some(c => c.includes("gamepad") || c.includes("controller")); - const hasTouch = controlsLower.some(c => c.includes("touch")); - - if (hasKeyboard) { - const icon = document.createElement("span"); - icon.className = "control-icon"; - icon.innerHTML = `Keyboard & Mouse`; - controlIcons.appendChild(icon); - } - if (hasGamepad) { - const icon = document.createElement("span"); - icon.className = "control-icon"; - icon.innerHTML = `Controller`; - controlIcons.appendChild(icon); - } - if (hasTouch) { - const icon = document.createElement("span"); - icon.className = "control-icon"; - icon.innerHTML = `Touch`; - controlIcons.appendChild(icon); - } - - controls.appendChild(controlIcons); - info.appendChild(controls); - } - - const desc = document.createElement("div"); - desc.className = "game-detail-description"; - desc.textContent = "Experience this game through GeForce NOW cloud gaming. Stream instantly without downloads."; - info.appendChild(desc); - - // Actions - const actions = document.createElement("div"); - actions.className = "game-detail-actions"; - - // Track selected variant - let selectedVariantId = game.id; - - // Store selector if multiple variants - if (game.variants && game.variants.length > 1) { - const storeSelector = document.createElement("div"); - storeSelector.className = "store-selector"; - - const selectorLabel = document.createElement("span"); - selectorLabel.className = "store-selector-label"; - selectorLabel.textContent = "Play on:"; - storeSelector.appendChild(selectorLabel); - - const selectorBtns = document.createElement("div"); - selectorBtns.className = "store-selector-buttons"; - - game.variants.forEach((variant, index) => { - const btn = document.createElement("button"); - btn.className = `store-selector-btn${index === 0 ? " active" : ""}`; - btn.dataset.variantId = variant.id; - btn.textContent = variant.store_type; - btn.addEventListener("click", () => { - selectorBtns.querySelectorAll(".store-selector-btn").forEach(b => b.classList.remove("active")); - btn.classList.add("active"); - selectedVariantId = variant.id; - }); - selectorBtns.appendChild(btn); - }); - - storeSelector.appendChild(selectorBtns); - info.appendChild(storeSelector); - } - - const playBtn = document.createElement("button"); - playBtn.className = "btn btn-primary btn-large"; - playBtn.innerHTML = ` Play Now`; - playBtn.addEventListener("click", () => { - // Use selected variant ID - const gameToLaunch = { ...game, id: selectedVariantId }; - launchGame(gameToLaunch); - }); - - const favBtn = document.createElement("button"); - favBtn.className = "btn btn-secondary"; - favBtn.innerHTML = ` Add to Library`; - favBtn.addEventListener("click", async () => { - favBtn.innerHTML = ` Added`; - favBtn.classList.add("favorited"); - lucide.createIcons(); - }); - - const storeBtn = document.createElement("button"); - storeBtn.className = "btn btn-secondary"; - storeBtn.innerHTML = ` View on ${game.store.store_type}`; - storeBtn.addEventListener("click", () => { - if (game.store.store_url) { - window.open(game.store.store_url, "_blank"); - } - }); - - actions.appendChild(playBtn); - actions.appendChild(favBtn); - if (game.store.store_url) { - actions.appendChild(storeBtn); - } - - info.appendChild(actions); - - content.appendChild(boxArt); - content.appendChild(info); - - wrapper.appendChild(hero); - wrapper.appendChild(content); - - // Screenshots section - if (game.images.screenshots && game.images.screenshots.length > 0) { - const screenshotsSection = document.createElement("div"); - screenshotsSection.className = "game-detail-screenshots"; - - const screenshotsTitle = document.createElement("h3"); - screenshotsTitle.textContent = "Screenshots"; - screenshotsSection.appendChild(screenshotsTitle); - - const screenshotsGrid = document.createElement("div"); - screenshotsGrid.className = "screenshots-grid"; - - game.images.screenshots.slice(0, 4).forEach((url) => { - const screenshot = document.createElement("img"); - screenshot.className = "screenshot"; - screenshot.src = url; - screenshot.alt = "Screenshot"; - screenshot.addEventListener("click", () => { - // TODO: Lightbox - window.open(url, "_blank"); - }); - screenshotsGrid.appendChild(screenshot); - }); - - screenshotsSection.appendChild(screenshotsGrid); - wrapper.appendChild(screenshotsSection); - } - - return wrapper; -} - -async function showGameDetail(gameId: string) { - const game = games.find((g) => g.id === gameId) - || searchResultsCache.find((g) => g.id === gameId) - || createPlaceholderGames().find((g) => g.id === gameId); - if (!game) return; - - const detailContainer = document.getElementById("game-detail"); - if (!detailContainer) return; - - // Clear and append new content safely - detailContainer.replaceChildren(); - detailContainer.appendChild(createGameDetailElement(game)); - - // Render Lucide icons in the new content - lucide.createIcons(); - - showModal("game-modal"); -} - -// Streaming state -interface StreamingUIState { - active: boolean; - sessionId: string | null; - gameName: string | null; - phase: string; - gpuType: string | null; - serverIp: string | null; - region: string | null; - inputCleanup: (() => void) | null; - statsInterval: number | null; - escCleanup: (() => void) | null; - recordingCleanup: (() => void) | null; - lastDiscordUpdate: number; - gameStartTime: number; -} - -let streamingUIState: StreamingUIState = { - active: false, - sessionId: null, - gameName: null, - phase: "idle", - gpuType: null, - serverIp: null, - region: null, - inputCleanup: null, - statsInterval: null, - escCleanup: null, - recordingCleanup: null, - lastDiscordUpdate: 0, - gameStartTime: 0, -}; - -async function launchGame(game: Game) { - console.log("Launching game:", game.title); - hideAllModals(); - - // Stop session polling while we're launching/streaming - stopSessionPolling(); - - // Get the GFN JWT token first (required for API authentication) - let accessToken: string; - try { - accessToken = await invoke("get_gfn_jwt"); - } catch (e) { - console.error("Not authenticated:", e); - alert("Please login first to launch games."); - startSessionPolling(); // Resume polling since we're not launching - return; - } - - // Check for active sessions before launching - const activeSessions = await checkActiveSessions(); - if (activeSessions.length > 0) { - // Show the conflict modal instead of launching - showSessionConflictModal(activeSessions[0], game); - startSessionPolling(); // Resume polling since we're not launching - return; - } - - // For free tier users on NVIDIA servers, show server selection modal with queue times - // Skip for Alliance Partners as they have their own queue system - if (isFreeTier(currentSubscription) && !isAlliancePartner()) { - const selectedServer = await showQueueSelectionModal(game); - if (selectedServer === null && selectedQueueServer === null) { - // User cancelled - startSessionPolling(); - return; - } - // If user selected a server, selectedQueueServer is already set - } - - // Show streaming overlay - showStreamingOverlay(game.title, "Requesting session..."); - - // Update Discord presence to show in queue (if enabled) - if (discordRpcEnabled) { - try { - await invoke("set_queue_presence", { - gameName: game.title, - queuePosition: null, - etaSeconds: null, - }); - } catch (e) { - console.warn("Discord presence update failed:", e); - } - } - - try { - // Phase 1: Start session - console.log("Starting session with game ID:", game.id); - updateStreamingStatus("Creating session..."); - - const streamParams = getStreamingParams(); - console.log("Using streaming params:", streamParams, "resolution:", currentResolution, "fps:", currentFps); - - // Get preferred server based on region setting - const preferredServer = getPreferredServerForSession(); - console.log("Using preferred server:", preferredServer || "default"); - - const sessionResult = await invoke<{ - sessionId: string; - signalingUrl: string | null; - server: { ip: string; id: string }; - }>("start_session", { - request: { - game_id: game.id, - store_type: game.store.store_type, - store_id: game.store.store_id, - preferred_server: preferredServer, - quality_preset: currentQuality, - resolution: streamParams.resolution, - fps: streamParams.fps, - codec: currentCodec, - max_bitrate_mbps: currentMaxBitrate, - reflex: reflexEnabled, // NVIDIA Reflex low-latency mode - }, - accessToken: accessToken, - }); - - console.log("Session created:", sessionResult); - streamingUIState.sessionId = sessionResult.sessionId; - streamingUIState.gameName = game.title; - streamingUIState.active = true; - - // Phase 2: Poll until ready and start streaming - updateStreamingStatus("Waiting for server..."); - - console.log("Calling start_streaming_flow for session:", sessionResult.sessionId); - let streamingResult; - try { - streamingResult = await invoke<{ - sessionId: string; - phase: string; - serverIp: string | null; - signalingUrl: string | null; - gpuType: string | null; - connectionInfo: { - controlIp: string; - controlPort: number; - streamIp: string | null; - streamPort: number; - resourcePath: string; - } | null; - error: string | null; - }>("start_streaming_flow", { - sessionId: sessionResult.sessionId, - accessToken: accessToken, - }); - } catch (e) { - console.error("start_streaming_flow failed:", e); - throw e; - } - - console.log("Streaming ready:", streamingResult); - console.log(" - sessionId:", streamingResult.sessionId); - console.log(" - phase:", streamingResult.phase); - console.log(" - serverIp:", streamingResult.serverIp); - console.log(" - signalingUrl:", streamingResult.signalingUrl); - console.log(" - connectionInfo:", streamingResult.connectionInfo); - console.log(" - gpuType:", streamingResult.gpuType); - streamingUIState.phase = streamingResult.phase; - streamingUIState.gpuType = streamingResult.gpuType; - streamingUIState.serverIp = streamingResult.serverIp; - - // Determine the region name for display - const currentServer = cachedServers.find(s => s.id === currentRegion) || - (currentRegion === "auto" ? cachedServers.find(s => s.status === "Online") : null); - streamingUIState.region = currentServer?.name || currentRegion; - - // Update overlay with success - updateStreamingStatus(`Connected to ${streamingResult.gpuType || "GPU"}`); - - // Update Discord presence to show playing (if enabled) - if (discordRpcEnabled) { - try { - // Store start time in seconds for Discord elapsed time - streamingUIState.gameStartTime = Math.floor(Date.now() / 1000); - await invoke("set_game_presence", { - gameName: game.title, - region: streamingUIState.region, - resolution: discordShowStats ? currentResolution : null, - fps: discordShowStats ? currentFps : null, - latencyMs: null, - }); - streamingUIState.lastDiscordUpdate = Date.now(); - } catch (e) { - console.warn("Discord presence update failed:", e); - } - } - - // Show streaming info - showStreamingInfo(streamingResult); - - // Phase 3: Initialize WebRTC video streaming - updateStreamingStatus("Starting video stream..."); - - // Create fullscreen streaming container - const streamContainer = createStreamingContainer(game.title); - - try { - // Initialize WebRTC streaming with user's selected resolution/fps - const streamingOptions: StreamingOptions = { - resolution: currentResolution, - fps: currentFps - }; - await initializeStreaming(streamingResult, accessToken, streamContainer, streamingOptions); - - // Set up input capture - const videoElement = document.getElementById("gfn-stream-video") as HTMLVideoElement; - if (videoElement) { - streamingUIState.inputCleanup = setupInputCapture(videoElement); - } - - // Start stats monitoring - streamingUIState.statsInterval = window.setInterval(async () => { - if (isStreamingActive()) { - const stats = await getStreamingStats(); - if (stats) { - updateStreamingStatsDisplay(stats); - - // Update Discord presence every 15 seconds with current stats - if (discordRpcEnabled && streamingUIState.gameName) { - const now = Date.now(); - if (now - streamingUIState.lastDiscordUpdate >= 15000) { - try { - await invoke("update_game_stats", { - gameName: streamingUIState.gameName, - region: streamingUIState.region, - resolution: discordShowStats ? (stats.resolution || currentResolution) : null, - fps: discordShowStats ? (stats.fps || null) : null, - latencyMs: discordShowStats ? (stats.latency_ms || null) : null, - startTime: streamingUIState.gameStartTime, - }); - streamingUIState.lastDiscordUpdate = now; - } catch (e) { - // Silently ignore Discord update failures - } - } - } - } - } - }, 1000); - - console.log("Video streaming initialized"); - } catch (streamError) { - console.error("Failed to initialize video stream:", streamError); - updateStreamingStatus(`Video error: ${streamError}`); - } - - } catch (error) { - console.error("Failed to launch game:", error); - streamingUIState.active = false; - - // Hide overlay and show error - hideStreamingOverlay(); - - // Reset Discord presence (if enabled) - if (discordRpcEnabled) { - try { - await invoke("set_browsing_presence"); - } catch (e) { - // Ignore - } - } - - // Resume session polling since launch failed - startSessionPolling(); - - // Check for specific errors and show appropriate modals - const errorStr = String(error); - if (errorStr.includes("REGION_NOT_SUPPORTED")) { - showRegionErrorModal(errorStr, game); - } else if (errorStr.includes("SESSION_LIMIT")) { - showSessionLimitModal(errorStr, game); - } else { - alert(`Failed to launch game: ${error}`); - } - } -} - -// Create fullscreen streaming container -function createStreamingContainer(gameName: string): HTMLElement { - // Remove existing container if any - const existing = document.getElementById("streaming-container"); - if (existing) existing.remove(); - - const container = document.createElement("div"); - container.id = "streaming-container"; - container.innerHTML = ` -
      - -
      -
      -
      - ${gameName} -
      - - - - - - -
      -
      -
      -
      - - - Region: -- - -- FPS - -- ms - ----x---- - ---- - -- Mbps -
      -
      -
      - - - - - Hold ESC to exit -
      -
      -
      -
      - Stream Settings - -
      -
      -
      -

      Stream Info

      -
      -
      - Region - -- -
      -
      - GPU - -- -
      -
      - Resolution - -- -
      -
      - FPS - -- -
      -
      - Codec - -- -
      -
      - Bitrate - -- -
      -
      - Latency - -- -
      -
      - Packet Loss - -- -
      -
      -
      -
      -

      Display

      -
      - - -
      -
      -
      -
      - `; - - // Add styles - const style = document.createElement("style"); - style.id = "streaming-container-style"; - style.textContent = ` - #streaming-container { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: #000; - z-index: 10001; - display: flex; - align-items: center; - justify-content: center; - } - .stream-video-wrapper { - width: 100%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; - } - #gfn-stream-video { - width: 100%; - height: 100%; - object-fit: contain; - } - .stream-overlay { - position: absolute; - top: 0; - left: 0; - right: 0; - padding: 10px 20px; - background: linear-gradient(to bottom, rgba(0,0,0,0.7) 0%, transparent 100%); - opacity: 0; - transition: opacity 0.3s; - pointer-events: none; - } - #streaming-container:hover .stream-overlay { - opacity: 1; - pointer-events: auto; - } - .stream-header { - display: flex; - justify-content: space-between; - align-items: center; - } - .stream-game-name { - font-size: 18px; - font-weight: bold; - color: #76b900; - } - .stream-controls { - display: flex; - gap: 8px; - } - .stream-btn { - display: flex; - align-items: center; - justify-content: center; - background: rgba(255,255,255,0.1); - border: none; - color: white; - width: 36px; - height: 36px; - border-radius: 6px; - cursor: pointer; - transition: background 0.2s; - } - .stream-btn svg { - width: 18px; - height: 18px; - } - .stream-btn:hover { - background: rgba(255,255,255,0.2); - } - .stream-btn-danger:hover { - background: rgba(255,0,0,0.5); - } - /* Recording button states */ - .stream-btn.recording-active { - background: rgba(255, 0, 0, 0.7); - animation: pulse-recording 1s infinite; - } - .stream-btn.replay-active { - background: rgba(118, 185, 0, 0.5); - } - @keyframes pulse-recording { - 0%, 100% { opacity: 1; } - 50% { opacity: 0.7; } - } - /* Recording indicator in stats bar */ - .recording-indicator { - display: inline-flex; - align-items: center; - gap: 6px; - color: #ff4444; - font-weight: bold; - animation: blink-recording 1s infinite; - } - .rec-dot { - width: 8px; - height: 8px; - background: #ff4444; - border-radius: 50%; - } - @keyframes blink-recording { - 0%, 100% { opacity: 1; } - 50% { opacity: 0.5; } - } - .replay-indicator { - display: inline-flex; - align-items: center; - color: #76b900; - font-weight: bold; - font-size: 11px; - padding: 2px 6px; - background: rgba(118, 185, 0, 0.2); - border-radius: 3px; - } - .recording-toast { - position: fixed; - bottom: 80px; - right: 20px; - background: rgba(20, 20, 20, 0.95); - color: #fff; - padding: 12px 20px; - border-radius: 8px; - font-size: 14px; - z-index: 10010; - display: flex; - align-items: center; - gap: 10px; - animation: toast-slide-in 0.3s ease; - border-left: 3px solid #76b900; - } - .recording-toast.error { - border-left-color: #ff4444; - } - .recording-toast svg { - width: 18px; - height: 18px; - } - @keyframes toast-slide-in { - from { transform: translateX(100%); opacity: 0; } - to { transform: translateX(0); opacity: 1; } - } - .stream-stats { - position: absolute; - bottom: 10px; - left: 20px; - display: flex; - gap: 15px; - font-size: 12px; - color: #aaa; - background: rgba(0,0,0,0.5); - padding: 5px 10px; - border-radius: 4px; - z-index: 10003; - } - #streaming-container:fullscreen .stream-stats, - #streaming-container:-webkit-full-screen .stream-stats { - position: fixed; - bottom: 20px; - left: 20px; - } - .stream-stats span { - font-family: monospace; - } - /* Latency color coding for stats */ - .stream-stats .latency-excellent, - .info-value.latency-excellent { color: #00c853 !important; } - .stream-stats .latency-good, - .info-value.latency-good { color: #76b900 !important; } - .stream-stats .latency-fair, - .info-value.latency-fair { color: #ffc107 !important; } - .stream-stats .latency-poor, - .info-value.latency-poor { color: #ff9800 !important; } - .stream-stats .latency-bad, - .info-value.latency-bad { color: #f44336 !important; } - #stats-region { - color: #76b900; - font-weight: 500; - } - .stream-settings-panel { - position: absolute; - top: 60px; - right: 20px; - width: 320px; - background: rgba(20, 20, 20, 0.95); - border: 1px solid rgba(255,255,255,0.1); - border-radius: 8px; - display: none; - z-index: 10002; - box-shadow: 0 4px 20px rgba(0,0,0,0.5); - } - .stream-settings-panel.visible { - display: block; - } - .settings-panel-header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 12px 16px; - border-bottom: 1px solid rgba(255,255,255,0.1); - color: #76b900; - font-weight: bold; - } - .settings-close-btn { - background: none; - border: none; - color: #aaa; - font-size: 16px; - cursor: pointer; - padding: 4px 8px; - } - .settings-close-btn:hover { - color: #fff; - } - .settings-panel-content { - padding: 16px; - max-height: 400px; - overflow-y: auto; - } - .settings-section { - margin-bottom: 20px; - } - .settings-section:last-child { - margin-bottom: 0; - } - .settings-section h4 { - margin: 0 0 12px 0; - color: #fff; - font-size: 13px; - text-transform: uppercase; - letter-spacing: 0.5px; - } - .settings-info-grid { - display: grid; - grid-template-columns: 1fr 1fr; - gap: 10px; - } - .info-item { - display: flex; - flex-direction: column; - gap: 4px; - } - .info-label { - font-size: 11px; - color: #888; - text-transform: uppercase; - } - .info-value { - font-size: 14px; - color: #fff; - font-family: monospace; - } - .settings-option { - display: flex; - justify-content: space-between; - align-items: center; - padding: 8px 0; - } - .settings-option label { - color: #ddd; - font-size: 13px; - } - .settings-option input[type="checkbox"] { - width: 18px; - height: 18px; - accent-color: #76b900; - } - /* Hide top bar (header with game name and buttons) in fullscreen mode */ - #streaming-container:fullscreen .stream-header, - #streaming-container:-webkit-full-screen .stream-header, - #streaming-container:-moz-full-screen .stream-header, - #streaming-container:-ms-fullscreen .stream-header, - #streaming-container.is-fullscreen .stream-header { - display: none !important; - } - /* Also hide settings panel in fullscreen mode */ - #streaming-container:fullscreen .stream-settings-panel, - #streaming-container:-webkit-full-screen .stream-settings-panel, - #streaming-container:-moz-full-screen .stream-settings-panel, - #streaming-container:-ms-fullscreen .stream-settings-panel, - #streaming-container.is-fullscreen .stream-settings-panel { - display: none !important; - } - /* ESC exit overlay styles */ - .stream-exit-overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex; - align-items: center; - justify-content: center; - background: rgba(0, 0, 0, 0.7); - opacity: 0; - visibility: hidden; - transition: opacity 0.15s ease, visibility 0.15s ease; - z-index: 10000; - pointer-events: none; - } - .stream-exit-overlay.active { - opacity: 1; - visibility: visible; - } - .exit-overlay-content { - display: flex; - flex-direction: column; - align-items: center; - gap: 16px; - } - .exit-progress-ring { - width: 100px; - height: 100px; - transform: rotate(-90deg); - } - .exit-progress-bg { - fill: none; - stroke: rgba(255, 255, 255, 0.2); - stroke-width: 6; - } - .exit-progress-bar { - fill: none; - stroke: #76b900; - stroke-width: 6; - stroke-linecap: round; - stroke-dasharray: 283; - stroke-dashoffset: 283; - transition: stroke-dashoffset 1s linear; - } - .stream-exit-overlay.active .exit-progress-bar { - stroke-dashoffset: 0; - } - .exit-overlay-text { - color: #fff; - font-size: 16px; - font-weight: 500; - text-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); - } - `; - - document.head.appendChild(style); - document.body.appendChild(container); - - // Reinitialize Lucide icons for dynamically added content - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - // Find the video wrapper to return - const videoWrapper = container.querySelector(".stream-video-wrapper") as HTMLElement; - - // Set up button handlers - document.getElementById("stream-exit-btn")?.addEventListener("click", () => { - exitStreaming(); - }); - - document.getElementById("stream-fullscreen-btn")?.addEventListener("click", async () => { - console.log("Fullscreen button clicked"); - - // Try Tauri's window API first (works properly on macOS) - let tauriSuccess = false; - let enteringFullscreen = false; - try { - const appWindow = getCurrentWindow(); - console.log("Got Tauri window:", appWindow); - const isFullscreen = await appWindow.isFullscreen(); - console.log("Current fullscreen state:", isFullscreen); - enteringFullscreen = !isFullscreen; - await appWindow.setFullscreen(enteringFullscreen); - console.log("Fullscreen toggled to:", enteringFullscreen); - tauriSuccess = true; - - // Toggle is-fullscreen class on container for CSS rules - const streamContainer = document.getElementById("streaming-container"); - if (streamContainer) { - if (enteringFullscreen) { - streamContainer.classList.add("is-fullscreen"); - } else { - streamContainer.classList.remove("is-fullscreen"); - } - } - - // Manually handle cursor hiding since browser fullscreenchange event won't fire for Tauri fullscreen - const video = document.getElementById("gfn-stream-video") as HTMLVideoElement; - if (enteringFullscreen) { - // Entering fullscreen - hide cursor, use absolute mode - console.log("Entering fullscreen - hiding cursor"); - await setInputCaptureMode('pointerlock'); // This just hides cursor now - - // Also request browser fullscreen on the streaming container for proper fullscreen behavior - const container = document.getElementById("streaming-container"); - if (container && !document.fullscreenElement) { - try { - await container.requestFullscreen(); - console.log("Browser fullscreen requested on container"); - } catch (e) { - console.warn("Browser fullscreen failed:", e); - } - } - } else { - // Exiting fullscreen - show cursor - console.log("Exiting fullscreen - showing cursor"); - await setInputCaptureMode('absolute'); - - // Exit browser fullscreen if active - if (document.fullscreenElement) { - try { - await document.exitFullscreen(); - console.log("Browser fullscreen exited"); - } catch (e) { - console.warn("Failed to exit browser fullscreen:", e); - } - } - } - } catch (e) { - console.error("Tauri fullscreen API error:", e); - } - - // If Tauri failed, try browser API - if (!tauriSuccess) { - console.log("Falling back to browser fullscreen API"); - const fullscreenElement = document.fullscreenElement || - (document as any).webkitFullscreenElement || - (document as any).mozFullScreenElement || - (document as any).msFullscreenElement; - - if (fullscreenElement) { - console.log("Exiting fullscreen via browser API"); - if (document.exitFullscreen) { - document.exitFullscreen().catch(err => console.error("exitFullscreen error:", err)); - } else if ((document as any).webkitExitFullscreen) { - (document as any).webkitExitFullscreen(); - } else if ((document as any).mozCancelFullScreen) { - (document as any).mozCancelFullScreen(); - } else if ((document as any).msExitFullscreen) { - (document as any).msExitFullscreen(); - } - } else { - console.log("Entering fullscreen via browser API on container:", container); - try { - if (container.requestFullscreen) { - await container.requestFullscreen(); - } else if ((container as any).webkitRequestFullscreen) { - (container as any).webkitRequestFullscreen(); - } else if ((container as any).mozRequestFullScreen) { - (container as any).mozRequestFullScreen(); - } else if ((container as any).msRequestFullscreen) { - (container as any).msRequestFullscreen(); - } - } catch (err) { - console.error("Browser fullscreen error:", err); - } - } - } - }); - - // Settings panel toggle - const settingsPanel = document.getElementById("stream-settings-panel"); - const settingsBtn = document.getElementById("stream-settings-btn"); - const closeSettingsBtn = document.getElementById("settings-close-btn"); - const showStatsCheckbox = document.getElementById("setting-show-stats") as HTMLInputElement; - const statsOverlay = document.getElementById("stream-stats"); - - settingsBtn?.addEventListener("click", () => { - settingsPanel?.classList.toggle("visible"); - }); - - closeSettingsBtn?.addEventListener("click", () => { - settingsPanel?.classList.remove("visible"); - }); - - // Toggle stats overlay visibility - showStatsCheckbox?.addEventListener("change", () => { - if (statsOverlay) { - statsOverlay.style.display = showStatsCheckbox.checked ? "flex" : "none"; - } - }); - - // ============================================ - // Recording Controls Setup - // ============================================ - const recordingManager = getRecordingManager(); - const recordBtn = document.getElementById("stream-record-btn"); - const screenshotBtn = document.getElementById("stream-screenshot-btn"); - const replayBtn = document.getElementById("stream-replay-btn"); - const recordingIndicator = document.getElementById("stats-recording"); - const recordingDurationEl = document.getElementById("recording-duration"); - const replayIndicator = document.getElementById("stats-replay"); - - // Helper to show toast notifications - const showRecordingToast = (message: string, isError = false) => { - // Remove existing toast - document.querySelector(".recording-toast")?.remove(); - - const toast = document.createElement("div"); - toast.className = `recording-toast${isError ? " error" : ""}`; - - const icon = document.createElement("i"); - icon.setAttribute("data-lucide", isError ? "alert-circle" : "check-circle"); - toast.appendChild(icon); - - const span = document.createElement("span"); - span.textContent = message; - toast.appendChild(span); - - document.body.appendChild(toast); - - if (typeof lucide !== 'undefined') { - lucide.createIcons(); - } - - // Auto-remove after 3 seconds - setTimeout(() => toast.remove(), 3000); - }; - - // Initialize recording manager with stream and video element - const initRecordingManager = () => { - const stream = getMediaStream(); - const video = getVideoElement(); - if (stream) { - recordingManager.setStream(stream); - recordingManager.setVideoElement(video); // For canvas-based recording (no stutter) - recordingManager.setGameName(gameName); - console.log("Recording manager initialized with stream and video element (canvas mode)"); - } else { - console.warn("No media stream available for recording"); - } - }; - - // Update UI based on recording state - const updateRecordingUI = (state: RecordingState) => { - // Update record button - if (state.isRecording) { - recordBtn?.classList.add("recording-active"); - if (recordingIndicator) recordingIndicator.style.display = "inline-flex"; - if (recordingDurationEl) recordingDurationEl.textContent = recordingManager.formatDuration(state.duration); - } else { - recordBtn?.classList.remove("recording-active"); - if (recordingIndicator) recordingIndicator.style.display = "none"; - } - }; - - // Update replay button state - const updateReplayUI = () => { - if (recordingManager.isInstantReplayEnabled) { - replayBtn?.classList.add("replay-active"); - if (replayIndicator) replayIndicator.style.display = "inline-flex"; - } else { - replayBtn?.classList.remove("replay-active"); - if (replayIndicator) replayIndicator.style.display = "none"; - } - }; - - // Set up recording callbacks - recordingManager.onStateChanged(updateRecordingUI); - recordingManager.onSaved((filepath, isScreenshot) => { - const type = isScreenshot ? "Screenshot" : "Recording"; - const filename = filepath.split(/[\\/]/).pop() || filepath; - showRecordingToast(`${type} saved: ${filename}`); - }); - - // Initialize after a short delay to ensure stream is ready - setTimeout(initRecordingManager, 500); - - // Record button click - recordBtn?.addEventListener("click", async () => { - if (!recordingManager.isRecording) { - // Try to initialize stream if not already - if (!getMediaStream()) { - showRecordingToast("No stream available", true); - return; - } - initRecordingManager(); - const success = await recordingManager.startRecording(); - if (success) { - showRecordingToast("Recording started"); - } else { - showRecordingToast("Failed to start recording", true); - } - } else { - await recordingManager.stopRecording(); - showRecordingToast("Recording stopped, saving..."); - } - }); - - // Screenshot button click - screenshotBtn?.addEventListener("click", async () => { - const video = getVideoElement(); - if (!video) { - showRecordingToast("No video available", true); - return; - } - const success = await recordingManager.takeScreenshot(video); - if (!success) { - showRecordingToast("Failed to take screenshot", true); - } - }); - - // Replay button click - toggle instant replay - replayBtn?.addEventListener("click", () => { - if (!recordingManager.isInstantReplayEnabled) { - if (!getMediaStream()) { - showRecordingToast("No stream available", true); - return; - } - initRecordingManager(); - const success = recordingManager.enableInstantReplay(60); - if (success) { - showRecordingToast("Instant Replay enabled (60s buffer)"); - updateReplayUI(); - } else { - showRecordingToast("Failed to enable Instant Replay", true); - } - } else { - recordingManager.disableInstantReplay(); - showRecordingToast("Instant Replay disabled"); - updateReplayUI(); - } - }); - - // Keyboard shortcuts for recording - const recordingKeyHandler = async (e: KeyboardEvent) => { - // Only handle if streaming container is active - if (!document.getElementById("streaming-container")) return; - - switch (e.key) { - case "F9": // Toggle recording - e.preventDefault(); - recordBtn?.click(); - break; - case "F8": // Screenshot - e.preventDefault(); - screenshotBtn?.click(); - break; - case "F7": // Save instant replay - e.preventDefault(); - if (recordingManager.isInstantReplayEnabled) { - const success = await recordingManager.saveInstantReplay(); - if (success) { - showRecordingToast("Instant Replay saved"); - } else { - showRecordingToast("No replay data to save", true); - } - } else { - showRecordingToast("Instant Replay not enabled", true); - } - break; - case "F6": // Toggle instant replay - e.preventDefault(); - replayBtn?.click(); - break; - } - }; - - document.addEventListener("keydown", recordingKeyHandler); - - // Store cleanup function for recording in state - streamingUIState.recordingCleanup = () => { - document.removeEventListener("keydown", recordingKeyHandler); - recordingManager.dispose(); - }; - - // Hold ESC to exit fullscreen (1 second hold required) - let escHoldStart = 0; - let escHoldTimer: number | null = null; - let tauriFullscreenState = false; // Track Tauri fullscreen state - - // Helper to check if in fullscreen (cross-browser) - const isBrowserFullscreen = () => document.fullscreenElement || - (document as any).webkitFullscreenElement || - (document as any).mozFullScreenElement || - (document as any).msFullscreenElement; - - // Helper to exit fullscreen using Tauri API (macOS) with browser fallback - const exitFullscreenAsync = async () => { - let exitedViaTauri = false; - try { - const appWindow = getCurrentWindow(); - const isFullscreen = await appWindow.isFullscreen(); - if (isFullscreen) { - await appWindow.setFullscreen(false); - exitedViaTauri = true; - } - } catch (e) { - // Fall through to browser API - } - - // Browser API fallback - if (!exitedViaTauri) { - if (document.exitFullscreen) { - document.exitFullscreen().catch(() => {}); - } else if ((document as any).webkitExitFullscreen) { - (document as any).webkitExitFullscreen(); - } else if ((document as any).mozCancelFullScreen) { - (document as any).mozCancelFullScreen(); - } else if ((document as any).msExitFullscreen) { - (document as any).msExitFullscreen(); - } - } - - // Switch back to absolute mode and exit pointer lock - console.log("ESC exit: Switching to absolute mode"); - await setInputCaptureMode('absolute'); - if (document.pointerLockElement) { - document.exitPointerLock(); - } - }; - - // Periodically check Tauri fullscreen state for ESC handler - const updateTauriFullscreenState = async () => { - try { - const appWindow = getCurrentWindow(); - tauriFullscreenState = await appWindow.isFullscreen(); - } catch { - tauriFullscreenState = false; - } - }; - const fullscreenCheckInterval = setInterval(updateTauriFullscreenState, 500); - - const escKeyDownHandler = (e: KeyboardEvent) => { - const isFullscreen = isBrowserFullscreen() || tauriFullscreenState; - if (e.key === "Escape" && isFullscreen) { - // Prevent browser's default behavior of exiting fullscreen on ESC - e.preventDefault(); - - // Only start the hold timer if not already started - if (escHoldStart === 0) { - escHoldStart = Date.now(); - - // Show the exit overlay with animation - const exitOverlay = document.getElementById("stream-exit-overlay"); - if (exitOverlay) { - exitOverlay.classList.add("active"); - } - - escHoldTimer = window.setTimeout(() => { - if (escHoldStart > 0) { - // Hide overlay before exiting - if (exitOverlay) { - exitOverlay.classList.remove("active"); - } - // Remove is-fullscreen class - const streamContainer = document.getElementById("streaming-container"); - if (streamContainer) { - streamContainer.classList.remove("is-fullscreen"); - } - exitFullscreenAsync(); - escHoldStart = 0; - } - }, 1000); // 1 second hold - } - } - }; - - const escKeyUpHandler = (e: KeyboardEvent) => { - if (e.key === "Escape") { - escHoldStart = 0; - if (escHoldTimer) { - clearTimeout(escHoldTimer); - escHoldTimer = null; - } - // Hide the exit overlay - const exitOverlay = document.getElementById("stream-exit-overlay"); - if (exitOverlay) { - exitOverlay.classList.remove("active"); - } - } - }; - - document.addEventListener("keydown", escKeyDownHandler); - document.addEventListener("keyup", escKeyUpHandler); - - // Window focus/blur handlers for macOS cursor capture - // When switching windows (Cmd+Tab), we need to release and recapture the cursor - const handleWindowBlur = () => { - console.log("Window blur - suspending cursor capture"); - suspendCursorCapture(); - }; - - const handleWindowFocus = () => { - console.log("Window focus - resuming cursor capture"); - resumeCursorCapture(); - }; - - window.addEventListener("blur", handleWindowBlur); - window.addEventListener("focus", handleWindowFocus); - - // Store cleanup for ESC handlers, fullscreen check interval, and focus handlers - streamingUIState.escCleanup = () => { - document.removeEventListener("keydown", escKeyDownHandler); - document.removeEventListener("keyup", escKeyUpHandler); - window.removeEventListener("blur", handleWindowBlur); - window.removeEventListener("focus", handleWindowFocus); - if (escHoldTimer) { - clearTimeout(escHoldTimer); - } - clearInterval(fullscreenCheckInterval); - }; - - return videoWrapper; -} - -// Update streaming stats display -function updateStreamingStatsDisplay(stats: { - fps: number; - latency_ms: number; - bitrate_kbps: number; - packet_loss: number; - resolution: string; - codec: string; -}): void { - // Update overlay stats - const regionEl = document.getElementById("stats-region"); - const fpsEl = document.getElementById("stats-fps"); - const latencyEl = document.getElementById("stats-latency"); - const resEl = document.getElementById("stats-resolution"); - const codecEl = document.getElementById("stats-codec"); - const bitrateEl = document.getElementById("stats-bitrate"); - const bitrateFormatted = stats.bitrate_kbps >= 1000 - ? `${(stats.bitrate_kbps / 1000).toFixed(1)} Mbps` - : `${stats.bitrate_kbps} kbps`; - - // Get current region info - const currentServer = cachedServers.find(s => s.id === currentRegion) || - (currentRegion === "auto" ? cachedServers.find(s => s.status === "Online") : null); - - if (regionEl) { - regionEl.textContent = currentServer ? currentServer.name : (currentRegion === "auto" ? "Auto" : currentRegion); - } - - if (fpsEl) fpsEl.textContent = `${Math.round(stats.fps)} FPS`; - - // Color code the latency - if (latencyEl) { - latencyEl.textContent = `${stats.latency_ms} ms`; - // Remove all latency classes first - latencyEl.classList.remove("latency-excellent", "latency-good", "latency-fair", "latency-poor", "latency-bad"); - // Add appropriate class based on latency - latencyEl.classList.add(getLatencyClass(stats.latency_ms)); - } - - if (resEl) resEl.textContent = stats.resolution || "----x----"; - if (codecEl) codecEl.textContent = stats.codec || "----"; - if (bitrateEl) bitrateEl.textContent = bitrateFormatted; - - // Update settings panel info - const infoRegionEl = document.getElementById("info-region"); - const infoGpuEl = document.getElementById("info-gpu"); - const infoResEl = document.getElementById("info-resolution"); - const infoFpsEl = document.getElementById("info-fps"); - const infoCodecEl = document.getElementById("info-codec"); - const infoBitrateEl = document.getElementById("info-bitrate"); - const infoLatencyEl = document.getElementById("info-latency"); - const infoPacketLossEl = document.getElementById("info-packet-loss"); - - if (infoRegionEl) { - infoRegionEl.textContent = currentServer ? currentServer.name : (currentRegion === "auto" ? "Auto" : currentRegion); - } - if (infoGpuEl) { - infoGpuEl.textContent = streamingUIState.gpuType || "--"; - } - if (infoResEl) infoResEl.textContent = stats.resolution || "--"; - if (infoFpsEl) infoFpsEl.textContent = `${Math.round(stats.fps)}`; - if (infoCodecEl) infoCodecEl.textContent = stats.codec || "--"; - if (infoBitrateEl) infoBitrateEl.textContent = bitrateFormatted; - if (infoLatencyEl) { - infoLatencyEl.textContent = `${stats.latency_ms} ms`; - infoLatencyEl.classList.remove("latency-excellent", "latency-good", "latency-fair", "latency-poor", "latency-bad"); - infoLatencyEl.classList.add(getLatencyClass(stats.latency_ms)); - } - if (infoPacketLossEl) infoPacketLossEl.textContent = `${(stats.packet_loss * 100).toFixed(2)}%`; -} - -// Exit streaming and cleanup -async function exitStreaming(): Promise { - console.log("Exiting streaming..."); - - // Stop input capture - if (streamingUIState.inputCleanup) { - streamingUIState.inputCleanup(); - streamingUIState.inputCleanup = null; - } - - // Stop ESC handlers - if (streamingUIState.escCleanup) { - streamingUIState.escCleanup(); - streamingUIState.escCleanup = null; - } - - // Stop recording and cleanup - if (streamingUIState.recordingCleanup) { - streamingUIState.recordingCleanup(); - streamingUIState.recordingCleanup = null; - } - - // Stop stats monitoring - if (streamingUIState.statsInterval) { - clearInterval(streamingUIState.statsInterval); - streamingUIState.statsInterval = null; - } - - // Stop WebRTC streaming - stopStreaming(); - - // Stop backend session - if (streamingUIState.sessionId) { - try { - const accessToken = await invoke("get_gfn_jwt"); - await invoke("stop_streaming_flow", { - sessionId: streamingUIState.sessionId, - accessToken: accessToken, - }); - } catch (e) { - console.warn("Error stopping session:", e); - } - } - - // Remove streaming container - const container = document.getElementById("streaming-container"); - const style = document.getElementById("streaming-container-style"); - if (container) container.remove(); - if (style) style.remove(); - - // Hide streaming overlay - hideStreamingOverlay(); - - // Reset state - streamingUIState = { - active: false, - sessionId: null, - gameName: null, - phase: "idle", - gpuType: null, - serverIp: null, - region: null, - inputCleanup: null, - statsInterval: null, - escCleanup: null, - recordingCleanup: null, - lastDiscordUpdate: 0, - gameStartTime: 0, - }; - - // Reset Discord presence (if enabled) - if (discordRpcEnabled) { - try { - await invoke("set_browsing_presence"); - } catch (e) { - // Ignore - } - } - - console.log("Streaming exited"); - - // Resume session polling now that we're not streaming - startSessionPolling(); -} - -// Queue status polling interval -let queueStatusInterval: number | null = null; - -// Queue status interface -interface QueueStatus { - session_status: number; - queue_position: number; - eta_ms: number; - is_in_queue: boolean; -} - -// Start polling for queue status updates -function startQueueStatusPolling() { - // Clear any existing interval - if (queueStatusInterval !== null) { - clearInterval(queueStatusInterval); - } - - // Start countdown timer if we have an ETA (free tier users) - if (queueStartEta > 0) { - startQueueCountdown(); - } - - // Poll every 2 seconds for queue status - queueStatusInterval = window.setInterval(async () => { - try { - const status = await invoke("get_queue_status"); - - if (status.is_in_queue && status.queue_position > 0) { - // Update the overlay to show queue position - updateQueueDisplay(status.queue_position, status.eta_ms); - } else if (status.session_status === 2) { - // Session is ready, stop polling queue status - stopQueueStatusPolling(); - } - } catch (e) { - // Silently ignore errors during queue polling - console.debug("Queue status poll error:", e); - } - }, 2000); -} - -// Stop polling for queue status -function stopQueueStatusPolling() { - if (queueStatusInterval !== null) { - clearInterval(queueStatusInterval); - queueStatusInterval = null; - } - // Also stop the countdown timer - stopQueueCountdown(); -} - -// Update the queue display in the overlay -function updateQueueDisplay(position: number, etaMs: number) { - const statusEl = document.getElementById("streaming-status"); - const queueInfoEl = document.getElementById("queue-info"); - - if (statusEl) { - statusEl.textContent = `Queue position: ${position}`; - } - - // Show/update the queue info section - if (queueInfoEl) { - queueInfoEl.style.display = "block"; - const positionEl = document.getElementById("queue-position"); - if (positionEl) { - positionEl.textContent = String(position); - } - } -} - -// Streaming overlay functions -function showStreamingOverlay(gameName: string, status: string) { - // Remove existing overlay if any - const existing = document.getElementById("streaming-overlay"); - if (existing) existing.remove(); - - const overlay = document.createElement("div"); - overlay.id = "streaming-overlay"; - overlay.innerHTML = ` -
      - -

      ${gameName}

      -

      ${status}

      - - - -
      - `; - - // Add styles - const style = document.createElement("style"); - style.id = "streaming-overlay-style"; - style.textContent = ` - #streaming-overlay { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(0, 0, 0, 0.9); - display: flex; - align-items: center; - justify-content: center; - z-index: 10000; - } - .streaming-overlay-content { - text-align: center; - color: white; - max-width: 400px; - padding: 40px; - } - .streaming-spinner { - width: 60px; - height: 60px; - border: 4px solid rgba(118, 185, 0, 0.3); - border-top-color: #76b900; - border-radius: 50%; - animation: spin 1s linear infinite; - margin: 0 auto 20px; - } - @keyframes spin { - to { transform: rotate(360deg); } - } - #streaming-game-name { - font-size: 24px; - margin-bottom: 10px; - color: #76b900; - } - #streaming-status { - font-size: 16px; - color: #aaa; - margin-bottom: 20px; - } - #queue-info { - background: rgba(118, 185, 0, 0.1); - border: 1px solid rgba(118, 185, 0, 0.3); - border-radius: 12px; - padding: 20px; - margin-bottom: 20px; - } - .queue-stats-row { - display: flex; - justify-content: center; - gap: 40px; - } - .queue-display { - display: flex; - flex-direction: column; - align-items: center; - gap: 8px; - } - .queue-label { - font-size: 14px; - color: #888; - text-transform: uppercase; - letter-spacing: 1px; - } - .queue-position { - font-size: 48px; - font-weight: bold; - color: #76b900; - line-height: 1; - } - .queue-eta { - font-size: 48px; - font-weight: bold; - color: #76b900; - line-height: 1; - } - .queue-hint { - font-size: 12px; - color: #666; - margin-top: 12px; - margin-bottom: 0; - } - #streaming-info { - background: rgba(255, 255, 255, 0.1); - border-radius: 8px; - padding: 15px; - margin-bottom: 20px; - text-align: left; - } - .streaming-stat { - display: flex; - justify-content: space-between; - padding: 5px 0; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); - } - .streaming-stat:last-child { - border-bottom: none; - } - #streaming-cancel-btn { - margin-top: 20px; - } - `; - - document.head.appendChild(style); - document.body.appendChild(overlay); - - // Add cancel handler - document.getElementById("streaming-cancel-btn")?.addEventListener("click", cancelStreaming); - - // Start polling for queue status - startQueueStatusPolling(); -} - -function updateStreamingStatus(status: string) { - const statusEl = document.getElementById("streaming-status"); - if (statusEl) { - statusEl.textContent = status; - } -} - -function showStreamingInfo(info: { - gpuType: string | null; - serverIp: string | null; - phase: string; -}) { - const infoEl = document.getElementById("streaming-info"); - const gpuEl = document.getElementById("streaming-gpu"); - const serverEl = document.getElementById("streaming-server"); - const phaseEl = document.getElementById("streaming-phase"); - const queueInfoEl = document.getElementById("queue-info"); - - // Hide queue info when session is ready - if (queueInfoEl && info.phase === "Ready") { - queueInfoEl.style.display = "none"; - } - - // Stop queue polling when ready - if (info.phase === "Ready") { - stopQueueStatusPolling(); - } - - if (infoEl) infoEl.style.display = "block"; - if (gpuEl) gpuEl.textContent = info.gpuType || "Unknown"; - if (serverEl) serverEl.textContent = info.serverIp || "Unknown"; - if (phaseEl) phaseEl.textContent = info.phase; - - // Hide spinner when ready - const spinner = document.querySelector(".streaming-spinner") as HTMLElement; - if (spinner && info.phase === "Ready") { - spinner.style.borderTopColor = "#76b900"; - spinner.style.animation = "none"; - spinner.innerHTML = ''; - spinner.style.display = "flex"; - spinner.style.alignItems = "center"; - spinner.style.justifyContent = "center"; - spinner.style.color = "#76b900"; - } -} - -function hideStreamingOverlay() { - // Stop queue status polling - stopQueueStatusPolling(); - - const overlay = document.getElementById("streaming-overlay"); - const style = document.getElementById("streaming-overlay-style"); - if (overlay) overlay.remove(); - if (style) style.remove(); -} - -async function cancelStreaming() { - console.log("Cancelling streaming..."); - - try { - // Cancel polling if active - await invoke("cancel_polling"); - } catch (e) { - console.warn("Error cancelling polling:", e); - } - - // Use the full exit streaming function to clean up everything - await exitStreaming(); -} - -// Settings -async function saveSettings() { - const bitrateEl = document.getElementById("bitrate-setting") as HTMLInputElement; - const proxyEl = document.getElementById("proxy-setting") as HTMLInputElement; - const telemetryEl = document.getElementById("telemetry-setting") as HTMLInputElement; - const discordEl = document.getElementById("discord-setting") as HTMLInputElement; - const discordStatsEl = document.getElementById("discord-stats-setting") as HTMLInputElement; - const reflexEl = document.getElementById("reflex-setting") as HTMLInputElement; - - // Get dropdown values - const resolution = getDropdownValue("resolution-setting") || "1920x1080"; - const fps = getDropdownValue("fps-setting") || "60"; - const codec = getDropdownValue("codec-setting") || "h264"; - const audioCodec = getDropdownValue("audio-codec-setting") || "opus"; - const region = getDropdownValue("region-setting") || "auto"; - const recordingCodec = getDropdownValue("recording-codec-setting") || "h264"; - - // Update global state - discordRpcEnabled = discordEl?.checked || false; - discordShowStats = discordStatsEl?.checked || false; - reflexEnabled = reflexEl?.checked ?? true; - currentResolution = resolution; - currentFps = parseInt(fps, 10); - currentCodec = codec; - currentAudioCodec = audioCodec; - currentMaxBitrate = parseInt(bitrateEl?.value || "200", 10); - currentRegion = region; - currentRecordingCodec = (recordingCodec === "av1" ? "av1" : recordingCodec === "h264" ? "h264" : "vp8") as RecordingCodecType; - getRecordingManager().setCodecPreference(currentRecordingCodec); - - // Update status bar with new region selection - updateStatusBarLatency(); - - const settings: Settings = { - quality: "custom", // Mark as custom since we use explicit resolution/fps - resolution: currentResolution, - fps: currentFps, - codec: codec, - audio_codec: audioCodec, - max_bitrate_mbps: currentMaxBitrate, - region: region || undefined, - discord_rpc: discordRpcEnabled, - discord_show_stats: discordShowStats, - proxy: proxyEl?.value || undefined, - disable_telemetry: telemetryEl?.checked || true, - reflex: reflexEnabled, - recording_codec: currentRecordingCodec, - }; - - try { - await invoke("save_settings", { settings }); - hideAllModals(); - console.log("Settings saved:", settings); - } catch (error) { - console.error("Failed to save settings:", error); - } -} - -// Placeholder Data -function createPlaceholderGames(): Game[] { - const titles = [ - "Cyberpunk 2077", - "The Witcher 3", - "Fortnite", - "Apex Legends", - "League of Legends", - "Valorant", - "Destiny 2", - "Warframe", - "Path of Exile", - "Lost Ark", - "Counter-Strike 2", - "Dota 2", - "Rocket League", - "Fall Guys", - "Among Us", - "Minecraft", - "Roblox", - "GTA V", - ]; - - // Generate placeholder images using data URLs for reliability - const generatePlaceholder = (title: string, index: number): string => { - // Create a simple colored placeholder using SVG data URL - const colors = ["#76b900", "#8dd100", "#5a9400", "#4a7d00", "#3d6600"]; - const color = colors[index % colors.length]; - const shortTitle = title.substring(0, 12); - const svg = ` - - - ${shortTitle} - `; - return `data:image/svg+xml,${encodeURIComponent(svg)}`; - }; - - return titles.map((title, i) => ({ - id: `game-${i}`, - title, - publisher: "Publisher", - images: { - box_art: generatePlaceholder(title, i), - thumbnail: generatePlaceholder(title, i), - }, - store: { - store_type: i % 3 === 0 ? "Steam" : i % 3 === 1 ? "Epic" : "Free", - store_id: `${i}`, - }, - })); -} - -// Export for window access -(window as any).gfnClient = { - switchView, - searchGames, - showGameDetail, - // Streaming controls - exitStreaming, - // Input debugging - forceInputHandshake, - isInputReady, - getInputDebugInfo, - setInputCaptureMode, - // Get streaming state - getStreamingState: () => streamingUIState, - // Queue times - showQueueTimesPage, -}; diff --git a/src/recording.ts b/src/recording.ts deleted file mode 100644 index 2fe7bdd..0000000 --- a/src/recording.ts +++ /dev/null @@ -1,648 +0,0 @@ -// Recording Manager for OpenNow GFN Client -// Optimized to minimize impact on WebRTC streaming performance - -import { invoke } from "@tauri-apps/api/core"; - -export const RECORDING_QUALITY = { - low: 1_500_000, // 1.5 Mbps - minimal impact - medium: 3_000_000, // 3 Mbps - balanced - high: 6_000_000, // 6 Mbps - high quality -} as const; - -export type RecordingQualityType = keyof typeof RECORDING_QUALITY; - -// Codec preference -// VP8 is default - software encoded, won't interfere with H.264 stream decoding -// H.264 causes stuttering because encoding/decoding compete for same GPU hardware -// AV1 works well on RTX 40 series (separate encoder chip) -export type RecordingCodecType = "vp8" | "h264" | "av1"; - -// Recording mode -// canvas = captures from video element (decoupled from WebRTC, no stutter) -// stream = direct MediaStream recording (may cause stutter) -export type RecordingMode = "canvas" | "stream"; - -export interface RecordingState { - isRecording: boolean; - isPaused: boolean; - startTime: number | null; - duration: number; - filename: string | null; -} - -export type RecordingSavedCallback = (filepath: string, isScreenshot: boolean) => void; - -export class RecordingManager { - private mediaRecorder: MediaRecorder | null = null; - private recordedChunks: Blob[] = []; - private stream: MediaStream | null = null; - private clonedStream: MediaStream | null = null; - private videoElement: HTMLVideoElement | null = null; - private gameName = "Unknown"; - private customOutputDir: string | null = null; - private quality: RecordingQualityType = "medium"; - private codecPreference: RecordingCodecType = "vp8"; // VP8 default - no GPU contention - private recordingMode: RecordingMode = "canvas"; // Canvas mode by default - no stutter - private recordingFps = 60; // Match stream FPS for smooth recording - private _isRecording = false; - private _isPaused = false; - private recordingStartTime: number | null = null; - private durationInterval: ReturnType | null = null; - private dvrChunks: Blob[] = []; - private dvrEnabled = false; - private dvrDuration = 60; - private dvrCleanupInterval: ReturnType | null = null; - private onRecordingSaved: RecordingSavedCallback | null = null; - private onStateChange: ((state: RecordingState) => void) | null = null; - - // Canvas-based recording (decoupled from WebRTC pipeline) - private canvas: HTMLCanvasElement | OffscreenCanvas | null = null; - private canvasCtx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D | null = null; - private canvasStream: MediaStream | null = null; - private frameRequestId: number | null = null; - private lastFrameTime = 0; - private frameInterval: number = 0; // ms between frames - - setStream(stream: MediaStream | null) { - this.stream = stream; - // Clean up old cloned stream - if (this.clonedStream) { - this.clonedStream.getTracks().forEach(t => t.stop()); - this.clonedStream = null; - } - } - - setVideoElement(el: HTMLVideoElement | null) { - this.videoElement = el; - } - - setGameName(name: string) { this.gameName = name.replace(/[<>:"/|?*]/g, "_"); } - setOutputDir(dir: string | null) { this.customOutputDir = dir; } - setQuality(quality: RecordingQualityType) { this.quality = quality; } - setCodecPreference(codec: RecordingCodecType) { this.codecPreference = codec; } - getCodecPreference(): RecordingCodecType { return this.codecPreference; } - setRecordingMode(mode: RecordingMode) { this.recordingMode = mode; } - getRecordingMode(): RecordingMode { return this.recordingMode; } - setRecordingFps(fps: number) { this.recordingFps = Math.max(15, Math.min(60, fps)); } - getRecordingFps(): number { return this.recordingFps; } - onSaved(cb: RecordingSavedCallback) { this.onRecordingSaved = cb; } - onStateChanged(cb: (s: RecordingState) => void) { this.onStateChange = cb; } - - getState(): RecordingState { - return { - isRecording: this._isRecording, - isPaused: this._isPaused, - startTime: this.recordingStartTime, - duration: this.recordingStartTime ? Math.floor((Date.now() - this.recordingStartTime) / 1000) : 0, - filename: null, - }; - } - - get isRecording() { return this._isRecording; } - get duration() { return this.recordingStartTime ? Math.floor((Date.now() - this.recordingStartTime) / 1000) : 0; } - formatDuration(s: number) { return Math.floor(s / 60).toString().padStart(2, "0") + ":" + (s % 60).toString().padStart(2, "0"); } - - private genFilename(pre: string, ext: string) { - const ts = new Date().toISOString().replace(/[:.]/g, "-").replace("T", "_").slice(0, 19); - return "OpenNow_" + this.gameName + "_" + pre + ts + "." + ext; - } - - // Get MIME type based on user preference - // VP8 is default - software encoded, won't interfere with stream playback - // H.264 causes stuttering because it competes with stream decoding for GPU - // AV1 works on RTX 40+ (separate encoder chip) - private getMime(): string { - const vp8Codecs = [ - "video/webm;codecs=vp8,opus", - "video/webm;codecs=vp8", - "video/webm", - ]; - - const h264Codecs = [ - "video/webm;codecs=h264,opus", - "video/webm;codecs=h264", - "video/mp4;codecs=h264,aac", - "video/mp4;codecs=avc1.42E01E,mp4a.40.2", - "video/mp4", - ]; - - const av1Codecs = [ - "video/webm;codecs=av1,opus", - "video/mp4;codecs=av01.0.04M.08", - ]; - - // Build codec list based on user preference - let codecs: string[]; - if (this.codecPreference === "av1") { - // AV1 first (RTX 40+), then VP8 fallback - codecs = [...av1Codecs, ...vp8Codecs]; - } else if (this.codecPreference === "h264") { - // H.264 first (may cause stuttering!), then VP8 fallback - codecs = [...h264Codecs, ...vp8Codecs]; - } else { - // VP8 first (default) - software encoded, no GPU contention - codecs = [...vp8Codecs, ...h264Codecs]; - } - - for (const codec of codecs) { - if (MediaRecorder.isTypeSupported(codec)) { - console.log("Recording codec:", codec); - return codec; - } - } - return "video/webm"; - } - - // Get file extension based on mime type - private getFileExtension(): string { - const mime = this.getMime(); - return mime.startsWith("video/mp4") ? "mp4" : "webm"; - } - - // Get stream for recording - canvas mode decouples from WebRTC pipeline - private getRecordingStream(): MediaStream | null { - // Canvas mode: capture from video element (decoupled, no stutter) - if (this.recordingMode === "canvas" && this.videoElement) { - return this.createCanvasStream(); - } - - // Stream mode: clone the MediaStream directly (may cause stutter) - if (!this.stream) return null; - - if (!this.clonedStream) { - try { - this.clonedStream = this.stream.clone(); - } catch { - this.clonedStream = new MediaStream(); - this.stream.getTracks().forEach(track => { - this.clonedStream!.addTrack(track.clone()); - }); - } - } - return this.clonedStream; - } - - // Create a canvas-based stream that captures from the video element - // This completely decouples recording from the WebRTC decode pipeline - private createCanvasStream(): MediaStream | null { - if (!this.videoElement || !this.videoElement.videoWidth) { - console.warn("[Recording] Video element not ready for canvas capture"); - return null; - } - - const width = this.videoElement.videoWidth; - const height = this.videoElement.videoHeight; - - // Use regular canvas for captureStream compatibility - this.canvas = document.createElement("canvas"); - this.canvas.width = width; - this.canvas.height = height; - - // Get context with performance optimizations - this.canvasCtx = this.canvas.getContext("2d", { - alpha: false, - desynchronized: true, // Don't sync with compositor - reduces latency - willReadFrequently: false, // We're writing, not reading - }); - - if (!this.canvasCtx) { - console.error("[Recording] Failed to create canvas context"); - return null; - } - - // Disable image smoothing for faster draws - this.canvasCtx.imageSmoothingEnabled = false; - - // Create stream from canvas - let it capture at native rate - // The FPS limiting happens in our frame loop - this.canvasStream = this.canvas.captureStream(0); // 0 = manual frame capture - - // Add audio track from original stream if available - if (this.stream) { - const audioTracks = this.stream.getAudioTracks(); - audioTracks.forEach(track => { - this.canvasStream!.addTrack(track.clone()); - }); - } - - // Calculate frame interval - this.frameInterval = 1000 / this.recordingFps; - this.lastFrameTime = 0; - - // Start frame capture loop using requestAnimationFrame (smoother than setInterval) - this.startCanvasCapture(); - - console.log(`[Recording] Canvas capture started at ${this.recordingFps}fps, ${width}x${height}`); - return this.canvasStream; - } - - // Capture frames using requestAnimationFrame for smooth, jank-free capture - private startCanvasCapture() { - const captureFrame = (timestamp: number) => { - if (!this.canvasCtx || !this.videoElement || !this.canvas) { - return; // Stop if resources cleaned up - } - - // Throttle to target FPS - const elapsed = timestamp - this.lastFrameTime; - if (elapsed >= this.frameInterval) { - this.lastFrameTime = timestamp - (elapsed % this.frameInterval); - - // Check if video dimensions changed - if (this.canvas.width !== this.videoElement.videoWidth || - this.canvas.height !== this.videoElement.videoHeight) { - this.canvas.width = this.videoElement.videoWidth; - this.canvas.height = this.videoElement.videoHeight; - } - - // Draw current video frame to canvas - this.canvasCtx.drawImage(this.videoElement, 0, 0); - - // Request new frame from canvas stream - const videoTrack = this.canvasStream?.getVideoTracks()[0]; - if (videoTrack && 'requestFrame' in videoTrack) { - (videoTrack as any).requestFrame(); - } - } - - // Continue loop - this.frameRequestId = requestAnimationFrame(captureFrame); - }; - - // Start the loop - this.frameRequestId = requestAnimationFrame(captureFrame); - } - - private stopCanvasCapture() { - if (this.frameRequestId !== null) { - cancelAnimationFrame(this.frameRequestId); - this.frameRequestId = null; - } - if (this.canvasStream) { - this.canvasStream.getTracks().forEach(t => t.stop()); - this.canvasStream = null; - } - this.canvas = null; - this.canvasCtx = null; - this.lastFrameTime = 0; - } - - async startRecording(): Promise { - if (this._isRecording) return false; - - const recordingStream = this.getRecordingStream(); - if (!recordingStream) return false; - - // Try codecs in order based on user preference - const codecsToTry = this.getCodecPriorityList(); - let selectedMime: string | null = null; - - for (const mime of codecsToTry) { - try { - // Test if MediaRecorder can actually be created with this codec - const testRecorder = new MediaRecorder(recordingStream, { - mimeType: mime, - videoBitsPerSecond: RECORDING_QUALITY[this.quality], - }); - testRecorder.stop(); - selectedMime = mime; - console.log("[Recording] Successfully initialized with codec:", mime); - break; - } catch (e) { - console.warn(`[Recording] Codec ${mime} failed:`, e); - // Continue to next codec - } - } - - if (!selectedMime) { - console.error("[Recording] No working codec found"); - return false; - } - - try { - this.mediaRecorder = new MediaRecorder(recordingStream, { - mimeType: selectedMime, - videoBitsPerSecond: RECORDING_QUALITY[this.quality], - }); - - this.recordedChunks = []; - - this.mediaRecorder.ondataavailable = e => { - if (e.data.size > 0) this.recordedChunks.push(e.data); - }; - - this.mediaRecorder.onstop = () => this.saveRecording(); - - // Use 5 second timeslice to reduce encoder pressure - // Shorter timeslices cause more frequent encoding flushes which stutter playback - this.mediaRecorder.start(5000); - - this._isRecording = true; - this.recordingStartTime = Date.now(); - this.durationInterval = setInterval(() => this.notifyStateChange(), 1000); - this.notifyStateChange(); - return true; - } catch (e) { - console.error("Failed to start recording:", e); - return false; - } - } - - // Get list of codecs to try in priority order based on user preference - private getCodecPriorityList(): string[] { - const vp8Codecs = [ - "video/webm;codecs=vp8,opus", - "video/webm;codecs=vp8", - "video/webm", - ]; - - const h264Codecs = [ - "video/webm;codecs=h264,opus", - "video/webm;codecs=h264", - "video/mp4;codecs=avc1.42E01E,mp4a.40.2", - ]; - - const av1Codecs = [ - "video/webm;codecs=av1,opus", - "video/mp4;codecs=av01.0.04M.08", - ]; - - let codecs: string[]; - if (this.codecPreference === "av1") { - codecs = [...av1Codecs, ...vp8Codecs]; - } else if (this.codecPreference === "h264") { - codecs = [...h264Codecs, ...vp8Codecs]; - } else { - // VP8 default - codecs = [...vp8Codecs, ...h264Codecs]; - } - - return codecs.filter(mime => MediaRecorder.isTypeSupported(mime)); - } - - async stopRecording(): Promise { - if (!this._isRecording || !this.mediaRecorder) return false; - - this.mediaRecorder.stop(); - this._isRecording = false; - - // Stop canvas capture if active - this.stopCanvasCapture(); - - if (this.durationInterval) { - clearInterval(this.durationInterval); - this.durationInterval = null; - } - - this.notifyStateChange(); - return true; - } - - async toggleRecording() { - return this._isRecording ? this.stopRecording() : this.startRecording(); - } - - private async saveRecording() { - if (!this.recordedChunks.length) return; - - const mimeType = this.getMime(); - const ext = this.getFileExtension(); - const blob = new Blob(this.recordedChunks, { type: mimeType }); - - // Use requestIdleCallback to defer heavy work, or setTimeout as fallback - const deferredSave = async () => { - const data = Array.from(new Uint8Array(await blob.arrayBuffer())); - const fp = await invoke("save_recording", { - data, - filename: this.genFilename("", ext), - customDir: this.customOutputDir - }); - this.recordedChunks = []; - this.recordingStartTime = null; - if (this.onRecordingSaved) this.onRecordingSaved(fp, false); - }; - - if ('requestIdleCallback' in window) { - (window as any).requestIdleCallback(deferredSave, { timeout: 5000 }); - } else { - setTimeout(deferredSave, 100); - } - } - - async takeScreenshot(vid: HTMLVideoElement): Promise { - if (!vid || !vid.videoWidth) return false; - - // Use OffscreenCanvas if available for better performance - let canvas: HTMLCanvasElement | OffscreenCanvas; - let ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D | null; - - if (typeof OffscreenCanvas !== 'undefined') { - canvas = new OffscreenCanvas(vid.videoWidth, vid.videoHeight); - ctx = canvas.getContext('2d'); - } else { - canvas = document.createElement("canvas"); - canvas.width = vid.videoWidth; - canvas.height = vid.videoHeight; - ctx = canvas.getContext("2d"); - } - - if (!ctx) return false; - ctx.drawImage(vid, 0, 0); - - let blob: Blob | null; - if (canvas instanceof OffscreenCanvas) { - blob = await canvas.convertToBlob({ type: "image/png" }); - } else { - blob = await new Promise(r => canvas.toBlob(r, "image/png")); - } - - if (!blob) return false; - - // Defer to avoid blocking - const data = Array.from(new Uint8Array(await blob.arrayBuffer())); - const fp = await invoke("save_screenshot", { - data, - filename: this.genFilename("", "png"), - customDir: this.customOutputDir - }); - - if (this.onRecordingSaved) this.onRecordingSaved(fp, true); - return true; - } - - enableInstantReplay(dur = 60): boolean { - if (this.dvrEnabled) return false; - - const recordingStream = this.getRecordingStream(); - if (!recordingStream) return false; - - this.dvrDuration = dur; - this.dvrChunks = []; - - // If already recording, share the chunks instead of creating another recorder - if (this._isRecording && this.mediaRecorder) { - // Just enable DVR mode - we'll use the main recorder's chunks - this.dvrEnabled = true; - return true; - } - - // Create a dedicated DVR recorder with lower quality for less impact - try { - const dvrRecorder = new MediaRecorder(recordingStream, { - mimeType: this.getMime(), - videoBitsPerSecond: RECORDING_QUALITY.low, // Use low quality for DVR to reduce impact - }); - - dvrRecorder.ondataavailable = e => { - if (e.data.size > 0) this.dvrChunks.push(e.data); - }; - - // Use 5 second chunks for DVR too - dvrRecorder.start(5000); - - // Cleanup old chunks periodically - check every 5 seconds - this.dvrCleanupInterval = setInterval(() => { - // Each chunk is ~5 seconds, so keep (duration/5) chunks - const maxChunks = Math.ceil(this.dvrDuration / 5); - while (this.dvrChunks.length > maxChunks) { - this.dvrChunks.shift(); - } - }, 5000); - - this.dvrEnabled = true; - // Store recorder reference for cleanup - (this as any)._dvrRecorder = dvrRecorder; - return true; - } catch (e) { - console.error("Failed to enable instant replay:", e); - return false; - } - } - - disableInstantReplay() { - if (!this.dvrEnabled) return; - - const dvrRecorder = (this as any)._dvrRecorder as MediaRecorder | undefined; - if (dvrRecorder && dvrRecorder.state !== "inactive") { - dvrRecorder.stop(); - } - (this as any)._dvrRecorder = null; - - if (this.dvrCleanupInterval) { - clearInterval(this.dvrCleanupInterval); - this.dvrCleanupInterval = null; - } - - this.dvrChunks = []; - this.dvrEnabled = false; - } - - get isInstantReplayEnabled() { return this.dvrEnabled; } - - async saveInstantReplay(): Promise { - if (!this.dvrEnabled) return false; - - // If we're sharing with main recorder, use those chunks - const chunks = this.dvrChunks.length > 0 ? this.dvrChunks : this.recordedChunks; - if (!chunks.length) return false; - - const mimeType = this.getMime(); - const ext = this.getFileExtension(); - const blob = new Blob([...chunks], { type: mimeType }); - - // Defer heavy work - const deferredSave = async () => { - const data = Array.from(new Uint8Array(await blob.arrayBuffer())); - const fp = await invoke("save_recording", { - data, - filename: this.genFilename("Replay_", ext), - customDir: this.customOutputDir - }); - if (this.onRecordingSaved) this.onRecordingSaved(fp, false); - }; - - if ('requestIdleCallback' in window) { - (window as any).requestIdleCallback(deferredSave, { timeout: 5000 }); - } else { - setTimeout(deferredSave, 100); - } - - return true; - } - - private notifyStateChange() { - if (this.onStateChange) this.onStateChange(this.getState()); - } - - // Expose the current codec for UI display - getCurrentCodec(): string { - return this.getMime(); - } - - dispose() { - this.stopRecording(); - this.disableInstantReplay(); - this.stopCanvasCapture(); - - // Clean up cloned stream - if (this.clonedStream) { - this.clonedStream.getTracks().forEach(t => t.stop()); - this.clonedStream = null; - } - - this.stream = null; - this.videoElement = null; - } -} - -let inst: RecordingManager | null = null; -export function getRecordingManager() { - if (!inst) inst = new RecordingManager(); - return inst; -} - -export async function openRecordingsFolder(d?: string) { - await invoke("open_recordings_folder", { customDir: d || null }); -} - -export async function getRecordingsDir(d?: string) { - return invoke("get_recordings_dir", { customDir: d || null }); -} - -// Test all codecs and return support status -export interface CodecSupport { - codec: string; - supported: boolean; - description: string; - hwAccelerated: boolean; -} - -export function testCodecSupport(): CodecSupport[] { - const codecs = [ - // AV1 - best compression, modern GPUs (RTX 40, Intel Arc, AMD RX 7000) - { codec: "video/webm;codecs=av1,opus", description: "AV1 + Opus (WebM) - Best Quality", hwAccelerated: true }, - { codec: "video/mp4;codecs=av01.0.04M.08", description: "AV1 (MP4)", hwAccelerated: true }, - // H.264 - widely supported, hardware accelerated - { codec: "video/webm;codecs=h264,opus", description: "H.264 + Opus (WebM) - Best Compatibility", hwAccelerated: true }, - { codec: "video/webm;codecs=h264", description: "H.264 (WebM)", hwAccelerated: true }, - { codec: "video/mp4;codecs=h264,aac", description: "H.264 + AAC (MP4)", hwAccelerated: true }, - { codec: "video/mp4;codecs=avc1.42E01E,mp4a.40.2", description: "H.264 Baseline (MP4)", hwAccelerated: true }, - { codec: "video/mp4", description: "MP4 (generic)", hwAccelerated: true }, - // VP9/VP8 - software encoded fallbacks - { codec: "video/webm;codecs=vp9,opus", description: "VP9 + Opus (WebM)", hwAccelerated: false }, - { codec: "video/webm;codecs=vp9", description: "VP9 (WebM)", hwAccelerated: false }, - { codec: "video/webm;codecs=vp8,opus", description: "VP8 + Opus (WebM)", hwAccelerated: false }, - { codec: "video/webm;codecs=vp8", description: "VP8 (WebM)", hwAccelerated: false }, - { codec: "video/webm", description: "WebM (generic)", hwAccelerated: false }, - ]; - - return codecs.map(c => ({ - ...c, - supported: MediaRecorder.isTypeSupported(c.codec), - })); -} - -// Get the currently selected codec -export function getCurrentCodec(): string { - return getRecordingManager().getCurrentCodec(); -} diff --git a/src/streaming.ts b/src/streaming.ts deleted file mode 100644 index 11a170c..0000000 --- a/src/streaming.ts +++ /dev/null @@ -1,3354 +0,0 @@ -// GFN WebRTC Streaming Implementation -// Based on analysis of official GFN browser client (WebSocket signaling + WebRTC) -// Reference: geronimo.log analysis showing wssignaling:1, WebRTC transport - -import { invoke } from "@tauri-apps/api/core"; - -// Extend Document interface for vendor-prefixed fullscreen APIs -interface FullscreenDocument extends Document { - webkitFullscreenElement?: Element; - mozFullScreenElement?: Element; - msFullscreenElement?: Element; -} - -// Video frame callback metadata (for requestVideoFrameCallback) -interface VideoFrameMetadata { - droppedVideoFrames?: number; - presentedFrames?: number; - presentationTime?: number; -} - -// Types -interface WebRtcConfig { - sessionId: string; - signalingUrl: string; - iceServers: IceServerConfig[]; - videoCodec: string; - audioCodec: string; - maxBitrateKbps: number; - // Media connection info from session API (usage=2 or usage=17) - // Contains the real UDP port for streaming, instead of the dummy port 47998 in SDP - mediaConnectionInfo?: MediaConnectionInfo; -} - -interface MediaConnectionInfo { - ip: string; - port: number; -} - -interface IceServerConfig { - urls: string[]; - username?: string; - credential?: string; -} - -interface StreamConnectionInfo { - controlIp: string; - controlPort: number; - streamIp: string | null; - streamPort: number; - resourcePath: string; -} - -interface StreamingConnectionState { - sessionId: string; - phase: string; - serverIp: string | null; - signalingUrl: string | null; - connectionInfo: StreamConnectionInfo | null; - gpuType: string | null; - error: string | null; -} - -// NVST Signaling Message Types (based on official client analysis) -interface NvstSignalingMessage { - type: string; - payload?: unknown; - timestamp?: number; - sequence?: number; -} - -interface NvstAuthMessage { - type: "auth"; - payload: { - token: string; - clientType: string; - clientVersion: string; - capabilities: string[]; - }; -} - -interface NvstOfferMessage { - type: "offer"; - payload: { - sdp: string; - sessionId: string; - }; -} - -interface NvstAnswerMessage { - type: "answer"; - payload: { - sdp: string; - }; -} - -interface NvstIceCandidateMessage { - type: "ice-candidate"; - payload: { - candidate: string; - sdpMid: string | null; - sdpMLineIndex: number | null; - }; -} - -// Streaming state -export interface StreamingState { - connected: boolean; - peerConnection: RTCPeerConnection | null; - dataChannels: Map; - videoElement: HTMLVideoElement | null; - audioContext: AudioContext | null; - signalingSocket: WebSocket | null; - sessionId: string | null; - stats: StreamingStats | null; - retryCount: number; - maxRetries: number; - inputDebugLogged?: Set; - liveEdgeIntervalId?: ReturnType; -} - -export interface StreamingStats { - fps: number; - latency_ms: number; - bitrate_kbps: number; - packet_loss: number; - resolution: string; - codec: string; -} - -// Global streaming state -let streamingState: StreamingState = { - connected: false, - peerConnection: null, - dataChannels: new Map(), - videoElement: null, - audioContext: null, - signalingSocket: null, - sessionId: null, - stats: null, - retryCount: 0, - maxRetries: 3, -}; - -// Signaling sequence counter -let signalingSeq = 0; - -// Bitrate tracking for real-time calculation -let lastBytesReceived = 0; -let lastBytesTimestamp = 0; - -/** - * Parse nvstSdp to extract TURN server credentials and ICE transport policy - * - * nvstSdp is NVIDIA's custom SDP-like format that contains streaming configuration. - * TURN info is in format: a=general.turnInfo:urls,username,credential|urls2,username2,credential2 - * ICE policy is in format: a=general.iceTransportPolicy:0 (all) or 1 (relay) - */ -interface ParsedNvstTurnInfo { - turnServers: IceServerConfig[]; - iceTransportPolicy: RTCIceTransportPolicy; -} - -function parseNvstSdpTurnInfo(nvstSdp: string | undefined): ParsedNvstTurnInfo { - const result: ParsedNvstTurnInfo = { - turnServers: [], - iceTransportPolicy: "all", - }; - - if (!nvstSdp) { - // No nvstSdp provided - return result; - } - - // Parse TURN info: a=general.turnInfo:urls,username,credential|... - const turnInfoMatch = nvstSdp.match(/a=general\.turnInfo:(.+)/); - if (turnInfoMatch) { - const turnInfoStr = turnInfoMatch[1].trim(); - const turnEntries = turnInfoStr.split("|"); - for (const entry of turnEntries) { - const parts = entry.split(",").map(p => p.trim()); - if (parts.length >= 3) { - const [urls, username, credential] = parts; - if (urls && username && credential) { - result.turnServers.push({ - urls: [urls], - username, - credential, - }); - } - } - } - } - - // Parse ICE transport policy: a=general.iceTransportPolicy:0 or 1 - const policyMatch = nvstSdp.match(/a=general\.iceTransportPolicy:(\d+)/); - if (policyMatch) { - const policyValue = parseInt(policyMatch[1], 10); - result.iceTransportPolicy = policyValue === 1 ? "relay" : "all"; - } - - return result; -} - -/** - * Initialize streaming with the given connection info - * - * GFN Browser Signaling Protocol (discovered from play.geforcenow.com): - * - URL: wss://{stream_ip}/nvst/sign_in?peer_id=peer-{random}&version=2 - * - Auth: WebSocket subprotocol x-nv-sessionid.{session_id} - * - Protocol: JSON peer messaging with ackid, peer_info, peer_msg - */ -export interface StreamingOptions { - resolution: string; // "2560x1440" format - fps: number; -} - -export async function initializeStreaming( - connectionState: StreamingConnectionState, - accessToken: string, - videoContainer: HTMLElement, - options?: StreamingOptions -): Promise { - if (!connectionState.connectionInfo) { - throw new Error("No connection info available"); - } - - // Reset shared media stream to avoid leftover audio tracks - sharedMediaStream = null; - - streamingState.sessionId = connectionState.sessionId; - streamingState.retryCount = 0; - - // Create video element - const videoEl = createVideoElement(); - videoContainer.appendChild(videoEl); - streamingState.videoElement = videoEl; - - // Create audio context for advanced audio handling - try { - streamingState.audioContext = new AudioContext(); - } catch (e) { - console.warn("Failed to create AudioContext:", e); - } - - // Get WebRTC config from backend - const webrtcConfig = await invoke("get_webrtc_config", { - sessionId: connectionState.sessionId, - signalingUrlOverride: connectionState.signalingUrl, - }); - - // Extract stream IP from signaling_url - let streamIp: string | null = null; - - if (connectionState.signalingUrl) { - try { - const urlMatch = connectionState.signalingUrl.match(/(?:rtsps?|wss?):\/\/([^:/]+)/); - if (urlMatch && urlMatch[1]) { - streamIp = urlMatch[1]; - } - } catch (e) { - console.warn("Failed to parse signaling_url:", e); - } - } - - // Fallback to other sources if signalingUrl parsing failed - if (!streamIp) { - streamIp = connectionState.connectionInfo.streamIp || - connectionState.connectionInfo.controlIp || - connectionState.serverIp; - } - - if (!streamIp) { - throw new Error("No stream server IP available"); - } - - const sessionId = connectionState.sessionId; - - // Parse resolution from options or use defaults - let streamWidth = window.screen.width; - let streamHeight = window.screen.height; - if (options?.resolution) { - const [w, h] = options.resolution.split('x').map(Number); - if (w && h) { - streamWidth = w; - streamHeight = h; - } - } - - // Parse FPS from options or use default - let streamFps = 60; - if (options?.fps && options.fps > 0) { - streamFps = options.fps; - } - - console.log(`Starting stream: ${streamWidth}x${streamHeight}@${streamFps}fps`); - - // Connect using the official GFN browser protocol - await connectGfnBrowserSignaling(streamIp, sessionId, webrtcConfig, streamWidth, streamHeight, streamFps); -} - -// GFN Browser Peer Protocol types -interface GfnPeerInfo { - browser: string; - browserVersion: string; - connected: boolean; - id: number; - name: string; - peer_role: number; - resolution: string; - version: number; -} - -interface GfnPeerMessage { - ackid?: number; - peer_info?: GfnPeerInfo; - peer_msg?: { - from: number; - to: number; - msg: string; - }; - hb?: number; -} - -// Peer connection state for GFN protocol -let gfnPeerId = 2; // Client is always peer 2, server is peer 1 -let gfnAckId = 0; -let heartbeatInterval: ReturnType | null = null; -let isReconnect = false; // Track if this is a reconnection attempt - -/** - * Log detailed ICE debugging information - */ -async function logIceDebugInfo(pc: RTCPeerConnection): Promise { - try { - const stats = await pc.getStats(); - console.log("=== ICE Debug Info ==="); - - // Log all candidate pairs - stats.forEach(report => { - if (report.type === "candidate-pair") { - console.log(`Candidate pair [${report.id}]:`); - console.log(` State: ${report.state}`); - console.log(` Nominated: ${report.nominated}`); - console.log(` Priority: ${report.priority}`); - console.log(` Local: ${report.localCandidateId}`); - console.log(` Remote: ${report.remoteCandidateId}`); - if (report.currentRoundTripTime) { - console.log(` RTT: ${report.currentRoundTripTime * 1000}ms`); - } - if (report.requestsSent !== undefined) { - console.log(` Requests sent: ${report.requestsSent}`); - } - if (report.responsesReceived !== undefined) { - console.log(` Responses received: ${report.responsesReceived}`); - } - } - }); - - // Log local candidates - console.log("--- Local candidates ---"); - stats.forEach(report => { - if (report.type === "local-candidate") { - console.log(` ${report.candidateType}: ${report.address}:${report.port} (${report.protocol})`); - } - }); - - // Log remote candidates - console.log("--- Remote candidates ---"); - stats.forEach(report => { - if (report.type === "remote-candidate") { - console.log(` ${report.candidateType}: ${report.address}:${report.port} (${report.protocol})`); - } - }); - - console.log("=== End ICE Debug ==="); - } catch (e) { - console.warn("Failed to get ICE debug info:", e); - } -} - -/** - * Connect using the official GFN browser signaling protocol - * - * Protocol based on network capture from play.geforcenow.com: - * - URL: wss://{server}/nvst/sign_in?peer_id=peer-{random}&version=2 - * - Auth: WebSocket subprotocol x-nv-sessionid.{session_id} - * - Messages: JSON with ackid, peer_info, peer_msg fields - */ -async function connectGfnBrowserSignaling( - serverIp: string, - sessionId: string, - config: WebRtcConfig, - requestedWidth: number, - requestedHeight: number, - requestedFps: number -): Promise { - return new Promise((resolve, reject) => { - // Generate random peer ID suffix (matching GFN browser format) - const randomPeerId = Math.floor(Math.random() * 10000000000); - const peerName = `peer-${randomPeerId}`; - - // Build signaling URL - exact format from GFN browser - // First connection is normal, reconnections add &reconnect=1 - let signalingUrl = `wss://${serverIp}/nvst/sign_in?peer_id=${peerName}&version=2`; - if (isReconnect) { - signalingUrl += "&reconnect=1"; - } - - // Auth via WebSocket subprotocol: x-nv-sessionid.{session_id} - const subprotocol = `x-nv-sessionid.${sessionId}`; - - let ws: WebSocket; - try { - ws = new WebSocket(signalingUrl, [subprotocol]); - } catch (e) { - console.error("Failed to create WebSocket:", e); - reject(new Error(`WebSocket creation failed: ${e}`)); - return; - } - - ws.binaryType = "arraybuffer"; - streamingState.signalingSocket = ws; - gfnAckId = 0; - - let resolved = false; - - const connectionTimeout = setTimeout(() => { - if (!resolved) { - ws.close(); - reject(new Error("GFN signaling connection timeout")); - } - }, 15000); - - ws.onopen = () => { - console.log("Signaling connected"); - - // Mark for reconnect on future attempts - isReconnect = true; - - // Send peer_info immediately after connection - const peerInfo: GfnPeerMessage = { - ackid: ++gfnAckId, - peer_info: { - browser: "Chrome", - browserVersion: navigator.userAgent.match(/Chrome\/(\d+)/)?.[1] || "131", - connected: true, - id: gfnPeerId, - name: peerName, - peer_role: 0, // 0 = client - resolution: `${requestedWidth}x${requestedHeight}`, - version: 2 - } - }; - - ws.send(JSON.stringify(peerInfo)); - - // Start heartbeat - heartbeatInterval = setInterval(() => { - if (ws.readyState === WebSocket.OPEN) { - ws.send(JSON.stringify({ hb: 1 })); - } - }, 5000); - }; - - ws.onmessage = async (event) => { - const messageText = typeof event.data === "string" - ? event.data - : new TextDecoder().decode(event.data); - - try { - const message: GfnPeerMessage & { ack?: number } = JSON.parse(messageText); - - // CRITICAL: Send ack for any message with ackid (except our own echoes) - if (message.ackid !== undefined) { - // Don't ack our own peer_info echo (same id as us) - const isOurEcho = message.peer_info?.id === gfnPeerId; - if (!isOurEcho) { - ws.send(JSON.stringify({ ack: message.ackid })); - } - } - - // Handle heartbeat - respond with heartbeat - if (message.hb !== undefined) { - if (ws.readyState === WebSocket.OPEN) { - ws.send(JSON.stringify({ hb: 1 })); - } - return; - } - - // Handle ack responses to our messages - if (message.ack !== undefined) { - return; - } - - // Handle server peer_info - if (message.peer_info) { - return; - } - - // Handle peer messages (SDP offer, ICE candidates, etc.) - if (message.peer_msg) { - const peerMsg = message.peer_msg; - - try { - const innerMsg = JSON.parse(peerMsg.msg); - - if (innerMsg.type === "offer") { - // Mark as resolved BEFORE processing - WebSocket may close during setup - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - } - - // Parse nvstSdp for TURN server credentials - const nvstTurnInfo = parseNvstSdpTurnInfo(innerMsg.nvstSdp); - - // Handle the SDP offer and create answer - handleGfnSdpOffer(innerMsg.sdp, ws, config, serverIp, requestedWidth, requestedHeight, requestedFps, nvstTurnInfo) - .then(() => { - resolve(); - }) - .catch((e) => { - console.error("Failed to handle SDP offer:", e); - reject(e); - }); - } else if (innerMsg.candidate !== undefined) { - // ICE candidate from server (trickle ICE) - if (streamingState.peerConnection && innerMsg.candidate) { - try { - await streamingState.peerConnection.addIceCandidate( - new RTCIceCandidate({ - candidate: innerMsg.candidate, - sdpMid: innerMsg.sdpMid, - sdpMLineIndex: innerMsg.sdpMLineIndex - }) - ); - } catch (e) { - console.warn("Failed to add ICE candidate:", e); - } - } - } else if (innerMsg.type === "candidate") { - // Alternative ICE candidate format - if (streamingState.peerConnection && innerMsg.candidate) { - try { - await streamingState.peerConnection.addIceCandidate( - new RTCIceCandidate({ - candidate: innerMsg.candidate, - sdpMid: innerMsg.sdpMid || "0", - sdpMLineIndex: innerMsg.sdpMLineIndex ?? 0 - }) - ); - } catch (e) { - console.warn("Failed to add ICE candidate:", e); - } - } - } else { - // Log any unhandled peer_msg types for debugging - console.log("Unhandled peer_msg inner type:", JSON.stringify(innerMsg).substring(0, 300)); - } - } catch (parseError) { - console.log("peer_msg content is not JSON:", peerMsg.msg.substring(0, 100)); - } - } - - } catch (e) { - console.warn("Failed to parse GFN message:", e); - } - }; - - ws.onerror = (error) => { - console.error("GFN WebSocket error:", error); - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - if (heartbeatInterval) { - clearInterval(heartbeatInterval); - heartbeatInterval = null; - } - reject(new Error("GFN signaling connection failed")); - } - }; - - ws.onclose = (event) => { - if (event.code !== 1000) { - console.log("Signaling closed:", event.code); - } - if (heartbeatInterval) { - clearInterval(heartbeatInterval); - heartbeatInterval = null; - } - - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - reject(new Error(`GFN signaling closed: ${event.code} ${event.reason}`)); - } - }; - }); -} - -/** - * Handle SDP offer from GFN server and send answer - * Note: Server's ICE candidate will come via trickle ICE, not manually constructed - */ -async function handleGfnSdpOffer( - serverSdp: string, - ws: WebSocket, - config: WebRtcConfig, - serverIp: string, - requestedWidth: number, - requestedHeight: number, - requestedFps: number, - nvstTurnInfo?: ParsedNvstTurnInfo -): Promise { - console.log("Setting up WebRTC connection"); - - // Merge ICE servers: config servers + TURN servers from nvstSdp - const allIceServers: RTCIceServer[] = [ - ...config.iceServers.map((s) => ({ - urls: s.urls, - username: s.username, - credential: s.credential, - })), - ]; - - // Add TURN servers from nvstSdp (these have credentials specific to this session) - if (nvstTurnInfo && nvstTurnInfo.turnServers.length > 0) { - for (const turn of nvstTurnInfo.turnServers) { - allIceServers.push({ - urls: turn.urls, - username: turn.username, - credential: turn.credential, - }); - } - } - - // Determine ICE transport policy - const iceTransportPolicy = nvstTurnInfo?.iceTransportPolicy || "all"; - - // Create RTCPeerConnection with proper configuration - // Settings based on official GFN browser client analysis - const pc = new RTCPeerConnection({ - iceServers: allIceServers, - bundlePolicy: "max-bundle", // Bundle all media over single transport - rtcpMuxPolicy: "require", // Multiplex RTP and RTCP - iceCandidatePoolSize: 2, // Official client uses 2 - iceTransportPolicy, // Use policy from server if specified - } as RTCConfiguration); - - streamingState.peerConnection = pc; - - // Set up event handlers - pc.ontrack = handleTrack; - - pc.onicecandidate = (event) => { - if (event.candidate) { - // Send ICE candidate to server using GFN peer protocol - const candidateMsg: GfnPeerMessage = { - peer_msg: { - from: gfnPeerId, // 2 = client - to: 1, // 1 = server - msg: JSON.stringify({ - candidate: event.candidate.candidate, - sdpMid: event.candidate.sdpMid, - sdpMLineIndex: event.candidate.sdpMLineIndex - }) - }, - ackid: ++gfnAckId - }; - - if (ws.readyState === WebSocket.OPEN) { - ws.send(JSON.stringify(candidateMsg)); - } - } - }; - - pc.oniceconnectionstatechange = () => { - if (pc.iceConnectionState === "connected") { - console.log("ICE connected"); - } else if (pc.iceConnectionState === "failed") { - console.error("ICE connection failed!"); - logIceDebugInfo(pc); - } else if (pc.iceConnectionState === "disconnected") { - console.warn("ICE disconnected"); - logIceDebugInfo(pc); - } - }; - - pc.onconnectionstatechange = () => { - if (pc.connectionState === "connected") { - streamingState.connected = true; - console.log("WebRTC connected"); - startStatsCollection(); - } else if (pc.connectionState === "failed") { - console.error("WebRTC connection failed"); - streamingState.connected = false; - } else if (pc.connectionState === "disconnected") { - console.warn("WebRTC disconnected"); - streamingState.connected = false; - } - }; - - // Set up handler for server-created data channels (control_channel, etc.) - pc.ondatachannel = (event) => { - const channel = event.channel; - channel.binaryType = "arraybuffer"; - - channel.onopen = () => { - streamingState.dataChannels.set(channel.label, channel); - - // Also store with normalized names for easier lookup - const lowerLabel = channel.label.toLowerCase(); - if (lowerLabel.includes("input") || lowerLabel.includes("ri_") || lowerLabel === "input_1") { - streamingState.dataChannels.set("server_input", channel); - if (!streamingState.dataChannels.has("input") || !inputHandshakeComplete) { - streamingState.dataChannels.set("input", channel); - } - } - if (lowerLabel.includes("control") || lowerLabel.includes("cc_")) { - streamingState.dataChannels.set("control", channel); - } - }; - - channel.onmessage = (e) => { - // Handle binary data (most common during streaming) - if (e.data instanceof ArrayBuffer && e.data.byteLength > 0) { - const bytes = new Uint8Array(e.data); - - // Try to decode as JSON (control messages) - try { - const text = new TextDecoder().decode(e.data); - if (text.startsWith('{') || text.startsWith('[')) { - const json = JSON.parse(text); - // Only log important messages - if (json.inputReady !== undefined) { - console.log("Input ready message:", json.inputReady); - } - } - } catch { - // Binary data - check for handshake on server input channel - if (bytes.length === 4 && bytes[0] === 0x0e) { - console.log("Server input handshake detected on", channel.label); - const response = new Uint8Array([bytes[0], bytes[1], bytes[2], bytes[3]]); - try { - channel.send(response.buffer); - console.log("Server input handshake complete"); - inputHandshakeComplete = true; - streamStartTime = Date.now(); - streamingState.dataChannels.set("input", channel); - } catch (err) { - console.error("Failed to send server input handshake:", err); - } - } - } - } - }; - - channel.onerror = (e) => console.error(`Data channel '${channel.label}' error:`, e); - channel.onclose = () => console.log(`Data channel '${channel.label}' closed`); - }; - - // === CRITICAL: Create input channel BEFORE SDP negotiation (per official GFN client) === - // The official NVIDIA GFN web client creates data channels during RTCPeerConnection setup, - // BEFORE calling setRemoteDescription. This ensures the server recognizes the channel - // and sends the input handshake message when the SCTP connection is established. - // - // From vendor.08340f0978ba62aa.js analysis: - // const Wt = {ordered: true, reliable: true}; - // this.cc = this.pc.createDataChannel("input_channel_v1", Wt); - // this.cc.binaryType = "arraybuffer"; - // // ... then later setRemoteDescription is called - console.log("Creating input_channel_v1 BEFORE SDP negotiation (per official GFN client)..."); - const inputChannel = pc.createDataChannel("input_channel_v1", { - ordered: false, // Unordered for lowest latency (mouse deltas don't need ordering) - maxRetransmits: 0, // No retransmits - if packet lost, next one will have updated position - }); - inputChannel.binaryType = "arraybuffer"; - - // Set up input channel handlers - inputChannel.onopen = () => { - console.log("=== INPUT CHANNEL OPENED ==="); - console.log(" Label:", inputChannel.label); - console.log(" ID:", inputChannel.id); - console.log(" ReadyState:", inputChannel.readyState); - streamingState.dataChannels.set("input_channel_v1", inputChannel); - streamingState.dataChannels.set("input", inputChannel); - console.log(" Waiting for server handshake message..."); - }; - - inputChannel.onmessage = (e) => { - const size = e.data instanceof ArrayBuffer ? e.data.byteLength : 0; - console.log("=== INPUT CHANNEL MESSAGE ==="); - console.log(" Size:", size, "bytes"); - - if (e.data instanceof ArrayBuffer && size > 0) { - const bytes = new Uint8Array(e.data); - const view = new DataView(e.data); - console.log(" Bytes:", Array.from(bytes.slice(0, 16)).map(b => b.toString(16).padStart(2, '0')).join(' ')); - - // Check for version handshake (per GFN protocol) - if (!inputHandshakeComplete && size >= 2) { - const firstWord = view.getUint16(0, true); // Little endian - - if (firstWord === 526) { - // New protocol format: 0x020E (526 LE) followed by version - const version = size >= 4 ? view.getUint16(2, true) : 0; - console.log(` *** HANDSHAKE: New format (0x020E), version=${version}`); - inputProtocolVersion = version; - - // CRITICAL: Send handshake response back to server - // Echo the received bytes to acknowledge the handshake - try { - const response = new Uint8Array(bytes.slice(0, size)); - inputChannel.send(response.buffer); - console.log(" *** HANDSHAKE RESPONSE SENT:", Array.from(response).map(b => b.toString(16).padStart(2, '0')).join(' ')); - } catch (err) { - console.error(" Failed to send handshake response:", err); - } - - inputHandshakeComplete = true; - inputHandshakeAttempts++; - streamStartTime = Date.now(); - console.log(" *** INPUT HANDSHAKE COMPLETE! Ready for input events."); - } else { - // Old format: first word is the version directly - console.log(` *** HANDSHAKE: Old format, version=${firstWord}`); - inputProtocolVersion = firstWord; - - // CRITICAL: Send handshake response back to server - try { - const response = new Uint8Array(bytes.slice(0, size)); - inputChannel.send(response.buffer); - console.log(" *** HANDSHAKE RESPONSE SENT:", Array.from(response).map(b => b.toString(16).padStart(2, '0')).join(' ')); - } catch (err) { - console.error(" Failed to send handshake response:", err); - } - - inputHandshakeComplete = true; - inputHandshakeAttempts++; - streamStartTime = Date.now(); - console.log(" *** INPUT HANDSHAKE COMPLETE! Ready for input events."); - } - } else { - // Post-handshake message (ACK, etc.) - console.log(" Post-handshake message received, size:", size); - } - } - }; - - inputChannel.onerror = (e) => console.error("Input channel error:", e); - inputChannel.onclose = () => { - streamingState.dataChannels.delete("input"); - streamingState.dataChannels.delete("input_channel_v1"); - }; - - // Rewrite SDP to replace internal IPs with public IP from signaling URL - let modifiedSdp = serverSdp; - - // Extract public IP from serverIp hostname (e.g., "95-178-87-234.zai..." -> "95.178.87.234") - const publicIpMatch = serverIp.match(/^(\d+-\d+-\d+-\d+)\./); - if (publicIpMatch) { - const publicIp = publicIpMatch[1].replace(/-/g, "."); - - // Find and replace private IPs (10.x.x.x, 172.16-31.x.x, 192.168.x.x) in ICE candidates. - // The 172.x range uses non-capturing groups (?:...) for the octet alternatives so the - // entire private IP is captured as a single group without shifting outer capture indices. - const privateIpPattern = /a=candidate:(\d+)\s+(\d+)\s+udp\s+(\d+)\s+(10\.\d+\.\d+\.\d+|172\.(?:1[6-9]|2[0-9]|3[0-1])\.\d+\.\d+|192\.168\.\d+\.\d+)\s+(\d+)\s+typ\s+host/g; - - modifiedSdp = modifiedSdp.replace(privateIpPattern, (match, foundation, component, priority, _privateIp, port) => { - return `a=candidate:${foundation} ${component} udp ${priority} ${publicIp} ${port} typ host`; - }); - } - - // Set remote description (server's SDP offer) - const remoteDesc = new RTCSessionDescription({ - type: "offer", - sdp: modifiedSdp, - }); - - await pc.setRemoteDescription(remoteDesc); - - // Create answer - const answer = await pc.createAnswer({ - offerToReceiveVideo: true, - offerToReceiveAudio: true, - }); - - // Modify SDP to prefer certain codecs if needed - if (answer.sdp) { - answer.sdp = preferCodec(answer.sdp, config.videoCodec); - } - - await pc.setLocalDescription(answer); - - // Wait briefly for some ICE candidates to be gathered - await new Promise((resolve) => { - let candidateCount = 0; - const checkCandidates = () => { - const currentSdp = pc.localDescription?.sdp || ""; - const hasSrflx = currentSdp.includes("typ srflx"); - candidateCount++; - - if (hasSrflx || candidateCount > 10) { - resolve(); - } else { - setTimeout(checkCandidates, 100); - } - }; - setTimeout(checkCandidates, 50); - }); - - const currentSdp = pc.localDescription?.sdp || answer.sdp || ""; - - // Extract ICE credentials and DTLS fingerprint from our answer SDP - const iceUfragMatch = currentSdp.match(/a=ice-ufrag:(\S+)/); - const icePwdMatch = currentSdp.match(/a=ice-pwd:(\S+)/); - const fingerprintMatch = currentSdp.match(/a=fingerprint:sha-256\s+(\S+)/); - - const iceUfrag = iceUfragMatch ? iceUfragMatch[1] : ""; - const icePwd = icePwdMatch ? icePwdMatch[1] : ""; - const fingerprint = fingerprintMatch ? fingerprintMatch[1] : ""; - - // Use requested resolution for viewport dimensions - const viewportWidth = requestedWidth; - const viewportHeight = requestedHeight; - - // Use bitrate from config (set by user in settings) - const maxBitrateKbps = config.maxBitrateKbps || 100000; - const minBitrateKbps = Math.min(10000, maxBitrateKbps / 10); - const initialBitrateKbps = Math.round(maxBitrateKbps * 0.5); - - // Build nvstSdp matching official GFN browser client format - // Based on Wl function from vendor_beautified.js - const isHighFps = requestedFps >= 120; - const is120Fps = requestedFps === 120; - const is240Fps = requestedFps >= 240; - - const nvstSdpString = [ - "v=0", - "o=SdpTest test_id_13 14 IN IPv4 127.0.0.1", - "s=-", - "t=0 0", - `a=general.icePassword:${icePwd}`, - `a=general.iceUserNameFragment:${iceUfrag}`, - `a=general.dtlsFingerprint:${fingerprint}`, - "m=video 0 RTP/AVP", - "a=msid:fbc-video-0", - // FEC settings - "a=vqos.fec.rateDropWindow:10", - "a=vqos.fec.minRequiredFecPackets:2", - "a=vqos.fec.repairMinPercent:5", - "a=vqos.fec.repairPercent:5", - "a=vqos.fec.repairMaxPercent:35", - // DRC settings - disable for high FPS, use DFC instead - ...(isHighFps ? [ - "a=vqos.drc.enable:0", - "a=vqos.dfc.enable:1", - "a=vqos.dfc.decodeFpsAdjPercent:85", - "a=vqos.dfc.targetDownCooldownMs:250", - "a=vqos.dfc.dfcAlgoVersion:2", - `a=vqos.dfc.minTargetFps:${is120Fps ? 100 : 60}`, - ] : [ - "a=vqos.drc.minRequiredBitrateCheckEnabled:1", - ]), - // Video encoder settings - "a=video.dx9EnableNv12:1", - "a=video.dx9EnableHdr:1", - "a=vqos.qpg.enable:1", - "a=vqos.resControl.qp.qpg.featureSetting:7", - "a=bwe.useOwdCongestionControl:1", - "a=video.enableRtpNack:1", - "a=vqos.bw.txRxLag.minFeedbackTxDeltaMs:200", - "a=vqos.drc.bitrateIirFilterFactor:18", - "a=video.packetSize:1140", - "a=packetPacing.minNumPacketsPerGroup:15", - // High FPS (120+) optimizations from official GFN client - ...(isHighFps ? [ - "a=bwe.iirFilterFactor:8", - "a=video.encoderFeatureSetting:47", - "a=video.encoderPreset:6", - "a=vqos.resControl.cpmRtc.badNwSkipFramesCount:600", - "a=vqos.resControl.cpmRtc.decodeTimeThresholdMs:9", - `a=video.fbcDynamicFpsGrabTimeoutMs:${is120Fps ? 6 : 18}`, - `a=vqos.resControl.cpmRtc.serverResolutionUpdateCoolDownCount:${is120Fps ? 6000 : 12000}`, - ] : []), - // Ultra high FPS (240+) optimizations - ...(is240Fps ? [ - "a=video.enableNextCaptureMode:1", - "a=vqos.maxStreamFpsEstimate:240", - "a=video.videoSplitEncodeStripsPerFrame:3", - "a=video.updateSplitEncodeStateDynamically:1", - ] : []), - // Out of focus settings - "a=vqos.adjustStreamingFpsDuringOutOfFocus:1", - "a=vqos.resControl.cpmRtc.ignoreOutOfFocusWindowState:1", - "a=vqos.resControl.perfHistory.rtcIgnoreOutOfFocusWindowState:1", - "a=vqos.resControl.cpmRtc.featureMask:3", - // Packet pacing - `a=packetPacing.numGroups:${is120Fps ? 3 : 5}`, - "a=packetPacing.maxDelayUs:1000", - "a=packetPacing.minNumPacketsFrame:10", - // NACK settings - "a=video.rtpNackQueueLength:1024", - "a=video.rtpNackQueueMaxPackets:512", - "a=video.rtpNackMaxPacketCount:25", - // Resolution/quality settings - "a=vqos.drc.qpMaxResThresholdAdj:4", - "a=vqos.grc.qpMaxResThresholdAdj:4", - "a=vqos.drc.iirFilterFactor:100", - // Viewport and FPS - `a=video.clientViewportWd:${viewportWidth}`, - `a=video.clientViewportHt:${viewportHeight}`, - `a=video.maxFPS:${requestedFps}`, - // Bitrate settings - `a=video.initialBitrateKbps:${initialBitrateKbps}`, - `a=video.initialPeakBitrateKbps:${initialBitrateKbps}`, - `a=vqos.bw.maximumBitrateKbps:${maxBitrateKbps}`, - `a=vqos.bw.minimumBitrateKbps:${minBitrateKbps}`, - // Encoder settings - "a=video.maxNumReferenceFrames:4", - "a=video.mapRtpTimestampsToFrames:1", - "a=video.encoderCscMode:3", - "a=video.scalingFeature1:0", - "a=video.prefilterParams.prefilterModel:0", - // Audio track - "m=audio 0 RTP/AVP", - "a=msid:audio", - // Mic track - "m=mic 0 RTP/AVP", - "a=msid:mic", - // Input/application track - "m=application 0 RTP/AVP", - "a=msid:input_1", - "a=ri.partialReliableThresholdMs:300", - "" - ].join("\n"); - - console.log("Built nvstSdp with ICE credentials and streaming params"); - - // Send answer to server using GFN peer protocol - // Include nvstSdp as seen in official browser traffic - const answerMsg: GfnPeerMessage = { - peer_msg: { - from: gfnPeerId, // 2 = client - to: 1, // 1 = server - msg: JSON.stringify({ - type: "answer", - sdp: currentSdp, - nvstSdp: nvstSdpString - }) - }, - ackid: ++gfnAckId - }; - - if (ws.readyState === WebSocket.OPEN) { - console.log("Sending SDP answer to server (with nvstSdp)"); - ws.send(JSON.stringify(answerMsg)); - } else { - console.error("WebSocket not open, cannot send answer! State:", ws.readyState); - } - - // For ice-lite servers that don't send trickle ICE candidates, - // we need to construct the candidate manually from the server IP and SDP port - console.log("Answer sent. Adding server ICE candidate manually for ice-lite..."); - - // Extract port from the SDP (from m=audio or m=video line) - // This is a DUMMY port (47998) for some Alliance Partners - the real port comes from connectionInfo - const portMatch = serverSdp.match(/m=(?:audio|video)\s+(\d+)/); - const sdpPort = portMatch ? parseInt(portMatch[1], 10) : 47998; - - // Use media connection info port if available (from session API connectionInfo with usage=2 or usage=17) - // This is the REAL UDP port for streaming, instead of the dummy port 47998 in SDP - // The official GFN client uses this to rewrite SDP candidates for Alliance Partners - let serverPort = sdpPort; - let serverIpAddress: string; - - if (config.mediaConnectionInfo) { - // Use real port from session API connectionInfo (usage=2 or usage=17) - serverPort = config.mediaConnectionInfo.port; - serverIpAddress = config.mediaConnectionInfo.ip; - console.log(`Using media port ${serverPort} from session API`); - } else { - // Convert serverIp from hostname format to IP - serverIpAddress = serverIp; - const ipMatch = serverIp.match(/^(\d+-\d+-\d+-\d+)\./); - if (ipMatch) { - serverIpAddress = ipMatch[1].replace(/-/g, "."); - } - } - - // Extract ICE credentials from server SDP - const serverUfragMatch = serverSdp.match(/a=ice-ufrag:(\S+)/); - const serverUfrag = serverUfragMatch ? serverUfragMatch[1] : ""; - - // Construct the ICE candidate - const candidateString = `candidate:1 1 udp 2130706431 ${serverIpAddress} ${serverPort} typ host`; - - try { - await pc.addIceCandidate(new RTCIceCandidate({ - candidate: candidateString, - sdpMid: "0", - sdpMLineIndex: 0, - usernameFragment: serverUfrag - })); - } catch { - // Try alternative format with different sdpMid values - for (const mid of ["1", "2", "3"]) { - try { - await pc.addIceCandidate(new RTCIceCandidate({ - candidate: candidateString, - sdpMid: mid, - sdpMLineIndex: parseInt(mid, 10), - usernameFragment: serverUfrag - })); - break; - } catch { - // Continue trying - } - } - } -} - -/** - * Create input data channel (FALLBACK FUNCTION) - * NOTE: The primary input channel is now created BEFORE SDP negotiation in - * handleGfnSdpOffer/handleSdpOffer. This function is kept as a fallback. - */ -function createInputDataChannel(pc: RTCPeerConnection): void { - if (streamingState.dataChannels.has("input_channel_v1")) { - console.log("Input channel already exists (created before SDP negotiation)"); - return; - } - console.warn("createInputDataChannel called as fallback - should have been created before SDP!"); -} - -/** - * Try connecting to multiple signaling URLs until one works - */ -async function connectSignalingWithMultipleUrls( - urls: string[], - accessToken: string, - config: WebRtcConfig -): Promise { - let lastError: Error | null = null; - let urlIndex = 0; - - for (const url of urls) { - urlIndex++; - console.log(`Trying signaling URL ${urlIndex}/${urls.length}: ${url}`); - - try { - await connectSignalingWithTimeout(url, accessToken, config, 5000); - console.log(`Successfully connected to: ${url}`); - return; - } catch (e) { - const error = e as Error; - console.warn(`URL ${urlIndex} failed: ${error.message}`); - lastError = error; - // Continue to next URL immediately (no delay between URLs) - } - } - - throw lastError || new Error("Failed to connect to any signaling server"); -} - -/** - * Connect to signaling with a timeout - */ -async function connectSignalingWithTimeout( - url: string, - accessToken: string, - config: WebRtcConfig, - timeoutMs: number -): Promise { - return new Promise((resolve, reject) => { - const timeout = setTimeout(() => { - reject(new Error(`Connection timeout after ${timeoutMs}ms`)); - }, timeoutMs); - - connectSignaling(url, accessToken, config) - .then(() => { - clearTimeout(timeout); - resolve(); - }) - .catch((e) => { - clearTimeout(timeout); - reject(e); - }); - }); -} - -/** - * Create a video element for streaming - */ -function createVideoElement(): HTMLVideoElement { - const video = document.createElement("video"); - video.id = "gfn-stream-video"; - video.autoplay = true; - video.playsInline = true; - video.muted = false; // Audio enabled - video.controls = false; // No controls - this is a live stream - video.disablePictureInPicture = true; // No PiP - - // === LOW LATENCY OPTIMIZATIONS === - // Hint for low-latency video decoding - (video as any).latencyHint = "interactive"; - // Disable audio/video sync for lower latency (audio may drift slightly) - (video as any).disableRemotePlayback = true; - // Disable pitch correction for lower latency audio - (video as any).preservesPitch = false; - // Request hardware acceleration - (video as any).mozPreservesPitch = false; - - video.style.cssText = ` - width: 100%; - height: 100%; - background: #000; - object-fit: contain; - pointer-events: auto; - `; - - // Prevent pausing the stream - video.onpause = () => { - // Immediately resume if paused - video.play().catch(() => {}); - }; - - // Prevent seeking and keep at live edge - video.onseeking = () => { - // Reset to live edge immediately - if (video.seekable.length > 0) { - video.currentTime = video.seekable.end(video.seekable.length - 1); - } - }; - - // Keep video at live edge - only intervene on major stalls - // Don't be aggressive - let WebRTC handle minor jitter - if (streamingState.liveEdgeIntervalId) { - clearInterval(streamingState.liveEdgeIntervalId); - } - streamingState.liveEdgeIntervalId = setInterval(() => { - if (!video.parentNode) { - if (streamingState.liveEdgeIntervalId) { - clearInterval(streamingState.liveEdgeIntervalId); - streamingState.liveEdgeIntervalId = undefined; - } - return; - } - if (video.buffered.length > 0) { - const bufferedEnd = video.buffered.end(video.buffered.length - 1); - const lag = bufferedEnd - video.currentTime; - // Only intervene on major stalls (>1 second behind) - // Let WebRTC jitter buffer handle normal variation - if (lag > 1.0) { - video.currentTime = bufferedEnd; - console.log(`Major stall recovery (was ${(lag * 1000).toFixed(0)}ms behind)`); - } - } - }, 2000); // Check less frequently - let WebRTC handle it - - // Handle video events - video.onloadedmetadata = () => { - console.log("Video metadata loaded:", video.videoWidth, "x", video.videoHeight); - }; - - video.onplay = () => { - console.log("Video playback started"); - - // === LOW LATENCY: Use requestVideoFrameCallback for precise frame timing === - // This fires exactly when a frame is presented, allowing tighter input sync - if ('requestVideoFrameCallback' in video) { - let frameCount = 0; - let droppedFrames = 0; - let lastDropLogTime = 0; - - const onVideoFrame = (_now: number, metadata: VideoFrameMetadata) => { - frameCount++; - - // Only log dropped frames, and throttle to once per 5 seconds max - if (frameCount % 300 === 0) { // Check every ~5 seconds at 60fps - const newDropped = (metadata.droppedVideoFrames || 0) - droppedFrames; - droppedFrames = metadata.droppedVideoFrames || 0; - const now = Date.now(); - - // Only log if frames were dropped and we haven't logged recently - if (newDropped > 5 && now - lastDropLogTime > 5000) { - console.log(`Dropped ${newDropped} frames in last 5 seconds`); - lastDropLogTime = now; - } - } - - // Continue callback loop - video.requestVideoFrameCallback(onVideoFrame); - }; - - video.requestVideoFrameCallback(onVideoFrame); - console.log("requestVideoFrameCallback enabled for low-latency frame sync"); - } - }; - - video.onerror = (e) => { - console.error("Video error:", e); - }; - - // Note: Double-click fullscreen is handled in setupInputCapture for proper pointer lock integration - - return video; -} - -/** - * Connect to the WebSocket signaling server - * - * Authentication methods to try: - * 1. WebSocket subprotocol with token - * 2. Token in first message after connect - * 3. Plain connection (server may use session-based auth) - */ -async function connectSignaling( - url: string, - accessToken: string, - config: WebRtcConfig -): Promise { - return new Promise((resolve, reject) => { - console.log("Opening WebSocket connection to:", url); - - let ws: WebSocket; - - try { - // Try with GFNJWT subprotocol (some servers accept auth via subprotocol) - // Format: ["GFNJWT-"] or ["gfn", "v1"] - ws = new WebSocket(url, ["gfn", "v1"]); - } catch (err) { - console.warn("WebSocket with subprotocol failed, trying plain:", err); - try { - ws = new WebSocket(url); - } catch (err2) { - reject(new Error(`Failed to create WebSocket: ${err2}`)); - return; - } - } - - ws.binaryType = "arraybuffer"; - streamingState.signalingSocket = ws; - - let resolved = false; - let messageCount = 0; - - const connectionTimeout = setTimeout(() => { - if (!resolved && ws.readyState !== WebSocket.OPEN) { - ws.close(); - reject(new Error("WebSocket connection timeout")); - } - }, 10000); - - ws.onopen = async () => { - console.log("WebSocket connected to:", url); - console.log("Protocol:", ws.protocol || "(none)"); - - try { - // Send authentication message immediately - await sendAuthMessage(ws, accessToken); - - // Also try RTSP-style OPTIONS request (in case server expects RTSP) - sendRtspOptions(ws, accessToken); - } catch (e) { - console.warn("Auth message failed:", e); - } - }; - - ws.onmessage = async (event) => { - messageCount++; - console.log(`Message ${messageCount} received, type:`, typeof event.data); - - try { - const handled = await handleSignalingMessage( - event.data, - ws, - accessToken, - config, - () => { - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - resolve(); - } - }, - (error) => { - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - reject(error); - } - } - ); - - // If we got any valid response, consider it a success for connection - if (handled && !resolved) { - resolved = true; - clearTimeout(connectionTimeout); - resolve(); - } - } catch (e) { - console.error("Error handling signaling message:", e); - } - }; - - ws.onerror = (error) => { - console.error("WebSocket error on", url); - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - reject(new Error("WebSocket connection failed")); - } - }; - - ws.onclose = (event) => { - console.log("WebSocket closed:", event.code, event.reason || "(no reason)"); - streamingState.connected = false; - - if (!resolved) { - resolved = true; - clearTimeout(connectionTimeout); - // Provide more specific error based on close code - let errorMsg = "WebSocket closed"; - if (event.code === 1006) { - errorMsg = "Connection failed (network error or server rejected)"; - } else if (event.code === 4001 || event.code === 4003) { - errorMsg = "Authentication failed"; - } - reject(new Error(`${errorMsg}: ${event.code}`)); - } - }; - }); -} - -/** - * Send RTSP OPTIONS request (in case server expects RTSP-over-WebSocket) - */ -function sendRtspOptions(ws: WebSocket, accessToken: string): void { - const rtspRequest = [ - "OPTIONS * RTSP/1.0", - "CSeq: 1", - "X-GS-Version: 14.2", - `Authorization: GFNJWT ${accessToken}`, - "", - "", - ].join("\r\n"); - - if (ws.readyState === WebSocket.OPEN) { - console.log("Sending RTSP OPTIONS request"); - ws.send(rtspRequest); - } -} - -/** - * Send authentication message to signaling server - */ -async function sendAuthMessage(ws: WebSocket, accessToken: string): Promise { - const authMsg: NvstAuthMessage = { - type: "auth", - payload: { - token: accessToken, - clientType: "BROWSER", - clientVersion: "2.0.80.173", - capabilities: [ - "webrtc", - "h264", - "av1", - "opus", - "datachannel", - ], - }, - }; - - sendSignalingMessage(ws, authMsg); - console.log("Auth message sent"); -} - -/** - * Send signaling message with sequence number - */ -function sendSignalingMessage(ws: WebSocket, message: NvstSignalingMessage): void { - const msgWithSeq = { - ...message, - sequence: signalingSeq++, - timestamp: Date.now(), - }; - - if (ws.readyState === WebSocket.OPEN) { - ws.send(JSON.stringify(msgWithSeq)); - } else { - console.warn("WebSocket not open, cannot send message"); - } -} - -/** - * Handle incoming signaling message - * Returns true if message was handled and streaming is ready - */ -async function handleSignalingMessage( - data: string | ArrayBuffer, - ws: WebSocket, - accessToken: string, - config: WebRtcConfig, - resolve: () => void, - reject: (error: Error) => void -): Promise { - const message = typeof data === "string" ? data : new TextDecoder().decode(data); - - // Try to parse as JSON - let json: NvstSignalingMessage; - try { - json = JSON.parse(message); - } catch { - // Not JSON - might be binary control data or keep-alive - console.log("Non-JSON signaling message:", message.substring(0, 100)); - return false; - } - - console.log("Signaling message received:", json.type); - - switch (json.type) { - case "auth-ack": - case "authenticated": - console.log("Authentication acknowledged"); - // Request streaming session - sendSignalingMessage(ws, { - type: "session-request", - payload: { - sessionId: streamingState.sessionId, - }, - }); - return true; - - case "offer": - // Server sent SDP offer - const offerPayload = json.payload as { sdp: string; sessionId?: string }; - console.log("Received SDP offer, length:", offerPayload.sdp?.length); - - try { - await handleSdpOffer(offerPayload.sdp, ws, accessToken, config); - resolve(); - } catch (e) { - reject(e as Error); - } - return true; - - case "ice-candidate": - // Remote ICE candidate - const candidatePayload = json.payload as { - candidate: string; - sdpMid: string | null; - sdpMLineIndex: number | null; - }; - - if (streamingState.peerConnection && candidatePayload.candidate) { - try { - const candidate = new RTCIceCandidate({ - candidate: candidatePayload.candidate, - sdpMid: candidatePayload.sdpMid, - sdpMLineIndex: candidatePayload.sdpMLineIndex, - }); - await streamingState.peerConnection.addIceCandidate(candidate); - console.log("Added remote ICE candidate"); - } catch (e) { - console.warn("Failed to add ICE candidate:", e); - } - } - return true; - - case "error": - const errorPayload = json.payload as { code?: string; message?: string }; - console.error("Signaling error:", errorPayload); - reject(new Error(`Signaling error: ${errorPayload.message || "Unknown error"}`)); - return true; - - case "session-ready": - console.log("Session ready for streaming"); - return true; - - case "ping": - // Respond to keep-alive - sendSignalingMessage(ws, { type: "pong" }); - return true; - - case "bye": - console.log("Server requested disconnect"); - stopStreaming(); - return true; - - default: - console.log("Unknown signaling message type:", json.type); - return false; - } -} - -/** - * Handle SDP offer and set up WebRTC - */ -async function handleSdpOffer( - serverSdp: string, - ws: WebSocket, - accessToken: string, - config: WebRtcConfig -): Promise { - console.log("Setting up WebRTC peer connection"); - - // Create RTCPeerConnection with proper configuration - const pc = new RTCPeerConnection({ - iceServers: config.iceServers.map((s) => ({ - urls: s.urls, - username: s.username, - credential: s.credential, - })), - bundlePolicy: "max-bundle", - rtcpMuxPolicy: "require", - iceCandidatePoolSize: 2, - }); - - streamingState.peerConnection = pc; - - // Set up event handlers - pc.ontrack = handleTrack; - pc.onicecandidate = (event) => handleIceCandidate(event, ws); - pc.oniceconnectionstatechange = () => { - console.log("ICE connection state:", pc.iceConnectionState); - if (pc.iceConnectionState === "failed") { - console.error("ICE connection failed, attempting restart"); - pc.restartIce(); - } - }; - pc.onconnectionstatechange = () => { - console.log("Connection state:", pc.connectionState); - if (pc.connectionState === "connected") { - streamingState.connected = true; - console.log("WebRTC connected!"); - startStatsCollection(); - } else if (pc.connectionState === "failed" || pc.connectionState === "disconnected") { - streamingState.connected = false; - } - }; - - // === CRITICAL: Create input channel BEFORE SDP negotiation (per official GFN client) === - // The official GFN web client creates data channels during RTCPeerConnection setup, - // BEFORE calling setRemoteDescription. - console.log("Creating input_channel_v1 BEFORE SDP negotiation..."); - const inputChannel = pc.createDataChannel("input_channel_v1", { - ordered: false, // Unordered for lowest latency - maxRetransmits: 0, // No retransmits for lowest latency - }); - inputChannel.binaryType = "arraybuffer"; - - inputChannel.onopen = () => { - console.log("=== INPUT CHANNEL OPENED ==="); - console.log(" Label:", inputChannel.label); - console.log(" ID:", inputChannel.id); - streamingState.dataChannels.set("input_channel_v1", inputChannel); - streamingState.dataChannels.set("input", inputChannel); - console.log(" Waiting for server handshake..."); - }; - - inputChannel.onmessage = (e) => { - const size = e.data instanceof ArrayBuffer ? e.data.byteLength : 0; - console.log("=== INPUT CHANNEL MESSAGE ===", "Size:", size, "bytes"); - - if (e.data instanceof ArrayBuffer && size > 0) { - const view = new DataView(e.data); - if (!inputHandshakeComplete && size >= 2) { - const firstWord = view.getUint16(0, true); - if (firstWord === 526) { - const version = size >= 4 ? view.getUint16(2, true) : 0; - console.log(` *** HANDSHAKE: New format (0x020E), version=${version}`); - inputProtocolVersion = version; - } else { - console.log(` *** HANDSHAKE: Old format, version=${firstWord}`); - inputProtocolVersion = firstWord; - } - inputHandshakeComplete = true; - inputHandshakeAttempts++; - streamStartTime = Date.now(); - console.log(" *** INPUT HANDSHAKE COMPLETE!"); - } - } - }; - - inputChannel.onerror = (e) => console.error("Input channel error:", e); - inputChannel.onclose = () => { - console.log("Input channel closed"); - streamingState.dataChannels.delete("input"); - streamingState.dataChannels.delete("input_channel_v1"); - }; - - console.log("Input channel created, state:", inputChannel.readyState); - - // Add transceiver for video to ensure we can receive - pc.addTransceiver("video", { direction: "recvonly" }); - pc.addTransceiver("audio", { direction: "recvonly" }); - - // Set remote description (server's SDP offer) - const remoteDesc = new RTCSessionDescription({ - type: "offer", - sdp: serverSdp, - }); - - await pc.setRemoteDescription(remoteDesc); - console.log("Remote description set"); - - // Create answer - const answer = await pc.createAnswer({ - offerToReceiveVideo: true, - offerToReceiveAudio: true, - }); - - // Modify SDP to prefer certain codecs if needed - if (answer.sdp) { - answer.sdp = preferCodec(answer.sdp, config.videoCodec); - } - - await pc.setLocalDescription(answer); - console.log("Local description set"); - - // Wait for ICE gathering to complete (or timeout) - await waitForIceGathering(pc); - - // Send answer to server - const answerMsg: NvstAnswerMessage = { - type: "answer", - payload: { - sdp: pc.localDescription?.sdp || answer.sdp || "", - }, - }; - sendSignalingMessage(ws, answerMsg); - console.log("Answer sent to server"); -} - -/** - * Wait for ICE gathering to complete - */ -async function waitForIceGathering(pc: RTCPeerConnection): Promise { - if (pc.iceGatheringState === "complete") { - return; - } - - return new Promise((resolve) => { - const checkState = () => { - if (pc.iceGatheringState === "complete") { - pc.removeEventListener("icegatheringstatechange", checkState); - resolve(); - } - }; - - pc.addEventListener("icegatheringstatechange", checkState); - - // Timeout after 5 seconds - setTimeout(() => { - pc.removeEventListener("icegatheringstatechange", checkState); - resolve(); - }, 5000); - }); -} - -/** - * Modify SDP to force a specific video codec by removing all other codecs - */ -function preferCodec(sdp: string, codec: string): string { - // Map user codec selection to actual SDP codec name - const codecMap: Record = { - H264: "H264", - H265: "H265", - HEVC: "H265", // HEVC is the same as H265 - AV1: "AV1", - }; - - const preferredCodec = codecMap[codec.toUpperCase()] || "H264"; - console.log("Forcing SDP to use codec:", preferredCodec); - - const lines = sdp.split("\r\n"); - const result: string[] = []; - - let inVideoSection = false; - const codecPayloads: Map = new Map(); // codec name -> payload types - const payloadToCodec: Map = new Map(); // payload type -> codec name - - // First pass: collect codec information - for (const line of lines) { - if (line.startsWith("m=video")) { - inVideoSection = true; - } else if (line.startsWith("m=") && inVideoSection) { - inVideoSection = false; - } - - if (inVideoSection) { - // Parse rtpmap lines to get codec -> payload mapping - const rtpmapMatch = line.match(/^a=rtpmap:(\d+)\s+([^\/]+)/); - if (rtpmapMatch) { - const pt = rtpmapMatch[1]; - const codecName = rtpmapMatch[2].toUpperCase(); - if (!codecPayloads.has(codecName)) { - codecPayloads.set(codecName, []); - } - codecPayloads.get(codecName)!.push(pt); - payloadToCodec.set(pt, codecName); - } - } - } - - // Get preferred codec payload types - const preferredPayloads = codecPayloads.get(preferredCodec) || []; - const preferredPayloadSet = new Set(preferredPayloads); - - if (preferredPayloads.length === 0) { - console.log("Preferred codec not found in SDP, returning original. Available:", Array.from(codecPayloads.keys()).join(", ")); - return sdp; - } - - console.log("Available codecs:", Array.from(codecPayloads.entries()).map(([k, v]) => `${k}:${v.join(",")}`).join(" | ")); - console.log("Keeping only payload types:", preferredPayloads.join(", ")); - - // Second pass: rebuild SDP keeping only preferred codec - inVideoSection = false; - for (const line of lines) { - if (line.startsWith("m=video")) { - inVideoSection = true; - // Rewrite m=video line to only include preferred codec payload types - const parts = line.split(" "); - const header = parts.slice(0, 3); // m=video, port, proto - const payloadTypes = parts.slice(3); - - // Keep only preferred codec payloads - const filtered = payloadTypes.filter(pt => preferredPayloadSet.has(pt)); - - if (filtered.length > 0) { - result.push([...header, ...filtered].join(" ")); - console.log("Filtered m=video line to payloads:", filtered.join(", ")); - } else { - result.push(line); // Fallback to original if filter removed everything - } - continue; - } else if (line.startsWith("m=") && inVideoSection) { - inVideoSection = false; - } - - if (inVideoSection) { - // Filter out rtpmap, fmtp, rtcp-fb lines for non-preferred codecs - const ptMatch = line.match(/^a=(?:rtpmap|fmtp|rtcp-fb):(\d+)/); - if (ptMatch) { - const pt = ptMatch[1]; - if (!preferredPayloadSet.has(pt)) { - // Skip this line - it's for a codec we don't want - continue; - } - } - } - - result.push(line); - } - - return result.join("\r\n"); -} - -/** - * Handle incoming media track - */ -// Shared media stream for all tracks -let sharedMediaStream: MediaStream | null = null; - -function handleTrack(event: RTCTrackEvent): void { - console.log("Track received:", event.track.kind, event.track.id, "readyState:", event.track.readyState); - console.log("Track settings:", JSON.stringify(event.track.getSettings())); - - // === LOW LATENCY: Set small jitter buffer === - // Don't set to 0 - causes stalls. Use small buffer for stability. - if (event.receiver) { - try { - // 50ms buffer balances latency vs stability - // 0 = too aggressive (causes FPS drops/stalls) - // 50ms = stable for gaming without noticeable latency - if ('jitterBufferTarget' in event.receiver) { - (event.receiver as any).jitterBufferTarget = 0.05; // 50ms - console.log("Set jitterBufferTarget to 50ms"); - } - if ('playoutDelayHint' in event.receiver) { - (event.receiver as any).playoutDelayHint = 0.05; // 50ms - console.log("Set playoutDelayHint to 50ms"); - } - } catch (e) { - console.log("Could not set jitter buffer target:", e); - } - } - - // Get or create the shared MediaStream - let stream: MediaStream; - if (event.streams && event.streams[0]) { - stream = event.streams[0]; - sharedMediaStream = stream; - console.log("Using stream from event, tracks:", stream.getTracks().map(t => t.kind).join(", ")); - } else { - // Track arrived without a stream - create one or add to existing - if (!sharedMediaStream) { - sharedMediaStream = new MediaStream(); - console.log("Created new MediaStream for orphan track"); - } - sharedMediaStream.addTrack(event.track); - stream = sharedMediaStream; - console.log("Added orphan track to shared stream"); - } - - // Always ensure video element has the stream - if (streamingState.videoElement) { - if (!streamingState.videoElement.srcObject) { - console.log("Setting srcObject on video element"); - streamingState.videoElement.srcObject = stream; - } else if (streamingState.videoElement.srcObject !== stream) { - // Different stream - add tracks to existing - const existingStream = streamingState.videoElement.srcObject as MediaStream; - if (!existingStream.getTracks().find(t => t.id === event.track.id)) { - existingStream.addTrack(event.track); - console.log("Added track to existing video srcObject"); - } - } - - // Log current stream state - const currentStream = streamingState.videoElement.srcObject as MediaStream; - console.log("Video element stream tracks:", currentStream?.getTracks().map(t => `${t.kind}:${t.readyState}`).join(", ")); - } - - if (event.track.kind === "video") { - console.log("Video track details - enabled:", event.track.enabled, "muted:", event.track.muted); - - if (streamingState.videoElement) { - // Ensure video plays - streamingState.videoElement.play().catch((e) => { - console.warn("Video autoplay blocked:", e); - const clickHandler = () => { - streamingState.videoElement?.play(); - document.removeEventListener("click", clickHandler); - }; - document.addEventListener("click", clickHandler); - }); - - // Log video element state - console.log("Video element state - readyState:", streamingState.videoElement.readyState, - "networkState:", streamingState.videoElement.networkState, - "paused:", streamingState.videoElement.paused, - "videoWidth:", streamingState.videoElement.videoWidth, - "videoHeight:", streamingState.videoElement.videoHeight); - } - } else if (event.track.kind === "audio") { - console.log("Audio track details - enabled:", event.track.enabled, "muted:", event.track.muted); - // Audio is played through the video element's srcObject - no need for separate AudioContext - // Using AudioContext would cause double audio playback - } - - // Handle track end - event.track.onended = () => { - console.log("Track ended:", event.track.kind, event.track.id); - }; - - event.track.onmute = () => { - console.log("Track muted:", event.track.kind, event.track.id); - }; - - event.track.onunmute = () => { - console.log("Track unmuted:", event.track.kind, event.track.id); - }; -} - -/** - * Handle ICE candidate - */ -function handleIceCandidate(event: RTCPeerConnectionIceEvent, ws: WebSocket): void { - if (event.candidate) { - console.log("Local ICE candidate:", event.candidate.candidate.substring(0, 50)); - - // Send ICE candidate to server - const candidateMsg: NvstIceCandidateMessage = { - type: "ice-candidate", - payload: { - candidate: event.candidate.candidate, - sdpMid: event.candidate.sdpMid, - sdpMLineIndex: event.candidate.sdpMLineIndex, - }, - }; - - sendSignalingMessage(ws, candidateMsg); - } else { - console.log("ICE gathering complete"); - } -} - -/** - * Create data channels for input - */ -function createDataChannels(pc: RTCPeerConnection): void { - // Match official GFN client data channel configuration - // From logs: control_channel_reliable, input_channel_partially_reliable - - // Control channel - reliable, ordered (SCTP stream 0) - const controlChannel = pc.createDataChannel("control_channel_reliable", { - ordered: true, - id: 0, // Explicit SCTP stream ID - }); - controlChannel.binaryType = "arraybuffer"; - controlChannel.onopen = () => { - console.log("Control channel open"); - // Send initial control handshake if needed - }; - controlChannel.onerror = (e) => console.error("Control channel error:", e); - controlChannel.onclose = () => console.log("Control channel closed"); - controlChannel.onmessage = (e) => { - const size = (e.data as ArrayBuffer).byteLength; - console.log("Control channel message, size:", size); - }; - streamingState.dataChannels.set("control", controlChannel); - - // Input channel - unreliable for lowest latency - const inputChannel = pc.createDataChannel("input_channel_partially_reliable", { - ordered: false, // Unordered for lowest latency - maxRetransmits: 0, // No retransmits - stale input is useless - id: 6, // SCTP stream 6 per logs - }); - inputChannel.binaryType = "arraybuffer"; - inputChannel.onopen = () => console.log("Input channel open"); - inputChannel.onerror = (e) => console.error("Input channel error:", e); - inputChannel.onclose = () => console.log("Input channel closed"); - streamingState.dataChannels.set("input", inputChannel); - - // Custom message channel - reliable (SCTP stream 2) - const customChannel = pc.createDataChannel("custom_message_on_sctp_private_reliable", { - ordered: true, - id: 2, - }); - customChannel.binaryType = "arraybuffer"; - customChannel.onopen = () => console.log("Custom message channel open"); - customChannel.onmessage = (e) => { - const size = (e.data as ArrayBuffer).byteLength; - console.log("Custom message received, size:", size); - }; - streamingState.dataChannels.set("custom", customChannel); - - // Also handle incoming data channels from server - pc.ondatachannel = (event) => { - const channel = event.channel; - console.log("Incoming data channel:", channel.label, "id:", channel.id); - channel.binaryType = "arraybuffer"; - channel.onopen = () => console.log(`Server channel '${channel.label}' open`); - channel.onmessage = (e) => { - const size = (e.data as ArrayBuffer).byteLength; - console.log(`Server channel '${channel.label}' message, size:`, size); - }; - streamingState.dataChannels.set(channel.label, channel); - }; -} - -/** - * Handle stats message from server - */ -function handleStatsMessage(event: MessageEvent): void { - try { - const data = new Uint8Array(event.data as ArrayBuffer); - // Parse server-side stats (format TBD based on NVST protocol) - console.log("Server stats received, bytes:", data.length); - } catch (e) { - console.warn("Failed to parse stats message:", e); - } -} - -/** - * Start periodic stats collection - * NOTE: Stats are collected by main.ts UI interval, this just caches them in streamingState - * We use a longer interval (5s) to reduce overhead since UI already collects at 1s - */ -function startStatsCollection(): void { - // Disabled - main.ts already collects stats every 1s for UI display - // Having two collectors causes duplicate getStats() calls which can cause lag spikes - // The UI interval in main.ts will update streamingState.stats via getStreamingStats() -} - -/** - * Send input event over data channel - * - * Strategy: Use binary protocol on input channel (primary), with JSON as fallback - */ -// Track input channel handshake state -let inputHandshakeComplete = false; -let inputHandshakeAttempts = 0; -let inputProtocolVersion = 0; // GFN input protocol version from server handshake - -// Input event counter for debugging -let inputEventCount = 0; -let lastInputLogTime = 0; - -// Prefer binary protocol over JSON - only use JSON if binary isn't working -let preferBinaryInput = true; - -/** - * Get the best available input channel - */ -function getBestInputChannel(): RTCDataChannel | null { - // Priority order for input channels: - // 1. Server-created input channel (labeled with "input" or "ri_") - // 2. Client-created input channel - // 3. Fall back to control channel for JSON input - - // Try server's input channel first - const serverInput = streamingState.dataChannels.get("server_input"); - if (serverInput && serverInput.readyState === "open") { - return serverInput; - } - - // Try primary input channel - const inputChannel = streamingState.dataChannels.get("input"); - if (inputChannel && inputChannel.readyState === "open") { - return inputChannel; - } - - // Try input_channel_v1 - const inputV1 = streamingState.dataChannels.get("input_channel_v1"); - if (inputV1 && inputV1.readyState === "open") { - return inputV1; - } - - // Search through all channels for one containing 'input' - for (const [name, channel] of streamingState.dataChannels.entries()) { - if (name.toLowerCase().includes("input") && channel.readyState === "open") { - return channel; - } - } - - return null; -} - -export function sendInputEvent(event: InputEvent): void { - const inputChannel = getBestInputChannel(); - const controlChannel = streamingState.dataChannels.get("control"); - - // Need at least one channel - if (!inputChannel && !controlChannel) { - return; - } - - // Initialize debug logging set - if (!streamingState.inputDebugLogged) { - streamingState.inputDebugLogged = new Set(); - } - - inputEventCount++; - - // Log input state only on first input (avoid GC pauses from logging) - if (inputEventCount === 1) { - console.log("=== FIRST INPUT EVENT ==="); - console.log(` Input channel: ${inputChannel?.label || 'none'} (${inputChannel?.readyState || 'n/a'})`); - console.log(` Handshake complete: ${inputHandshakeComplete}`); - console.log("========================="); - } - - try { - // Primary: Send binary format on input channel - if (inputChannel && inputChannel.readyState === "open" && preferBinaryInput) { - const encoded = encodeInputEvent(event); - - // Only send if we have valid data - if (encoded.byteLength > 0) { - // For protocol version > 2, prepend 10-byte header: - // [0x23 (1 byte)][timestamp (8 bytes BE)][0x22 wrapper (1 byte)] - // The 0x22 (34) byte is a single-event wrapper required by v3 protocol - let finalPacket: ArrayBuffer; - if (inputProtocolVersion > 2) { - const now = Date.now(); - const relativeMs = streamStartTime > 0 ? now - streamStartTime : now; - const timestampUs = BigInt(relativeMs) * BigInt(1000); - - // Create packet with 10-byte header prefix (9-byte v3 header + 1-byte wrapper) - finalPacket = new ArrayBuffer(10 + encoded.byteLength); - const headerView = new DataView(finalPacket); - const packetBytes = new Uint8Array(finalPacket); - - // Header byte 0: type marker 0x23 (35) - headerView.setUint8(0, 0x23); - // Header bytes 1-8: timestamp in microseconds (BE) - headerView.setBigUint64(1, timestampUs, false); - // Header byte 9: single event wrapper 0x22 (34) - headerView.setUint8(9, 0x22); - // Copy original payload after header - packetBytes.set(new Uint8Array(encoded), 10); - } else { - finalPacket = encoded; - } - - inputChannel.send(finalPacket); - - // Log first of each type - if (!streamingState.inputDebugLogged.has(event.type + "_binary")) { - streamingState.inputDebugLogged.add(event.type + "_binary"); - const bytes = new Uint8Array(finalPacket); - console.log(`First binary input (${event.type}):`); - console.log(` Channel: ${inputChannel.label}`); - console.log(` Protocol version: ${inputProtocolVersion}`); - console.log(` Bytes: ${bytes.length}${inputProtocolVersion > 2 ? ' (includes 10-byte v3 header)' : ''}`); - console.log(` Hex: ${Array.from(bytes.slice(0, 45)).map(b => b.toString(16).padStart(2, '0')).join(' ')}${bytes.length > 45 ? '...' : ''}`); - } - } - } - - // Fallback: Send JSON format on control channel if binary isn't preferred or failed - if (controlChannel && controlChannel.readyState === "open" && !preferBinaryInput) { - const jsonMsg = encodeInputAsJson(event); - if (jsonMsg) { - controlChannel.send(jsonMsg); - - if (!streamingState.inputDebugLogged.has(event.type + "_json")) { - streamingState.inputDebugLogged.add(event.type + "_json"); - console.log(`First JSON input (${event.type}): ${jsonMsg.substring(0, 80)}...`); - } - } - } - } catch (e) { - console.error("Failed to send input event:", e); - } -} - -/** - * Force initialize input handshake (call this if input isn't working) - */ -export function forceInputHandshake(): void { - const inputChannel = getBestInputChannel(); - if (!inputChannel) { - console.error("No input channel available for handshake"); - return; - } - - console.log("Forcing input handshake on channel:", inputChannel.label); - - // Send handshake initiation: [0x0e, version_major, version_minor, flags] - // Version 14.0 based on GFN client analysis - const handshake = new Uint8Array([0x0e, 0x0e, 0x00, 0x00]); - try { - inputChannel.send(handshake.buffer); - console.log("Handshake sent:", Array.from(handshake).map(b => b.toString(16).padStart(2, '0')).join(' ')); - inputHandshakeAttempts++; - } catch (e) { - console.error("Failed to send handshake:", e); - } -} - -/** - * Check if input is ready - */ -export function isInputReady(): boolean { - return inputHandshakeComplete && getBestInputChannel() !== null; -} - -/** - * Get input debug info - */ -export function getInputDebugInfo(): object { - return { - handshakeComplete: inputHandshakeComplete, - handshakeAttempts: inputHandshakeAttempts, - eventCount: inputEventCount, - streamStartTime, - inputChannel: getBestInputChannel()?.label || null, - inputChannelState: getBestInputChannel()?.readyState || null, - channels: Array.from(streamingState.dataChannels.entries()).map(([name, ch]) => ({ - name, - label: ch.label, - state: ch.readyState, - id: ch.id - })) - }; -} - -/** - * Encode input event as JSON (matching GFN web client format) - */ -function encodeInputAsJson(event: InputEvent): string | null { - const timestamp = Date.now(); - - switch (event.type) { - case "mouse_move": { - const data = event.data as MouseMoveData; - // Format matching GFN web client - return JSON.stringify({ - inputEvent: { - eventName: "mouseMove", - movementX: data.dx, - movementY: data.dy, - timestamp - } - }); - } - - case "mouse_button": { - const data = event.data as MouseButtonData; - return JSON.stringify({ - inputEvent: { - eventName: data.pressed ? "mouseDown" : "mouseUp", - button: data.button, - timestamp - } - }); - } - - case "mouse_wheel": { - const data = event.data as MouseWheelData; - return JSON.stringify({ - inputEvent: { - eventName: "wheel", - deltaX: data.deltaX, - deltaY: data.deltaY, - timestamp - } - }); - } - - case "key": { - const data = event.data as KeyData; - return JSON.stringify({ - inputEvent: { - eventName: data.pressed ? "keyDown" : "keyUp", - keyCode: data.keyCode, - scanCode: data.scanCode, - modifiers: data.modifiers, - timestamp - } - }); - } - - default: - return null; - } -} - -/** - * Input event types - */ -export interface InputEvent { - type: "mouse_move" | "mouse_button" | "mouse_wheel" | "key"; - data: MouseMoveData | MouseButtonData | MouseWheelData | KeyData; -} - -interface MouseMoveData { - dx: number; - dy: number; - absolute?: boolean; - x?: number; - y?: number; -} - -interface MouseButtonData { - button: number; - pressed: boolean; -} - -interface MouseWheelData { - deltaX: number; - deltaY: number; -} - -interface KeyData { - keyCode: number; - scanCode: number; - pressed: boolean; - modifiers: number; -} - -// GFN Input Protocol Constants (from vendor.js analysis) -// Type: Little Endian, Data fields: Big Endian, Timestamp: 8B Big Endian microseconds -const GFN_INPUT_KEY_DOWN = 3; -const GFN_INPUT_KEY_UP = 4; -const GFN_INPUT_MOUSE_ABS = 5; -const GFN_INPUT_MOUSE_REL = 7; -const GFN_INPUT_MOUSE_BUTTON_DOWN = 8; -const GFN_INPUT_MOUSE_BUTTON_UP = 9; -const GFN_INPUT_MOUSE_WHEEL = 10; - -// GFN Modifier flags (from vendor.js mS function) -const GFN_MOD_SHIFT = 1; -const GFN_MOD_CTRL = 2; -const GFN_MOD_ALT = 4; -const GFN_MOD_META = 8; - -// Browser code to Windows Virtual Key code mapping (from vendor.js so map) -const CODE_TO_VK: Record = { - "Escape": 27, "Digit0": 48, "Digit1": 49, "Digit2": 50, "Digit3": 51, - "Digit4": 52, "Digit5": 53, "Digit6": 54, "Digit7": 55, "Digit8": 56, "Digit9": 57, - "Minus": 189, "Equal": 187, "Backspace": 8, "Tab": 9, - "KeyQ": 81, "KeyW": 87, "KeyE": 69, "KeyR": 82, "KeyT": 84, "KeyY": 89, - "KeyU": 85, "KeyI": 73, "KeyO": 79, "KeyP": 80, - "BracketLeft": 219, "BracketRight": 221, "Enter": 13, - "ControlLeft": 162, "ControlRight": 163, - "KeyA": 65, "KeyS": 83, "KeyD": 68, "KeyF": 70, "KeyG": 71, "KeyH": 72, - "KeyJ": 74, "KeyK": 75, "KeyL": 76, - "Semicolon": 186, "Quote": 222, "Backquote": 192, - "ShiftLeft": 160, "ShiftRight": 161, - "Backslash": 220, "IntlBackslash": 226, - "KeyZ": 90, "KeyX": 88, "KeyC": 67, "KeyV": 86, "KeyB": 66, "KeyN": 78, "KeyM": 77, - "Comma": 188, "Period": 190, "Slash": 191, - "NumpadMultiply": 106, "NumpadDivide": 111, "NumpadSubtract": 109, - "NumpadAdd": 107, "NumpadEnter": 13, "NumpadDecimal": 110, - "Numpad0": 96, "Numpad1": 97, "Numpad2": 98, "Numpad3": 99, "Numpad4": 100, - "Numpad5": 101, "Numpad6": 102, "Numpad7": 103, "Numpad8": 104, "Numpad9": 105, - "AltLeft": 164, "AltRight": 165, "Space": 32, "CapsLock": 20, - "F1": 112, "F2": 113, "F3": 114, "F4": 115, "F5": 116, "F6": 117, - "F7": 118, "F8": 119, "F9": 120, "F10": 121, "F11": 122, "F12": 123, - "F13": 124, "F14": 125, "F15": 126, "F16": 127, "F17": 128, "F18": 129, - "F19": 130, "F20": 131, "F21": 132, "F22": 133, "F23": 134, "F24": 135, - "Pause": 19, "ScrollLock": 145, "NumLock": 144, "PrintScreen": 42, - "Home": 36, "End": 35, "PageUp": 33, "PageDown": 34, - "ArrowUp": 38, "ArrowDown": 40, "ArrowLeft": 37, "ArrowRight": 39, - "Insert": 45, "Delete": 46, - "MetaLeft": 91, "MetaRight": 92, "OSLeft": 91, "OSRight": 92, - "ContextMenu": 93, - // International keys - "IntlRo": 194, "IntlYen": 193, "KanaMode": 233, - "Lang1": 21, "Lang2": 25, "Convert": 234, "NonConvert": 235, -}; - -// Get Windows Virtual Key code from browser event -function getVirtualKeyCode(e: KeyboardEvent): number { - // First try to map from e.code - if (e.code && CODE_TO_VK[e.code] !== undefined) { - return CODE_TO_VK[e.code]; - } - // Fallback to keyCode (deprecated but still works) - return e.keyCode; -} - -// Get GFN modifier flags from browser event -function getModifierFlags(e: KeyboardEvent): number { - let flags = 0; - // Only include modifier flags if the key itself isn't a modifier - if (e.shiftKey && !e.code.startsWith("Shift")) flags |= GFN_MOD_SHIFT; - if (e.ctrlKey && !e.code.startsWith("Control")) flags |= GFN_MOD_CTRL; - if (e.altKey && !e.code.startsWith("Alt")) flags |= GFN_MOD_ALT; - if (e.metaKey && !e.code.startsWith("Meta") && !e.code.startsWith("OS")) flags |= GFN_MOD_META; - return flags; -} - -// Use wrapper byte in packets (0xFF) - set to false to try without -const USE_WRAPPER_BYTE = false; - -// Stream start time for relative timestamps -let streamStartTime = 0; - -// Pre-allocated buffers for input events to reduce GC pressure -// These are reused for each input event instead of allocating new ArrayBuffers -const inputBuffers = { - mouseRel: new ArrayBuffer(22), - mouseAbs: new ArrayBuffer(26), - mouseButton: new ArrayBuffer(18), - mouseWheel: new ArrayBuffer(22), - keyboard: new ArrayBuffer(18), -}; -const inputViews = { - mouseRel: new DataView(inputBuffers.mouseRel), - mouseAbs: new DataView(inputBuffers.mouseAbs), - mouseButton: new DataView(inputBuffers.mouseButton), - mouseWheel: new DataView(inputBuffers.mouseWheel), - keyboard: new DataView(inputBuffers.keyboard), -}; -const inputBytes = { - mouseButton: new Uint8Array(inputBuffers.mouseButton), -}; - -/** - * Encode input event for GFN protocol (from deobfuscated vendor.js) - * - * Format discovered from vendor.js: - * - Event type: 4 bytes, LITTLE ENDIAN - * - Data fields: BIG ENDIAN - * - Timestamp: 8 bytes, BIG ENDIAN, in MICROSECONDS (ms * 1000) - * - * Mouse Relative (22 bytes): Gc function - * [type 4B LE][dx 2B BE][dy 2B BE][reserved 2B][reserved 4B][timestamp 8B BE μs] - * - * Mouse Button (18 bytes): xc function - * [type 4B LE][button 1B][pad 1B][reserved 4B][timestamp 8B BE μs] - * - * Keyboard (18 bytes): Yc function - * [type 4B LE][keycode 2B BE][modifiers 2B BE][reserved 2B][timestamp 8B BE μs] - * - * NOTE: Uses pre-allocated buffers to avoid GC pressure from frequent allocations - */ -function encodeInputEvent(event: InputEvent): ArrayBuffer { - // Timestamp in microseconds (ms * 1000), relative to stream start - const now = Date.now(); - const relativeMs = streamStartTime > 0 ? now - streamStartTime : now; - const timestampUs = BigInt(relativeMs) * BigInt(1000); - - switch (event.type) { - case "mouse_move": { - const data = event.data as MouseMoveData; - - // Check if we should use absolute positioning - if (data.absolute && data.x !== undefined && data.y !== undefined) { - // Mouse Absolute (Gc with absolute=true): 26 bytes - use pre-allocated buffer - const view = inputViews.mouseAbs; - view.setUint32(0, GFN_INPUT_MOUSE_ABS, true); // Type 5, LE - view.setUint16(4, data.x, false); // Absolute X, BE (0-65535) - view.setUint16(6, data.y, false); // Absolute Y, BE (0-65535) - view.setUint16(8, 0, false); // Reserved, BE - view.setUint16(10, 65535, false); // Reference width, BE - view.setUint16(12, 65535, false); // Reference height, BE - view.setUint32(14, 0, false); // Reserved - view.setBigUint64(18, timestampUs, false); // Timestamp μs, BE - return inputBuffers.mouseAbs; - } - - // Mouse Relative (Gc with absolute=false): 22 bytes - use pre-allocated buffer - const view = inputViews.mouseRel; - view.setUint32(0, GFN_INPUT_MOUSE_REL, true); // Type 7, LE - view.setInt16(4, data.dx, false); // Delta X, BE (signed) - view.setInt16(6, data.dy, false); // Delta Y, BE (signed) - view.setUint16(8, 0, false); // Reserved, BE - view.setUint32(10, 0, false); // Reserved - view.setBigUint64(14, timestampUs, false); // Timestamp μs, BE - return inputBuffers.mouseRel; - } - - case "mouse_button": { - // Mouse Button (xc): 18 bytes - use pre-allocated buffer - const data = event.data as MouseButtonData; - const eventType = data.pressed ? GFN_INPUT_MOUSE_BUTTON_DOWN : GFN_INPUT_MOUSE_BUTTON_UP; - const gfnButton = data.button + 1; // GFN uses 1-based button indices - const view = inputViews.mouseButton; - const bytes = inputBytes.mouseButton; - view.setUint32(0, eventType, true); // Type 8 or 9, LE - bytes[4] = gfnButton; // Button as uint8 (1=left, 2=right, 3=middle) - bytes[5] = 0; // Padding - view.setUint32(6, 0); // Reserved - view.setBigUint64(10, timestampUs, false); // Timestamp μs, BE - return inputBuffers.mouseButton; - } - - case "mouse_wheel": { - // Mouse Wheel (Lc): 22 bytes - use pre-allocated buffer - const data = event.data as MouseWheelData; - // GFN expects wheel delta as multiples of 120, negated - const wheelDelta = Math.round(data.deltaY / Math.abs(data.deltaY || 1) * -120); - const view = inputViews.mouseWheel; - view.setUint32(0, GFN_INPUT_MOUSE_WHEEL, true); // Type 10, LE - view.setInt16(4, 0, false); // Horizontal wheel, BE - view.setInt16(6, wheelDelta, false); // Vertical wheel, BE - view.setUint16(8, 0, false); // Reserved, BE - view.setUint32(10, 0); // Reserved - view.setBigUint64(14, timestampUs, false); // Timestamp μs, BE - return inputBuffers.mouseWheel; - } - - case "key": { - // Keyboard (Yc): 18 bytes - use pre-allocated buffer - const data = event.data as KeyData; - const eventType = data.pressed ? GFN_INPUT_KEY_DOWN : GFN_INPUT_KEY_UP; - const view = inputViews.keyboard; - view.setUint32(0, eventType, true); // Type 3 or 4, LE - view.setUint16(4, data.keyCode, false); // Key code, BE - view.setUint16(6, data.modifiers, false); // Modifiers, BE - view.setUint16(8, data.scanCode || 0, false); // Reserved (or scancode), BE - view.setBigUint64(10, timestampUs, false); // Timestamp μs, BE - return inputBuffers.keyboard; - } - - default: - return new ArrayBuffer(0); - } -} - -// Input capture mode - can be 'pointerlock' (FPS games) or 'absolute' (desktop/menu) -let inputCaptureMode: 'pointerlock' | 'absolute' = 'absolute'; - -// Track if input is active (video element is focused/active) -let inputCaptureActive = false; - -// Helper to check fullscreen state across browsers -function isFullscreen(): boolean { - const doc = document as FullscreenDocument; - return !!( - document.fullscreenElement || - doc.webkitFullscreenElement || - doc.mozFullScreenElement || - doc.msFullscreenElement - ); -} - -// Platform detection -const isMacOS = navigator.platform.toUpperCase().includes("MAC") || - navigator.userAgent.toUpperCase().includes("MAC"); -const isWindows = navigator.platform.toUpperCase().includes("WIN") || - navigator.userAgent.toUpperCase().includes("WIN"); - -/** - * Get input latency stats. - * Note: Returns zeros since we use absolute mode which doesn't track per-input latency. - * The actual streaming latency is measured via WebRTC stats in getStreamingStats(). - */ -export function getInputLatencyStats(): { ipc: number; send: number; total: number; rate: number } { - // Absolute mode doesn't track individual input latency - use WebRTC stats instead - return { ipc: 0, send: 0, total: 0, rate: 0 }; -} - -/** - * Set cursor visibility for streaming. - * We always use absolute mouse coordinates since the server renders the cursor in the video stream. - * This function only controls whether the local cursor is hidden (fullscreen) or visible (windowed). - * - * @param mode - 'pointerlock' hides cursor, 'absolute' shows cursor - */ -export async function setInputCaptureMode(mode: 'pointerlock' | 'absolute'): Promise { - console.log("Setting cursor visibility:", mode === 'pointerlock' ? 'hidden' : 'visible'); - inputCaptureMode = 'absolute'; // Always use absolute coordinates - inputCaptureActive = true; - - const video = document.getElementById("gfn-stream-video") as HTMLVideoElement; - const container = document.getElementById("streaming-container"); - - if (mode === 'pointerlock') { - // Hide cursor via CSS for fullscreen gaming - if (video) video.style.cursor = 'none'; - if (container) container.style.cursor = 'none'; - document.body.style.cursor = 'none'; - console.log("Cursor hidden for fullscreen"); - } else { - // Show cursor for windowed mode - if (video) video.style.cursor = 'default'; - if (container) container.style.cursor = 'default'; - document.body.style.cursor = 'default'; - console.log("Cursor visible for windowed mode"); - } -} - -/** - * Suspend cursor capture temporarily (e.g., when window loses focus) - * On Windows, releases the cursor clip so user can interact with other windows - */ -export async function suspendCursorCapture(): Promise { - // Only need to handle this in fullscreen/pointer lock mode - if (inputCaptureMode === 'pointerlock' && inputCaptureActive) { - try { - // Release cursor clip on Windows when window loses focus - await invoke("unclip_cursor"); - console.log("Cursor clip suspended (window lost focus)"); - } catch { - // Ignore errors - command may not exist on non-Windows - } - } -} - -/** - * Resume cursor capture (e.g., when window regains focus) - * On Windows, re-clips the cursor to the window - */ -export async function resumeCursorCapture(): Promise { - // Only need to handle this in fullscreen/pointer lock mode - if (inputCaptureMode === 'pointerlock' && inputCaptureActive) { - try { - // Re-clip cursor to window on Windows when window regains focus - await invoke("clip_cursor"); - console.log("Cursor clip resumed (window regained focus)"); - } catch { - // Ignore errors - command may not exist on non-Windows - } - } -} - -/** - * Check if we're currently using native cursor capture - */ -export function isNativeCursorCaptured(): boolean { - return false; // We don't use native capture anymore -} - -/** - * Get current input capture mode - */ -export function getInputCaptureMode(): 'pointerlock' | 'absolute' { - return inputCaptureMode; -} - -/** - * Set up input capture on the video element - */ -export function setupInputCapture(videoElement: HTMLVideoElement): () => void { - // Track if we have pointer lock - let hasPointerLock = false; - - // Get video element bounds for absolute mouse calculations - const getVideoBounds = () => videoElement.getBoundingClientRect(); - - // Convert page coordinates to video-relative coordinates (0-65535 range for GFN) - const toAbsoluteCoords = (pageX: number, pageY: number) => { - const bounds = getVideoBounds(); - const relX = Math.max(0, Math.min(1, (pageX - bounds.left) / bounds.width)); - const relY = Math.max(0, Math.min(1, (pageY - bounds.top) / bounds.height)); - // GFN uses 16-bit absolute coordinates (0-65535) - return { - x: Math.round(relX * 65535), - y: Math.round(relY * 65535), - }; - }; - - // Check if mouse is over video element - const isMouseOverVideo = (e: MouseEvent) => { - const bounds = getVideoBounds(); - return ( - e.clientX >= bounds.left && - e.clientX <= bounds.right && - e.clientY >= bounds.top && - e.clientY <= bounds.bottom - ); - }; - - // Check if pointerrawupdate is supported (lower latency than pointermove) - const supportsRawUpdate = "onpointerrawupdate" in videoElement; - - // Mouse move handler - uses relative movement in pointer lock, absolute otherwise - const handleMouseMove = (e: MouseEvent | PointerEvent) => { - // In pointer lock mode (fullscreen), use relative movement - if (document.pointerLockElement === videoElement) { - if (e.movementX !== 0 || e.movementY !== 0) { - sendInputEvent({ - type: "mouse_move", - data: { dx: e.movementX, dy: e.movementY }, - }); - } - } else if (inputCaptureActive || isMouseOverVideo(e)) { - // In windowed mode, use absolute coordinates - const coords = toAbsoluteCoords(e.clientX, e.clientY); - sendInputEvent({ - type: "mouse_move", - data: { - dx: e.movementX, - dy: e.movementY, - absolute: true, - x: coords.x, - y: coords.y, - }, - }); - } - }; - - // Mouse button down - const handleMouseDown = (e: MouseEvent) => { - if (inputCaptureActive || isMouseOverVideo(e)) { - // Activate input capture on click - if (!inputCaptureActive) { - inputCaptureActive = true; - videoElement.focus(); - console.log("Input capture activated"); - } - - sendInputEvent({ - type: "mouse_button", - data: { button: e.button, pressed: true }, - }); - e.preventDefault(); - } - }; - - // Mouse button up - const handleMouseUp = (e: MouseEvent) => { - if (inputCaptureActive) { - sendInputEvent({ - type: "mouse_button", - data: { button: e.button, pressed: false }, - }); - e.preventDefault(); - } - }; - - // Mouse wheel - const handleWheel = (e: WheelEvent) => { - if (inputCaptureActive || isMouseOverVideo(e)) { - sendInputEvent({ - type: "mouse_wheel", - data: { deltaX: e.deltaX, deltaY: e.deltaY }, - }); - e.preventDefault(); - } - }; - - // Keyboard handlers - const handleKeyDown = (e: KeyboardEvent) => { - if (inputCaptureActive) { - const vkCode = getVirtualKeyCode(e); - const modifiers = getModifierFlags(e); - - sendInputEvent({ - type: "key", - data: { - keyCode: vkCode, - scanCode: 0, - pressed: true, - modifiers, - }, - }); - - e.preventDefault(); - } - }; - - const handleKeyUp = (e: KeyboardEvent) => { - if (inputCaptureActive) { - const vkCode = getVirtualKeyCode(e); - const modifiers = getModifierFlags(e); - - sendInputEvent({ - type: "key", - data: { - keyCode: vkCode, - scanCode: 0, - pressed: false, - modifiers, - }, - }); - - e.preventDefault(); - } - }; - - // Helper to request pointer lock with keyboard lock (Windows only) - // Keyboard lock must be acquired BEFORE pointer lock to capture Escape key - const requestPointerLockWithKeyboardLock = async () => { - // On Windows, lock the Escape key first to prevent Chrome from exiting pointer lock - if (!isMacOS && navigator.keyboard?.lock) { - try { - await navigator.keyboard.lock(["Escape"]); - console.log("Keyboard lock enabled (Escape key captured)"); - } catch (e) { - console.warn("Keyboard lock failed:", e); - } - } - - // Now request pointer lock - try { - // Use unadjustedMovement for raw mouse input without OS acceleration - await (videoElement as any).requestPointerLock({ unadjustedMovement: true }); - } catch { - // Fallback if unadjustedMovement not supported - videoElement.requestPointerLock(); - } - }; - - // Click handler - activate input capture - const handleClick = () => { - if (!inputCaptureActive) { - inputCaptureActive = true; - videoElement.focus(); - console.log("Input capture activated (click)"); - } - }; - - // Context menu handler - prevent default when captured - const handleContextMenu = (e: MouseEvent) => { - if (hasPointerLock || inputCaptureActive) { - e.preventDefault(); - } - }; - - // Pointer lock change - const handlePointerLockChange = () => { - hasPointerLock = document.pointerLockElement === videoElement; - console.log("Pointer lock:", hasPointerLock); - if (hasPointerLock) { - inputCaptureActive = true; - } else { - // Release keyboard lock when pointer lock is released - if (!isMacOS && navigator.keyboard?.unlock) { - navigator.keyboard.unlock(); - console.log("Keyboard lock released"); - } - } - - // Hide/show main app UI based on pointer lock state - const appHeader = document.getElementById("app-header"); - const statusBar = document.getElementById("status-bar"); - const streamHeader = document.querySelector(".stream-header") as HTMLElement; - - if (hasPointerLock) { - // Hide main app UI when mouse is locked - if (appHeader) appHeader.style.display = "none"; - if (statusBar) statusBar.style.display = "none"; - if (streamHeader) streamHeader.style.display = "none"; - } else { - // Show main app UI when mouse is unlocked - if (appHeader) appHeader.style.display = ""; - if (statusBar) statusBar.style.display = ""; - if (streamHeader) streamHeader.style.display = ""; - } - }; - - // Pointer lock error - const handlePointerLockError = () => { - // On macOS/Windows, we use native cursor capture, so ignore browser pointer lock errors - if (isMacOS || isWindows) return; - - console.error("Pointer lock error - falling back to absolute mode"); - hasPointerLock = false; - // Fall back to absolute mode if pointer lock fails - if (inputCaptureMode === 'pointerlock') { - inputCaptureMode = 'absolute'; - inputCaptureActive = true; - } - }; - - // Track if we were in fullscreen when focus was lost (for re-locking on focus) - let wasInFullscreenPointerLock = false; - let fullscreenTimeoutId: ReturnType | null = null; - - // Blur handler - deactivate capture when window loses focus - const handleBlur = () => { - if (inputCaptureActive) { - console.log("Window blurred, input capture paused"); - - // Check if we're currently in fullscreen with pointer lock - const inFullscreen = isFullscreen(); - - // Remember if we had pointer lock in fullscreen mode - // Note: Browser may exit fullscreen on blur, so check both conditions - if ((hasPointerLock || inFullscreen) && inputCaptureMode === 'pointerlock') { - wasInFullscreenPointerLock = true; - console.log("Was in fullscreen pointer lock mode - will re-enter fullscreen on focus"); - } - } - }; - - // Focus handler - re-capture mouse when window regains focus - const handleFocus = async () => { - if (inputCaptureActive && wasInFullscreenPointerLock) { - console.log("Window focused, re-entering fullscreen mode"); - - // Check if we're still in fullscreen (browser may have exited it on blur) - const inFullscreen = isFullscreen(); - - wasInFullscreenPointerLock = false; - - // Cancel any pending fullscreen timeout to prevent stacking - if (fullscreenTimeoutId) { - clearTimeout(fullscreenTimeoutId); - fullscreenTimeoutId = null; - } - - // Small delay to ensure window is fully focused - fullscreenTimeoutId = setTimeout(async () => { - fullscreenTimeoutId = null; - try { - if (!inFullscreen) { - // Re-enter fullscreen - this will trigger handleFullscreenChange which requests pointer lock - console.log("Re-entering fullscreen after focus regained"); - await videoElement.requestFullscreen(); - } else if (!document.pointerLockElement) { - // Still in fullscreen but lost pointer lock, re-request it - console.log("Re-requesting pointer lock after focus regained"); - await requestPointerLockWithKeyboardLock(); - } - } catch (e) { - console.warn("Failed to re-enter fullscreen/pointer lock:", e); - } - }, 150); - } - }; - - // Fullscreen change handler - use pointer lock in fullscreen to confine cursor - const handleFullscreenChange = async () => { - const isFullscreen = !!( - document.fullscreenElement || - (document as any).webkitFullscreenElement || - (document as any).mozFullScreenElement || - (document as any).msFullscreenElement - ); - - console.log("Fullscreen changed:", isFullscreen); - - if (isFullscreen) { - // Request pointer lock to confine cursor - this is how official GFN client works - inputCaptureMode = 'pointerlock'; - inputCaptureActive = true; - - // Use keyboard lock + pointer lock to capture Escape key (like official GFN client) - // This prevents browser from immediately exiting pointer lock when ESC is pressed - await requestPointerLockWithKeyboardLock(); - } else { - // Release keyboard lock first - if (navigator.keyboard?.unlock) { - navigator.keyboard.unlock(); - console.log("Keyboard lock released (fullscreen exit)"); - } - // Exit pointer lock when leaving fullscreen - if (document.pointerLockElement) { - document.exitPointerLock(); - } - inputCaptureMode = 'absolute'; - inputCaptureActive = true; - console.log("Windowed: pointer lock released"); - } - }; - - // Make video element focusable - videoElement.tabIndex = 0; - - // Add event listeners - videoElement.addEventListener("click", handleClick); - videoElement.addEventListener("contextmenu", handleContextMenu); - document.addEventListener("pointerlockchange", handlePointerLockChange); - document.addEventListener("pointerlockerror", handlePointerLockError); - document.addEventListener("fullscreenchange", handleFullscreenChange); - document.addEventListener("webkitfullscreenchange", handleFullscreenChange); - document.addEventListener("mozfullscreenchange", handleFullscreenChange); - document.addEventListener("MSFullscreenChange", handleFullscreenChange); - // Use pointerrawupdate for lowest latency when available, fallback to pointermove - if (supportsRawUpdate) { - document.addEventListener("pointerrawupdate", handleMouseMove as EventListener); - console.log("Using pointerrawupdate for low-latency mouse input"); - } else { - document.addEventListener("pointermove", handleMouseMove as EventListener); - console.log("Using pointermove for mouse input (pointerrawupdate not supported)"); - } - document.addEventListener("mousedown", handleMouseDown); - document.addEventListener("mouseup", handleMouseUp); - document.addEventListener("wheel", handleWheel, { passive: false }); - document.addEventListener("keydown", handleKeyDown, { passive: false }); - document.addEventListener("keyup", handleKeyUp, { passive: false }); - window.addEventListener("blur", handleBlur); - window.addEventListener("focus", handleFocus); - - // Start in absolute mode - immediately active - console.log("Input capture set up in", inputCaptureMode, "mode"); - console.log("Double-click video to enter fullscreen with pointer lock"); - if (inputCaptureMode === 'absolute') { - // Auto-activate after a short delay to allow video to render - setTimeout(() => { - inputCaptureActive = true; - videoElement.focus(); - console.log("Input capture auto-activated"); - }, 500); - } - - // Return cleanup function - return () => { - inputCaptureActive = false; - videoElement.removeEventListener("click", handleClick); - videoElement.removeEventListener("contextmenu", handleContextMenu); - document.removeEventListener("pointerlockchange", handlePointerLockChange); - document.removeEventListener("pointerlockerror", handlePointerLockError); - document.removeEventListener("fullscreenchange", handleFullscreenChange); - document.removeEventListener("webkitfullscreenchange", handleFullscreenChange); - document.removeEventListener("mozfullscreenchange", handleFullscreenChange); - document.removeEventListener("MSFullscreenChange", handleFullscreenChange); - if (supportsRawUpdate) { - document.removeEventListener("pointerrawupdate", handleMouseMove as EventListener); - } else { - document.removeEventListener("pointermove", handleMouseMove as EventListener); - } - document.removeEventListener("mousedown", handleMouseDown); - document.removeEventListener("mouseup", handleMouseUp); - document.removeEventListener("wheel", handleWheel); - document.removeEventListener("keydown", handleKeyDown); - document.removeEventListener("keyup", handleKeyUp); - window.removeEventListener("blur", handleBlur); - window.removeEventListener("focus", handleFocus); - - if (document.pointerLockElement === videoElement) { - document.exitPointerLock(); - } - - // Exit fullscreen if active (cross-browser) - const fullscreenElement = document.fullscreenElement || - (document as any).webkitFullscreenElement || - (document as any).mozFullScreenElement || - (document as any).msFullscreenElement; - - if (fullscreenElement) { - if (document.exitFullscreen) { - document.exitFullscreen().catch(() => {}); - } else if ((document as any).webkitExitFullscreen) { - (document as any).webkitExitFullscreen(); - } else if ((document as any).mozCancelFullScreen) { - (document as any).mozCancelFullScreen(); - } else if ((document as any).msExitFullscreen) { - (document as any).msExitFullscreen(); - } - } - }; -} - -/** - * Get streaming statistics - */ -export async function getStreamingStats(): Promise { - if (!streamingState.peerConnection) { - return null; - } - - const stats = await streamingState.peerConnection.getStats(); - let fps = 0; - let latency = 0; - let bitrate = 0; - let packetLoss = 0; - let resolution = ""; - let codec = ""; - - stats.forEach((report) => { - if (report.type === "inbound-rtp" && report.kind === "video") { - fps = report.framesPerSecond || 0; - resolution = `${report.frameWidth || 0}x${report.frameHeight || 0}`; - - if (report.packetsLost !== undefined && report.packetsReceived) { - packetLoss = report.packetsLost / (report.packetsReceived + report.packetsLost); - } - } - - if (report.type === "candidate-pair" && report.state === "succeeded") { - latency = report.currentRoundTripTime ? report.currentRoundTripTime * 1000 : 0; - } - - if (report.type === "codec" && report.mimeType?.includes("video")) { - codec = report.mimeType.replace("video/", ""); - // Normalize HEVC to H265 for display consistency - if (codec.toUpperCase() === "HEVC") { - codec = "H265"; - } - } - }); - - // Calculate real-time bitrate from bytes received over time - const videoStats = Array.from(stats.values()).find( - (s) => s.type === "inbound-rtp" && s.kind === "video" - ); - if (videoStats && videoStats.bytesReceived !== undefined) { - const now = Date.now(); - const currentBytes = videoStats.bytesReceived; - - if (lastBytesTimestamp > 0 && lastBytesReceived > 0) { - const timeDelta = (now - lastBytesTimestamp) / 1000; // seconds - const bytesDelta = currentBytes - lastBytesReceived; - - if (timeDelta > 0 && bytesDelta >= 0) { - // Calculate kbps: (bytes * 8 bits/byte) / 1000 / seconds - bitrate = Math.round((bytesDelta * 8) / 1000 / timeDelta); - } - } - - // Update tracking for next calculation - lastBytesReceived = currentBytes; - lastBytesTimestamp = now; - } - - const currentStats: StreamingStats = { - fps, - latency_ms: Math.round(latency), - bitrate_kbps: bitrate, - packet_loss: packetLoss, - resolution, - codec, - }; - - streamingState.stats = currentStats; - return currentStats; -} - -/** - * Stop streaming and clean up resources - */ -export function stopStreaming(): void { - console.log("Stopping streaming"); - - // Clear heartbeat interval - if (heartbeatInterval) { - clearInterval(heartbeatInterval); - heartbeatInterval = null; - } - - // Clear live edge interval - if (streamingState.liveEdgeIntervalId) { - clearInterval(streamingState.liveEdgeIntervalId); - streamingState.liveEdgeIntervalId = undefined; - } - - // Close WebSocket - if (streamingState.signalingSocket) { - // Send bye message before closing - if (streamingState.signalingSocket.readyState === WebSocket.OPEN) { - sendSignalingMessage(streamingState.signalingSocket, { type: "bye" }); - } - streamingState.signalingSocket.close(1000, "User requested stop"); - streamingState.signalingSocket = null; - } - - // Close data channels - streamingState.dataChannels.forEach((channel) => { - channel.close(); - }); - streamingState.dataChannels.clear(); - - // Close peer connection - if (streamingState.peerConnection) { - streamingState.peerConnection.close(); - streamingState.peerConnection = null; - } - - // Close audio context - if (streamingState.audioContext) { - streamingState.audioContext.close(); - streamingState.audioContext = null; - } - - // Remove video element - if (streamingState.videoElement) { - streamingState.videoElement.srcObject = null; - streamingState.videoElement.remove(); - streamingState.videoElement = null; - } - - // Reset state - streamingState.connected = false; - streamingState.sessionId = null; - streamingState.stats = null; - streamingState.retryCount = 0; - streamingState.inputDebugLogged = undefined; - signalingSeq = 0; - gfnAckId = 0; - sharedMediaStream = null; - isReconnect = false; // Reset for fresh session - inputHandshakeComplete = false; - inputHandshakeAttempts = 0; - inputProtocolVersion = 0; - streamStartTime = 0; - inputEventCount = 0; - lastInputLogTime = 0; - inputCaptureActive = false; - - // Reset bitrate tracking - lastBytesReceived = 0; - lastBytesTimestamp = 0; -} - -/** - * Check if streaming is active - */ -export function isStreamingActive(): boolean { - return streamingState.connected && streamingState.peerConnection !== null; -} - -/** - * Get current streaming state - */ -export function getStreamingState(): StreamingState { - return { ...streamingState }; -} - -/** - * Set video quality during stream - */ -export function setStreamingQuality(quality: { - maxBitrate?: number; - maxFramerate?: number; -}): void { - if (!streamingState.peerConnection) { - return; - } - - const senders = streamingState.peerConnection.getSenders(); - senders.forEach((sender) => { - if (sender.track?.kind === "video") { - const params = sender.getParameters(); - if (params.encodings && params.encodings.length > 0) { - if (quality.maxBitrate) { - params.encodings[0].maxBitrate = quality.maxBitrate * 1000; - } - if (quality.maxFramerate) { - params.encodings[0].maxFramerate = quality.maxFramerate; - } - sender.setParameters(params); - } - } - }); -} - -/** - * Toggle fullscreen mode - */ -export function toggleFullscreen(): void { - if (!streamingState.videoElement) { - return; - } - - // Cross-browser fullscreen check - const fullscreenElement = document.fullscreenElement || - (document as any).webkitFullscreenElement || - (document as any).mozFullScreenElement || - (document as any).msFullscreenElement; - - const element = streamingState.videoElement; - - if (fullscreenElement) { - // Exit fullscreen - cross-browser - if (document.exitFullscreen) { - document.exitFullscreen(); - } else if ((document as any).webkitExitFullscreen) { - (document as any).webkitExitFullscreen(); - } else if ((document as any).mozCancelFullScreen) { - (document as any).mozCancelFullScreen(); - } else if ((document as any).msExitFullscreen) { - (document as any).msExitFullscreen(); - } - } else { - // Enter fullscreen - cross-browser (with Safari/WebKit support for macOS) - if (element.requestFullscreen) { - element.requestFullscreen(); - } else if ((element as any).webkitRequestFullscreen) { - (element as any).webkitRequestFullscreen(); - } else if ((element as any).mozRequestFullScreen) { - (element as any).mozRequestFullScreen(); - } else if ((element as any).msRequestFullscreen) { - (element as any).msRequestFullscreen(); - } - } -} - -/** - * Set audio volume (0-1) - */ -export function setVolume(volume: number): void { - if (streamingState.videoElement) { - streamingState.videoElement.volume = Math.max(0, Math.min(1, volume)); - } -} - -/** - * Toggle audio mute - */ -export function toggleMute(): boolean { - if (streamingState.videoElement) { - streamingState.videoElement.muted = !streamingState.videoElement.muted; - return streamingState.videoElement.muted; - } - return false; -} - - -/** - * Get the current media stream for recording - */ -export function getMediaStream(): MediaStream | null { - return sharedMediaStream; -} - -/** - * Get the current video element for screenshot capture - */ -export function getVideoElement(): HTMLVideoElement | null { - return streamingState.videoElement; -} - diff --git a/src/styles/main.css b/src/styles/main.css deleted file mode 100644 index d48d8fb..0000000 --- a/src/styles/main.css +++ /dev/null @@ -1,1814 +0,0 @@ -/* GFN Custom Client - Dark Theme */ -:root { - --bg-primary: #1a1a1a; - --bg-secondary: #252525; - --bg-tertiary: #2d2d2d; - --bg-hover: #3a3a3a; - --text-primary: #ffffff; - --text-secondary: #b3b3b3; - --text-muted: #666666; - --accent-green: #76b900; - --accent-green-hover: #8dd100; - --border-color: #404040; - --shadow: 0 4px 12px rgba(0, 0, 0, 0.4); - --radius: 8px; - --radius-sm: 4px; - /* Latency colors */ - --latency-excellent: #00c853; - --latency-good: #76b900; - --latency-fair: #ffc107; - --latency-poor: #ff9800; - --latency-bad: #f44336; - --latency-offline: #666666; -} - -* { - margin: 0; - padding: 0; - box-sizing: border-box; -} - -body { - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif; - background-color: var(--bg-primary); - color: var(--text-primary); - line-height: 1.5; - overflow: hidden; -} - -#app { - display: flex; - flex-direction: column; - height: 100vh; -} - -/* Header */ -#app-header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 24px; - height: 56px; - background: var(--bg-secondary); - border-bottom: 1px solid var(--border-color); - -webkit-app-region: drag; -} - -.header-left, .header-right { - display: flex; - align-items: center; - gap: 16px; - -webkit-app-region: no-drag; - flex: 0 0 auto; -} - -.header-center { - display: flex; - align-items: center; - justify-content: center; - flex: 1; - -webkit-app-region: no-drag; -} - -.main-nav { - display: flex; - gap: 4px; -} - -.nav-item { - display: flex; - align-items: center; - gap: 8px; - padding: 8px 16px; - color: var(--text-secondary); - text-decoration: none; - border-radius: var(--radius-sm); - transition: all 0.2s; - font-size: 14px; -} - -.nav-item .nav-icon { - width: 18px; - height: 18px; -} - -.nav-item:hover { - color: var(--text-primary); - background: var(--bg-hover); -} - -.nav-item.active { - color: var(--accent-green); - background: rgba(118, 185, 0, 0.1); -} - -/* Search */ -.search-container { - position: relative; - display: flex; - align-items: center; -} - -.search-icon { - position: absolute; - left: 14px; - width: 16px; - height: 16px; - opacity: 0.5; - pointer-events: none; - color: var(--text-muted); -} - -#search-input { - width: 400px; - max-width: 50vw; - padding: 10px 16px 10px 40px; - background: var(--bg-tertiary); - border: 1px solid var(--border-color); - border-radius: 24px; - color: var(--text-primary); - font-size: 14px; - outline: none; - transition: all 0.2s; -} - -#search-input:focus { - border-color: var(--accent-green); - background: var(--bg-hover); -} - -#search-input::placeholder { - color: var(--text-muted); -} - -/* Search Dropdown */ -.search-container { - position: relative; -} - -.search-dropdown { - position: absolute; - top: 100%; - left: 0; - right: 0; - margin-top: 8px; - background: var(--bg-secondary); - border: 1px solid var(--border-color); - border-radius: var(--radius-md); - box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4); - z-index: 1000; - max-height: 400px; - overflow-y: auto; -} - -.search-dropdown.hidden { - display: none; -} - -.search-dropdown-item { - display: flex; - align-items: center; - gap: 12px; - padding: 10px 12px; - cursor: pointer; - transition: background 0.15s; -} - -.search-dropdown-item:hover { - background: var(--bg-hover); -} - -.search-dropdown-item:first-child { - border-radius: var(--radius-md) var(--radius-md) 0 0; -} - -.search-dropdown-image { - width: 48px; - height: 64px; - object-fit: cover; - border-radius: var(--radius-sm); - flex-shrink: 0; -} - -.search-dropdown-info { - flex: 1; - min-width: 0; -} - -.search-dropdown-title { - font-size: 14px; - font-weight: 500; - color: var(--text-primary); - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.search-dropdown-store { - font-size: 12px; - color: var(--text-muted); - margin-top: 2px; -} - -.search-dropdown-empty { - padding: 16px; - text-align: center; - color: var(--text-muted); - font-size: 14px; -} - -.search-dropdown-viewall { - padding: 12px 16px; - text-align: center; - color: var(--accent-green); - font-size: 13px; - cursor: pointer; - border-top: 1px solid var(--border-color); - transition: background 0.15s; -} - -.search-dropdown-viewall:hover { - background: var(--bg-hover); -} - -/* Search Results Header */ -.search-results-header { - display: flex; - align-items: center; - justify-content: space-between; - margin-bottom: 24px; - padding: 0 8px; -} - -.search-results-header h2 { - font-size: 20px; - font-weight: 600; - color: var(--text-primary); - margin: 0; -} - -.search-results-count { - font-size: 14px; - color: var(--text-muted); -} - -/* Buttons */ -.btn { - padding: 8px 20px; - border: none; - border-radius: var(--radius-sm); - font-size: 14px; - font-weight: 500; - cursor: pointer; - transition: all 0.2s; - background: var(--bg-tertiary); - color: var(--text-primary); -} - -.btn:hover { - background: var(--bg-hover); -} - -.btn-primary { - background: var(--accent-green); - color: #000; -} - -.btn-primary:hover { - background: var(--accent-green-hover); -} - -.btn-small { - padding: 4px 12px; - font-size: 12px; -} - -.icon-btn { - display: flex; - align-items: center; - justify-content: center; - width: 36px; - height: 36px; - border: none; - border-radius: 50%; - background: var(--bg-tertiary); - color: var(--text-secondary); - cursor: pointer; - transition: all 0.2s; -} - -.icon-btn svg { - width: 18px; - height: 18px; -} - -/* Buttons with icons */ -.btn { - display: inline-flex; - align-items: center; - gap: 8px; -} - -.btn svg { - width: 16px; - height: 16px; - flex-shrink: 0; -} - -.btn-large svg { - width: 18px; - height: 18px; -} - -.btn.favorited { - background: rgba(239, 68, 68, 0.2); - color: #ef4444; -} - -.btn.favorited svg { - fill: currentColor; -} - -.icon-btn:hover { - background: var(--bg-hover); - color: var(--text-primary); -} - -/* User Section */ -.user-section { - display: flex; - align-items: center; -} - -.user-menu { - display: flex; - align-items: center; - gap: 12px; -} - -.user-info { - display: flex; - flex-direction: column; - align-items: flex-end; - gap: 2px; - text-align: right; -} - -#user-name { - font-weight: 500; - font-size: 13px; -} - -#logout-btn { - color: var(--text-muted); -} - -#logout-btn:hover { - color: #f44336; - background: rgba(244, 67, 54, 0.1); -} - -.user-tier { - font-size: 10px; - padding: 2px 6px; - border-radius: 4px; - text-transform: uppercase; - font-weight: 600; -} - -.tier-free { - background: #4a4a4a; - color: #ccc; -} - -.tier-priority { - background: linear-gradient(135deg, #1e88e5, #1565c0); - color: #fff; -} - -.tier-ultimate { - background: linear-gradient(135deg, #76b900, #5a8f00); - color: #fff; -} - -.tier-info { - display: flex; - align-items: center; - gap: 8px; -} - -.user-time { - font-size: 11px; - color: #888; - font-weight: 500; -} - -/* Main Content */ -#main-content { - flex: 1; - overflow-y: auto; - padding: 24px; -} - -.view:not(.active) { - display: none; -} - -.view.active { - display: block; -} - -.hidden:not(.view) { - display: none !important; -} - -/* Content Sections */ -.content-section { - margin-bottom: 40px; -} - -.content-section h2 { - font-size: 24px; - font-weight: 600; - margin-bottom: 20px; - color: var(--text-primary); -} - -/* Games Grid */ -.games-grid { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(180px, 1fr)); - gap: 20px; -} - -/* Grid Loading Spinner */ -.grid-loading { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 60px 20px; - grid-column: 1 / -1; - color: var(--text-secondary); - gap: 12px; -} - -.grid-loading-spinner { - width: 40px; - height: 40px; - border: 3px solid rgba(118, 185, 0, 0.2); - border-top-color: var(--accent); - border-radius: 50%; - animation: grid-spin 0.8s linear infinite; -} - -@keyframes grid-spin { - to { - transform: rotate(360deg); - } -} - -/* Login Prompt */ -.login-prompt { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - padding: 60px 20px; - text-align: center; - color: var(--text-secondary); - grid-column: 1 / -1; -} - -.login-prompt-icon { - width: 48px; - height: 48px; - margin-bottom: 16px; - color: var(--text-muted); -} - -.login-prompt p { - font-size: 16px; - margin-bottom: 20px; -} - -.game-card { - background: var(--bg-secondary); - border-radius: var(--radius); - overflow: hidden; - cursor: pointer; - transition: transform 0.2s, box-shadow 0.2s; -} - -.game-card:hover { - transform: translateY(-4px); - box-shadow: var(--shadow); -} - -.game-card-image { - width: 100%; - height: auto; - aspect-ratio: 3/4; - object-fit: cover; - background: var(--bg-tertiary); - display: block; - min-height: 200px; -} - -.game-card-info { - padding: 12px; -} - -.game-card-title { - font-size: 14px; - font-weight: 500; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -.game-card-store { - font-size: 12px; - color: var(--text-muted); - margin-top: 4px; -} - -/* Library Header */ -.library-header, .store-header { - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 24px; -} - -.library-filters, .store-filters { - display: flex; - gap: 12px; -} - -.library-filters .custom-dropdown, -.store-filters .custom-dropdown { - width: auto; - min-width: 140px; -} - -/* Hide native selects - we use custom dropdowns */ -select { - display: none; -} - -/* Custom Dropdown Component */ -.custom-dropdown { - position: relative; - width: 100%; -} - -.dropdown-trigger { - display: flex; - align-items: center; - justify-content: space-between; - padding: 10px 14px; - background: var(--bg-tertiary); - border: 1px solid var(--border-color); - border-radius: var(--radius-sm); - color: var(--text-primary); - font-size: 14px; - cursor: pointer; - transition: all 0.15s ease; - user-select: none; -} - -.dropdown-trigger:hover { - background: var(--bg-hover); - border-color: var(--text-muted); -} - -.dropdown-trigger:focus, -.custom-dropdown.open .dropdown-trigger { - border-color: var(--accent-green); - outline: none; -} - -.dropdown-trigger .dropdown-text { - flex: 1; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.dropdown-trigger .dropdown-arrow { - margin-left: 8px; - width: 14px; - height: 14px; - color: var(--text-muted); - transition: transform 0.2s ease; - flex-shrink: 0; -} - -.custom-dropdown.open .dropdown-arrow { - transform: rotate(180deg); -} - -.dropdown-menu { - position: absolute; - top: calc(100% + 4px); - left: 0; - right: 0; - background: var(--bg-secondary); - border: 1px solid var(--border-color); - border-radius: var(--radius-sm); - box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4); - z-index: 100; - max-height: 240px; - overflow-y: auto; - opacity: 0; - visibility: hidden; - transform: translateY(-8px); - transition: all 0.15s ease; -} - -.custom-dropdown.open .dropdown-menu { - opacity: 1; - visibility: visible; - transform: translateY(0); -} - -.dropdown-option { - display: flex; - align-items: center; - padding: 10px 14px; - color: var(--text-primary); - font-size: 14px; - cursor: pointer; - transition: background 0.1s ease; -} - -.dropdown-option:hover { - background: var(--bg-hover); -} - -.dropdown-option.selected { - background: rgba(118, 185, 0, 0.15); - color: var(--accent-green); -} - -.dropdown-option.selected::before { - content: "✓"; - margin-right: 8px; - font-size: 12px; -} - -/* Latency color classes for region dropdown */ -.dropdown-option.latency-excellent { color: #00c853; } -.dropdown-option.latency-good { color: #76b900; } -.dropdown-option.latency-fair { color: #ffc107; } -.dropdown-option.latency-poor { color: #ff9800; } -.dropdown-option.latency-bad { color: #f44336; } -.dropdown-option.latency-excellent.selected, -.dropdown-option.latency-good.selected { color: var(--accent-green); } -.dropdown-option.latency-fair.selected { color: #ffc107; } -.dropdown-option.latency-poor.selected { color: #ff9800; } -.dropdown-option.latency-bad.selected { color: #f44336; } - -/* Trigger inherits latency color */ -.dropdown-trigger.latency-excellent .dropdown-text { color: #00c853; } -.dropdown-trigger.latency-good .dropdown-text { color: #76b900; } -.dropdown-trigger.latency-fair .dropdown-text { color: #ffc107; } -.dropdown-trigger.latency-poor .dropdown-text { color: #ff9800; } -.dropdown-trigger.latency-bad .dropdown-text { color: #f44336; } - -.dropdown-option:first-child { - border-radius: var(--radius-sm) var(--radius-sm) 0 0; -} - -.dropdown-option:last-child { - border-radius: 0 0 var(--radius-sm) var(--radius-sm); -} - -.dropdown-option:only-child { - border-radius: var(--radius-sm); -} - -/* Dropdown scrollbar */ -.dropdown-menu::-webkit-scrollbar { - width: 6px; -} - -.dropdown-menu::-webkit-scrollbar-track { - background: transparent; -} - -.dropdown-menu::-webkit-scrollbar-thumb { - background: var(--bg-hover); - border-radius: 3px; -} - -.dropdown-menu::-webkit-scrollbar-thumb:hover { - background: var(--text-muted); -} - -/* Compact dropdown variant for filters */ -.custom-dropdown.compact .dropdown-trigger { - padding: 6px 10px; - font-size: 13px; -} - -.custom-dropdown.compact .dropdown-option { - padding: 8px 10px; - font-size: 13px; -} - -/* Modal */ -.modal { - position: fixed; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(0, 0, 0, 0.8); - display: flex; - align-items: center; - justify-content: center; - z-index: 1000; -} - -.modal-content { - background: var(--bg-secondary); - border-radius: var(--radius); - padding: 24px; - max-width: 600px; - width: 90%; - max-height: 80vh; - overflow-y: auto; - position: relative; -} - -.modal-close { - position: absolute; - top: 16px; - right: 16px; - width: 32px; - height: 32px; - border: none; - background: var(--bg-tertiary); - color: var(--text-primary); - font-size: 24px; - border-radius: 50%; - cursor: pointer; - display: flex; - align-items: center; - justify-content: center; -} - -.modal-close:hover { - background: var(--bg-hover); -} - -/* Session Modals (Active Session & Session Conflict) */ -.session-modal-content { - max-width: 450px; - text-align: center; -} - -.session-modal-header { - display: flex; - flex-direction: column; - align-items: center; - gap: 12px; - margin-bottom: 16px; -} - -.session-icon { - width: 64px; - height: 64px; - background: linear-gradient(135deg, var(--accent-green) 0%, var(--accent-green-hover) 100%); - border-radius: 50%; - display: flex; - align-items: center; - justify-content: center; - color: white; - box-shadow: 0 4px 12px rgba(118, 185, 0, 0.3); -} - -.session-icon svg { - width: 28px; - height: 28px; -} - -.session-icon.warning { - background: linear-gradient(135deg, var(--latency-poor) 0%, var(--latency-fair) 100%); - box-shadow: 0 4px 12px rgba(255, 152, 0, 0.3); -} - -.session-modal-header h2 { - margin: 0; - font-size: 22px; - font-weight: 600; - color: var(--text-primary); -} - -.session-modal-description { - color: var(--text-secondary); - font-size: 14px; - margin-bottom: 20px; - line-height: 1.5; -} - -.session-info-card { - background: var(--bg-tertiary); - border: 1px solid var(--border-color); - border-radius: var(--radius); - padding: 16px; - margin-bottom: 24px; - text-align: left; -} - -.session-info-row { - display: flex; - justify-content: space-between; - align-items: center; - padding: 8px 0; - border-bottom: 1px solid var(--border-color); -} - -.session-info-row:last-child { - border-bottom: none; -} - -.session-label { - color: var(--text-muted); - font-size: 13px; - text-transform: uppercase; - letter-spacing: 0.5px; -} - -.session-value { - color: var(--text-primary); - font-size: 14px; - font-weight: 500; -} - -.session-modal-actions { - display: flex; - flex-direction: column; - gap: 10px; -} - -.session-modal-actions .btn { - width: 100%; - justify-content: center; -} - -.session-modal-actions .btn-large { - padding: 14px 24px; - font-size: 15px; -} - -/* Update Modal */ -.update-modal-content { - max-width: 500px; - text-align: center; -} - -.update-header { - display: flex; - flex-direction: column; - align-items: center; - gap: 12px; - margin-bottom: 16px; -} - -.update-icon { - width: 48px; - height: 48px; - color: var(--accent-green); -} - -.update-version { - color: var(--text-secondary); - margin-bottom: 20px; -} - -.update-version span { - color: var(--accent-green); - font-weight: 600; -} - -.update-changelog { - background: var(--bg-tertiary); - border-radius: var(--radius-md); - padding: 16px; - margin-bottom: 24px; - text-align: left; - max-height: 200px; - overflow-y: auto; -} - -.update-changelog h3 { - font-size: 14px; - color: var(--text-secondary); - margin-bottom: 12px; - text-transform: uppercase; - letter-spacing: 0.5px; -} - -.update-changelog-content { - font-size: 14px; - color: var(--text-primary); - line-height: 1.6; -} - -.update-changelog-content ul { - margin: 0; - padding-left: 20px; -} - -.update-changelog-content li { - margin-bottom: 6px; -} - -.update-actions { - display: flex; - flex-direction: column; - gap: 10px; -} - -.update-actions .btn { - width: 100%; - justify-content: center; -} - -.btn-ghost { - background: transparent; - color: var(--text-secondary); - border: none; - padding: 10px 16px; - cursor: pointer; - border-radius: var(--radius-sm); - transition: all 0.2s; -} - -.btn-ghost:hover { - color: var(--text-primary); - background: var(--bg-hover); -} - -/* Navbar Active Session Indicator */ -.active-session-indicator { - display: flex; - align-items: center; - gap: 8px; - padding: 6px 12px; - background: rgba(118, 185, 0, 0.15); - border: 1px solid var(--accent-green); - border-radius: 20px; - cursor: pointer; - transition: all 0.2s ease; - margin-left: 8px; -} - -.active-session-indicator:hover { - background: rgba(118, 185, 0, 0.25); - transform: scale(1.02); -} - -.session-indicator-dot { - width: 8px; - height: 8px; - background: var(--accent-green); - border-radius: 50%; - animation: pulse-dot 2s ease-in-out infinite; -} - -@keyframes pulse-dot { - 0%, 100% { - opacity: 1; - transform: scale(1); - } - 50% { - opacity: 0.6; - transform: scale(1.2); - } -} - -.session-indicator-text { - font-size: 13px; - font-weight: 500; - color: var(--text-primary); - max-width: 150px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -.session-indicator-gpu { - font-size: 11px; - color: var(--accent-green); - padding: 2px 6px; - background: rgba(118, 185, 0, 0.2); - border-radius: 4px; - font-weight: 600; -} - -/* Settings Form */ -.settings-form { - margin-top: 20px; -} - -.setting-group { - margin-bottom: 20px; -} - -.setting-group label { - display: block; - margin-bottom: 8px; - color: var(--text-secondary); -} - -.setting-group input[type="text"] { - width: 100%; - padding: 10px 12px; - background: var(--bg-tertiary); - border: 1px solid var(--border-color); - border-radius: var(--radius-sm); - color: var(--text-primary); - font-size: 14px; - outline: none; -} - -.setting-group input[type="text"]:focus { - border-color: var(--accent-green); -} - -.setting-group input[type="checkbox"] { - margin-right: 8px; -} - -.setting-group select { - width: 100%; -} - -.setting-group input[type="range"] { - width: 100%; - height: 6px; - -webkit-appearance: none; - appearance: none; - background: var(--bg-tertiary); - border-radius: 3px; - outline: none; - margin: 8px 0; -} - -.setting-group input[type="range"]::-webkit-slider-thumb { - -webkit-appearance: none; - appearance: none; - width: 16px; - height: 16px; - background: var(--accent-green); - border-radius: 50%; - cursor: pointer; -} - -.bitrate-labels { - display: flex; - justify-content: space-between; - font-size: 12px; - color: var(--text-muted); -} - -.setting-divider { - margin-top: 32px; - padding-top: 20px; - border-top: 1px solid var(--border-color); -} - -.setting-hint { - font-size: 12px; - color: var(--text-muted); - margin-bottom: 12px; -} - -.troubleshooting-buttons { - display: flex; - gap: 12px; -} - -.troubleshooting-buttons .btn { - flex: 1; -} - -/* Region selector with latency coloring */ -#region-setting { - width: 100%; -} - -#region-setting option { - padding: 8px 12px; -} - -.region-option { - display: flex; - justify-content: space-between; -} - -/* Latency indicator badge */ -.latency-badge { - display: inline-block; - padding: 2px 8px; - border-radius: 10px; - font-size: 12px; - font-weight: 500; -} - -.latency-excellent { - color: var(--latency-excellent); -} - -.latency-good { - color: var(--latency-good); -} - -.latency-fair { - color: var(--latency-fair); -} - -.latency-poor { - color: var(--latency-poor); -} - -.latency-bad { - color: var(--latency-bad); -} - -.latency-offline { - color: var(--latency-offline); -} - -/* Region testing loading state */ -.region-loading { - display: flex; - align-items: center; - gap: 8px; - color: var(--text-secondary); - padding: 8px 0; -} - -.region-loading-spinner { - width: 16px; - height: 16px; - border: 2px solid var(--bg-tertiary); - border-top-color: var(--accent-green); - border-radius: 50%; - animation: spin 1s linear infinite; -} - -@keyframes spin { - to { transform: rotate(360deg); } -} - -/* Status bar latency display */ -#ping-info.latency-excellent { color: var(--latency-excellent); } -#ping-info.latency-good { color: var(--latency-good); } -#ping-info.latency-fair { color: var(--latency-fair); } -#ping-info.latency-poor { color: var(--latency-poor); } -#ping-info.latency-bad { color: var(--latency-bad); } - -/* Status Bar */ -#status-bar { - display: flex; - justify-content: space-between; - padding: 8px 24px; - background: var(--bg-secondary); - border-top: 1px solid var(--border-color); - font-size: 12px; - color: var(--text-muted); -} - -.status-left, .status-right { - display: flex; - gap: 16px; -} - -#connection-status { - color: var(--accent-green); -} - -/* Storage Indicator */ -#storage-indicator, -.storage-indicator { - display: flex; - align-items: center; - gap: 6px; - color: var(--accent-green) !important; -} - -#storage-indicator svg, -.storage-indicator svg { - width: 12px; - height: 12px; - color: var(--accent-green) !important; -} - -#storage-indicator .storage-text, -.storage-indicator .storage-text { - font-size: 12px; - color: var(--accent-green) !important; - white-space: nowrap; -} - -#storage-indicator.storage-warning, -#storage-indicator.storage-warning .storage-text, -#storage-indicator.storage-warning svg, -.storage-indicator.storage-warning, -.storage-indicator.storage-warning .storage-text, -.storage-indicator.storage-warning svg { - color: var(--latency-medium) !important; -} - -#storage-indicator.storage-critical, -#storage-indicator.storage-critical .storage-text, -#storage-indicator.storage-critical svg, -.storage-indicator.storage-critical, -.storage-indicator.storage-critical .storage-text, -.storage-indicator.storage-critical svg { - color: var(--latency-bad) !important; -} - -/* Session Time Indicator */ -#session-time-indicator, -.session-time-indicator { - display: flex; - align-items: center; - gap: 6px; - color: var(--accent-green) !important; -} - -#session-time-indicator svg, -.session-time-indicator svg { - width: 12px; - height: 12px; - color: var(--accent-green) !important; -} - -#session-time-indicator .session-time-text, -.session-time-indicator .session-time-text { - font-size: 12px; - color: var(--accent-green) !important; - white-space: nowrap; -} - -#session-time-indicator.time-warning, -#session-time-indicator.time-warning .session-time-text, -#session-time-indicator.time-warning svg, -.session-time-indicator.time-warning, -.session-time-indicator.time-warning .session-time-text, -.session-time-indicator.time-warning svg { - color: var(--latency-medium) !important; -} - -#session-time-indicator.time-critical, -#session-time-indicator.time-critical .session-time-text, -#session-time-indicator.time-critical svg, -.session-time-indicator.time-critical, -.session-time-indicator.time-critical .session-time-text, -.session-time-indicator.time-critical svg { - color: var(--latency-bad) !important; -} - -/* Load More */ -.load-more { - text-align: center; - padding: 20px; -} - -/* Game Detail */ -.game-detail-wrapper { - max-width: 800px; - margin: 0 auto; -} - -.game-detail-hero { - height: 180px; - background-size: cover; - background-position: center top; - border-radius: var(--radius-lg); - position: relative; -} - -.game-detail-content { - display: flex; - gap: 24px; - margin-top: -60px; - padding: 0 20px; - position: relative; - z-index: 1; -} - -.game-detail-boxart { - width: 140px; - height: 190px; - object-fit: cover; - border-radius: var(--radius-md); - box-shadow: 0 8px 32px rgba(0, 0, 0, 0.5); - flex-shrink: 0; - border: 2px solid var(--bg-secondary); -} - -.game-detail-info { - flex: 1; - padding-top: 65px; -} - -.game-detail-title { - font-size: 24px; - font-weight: 700; - margin-bottom: 8px; - line-height: 1.2; -} - -.game-detail-meta { - display: flex; - align-items: center; - gap: 10px; - flex-wrap: wrap; - margin-bottom: 10px; -} - -.game-detail-meta > span:first-child { - color: var(--text-secondary); - font-size: 14px; -} - -.store-badge { - display: inline-flex; - align-items: center; - gap: 6px; - padding: 4px 10px; - border-radius: var(--radius-sm); - font-size: 12px; - font-weight: 600; - text-transform: uppercase; -} - -.store-badge svg { - width: 14px; - height: 14px; -} - -.store-steam { - background: linear-gradient(135deg, #1b2838, #2a475e); - color: #66c0f4; -} - -.store-epic { - background: linear-gradient(135deg, #2a2a2a, #313131); - color: #fff; -} - -.store-ubisoft { - background: linear-gradient(135deg, #0070ff, #0055cc); - color: #fff; -} - -.store-gog { - background: linear-gradient(135deg, #4c1d9a, #6a2ec2); - color: #fff; -} - -.store-ea { - background: linear-gradient(135deg, #ff4747, #cc0000); - color: #fff; -} - -.status-badge { - display: inline-flex; - align-items: center; - gap: 6px; - padding: 4px 10px; - border-radius: var(--radius-sm); - font-size: 12px; - font-weight: 500; -} - -.status-badge svg { - width: 12px; - height: 12px; -} - -.status-available { - background: rgba(118, 185, 0, 0.15); - color: var(--gfn-green); -} - -.status-maintenance { - background: rgba(255, 183, 0, 0.15); - color: #ffb700; -} - -.game-detail-genres { - display: flex; - gap: 6px; - flex-wrap: wrap; - margin-bottom: 10px; -} - -.genre-tag { - padding: 3px 10px; - background: var(--bg-tertiary); - border-radius: var(--radius-sm); - font-size: 11px; - color: var(--text-secondary); -} - -.game-detail-controls { - display: flex; - align-items: center; - gap: 12px; - margin-bottom: 12px; - padding: 8px 12px; - background: var(--bg-tertiary); - border-radius: var(--radius-md); -} - -.controls-label { - font-size: 12px; - color: var(--text-secondary); - text-transform: uppercase; - letter-spacing: 0.5px; -} - -.control-icons { - display: flex; - gap: 12px; -} - -.control-icon { - display: flex; - align-items: center; - gap: 6px; - color: var(--text-primary); - font-size: 13px; -} - -.control-icon svg { - width: 18px; - height: 18px; - color: var(--gfn-green); -} - -.game-detail-description { - color: var(--text-secondary); - margin-bottom: 14px; - line-height: 1.5; - font-size: 13px; -} - -.store-selector { - display: flex; - align-items: center; - gap: 10px; - margin-bottom: 12px; -} - -.store-selector-label { - font-size: 12px; - color: var(--text-secondary); - text-transform: uppercase; -} - -.store-selector-buttons { - display: flex; - gap: 6px; -} - -.store-selector-btn { - padding: 5px 12px; - border: 1px solid var(--border-color); - border-radius: var(--radius-sm); - background: var(--bg-tertiary); - color: var(--text-secondary); - font-size: 12px; - font-weight: 500; - cursor: pointer; - transition: all 0.15s; -} - -.store-selector-btn:hover { - background: var(--bg-hover); - color: var(--text-primary); -} - -.store-selector-btn.active { - background: var(--gfn-green); - color: #000; - border-color: var(--gfn-green); -} - -.game-detail-actions { - display: flex; - gap: 10px; - flex-wrap: wrap; -} - -.game-detail-actions .btn-primary { - min-width: 140px; -} - -.game-detail-actions .btn svg { - width: 18px; - height: 18px; -} - -.game-detail-screenshots { - display: none; /* Hide screenshots in modal to save space */ -} - -.game-detail-screenshots h3 { - font-size: 18px; - margin-bottom: 16px; - color: var(--text-primary); -} - -.screenshots-grid { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); - gap: 12px; -} - -.screenshot { - width: 100%; - aspect-ratio: 16/9; - object-fit: cover; - border-radius: var(--radius-md); - cursor: pointer; - transition: transform 0.2s, box-shadow 0.2s; -} - -.screenshot:hover { - transform: scale(1.03); - box-shadow: 0 4px 20px rgba(0, 0, 0, 0.4); -} - -/* Scrollbar */ -::-webkit-scrollbar { - width: 8px; -} - -::-webkit-scrollbar-track { - background: var(--bg-primary); -} - -::-webkit-scrollbar-thumb { - background: var(--bg-hover); - border-radius: 4px; -} - -::-webkit-scrollbar-thumb:hover { - background: var(--border-color); -} - -/* Login Modal */ -.login-modal-content { - max-width: 420px; - text-align: center; -} - -.login-modal-content h2 { - margin-bottom: 20px; - color: var(--text-primary); -} - -/* Login Region/Provider Selection */ -.login-region-section { - margin-bottom: 24px; - text-align: left; -} - -.login-region-label { - display: block; - font-size: 14px; - font-weight: 500; - color: var(--text-secondary); - margin-bottom: 8px; -} - -.login-region-section .custom-dropdown { - width: 100%; -} - -.login-region-section .dropdown-trigger { - width: 100%; - padding: 12px 16px; - background: var(--bg-tertiary); - border: 1px solid var(--border-color); - border-radius: var(--radius); -} - -.login-region-section .dropdown-menu { - max-height: 250px; - overflow-y: auto; -} - -.login-region-hint { - font-size: 12px; - color: var(--text-muted); - margin-top: 6px; -} - -.login-options { - display: flex; - flex-direction: column; - gap: 16px; -} - -.login-option { - display: flex; - align-items: center; - justify-content: center; - gap: 12px; - padding: 16px 24px; - font-size: 16px; - width: 100%; -} - -.login-icon { - width: 20px; - height: 20px; -} - -.btn-large { - padding: 14px 28px; - font-size: 16px; -} - -.btn-secondary { - background: var(--bg-tertiary); - border: 1px solid var(--border-color); -} - -.btn-secondary:hover { - background: var(--bg-hover); -} - -.login-divider { - display: flex; - align-items: center; - gap: 16px; - color: var(--text-muted); - font-size: 14px; -} - -.login-divider::before, -.login-divider::after { - content: ''; - flex: 1; - height: 1px; - background: var(--border-color); -} - -.token-entry { - margin-top: 24px; - text-align: left; -} - -.token-instructions { - font-size: 13px; - color: var(--text-secondary); - background: var(--bg-tertiary); - padding: 12px; - border-radius: var(--radius); - margin-bottom: 16px; - line-height: 1.8; -} - -.token-instructions a { - color: var(--accent-green); -} - -#token-input { - width: 100%; - height: 100px; - padding: 12px; - background: var(--bg-tertiary); - border: 1px solid var(--border-color); - border-radius: var(--radius); - color: var(--text-primary); - font-family: monospace; - font-size: 12px; - resize: vertical; - margin-bottom: 12px; -} - -#token-input:focus { - outline: none; - border-color: var(--accent-green); -} - -#submit-token-btn { - width: 100%; -} - -/* Codec Test Results */ -.codec-results { - margin-top: 12px; - background: var(--bg-primary); - border: 1px solid var(--border-color); - border-radius: var(--radius); - padding: 12px; -} - -.codec-header { - font-size: 12px; - color: var(--accent-green); - font-weight: 600; - margin-bottom: 10px; - padding-bottom: 8px; - border-bottom: 1px solid var(--border-color); -} - -.codec-list { - display: flex; - flex-direction: column; - gap: 6px; - max-height: 300px; - overflow-y: auto; -} - -.codec-item { - display: flex; - align-items: center; - gap: 8px; - padding: 6px 8px; - border-radius: var(--radius-sm); - font-size: 12px; -} - -.codec-item.supported { - background: rgba(118, 185, 0, 0.1); -} - -.codec-item.unsupported { - background: rgba(102, 102, 102, 0.1); - opacity: 0.6; -} - -.codec-item.active { - background: rgba(118, 185, 0, 0.25); - border: 1px solid var(--accent-green); -} - -.codec-indicator { - font-weight: bold; - width: 16px; - text-align: center; -} - -.codec-item.supported .codec-indicator { - color: var(--accent-green); -} - -.codec-item.unsupported .codec-indicator { - color: var(--text-muted); -} - -.codec-info { - display: flex; - align-items: center; - gap: 8px; - flex: 1; -} - -.codec-name { - color: var(--text-primary); -} - -.codec-badge { - font-size: 10px; - padding: 2px 6px; - background: var(--accent-green); - color: #000; - border-radius: 3px; - font-weight: 600; -} - -.codec-note { - margin-top: 10px; - padding-top: 8px; - border-top: 1px solid var(--border-color); - font-size: 11px; - color: var(--text-muted); - font-style: italic; -} - -.codec-section { - margin-top: 12px; - padding-top: 10px; - border-top: 1px solid var(--border-color); -} - -.codec-subheader { - font-size: 11px; - color: var(--text-secondary); - margin-bottom: 8px; - font-weight: 500; -} diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 555350e..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2021", - "useDefineForClassFields": true, - "module": "ESNext", - "lib": ["ES2021", "DOM", "DOM.Iterable"], - "skipLibCheck": true, - "moduleResolution": "bundler", - "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "isolatedModules": true, - "noEmit": true, - "strict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noFallthroughCasesInSwitch": true - }, - "include": ["src"] -} diff --git a/vite.config.ts b/vite.config.ts deleted file mode 100644 index b320a66..0000000 --- a/vite.config.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { defineConfig } from "vite"; - -// https://vitejs.dev/config/ -export default defineConfig({ - // Vite options tailored for Tauri development - clearScreen: false, - server: { - port: 1420, - strictPort: true, - watch: { - ignored: ["**/src-tauri/**"], - }, - }, - build: { - // Tauri uses Chromium on Windows and WebKit on macOS and Linux - target: process.env.TAURI_ENV_PLATFORM == "windows" ? "chrome105" : "safari13", - // don't minify for debug builds - minify: !process.env.TAURI_ENV_DEBUG ? "esbuild" : false, - // produce sourcemaps for debug builds - sourcemap: !!process.env.TAURI_ENV_DEBUG, - }, - // Environment variables for Tauri - envPrefix: ["VITE_", "TAURI_ENV_*"], -}); From 306a8d76a7ba9d6e8e2929c77e5d26fe72ed0d12 Mon Sep 17 00:00:00 2001 From: Zortos Date: Wed, 31 Dec 2025 15:20:40 +0100 Subject: [PATCH 05/67] Fix CI build errors and improve cross-platform bundling - Fix Pixel::VAAPI and Pixel::D3D12 compile errors on Linux - Fix all unused import warnings across codebase - Use BtbN FFmpeg builds for Windows x64, Windows ARM64, Linux ARM64 - Re-enable Windows ARM64 build target - Improve macOS dylib bundling with transitive dependency support - Add Linux ARM64 bundle with FFmpeg libs and wrapper script - Update release notes to reflect bundling changes --- .github/workflows/auto-build.yml | 286 +++++++++++++++--------- opennow-streamer/src/api/mod.rs | 1 + opennow-streamer/src/auth/mod.rs | 3 +- opennow-streamer/src/gui/image_cache.rs | 5 +- opennow-streamer/src/gui/mod.rs | 2 - opennow-streamer/src/gui/renderer.rs | 2 + opennow-streamer/src/input/mod.rs | 1 - opennow-streamer/src/media/audio.rs | 4 +- opennow-streamer/src/media/mod.rs | 2 +- opennow-streamer/src/media/video.rs | 2 - opennow-streamer/src/webrtc/mod.rs | 8 +- opennow-streamer/src/webrtc/peer.rs | 7 +- 12 files changed, 198 insertions(+), 125 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 1f82cec..21a225f 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -157,8 +157,8 @@ jobs: rust_target: aarch64-unknown-linux-gnu - platform: macos-latest target: macos - arch: universal - rust_target: universal + arch: arm64 + rust_target: aarch64-apple-darwin - platform: windows-latest target: windows arch: x86_64 @@ -200,11 +200,8 @@ jobs: - name: Install Rust stable uses: dtolnay/rust-toolchain@stable - - name: Add macOS targets (universal build) - if: matrix.target == 'macos' - run: | - rustup target add aarch64-apple-darwin - rustup target add x86_64-apple-darwin + # macOS builds natively for ARM64 (macos-latest is ARM64) + # Intel Mac users can use Rosetta 2 to run ARM64 binaries - name: Add Linux ARM64 target if: matrix.target == 'linux-arm64' @@ -222,30 +219,53 @@ jobs: # ==================== FFmpeg Installation ==================== - - name: Install FFmpeg (Windows) - if: matrix.target == 'windows' || matrix.target == 'windows-arm64' + - name: Install FFmpeg (Windows x64) + if: matrix.target == 'windows' shell: pwsh run: | - # Download shared FFmpeg build from gyan.dev (includes all DLLs and dev files) - $ffmpegUrl = "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z" - Write-Host "Downloading FFmpeg from $ffmpegUrl..." - Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.7z - + # Download shared FFmpeg build from BtbN (GitHub releases) + $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-win64-lgpl-shared-8.0.zip" + Write-Host "Downloading FFmpeg x64 from $ffmpegUrl..." + Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip + Write-Host "Extracting FFmpeg..." - 7z x ffmpeg.7z -offmpeg + Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName Write-Host "FFmpeg extracted to: $ffmpegDir" - + # Set environment variables for ffmpeg-next crate echo "FFMPEG_DIR=$ffmpegDir" >> $env:GITHUB_ENV echo "PATH=$ffmpegDir\bin;$env:PATH" >> $env:GITHUB_ENV - + # Store path for later bundling echo "FFMPEG_BIN_DIR=$ffmpegDir\bin" >> $env:GITHUB_ENV - + Write-Host "FFmpeg setup complete" Write-Host "FFMPEG_DIR: $ffmpegDir" - Write-Host "FFMPEG_BIN_DIR: $ffmpegDir\bin" + + - name: Install FFmpeg (Windows ARM64) + if: matrix.target == 'windows-arm64' + shell: pwsh + run: | + # Download ARM64 FFmpeg build from BtbN (GitHub releases) + $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-winarm64-lgpl-shared-8.0.zip" + Write-Host "Downloading FFmpeg ARM64 from $ffmpegUrl..." + Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip + + Write-Host "Extracting FFmpeg..." + Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg + $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName + Write-Host "FFmpeg extracted to: $ffmpegDir" + + # Set environment variables for ffmpeg-next crate + echo "FFMPEG_DIR=$ffmpegDir" >> $env:GITHUB_ENV + echo "PATH=$ffmpegDir\bin;$env:PATH" >> $env:GITHUB_ENV + + # Store path for later bundling + echo "FFMPEG_BIN_DIR=$ffmpegDir\bin" >> $env:GITHUB_ENV + + Write-Host "FFmpeg ARM64 setup complete" + Write-Host "FFMPEG_DIR: $ffmpegDir" - name: Install FFmpeg (macOS) if: matrix.target == 'macos' @@ -280,43 +300,43 @@ jobs: if: matrix.target == 'linux-arm64' run: | sudo apt-get update - sudo dpkg --add-architecture arm64 - - # Add ARM64 repositories - sudo sed -i 's/^deb /deb [arch=amd64] /' /etc/apt/sources.list - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list - echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list - - sudo apt-get update - - # Install cross-compilation toolchain + + # Install cross-compilation toolchain and build dependencies sudo apt-get install -y \ gcc-aarch64-linux-gnu \ g++-aarch64-linux-gnu \ pkg-config \ clang \ - libclang-dev - - # Install ARM64 FFmpeg libraries (some may not be available, continue on error) - sudo apt-get install -y \ - libavcodec-dev:arm64 \ - libavformat-dev:arm64 \ - libavutil-dev:arm64 \ - libswscale-dev:arm64 \ - libswresample-dev:arm64 \ - libavfilter-dev:arm64 \ - libasound2-dev:arm64 \ - libx11-dev:arm64 || echo "Warning: Some ARM64 packages may not be available" - - # Set up pkg-config for cross-compilation - echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV - + libclang-dev \ + wget + + # Download pre-built FFmpeg ARM64 from BtbN + FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-linuxarm64-lgpl-shared-8.0.tar.xz" + echo "Downloading FFmpeg ARM64 from $FFMPEG_URL..." + wget -q "$FFMPEG_URL" -O ffmpeg.tar.xz + + echo "Extracting FFmpeg..." + tar -xf ffmpeg.tar.xz + FFMPEG_DIR=$(ls -d ffmpeg-*/ | head -1) + FFMPEG_DIR=$(realpath "$FFMPEG_DIR") + echo "FFmpeg extracted to: $FFMPEG_DIR" + + # Set FFmpeg environment for ffmpeg-next crate + echo "FFMPEG_DIR=$FFMPEG_DIR" >> $GITHUB_ENV + echo "FFMPEG_INCLUDE_DIR=$FFMPEG_DIR/include" >> $GITHUB_ENV + echo "FFMPEG_LIB_DIR=$FFMPEG_DIR/lib" >> $GITHUB_ENV + + # Store for bundling + echo "FFMPEG_BIN_DIR=$FFMPEG_DIR/bin" >> $GITHUB_ENV + # Set cross-compilation environment echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=$FFMPEG_DIR/lib/pkgconfig" >> $GITHUB_ENV + + echo "FFmpeg ARM64 setup complete" # ==================== Build Native Client ==================== @@ -336,26 +356,14 @@ jobs: echo "Building for Windows ARM64..." cargo build --release --target aarch64-pc-windows-msvc --verbose - - name: Build native client (macOS Universal) + - name: Build native client (macOS ARM64) if: matrix.target == 'macos' shell: bash working-directory: opennow-streamer run: | - echo "Building for macOS (Universal Binary)..." - - # Build for both architectures - cargo build --release --target aarch64-apple-darwin --verbose - cargo build --release --target x86_64-apple-darwin --verbose - - # Create universal binary using lipo - mkdir -p target/release - lipo -create \ - target/aarch64-apple-darwin/release/opennow-streamer \ - target/x86_64-apple-darwin/release/opennow-streamer \ - -output target/release/opennow-streamer - - echo "Universal binary created at target/release/opennow-streamer" - lipo -info target/release/opennow-streamer + echo "Building for macOS ARM64 (Apple Silicon)..." + cargo build --release --verbose + echo "macOS ARM64 build complete" - name: Build native client (Linux x64) if: matrix.target == 'linux' @@ -392,10 +400,10 @@ jobs: shell: pwsh run: | $targetDir = "opennow-streamer/target/aarch64-pc-windows-msvc/release" - - Write-Host "Copying FFmpeg DLLs to $targetDir..." + + Write-Host "Copying FFmpeg ARM64 DLLs to $targetDir..." Copy-Item "$env:FFMPEG_BIN_DIR\*.dll" -Destination $targetDir -Verbose - + Write-Host "`n=== Bundled FFmpeg DLLs ===" Get-ChildItem $targetDir -Filter "*.dll" | ForEach-Object { Write-Host " - $($_.Name)" } @@ -404,53 +412,125 @@ jobs: shell: bash run: | cd opennow-streamer - + BINARY="target/release/opennow-streamer" BUNDLE_DIR="target/release/bundle" - + echo "Creating bundle directory structure..." mkdir -p "$BUNDLE_DIR/libs" - + # Copy the binary cp "$BINARY" "$BUNDLE_DIR/" chmod +x "$BUNDLE_DIR/opennow-streamer" - - # Find and copy FFmpeg dylibs - echo "" - echo "=== Finding FFmpeg dependencies ===" - FFMPEG_LIBS=$(otool -L "$BINARY" | grep -E 'libav|libsw|libpostproc' | awk '{print $1}') - - for lib in $FFMPEG_LIBS; do - if [ -f "$lib" ]; then - libname=$(basename "$lib") + + # Function to copy a library and fix its install name + copy_lib() { + local lib="$1" + local libname=$(basename "$lib") + + if [ ! -f "$BUNDLE_DIR/libs/$libname" ] && [ -f "$lib" ]; then echo "Copying: $libname" cp "$lib" "$BUNDLE_DIR/libs/" - - # Update rpath in the binary - install_name_tool -change "$lib" "@executable_path/libs/$libname" "$BUNDLE_DIR/opennow-streamer" + chmod 755 "$BUNDLE_DIR/libs/$libname" + + # Fix the library's own install name + install_name_tool -id "@executable_path/libs/$libname" "$BUNDLE_DIR/libs/$libname" 2>/dev/null || true + return 0 fi + return 1 + } + + # Function to fix references in a binary/library + fix_refs() { + local target="$1" + for dep in $(otool -L "$target" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + local depname=$(basename "$dep") + install_name_tool -change "$dep" "@executable_path/libs/$depname" "$target" 2>/dev/null || true + done + } + + echo "" + echo "=== Phase 1: Copy direct FFmpeg dependencies ===" + for lib in $(otool -L "$BINARY" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + copy_lib "$lib" done - - # Also handle Homebrew paths - for lib in $(otool -L "$BUNDLE_DIR/opennow-streamer" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do - if [[ "$lib" == *libav* ]] || [[ "$lib" == *libsw* ]] || [[ "$lib" == *libpostproc* ]]; then - libname=$(basename "$lib") - if [ -f "$lib" ] && [ ! -f "$BUNDLE_DIR/libs/$libname" ]; then - echo "Copying Homebrew lib: $libname" - cp "$lib" "$BUNDLE_DIR/libs/" - install_name_tool -change "$lib" "@executable_path/libs/$libname" "$BUNDLE_DIR/opennow-streamer" - fi - fi + + echo "" + echo "=== Phase 2: Copy transitive dependencies (3 passes) ===" + for pass in 1 2 3; do + echo "Pass $pass..." + for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do + [ -f "$bundled_lib" ] || continue + for dep in $(otool -L "$bundled_lib" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + copy_lib "$dep" + done + done done - + + echo "" + echo "=== Phase 3: Fix all library references ===" + # Fix the main binary + fix_refs "$BUNDLE_DIR/opennow-streamer" + + # Fix all bundled libraries + for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do + [ -f "$bundled_lib" ] || continue + fix_refs "$bundled_lib" + done + echo "" echo "=== Bundled libraries ===" - ls -lh "$BUNDLE_DIR/libs/" - + ls -lh "$BUNDLE_DIR/libs/" | head -30 + echo "" echo "=== Final binary dependencies ===" otool -L "$BUNDLE_DIR/opennow-streamer" + echo "" + echo "=== Verifying no remaining Homebrew paths ===" + if otool -L "$BUNDLE_DIR/opennow-streamer" | grep -E '/opt/homebrew|/usr/local'; then + echo "WARNING: Some Homebrew paths remain (may be system libs, which is OK)" + else + echo "All Homebrew dependencies bundled successfully!" + fi + + - name: Bundle FFmpeg libs (Linux ARM64) + if: matrix.target == 'linux-arm64' + shell: bash + run: | + cd opennow-streamer + + BINARY="target/aarch64-unknown-linux-gnu/release/opennow-streamer" + BUNDLE_DIR="target/aarch64-unknown-linux-gnu/release/bundle" + + echo "Creating bundle directory structure..." + mkdir -p "$BUNDLE_DIR/libs" + + # Copy the binary + cp "$BINARY" "$BUNDLE_DIR/" + chmod +x "$BUNDLE_DIR/opennow-streamer" + + # Copy FFmpeg shared libraries + echo "Copying FFmpeg libraries..." + cp "$FFMPEG_DIR"/lib/*.so* "$BUNDLE_DIR/libs/" 2>/dev/null || true + + # Create wrapper script that sets LD_LIBRARY_PATH + cat > "$BUNDLE_DIR/run.sh" << 'WRAPPER' + #!/bin/bash + SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + export LD_LIBRARY_PATH="$SCRIPT_DIR/libs:$LD_LIBRARY_PATH" + exec "$SCRIPT_DIR/opennow-streamer" "$@" + WRAPPER + chmod +x "$BUNDLE_DIR/run.sh" + + echo "" + echo "=== Bundled libraries ===" + ls -lh "$BUNDLE_DIR/libs/" | head -20 + + echo "" + echo "Bundle created at: $BUNDLE_DIR" + echo "Run with: ./run.sh" + # ==================== Upload Artifacts ==================== - name: Upload Windows x64 artifacts @@ -494,7 +574,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: opennow-streamer-${{ needs.get-version.outputs.version }}-linux-arm64 - path: opennow-streamer/target/aarch64-unknown-linux-gnu/release/opennow-streamer + path: opennow-streamer/target/aarch64-unknown-linux-gnu/release/bundle/ retention-days: 30 # ==================== Upload to GitHub Release (main branch only) ==================== @@ -515,13 +595,13 @@ jobs: --- ### Downloads - - **Windows x64**: Portable executable with FFmpeg DLLs - - **Windows ARM64**: Portable executable with FFmpeg DLLs (for ARM devices) - - **macOS**: Universal binary (Intel + Apple Silicon) with FFmpeg dylibs - - **Linux x64**: Portable binary (requires system FFmpeg) - - **Linux ARM64**: Portable binary (Raspberry Pi, ARM servers, requires system FFmpeg) + - **Windows x64**: Portable executable with bundled FFmpeg DLLs + - **Windows ARM64**: Portable executable with bundled FFmpeg DLLs (Surface Pro X, etc.) + - **macOS ARM64**: Apple Silicon native binary with bundled FFmpeg dylibs (Intel Macs can use Rosetta 2) + - **Linux x64**: Portable binary (requires system FFmpeg - see below) + - **Linux ARM64**: Portable bundle with FFmpeg libs (run via `./run.sh`) - **Linux users**: Install FFmpeg via your package manager: + **Linux x64 users**: Install FFmpeg via your package manager: ```bash # Ubuntu/Debian sudo apt install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev @@ -588,7 +668,7 @@ jobs: uses: softprops/action-gh-release@v1 with: tag_name: ${{ needs.get-version.outputs.version }} - files: opennow-streamer/target/aarch64-unknown-linux-gnu/release/opennow-streamer + files: opennow-streamer/target/aarch64-unknown-linux-gnu/release/bundle/* fail_on_unmatched_files: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/opennow-streamer/src/api/mod.rs b/opennow-streamer/src/api/mod.rs index c7278da..6b3183a 100644 --- a/opennow-streamer/src/api/mod.rs +++ b/opennow-streamer/src/api/mod.rs @@ -5,6 +5,7 @@ mod cloudmatch; mod games; +#[allow(unused_imports)] pub use cloudmatch::*; pub use games::*; diff --git a/opennow-streamer/src/auth/mod.rs b/opennow-streamer/src/auth/mod.rs index 81db17e..3bbbf11 100644 --- a/opennow-streamer/src/auth/mod.rs +++ b/opennow-streamer/src/auth/mod.rs @@ -4,7 +4,7 @@ //! Supports multi-region login via Alliance Partners. use anyhow::{Result, Context}; -use log::{info, warn, debug}; +use log::{info, debug}; use serde::{Deserialize, Serialize}; use sha2::{Sha256, Digest}; use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; @@ -104,7 +104,6 @@ struct ServiceEndpoint { login_provider_priority: i32, } -/// Global selected provider storage lazy_static::lazy_static! { static ref SELECTED_PROVIDER: Arc>> = Arc::new(RwLock::new(None)); static ref CACHED_PROVIDERS: Arc>> = Arc::new(RwLock::new(Vec::new())); diff --git a/opennow-streamer/src/gui/image_cache.rs b/opennow-streamer/src/gui/image_cache.rs index f6737b6..262a98e 100644 --- a/opennow-streamer/src/gui/image_cache.rs +++ b/opennow-streamer/src/gui/image_cache.rs @@ -5,7 +5,7 @@ use std::collections::HashMap; use std::sync::Arc; use parking_lot::RwLock; -use log::{info, debug, warn}; +use log::{debug, warn}; /// Image loading state #[derive(Clone)] @@ -66,7 +66,7 @@ impl ImageCache { // Spawn async task to load image let client = self.client.clone(); let url_clone = url.clone(); - let images = Arc::new(self.images.read().clone()); + let _images = Arc::new(self.images.read().clone()); // We need to use a static or leaked reference for the cache update // For simplicity, we'll use a channel pattern @@ -137,7 +137,6 @@ lazy_static::lazy_static! { static ref LOADED_IMAGES: RwLock> = RwLock::new(HashMap::new()); } -/// Global image cache instance lazy_static::lazy_static! { pub static ref IMAGE_CACHE: ImageCache = ImageCache::new(); } diff --git a/opennow-streamer/src/gui/mod.rs b/opennow-streamer/src/gui/mod.rs index 2a03063..3f1136a 100644 --- a/opennow-streamer/src/gui/mod.rs +++ b/opennow-streamer/src/gui/mod.rs @@ -9,5 +9,3 @@ pub mod image_cache; pub use renderer::Renderer; pub use stats_panel::StatsPanel; pub use image_cache::{get_image, request_image, update_cache}; - -use winit::dpi::PhysicalSize; diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 0a7349f..3815e10 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -2111,6 +2111,7 @@ impl Renderer { .fixed_pos(egui::pos2(0.0, 0.0)) .order(egui::Order::Middle) .show(ctx, |ui| { + #[allow(deprecated)] let screen_rect = ctx.screen_rect(); ui.allocate_response(screen_rect.size(), egui::Sense::click()); ui.painter().rect_filled( @@ -2121,6 +2122,7 @@ impl Renderer { }); // Modal window + #[allow(deprecated)] let screen_rect = ctx.screen_rect(); let modal_pos = egui::pos2( (screen_rect.width() - modal_width) / 2.0, diff --git a/opennow-streamer/src/input/mod.rs b/opennow-streamer/src/input/mod.rs index 477d25e..68e6570 100644 --- a/opennow-streamer/src/input/mod.rs +++ b/opennow-streamer/src/input/mod.rs @@ -59,7 +59,6 @@ pub use macos::{ }; use std::time::{Instant, SystemTime, UNIX_EPOCH}; -use std::sync::atomic::{AtomicU64, Ordering as AtomicOrdering}; use parking_lot::RwLock; /// Session timing state - resettable for each streaming session diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index c37b60b..60100ee 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -3,7 +3,7 @@ //! Decode Opus audio using FFmpeg and play through cpal. use anyhow::{Result, Context, anyhow}; -use log::{info, warn, error, debug}; +use log::{info, error, debug}; use std::sync::Arc; use std::sync::mpsc; use std::thread; @@ -53,7 +53,7 @@ impl AudioDecoder { } }; - let mut ctx = CodecContext::new_with_codec(codec); + let ctx = CodecContext::new_with_codec(codec); // Set parameters for Opus // Note: FFmpeg Opus decoder auto-detects most parameters from the bitstream diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs index 4e7bfa7..61890c5 100644 --- a/opennow-streamer/src/media/mod.rs +++ b/opennow-streamer/src/media/mod.rs @@ -108,7 +108,7 @@ impl VideoFrame { let height = self.height as usize; let y_stride = self.y_stride as usize; let u_stride = self.u_stride as usize; - let v_stride = self.v_stride as usize; + let _v_stride = self.v_stride as usize; for row in 0..height { let y_row_offset = row * y_stride; diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 17f225b..7be21cb 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -537,13 +537,11 @@ impl VideoDecoder { format, Pixel::VIDEOTOOLBOX | Pixel::CUDA - | Pixel::VAAPI | Pixel::VDPAU | Pixel::QSV | Pixel::D3D11 | Pixel::DXVA2_VLD | Pixel::D3D11VA_VLD - | Pixel::D3D12 | Pixel::VULKAN ) } diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index b771f32..453e5fa 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -13,14 +13,12 @@ pub use sdp::*; pub use datachannel::*; use std::sync::Arc; -use parking_lot::Mutex; use tokio::sync::mpsc; -use anyhow::{Result, Context}; +use anyhow::Result; use log::{info, warn, error, debug}; -use webrtc::ice_transport::ice_server::RTCIceServer; use crate::app::{SessionInfo, Settings, VideoCodec, SharedFrame}; -use crate::media::{VideoFrame, StreamStats, VideoDecoder, AudioDecoder, AudioPlayer, RtpDepacketizer, DepacketizerCodec, DecodeStats}; +use crate::media::{StreamStats, VideoDecoder, AudioDecoder, AudioPlayer, RtpDepacketizer, DepacketizerCodec}; use crate::input::InputHandler; /// Active streaming session @@ -284,7 +282,7 @@ pub async fn run_streaming( let mut last_stats_time = std::time::Instant::now(); let mut frames_received: u64 = 0; let mut frames_decoded: u64 = 0; - let mut frames_dropped: u64 = 0; + let frames_dropped: u64 = 0; let mut bytes_received: u64 = 0; let mut last_frames_decoded: u64 = 0; // For actual FPS calculation diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs index a72ad2b..e366c80 100644 --- a/opennow-streamer/src/webrtc/peer.rs +++ b/opennow-streamer/src/webrtc/peer.rs @@ -5,7 +5,7 @@ use std::sync::Arc; use tokio::sync::mpsc; use parking_lot::Mutex; -use webrtc::api::media_engine::{MediaEngine, MIME_TYPE_H264, MIME_TYPE_OPUS}; +use webrtc::api::media_engine::MediaEngine; use webrtc::api::setting_engine::SettingEngine; use webrtc::api::APIBuilder; use webrtc::api::interceptor_registry::register_default_interceptors; @@ -20,7 +20,7 @@ use webrtc::peer_connection::sdp::session_description::RTCSessionDescription; use webrtc::rtp_transceiver::rtp_codec::{RTCRtpCodecCapability, RTCRtpCodecParameters, RTPCodecType}; use webrtc::rtcp::payload_feedbacks::picture_loss_indication::PictureLossIndication; use anyhow::{Result, Context}; -use log::{info, debug, warn, error}; +use log::{info, debug, warn}; use bytes::Bytes; /// MIME type for H265/HEVC video codec @@ -220,10 +220,9 @@ impl WebRtcPeer { })); // On peer connection state change (includes DTLS state) - let pc_for_state = peer_connection.clone(); + let _pc_for_state = peer_connection.clone(); peer_connection.on_peer_connection_state_change(Box::new(move |state| { info!("Peer connection state: {:?}", state); - let pc = pc_for_state.clone(); Box::pin(async move { match state { webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Connected => { From f1054064c016ebbef5187bff807e5b7e1edd035e Mon Sep 17 00:00:00 2001 From: f1shy-dev Date: Wed, 31 Dec 2025 14:34:00 +0000 Subject: [PATCH 06/67] feat: add session conflict detection and resume capability Add GET /v2/session API call to detect active sessions before launch, PUT /v2/session/{id} to claim/resume existing sessions with polling, and session conflict dialog for users to choose between resuming or terminating. This resolves 403 errors when launching games with active GFN sessions. Co-authored-by: Capy --- opennow-streamer/src/api/cloudmatch.rs | 314 +++++++++++++++++++++++++ opennow-streamer/src/app/mod.rs | 258 +++++++++++++++++++- opennow-streamer/src/app/session.rs | 55 +++++ opennow-streamer/src/gui/renderer.rs | 200 ++++++++++++++++ 4 files changed, 818 insertions(+), 9 deletions(-) diff --git a/opennow-streamer/src/api/cloudmatch.rs b/opennow-streamer/src/api/cloudmatch.rs index 51975f7..6deb6f8 100644 --- a/opennow-streamer/src/api/cloudmatch.rs +++ b/opennow-streamer/src/api/cloudmatch.rs @@ -462,4 +462,318 @@ impl GfnApiClient { SessionState::Launching } + + /// Get active sessions + /// Returns list of sessions with status 2 (Ready) or 3 (Streaming) + pub async fn get_active_sessions(&self) -> Result> { + let token = self.token() + .context("No access token")?; + + let device_id = generate_uuid(); + let client_id = generate_uuid(); + + // Get streaming base URL + let streaming_base_url = auth::get_streaming_base_url(); + let session_url = format!("{}/v2/session", streaming_base_url.trim_end_matches('/')); + + info!("Checking for active sessions at: {}", session_url); + + let response = self.client.get(&session_url) + .header("User-Agent", GFN_USER_AGENT) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Content-Type", "application/json") + .header("nv-client-id", &client_id) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .header("x-device-id", &device_id) + .send() + .await + .context("Failed to get sessions")?; + + let status = response.status(); + let response_text = response.text().await + .context("Failed to read response")?; + + if !status.is_success() { + warn!("Get sessions failed: {} - {}", status, &response_text[..response_text.len().min(200)]); + return Ok(vec![]); + } + + debug!("Active sessions response: {} bytes", response_text.len()); + + let sessions_response: GetSessionsResponse = serde_json::from_str(&response_text) + .context("Failed to parse sessions response")?; + + if sessions_response.request_status.status_code != 1 { + warn!("Get sessions API error: {:?}", sessions_response.request_status.status_description); + return Ok(vec![]); + } + + info!("Found {} session(s) from API", sessions_response.sessions.len()); + + let active_sessions: Vec = sessions_response.sessions + .into_iter() + .filter(|s| { + debug!("Session {} has status {}", s.session_id, s.status); + s.status == 2 || s.status == 3 + }) + .map(|s| { + let app_id = s.session_request_data + .as_ref() + .map(|d| d.app_id) + .unwrap_or(0); + + let server_ip = s.session_control_info + .as_ref() + .and_then(|c| c.ip.clone()); + + let signaling_url = s.connection_info + .as_ref() + .and_then(|conns| conns.iter().find(|c| c.usage == 14)) + .and_then(|conn| { + conn.ip.as_ref().map(|ip| format!("wss://{}:443/nvst/", ip)) + }) + .or_else(|| { + server_ip.as_ref().map(|ip| format!("wss://{}:443/nvst/", ip)) + }); + + let (resolution, fps) = s.monitor_settings + .as_ref() + .and_then(|ms| ms.first()) + .map(|m| ( + Some(format!("{}x{}", m.width_in_pixels, m.height_in_pixels)), + Some(m.frames_per_second) + )) + .unwrap_or((None, None)); + + ActiveSessionInfo { + session_id: s.session_id, + app_id, + gpu_type: s.gpu_type, + status: s.status, + server_ip, + signaling_url, + resolution, + fps, + } + }) + .collect(); + + info!("Found {} active session(s)", active_sessions.len()); + Ok(active_sessions) + } + + /// Claim/Resume an existing session + /// Required before connecting to an existing session + pub async fn claim_session( + &self, + session_id: &str, + server_ip: &str, + app_id: &str, + settings: &Settings, + ) -> Result { + let token = self.token() + .context("No access token")?; + + let device_id = generate_uuid(); + let client_id = generate_uuid(); + let sub_session_id = generate_uuid(); + + let (width, height) = settings.resolution_tuple(); + + let timezone_offset_ms = chrono::Local::now() + .offset() + .local_minus_utc() as i64 * 1000; + + let claim_url = format!( + "https://{}/v2/session/{}?keyboardLayout=en-US&languageCode=en_US", + server_ip, session_id + ); + + info!("Claiming session: {} at {}", session_id, claim_url); + + let resume_payload = serde_json::json!({ + "action": 2, + "data": "RESUME", + "sessionRequestData": { + "audioMode": 2, + "remoteControllersBitmap": 0, + "sdrHdrMode": 0, + "networkTestSessionId": null, + "availableSupportedControllers": [], + "clientVersion": "30.0", + "deviceHashId": device_id, + "internalTitle": null, + "clientPlatformName": "windows", + "metaData": [ + {"key": "SubSessionId", "value": sub_session_id}, + {"key": "wssignaling", "value": "1"}, + {"key": "GSStreamerType", "value": "WebRTC"}, + {"key": "networkType", "value": "Unknown"}, + {"key": "ClientImeSupport", "value": "0"}, + {"key": "clientPhysicalResolution", "value": format!("{{\"horizontalPixels\":{},\"verticalPixels\":{}}}", width, height)}, + {"key": "surroundAudioInfo", "value": "2"} + ], + "surroundAudioInfo": 0, + "clientTimezoneOffset": timezone_offset_ms, + "clientIdentification": "GFN-PC", + "parentSessionId": null, + "appId": app_id, + "streamerVersion": 1, + "clientRequestMonitorSettings": [{ + "widthInPixels": width, + "heightInPixels": height, + "framesPerSecond": settings.fps, + "sdrHdrMode": 0, + "displayData": { + "desiredContentMaxLuminance": 0, + "desiredContentMinLuminance": 0, + "desiredContentMaxFrameAverageLuminance": 0 + }, + "dpi": 100 + }], + "appLaunchMode": 1, + "sdkVersion": "1.0", + "enhancedStreamMode": 1, + "useOps": true, + "clientDisplayHdrCapabilities": null, + "accountLinked": true, + "partnerCustomData": "", + "enablePersistingInGameSettings": true, + "secureRTSPSupported": false, + "userAge": 26, + "requestedStreamingFeatures": { + "reflex": settings.fps >= 120, + "bitDepth": 0, + "cloudGsync": false, + "enabledL4S": false, + "mouseMovementFlags": 0, + "trueHdr": false, + "supportedHidDevices": 0, + "profile": 0, + "fallbackToLogicalResolution": false, + "hidDevices": null, + "chromaFormat": 0, + "prefilterMode": 0, + "prefilterSharpness": 0, + "prefilterNoiseReduction": 0, + "hudStreamingMode": 0 + } + }, + "metaData": [] + }); + + let response = self.client.put(&claim_url) + .header("User-Agent", GFN_USER_AGENT) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Content-Type", "application/json") + .header("Origin", "https://play.geforcenow.com") + .header("Referer", "https://play.geforcenow.com/") + .header("nv-client-id", &client_id) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .header("x-device-id", &device_id) + .json(&resume_payload) + .send() + .await + .context("Claim session request failed")?; + + let status = response.status(); + let response_text = response.text().await + .context("Failed to read claim response")?; + + if !status.is_success() { + return Err(anyhow::anyhow!("Claim session failed: {} - {}", + status, &response_text[..response_text.len().min(200)])); + } + + let api_response: CloudMatchResponse = serde_json::from_str(&response_text) + .context("Failed to parse claim response")?; + + if api_response.request_status.status_code != 1 { + let error = api_response.request_status.status_description + .unwrap_or_else(|| "Unknown error".to_string()); + return Err(anyhow::anyhow!("Claim session error: {}", error)); + } + + info!("Session claimed! Polling until ready..."); + + let get_url = format!("https://{}/v2/session/{}", server_ip, session_id); + + for attempt in 1..=10 { + if attempt > 1 { + tokio::time::sleep(tokio::time::Duration::from_millis(500)).await; + } + + let poll_response = self.client.get(&get_url) + .header("User-Agent", GFN_USER_AGENT) + .header("Authorization", format!("GFNJWT {}", token)) + .header("Content-Type", "application/json") + .header("nv-client-id", &client_id) + .header("nv-client-streamer", "NVIDIA-CLASSIC") + .header("nv-client-type", "NATIVE") + .header("nv-client-version", GFN_CLIENT_VERSION) + .header("nv-device-os", "WINDOWS") + .header("nv-device-type", "DESKTOP") + .header("x-device-id", &device_id) + .send() + .await + .context("Poll claim request failed")?; + + if !poll_response.status().is_success() { + continue; + } + + let poll_text = poll_response.text().await + .context("Failed to read poll response")?; + + let poll_api_response: CloudMatchResponse = match serde_json::from_str(&poll_text) { + Ok(r) => r, + Err(_) => continue, + }; + + let session_data = poll_api_response.session; + debug!("Claim poll attempt {}: status {}", attempt, session_data.status); + + if session_data.status == 2 || session_data.status == 3 { + info!("Session ready after claim! Status: {}", session_data.status); + + let state = Self::parse_session_state(&session_data); + let server_ip_final = session_data.streaming_server_ip().unwrap_or_else(|| server_ip.to_string()); + let signaling_path = session_data.signaling_url(); + + let signaling_url = signaling_path.map(|path| { + Self::build_signaling_url(&path, &server_ip_final) + }).or_else(|| { + Some(format!("wss://{}:443/nvst/", server_ip_final)) + }); + + let ice_servers = session_data.ice_servers(); + let media_connection_info = session_data.media_connection_info(); + + return Ok(SessionInfo { + session_id: session_data.session_id, + server_ip: server_ip_final, + zone: String::new(), + state, + gpu_type: session_data.gpu_type, + signaling_url, + ice_servers, + media_connection_info, + }); + } + + if session_data.status != 6 { + break; + } + } + + Err(anyhow::anyhow!("Session did not become ready after claiming")) + } } diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index a7be49e..47a08f4 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -6,7 +6,7 @@ pub mod config; pub mod session; pub use config::{Settings, VideoCodec, AudioCodec, StreamQuality, StatsPosition}; -pub use session::{SessionInfo, SessionState}; +pub use session::{SessionInfo, SessionState, ActiveSessionInfo}; use std::sync::Arc; use std::sync::atomic::{AtomicU64, Ordering}; @@ -135,6 +135,12 @@ pub enum UiAction { StartPingTest, /// Toggle settings modal ToggleSettingsModal, + /// Resume an active session + ResumeSession(ActiveSessionInfo), + /// Terminate existing session and start new game + TerminateAndLaunch(String, GameInfo), + /// Close session conflict dialog + CloseSessionConflict, } /// Setting changes @@ -267,6 +273,15 @@ pub struct App { /// Whether settings modal is visible pub show_settings_modal: bool, + /// Active sessions detected + pub active_sessions: Vec, + + /// Whether showing session conflict dialog + pub show_session_conflict: bool, + + /// Pending game launch (waiting for session conflict resolution) + pub pending_game_launch: Option, + /// Last time we polled the session (for rate limiting) last_poll_time: std::time::Instant, @@ -392,6 +407,9 @@ impl App { auto_server_selection: auto_server, // Load from settings ping_testing: false, show_settings_modal: false, + active_sessions: Vec::new(), + show_session_conflict: false, + pending_game_launch: None, last_poll_time: std::time::Instant::now(), render_frame_count: 0, last_render_fps_time: std::time::Instant::now(), @@ -494,6 +512,16 @@ impl App { self.load_servers(); } } + UiAction::ResumeSession(session_info) => { + self.resume_session(session_info); + } + UiAction::TerminateAndLaunch(session_id, game) => { + self.terminate_and_launch(session_id, game); + } + UiAction::CloseSessionConflict => { + self.show_session_conflict = false; + self.pending_game_launch = None; + } } } @@ -683,6 +711,24 @@ impl App { self.load_ping_results(); } + // Check for active sessions from async check + if let Some(sessions) = Self::load_active_sessions_cache() { + self.active_sessions = sessions.clone(); + if let Some(pending) = Self::load_pending_game_cache() { + self.pending_game_launch = Some(pending); + self.show_session_conflict = true; + Self::clear_active_sessions_cache(); + } + } + + // Check for launch proceed flag (after session termination) + if Self::check_launch_proceed_flag() { + if let Some(game) = Self::load_pending_game_cache() { + Self::clear_pending_game_cache(); + self.start_new_session(&game); + } + } + // Poll session status when in session state if self.state == AppState::Session && self.is_loading { self.poll_session_status(); @@ -1094,7 +1140,47 @@ impl App { pub fn launch_game(&mut self, game: &GameInfo) { info!("Launching game: {} (ID: {})", game.title, game.id); - // Clear any old session data first + // Get token first + let token = match &self.auth_tokens { + Some(t) => t.jwt().to_string(), + None => { + self.error_message = Some("Not logged in".to_string()); + return; + } + }; + + let game_clone = game.clone(); + + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.get_active_sessions().await { + Ok(sessions) => { + if !sessions.is_empty() { + info!("Found {} active session(s)", sessions.len()); + Self::save_active_sessions_cache(&sessions); + Self::save_pending_game_cache(&game_clone); + } else { + info!("No active sessions, proceeding with launch"); + Self::clear_active_sessions_cache(); + Self::save_launch_proceed_flag(); + } + } + Err(e) => { + warn!("Failed to check active sessions: {}, proceeding with launch", e); + Self::clear_active_sessions_cache(); + Self::save_launch_proceed_flag(); + } + } + }); + } + + /// Start creating a new session (after checking for conflicts) + fn start_new_session(&mut self, game: &GameInfo) { + info!("Starting new session for: {}", game.title); + Self::clear_session_cache(); Self::clear_session_error(); @@ -1103,9 +1189,8 @@ impl App { self.status_message = format!("Starting {}...", game.title); self.error_message = None; self.is_loading = true; - self.last_poll_time = std::time::Instant::now() - POLL_INTERVAL; // Allow immediate first poll + self.last_poll_time = std::time::Instant::now() - POLL_INTERVAL; - // Get token and settings for session creation let token = match &self.auth_tokens { Some(t) => t.jwt().to_string(), None => { @@ -1119,23 +1204,18 @@ impl App { let game_title = game.title.clone(); let settings = self.settings.clone(); - // Use selected server or default let zone = self.servers.get(self.selected_server_index) .map(|s| s.id.clone()) .unwrap_or_else(|| "eu-netherlands-south".to_string()); - // Create API client with token let mut api_client = GfnApiClient::new(); api_client.set_access_token(token); - // Spawn async task to create and poll session let runtime = self.runtime.clone(); runtime.spawn(async move { - // Create session match api_client.create_session(&app_id, &game_title, &settings, &zone).await { Ok(session) => { info!("Session created: {} (state: {:?})", session.session_id, session.state); - // Save session info for polling Self::save_session_cache(&session); } Err(e) => { @@ -1146,6 +1226,100 @@ impl App { }); } + /// Resume an existing session + fn resume_session(&mut self, session_info: ActiveSessionInfo) { + info!("Resuming session: {}", session_info.session_id); + + self.show_session_conflict = false; + self.pending_game_launch = None; + self.state = AppState::Session; + self.status_message = "Resuming session...".to_string(); + self.error_message = None; + self.is_loading = true; + self.last_poll_time = std::time::Instant::now() - POLL_INTERVAL; + + let token = match &self.auth_tokens { + Some(t) => t.jwt().to_string(), + None => { + self.error_message = Some("Not logged in".to_string()); + self.is_loading = false; + return; + } + }; + + let server_ip = match session_info.server_ip { + Some(ip) => ip, + None => { + self.error_message = Some("Session has no server IP".to_string()); + self.is_loading = false; + return; + } + }; + + let app_id = session_info.app_id.to_string(); + let settings = self.settings.clone(); + + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.claim_session( + &session_info.session_id, + &server_ip, + &app_id, + &settings, + ).await { + Ok(session) => { + info!("Session claimed: {} (state: {:?})", session.session_id, session.state); + Self::save_session_cache(&session); + } + Err(e) => { + error!("Failed to claim session: {}", e); + Self::save_session_error(&format!("Failed to resume session: {}", e)); + } + } + }); + } + + /// Terminate existing session and start new game + fn terminate_and_launch(&mut self, session_id: String, game: GameInfo) { + info!("Terminating session {} and launching {}", session_id, game.title); + + self.show_session_conflict = false; + self.pending_game_launch = None; + self.status_message = "Ending previous session...".to_string(); + + let token = match &self.auth_tokens { + Some(t) => t.jwt().to_string(), + None => { + self.error_message = Some("Not logged in".to_string()); + return; + } + }; + + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + let runtime = self.runtime.clone(); + let game_for_launch = game.clone(); + runtime.spawn(async move { + match api_client.stop_session(&session_id, "", None).await { + Ok(_) => { + info!("Session terminated, waiting before launching new session"); + tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await; + Self::save_launch_proceed_flag(); + Self::save_pending_game_cache(&game_for_launch); + } + Err(e) => { + warn!("Session termination failed ({}), proceeding anyway", e); + Self::save_launch_proceed_flag(); + Self::save_pending_game_cache(&game_for_launch); + } + } + }); + } + /// Poll session state and update UI fn poll_session_status(&mut self) { // First check cache for state updates (from in-flight or completed requests) @@ -1541,6 +1715,72 @@ impl App { } } + // Session conflict management cache + fn save_active_sessions_cache(sessions: &[ActiveSessionInfo]) { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("active_sessions.json")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(sessions) { + let _ = std::fs::write(path, json); + } + } + } + + fn load_active_sessions_cache() -> Option> { + let path = Self::get_app_data_dir()?.join("active_sessions.json"); + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() + } + + fn clear_active_sessions_cache() { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("active_sessions.json")) { + let _ = std::fs::remove_file(path); + } + } + + fn save_pending_game_cache(game: &GameInfo) { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("pending_game.json")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(game) { + let _ = std::fs::write(path, json); + } + } + } + + fn load_pending_game_cache() -> Option { + let path = Self::get_app_data_dir()?.join("pending_game.json"); + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() + } + + fn clear_pending_game_cache() { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("pending_game.json")) { + let _ = std::fs::remove_file(path); + } + } + + fn save_launch_proceed_flag() { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("launch_proceed.flag")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let _ = std::fs::write(path, "1"); + } + } + + fn check_launch_proceed_flag() -> bool { + if let Some(path) = Self::get_app_data_dir().map(|p| p.join("launch_proceed.flag")) { + if path.exists() { + let _ = std::fs::remove_file(path); + return true; + } + } + false + } + // Games cache for async fetch fn games_cache_path() -> Option { Self::get_app_data_dir().map(|p| p.join("games_cache.json")) diff --git a/opennow-streamer/src/app/session.rs b/opennow-streamer/src/app/session.rs index 2dc5412..14178ad 100644 --- a/opennow-streamer/src/app/session.rs +++ b/opennow-streamer/src/app/session.rs @@ -373,3 +373,58 @@ impl CloudMatchSession { .unwrap_or_default() } } + +// ============================================ +// Session Management Types (GET /v2/session) +// ============================================ + +/// Response from GET /v2/session endpoint (list active sessions) +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct GetSessionsResponse { + #[serde(default)] + pub sessions: Vec, + pub request_status: RequestStatus, +} + +/// Session data from GET /v2/session API +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SessionFromApi { + pub session_id: String, + #[serde(default)] + pub session_request_data: Option, + #[serde(default)] + pub gpu_type: Option, + #[serde(default)] + pub status: i32, + #[serde(default)] + pub session_control_info: Option, + #[serde(default)] + pub connection_info: Option>, + #[serde(default)] + pub monitor_settings: Option>, +} + +/// Session request data from API (contains app_id) +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct SessionRequestDataFromApi { + /// App ID as i64 (API returns it as number) + #[serde(default)] + pub app_id: i64, +} + +/// Simplified active session info for UI +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct ActiveSessionInfo { + pub session_id: String, + pub app_id: i64, + pub gpu_type: Option, + pub status: i32, + pub server_ip: Option, + pub signaling_url: Option, + pub resolution: Option, + pub fps: Option, +} diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 0a7349f..d0ff281 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -2091,6 +2091,11 @@ impl Renderer { if show_settings_modal { Self::render_settings_modal(ctx, settings, servers, selected_server_index, auto_server_selection, ping_testing, actions); } + + // Session conflict dialog + if app.show_session_conflict { + Self::render_session_conflict_dialog(ctx, &app.active_sessions, app.pending_game_launch.as_ref(), actions); + } } /// Render the Settings modal with region selector and stream settings @@ -2391,6 +2396,201 @@ impl Renderer { }); } + /// Render the session conflict dialog + fn render_session_conflict_dialog( + ctx: &egui::Context, + active_sessions: &[ActiveSessionInfo], + pending_game: Option<&GameInfo>, + actions: &mut Vec, + ) { + use crate::app::session::ActiveSessionInfo; + use crate::app::GameInfo; + + let modal_width = 500.0; + let modal_height = 300.0; + + egui::Area::new(egui::Id::new("session_conflict_overlay")) + .fixed_pos(egui::pos2(0.0, 0.0)) + .order(egui::Order::Middle) + .show(ctx, |ui| { + let screen_rect = ctx.screen_rect(); + ui.allocate_response(screen_rect.size(), egui::Sense::click()); + ui.painter().rect_filled( + screen_rect, + 0.0, + egui::Color32::from_rgba_unmultiplied(0, 0, 0, 200), + ); + }); + + let screen_rect = ctx.screen_rect(); + let modal_pos = egui::pos2( + (screen_rect.width() - modal_width) / 2.0, + (screen_rect.height() - modal_height) / 2.0, + ); + + egui::Area::new(egui::Id::new("session_conflict_modal")) + .fixed_pos(modal_pos) + .order(egui::Order::Foreground) + .show(ctx, |ui| { + egui::Frame::new() + .fill(egui::Color32::from_rgb(28, 28, 35)) + .corner_radius(12.0) + .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) + .inner_margin(egui::Margin::same(20)) + .show(ui, |ui| { + ui.set_min_size(egui::vec2(modal_width, modal_height)); + + ui.label( + egui::RichText::new("⚠ Active Session Detected") + .size(20.0) + .strong() + .color(egui::Color32::from_rgb(255, 200, 80)) + ); + + ui.add_space(15.0); + + if let Some(session) = active_sessions.first() { + ui.label( + egui::RichText::new("You have an active GFN session running:") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + ui.add_space(10.0); + + egui::Frame::new() + .fill(egui::Color32::from_rgb(40, 40, 50)) + .corner_radius(8.0) + .inner_margin(egui::Margin::same(12)) + .show(ui, |ui| { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("App ID:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(format!("{}", session.app_id)) + .size(13.0) + .color(egui::Color32::WHITE) + ); + }); + + if let Some(ref gpu) = session.gpu_type { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("GPU:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(gpu) + .size(13.0) + .color(egui::Color32::WHITE) + ); + }); + } + + if let Some(ref res) = session.resolution { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Resolution:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(format!("{} @ {}fps", res, session.fps.unwrap_or(60))) + .size(13.0) + .color(egui::Color32::WHITE) + ); + }); + } + + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Status:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + let status_text = match session.status { + 2 => "Ready", + 3 => "Running", + _ => "Unknown", + }; + ui.label( + egui::RichText::new(status_text) + .size(13.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + }); + }); + + ui.add_space(15.0); + + if pending_game.is_some() { + ui.label( + egui::RichText::new("GFN only allows one session at a time. You can either:") + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + } else { + ui.label( + egui::RichText::new("What would you like to do?") + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + } + + ui.add_space(15.0); + + ui.vertical_centered(|ui| { + let resume_btn = egui::Button::new( + egui::RichText::new("Resume Existing Session") + .size(14.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::from_rgb(118, 185, 0)) + .min_size(egui::vec2(200.0, 35.0)); + + if ui.add(resume_btn).clicked() { + actions.push(UiAction::ResumeSession(session.clone())); + } + + ui.add_space(8.0); + + if let Some(game) = pending_game { + let terminate_btn = egui::Button::new( + egui::RichText::new(format!("End Session & Launch \"{}\"", game.title)) + .size(14.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::from_rgb(220, 60, 60)) + .min_size(egui::vec2(200.0, 35.0)); + + if ui.add(terminate_btn).clicked() { + actions.push(UiAction::TerminateAndLaunch(session.session_id.clone(), game.clone())); + } + + ui.add_space(8.0); + } + + let cancel_btn = egui::Button::new( + egui::RichText::new("Cancel") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ) + .fill(egui::Color32::from_rgb(60, 60, 75)) + .min_size(egui::vec2(200.0, 35.0)); + + if ui.add(cancel_btn).clicked() { + actions.push(UiAction::CloseSessionConflict); + } + }); + } + }); + }); + } + /// Render the game detail popup fn render_game_popup( ctx: &egui::Context, From 8dc72c1cc70208c1c80849b58e3572a1d3197448 Mon Sep 17 00:00:00 2001 From: Zortos Date: Wed, 31 Dec 2025 15:44:45 +0100 Subject: [PATCH 07/67] Increase recursion limit for serde_json macro --- opennow-streamer/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opennow-streamer/src/lib.rs b/opennow-streamer/src/lib.rs index c1dae1b..99b8c13 100644 --- a/opennow-streamer/src/lib.rs +++ b/opennow-streamer/src/lib.rs @@ -2,6 +2,8 @@ //! //! Core components for the native GeForce NOW streaming client. +#![recursion_limit = "256"] + pub mod app; pub mod api; pub mod auth; From 0aaf23d2ca4a1d4ea10b1a758d1606c9061bdd33 Mon Sep 17 00:00:00 2001 From: Zortos Date: Wed, 31 Dec 2025 16:40:32 +0100 Subject: [PATCH 08/67] Fix compilation errors: add Deserialize derives, fix render_games_screen parameters, add recursion limit --- opennow-streamer/src/app/session.rs | 4 ++-- opennow-streamer/src/gui/renderer.rs | 18 ++++++++++++------ opennow-streamer/src/main.rs | 2 ++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/opennow-streamer/src/app/session.rs b/opennow-streamer/src/app/session.rs index 14178ad..0c7f1e7 100644 --- a/opennow-streamer/src/app/session.rs +++ b/opennow-streamer/src/app/session.rs @@ -157,7 +157,7 @@ pub struct SessionRequestData { pub requested_streaming_features: Option, } -#[derive(Debug, Serialize)] +#[derive(Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct MonitorSettings { pub width_in_pixels: u32, @@ -168,7 +168,7 @@ pub struct MonitorSettings { pub dpi: i32, } -#[derive(Debug, Serialize)] +#[derive(Debug, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct DisplayData { pub desired_content_max_luminance: i32, diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 9a7f755..d9e6e58 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -13,7 +13,8 @@ use winit::window::{Window, WindowAttributes, Fullscreen, CursorGrabMode}; #[cfg(target_os = "macos")] use winit::raw_window_handle::{HasWindowHandle, RawWindowHandle}; -use crate::app::{App, AppState, UiAction, GamesTab, SettingChange}; +use crate::app::{App, AppState, UiAction, GamesTab, SettingChange, GameInfo}; +use crate::app::session::ActiveSessionInfo; use crate::media::{VideoFrame, PixelFormat}; use super::StatsPanel; use super::image_cache; @@ -1503,6 +1504,9 @@ impl Renderer { auto_server_selection, ping_testing, show_settings_modal, + app.show_session_conflict, + &app.active_sessions, + app.pending_game_launch.as_ref(), &mut actions ); } @@ -1760,6 +1764,9 @@ impl Renderer { auto_server_selection: bool, ping_testing: bool, show_settings_modal: bool, + show_session_conflict: bool, + active_sessions: &[ActiveSessionInfo], + pending_game_launch: Option<&GameInfo>, actions: &mut Vec ) { // Top bar with tabs, search, and logout - subscription info moved to bottom @@ -2093,8 +2100,8 @@ impl Renderer { } // Session conflict dialog - if app.show_session_conflict { - Self::render_session_conflict_dialog(ctx, &app.active_sessions, app.pending_game_launch.as_ref(), actions); + if show_session_conflict { + Self::render_session_conflict_dialog(ctx, active_sessions, pending_game_launch, actions); } } @@ -2405,9 +2412,6 @@ impl Renderer { pending_game: Option<&GameInfo>, actions: &mut Vec, ) { - use crate::app::session::ActiveSessionInfo; - use crate::app::GameInfo; - let modal_width = 500.0; let modal_height = 300.0; @@ -2415,6 +2419,7 @@ impl Renderer { .fixed_pos(egui::pos2(0.0, 0.0)) .order(egui::Order::Middle) .show(ctx, |ui| { + #[allow(deprecated)] let screen_rect = ctx.screen_rect(); ui.allocate_response(screen_rect.size(), egui::Sense::click()); ui.painter().rect_filled( @@ -2424,6 +2429,7 @@ impl Renderer { ); }); + #[allow(deprecated)] let screen_rect = ctx.screen_rect(); let modal_pos = egui::pos2( (screen_rect.width() - modal_width) / 2.0, diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index 6d88e5e..66b6d54 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -2,6 +2,8 @@ //! //! A high-performance, cross-platform streaming client for GFN. +#![recursion_limit = "256"] + mod app; mod api; mod auth; From 8960a04b49883a943c058dcc89ac06fc7851ff67 Mon Sep 17 00:00:00 2001 From: Zortos Date: Wed, 31 Dec 2025 17:15:00 +0100 Subject: [PATCH 09/67] Fix CI: use master-latest FFmpeg builds, add ARM64 OpenSSL, fix macOS bundle script --- .github/workflows/auto-build.yml | 90 ++++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 22 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 21a225f..0b214da 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -223,8 +223,8 @@ jobs: if: matrix.target == 'windows' shell: pwsh run: | - # Download shared FFmpeg build from BtbN (GitHub releases) - $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-win64-lgpl-shared-8.0.zip" + # Download shared FFmpeg build from BtbN (GitHub releases) - use master-latest for stability + $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-lgpl-shared.zip" Write-Host "Downloading FFmpeg x64 from $ffmpegUrl..." Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip @@ -233,6 +233,12 @@ jobs: $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName Write-Host "FFmpeg extracted to: $ffmpegDir" + # List contents to verify structure + Write-Host "`n=== FFmpeg directory structure ===" + Get-ChildItem $ffmpegDir + Write-Host "`n=== Lib directory ===" + Get-ChildItem "$ffmpegDir\lib" -ErrorAction SilentlyContinue + # Set environment variables for ffmpeg-next crate echo "FFMPEG_DIR=$ffmpegDir" >> $env:GITHUB_ENV echo "PATH=$ffmpegDir\bin;$env:PATH" >> $env:GITHUB_ENV @@ -247,8 +253,8 @@ jobs: if: matrix.target == 'windows-arm64' shell: pwsh run: | - # Download ARM64 FFmpeg build from BtbN (GitHub releases) - $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-winarm64-lgpl-shared-8.0.zip" + # Download ARM64 FFmpeg build from BtbN (GitHub releases) - use master-latest for stability + $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-winarm64-lgpl-shared.zip" Write-Host "Downloading FFmpeg ARM64 from $ffmpegUrl..." Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip @@ -301,6 +307,16 @@ jobs: run: | sudo apt-get update + # Enable ARM64 architecture for cross-compilation + sudo dpkg --add-architecture arm64 + + # Add ARM64 repositories + sudo sed -i 's/^deb /deb [arch=amd64] /' /etc/apt/sources.list + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list + echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list + + sudo apt-get update + # Install cross-compilation toolchain and build dependencies sudo apt-get install -y \ gcc-aarch64-linux-gnu \ @@ -308,10 +324,11 @@ jobs: pkg-config \ clang \ libclang-dev \ - wget + wget \ + libssl-dev:arm64 - # Download pre-built FFmpeg ARM64 from BtbN - FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-linuxarm64-lgpl-shared-8.0.tar.xz" + # Download pre-built FFmpeg ARM64 from BtbN - use master-latest for stability + FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm64-lgpl-shared.tar.xz" echo "Downloading FFmpeg ARM64 from $FFMPEG_URL..." wget -q "$FFMPEG_URL" -O ffmpeg.tar.xz @@ -336,6 +353,11 @@ jobs: echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=$FFMPEG_DIR/lib/pkgconfig" >> $GITHUB_ENV + # Set OpenSSL paths for ARM64 cross-compilation + echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV + echo "OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu" >> $GITHUB_ENV + echo "OPENSSL_INCLUDE_DIR=/usr/include" >> $GITHUB_ENV + echo "FFmpeg ARM64 setup complete" # ==================== Build Native Client ==================== @@ -411,6 +433,7 @@ jobs: if: matrix.target == 'macos' shell: bash run: | + set -e cd opennow-streamer BINARY="target/release/opennow-streamer" @@ -419,6 +442,12 @@ jobs: echo "Creating bundle directory structure..." mkdir -p "$BUNDLE_DIR/libs" + # Check if binary exists + if [ ! -f "$BINARY" ]; then + echo "ERROR: Binary not found at $BINARY" + exit 1 + fi + # Copy the binary cp "$BINARY" "$BUNDLE_DIR/" chmod +x "$BUNDLE_DIR/opennow-streamer" @@ -443,7 +472,7 @@ jobs: # Function to fix references in a binary/library fix_refs() { local target="$1" - for dep in $(otool -L "$target" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + for dep in $(otool -L "$target" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do local depname=$(basename "$dep") install_name_tool -change "$dep" "@executable_path/libs/$depname" "$target" 2>/dev/null || true done @@ -451,20 +480,31 @@ jobs: echo "" echo "=== Phase 1: Copy direct FFmpeg dependencies ===" - for lib in $(otool -L "$BINARY" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do - copy_lib "$lib" - done + DIRECT_DEPS=$(otool -L "$BINARY" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}' || true) + if [ -z "$DIRECT_DEPS" ]; then + echo "No Homebrew dependencies found in binary (may be statically linked or using system libs)" + else + for lib in $DIRECT_DEPS; do + copy_lib "$lib" + done + fi echo "" echo "=== Phase 2: Copy transitive dependencies (3 passes) ===" for pass in 1 2 3; do echo "Pass $pass..." - for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do - [ -f "$bundled_lib" ] || continue - for dep in $(otool -L "$bundled_lib" | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do - copy_lib "$dep" + # Check if any dylibs exist in the libs directory + if ls "$BUNDLE_DIR/libs/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do + [ -f "$bundled_lib" ] || continue + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + copy_lib "$dep" + done done - done + else + echo " No dylibs to process" + break + fi done echo "" @@ -472,15 +512,21 @@ jobs: # Fix the main binary fix_refs "$BUNDLE_DIR/opennow-streamer" - # Fix all bundled libraries - for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do - [ -f "$bundled_lib" ] || continue - fix_refs "$bundled_lib" - done + # Fix all bundled libraries if they exist + if ls "$BUNDLE_DIR/libs/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do + [ -f "$bundled_lib" ] || continue + fix_refs "$bundled_lib" + done + fi echo "" echo "=== Bundled libraries ===" - ls -lh "$BUNDLE_DIR/libs/" | head -30 + if ls "$BUNDLE_DIR/libs/"* 1>/dev/null 2>&1; then + ls -lh "$BUNDLE_DIR/libs/" | head -30 + else + echo " (no libraries bundled - using system/static linking)" + fi echo "" echo "=== Final binary dependencies ===" From e31eb13f2a1a3ecff72c80d48c2021c2af5d3075 Mon Sep 17 00:00:00 2001 From: Zortos Date: Thu, 1 Jan 2026 14:52:44 +0100 Subject: [PATCH 10/67] Fix game launch and sync render FPS to decode rate - Fix game not launching: save pending game cache before setting launch flag - Add frame rate limiting in streaming mode to match target FPS - Prevents render loop running at 500+ FPS when decode is only 120 FPS --- opennow-streamer/src/app/mod.rs | 2 ++ opennow-streamer/src/main.rs | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index 47a08f4..d3b8347 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -1165,12 +1165,14 @@ impl App { } else { info!("No active sessions, proceeding with launch"); Self::clear_active_sessions_cache(); + Self::save_pending_game_cache(&game_clone); Self::save_launch_proceed_flag(); } } Err(e) => { warn!("Failed to check active sessions: {}, proceeding with launch", e); Self::clear_active_sessions_cache(); + Self::save_pending_game_cache(&game_clone); Self::save_launch_proceed_flag(); } } diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index 66b6d54..b5b7ba8 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -405,9 +405,23 @@ impl ApplicationHandler for OpenNowApp { // No polling needed here - raw input sends directly to the WebRTC input channel // This keeps mouse latency minimal and independent of render rate - // CRITICAL: Render directly here during streaming! - // This bypasses request_redraw() which is tied to monitor refresh rate. - // With ControlFlow::Poll + Immediate present mode, this renders as fast as possible. + // Frame rate limiting - sync render rate to stream's target FPS + // This prevents the render loop from running at 500+ FPS when decode is only 120 FPS + let target_fps = app_guard.stats.target_fps.max(60); + drop(app_guard); // Release lock before potential sleep + + let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps as f64); + let elapsed = self.last_frame_time.elapsed(); + if elapsed < frame_duration { + let sleep_time = frame_duration - elapsed; + if sleep_time.as_micros() > 500 { + std::thread::sleep(sleep_time - std::time::Duration::from_micros(500)); + } + } + self.last_frame_time = std::time::Instant::now(); + + // Re-acquire lock for update and render + let mut app_guard = self.app.lock(); app_guard.update(); match renderer.render(&app_guard) { From a61ef1a6e87f1e3e063f05efbe2a02d846286be5 Mon Sep 17 00:00:00 2001 From: Zortos Date: Thu, 1 Jan 2026 17:09:35 +0100 Subject: [PATCH 11/67] Refactor: split large files into smaller modules - Extract UI screens from renderer.rs to gui/screens/ - login.rs: login screen with provider selection - session.rs: session loading/connecting screen - dialogs.rs: settings, session conflict, AV1 warning modals - shaders.rs: GPU shader constants - Extract RTP depacketizer from video.rs to media/rtp.rs - Handles H.264, H.265/HEVC, and AV1 depacketization - Extract app cache/persistence logic to app/cache.rs - Token, games, library, subscription caching - Session state persistence - Ping results caching - Extract app types to app/types.rs - SharedFrame, GameInfo, UiAction, etc. --- opennow-streamer/src/app/cache.rs | 423 +++++++ opennow-streamer/src/app/config.rs | 3 +- opennow-streamer/src/app/mod.rs | 756 ++----------- opennow-streamer/src/app/types.rs | 206 ++++ opennow-streamer/src/gui/mod.rs | 2 + opennow-streamer/src/gui/renderer.rs | 1099 ++----------------- opennow-streamer/src/gui/screens/dialogs.rs | 606 ++++++++++ opennow-streamer/src/gui/screens/login.rs | 152 +++ opennow-streamer/src/gui/screens/mod.rs | 11 + opennow-streamer/src/gui/screens/session.rs | 61 + opennow-streamer/src/gui/shaders.rs | 145 +++ opennow-streamer/src/media/mod.rs | 4 +- opennow-streamer/src/media/rtp.rs | 659 +++++++++++ opennow-streamer/src/media/video.rs | 365 ++---- 14 files changed, 2521 insertions(+), 1971 deletions(-) create mode 100644 opennow-streamer/src/app/cache.rs create mode 100644 opennow-streamer/src/app/types.rs create mode 100644 opennow-streamer/src/gui/screens/dialogs.rs create mode 100644 opennow-streamer/src/gui/screens/login.rs create mode 100644 opennow-streamer/src/gui/screens/mod.rs create mode 100644 opennow-streamer/src/gui/screens/session.rs create mode 100644 opennow-streamer/src/gui/shaders.rs create mode 100644 opennow-streamer/src/media/rtp.rs diff --git a/opennow-streamer/src/app/cache.rs b/opennow-streamer/src/app/cache.rs new file mode 100644 index 0000000..241c753 --- /dev/null +++ b/opennow-streamer/src/app/cache.rs @@ -0,0 +1,423 @@ +//! App Data Cache Management +//! +//! Handles caching of games, library, subscription, sessions, and tokens. + +use log::{error, info, warn}; +use std::path::PathBuf; + +use crate::auth::AuthTokens; +use super::{GameInfo, SubscriptionInfo, SessionInfo, SessionState, ActiveSessionInfo}; +use crate::app::session::MediaConnectionInfo; + +/// Get the application data directory +/// Creates directory if it doesn't exist +pub fn get_app_data_dir() -> Option { + use std::sync::OnceLock; + static APP_DATA_DIR: OnceLock> = OnceLock::new(); + + APP_DATA_DIR.get_or_init(|| { + let data_dir = dirs::data_dir()?; + let app_dir = data_dir.join("opennow"); + + // Ensure directory exists + if let Err(e) = std::fs::create_dir_all(&app_dir) { + error!("Failed to create app data directory: {}", e); + } + + // Migration: copy auth.json from legacy locations if it doesn't exist in new location + let new_auth = app_dir.join("auth.json"); + if !new_auth.exists() { + // Try legacy opennow-streamer location (config_dir) + if let Some(config_dir) = dirs::config_dir() { + let legacy_path = config_dir.join("opennow-streamer").join("auth.json"); + if legacy_path.exists() { + if let Err(e) = std::fs::copy(&legacy_path, &new_auth) { + warn!("Failed to migrate auth.json from legacy location: {}", e); + } else { + info!("Migrated auth.json from {:?} to {:?}", legacy_path, new_auth); + } + } + } + + // Try gfn-client location (config_dir) + if !new_auth.exists() { + if let Some(config_dir) = dirs::config_dir() { + let legacy_path = config_dir.join("gfn-client").join("auth.json"); + if legacy_path.exists() { + if let Err(e) = std::fs::copy(&legacy_path, &new_auth) { + warn!("Failed to migrate auth.json from gfn-client: {}", e); + } else { + info!("Migrated auth.json from {:?} to {:?}", legacy_path, new_auth); + } + } + } + } + } + + Some(app_dir) + }).clone() +} + +// ============================================================ +// Auth Token Cache +// ============================================================ + +pub fn tokens_path() -> Option { + get_app_data_dir().map(|p| p.join("auth.json")) +} + +pub fn load_tokens() -> Option { + let path = tokens_path()?; + let content = std::fs::read_to_string(&path).ok()?; + let tokens: AuthTokens = serde_json::from_str(&content).ok()?; + + // Validate token is not expired + if tokens.is_expired() { + info!("Saved token expired, clearing auth file"); + let _ = std::fs::remove_file(&path); + return None; + } + + Some(tokens) +} + +pub fn save_tokens(tokens: &AuthTokens) { + if let Some(path) = tokens_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string_pretty(tokens) { + if let Err(e) = std::fs::write(&path, &json) { + error!("Failed to save tokens: {}", e); + } else { + info!("Saved tokens to {:?}", path); + } + } + } +} + +pub fn clear_tokens() { + if let Some(path) = tokens_path() { + let _ = std::fs::remove_file(path); + info!("Cleared auth tokens"); + } +} + +// ============================================================ +// Games Cache +// ============================================================ + +fn games_cache_path() -> Option { + get_app_data_dir().map(|p| p.join("games_cache.json")) +} + +pub fn save_games_cache(games: &[GameInfo]) { + if let Some(path) = games_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(games) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_games_cache() -> Option> { + let path = games_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() +} + +pub fn clear_games_cache() { + if let Some(path) = games_cache_path() { + let _ = std::fs::remove_file(path); + } +} + +// ============================================================ +// Library Cache +// ============================================================ + +fn library_cache_path() -> Option { + get_app_data_dir().map(|p| p.join("library_cache.json")) +} + +pub fn save_library_cache(games: &[GameInfo]) { + if let Some(path) = library_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(games) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_library_cache() -> Option> { + let path = library_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() +} + +// ============================================================ +// Subscription Cache +// ============================================================ + +fn subscription_cache_path() -> Option { + get_app_data_dir().map(|p| p.join("subscription_cache.json")) +} + +pub fn save_subscription_cache(sub: &SubscriptionInfo) { + if let Some(path) = subscription_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let cache = serde_json::json!({ + "membership_tier": sub.membership_tier, + "remaining_hours": sub.remaining_hours, + "total_hours": sub.total_hours, + "has_persistent_storage": sub.has_persistent_storage, + "storage_size_gb": sub.storage_size_gb, + }); + if let Ok(json) = serde_json::to_string(&cache) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_subscription_cache() -> Option { + let path = subscription_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + let cache: serde_json::Value = serde_json::from_str(&content).ok()?; + + Some(SubscriptionInfo { + membership_tier: cache.get("membership_tier")?.as_str()?.to_string(), + remaining_hours: cache.get("remaining_hours")?.as_f64()? as f32, + total_hours: cache.get("total_hours")?.as_f64()? as f32, + has_persistent_storage: cache.get("has_persistent_storage")?.as_bool()?, + storage_size_gb: cache.get("storage_size_gb").and_then(|v| v.as_u64()).map(|v| v as u32), + }) +} + +// ============================================================ +// Session Cache +// ============================================================ + +fn session_cache_path() -> Option { + get_app_data_dir().map(|p| p.join("session_cache.json")) +} + +fn session_error_path() -> Option { + get_app_data_dir().map(|p| p.join("session_error.txt")) +} + +pub fn save_session_cache(session: &SessionInfo) { + if let Some(path) = session_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + // Serialize session info + let cache = serde_json::json!({ + "session_id": session.session_id, + "server_ip": session.server_ip, + "zone": session.zone, + "state": format!("{:?}", session.state), + "gpu_type": session.gpu_type, + "signaling_url": session.signaling_url, + "is_ready": session.is_ready(), + "is_queued": session.is_queued(), + "queue_position": session.queue_position(), + "media_connection_info": session.media_connection_info.as_ref().map(|mci| { + serde_json::json!({ + "ip": mci.ip, + "port": mci.port, + }) + }), + }); + if let Ok(json) = serde_json::to_string(&cache) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_session_cache() -> Option { + let path = session_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + let cache: serde_json::Value = serde_json::from_str(&content).ok()?; + + let state_str = cache.get("state")?.as_str()?; + let state = if state_str.contains("Ready") { + SessionState::Ready + } else if state_str.contains("Streaming") { + SessionState::Streaming + } else if state_str.contains("InQueue") { + // Parse queue position and eta from state string + let position = cache.get("queue_position") + .and_then(|v| v.as_u64()) + .unwrap_or(0) as u32; + SessionState::InQueue { position, eta_secs: 0 } + } else if state_str.contains("Error") { + SessionState::Error(state_str.to_string()) + } else if state_str.contains("Launching") { + SessionState::Launching + } else { + SessionState::Requesting + }; + + // Parse media_connection_info if present + let media_connection_info = cache.get("media_connection_info") + .and_then(|v| v.as_object()) + .and_then(|obj| { + let ip = obj.get("ip")?.as_str()?.to_string(); + let port = obj.get("port")?.as_u64()? as u16; + Some(MediaConnectionInfo { ip, port }) + }); + + Some(SessionInfo { + session_id: cache.get("session_id")?.as_str()?.to_string(), + server_ip: cache.get("server_ip")?.as_str()?.to_string(), + zone: cache.get("zone")?.as_str()?.to_string(), + state, + gpu_type: cache.get("gpu_type").and_then(|v| v.as_str()).map(|s| s.to_string()), + signaling_url: cache.get("signaling_url").and_then(|v| v.as_str()).map(|s| s.to_string()), + ice_servers: Vec::new(), + media_connection_info, + }) +} + +pub fn clear_session_cache() { + if let Some(path) = session_cache_path() { + let _ = std::fs::remove_file(path); + } +} + +pub fn save_session_error(error: &str) { + if let Some(path) = session_error_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let _ = std::fs::write(path, error); + } +} + +pub fn load_session_error() -> Option { + let path = session_error_path()?; + std::fs::read_to_string(path).ok() +} + +pub fn clear_session_error() { + if let Some(path) = session_error_path() { + let _ = std::fs::remove_file(path); + } +} + +// ============================================================ +// Active Sessions Cache (for conflict detection) +// ============================================================ + +pub fn save_active_sessions_cache(sessions: &[ActiveSessionInfo]) { + if let Some(path) = get_app_data_dir().map(|p| p.join("active_sessions.json")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(sessions) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_active_sessions_cache() -> Option> { + let path = get_app_data_dir()?.join("active_sessions.json"); + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() +} + +pub fn clear_active_sessions_cache() { + if let Some(path) = get_app_data_dir().map(|p| p.join("active_sessions.json")) { + let _ = std::fs::remove_file(path); + } +} + +// ============================================================ +// Pending Game Cache +// ============================================================ + +pub fn save_pending_game_cache(game: &GameInfo) { + if let Some(path) = get_app_data_dir().map(|p| p.join("pending_game.json")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(game) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_pending_game_cache() -> Option { + let path = get_app_data_dir()?.join("pending_game.json"); + let content = std::fs::read_to_string(path).ok()?; + serde_json::from_str(&content).ok() +} + +pub fn clear_pending_game_cache() { + if let Some(path) = get_app_data_dir().map(|p| p.join("pending_game.json")) { + let _ = std::fs::remove_file(path); + } +} + +// ============================================================ +// Launch Proceed Flag +// ============================================================ + +pub fn save_launch_proceed_flag() { + if let Some(path) = get_app_data_dir().map(|p| p.join("launch_proceed.flag")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let _ = std::fs::write(path, "1"); + } +} + +pub fn check_launch_proceed_flag() -> bool { + if let Some(path) = get_app_data_dir().map(|p| p.join("launch_proceed.flag")) { + if path.exists() { + let _ = std::fs::remove_file(path); + return true; + } + } + false +} + +// ============================================================ +// Ping Results Cache +// ============================================================ + +use super::types::ServerStatus; + +pub fn save_ping_results(results: &[(String, Option, ServerStatus)]) { + if let Some(path) = get_app_data_dir().map(|p| p.join("ping_results.json")) { + let cache: Vec = results + .iter() + .map(|(id, ping, status)| { + serde_json::json!({ + "id": id, + "ping_ms": ping, + "status": format!("{:?}", status), + }) + }) + .collect(); + + if let Ok(json) = serde_json::to_string(&cache) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_ping_results() -> Option> { + let path = get_app_data_dir()?.join("ping_results.json"); + let content = std::fs::read_to_string(&path).ok()?; + let results: Vec = serde_json::from_str(&content).ok()?; + // Clear the ping file after loading + let _ = std::fs::remove_file(&path); + Some(results) +} diff --git a/opennow-streamer/src/app/config.rs b/opennow-streamer/src/app/config.rs index ff32b53..55d6a21 100644 --- a/opennow-streamer/src/app/config.rs +++ b/opennow-streamer/src/app/config.rs @@ -295,7 +295,8 @@ impl VideoCodec { /// Get all available codecs pub fn all() -> &'static [VideoCodec] { - &[VideoCodec::H264, VideoCodec::H265, VideoCodec::AV1] + // AV1 disabled for now due to color space issues with NVIDIA CUVID decoder + &[VideoCodec::H264, VideoCodec::H265] } } diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index d3b8347..2e8f46e 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -4,13 +4,18 @@ pub mod config; pub mod session; +pub mod types; +pub mod cache; pub use config::{Settings, VideoCodec, AudioCodec, StreamQuality, StatsPosition}; pub use session::{SessionInfo, SessionState, ActiveSessionInfo}; +pub use types::{ + SharedFrame, GameInfo, SubscriptionInfo, GamesTab, ServerInfo, ServerStatus, + UiAction, SettingChange, AppState, parse_resolution, +}; use std::sync::Arc; -use std::sync::atomic::{AtomicU64, Ordering}; -use parking_lot::{Mutex, RwLock}; +use parking_lot::RwLock; use tokio::runtime::Handle; use tokio::sync::mpsc; use log::{info, error, warn}; @@ -20,154 +25,12 @@ use crate::api::{self, GfnApiClient, DynamicServerRegion}; use crate::input::InputHandler; -use crate::media::{VideoFrame, StreamStats}; +use crate::media::StreamStats; use crate::webrtc::StreamingSession; /// Cache for dynamic regions fetched from serverInfo API static DYNAMIC_REGIONS_CACHE: RwLock>> = RwLock::new(None); -/// Shared frame holder for zero-latency frame delivery -/// Decoder writes latest frame, renderer reads it - no buffering -pub struct SharedFrame { - frame: Mutex>, - frame_count: AtomicU64, - last_read_count: AtomicU64, -} - -impl SharedFrame { - pub fn new() -> Self { - Self { - frame: Mutex::new(None), - frame_count: AtomicU64::new(0), - last_read_count: AtomicU64::new(0), - } - } - - /// Write a new frame (called by decoder) - pub fn write(&self, frame: VideoFrame) { - *self.frame.lock() = Some(frame); - self.frame_count.fetch_add(1, Ordering::Release); - } - - /// Check if there's a new frame since last read - pub fn has_new_frame(&self) -> bool { - let current = self.frame_count.load(Ordering::Acquire); - let last = self.last_read_count.load(Ordering::Acquire); - current > last - } - - /// Read the latest frame (called by renderer) - /// Returns None if no frame available or no new frame since last read - /// Uses take() instead of clone() to avoid copying ~3MB per frame - pub fn read(&self) -> Option { - let current = self.frame_count.load(Ordering::Acquire); - let last = self.last_read_count.load(Ordering::Acquire); - - if current > last { - self.last_read_count.store(current, Ordering::Release); - self.frame.lock().take() // Move instead of clone - zero copy - } else { - None - } - } - - /// Get frame count for stats - pub fn frame_count(&self) -> u64 { - self.frame_count.load(Ordering::Relaxed) - } -} - -impl Default for SharedFrame { - fn default() -> Self { - Self::new() - } -} - -/// Parse resolution string (e.g., "1920x1080") into (width, height) -/// Returns (1920, 1080) as default if parsing fails -pub fn parse_resolution(res: &str) -> (u32, u32) { - let parts: Vec<&str> = res.split('x').collect(); - if parts.len() == 2 { - let width = parts[0].parse().unwrap_or(1920); - let height = parts[1].parse().unwrap_or(1080); - (width, height) - } else { - (1920, 1080) // Default to 1080p - } -} - -/// UI actions that can be triggered from the renderer -#[derive(Debug, Clone)] -pub enum UiAction { - /// Start OAuth login flow - StartLogin, - /// Select a login provider - SelectProvider(usize), - /// Logout - Logout, - /// Launch a game by index - LaunchGame(usize), - /// Launch a specific game - LaunchGameDirect(GameInfo), - /// Stop streaming - StopStreaming, - /// Toggle stats overlay - ToggleStats, - /// Update search query - UpdateSearch(String), - /// Toggle settings panel - ToggleSettings, - /// Update a setting - UpdateSetting(SettingChange), - /// Refresh games list - RefreshGames, - /// Switch to a tab - SwitchTab(GamesTab), - /// Open game detail popup - OpenGamePopup(GameInfo), - /// Close game detail popup - CloseGamePopup, - /// Select a server/region - SelectServer(usize), - /// Enable auto server selection (best ping) - SetAutoServerSelection(bool), - /// Start ping test for all servers - StartPingTest, - /// Toggle settings modal - ToggleSettingsModal, - /// Resume an active session - ResumeSession(ActiveSessionInfo), - /// Terminate existing session and start new game - TerminateAndLaunch(String, GameInfo), - /// Close session conflict dialog - CloseSessionConflict, -} - -/// Setting changes -#[derive(Debug, Clone)] -pub enum SettingChange { - Resolution(String), - Fps(u32), - Codec(VideoCodec), - MaxBitrate(u32), - Fullscreen(bool), - VSync(bool), - LowLatency(bool), -} - -/// Application state enum -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum AppState { - /// Login screen - Login, - /// Browsing games library - Games, - /// Session being set up (queue, launching) - Session, - /// Active streaming - Streaming, -} - /// Main application structure pub struct App { /// Current application state @@ -279,6 +142,9 @@ pub struct App { /// Whether showing session conflict dialog pub show_session_conflict: bool, + /// Whether showing AV1 unsupported warning dialog + pub show_av1_warning: bool, + /// Pending game launch (waiting for session conflict resolution) pub pending_game_launch: Option, @@ -294,58 +160,11 @@ pub struct App { /// Poll interval for session status (2 seconds) const POLL_INTERVAL: std::time::Duration = std::time::Duration::from_secs(2); -/// Game information -#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] -pub struct GameInfo { - pub id: String, - pub title: String, - pub publisher: Option, - pub image_url: Option, - pub store: String, - pub app_id: Option, -} - -/// Subscription information -#[derive(Debug, Clone, Default)] -pub struct SubscriptionInfo { - pub membership_tier: String, - pub remaining_hours: f32, - pub total_hours: f32, - pub has_persistent_storage: bool, - pub storage_size_gb: Option, -} +// Mutex re-export for streaming session +use parking_lot::Mutex; -/// Current tab in Games view -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum GamesTab { - AllGames, - MyLibrary, -} - -impl Default for GamesTab { - fn default() -> Self { - GamesTab::AllGames - } -} - -/// Server/Region information -#[derive(Debug, Clone)] -pub struct ServerInfo { - pub id: String, - pub name: String, - pub region: String, - pub url: Option, - pub ping_ms: Option, - pub status: ServerStatus, -} - -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum ServerStatus { - Online, - Testing, - Offline, - Unknown, -} +// VideoFrame re-import for current_frame field +use crate::media::VideoFrame; impl App { /// Create new application instance @@ -355,7 +174,7 @@ impl App { let auto_server = settings.auto_server_selection; // Save before move // Try to load saved tokens - let auth_tokens = Self::load_tokens(); + let auth_tokens = cache::load_tokens(); let has_token = auth_tokens.as_ref().map(|t| !t.is_expired()).unwrap_or(false); let initial_state = if has_token { @@ -409,6 +228,7 @@ impl App { show_settings_modal: false, active_sessions: Vec::new(), show_session_conflict: false, + show_av1_warning: false, pending_game_launch: None, last_poll_time: std::time::Instant::now(), render_frame_count: 0, @@ -458,7 +278,14 @@ impl App { match change { SettingChange::Resolution(res) => self.settings.resolution = res, SettingChange::Fps(fps) => self.settings.fps = fps, - SettingChange::Codec(codec) => self.settings.codec = codec, + SettingChange::Codec(codec) => { + // Check if AV1 is supported before enabling it + if codec == VideoCodec::AV1 && !crate::media::is_av1_hardware_supported() { + self.show_av1_warning = true; + } + // Still set the codec - user can use software decode if they want + self.settings.codec = codec; + } SettingChange::MaxBitrate(bitrate) => self.settings.max_bitrate_mbps = bitrate, SettingChange::Fullscreen(fs) => self.settings.fullscreen = fs, SettingChange::VSync(vsync) => self.settings.vsync = vsync, @@ -522,6 +349,9 @@ impl App { self.show_session_conflict = false; self.pending_game_launch = None; } + UiAction::CloseAV1Warning => { + self.show_av1_warning = false; + } } } @@ -591,7 +421,7 @@ impl App { info!("Token exchange successful!"); // Tokens will be picked up in update() // For now, we store them in a temp file - Self::save_tokens(&tokens); + cache::save_tokens(&tokens); } Err(e) => { error!("Token exchange failed: {}", e); @@ -648,7 +478,7 @@ impl App { // Check if tokens were saved by OAuth callback if self.state == AppState::Login && self.is_loading { - if let Some(tokens) = Self::load_tokens() { + if let Some(tokens) = cache::load_tokens() { if !tokens.is_expired() { info!("OAuth login successful!"); self.auth_tokens = Some(tokens.clone()); @@ -665,7 +495,7 @@ impl App { // Check if games were fetched and saved to cache if self.state == AppState::Games && self.is_loading && self.games.is_empty() { - if let Some(games) = Self::load_games_cache() { + if let Some(games) = cache::load_games_cache() { if !games.is_empty() { // Check if cache has images - if not, it's old cache that needs refresh let has_images = games.iter().any(|g| g.image_url.is_some()); @@ -676,7 +506,7 @@ impl App { self.status_message = format!("Loaded {} games", self.games.len()); } else { info!("Cache has {} games but no images - forcing refresh", games.len()); - Self::clear_games_cache(); + cache::clear_games_cache(); self.fetch_games(); } } @@ -685,7 +515,7 @@ impl App { // Check if library was fetched and saved to cache if self.state == AppState::Games && self.current_tab == GamesTab::MyLibrary && self.library_games.is_empty() { - if let Some(games) = Self::load_library_cache() { + if let Some(games) = cache::load_library_cache() { if !games.is_empty() { info!("Loaded {} games from library cache", games.len()); self.library_games = games; @@ -697,7 +527,7 @@ impl App { // Check if subscription was fetched and saved to cache if self.state == AppState::Games && self.subscription.is_none() { - if let Some(sub) = Self::load_subscription_cache() { + if let Some(sub) = cache::load_subscription_cache() { info!("Loaded subscription from cache: {}", sub.membership_tier); self.subscription = Some(sub); } @@ -712,19 +542,19 @@ impl App { } // Check for active sessions from async check - if let Some(sessions) = Self::load_active_sessions_cache() { + if let Some(sessions) = cache::load_active_sessions_cache() { self.active_sessions = sessions.clone(); - if let Some(pending) = Self::load_pending_game_cache() { + if let Some(pending) = cache::load_pending_game_cache() { self.pending_game_launch = Some(pending); self.show_session_conflict = true; - Self::clear_active_sessions_cache(); + cache::clear_active_sessions_cache(); } } // Check for launch proceed flag (after session termination) - if Self::check_launch_proceed_flag() { - if let Some(game) = Self::load_pending_game_cache() { - Self::clear_pending_game_cache(); + if cache::check_launch_proceed_flag() { + if let Some(game) = cache::load_pending_game_cache() { + cache::clear_pending_game_cache(); self.start_new_session(&game); } } @@ -740,7 +570,7 @@ impl App { self.auth_tokens = None; self.user_info = None; auth::clear_login_provider(); - Self::clear_tokens(); + cache::clear_tokens(); self.state = AppState::Login; self.games.clear(); self.status_message = "Logged out".to_string(); @@ -766,7 +596,7 @@ impl App { match api_client.fetch_main_games(None).await { Ok(games) => { info!("Fetched {} games from GraphQL MAIN panel (with images)", games.len()); - Self::save_games_cache(&games); + cache::save_games_cache(&games); } Err(e) => { error!("Failed to fetch main games from GraphQL: {}", e); @@ -776,7 +606,7 @@ impl App { match api_client.fetch_public_games().await { Ok(games) => { info!("Fetched {} games from public list (fallback)", games.len()); - Self::save_games_cache(&games); + cache::save_games_cache(&games); } Err(e2) => { error!("Failed to fetch public games: {}", e2); @@ -805,7 +635,7 @@ impl App { match api_client.fetch_library(None).await { Ok(games) => { info!("Fetched {} games from LIBRARY panel", games.len()); - Self::save_library_cache(&games); + cache::save_library_cache(&games); } Err(e) => { error!("Failed to fetch library: {}", e); @@ -833,7 +663,7 @@ impl App { sub.total_hours, sub.has_persistent_storage ); - Self::save_subscription_cache(&sub); + cache::save_subscription_cache(&sub); } Err(e) => { warn!("Failed to fetch subscription: {}", e); @@ -1028,7 +858,7 @@ impl App { } // Save results to cache - Self::save_ping_results(&results); + cache::save_ping_results(&results); }); } @@ -1053,69 +883,43 @@ impl App { } } - /// Save ping results to cache (for async loading) - fn save_ping_results(results: &[(String, Option, ServerStatus)]) { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("ping_results.json")) { - let cache: Vec = results - .iter() - .map(|(id, ping, status)| { - serde_json::json!({ - "id": id, - "ping_ms": ping, - "status": format!("{:?}", status), - }) - }) - .collect(); - - if let Ok(json) = serde_json::to_string(&cache) { - let _ = std::fs::write(path, json); - } - } - } - /// Load ping results from cache fn load_ping_results(&mut self) { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("ping_results.json")) { - if let Ok(content) = std::fs::read_to_string(&path) { - if let Ok(results) = serde_json::from_str::>(&content) { - for result in results { - if let Some(id) = result.get("id").and_then(|v| v.as_str()) { - if let Some(server) = self.servers.iter_mut().find(|s| s.id == id) { - server.ping_ms = result.get("ping_ms").and_then(|v| v.as_u64()).map(|v| v as u32); - server.status = match result.get("status").and_then(|v| v.as_str()) { - Some("Online") => ServerStatus::Online, - Some("Offline") => ServerStatus::Offline, - _ => ServerStatus::Unknown, - }; - } - } + if let Some(results) = cache::load_ping_results() { + for result in results { + if let Some(id) = result.get("id").and_then(|v| v.as_str()) { + if let Some(server) = self.servers.iter_mut().find(|s| s.id == id) { + server.ping_ms = result.get("ping_ms").and_then(|v| v.as_u64()).map(|v| v as u32); + server.status = match result.get("status").and_then(|v| v.as_str()) { + Some("Online") => ServerStatus::Online, + Some("Offline") => ServerStatus::Offline, + _ => ServerStatus::Unknown, + }; } + } + } - // Clear the ping file after loading - let _ = std::fs::remove_file(&path); - self.ping_testing = false; - - // Sort servers by ping (online first, then by ping) - self.servers.sort_by(|a, b| { - match (&a.status, &b.status) { - (ServerStatus::Online, ServerStatus::Online) => { - a.ping_ms.unwrap_or(9999).cmp(&b.ping_ms.unwrap_or(9999)) - } - (ServerStatus::Online, _) => std::cmp::Ordering::Less, - (_, ServerStatus::Online) => std::cmp::Ordering::Greater, - _ => std::cmp::Ordering::Equal, - } - }); - - // Update selected index after sort - if self.auto_server_selection { - // Auto-select best server - self.select_best_server(); - } else if let Some(ref selected_id) = self.settings.selected_server { - if let Some(idx) = self.servers.iter().position(|s| s.id == *selected_id) { - self.selected_server_index = idx; - } + self.ping_testing = false; + + // Sort servers by ping (online first, then by ping) + self.servers.sort_by(|a, b| { + match (&a.status, &b.status) { + (ServerStatus::Online, ServerStatus::Online) => { + a.ping_ms.unwrap_or(9999).cmp(&b.ping_ms.unwrap_or(9999)) } + (ServerStatus::Online, _) => std::cmp::Ordering::Less, + (_, ServerStatus::Online) => std::cmp::Ordering::Greater, + _ => std::cmp::Ordering::Equal, + } + }); + + // Update selected index after sort + if self.auto_server_selection { + // Auto-select best server + self.select_best_server(); + } else if let Some(ref selected_id) = self.settings.selected_server { + if let Some(idx) = self.servers.iter().position(|s| s.id == *selected_id) { + self.selected_server_index = idx; } } } @@ -1160,20 +964,20 @@ impl App { Ok(sessions) => { if !sessions.is_empty() { info!("Found {} active session(s)", sessions.len()); - Self::save_active_sessions_cache(&sessions); - Self::save_pending_game_cache(&game_clone); + cache::save_active_sessions_cache(&sessions); + cache::save_pending_game_cache(&game_clone); } else { info!("No active sessions, proceeding with launch"); - Self::clear_active_sessions_cache(); - Self::save_pending_game_cache(&game_clone); - Self::save_launch_proceed_flag(); + cache::clear_active_sessions_cache(); + cache::save_pending_game_cache(&game_clone); + cache::save_launch_proceed_flag(); } } Err(e) => { warn!("Failed to check active sessions: {}, proceeding with launch", e); - Self::clear_active_sessions_cache(); - Self::save_pending_game_cache(&game_clone); - Self::save_launch_proceed_flag(); + cache::clear_active_sessions_cache(); + cache::save_pending_game_cache(&game_clone); + cache::save_launch_proceed_flag(); } } }); @@ -1183,8 +987,8 @@ impl App { fn start_new_session(&mut self, game: &GameInfo) { info!("Starting new session for: {}", game.title); - Self::clear_session_cache(); - Self::clear_session_error(); + cache::clear_session_cache(); + cache::clear_session_error(); self.selected_game = Some(game.clone()); self.state = AppState::Session; @@ -1218,11 +1022,11 @@ impl App { match api_client.create_session(&app_id, &game_title, &settings, &zone).await { Ok(session) => { info!("Session created: {} (state: {:?})", session.session_id, session.state); - Self::save_session_cache(&session); + cache::save_session_cache(&session); } Err(e) => { error!("Failed to create session: {}", e); - Self::save_session_error(&format!("Failed to create session: {}", e)); + cache::save_session_error(&format!("Failed to create session: {}", e)); } } }); @@ -1274,11 +1078,11 @@ impl App { ).await { Ok(session) => { info!("Session claimed: {} (state: {:?})", session.session_id, session.state); - Self::save_session_cache(&session); + cache::save_session_cache(&session); } Err(e) => { error!("Failed to claim session: {}", e); - Self::save_session_error(&format!("Failed to resume session: {}", e)); + cache::save_session_error(&format!("Failed to resume session: {}", e)); } } }); @@ -1310,13 +1114,13 @@ impl App { Ok(_) => { info!("Session terminated, waiting before launching new session"); tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await; - Self::save_launch_proceed_flag(); - Self::save_pending_game_cache(&game_for_launch); + cache::save_launch_proceed_flag(); + cache::save_pending_game_cache(&game_for_launch); } Err(e) => { warn!("Session termination failed ({}), proceeding anyway", e); - Self::save_launch_proceed_flag(); - Self::save_pending_game_cache(&game_for_launch); + cache::save_launch_proceed_flag(); + cache::save_pending_game_cache(&game_for_launch); } } }); @@ -1325,14 +1129,14 @@ impl App { /// Poll session state and update UI fn poll_session_status(&mut self) { // First check cache for state updates (from in-flight or completed requests) - if let Some(session) = Self::load_session_cache() { + if let Some(session) = cache::load_session_cache() { if session.state == SessionState::Ready { info!("Session ready! GPU: {:?}, Server: {}", session.gpu_type, session.server_ip); self.status_message = format!( "Connecting to GPU: {}", session.gpu_type.as_deref().unwrap_or("Unknown") ); - Self::clear_session_cache(); + cache::clear_session_cache(); self.start_streaming(session); return; } else if let SessionState::InQueue { position, eta_secs } = session.state { @@ -1340,7 +1144,7 @@ impl App { } else if let SessionState::Error(ref msg) = session.state { self.error_message = Some(msg.clone()); self.is_loading = false; - Self::clear_session_cache(); + cache::clear_session_cache(); return; } else { self.status_message = "Setting up session...".to_string(); @@ -1353,7 +1157,7 @@ impl App { return; } - if let Some(session) = Self::load_session_cache() { + if let Some(session) = cache::load_session_cache() { let should_poll = matches!( session.state, SessionState::Requesting | SessionState::Launching | SessionState::InQueue { .. } @@ -1384,7 +1188,7 @@ impl App { match api_client.poll_session(&session_id, &zone, server_ip.as_deref()).await { Ok(updated_session) => { info!("Session poll: state={:?}", updated_session.state); - Self::save_session_cache(&updated_session); + cache::save_session_cache(&updated_session); } Err(e) => { error!("Session poll failed: {}", e); @@ -1395,119 +1199,10 @@ impl App { } // Check for session errors - if let Some(error) = Self::load_session_error() { + if let Some(error) = cache::load_session_error() { self.error_message = Some(error); self.is_loading = false; - Self::clear_session_error(); - } - } - - // Session cache helpers - fn session_cache_path() -> Option { - Self::get_app_data_dir().map(|p| p.join("session_cache.json")) - } - - fn session_error_path() -> Option { - Self::get_app_data_dir().map(|p| p.join("session_error.txt")) - } - - fn save_session_cache(session: &SessionInfo) { - if let Some(path) = Self::session_cache_path() { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - // Serialize session info (we need to make it serializable) - let cache = serde_json::json!({ - "session_id": session.session_id, - "server_ip": session.server_ip, - "zone": session.zone, - "state": format!("{:?}", session.state), - "gpu_type": session.gpu_type, - "signaling_url": session.signaling_url, - "is_ready": session.is_ready(), - "is_queued": session.is_queued(), - "queue_position": session.queue_position(), - "media_connection_info": session.media_connection_info.as_ref().map(|mci| { - serde_json::json!({ - "ip": mci.ip, - "port": mci.port, - }) - }), - }); - if let Ok(json) = serde_json::to_string(&cache) { - let _ = std::fs::write(path, json); - } - } - } - - fn load_session_cache() -> Option { - let path = Self::session_cache_path()?; - let content = std::fs::read_to_string(path).ok()?; - let cache: serde_json::Value = serde_json::from_str(&content).ok()?; - - let state_str = cache.get("state")?.as_str()?; - let state = if state_str.contains("Ready") { - SessionState::Ready - } else if state_str.contains("Streaming") { - SessionState::Streaming - } else if state_str.contains("InQueue") { - // Parse queue position and eta from state string - let position = cache.get("queue_position") - .and_then(|v| v.as_u64()) - .unwrap_or(0) as u32; - SessionState::InQueue { position, eta_secs: 0 } - } else if state_str.contains("Error") { - SessionState::Error(state_str.to_string()) - } else if state_str.contains("Launching") { - SessionState::Launching - } else { - SessionState::Requesting - }; - - // Parse media_connection_info if present - let media_connection_info = cache.get("media_connection_info") - .and_then(|v| v.as_object()) - .and_then(|obj| { - let ip = obj.get("ip")?.as_str()?.to_string(); - let port = obj.get("port")?.as_u64()? as u16; - Some(crate::app::session::MediaConnectionInfo { ip, port }) - }); - - Some(SessionInfo { - session_id: cache.get("session_id")?.as_str()?.to_string(), - server_ip: cache.get("server_ip")?.as_str()?.to_string(), - zone: cache.get("zone")?.as_str()?.to_string(), - state, - gpu_type: cache.get("gpu_type").and_then(|v| v.as_str()).map(|s| s.to_string()), - signaling_url: cache.get("signaling_url").and_then(|v| v.as_str()).map(|s| s.to_string()), - ice_servers: Vec::new(), - media_connection_info, - }) - } - - fn clear_session_cache() { - if let Some(path) = Self::session_cache_path() { - let _ = std::fs::remove_file(path); - } - } - - fn save_session_error(error: &str) { - if let Some(path) = Self::session_error_path() { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - let _ = std::fs::write(path, error); - } - } - - fn load_session_error() -> Option { - let path = Self::session_error_path()?; - std::fs::read_to_string(path).ok() - } - - fn clear_session_error() { - if let Some(path) = Self::session_error_path() { - let _ = std::fs::remove_file(path); + cache::clear_session_error(); } } @@ -1577,7 +1272,7 @@ impl App { info!("Stopping streaming"); // Clear session cache first to prevent stale session data - Self::clear_session_cache(); + cache::clear_session_cache(); // Reset input timing for next session crate::input::reset_session_timing(); @@ -1626,247 +1321,4 @@ impl App { .map(|u| u.membership_tier.as_str()) .unwrap_or("FREE") } - - // Token persistence helpers - cross-platform using data_dir/opennow - // Cached app data directory (initialized once) - fn get_app_data_dir() -> Option { - use std::sync::OnceLock; - static APP_DATA_DIR: OnceLock> = OnceLock::new(); - - APP_DATA_DIR.get_or_init(|| { - let data_dir = dirs::data_dir()?; - let app_dir = data_dir.join("opennow"); - - // Ensure directory exists - if let Err(e) = std::fs::create_dir_all(&app_dir) { - error!("Failed to create app data directory: {}", e); - } - - // Migration: copy auth.json from legacy locations if it doesn't exist in new location - let new_auth = app_dir.join("auth.json"); - if !new_auth.exists() { - // Try legacy opennow-streamer location (config_dir) - if let Some(config_dir) = dirs::config_dir() { - let legacy_path = config_dir.join("opennow-streamer").join("auth.json"); - if legacy_path.exists() { - if let Err(e) = std::fs::copy(&legacy_path, &new_auth) { - warn!("Failed to migrate auth.json from legacy location: {}", e); - } else { - info!("Migrated auth.json from {:?} to {:?}", legacy_path, new_auth); - } - } - } - - // Try gfn-client location (config_dir) - if !new_auth.exists() { - if let Some(config_dir) = dirs::config_dir() { - let legacy_path = config_dir.join("gfn-client").join("auth.json"); - if legacy_path.exists() { - if let Err(e) = std::fs::copy(&legacy_path, &new_auth) { - warn!("Failed to migrate auth.json from gfn-client: {}", e); - } else { - info!("Migrated auth.json from {:?} to {:?}", legacy_path, new_auth); - } - } - } - } - } - - Some(app_dir) - }).clone() - } - - fn tokens_path() -> Option { - Self::get_app_data_dir().map(|p| p.join("auth.json")) - } - - fn load_tokens() -> Option { - let path = Self::tokens_path()?; - let content = std::fs::read_to_string(&path).ok()?; - let tokens: AuthTokens = serde_json::from_str(&content).ok()?; - - // Validate token is not expired - if tokens.is_expired() { - info!("Saved token expired, clearing auth file"); - let _ = std::fs::remove_file(&path); - return None; - } - - Some(tokens) - } - - fn save_tokens(tokens: &AuthTokens) { - if let Some(path) = Self::tokens_path() { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - if let Ok(json) = serde_json::to_string_pretty(tokens) { - if let Err(e) = std::fs::write(&path, &json) { - error!("Failed to save tokens: {}", e); - } else { - info!("Saved tokens to {:?}", path); - } - } - } - } - - fn clear_tokens() { - if let Some(path) = Self::tokens_path() { - let _ = std::fs::remove_file(path); - info!("Cleared auth tokens"); - } - } - - // Session conflict management cache - fn save_active_sessions_cache(sessions: &[ActiveSessionInfo]) { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("active_sessions.json")) { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - if let Ok(json) = serde_json::to_string(sessions) { - let _ = std::fs::write(path, json); - } - } - } - - fn load_active_sessions_cache() -> Option> { - let path = Self::get_app_data_dir()?.join("active_sessions.json"); - let content = std::fs::read_to_string(path).ok()?; - serde_json::from_str(&content).ok() - } - - fn clear_active_sessions_cache() { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("active_sessions.json")) { - let _ = std::fs::remove_file(path); - } - } - - fn save_pending_game_cache(game: &GameInfo) { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("pending_game.json")) { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - if let Ok(json) = serde_json::to_string(game) { - let _ = std::fs::write(path, json); - } - } - } - - fn load_pending_game_cache() -> Option { - let path = Self::get_app_data_dir()?.join("pending_game.json"); - let content = std::fs::read_to_string(path).ok()?; - serde_json::from_str(&content).ok() - } - - fn clear_pending_game_cache() { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("pending_game.json")) { - let _ = std::fs::remove_file(path); - } - } - - fn save_launch_proceed_flag() { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("launch_proceed.flag")) { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - let _ = std::fs::write(path, "1"); - } - } - - fn check_launch_proceed_flag() -> bool { - if let Some(path) = Self::get_app_data_dir().map(|p| p.join("launch_proceed.flag")) { - if path.exists() { - let _ = std::fs::remove_file(path); - return true; - } - } - false - } - - // Games cache for async fetch - fn games_cache_path() -> Option { - Self::get_app_data_dir().map(|p| p.join("games_cache.json")) - } - - fn save_games_cache(games: &[GameInfo]) { - if let Some(path) = Self::games_cache_path() { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - if let Ok(json) = serde_json::to_string(games) { - let _ = std::fs::write(path, json); - } - } - } - - fn load_games_cache() -> Option> { - let path = Self::games_cache_path()?; - let content = std::fs::read_to_string(path).ok()?; - serde_json::from_str(&content).ok() - } - - fn clear_games_cache() { - if let Some(path) = Self::games_cache_path() { - let _ = std::fs::remove_file(path); - } - } - - // Library cache for async fetch - fn library_cache_path() -> Option { - Self::get_app_data_dir().map(|p| p.join("library_cache.json")) - } - - fn save_library_cache(games: &[GameInfo]) { - if let Some(path) = Self::library_cache_path() { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - if let Ok(json) = serde_json::to_string(games) { - let _ = std::fs::write(path, json); - } - } - } - - fn load_library_cache() -> Option> { - let path = Self::library_cache_path()?; - let content = std::fs::read_to_string(path).ok()?; - serde_json::from_str(&content).ok() - } - - // Subscription cache for async fetch - fn subscription_cache_path() -> Option { - Self::get_app_data_dir().map(|p| p.join("subscription_cache.json")) - } - - fn save_subscription_cache(sub: &SubscriptionInfo) { - if let Some(path) = Self::subscription_cache_path() { - if let Some(parent) = path.parent() { - let _ = std::fs::create_dir_all(parent); - } - let cache = serde_json::json!({ - "membership_tier": sub.membership_tier, - "remaining_hours": sub.remaining_hours, - "total_hours": sub.total_hours, - "has_persistent_storage": sub.has_persistent_storage, - "storage_size_gb": sub.storage_size_gb, - }); - if let Ok(json) = serde_json::to_string(&cache) { - let _ = std::fs::write(path, json); - } - } - } - - fn load_subscription_cache() -> Option { - let path = Self::subscription_cache_path()?; - let content = std::fs::read_to_string(path).ok()?; - let cache: serde_json::Value = serde_json::from_str(&content).ok()?; - - Some(SubscriptionInfo { - membership_tier: cache.get("membership_tier")?.as_str()?.to_string(), - remaining_hours: cache.get("remaining_hours")?.as_f64()? as f32, - total_hours: cache.get("total_hours")?.as_f64()? as f32, - has_persistent_storage: cache.get("has_persistent_storage")?.as_bool()?, - storage_size_gb: cache.get("storage_size_gb").and_then(|v| v.as_u64()).map(|v| v as u32), - }) - } } diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs new file mode 100644 index 0000000..9c79b92 --- /dev/null +++ b/opennow-streamer/src/app/types.rs @@ -0,0 +1,206 @@ +//! Application Types +//! +//! Common types used across the application. + +use std::sync::atomic::{AtomicU64, Ordering}; +use parking_lot::Mutex; + +use crate::media::VideoFrame; +use super::config::VideoCodec; + +/// Shared frame holder for zero-latency frame delivery +/// Decoder writes latest frame, renderer reads it - no buffering +pub struct SharedFrame { + frame: Mutex>, + frame_count: AtomicU64, + last_read_count: AtomicU64, +} + +impl SharedFrame { + pub fn new() -> Self { + Self { + frame: Mutex::new(None), + frame_count: AtomicU64::new(0), + last_read_count: AtomicU64::new(0), + } + } + + /// Write a new frame (called by decoder) + pub fn write(&self, frame: VideoFrame) { + *self.frame.lock() = Some(frame); + self.frame_count.fetch_add(1, Ordering::Release); + } + + /// Check if there's a new frame since last read + pub fn has_new_frame(&self) -> bool { + let current = self.frame_count.load(Ordering::Acquire); + let last = self.last_read_count.load(Ordering::Acquire); + current > last + } + + /// Read the latest frame (called by renderer) + /// Returns None if no frame available or no new frame since last read + /// Uses take() instead of clone() to avoid copying ~3MB per frame + pub fn read(&self) -> Option { + let current = self.frame_count.load(Ordering::Acquire); + let last = self.last_read_count.load(Ordering::Acquire); + + if current > last { + self.last_read_count.store(current, Ordering::Release); + self.frame.lock().take() // Move instead of clone - zero copy + } else { + None + } + } + + /// Get frame count for stats + pub fn frame_count(&self) -> u64 { + self.frame_count.load(Ordering::Relaxed) + } +} + +impl Default for SharedFrame { + fn default() -> Self { + Self::new() + } +} + +/// Parse resolution string (e.g., "1920x1080") into (width, height) +/// Returns (1920, 1080) as default if parsing fails +pub fn parse_resolution(res: &str) -> (u32, u32) { + let parts: Vec<&str> = res.split('x').collect(); + if parts.len() == 2 { + let width = parts[0].parse().unwrap_or(1920); + let height = parts[1].parse().unwrap_or(1080); + (width, height) + } else { + (1920, 1080) // Default to 1080p + } +} + +/// Game information +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] +pub struct GameInfo { + pub id: String, + pub title: String, + pub publisher: Option, + pub image_url: Option, + pub store: String, + pub app_id: Option, +} + +/// Subscription information +#[derive(Debug, Clone, Default)] +pub struct SubscriptionInfo { + pub membership_tier: String, + pub remaining_hours: f32, + pub total_hours: f32, + pub has_persistent_storage: bool, + pub storage_size_gb: Option, +} + +/// Current tab in Games view +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum GamesTab { + AllGames, + MyLibrary, +} + +impl Default for GamesTab { + fn default() -> Self { + GamesTab::AllGames + } +} + +/// Server/Region information +#[derive(Debug, Clone)] +pub struct ServerInfo { + pub id: String, + pub name: String, + pub region: String, + pub url: Option, + pub ping_ms: Option, + pub status: ServerStatus, +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum ServerStatus { + Online, + Testing, + Offline, + Unknown, +} + +/// UI actions that can be triggered from the renderer +#[derive(Debug, Clone)] +pub enum UiAction { + /// Start OAuth login flow + StartLogin, + /// Select a login provider + SelectProvider(usize), + /// Logout + Logout, + /// Launch a game by index + LaunchGame(usize), + /// Launch a specific game + LaunchGameDirect(GameInfo), + /// Stop streaming + StopStreaming, + /// Toggle stats overlay + ToggleStats, + /// Update search query + UpdateSearch(String), + /// Toggle settings panel + ToggleSettings, + /// Update a setting + UpdateSetting(SettingChange), + /// Refresh games list + RefreshGames, + /// Switch to a tab + SwitchTab(GamesTab), + /// Open game detail popup + OpenGamePopup(GameInfo), + /// Close game detail popup + CloseGamePopup, + /// Select a server/region + SelectServer(usize), + /// Enable auto server selection (best ping) + SetAutoServerSelection(bool), + /// Start ping test for all servers + StartPingTest, + /// Toggle settings modal + ToggleSettingsModal, + /// Resume an active session + ResumeSession(super::session::ActiveSessionInfo), + /// Terminate existing session and start new game + TerminateAndLaunch(String, GameInfo), + /// Close session conflict dialog + CloseSessionConflict, + /// Close AV1 warning dialog + CloseAV1Warning, +} + +/// Setting changes +#[derive(Debug, Clone)] +pub enum SettingChange { + Resolution(String), + Fps(u32), + Codec(VideoCodec), + MaxBitrate(u32), + Fullscreen(bool), + VSync(bool), + LowLatency(bool), +} + +/// Application state enum +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum AppState { + /// Login screen + Login, + /// Browsing games library + Games, + /// Session being set up (queue, launching) + Session, + /// Active streaming + Streaming, +} diff --git a/opennow-streamer/src/gui/mod.rs b/opennow-streamer/src/gui/mod.rs index 3f1136a..56cbb5f 100644 --- a/opennow-streamer/src/gui/mod.rs +++ b/opennow-streamer/src/gui/mod.rs @@ -4,6 +4,8 @@ mod renderer; mod stats_panel; +mod shaders; +pub mod screens; pub mod image_cache; pub use renderer::Renderer; diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index d9e6e58..76d0ece 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -18,148 +18,10 @@ use crate::app::session::ActiveSessionInfo; use crate::media::{VideoFrame, PixelFormat}; use super::StatsPanel; use super::image_cache; +use super::shaders::{VIDEO_SHADER, NV12_SHADER}; +use super::screens::{render_login_screen, render_session_screen, render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog}; use std::collections::HashMap; -/// WGSL shader for full-screen video quad with YUV to RGB conversion -/// Uses 3 separate textures (Y, U, V) for GPU-accelerated color conversion -/// This eliminates the CPU bottleneck of converting ~600M pixels/sec at 1440p165 -const VIDEO_SHADER: &str = r#" -struct VertexOutput { - @builtin(position) position: vec4, - @location(0) tex_coord: vec2, -}; - -@vertex -fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { - // Full-screen quad (2 triangles = 6 vertices) - var positions = array, 6>( - vec2(-1.0, -1.0), // bottom-left - vec2( 1.0, -1.0), // bottom-right - vec2(-1.0, 1.0), // top-left - vec2(-1.0, 1.0), // top-left - vec2( 1.0, -1.0), // bottom-right - vec2( 1.0, 1.0), // top-right - ); - - var tex_coords = array, 6>( - vec2(0.0, 1.0), // bottom-left - vec2(1.0, 1.0), // bottom-right - vec2(0.0, 0.0), // top-left - vec2(0.0, 0.0), // top-left - vec2(1.0, 1.0), // bottom-right - vec2(1.0, 0.0), // top-right - ); - - var output: VertexOutput; - output.position = vec4(positions[vertex_index], 0.0, 1.0); - output.tex_coord = tex_coords[vertex_index]; - return output; -} - -// YUV planar textures (Y = full res, U/V = half res) -@group(0) @binding(0) -var y_texture: texture_2d; -@group(0) @binding(1) -var u_texture: texture_2d; -@group(0) @binding(2) -var v_texture: texture_2d; -@group(0) @binding(3) -var video_sampler: sampler; - -@fragment -fn fs_main(input: VertexOutput) -> @location(0) vec4 { - // Sample Y, U, V planes - // Y is full resolution, U/V are half resolution (4:2:0 subsampling) - // The sampler handles the upscaling of U/V automatically - let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; - let u_raw = textureSample(u_texture, video_sampler, input.tex_coord).r; - let v_raw = textureSample(v_texture, video_sampler, input.tex_coord).r; - - // BT.709 YUV to RGB conversion (limited/TV range) - // Video uses limited range: Y [16-235], UV [16-240] - // First convert from limited range to full range - let y = (y_raw - 0.0625) * 1.1644; // (Y - 16/255) * (255/219) - let u = (u_raw - 0.5) * 1.1384; // (U - 128/255) * (255/224) - let v = (v_raw - 0.5) * 1.1384; // (V - 128/255) * (255/224) - - // BT.709 color matrix (HD content: 720p and above) - // R = Y + 1.5748 * V - // G = Y - 0.1873 * U - 0.4681 * V - // B = Y + 1.8556 * U - let r = y + 1.5748 * v; - let g = y - 0.1873 * u - 0.4681 * v; - let b = y + 1.8556 * u; - - return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); -} -"#; - -/// WGSL shader for NV12 format (VideoToolbox on macOS) -/// NV12 has Y plane (R8) and interleaved UV plane (Rg8) -/// This shader deinterleaves UV on the GPU - much faster than CPU scaler -const NV12_SHADER: &str = r#" -struct VertexOutput { - @builtin(position) position: vec4, - @location(0) tex_coord: vec2, -}; - -@vertex -fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { - var positions = array, 6>( - vec2(-1.0, -1.0), - vec2( 1.0, -1.0), - vec2(-1.0, 1.0), - vec2(-1.0, 1.0), - vec2( 1.0, -1.0), - vec2( 1.0, 1.0), - ); - - var tex_coords = array, 6>( - vec2(0.0, 1.0), - vec2(1.0, 1.0), - vec2(0.0, 0.0), - vec2(0.0, 0.0), - vec2(1.0, 1.0), - vec2(1.0, 0.0), - ); - - var output: VertexOutput; - output.position = vec4(positions[vertex_index], 0.0, 1.0); - output.tex_coord = tex_coords[vertex_index]; - return output; -} - -// NV12 textures: Y (R8, full res) and UV (Rg8, half res, interleaved) -@group(0) @binding(0) -var y_texture: texture_2d; -@group(0) @binding(1) -var uv_texture: texture_2d; -@group(0) @binding(2) -var video_sampler: sampler; - -@fragment -fn fs_main(input: VertexOutput) -> @location(0) vec4 { - // Sample Y (full res) and UV (half res, interleaved) - let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; - let uv = textureSample(uv_texture, video_sampler, input.tex_coord); - let u_raw = uv.r; // U is in red channel - let v_raw = uv.g; // V is in green channel - - // BT.709 YUV to RGB conversion (limited/TV range - same as YUV420P path) - // VideoToolbox outputs limited range: Y [16-235], UV [16-240] - let y = (y_raw - 0.0625) * 1.1644; // (Y - 16/255) * (255/219) - let u = (u_raw - 0.5) * 1.1384; // (U - 128/255) * (255/224) - let v = (v_raw - 0.5) * 1.1384; // (V - 128/255) * (255/224) - - // BT.709 color matrix (HD content: 720p and above) - let r = y + 1.5748 * v; - let g = y - 0.1873 * u - 0.4681 * v; - let b = y + 1.8556 * u; - - return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); -} -"#; - /// Main renderer pub struct Renderer { window: Arc, @@ -287,11 +149,13 @@ impl Renderer { .context("Failed to create device")?; // Configure surface + // Use non-sRGB (linear) format for video - H.264/HEVC output is already gamma-corrected + // Using sRGB format would apply double gamma correction, causing washed-out colors let surface_caps = surface.get_capabilities(&adapter); let surface_format = surface_caps .formats .iter() - .find(|f| f.is_srgb()) + .find(|f| !f.is_srgb()) // Prefer linear format for video .copied() .unwrap_or(surface_caps.formats[0]); @@ -1481,7 +1345,7 @@ impl Renderer { match app_state { AppState::Login => { - self.render_login_screen(ctx, &login_providers, selected_provider_index, &status_message, is_loading, &mut actions); + render_login_screen(ctx, &login_providers, selected_provider_index, &status_message, is_loading, &mut actions); } AppState::Games => { // Update image cache for async loading @@ -1505,13 +1369,14 @@ impl Renderer { ping_testing, show_settings_modal, app.show_session_conflict, + app.show_av1_warning, &app.active_sessions, app.pending_game_launch.as_ref(), &mut actions ); } AppState::Session => { - self.render_session_screen(ctx, &selected_game, &status_message, &error_message, &mut actions); + render_session_screen(ctx, &selected_game, &status_message, &error_message, &mut actions); } AppState::Streaming => { // Render stats overlay @@ -1599,151 +1464,7 @@ impl Renderer { Ok(actions) } - fn render_login_screen( - &self, - ctx: &egui::Context, - login_providers: &[crate::auth::LoginProvider], - selected_provider_index: usize, - status_message: &str, - is_loading: bool, - actions: &mut Vec - ) { - egui::CentralPanel::default().show(ctx, |ui| { - let available_height = ui.available_height(); - let content_height = 400.0; - let top_padding = ((available_height - content_height) / 2.0).max(40.0); - - ui.vertical_centered(|ui| { - ui.add_space(top_padding); - - // Logo/Title with gradient-like effect - ui.label( - egui::RichText::new("OpenNOW") - .size(48.0) - .color(egui::Color32::from_rgb(118, 185, 0)) // NVIDIA green - .strong() - ); - - ui.add_space(8.0); - ui.label( - egui::RichText::new("GeForce NOW Client") - .size(14.0) - .color(egui::Color32::from_rgb(150, 150, 150)) - ); - - ui.add_space(60.0); - - // Login card container - egui::Frame::new() - .fill(egui::Color32::from_rgb(30, 30, 40)) - .corner_radius(12.0) - .inner_margin(egui::Margin { left: 40, right: 40, top: 30, bottom: 30 }) - .show(ui, |ui| { - ui.set_min_width(320.0); - - ui.vertical(|ui| { - // Region selection label - centered - ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { - ui.label( - egui::RichText::new("Select Region") - .size(13.0) - .color(egui::Color32::from_rgb(180, 180, 180)) - ); - }); - - ui.add_space(10.0); - - // Provider dropdown - centered using horizontal with spacing - ui.horizontal(|ui| { - let available_width = ui.available_width(); - let combo_width = 240.0; - let padding = (available_width - combo_width) / 2.0; - ui.add_space(padding.max(0.0)); - - let selected_name = login_providers.get(selected_provider_index) - .map(|p| p.login_provider_display_name.as_str()) - .unwrap_or("NVIDIA (Global)"); - - egui::ComboBox::from_id_salt("provider_select") - .selected_text(selected_name) - .width(combo_width) - .show_ui(ui, |ui| { - for (i, provider) in login_providers.iter().enumerate() { - let is_selected = i == selected_provider_index; - if ui.selectable_label(is_selected, &provider.login_provider_display_name).clicked() { - actions.push(UiAction::SelectProvider(i)); - } - } - }); - }); - - ui.add_space(25.0); - - // Login button or loading state - centered - ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { - if is_loading { - ui.add_space(10.0); - ui.spinner(); - ui.add_space(12.0); - ui.label( - egui::RichText::new("Opening browser...") - .size(13.0) - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - ui.add_space(5.0); - ui.label( - egui::RichText::new("Complete login in your browser") - .size(11.0) - .color(egui::Color32::GRAY) - ); - } else { - let login_btn = egui::Button::new( - egui::RichText::new("Sign In") - .size(15.0) - .color(egui::Color32::WHITE) - .strong() - ) - .fill(egui::Color32::from_rgb(118, 185, 0)) - .corner_radius(6.0); - - if ui.add_sized([240.0, 42.0], login_btn).clicked() { - actions.push(UiAction::StartLogin); - } - - ui.add_space(15.0); - - ui.label( - egui::RichText::new("Sign in with your NVIDIA account") - .size(11.0) - .color(egui::Color32::from_rgb(120, 120, 120)) - ); - } - }); - }); - }); - - ui.add_space(20.0); - - // Status message (if any) - if !status_message.is_empty() && status_message != "Welcome to OpenNOW" { - ui.label( - egui::RichText::new(status_message) - .size(11.0) - .color(egui::Color32::from_rgb(150, 150, 150)) - ); - } - - ui.add_space(40.0); - - // Footer info - ui.label( - egui::RichText::new("Alliance Partners can select their region above") - .size(10.0) - .color(egui::Color32::from_rgb(80, 80, 80)) - ); - }); - }); - } + // render_login_screen moved to screens/login.rs fn render_games_screen( &self, @@ -1765,6 +1486,7 @@ impl Renderer { ping_testing: bool, show_settings_modal: bool, show_session_conflict: bool, + show_av1_warning: bool, active_sessions: &[ActiveSessionInfo], pending_game_launch: Option<&GameInfo>, actions: &mut Vec @@ -2096,508 +1818,23 @@ impl Renderer { // Settings modal if show_settings_modal { - Self::render_settings_modal(ctx, settings, servers, selected_server_index, auto_server_selection, ping_testing, actions); + render_settings_modal(ctx, settings, servers, selected_server_index, auto_server_selection, ping_testing, actions); } // Session conflict dialog if show_session_conflict { - Self::render_session_conflict_dialog(ctx, active_sessions, pending_game_launch, actions); + render_session_conflict_dialog(ctx, active_sessions, pending_game_launch, actions); } - } - - /// Render the Settings modal with region selector and stream settings - fn render_settings_modal( - ctx: &egui::Context, - settings: &crate::app::Settings, - servers: &[crate::app::ServerInfo], - selected_server_index: usize, - auto_server_selection: bool, - ping_testing: bool, - actions: &mut Vec, - ) { - let modal_width = 500.0; - let modal_height = 600.0; - - // Dark overlay - egui::Area::new(egui::Id::new("settings_overlay")) - .fixed_pos(egui::pos2(0.0, 0.0)) - .order(egui::Order::Middle) - .show(ctx, |ui| { - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - ui.allocate_response(screen_rect.size(), egui::Sense::click()); - ui.painter().rect_filled( - screen_rect, - 0.0, - egui::Color32::from_rgba_unmultiplied(0, 0, 0, 180), - ); - }); - // Modal window - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - let modal_pos = egui::pos2( - (screen_rect.width() - modal_width) / 2.0, - (screen_rect.height() - modal_height) / 2.0, - ); - - egui::Area::new(egui::Id::new("settings_modal")) - .fixed_pos(modal_pos) - .order(egui::Order::Foreground) - .show(ctx, |ui| { - egui::Frame::new() - .fill(egui::Color32::from_rgb(28, 28, 35)) - .corner_radius(12.0) - .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) - .inner_margin(egui::Margin::same(20)) - .show(ui, |ui| { - ui.set_min_size(egui::vec2(modal_width, modal_height)); - - // Header with close button - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Settings") - .size(20.0) - .strong() - .color(egui::Color32::WHITE) - ); - - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - let close_btn = egui::Button::new( - egui::RichText::new("✕") - .size(16.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::TRANSPARENT) - .corner_radius(4.0); - - if ui.add(close_btn).clicked() { - actions.push(UiAction::ToggleSettingsModal); - } - }); - }); - - ui.add_space(15.0); - ui.separator(); - ui.add_space(15.0); - - egui::ScrollArea::vertical() - .max_height(modal_height - 100.0) - .show(ui, |ui| { - // === Stream Settings Section === - ui.label( - egui::RichText::new("Stream Settings") - .size(16.0) - .strong() - .color(egui::Color32::WHITE) - ); - ui.add_space(15.0); - - egui::Grid::new("settings_grid") - .num_columns(2) - .spacing([20.0, 12.0]) - .min_col_width(100.0) - .show(ui, |ui| { - // Resolution dropdown - ui.label( - egui::RichText::new("Resolution") - .size(13.0) - .color(egui::Color32::GRAY) - ); - egui::ComboBox::from_id_salt("resolution_combo") - .selected_text(&settings.resolution) - .width(180.0) - .show_ui(ui, |ui| { - for res in crate::app::config::RESOLUTIONS { - if ui.selectable_label(settings.resolution == res.0, format!("{} ({})", res.0, res.1)).clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res.0.to_string()))); - } - } - }); - ui.end_row(); - - // FPS dropdown - ui.label( - egui::RichText::new("FPS") - .size(13.0) - .color(egui::Color32::GRAY) - ); - egui::ComboBox::from_id_salt("fps_combo") - .selected_text(format!("{} FPS", settings.fps)) - .width(180.0) - .show_ui(ui, |ui| { - for fps in crate::app::config::FPS_OPTIONS { - if ui.selectable_label(settings.fps == *fps, format!("{} FPS", fps)).clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Fps(*fps))); - } - } - }); - ui.end_row(); - - // Codec dropdown - ui.label( - egui::RichText::new("Video Codec") - .size(13.0) - .color(egui::Color32::GRAY) - ); - egui::ComboBox::from_id_salt("codec_combo") - .selected_text(settings.codec.display_name()) - .width(180.0) - .show_ui(ui, |ui| { - for codec in crate::app::config::VideoCodec::all() { - if ui.selectable_label(settings.codec == *codec, codec.display_name()).clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Codec(*codec))); - } - } - }); - ui.end_row(); - - // Max Bitrate slider - ui.label( - egui::RichText::new("Max Bitrate") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.horizontal(|ui| { - ui.label( - egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)) - .size(13.0) - .color(egui::Color32::WHITE) - ); - ui.label( - egui::RichText::new("(200 = unlimited)") - .size(10.0) - .color(egui::Color32::GRAY) - ); - }); - ui.end_row(); - }); - - ui.add_space(25.0); - ui.separator(); - ui.add_space(15.0); - - // === Server Region Section === - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Server Region") - .size(16.0) - .strong() - .color(egui::Color32::WHITE) - ); - - ui.add_space(20.0); - - // Ping test button - let ping_btn_text = if ping_testing { "Testing..." } else { "Test Ping" }; - let ping_btn = egui::Button::new( - egui::RichText::new(ping_btn_text) - .size(11.0) - .color(egui::Color32::WHITE) - ) - .fill(if ping_testing { - egui::Color32::from_rgb(80, 80, 100) - } else { - egui::Color32::from_rgb(60, 120, 60) - }) - .corner_radius(4.0); - - if ui.add_sized([80.0, 24.0], ping_btn).clicked() && !ping_testing { - actions.push(UiAction::StartPingTest); - } - - if ping_testing { - ui.spinner(); - } - }); - ui.add_space(10.0); - - // Server dropdown with Auto option and best server highlighted - let selected_text = if auto_server_selection { - // Find best server for display - let best = servers.iter() - .filter(|s| s.status == crate::app::ServerStatus::Online && s.ping_ms.is_some()) - .min_by_key(|s| s.ping_ms.unwrap_or(9999)); - if let Some(best_server) = best { - format!("Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) - } else { - "Auto (Best Ping)".to_string() - } - } else { - servers.get(selected_server_index) - .map(|s| { - if let Some(ping) = s.ping_ms { - format!("{} ({}ms)", s.name, ping) - } else { - s.name.clone() - } - }) - .unwrap_or_else(|| "Select a server...".to_string()) - }; - - egui::ComboBox::from_id_salt("server_combo") - .selected_text(selected_text) - .width(300.0) - .show_ui(ui, |ui| { - // Auto option at the top - let auto_label = { - let best = servers.iter() - .filter(|s| s.status == crate::app::ServerStatus::Online && s.ping_ms.is_some()) - .min_by_key(|s| s.ping_ms.unwrap_or(9999)); - if let Some(best_server) = best { - format!("✨ Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) - } else { - "✨ Auto (Best Ping)".to_string() - } - }; - - if ui.selectable_label(auto_server_selection, auto_label).clicked() { - actions.push(UiAction::SetAutoServerSelection(true)); - } - - ui.separator(); - ui.add_space(5.0); - - // Group by region - let regions = ["Europe", "North America", "Canada", "Asia-Pacific", "Other"]; - for region in regions { - let region_servers: Vec<_> = servers - .iter() - .enumerate() - .filter(|(_, s)| s.region == region) - .collect(); - - if region_servers.is_empty() { - continue; - } - - ui.label( - egui::RichText::new(region) - .size(11.0) - .strong() - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - - for (idx, server) in region_servers { - let is_selected = !auto_server_selection && idx == selected_server_index; - let ping_text = match server.status { - crate::app::ServerStatus::Online => { - server.ping_ms.map(|p| format!(" ({}ms)", p)).unwrap_or_default() - } - crate::app::ServerStatus::Testing => " (testing...)".to_string(), - crate::app::ServerStatus::Offline => " (offline)".to_string(), - crate::app::ServerStatus::Unknown => "".to_string(), - }; - - let label = format!(" {}{}", server.name, ping_text); - if ui.selectable_label(is_selected, label).clicked() { - actions.push(UiAction::SelectServer(idx)); - } - } - - ui.add_space(5.0); - } - }); - - ui.add_space(20.0); - }); - }); - }); + // AV1 hardware warning dialog + if show_av1_warning { + render_av1_warning_dialog(ctx, actions); + } } - /// Render the session conflict dialog - fn render_session_conflict_dialog( - ctx: &egui::Context, - active_sessions: &[ActiveSessionInfo], - pending_game: Option<&GameInfo>, - actions: &mut Vec, - ) { - let modal_width = 500.0; - let modal_height = 300.0; - - egui::Area::new(egui::Id::new("session_conflict_overlay")) - .fixed_pos(egui::pos2(0.0, 0.0)) - .order(egui::Order::Middle) - .show(ctx, |ui| { - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - ui.allocate_response(screen_rect.size(), egui::Sense::click()); - ui.painter().rect_filled( - screen_rect, - 0.0, - egui::Color32::from_rgba_unmultiplied(0, 0, 0, 200), - ); - }); - - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - let modal_pos = egui::pos2( - (screen_rect.width() - modal_width) / 2.0, - (screen_rect.height() - modal_height) / 2.0, - ); - - egui::Area::new(egui::Id::new("session_conflict_modal")) - .fixed_pos(modal_pos) - .order(egui::Order::Foreground) - .show(ctx, |ui| { - egui::Frame::new() - .fill(egui::Color32::from_rgb(28, 28, 35)) - .corner_radius(12.0) - .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) - .inner_margin(egui::Margin::same(20)) - .show(ui, |ui| { - ui.set_min_size(egui::vec2(modal_width, modal_height)); - - ui.label( - egui::RichText::new("⚠ Active Session Detected") - .size(20.0) - .strong() - .color(egui::Color32::from_rgb(255, 200, 80)) - ); - - ui.add_space(15.0); - - if let Some(session) = active_sessions.first() { - ui.label( - egui::RichText::new("You have an active GFN session running:") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - - ui.add_space(10.0); - - egui::Frame::new() - .fill(egui::Color32::from_rgb(40, 40, 50)) - .corner_radius(8.0) - .inner_margin(egui::Margin::same(12)) - .show(ui, |ui| { - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("App ID:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(format!("{}", session.app_id)) - .size(13.0) - .color(egui::Color32::WHITE) - ); - }); - - if let Some(ref gpu) = session.gpu_type { - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("GPU:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(gpu) - .size(13.0) - .color(egui::Color32::WHITE) - ); - }); - } - - if let Some(ref res) = session.resolution { - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Resolution:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(format!("{} @ {}fps", res, session.fps.unwrap_or(60))) - .size(13.0) - .color(egui::Color32::WHITE) - ); - }); - } - - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Status:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - let status_text = match session.status { - 2 => "Ready", - 3 => "Running", - _ => "Unknown", - }; - ui.label( - egui::RichText::new(status_text) - .size(13.0) - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - }); - }); - - ui.add_space(15.0); - - if pending_game.is_some() { - ui.label( - egui::RichText::new("GFN only allows one session at a time. You can either:") - .size(13.0) - .color(egui::Color32::LIGHT_GRAY) - ); - } else { - ui.label( - egui::RichText::new("What would you like to do?") - .size(13.0) - .color(egui::Color32::LIGHT_GRAY) - ); - } - - ui.add_space(15.0); - - ui.vertical_centered(|ui| { - let resume_btn = egui::Button::new( - egui::RichText::new("Resume Existing Session") - .size(14.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::from_rgb(118, 185, 0)) - .min_size(egui::vec2(200.0, 35.0)); - - if ui.add(resume_btn).clicked() { - actions.push(UiAction::ResumeSession(session.clone())); - } - - ui.add_space(8.0); - - if let Some(game) = pending_game { - let terminate_btn = egui::Button::new( - egui::RichText::new(format!("End Session & Launch \"{}\"", game.title)) - .size(14.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::from_rgb(220, 60, 60)) - .min_size(egui::vec2(200.0, 35.0)); - - if ui.add(terminate_btn).clicked() { - actions.push(UiAction::TerminateAndLaunch(session.session_id.clone(), game.clone())); - } - - ui.add_space(8.0); - } - - let cancel_btn = egui::Button::new( - egui::RichText::new("Cancel") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ) - .fill(egui::Color32::from_rgb(60, 60, 75)) - .min_size(egui::vec2(200.0, 35.0)); - - if ui.add(cancel_btn).clicked() { - actions.push(UiAction::CloseSessionConflict); - } - }); - } - }); - }); - } + // Note: render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog + // have been moved to src/gui/screens/dialogs.rs + // render_login_screen, render_session_screen moved to src/gui/screens/ /// Render the game detail popup fn render_game_popup( @@ -2829,105 +2066,30 @@ impl Renderer { .color(egui::Color32::WHITE) ); - ui.add_space(2.0); - - // Store badge with color coding - let store_color = match game.store.to_lowercase().as_str() { - "steam" => egui::Color32::from_rgb(102, 192, 244), - "epic" => egui::Color32::from_rgb(200, 200, 200), - "ubisoft" | "uplay" => egui::Color32::from_rgb(0, 150, 255), - "xbox" => egui::Color32::from_rgb(16, 124, 16), - "gog" => egui::Color32::from_rgb(190, 130, 255), - _ => egui::Color32::from_rgb(150, 150, 150), - }; + // Store badge ui.label( - egui::RichText::new(&game.store.to_uppercase()) + egui::RichText::new(game.store.to_uppercase()) .size(10.0) - .color(store_color) + .color(egui::Color32::from_rgb(100, 180, 255)) ); }); }); - ui.add_space(10.0); + ui.add_space(8.0); }); }); - // Make the card clickable - check for click on the response rect - let card_rect = response.response.rect; - if ui.rect_contains_pointer(card_rect) { - // Change cursor to pointer - ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand); - - // Highlight on hover - subtle glow effect - ui.painter().rect_stroke( - card_rect, - 8.0, - egui::Stroke::new(2.0, egui::Color32::from_rgb(118, 185, 0)), - egui::StrokeKind::Outside - ); - } - if response.response.interact(egui::Sense::click()).clicked() { actions.push(UiAction::OpenGamePopup(game_for_click)); } } - fn render_session_screen( - &self, - ctx: &egui::Context, - selected_game: &Option, - status_message: &str, - error_message: &Option, - actions: &mut Vec - ) { - egui::CentralPanel::default().show(ctx, |ui| { - ui.vertical_centered(|ui| { - ui.add_space(120.0); - - // Game title - if let Some(ref game) = selected_game { - ui.label( - egui::RichText::new(&game.title) - .size(28.0) - .strong() - .color(egui::Color32::WHITE) - ); - } - - ui.add_space(40.0); - - // Spinner - ui.spinner(); - - ui.add_space(20.0); - - // Status - ui.label( - egui::RichText::new(status_message) - .size(16.0) - .color(egui::Color32::LIGHT_GRAY) - ); - - // Error message - if let Some(ref error) = error_message { - ui.add_space(20.0); - ui.label( - egui::RichText::new(error) - .size(14.0) - .color(egui::Color32::from_rgb(255, 100, 100)) - ); - } - - ui.add_space(40.0); - - // Cancel button - if ui.button("Cancel").clicked() { - actions.push(UiAction::StopStreaming); - } - }); - }); - } + // Note: render_session_conflict_dialog, render_av1_warning_dialog, render_session_screen + // have been moved to src/gui/screens/dialogs.rs and screens/session.rs } +// End of impl Renderer block +// Below is the standalone render_stats_panel function + /// Render stats panel (standalone function) fn render_stats_panel(ctx: &egui::Context, stats: &crate::media::StreamStats, position: crate::app::StatsPosition) { use egui::{Align2, Color32, FontId, RichText}; @@ -2945,168 +2107,63 @@ fn render_stats_panel(ctx: &egui::Context, stats: &crate::media::StreamStats, po .show(ctx, |ui| { egui::Frame::new() .fill(Color32::from_rgba_unmultiplied(0, 0, 0, 200)) - .corner_radius(4.0) - .inner_margin(8.0) + .corner_radius(6.0) + .inner_margin(egui::Margin::same(10)) .show(ui, |ui| { - ui.set_min_width(200.0); - - // Resolution - let res_text = if stats.resolution.is_empty() { - "Connecting...".to_string() - } else { - stats.resolution.clone() - }; - - ui.label( - RichText::new(res_text) - .font(FontId::monospace(13.0)) - .color(Color32::WHITE) - ); - - // Decoded FPS vs Render FPS (shows if renderer is bottlenecked) - let decode_fps = stats.fps; - let render_fps = stats.render_fps; - let target_fps = stats.target_fps as f32; - - // Decode FPS color - let decode_color = if target_fps > 0.0 { - let ratio = decode_fps / target_fps; - if ratio >= 0.8 { Color32::GREEN } - else if ratio >= 0.5 { Color32::YELLOW } - else { Color32::from_rgb(255, 100, 100) } - } else { Color32::WHITE }; - - // Render FPS color (critical - this is what you actually see) - let render_color = if target_fps > 0.0 { - let ratio = render_fps / target_fps; - if ratio >= 0.8 { Color32::GREEN } - else if ratio >= 0.5 { Color32::YELLOW } - else { Color32::from_rgb(255, 100, 100) } - } else { Color32::WHITE }; - - // Show both FPS values ui.horizontal(|ui| { - ui.label( - RichText::new(format!("Decode: {:.0}", decode_fps)) - .font(FontId::monospace(11.0)) - .color(decode_color) - ); - ui.label( - RichText::new(format!(" | Render: {:.0}", render_fps)) - .font(FontId::monospace(11.0)) - .color(render_color) - ); - if stats.target_fps > 0 { + // Video stats (left) + ui.vertical(|ui| { + ui.label( + RichText::new("VIDEO") + .font(FontId::monospace(10.0)) + .color(Color32::from_rgb(120, 200, 120)) + ); ui.label( - RichText::new(format!(" / {} fps", stats.target_fps)) + RichText::new(&stats.resolution) .font(FontId::monospace(11.0)) - .color(Color32::GRAY) + .color(Color32::WHITE) ); - } - }); - - // Codec and bitrate - if !stats.codec.is_empty() { - ui.label( - RichText::new(format!( - "{} | {:.1} Mbps", - stats.codec, - stats.bitrate_mbps - )) - .font(FontId::monospace(11.0)) - .color(Color32::LIGHT_GRAY) - ); - } - - // Latency (decode pipeline) - let latency_color = if stats.latency_ms < 30.0 { - Color32::GREEN - } else if stats.latency_ms < 60.0 { - Color32::YELLOW - } else { - Color32::RED - }; - - ui.label( - RichText::new(format!("Decode: {:.0} ms", stats.latency_ms)) - .font(FontId::monospace(11.0)) - .color(latency_color) - ); - - // Input latency (event creation to transmission) - if stats.input_latency_ms > 0.0 { - let input_color = if stats.input_latency_ms < 2.0 { - Color32::GREEN - } else if stats.input_latency_ms < 5.0 { - Color32::YELLOW - } else { - Color32::RED - }; - - ui.label( - RichText::new(format!("Input: {:.1} ms", stats.input_latency_ms)) - .font(FontId::monospace(11.0)) - .color(input_color) - ); - } - - if stats.packet_loss > 0.0 { - let loss_color = if stats.packet_loss < 1.0 { - Color32::YELLOW - } else { - Color32::RED - }; - - ui.label( - RichText::new(format!("Packet Loss: {:.1}%", stats.packet_loss)) - .font(FontId::monospace(11.0)) - .color(loss_color) - ); - } - - // Decode and render times - if stats.decode_time_ms > 0.0 || stats.render_time_ms > 0.0 { - ui.label( - RichText::new(format!( - "Decode: {:.1} ms | Render: {:.1} ms", - stats.decode_time_ms, - stats.render_time_ms - )) - .font(FontId::monospace(10.0)) - .color(Color32::GRAY) - ); - } - - // Frame stats - if stats.frames_received > 0 { - ui.label( - RichText::new(format!( - "Frames: {} rx, {} dec, {} drop", - stats.frames_received, - stats.frames_decoded, - stats.frames_dropped - )) - .font(FontId::monospace(10.0)) - .color(Color32::DARK_GRAY) - ); - } + ui.label( + RichText::new(format!("{:.1} fps", stats.fps)) + .font(FontId::monospace(11.0)) + .color(Color32::WHITE) + ); + ui.label( + RichText::new(&stats.codec) + .font(FontId::monospace(11.0)) + .color(Color32::LIGHT_GRAY) + ); + }); - // GPU and server info - if !stats.gpu_type.is_empty() || !stats.server_region.is_empty() { - let info = format!( - "{}{}{}", - stats.gpu_type, - if !stats.gpu_type.is_empty() && !stats.server_region.is_empty() { " | " } else { "" }, - stats.server_region - ); + ui.add_space(20.0); - ui.label( - RichText::new(info) - .font(FontId::monospace(10.0)) - .color(Color32::DARK_GRAY) - ); - } + // Network stats (right) + ui.vertical(|ui| { + ui.label( + RichText::new("NETWORK") + .font(FontId::monospace(10.0)) + .color(Color32::from_rgb(120, 120, 200)) + ); + ui.label( + RichText::new(format!("{:.1} Mbps", stats.bitrate_mbps)) + .font(FontId::monospace(11.0)) + .color(Color32::WHITE) + ); + ui.label( + RichText::new(format!("{:.1}ms", stats.latency_ms)) + .font(FontId::monospace(11.0)) + .color(Color32::WHITE) + ); + // Show packet loss if relevant + if stats.packet_loss > 0.0 { + ui.label( + RichText::new(format!("{:.1}% loss", stats.packet_loss)) + .font(FontId::monospace(11.0)) + .color(Color32::from_rgb(255, 100, 100)) + ); + } + }); + }); }); }); } - diff --git a/opennow-streamer/src/gui/screens/dialogs.rs b/opennow-streamer/src/gui/screens/dialogs.rs new file mode 100644 index 0000000..bc3f46d --- /dev/null +++ b/opennow-streamer/src/gui/screens/dialogs.rs @@ -0,0 +1,606 @@ +//! Dialog Components +//! +//! Modal dialogs for settings, session conflicts, and warnings. + +use crate::app::{GameInfo, Settings, ServerInfo, ServerStatus, UiAction, SettingChange}; +use crate::app::session::ActiveSessionInfo; + +/// Render the settings modal +pub fn render_settings_modal( + ctx: &egui::Context, + settings: &Settings, + servers: &[ServerInfo], + selected_server_index: usize, + auto_server_selection: bool, + ping_testing: bool, + actions: &mut Vec, +) { + let modal_width = 500.0; + let modal_height = 600.0; + + // Dark overlay + egui::Area::new(egui::Id::new("settings_overlay")) + .fixed_pos(egui::pos2(0.0, 0.0)) + .order(egui::Order::Middle) + .show(ctx, |ui| { + #[allow(deprecated)] + let screen_rect = ctx.screen_rect(); + ui.allocate_response(screen_rect.size(), egui::Sense::click()); + ui.painter().rect_filled( + screen_rect, + 0.0, + egui::Color32::from_rgba_unmultiplied(0, 0, 0, 180), + ); + }); + + // Modal window + #[allow(deprecated)] + let screen_rect = ctx.screen_rect(); + let modal_pos = egui::pos2( + (screen_rect.width() - modal_width) / 2.0, + (screen_rect.height() - modal_height) / 2.0, + ); + + egui::Area::new(egui::Id::new("settings_modal")) + .fixed_pos(modal_pos) + .order(egui::Order::Foreground) + .show(ctx, |ui| { + egui::Frame::new() + .fill(egui::Color32::from_rgb(28, 28, 35)) + .corner_radius(12.0) + .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) + .inner_margin(egui::Margin::same(20)) + .show(ui, |ui| { + ui.set_min_size(egui::vec2(modal_width, modal_height)); + + // Header with close button + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Settings") + .size(20.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + let close_btn = egui::Button::new( + egui::RichText::new("✕") + .size(16.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::TRANSPARENT) + .corner_radius(4.0); + + if ui.add(close_btn).clicked() { + actions.push(UiAction::ToggleSettingsModal); + } + }); + }); + + ui.add_space(15.0); + ui.separator(); + ui.add_space(15.0); + + egui::ScrollArea::vertical() + .max_height(modal_height - 100.0) + .show(ui, |ui| { + // === Stream Settings Section === + ui.label( + egui::RichText::new("Stream Settings") + .size(16.0) + .strong() + .color(egui::Color32::WHITE) + ); + ui.add_space(15.0); + + egui::Grid::new("settings_grid") + .num_columns(2) + .spacing([20.0, 12.0]) + .min_col_width(100.0) + .show(ui, |ui| { + // Resolution dropdown + ui.label( + egui::RichText::new("Resolution") + .size(13.0) + .color(egui::Color32::GRAY) + ); + egui::ComboBox::from_id_salt("resolution_combo") + .selected_text(&settings.resolution) + .width(180.0) + .show_ui(ui, |ui| { + for res in crate::app::config::RESOLUTIONS { + if ui.selectable_label(settings.resolution == res.0, format!("{} ({})", res.0, res.1)).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res.0.to_string()))); + } + } + }); + ui.end_row(); + + // FPS dropdown + ui.label( + egui::RichText::new("FPS") + .size(13.0) + .color(egui::Color32::GRAY) + ); + egui::ComboBox::from_id_salt("fps_combo") + .selected_text(format!("{} FPS", settings.fps)) + .width(180.0) + .show_ui(ui, |ui| { + for fps in crate::app::config::FPS_OPTIONS { + if ui.selectable_label(settings.fps == *fps, format!("{} FPS", fps)).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Fps(*fps))); + } + } + }); + ui.end_row(); + + // Codec dropdown + ui.label( + egui::RichText::new("Video Codec") + .size(13.0) + .color(egui::Color32::GRAY) + ); + egui::ComboBox::from_id_salt("codec_combo") + .selected_text(settings.codec.display_name()) + .width(180.0) + .show_ui(ui, |ui| { + for codec in crate::app::config::VideoCodec::all() { + if ui.selectable_label(settings.codec == *codec, codec.display_name()).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(*codec))); + } + } + }); + ui.end_row(); + + // Max Bitrate slider + ui.label( + egui::RichText::new("Max Bitrate") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.horizontal(|ui| { + ui.label( + egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)) + .size(13.0) + .color(egui::Color32::WHITE) + ); + ui.label( + egui::RichText::new("(200 = unlimited)") + .size(10.0) + .color(egui::Color32::GRAY) + ); + }); + ui.end_row(); + }); + + ui.add_space(25.0); + ui.separator(); + ui.add_space(15.0); + + // === Server Region Section === + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Server Region") + .size(16.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.add_space(20.0); + + // Ping test button + let ping_btn_text = if ping_testing { "Testing..." } else { "Test Ping" }; + let ping_btn = egui::Button::new( + egui::RichText::new(ping_btn_text) + .size(11.0) + .color(egui::Color32::WHITE) + ) + .fill(if ping_testing { + egui::Color32::from_rgb(80, 80, 100) + } else { + egui::Color32::from_rgb(60, 120, 60) + }) + .corner_radius(4.0); + + if ui.add_sized([80.0, 24.0], ping_btn).clicked() && !ping_testing { + actions.push(UiAction::StartPingTest); + } + + if ping_testing { + ui.spinner(); + } + }); + ui.add_space(10.0); + + // Server dropdown with Auto option and best server highlighted + let selected_text = if auto_server_selection { + // Find best server for display + let best = servers.iter() + .filter(|s| s.status == ServerStatus::Online && s.ping_ms.is_some()) + .min_by_key(|s| s.ping_ms.unwrap_or(9999)); + if let Some(best_server) = best { + format!("Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) + } else { + "Auto (Best Ping)".to_string() + } + } else { + servers.get(selected_server_index) + .map(|s| { + if let Some(ping) = s.ping_ms { + format!("{} ({}ms)", s.name, ping) + } else { + s.name.clone() + } + }) + .unwrap_or_else(|| "Select a server...".to_string()) + }; + + egui::ComboBox::from_id_salt("server_combo") + .selected_text(selected_text) + .width(300.0) + .show_ui(ui, |ui| { + // Auto option at the top + let auto_label = { + let best = servers.iter() + .filter(|s| s.status == ServerStatus::Online && s.ping_ms.is_some()) + .min_by_key(|s| s.ping_ms.unwrap_or(9999)); + if let Some(best_server) = best { + format!("✨ Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) + } else { + "✨ Auto (Best Ping)".to_string() + } + }; + + if ui.selectable_label(auto_server_selection, auto_label).clicked() { + actions.push(UiAction::SetAutoServerSelection(true)); + } + + ui.separator(); + ui.add_space(5.0); + + // Group by region + let regions = ["Europe", "North America", "Canada", "Asia-Pacific", "Other"]; + for region in regions { + let region_servers: Vec<_> = servers + .iter() + .enumerate() + .filter(|(_, s)| s.region == region) + .collect(); + + if region_servers.is_empty() { + continue; + } + + ui.label( + egui::RichText::new(region) + .size(11.0) + .strong() + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + + for (idx, server) in region_servers { + let is_selected = !auto_server_selection && idx == selected_server_index; + let ping_text = match server.status { + ServerStatus::Online => { + server.ping_ms.map(|p| format!(" ({}ms)", p)).unwrap_or_default() + } + ServerStatus::Testing => " (testing...)".to_string(), + ServerStatus::Offline => " (offline)".to_string(), + ServerStatus::Unknown => "".to_string(), + }; + + let label = format!(" {}{}", server.name, ping_text); + if ui.selectable_label(is_selected, label).clicked() { + actions.push(UiAction::SelectServer(idx)); + } + } + + ui.add_space(5.0); + } + }); + + ui.add_space(20.0); + }); + }); + }); +} + +/// Render the session conflict dialog +pub fn render_session_conflict_dialog( + ctx: &egui::Context, + active_sessions: &[ActiveSessionInfo], + pending_game: Option<&GameInfo>, + actions: &mut Vec, +) { + let modal_width = 500.0; + let modal_height = 300.0; + + egui::Area::new(egui::Id::new("session_conflict_overlay")) + .fixed_pos(egui::pos2(0.0, 0.0)) + .order(egui::Order::Middle) + .show(ctx, |ui| { + #[allow(deprecated)] + let screen_rect = ctx.screen_rect(); + ui.allocate_response(screen_rect.size(), egui::Sense::click()); + ui.painter().rect_filled( + screen_rect, + 0.0, + egui::Color32::from_rgba_unmultiplied(0, 0, 0, 200), + ); + }); + + #[allow(deprecated)] + let screen_rect = ctx.screen_rect(); + let modal_pos = egui::pos2( + (screen_rect.width() - modal_width) / 2.0, + (screen_rect.height() - modal_height) / 2.0, + ); + + egui::Area::new(egui::Id::new("session_conflict_modal")) + .fixed_pos(modal_pos) + .order(egui::Order::Foreground) + .show(ctx, |ui| { + egui::Frame::new() + .fill(egui::Color32::from_rgb(28, 28, 35)) + .corner_radius(12.0) + .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) + .inner_margin(egui::Margin::same(20)) + .show(ui, |ui| { + ui.set_min_size(egui::vec2(modal_width, modal_height)); + + ui.label( + egui::RichText::new("⚠ Active Session Detected") + .size(20.0) + .strong() + .color(egui::Color32::from_rgb(255, 200, 80)) + ); + + ui.add_space(15.0); + + if let Some(session) = active_sessions.first() { + ui.label( + egui::RichText::new("You have an active GFN session running:") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + ui.add_space(10.0); + + egui::Frame::new() + .fill(egui::Color32::from_rgb(40, 40, 50)) + .corner_radius(8.0) + .inner_margin(egui::Margin::same(12)) + .show(ui, |ui| { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("App ID:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(format!("{}", session.app_id)) + .size(13.0) + .color(egui::Color32::WHITE) + ); + }); + + if let Some(ref gpu) = session.gpu_type { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("GPU:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(gpu) + .size(13.0) + .color(egui::Color32::WHITE) + ); + }); + } + + if let Some(ref res) = session.resolution { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Resolution:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(format!("{} @ {}fps", res, session.fps.unwrap_or(60))) + .size(13.0) + .color(egui::Color32::WHITE) + ); + }); + } + + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Status:") + .size(13.0) + .color(egui::Color32::GRAY) + ); + let status_text = match session.status { + 2 => "Ready", + 3 => "Running", + _ => "Unknown", + }; + ui.label( + egui::RichText::new(status_text) + .size(13.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + }); + }); + + ui.add_space(15.0); + + if pending_game.is_some() { + ui.label( + egui::RichText::new("GFN only allows one session at a time. You can either:") + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + } else { + ui.label( + egui::RichText::new("What would you like to do?") + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + } + + ui.add_space(15.0); + + ui.vertical_centered(|ui| { + let resume_btn = egui::Button::new( + egui::RichText::new("Resume Existing Session") + .size(14.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::from_rgb(118, 185, 0)) + .min_size(egui::vec2(200.0, 35.0)); + + if ui.add(resume_btn).clicked() { + actions.push(UiAction::ResumeSession(session.clone())); + } + + ui.add_space(8.0); + + if let Some(game) = pending_game { + let terminate_btn = egui::Button::new( + egui::RichText::new(format!("End Session & Launch \"{}\"", game.title)) + .size(14.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::from_rgb(220, 60, 60)) + .min_size(egui::vec2(200.0, 35.0)); + + if ui.add(terminate_btn).clicked() { + actions.push(UiAction::TerminateAndLaunch(session.session_id.clone(), game.clone())); + } + + ui.add_space(8.0); + } + + let cancel_btn = egui::Button::new( + egui::RichText::new("Cancel") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ) + .fill(egui::Color32::from_rgb(60, 60, 75)) + .min_size(egui::vec2(200.0, 35.0)); + + if ui.add(cancel_btn).clicked() { + actions.push(UiAction::CloseSessionConflict); + } + }); + } + }); + }); +} + +/// Render the AV1 hardware warning dialog +pub fn render_av1_warning_dialog( + ctx: &egui::Context, + actions: &mut Vec, +) { + let modal_width = 450.0; + let modal_height = 280.0; + + // Dark overlay + egui::Area::new(egui::Id::new("av1_warning_overlay")) + .fixed_pos(egui::pos2(0.0, 0.0)) + .order(egui::Order::Foreground) + .show(ctx, |ui| { + #[allow(deprecated)] + let screen_rect = ctx.screen_rect(); + let overlay_rect = egui::Rect::from_min_size( + egui::pos2(0.0, 0.0), + screen_rect.size() + ); + + ui.painter().rect_filled( + overlay_rect, + 0.0, + egui::Color32::from_rgba_unmultiplied(0, 0, 0, 200) + ); + + // Modal window + let modal_pos = egui::pos2( + (screen_rect.width() - modal_width) / 2.0, + (screen_rect.height() - modal_height) / 2.0 + ); + + egui::Area::new(egui::Id::new("av1_warning_modal")) + .fixed_pos(modal_pos) + .order(egui::Order::Foreground) + .show(ctx, |ui| { + egui::Frame::new() + .fill(egui::Color32::from_rgb(35, 35, 45)) + .corner_radius(12.0) + .inner_margin(egui::Margin::same(25)) + .show(ui, |ui| { + ui.set_width(modal_width - 50.0); + + // Warning icon and title + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("⚠") + .size(28.0) + .color(egui::Color32::from_rgb(255, 180, 0)) + ); + ui.add_space(10.0); + ui.label( + egui::RichText::new("AV1 Hardware Not Detected") + .size(20.0) + .strong() + .color(egui::Color32::WHITE) + ); + }); + + ui.add_space(20.0); + + // Warning message + ui.label( + egui::RichText::new( + "Your system does not appear to have hardware AV1 decoding support. \ + AV1 requires:\n\n\ + • NVIDIA RTX 30 series or newer\n\ + • Intel 11th Gen (Tiger Lake) or newer\n\ + • AMD RX 6000 series or newer (Linux)\n\ + • Apple M3 or newer (macOS)" + ) + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + ui.add_space(15.0); + + ui.label( + egui::RichText::new( + "Software decoding will be used, which may cause high CPU usage and poor performance." + ) + .size(13.0) + .color(egui::Color32::from_rgb(255, 150, 100)) + ); + + ui.add_space(25.0); + + // Buttons + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + let ok_btn = egui::Button::new( + egui::RichText::new("I Understand") + .size(14.0) + .color(egui::Color32::WHITE) + ) + .fill(egui::Color32::from_rgb(118, 185, 0)) + .min_size(egui::vec2(130.0, 35.0)); + + if ui.add(ok_btn).clicked() { + actions.push(UiAction::CloseAV1Warning); + } + }); + }); + }); + }); +} diff --git a/opennow-streamer/src/gui/screens/login.rs b/opennow-streamer/src/gui/screens/login.rs new file mode 100644 index 0000000..07b582c --- /dev/null +++ b/opennow-streamer/src/gui/screens/login.rs @@ -0,0 +1,152 @@ +//! Login Screen +//! +//! Renders the login/provider selection screen. + +use crate::app::UiAction; +use crate::auth::LoginProvider; + +/// Render the login screen with provider selection +pub fn render_login_screen( + ctx: &egui::Context, + login_providers: &[LoginProvider], + selected_provider_index: usize, + status_message: &str, + is_loading: bool, + actions: &mut Vec +) { + egui::CentralPanel::default().show(ctx, |ui| { + let available_height = ui.available_height(); + let content_height = 400.0; + let top_padding = ((available_height - content_height) / 2.0).max(40.0); + + ui.vertical_centered(|ui| { + ui.add_space(top_padding); + + // Logo/Title with gradient-like effect + ui.label( + egui::RichText::new("OpenNOW") + .size(48.0) + .color(egui::Color32::from_rgb(118, 185, 0)) // NVIDIA green + .strong() + ); + + ui.add_space(8.0); + ui.label( + egui::RichText::new("GeForce NOW Client") + .size(14.0) + .color(egui::Color32::from_rgb(150, 150, 150)) + ); + + ui.add_space(60.0); + + // Login card container + egui::Frame::new() + .fill(egui::Color32::from_rgb(30, 30, 40)) + .corner_radius(12.0) + .inner_margin(egui::Margin { left: 40, right: 40, top: 30, bottom: 30 }) + .show(ui, |ui| { + ui.set_min_width(320.0); + + ui.vertical(|ui| { + // Region selection label - centered + ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { + ui.label( + egui::RichText::new("Select Region") + .size(13.0) + .color(egui::Color32::from_rgb(180, 180, 180)) + ); + }); + + ui.add_space(10.0); + + // Provider dropdown - centered using horizontal with spacing + ui.horizontal(|ui| { + let available_width = ui.available_width(); + let combo_width = 240.0; + let padding = (available_width - combo_width) / 2.0; + ui.add_space(padding.max(0.0)); + + let selected_name = login_providers.get(selected_provider_index) + .map(|p| p.login_provider_display_name.as_str()) + .unwrap_or("NVIDIA (Global)"); + + egui::ComboBox::from_id_salt("provider_select") + .selected_text(selected_name) + .width(combo_width) + .show_ui(ui, |ui| { + for (i, provider) in login_providers.iter().enumerate() { + let is_selected = i == selected_provider_index; + if ui.selectable_label(is_selected, &provider.login_provider_display_name).clicked() { + actions.push(UiAction::SelectProvider(i)); + } + } + }); + }); + + ui.add_space(25.0); + + // Login button or loading state - centered + ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { + if is_loading { + ui.add_space(10.0); + ui.spinner(); + ui.add_space(12.0); + ui.label( + egui::RichText::new("Opening browser...") + .size(13.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + ui.add_space(5.0); + ui.label( + egui::RichText::new("Complete login in your browser") + .size(11.0) + .color(egui::Color32::GRAY) + ); + } else { + let login_btn = egui::Button::new( + egui::RichText::new("Sign In") + .size(15.0) + .color(egui::Color32::WHITE) + .strong() + ) + .fill(egui::Color32::from_rgb(118, 185, 0)) + .corner_radius(6.0); + + if ui.add_sized([240.0, 42.0], login_btn).clicked() { + actions.push(UiAction::StartLogin); + } + + ui.add_space(15.0); + + ui.label( + egui::RichText::new("Sign in with your NVIDIA account") + .size(11.0) + .color(egui::Color32::from_rgb(120, 120, 120)) + ); + } + }); + }); + }); + + ui.add_space(20.0); + + // Status message (if any) + if !status_message.is_empty() && status_message != "Welcome to OpenNOW" { + ui.label( + egui::RichText::new(status_message) + .size(11.0) + .color(egui::Color32::from_rgb(150, 150, 150)) + ); + } + + ui.add_space(40.0); + + // Footer info + ui.label( + egui::RichText::new("Alliance Partners can select their region above") + .size(10.0) + .color(egui::Color32::from_rgb(80, 80, 80)) + ); + }); + }); +} diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs new file mode 100644 index 0000000..89097b5 --- /dev/null +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -0,0 +1,11 @@ +//! UI Screens +//! +//! Standalone UI rendering functions for different application screens. + +mod login; +mod session; +mod dialogs; + +pub use login::render_login_screen; +pub use session::render_session_screen; +pub use dialogs::{render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog}; diff --git a/opennow-streamer/src/gui/screens/session.rs b/opennow-streamer/src/gui/screens/session.rs new file mode 100644 index 0000000..e980cae --- /dev/null +++ b/opennow-streamer/src/gui/screens/session.rs @@ -0,0 +1,61 @@ +//! Session Screen +//! +//! Renders the session loading/connecting screen. + +use crate::app::{GameInfo, UiAction}; + +/// Render the session screen (loading/connecting state) +pub fn render_session_screen( + ctx: &egui::Context, + selected_game: &Option, + status_message: &str, + error_message: &Option, + actions: &mut Vec +) { + egui::CentralPanel::default().show(ctx, |ui| { + ui.vertical_centered(|ui| { + ui.add_space(120.0); + + // Game title + if let Some(ref game) = selected_game { + ui.label( + egui::RichText::new(&game.title) + .size(28.0) + .strong() + .color(egui::Color32::WHITE) + ); + } + + ui.add_space(40.0); + + // Spinner + ui.spinner(); + + ui.add_space(20.0); + + // Status + ui.label( + egui::RichText::new(status_message) + .size(16.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + // Error message + if let Some(ref error) = error_message { + ui.add_space(20.0); + ui.label( + egui::RichText::new(error) + .size(14.0) + .color(egui::Color32::from_rgb(255, 100, 100)) + ); + } + + ui.add_space(40.0); + + // Cancel button + if ui.button("Cancel").clicked() { + actions.push(UiAction::StopStreaming); + } + }); + }); +} diff --git a/opennow-streamer/src/gui/shaders.rs b/opennow-streamer/src/gui/shaders.rs new file mode 100644 index 0000000..f316a6b --- /dev/null +++ b/opennow-streamer/src/gui/shaders.rs @@ -0,0 +1,145 @@ +//! GPU Shaders for video rendering +//! +//! WGSL shaders for YUV to RGB conversion on the GPU. + +/// WGSL shader for full-screen video quad with YUV to RGB conversion +/// Uses 3 separate textures (Y, U, V) for GPU-accelerated color conversion +/// This eliminates the CPU bottleneck of converting ~600M pixels/sec at 1440p165 +pub const VIDEO_SHADER: &str = r#" +struct VertexOutput { + @builtin(position) position: vec4, + @location(0) tex_coord: vec2, +}; + +@vertex +fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { + // Full-screen quad (2 triangles = 6 vertices) + var positions = array, 6>( + vec2(-1.0, -1.0), // bottom-left + vec2( 1.0, -1.0), // bottom-right + vec2(-1.0, 1.0), // top-left + vec2(-1.0, 1.0), // top-left + vec2( 1.0, -1.0), // bottom-right + vec2( 1.0, 1.0), // top-right + ); + + var tex_coords = array, 6>( + vec2(0.0, 1.0), // bottom-left + vec2(1.0, 1.0), // bottom-right + vec2(0.0, 0.0), // top-left + vec2(0.0, 0.0), // top-left + vec2(1.0, 1.0), // bottom-right + vec2(1.0, 0.0), // top-right + ); + + var output: VertexOutput; + output.position = vec4(positions[vertex_index], 0.0, 1.0); + output.tex_coord = tex_coords[vertex_index]; + return output; +} + +// YUV planar textures (Y = full res, U/V = half res) +@group(0) @binding(0) +var y_texture: texture_2d; +@group(0) @binding(1) +var u_texture: texture_2d; +@group(0) @binding(2) +var v_texture: texture_2d; +@group(0) @binding(3) +var video_sampler: sampler; + +@fragment +fn fs_main(input: VertexOutput) -> @location(0) vec4 { + // Sample Y, U, V planes + // Y is full resolution, U/V are half resolution (4:2:0 subsampling) + // The sampler handles the upscaling of U/V automatically + let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; + let u_raw = textureSample(u_texture, video_sampler, input.tex_coord).r; + let v_raw = textureSample(v_texture, video_sampler, input.tex_coord).r; + + // BT.709 YUV to RGB conversion (limited/TV range) + // Video uses limited range: Y [16-235], UV [16-240] + // First convert from limited range to full range + let y = (y_raw - 0.0625) * 1.1644; // (Y - 16/255) * (255/219) + let u = (u_raw - 0.5) * 1.1384; // (U - 128/255) * (255/224) + let v = (v_raw - 0.5) * 1.1384; // (V - 128/255) * (255/224) + + // BT.709 color matrix (HD content: 720p and above) + // R = Y + 1.5748 * V + // G = Y - 0.1873 * U - 0.4681 * V + // B = Y + 1.8556 * U + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; + + return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); +} +"#; + +/// WGSL shader for NV12 format (VideoToolbox on macOS, CUVID on Windows) +/// NV12 has Y plane (R8) and interleaved UV plane (Rg8) +/// This shader deinterleaves UV on the GPU - much faster than CPU scaler +pub const NV12_SHADER: &str = r#" +struct VertexOutput { + @builtin(position) position: vec4, + @location(0) tex_coord: vec2, +}; + +@vertex +fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { + var positions = array, 6>( + vec2(-1.0, -1.0), + vec2( 1.0, -1.0), + vec2(-1.0, 1.0), + vec2(-1.0, 1.0), + vec2( 1.0, -1.0), + vec2( 1.0, 1.0), + ); + + var tex_coords = array, 6>( + vec2(0.0, 1.0), + vec2(1.0, 1.0), + vec2(0.0, 0.0), + vec2(0.0, 0.0), + vec2(1.0, 1.0), + vec2(1.0, 0.0), + ); + + var output: VertexOutput; + output.position = vec4(positions[vertex_index], 0.0, 1.0); + output.tex_coord = tex_coords[vertex_index]; + return output; +} + +// NV12 textures: Y (R8, full res) and UV (Rg8, half res, interleaved) +@group(0) @binding(0) +var y_texture: texture_2d; +@group(0) @binding(1) +var uv_texture: texture_2d; +@group(0) @binding(2) +var video_sampler: sampler; + +@fragment +fn fs_main(input: VertexOutput) -> @location(0) vec4 { + // Sample Y (full res) and UV (half res, interleaved) + let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; + let uv = textureSample(uv_texture, video_sampler, input.tex_coord); + // NVIDIA CUVID outputs NV12 with standard UV order (U in R, V in G) + // but some decoders output NV21 (V in R, U in G) - try swapping if colors are wrong + let u_raw = uv.r; // U is in red channel (first byte of pair) + let v_raw = uv.g; // V is in green channel (second byte of pair) + + // BT.709 YUV to RGB conversion (full range for NVIDIA CUVID) + // NVIDIA hardware decoders typically output full range [0-255] + let y = y_raw; + let u = u_raw - 0.5; // Center around 0 (128/255 = 0.5) + let v = v_raw - 0.5; // Center around 0 + + // BT.709 color matrix (HD content: 720p and above) + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; + + return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); +} +"#; diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs index 61890c5..0473f65 100644 --- a/opennow-streamer/src/media/mod.rs +++ b/opennow-streamer/src/media/mod.rs @@ -4,11 +4,13 @@ mod video; mod audio; +mod rtp; #[cfg(target_os = "macos")] pub mod videotoolbox; -pub use video::{VideoDecoder, RtpDepacketizer, DepacketizerCodec, DecodeStats}; +pub use video::{VideoDecoder, DecodeStats, is_av1_hardware_supported}; +pub use rtp::{RtpDepacketizer, DepacketizerCodec}; pub use audio::*; #[cfg(target_os = "macos")] diff --git a/opennow-streamer/src/media/rtp.rs b/opennow-streamer/src/media/rtp.rs new file mode 100644 index 0000000..929f3f2 --- /dev/null +++ b/opennow-streamer/src/media/rtp.rs @@ -0,0 +1,659 @@ +//! RTP Depacketizer +//! +//! Depacketizes RTP payloads for H.264, H.265/HEVC, and AV1 video codecs. + +use log::{debug, info, warn}; + +/// Codec type for depacketizer +#[derive(Debug, Clone, Copy, PartialEq)] +pub enum DepacketizerCodec { + H264, + H265, + AV1, +} + +/// RTP depacketizer supporting H.264, H.265/HEVC, and AV1 +pub struct RtpDepacketizer { + codec: DepacketizerCodec, + buffer: Vec, + fragments: Vec>, + in_fragment: bool, + /// Cached VPS NAL unit (H.265 only) + vps: Option>, + /// Cached SPS NAL unit + sps: Option>, + /// Cached PPS NAL unit + pps: Option>, + /// Accumulated OBUs for current AV1 frame (sent when marker bit is set) + av1_frame_buffer: Vec, + /// Cached AV1 SEQUENCE_HEADER OBU - must be present at start of each frame + av1_sequence_header: Option>, +} + +impl RtpDepacketizer { + pub fn new() -> Self { + Self::with_codec(DepacketizerCodec::H264) + } + + pub fn with_codec(codec: DepacketizerCodec) -> Self { + Self { + codec, + buffer: Vec::with_capacity(64 * 1024), + fragments: Vec::new(), + in_fragment: false, + vps: None, + sps: None, + pps: None, + av1_frame_buffer: Vec::with_capacity(256 * 1024), + av1_sequence_header: None, + } + } + + /// Set the codec type + pub fn set_codec(&mut self, codec: DepacketizerCodec) { + self.codec = codec; + // Clear cached parameter sets when codec changes + self.vps = None; + self.sps = None; + self.pps = None; + self.buffer.clear(); + self.in_fragment = false; + self.av1_frame_buffer.clear(); + self.av1_sequence_header = None; + } + + /// Accumulate an OBU for the current AV1 frame + /// Call take_accumulated_frame() when marker bit is set to get complete frame + pub fn accumulate_obu(&mut self, obu: Vec) { + self.av1_frame_buffer.extend_from_slice(&obu); + } + + /// Take the accumulated AV1 frame data (all OBUs concatenated) + /// Returns None if no data accumulated or if frame doesn't contain picture data + pub fn take_accumulated_frame(&mut self) -> Option> { + if self.av1_frame_buffer.is_empty() { + return None; + } + let mut frame = std::mem::take(&mut self.av1_frame_buffer); + // Pre-allocate for next frame + self.av1_frame_buffer = Vec::with_capacity(256 * 1024); + + // Validate that frame contains actual picture data (TILE_GROUP or FRAME OBU) + // Without this, we'd send headers-only to decoder which can crash CUVID + if !Self::av1_frame_has_picture_data(&frame) { + // But still extract and cache SEQUENCE_HEADER if present + if let Some(seq_hdr) = Self::extract_sequence_header(&frame) { + info!("AV1: Caching SEQUENCE_HEADER ({} bytes) from header-only packet", seq_hdr.len()); + self.av1_sequence_header = Some(seq_hdr); + } + static SKIPPED_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); + let logged = SKIPPED_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + if logged < 5 { + warn!("AV1: Skipping frame without picture data ({} bytes)", frame.len()); + } + return None; + } + + // Check if frame already has a SEQUENCE_HEADER + let has_sequence_header = Self::av1_frame_has_sequence_header(&frame); + + // If frame has SEQUENCE_HEADER, cache it for future frames + if has_sequence_header { + if let Some(seq_hdr) = Self::extract_sequence_header(&frame) { + if self.av1_sequence_header.is_none() { + info!("AV1: Caching SEQUENCE_HEADER ({} bytes)", seq_hdr.len()); + } + self.av1_sequence_header = Some(seq_hdr); + } + } else if let Some(ref seq_hdr) = self.av1_sequence_header { + // Prepend cached SEQUENCE_HEADER to frame + static PREPEND_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); + let logged = PREPEND_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + if logged < 5 { + info!("AV1: Prepending cached SEQUENCE_HEADER ({} bytes) to frame", seq_hdr.len()); + } + let mut new_frame = Vec::with_capacity(seq_hdr.len() + frame.len()); + new_frame.extend_from_slice(seq_hdr); + new_frame.extend_from_slice(&frame); + frame = new_frame; + } + + static FRAMES_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); + let logged = FRAMES_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + if logged < 10 { + info!("AV1: Sending complete frame to decoder: {} bytes (has_seq_hdr={})", + frame.len(), has_sequence_header || self.av1_sequence_header.is_some()); + } + + Some(frame) + } + + /// Check if an AV1 frame contains actual picture data (TILE_GROUP or FRAME OBU) + /// Frames with only SEQUENCE_HEADER, FRAME_HEADER, etc. are not decodable + fn av1_frame_has_picture_data(data: &[u8]) -> bool { + Self::av1_find_obu_types(data).iter().any(|&t| t == 4 || t == 6) + } + + /// Check if an AV1 frame contains a SEQUENCE_HEADER OBU + fn av1_frame_has_sequence_header(data: &[u8]) -> bool { + Self::av1_find_obu_types(data).contains(&1) + } + + /// Find all OBU types in an AV1 bitstream + fn av1_find_obu_types(data: &[u8]) -> Vec { + let mut types = Vec::new(); + let mut offset = 0; + + while offset < data.len() { + // Parse OBU header + let header = data[offset]; + let obu_type = (header >> 3) & 0x0F; + let has_extension = (header & 0x04) != 0; + let has_size = (header & 0x02) != 0; + + types.push(obu_type); + + // Move to next OBU + let header_size = if has_extension { 2 } else { 1 }; + offset += header_size; + + if has_size && offset < data.len() { + let (size, bytes_read) = Self::read_leb128(&data[offset..]); + offset += bytes_read + size as usize; + } else { + // No size field - OBU extends to end of data + break; + } + } + types + } + + /// Extract the SEQUENCE_HEADER OBU from an AV1 bitstream + fn extract_sequence_header(data: &[u8]) -> Option> { + let mut offset = 0; + + while offset < data.len() { + let start_offset = offset; + + // Parse OBU header + let header = data[offset]; + let obu_type = (header >> 3) & 0x0F; + let has_extension = (header & 0x04) != 0; + let has_size = (header & 0x02) != 0; + + // Move past header + let header_size = if has_extension { 2 } else { 1 }; + offset += header_size; + + if has_size && offset < data.len() { + let (size, bytes_read) = Self::read_leb128(&data[offset..]); + offset += bytes_read; + + // If this is SEQUENCE_HEADER (type 1), extract it + if obu_type == 1 { + let end_offset = offset + size as usize; + if end_offset <= data.len() { + return Some(data[start_offset..end_offset].to_vec()); + } + } + + offset += size as usize; + } else { + // No size field - OBU extends to end of data + if obu_type == 1 { + return Some(data[start_offset..].to_vec()); + } + break; + } + } + None + } + + /// Process an RTP payload and return complete NAL units (or OBUs for AV1) + pub fn process(&mut self, payload: &[u8]) -> Vec> { + match self.codec { + DepacketizerCodec::H264 => self.process_h264(payload), + DepacketizerCodec::H265 => self.process_h265(payload), + DepacketizerCodec::AV1 => self.process_av1(payload), + } + } + + /// Process H.264 RTP payload + fn process_h264(&mut self, payload: &[u8]) -> Vec> { + let mut result = Vec::new(); + + if payload.is_empty() { + return result; + } + + let nal_type = payload[0] & 0x1F; + + match nal_type { + // Single NAL unit (1-23) + 1..=23 => { + // Cache SPS/PPS for later use + if nal_type == 7 { + debug!("H264: Caching SPS ({} bytes)", payload.len()); + self.sps = Some(payload.to_vec()); + } else if nal_type == 8 { + debug!("H264: Caching PPS ({} bytes)", payload.len()); + self.pps = Some(payload.to_vec()); + } + result.push(payload.to_vec()); + } + + // STAP-A (24) - Single-time aggregation packet + 24 => { + let mut offset = 1; + debug!("H264 STAP-A packet: {} bytes total", payload.len()); + + while offset + 2 <= payload.len() { + let size = u16::from_be_bytes([payload[offset], payload[offset + 1]]) as usize; + offset += 2; + + if offset + size > payload.len() { + warn!("H264 STAP-A: invalid size {} at offset {}", size, offset); + break; + } + + let nal_data = payload[offset..offset + size].to_vec(); + let inner_nal_type = nal_data.first().map(|b| b & 0x1F).unwrap_or(0); + + // Cache SPS/PPS + if inner_nal_type == 7 { + self.sps = Some(nal_data.clone()); + } else if inner_nal_type == 8 { + self.pps = Some(nal_data.clone()); + } + + result.push(nal_data); + offset += size; + } + } + + // FU-A (28) - Fragmentation unit + 28 => { + if payload.len() < 2 { + return result; + } + + let fu_header = payload[1]; + let start = (fu_header & 0x80) != 0; + let end = (fu_header & 0x40) != 0; + let inner_nal_type = fu_header & 0x1F; + + if start { + self.buffer.clear(); + self.in_fragment = true; + let nal_header = (payload[0] & 0xE0) | inner_nal_type; + self.buffer.push(nal_header); + self.buffer.extend_from_slice(&payload[2..]); + } else if self.in_fragment { + self.buffer.extend_from_slice(&payload[2..]); + } + + if end && self.in_fragment { + self.in_fragment = false; + let inner_nal_type = self.buffer.first().map(|b| b & 0x1F).unwrap_or(0); + + // For IDR frames, prepend SPS/PPS + if inner_nal_type == 5 { + if let (Some(sps), Some(pps)) = (&self.sps, &self.pps) { + result.push(sps.clone()); + result.push(pps.clone()); + } + } + + result.push(self.buffer.clone()); + } + } + + _ => { + debug!("H264: Unknown NAL type: {}", nal_type); + } + } + + result + } + + /// Process H.265/HEVC RTP payload (RFC 7798) + fn process_h265(&mut self, payload: &[u8]) -> Vec> { + let mut result = Vec::new(); + + if payload.len() < 2 { + return result; + } + + // H.265 NAL unit header is 2 bytes + // Type is in bits 1-6 of first byte: (byte0 >> 1) & 0x3F + let nal_type = (payload[0] >> 1) & 0x3F; + + match nal_type { + // Single NAL unit (0-47, but 48 and 49 are special) + 0..=47 => { + // Cache VPS/SPS/PPS for later use + match nal_type { + 32 => { + debug!("H265: Caching VPS ({} bytes)", payload.len()); + self.vps = Some(payload.to_vec()); + } + 33 => { + debug!("H265: Caching SPS ({} bytes)", payload.len()); + self.sps = Some(payload.to_vec()); + } + 34 => { + debug!("H265: Caching PPS ({} bytes)", payload.len()); + self.pps = Some(payload.to_vec()); + } + _ => {} + } + result.push(payload.to_vec()); + } + + // AP (48) - Aggregation Packet + 48 => { + let mut offset = 2; // Skip the 2-byte NAL unit header + debug!("H265 AP packet: {} bytes total", payload.len()); + + while offset + 2 <= payload.len() { + let size = u16::from_be_bytes([payload[offset], payload[offset + 1]]) as usize; + offset += 2; + + if offset + size > payload.len() { + warn!("H265 AP: invalid size {} at offset {}", size, offset); + break; + } + + let nal_data = payload[offset..offset + size].to_vec(); + + if nal_data.len() >= 2 { + let inner_nal_type = (nal_data[0] >> 1) & 0x3F; + // Cache VPS/SPS/PPS + match inner_nal_type { + 32 => self.vps = Some(nal_data.clone()), + 33 => self.sps = Some(nal_data.clone()), + 34 => self.pps = Some(nal_data.clone()), + _ => {} + } + } + + result.push(nal_data); + offset += size; + } + } + + // FU (49) - Fragmentation Unit + 49 => { + if payload.len() < 3 { + return result; + } + + // FU header is at byte 2 + let fu_header = payload[2]; + let start = (fu_header & 0x80) != 0; + let end = (fu_header & 0x40) != 0; + let inner_nal_type = fu_header & 0x3F; + + if start { + self.buffer.clear(); + self.in_fragment = true; + + // Reconstruct NAL unit header from original header + inner type + // H265 NAL header: forbidden_zero_bit(1) | nal_unit_type(6) | nuh_layer_id(6) | nuh_temporal_id_plus1(3) + // First byte: (forbidden_zero_bit << 7) | (inner_nal_type << 1) | (layer_id >> 5) + // Second byte: (layer_id << 3) | temporal_id + let layer_id = payload[0] & 0x01; // lowest bit of first byte + let temporal_id = payload[1]; // second byte + + let nal_header_byte0 = (inner_nal_type << 1) | layer_id; + let nal_header_byte1 = temporal_id; + + self.buffer.push(nal_header_byte0); + self.buffer.push(nal_header_byte1); + self.buffer.extend_from_slice(&payload[3..]); + } else if self.in_fragment { + self.buffer.extend_from_slice(&payload[3..]); + } + + if end && self.in_fragment { + self.in_fragment = false; + + if self.buffer.len() >= 2 { + let inner_nal_type = (self.buffer[0] >> 1) & 0x3F; + + // For IDR frames (types 19 and 20), prepend VPS/SPS/PPS + if inner_nal_type == 19 || inner_nal_type == 20 { + if let Some(vps) = &self.vps { + result.push(vps.clone()); + } + if let Some(sps) = &self.sps { + result.push(sps.clone()); + } + if let Some(pps) = &self.pps { + result.push(pps.clone()); + } + } + } + + result.push(self.buffer.clone()); + } + } + + _ => { + debug!("H265: Unknown NAL type: {}", nal_type); + } + } + + result + } + + /// Process AV1 RTP payload (RFC 9000 - RTP Payload Format for AV1) + /// AV1 uses OBUs (Open Bitstream Units) instead of NAL units + /// + /// The RTP payload format omits the obu_size field from OBU headers. + /// We need to reconstruct full OBUs with size fields for the decoder. + fn process_av1(&mut self, payload: &[u8]) -> Vec> { + let mut result = Vec::new(); + + if payload.is_empty() { + return result; + } + + // AV1 aggregation header (first byte) + // Z (1 bit): Continuation of previous OBU fragment + // Y (1 bit): Last OBU fragment (or complete OBU) + // W (2 bits): Number of OBU elements (0=1 OBU, 1-3=W OBUs with sizes) + // N (1 bit): First packet of a coded video sequence + // Reserved (3 bits) + let agg_header = payload[0]; + let z_flag = (agg_header & 0x80) != 0; // continuation + let y_flag = (agg_header & 0x40) != 0; // last fragment / complete + let w_field = (agg_header >> 4) & 0x03; + let n_flag = (agg_header & 0x08) != 0; // new coded video sequence + + // Log first few packets to debug + static PACKETS_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); + let logged = PACKETS_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + if logged < 20 { + info!("AV1 RTP: len={} Z={} Y={} W={} N={} header=0x{:02x}", + payload.len(), z_flag as u8, y_flag as u8, w_field, n_flag as u8, agg_header); + } + + if n_flag { + info!("AV1: New coded video sequence"); + // Clear any pending fragments and collected OBUs + self.buffer.clear(); + self.fragments.clear(); + self.in_fragment = false; + } + + let mut offset = 1; + + // Handle fragmented OBU (Z=1 means this is a continuation) + if z_flag { + if self.in_fragment { + self.buffer.extend_from_slice(&payload[offset..]); + if y_flag { + // Last fragment - reconstruct full OBU with size field + self.in_fragment = false; + if let Some(obu) = Self::reconstruct_obu_with_size(&self.buffer) { + result.push(obu); + } + self.buffer.clear(); + } + } + return result; + } + + // Not a continuation - parse new OBU elements + // W=0: single OBU element occupying the rest of the packet + // W=1,2,3: W OBU elements, each preceded by LEB128 size (except last) + let obu_count = if w_field == 0 { 1 } else { w_field as usize }; + + for i in 0..obu_count { + if offset >= payload.len() { + break; + } + + // Read OBU size (LEB128) for all but the last element when W > 0 + let obu_size = if w_field > 0 && i < obu_count - 1 { + let (size, bytes_read) = Self::read_leb128(&payload[offset..]); + offset += bytes_read; + size as usize + } else { + // Last OBU (or only OBU when W=0) takes remaining bytes + payload.len() - offset + }; + + if offset + obu_size > payload.len() { + warn!("AV1: Invalid OBU size {} at offset {} (payload len {})", + obu_size, offset, payload.len()); + break; + } + + let obu_data = &payload[offset..offset + obu_size]; + + // Check if this starts a fragmented OBU + // Y=0 on the last OBU means it's fragmented across packets + if i == obu_count - 1 && !y_flag { + self.buffer.clear(); + self.buffer.extend_from_slice(obu_data); + self.in_fragment = true; + } else if !obu_data.is_empty() { + // Complete OBU - reconstruct with proper size field + if let Some(obu) = Self::reconstruct_obu_with_size(obu_data) { + result.push(obu); + } + } + + offset += obu_size; + } + + result + } + + /// Reconstruct an OBU with the obu_size field included + /// RTP format strips the size field, but decoders need it + fn reconstruct_obu_with_size(obu_data: &[u8]) -> Option> { + if obu_data.is_empty() { + return None; + } + + // Parse OBU header + let header = obu_data[0]; + let obu_type = (header >> 3) & 0x0F; + let has_extension = (header & 0x04) != 0; + let has_size_field = (header & 0x02) != 0; + + // If it already has a size field, return as-is + if has_size_field { + return Some(obu_data.to_vec()); + } + + // Calculate payload size (everything after header and optional extension) + let header_size = if has_extension { 2 } else { 1 }; + if obu_data.len() < header_size { + return None; + } + + let payload_size = obu_data.len() - header_size; + + // Build new OBU with size field + let mut new_obu = Vec::with_capacity(obu_data.len() + 8); + + // Modified header with has_size_field = 1 + new_obu.push(header | 0x02); + + // Copy extension byte if present + if has_extension && obu_data.len() > 1 { + new_obu.push(obu_data[1]); + } + + // Write payload size as LEB128 + Self::write_leb128(&mut new_obu, payload_size as u64); + + // Copy payload + new_obu.extend_from_slice(&obu_data[header_size..]); + + // Log OBU types for debugging + let obu_type_name = match obu_type { + 1 => "SEQUENCE_HEADER", + 2 => "TEMPORAL_DELIMITER", + 3 => "FRAME_HEADER", + 4 => "TILE_GROUP", + 5 => "METADATA", + 6 => "FRAME", + 7 => "REDUNDANT_FRAME_HEADER", + 8 => "TILE_LIST", + 15 => "PADDING", + _ => "UNKNOWN", + }; + + // Log first few OBUs at info level + static OBUS_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); + let logged = OBUS_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + if logged < 30 { + info!("AV1: Reconstructed OBU type {} ({}) payload_size={} total_size={}", + obu_type, obu_type_name, payload_size, new_obu.len()); + } + + Some(new_obu) + } + + /// Read LEB128 encoded unsigned integer + fn read_leb128(data: &[u8]) -> (u64, usize) { + let mut value: u64 = 0; + let mut bytes_read = 0; + + for (i, &byte) in data.iter().enumerate().take(8) { + value |= ((byte & 0x7F) as u64) << (i * 7); + bytes_read = i + 1; + if (byte & 0x80) == 0 { + break; + } + } + + (value, bytes_read) + } + + /// Write LEB128 encoded unsigned integer + fn write_leb128(output: &mut Vec, mut value: u64) { + loop { + let mut byte = (value & 0x7F) as u8; + value >>= 7; + if value != 0 { + byte |= 0x80; // More bytes follow + } + output.push(byte); + if value == 0 { + break; + } + } + } +} + +impl Default for RtpDepacketizer { + fn default() -> Self { + Self::new() + } +} diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 7be21cb..998ca02 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -122,6 +122,60 @@ fn check_qsv_available() -> bool { }) } +/// Cached AV1 hardware support check +static AV1_HW_AVAILABLE: std::sync::OnceLock = std::sync::OnceLock::new(); + +/// Check if AV1 hardware decoding is supported on this system +/// Returns true if NVIDIA CUVID (RTX 30+) or Intel QSV (11th gen+) is available +pub fn is_av1_hardware_supported() -> bool { + *AV1_HW_AVAILABLE.get_or_init(|| { + // Initialize FFmpeg if not already done + let _ = ffmpeg::init(); + + // Check for NVIDIA CUVID AV1 decoder + let has_nvidia = ffmpeg::codec::decoder::find_by_name("av1_cuvid").is_some(); + + // Check for Intel QSV AV1 decoder (requires QSV runtime) + let has_intel = check_qsv_available() && + ffmpeg::codec::decoder::find_by_name("av1_qsv").is_some(); + + // Check for AMD VAAPI (Linux only) + #[cfg(target_os = "linux")] + let has_amd = ffmpeg::codec::decoder::find_by_name("av1_vaapi").is_some(); + #[cfg(not(target_os = "linux"))] + let has_amd = false; + + // Check for VideoToolbox (macOS) + #[cfg(target_os = "macos")] + let has_videotoolbox = { + // VideoToolbox AV1 support was added in macOS 13 Ventura on Apple Silicon + // Check if the decoder exists in FFmpeg build + ffmpeg::codec::decoder::find_by_name("av1").map_or(false, |codec| { + // The standard av1 decoder with VideoToolbox hwaccel + // This is a heuristic - actual support depends on macOS version and hardware + true + }) + }; + #[cfg(not(target_os = "macos"))] + let has_videotoolbox = false; + + let supported = has_nvidia || has_intel || has_amd || has_videotoolbox; + + if supported { + let mut sources = Vec::new(); + if has_nvidia { sources.push("NVIDIA NVDEC"); } + if has_intel { sources.push("Intel QSV"); } + if has_amd { sources.push("AMD VAAPI"); } + if has_videotoolbox { sources.push("Apple VideoToolbox"); } + info!("AV1 hardware decoding available via: {}", sources.join(", ")); + } else { + info!("AV1 hardware decoding NOT available - will use software decode (slow)"); + } + + supported + }) +} + /// Commands sent to the decoder thread enum DecoderCommand { /// Decode a packet and return result via channel (blocking mode) @@ -288,6 +342,7 @@ impl VideoDecoder { &mut height, &mut frames_decoded, &data, + codec_id, ); let _ = frame_tx.send(result); } @@ -302,6 +357,7 @@ impl VideoDecoder { &mut height, &mut frames_decoded, &data, + codec_id, ); let decode_time_ms = receive_time.elapsed().as_secs_f32() * 1000.0; @@ -593,14 +649,19 @@ impl VideoDecoder { height: &mut u32, frames_decoded: &mut u64, data: &[u8], + codec_id: ffmpeg::codec::Id, ) -> Option { - // Ensure data starts with start code - let data = if data.len() >= 4 && data[0..4] == [0, 0, 0, 1] { + // AV1 uses OBUs directly, no start codes needed + // H.264/H.265 need Annex B start codes (0x00 0x00 0x00 0x01) + let data = if codec_id == ffmpeg::codec::Id::AV1 { + // AV1 - use data as-is (OBU format) + data.to_vec() + } else if data.len() >= 4 && data[0..4] == [0, 0, 0, 1] { data.to_vec() } else if data.len() >= 3 && data[0..3] == [0, 0, 1] { data.to_vec() } else { - // Add start code + // Add start code for H.264/H.265 let mut with_start = vec![0, 0, 0, 1]; with_start.extend_from_slice(data); with_start @@ -660,8 +721,13 @@ impl VideoDecoder { let uv_stride = frame_to_use.stride(1) as u32; if *frames_decoded == 1 { + // Debug: Check UV plane data for green screen debugging + let uv_non_zero = uv_plane.iter().filter(|&&b| b != 0 && b != 128).take(10).count(); + let uv_sample: Vec = uv_plane.iter().take(32).cloned().collect(); info!("NV12 direct path: Y {}x{} stride {}, UV stride {} - GPU will handle conversion", w, h, y_stride, uv_stride); + info!("UV plane: {} bytes, non-zero/128 samples: {}, first 32 bytes: {:?}", + uv_plane.len(), uv_non_zero, uv_sample); } return Some(VideoFrame { @@ -794,296 +860,3 @@ impl Drop for VideoDecoder { let _ = self.cmd_tx.send(DecoderCommand::Stop); } } - -/// Codec type for depacketizer -#[derive(Debug, Clone, Copy, PartialEq)] -pub enum DepacketizerCodec { - H264, - H265, -} - -/// RTP depacketizer supporting H.264 and H.265/HEVC -pub struct RtpDepacketizer { - codec: DepacketizerCodec, - buffer: Vec, - fragments: Vec>, - in_fragment: bool, - /// Cached VPS NAL unit (H.265 only) - vps: Option>, - /// Cached SPS NAL unit - sps: Option>, - /// Cached PPS NAL unit - pps: Option>, -} - -impl RtpDepacketizer { - pub fn new() -> Self { - Self::with_codec(DepacketizerCodec::H264) - } - - pub fn with_codec(codec: DepacketizerCodec) -> Self { - Self { - codec, - buffer: Vec::with_capacity(64 * 1024), - fragments: Vec::new(), - in_fragment: false, - vps: None, - sps: None, - pps: None, - } - } - - /// Set the codec type - pub fn set_codec(&mut self, codec: DepacketizerCodec) { - self.codec = codec; - // Clear cached parameter sets when codec changes - self.vps = None; - self.sps = None; - self.pps = None; - self.buffer.clear(); - self.in_fragment = false; - } - - /// Process an RTP payload and return complete NAL units - pub fn process(&mut self, payload: &[u8]) -> Vec> { - match self.codec { - DepacketizerCodec::H264 => self.process_h264(payload), - DepacketizerCodec::H265 => self.process_h265(payload), - } - } - - /// Process H.264 RTP payload - fn process_h264(&mut self, payload: &[u8]) -> Vec> { - let mut result = Vec::new(); - - if payload.is_empty() { - return result; - } - - let nal_type = payload[0] & 0x1F; - - match nal_type { - // Single NAL unit (1-23) - 1..=23 => { - // Cache SPS/PPS for later use - if nal_type == 7 { - debug!("H264: Caching SPS ({} bytes)", payload.len()); - self.sps = Some(payload.to_vec()); - } else if nal_type == 8 { - debug!("H264: Caching PPS ({} bytes)", payload.len()); - self.pps = Some(payload.to_vec()); - } - result.push(payload.to_vec()); - } - - // STAP-A (24) - Single-time aggregation packet - 24 => { - let mut offset = 1; - debug!("H264 STAP-A packet: {} bytes total", payload.len()); - - while offset + 2 <= payload.len() { - let size = u16::from_be_bytes([payload[offset], payload[offset + 1]]) as usize; - offset += 2; - - if offset + size > payload.len() { - warn!("H264 STAP-A: invalid size {} at offset {}", size, offset); - break; - } - - let nal_data = payload[offset..offset + size].to_vec(); - let inner_nal_type = nal_data.first().map(|b| b & 0x1F).unwrap_or(0); - - // Cache SPS/PPS - if inner_nal_type == 7 { - self.sps = Some(nal_data.clone()); - } else if inner_nal_type == 8 { - self.pps = Some(nal_data.clone()); - } - - result.push(nal_data); - offset += size; - } - } - - // FU-A (28) - Fragmentation unit - 28 => { - if payload.len() < 2 { - return result; - } - - let fu_header = payload[1]; - let start = (fu_header & 0x80) != 0; - let end = (fu_header & 0x40) != 0; - let inner_nal_type = fu_header & 0x1F; - - if start { - self.buffer.clear(); - self.in_fragment = true; - let nal_header = (payload[0] & 0xE0) | inner_nal_type; - self.buffer.push(nal_header); - self.buffer.extend_from_slice(&payload[2..]); - } else if self.in_fragment { - self.buffer.extend_from_slice(&payload[2..]); - } - - if end && self.in_fragment { - self.in_fragment = false; - let inner_nal_type = self.buffer.first().map(|b| b & 0x1F).unwrap_or(0); - - // For IDR frames, prepend SPS/PPS - if inner_nal_type == 5 { - if let (Some(sps), Some(pps)) = (&self.sps, &self.pps) { - result.push(sps.clone()); - result.push(pps.clone()); - } - } - - result.push(self.buffer.clone()); - } - } - - _ => { - debug!("H264: Unknown NAL type: {}", nal_type); - } - } - - result - } - - /// Process H.265/HEVC RTP payload (RFC 7798) - fn process_h265(&mut self, payload: &[u8]) -> Vec> { - let mut result = Vec::new(); - - if payload.len() < 2 { - return result; - } - - // H.265 NAL unit header is 2 bytes - // Type is in bits 1-6 of first byte: (byte0 >> 1) & 0x3F - let nal_type = (payload[0] >> 1) & 0x3F; - - match nal_type { - // Single NAL unit (0-47, but 48 and 49 are special) - 0..=47 => { - // Cache VPS/SPS/PPS for later use - match nal_type { - 32 => { - debug!("H265: Caching VPS ({} bytes)", payload.len()); - self.vps = Some(payload.to_vec()); - } - 33 => { - debug!("H265: Caching SPS ({} bytes)", payload.len()); - self.sps = Some(payload.to_vec()); - } - 34 => { - debug!("H265: Caching PPS ({} bytes)", payload.len()); - self.pps = Some(payload.to_vec()); - } - _ => {} - } - result.push(payload.to_vec()); - } - - // AP (48) - Aggregation Packet - 48 => { - let mut offset = 2; // Skip the 2-byte NAL unit header - debug!("H265 AP packet: {} bytes total", payload.len()); - - while offset + 2 <= payload.len() { - let size = u16::from_be_bytes([payload[offset], payload[offset + 1]]) as usize; - offset += 2; - - if offset + size > payload.len() { - warn!("H265 AP: invalid size {} at offset {}", size, offset); - break; - } - - let nal_data = payload[offset..offset + size].to_vec(); - - if nal_data.len() >= 2 { - let inner_nal_type = (nal_data[0] >> 1) & 0x3F; - // Cache VPS/SPS/PPS - match inner_nal_type { - 32 => self.vps = Some(nal_data.clone()), - 33 => self.sps = Some(nal_data.clone()), - 34 => self.pps = Some(nal_data.clone()), - _ => {} - } - } - - result.push(nal_data); - offset += size; - } - } - - // FU (49) - Fragmentation Unit - 49 => { - if payload.len() < 3 { - return result; - } - - // FU header is at byte 2 - let fu_header = payload[2]; - let start = (fu_header & 0x80) != 0; - let end = (fu_header & 0x40) != 0; - let inner_nal_type = fu_header & 0x3F; - - if start { - self.buffer.clear(); - self.in_fragment = true; - - // Reconstruct NAL unit header from original header + inner type - // H265 NAL header: forbidden_zero_bit(1) | nal_unit_type(6) | nuh_layer_id(6) | nuh_temporal_id_plus1(3) - // First byte: (forbidden_zero_bit << 7) | (inner_nal_type << 1) | (layer_id >> 5) - // Second byte: (layer_id << 3) | temporal_id - let layer_id = payload[0] & 0x01; // lowest bit of first byte - let temporal_id = payload[1]; // second byte - - let nal_header_byte0 = (inner_nal_type << 1) | layer_id; - let nal_header_byte1 = temporal_id; - - self.buffer.push(nal_header_byte0); - self.buffer.push(nal_header_byte1); - self.buffer.extend_from_slice(&payload[3..]); - } else if self.in_fragment { - self.buffer.extend_from_slice(&payload[3..]); - } - - if end && self.in_fragment { - self.in_fragment = false; - - if self.buffer.len() >= 2 { - let inner_nal_type = (self.buffer[0] >> 1) & 0x3F; - - // For IDR frames (types 19 and 20), prepend VPS/SPS/PPS - if inner_nal_type == 19 || inner_nal_type == 20 { - if let Some(vps) = &self.vps { - result.push(vps.clone()); - } - if let Some(sps) = &self.sps { - result.push(sps.clone()); - } - if let Some(pps) = &self.pps { - result.push(pps.clone()); - } - } - } - - result.push(self.buffer.clone()); - } - } - - _ => { - debug!("H265: Unknown NAL type: {}", nal_type); - } - } - - result - } -} - -impl Default for RtpDepacketizer { - fn default() -> Self { - Self::new() - } -} From 951cc353a0dbb0edfe16c8c3050d2f99c5ba7f01 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 00:12:43 +0100 Subject: [PATCH 12/67] Fix controller input - use packet type 12, Little Endian, XInput format --- opennow-streamer/Cargo.lock | 93 +++ opennow-streamer/Cargo.toml | 3 + opennow-streamer/src/api/cloudmatch.rs | 31 +- opennow-streamer/src/api/error_codes.rs | 455 +++++++++++++++ opennow-streamer/src/api/mod.rs | 2 + opennow-streamer/src/app/config.rs | 5 +- opennow-streamer/src/gui/renderer.rs | 220 +++++-- opennow-streamer/src/gui/screens/dialogs.rs | 606 -------------------- opennow-streamer/src/gui/screens/mod.rs | 355 +++++++++++- opennow-streamer/src/gui/shaders.rs | 69 ++- opennow-streamer/src/input/controller.rs | 276 +++++++++ opennow-streamer/src/input/mod.rs | 2 + opennow-streamer/src/media/audio.rs | 4 +- opennow-streamer/src/media/mod.rs | 28 + opennow-streamer/src/media/rtp.rs | 289 +++++----- opennow-streamer/src/media/video.rs | 189 ++++-- opennow-streamer/src/webrtc/datachannel.rs | 66 +++ opennow-streamer/src/webrtc/mod.rs | 97 +++- opennow-streamer/src/webrtc/peer.rs | 21 +- 19 files changed, 1868 insertions(+), 943 deletions(-) create mode 100644 opennow-streamer/src/api/error_codes.rs delete mode 100644 opennow-streamer/src/gui/screens/dialogs.rs create mode 100644 opennow-streamer/src/input/controller.rs diff --git a/opennow-streamer/Cargo.lock b/opennow-streamer/Cargo.lock index dbe1d80..3488065 100644 --- a/opennow-streamer/Cargo.lock +++ b/opennow-streamer/Cargo.lock @@ -1670,6 +1670,40 @@ dependencies = [ "polyval", ] +[[package]] +name = "gilrs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb2c998745a3c1ac90f64f4f7b3a54219fd3612d7705e7798212935641ed18f" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] + +[[package]] +name = "gilrs-core" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be11a71ac3564f6965839e2ed275bf4fcf5ce16d80d396e1dfdb7b2d80bd587e" +dependencies = [ + "core-foundation 0.10.1", + "inotify", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix 0.30.1", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.62.2", +] + [[package]] name = "gl_generator" version = "0.14.0" @@ -2138,6 +2172,26 @@ dependencies = [ "hashbrown 0.16.1", ] +[[package]] +name = "inotify" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" +dependencies = [ + "bitflags 2.10.0", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "inout" version = "0.1.4" @@ -2168,6 +2222,16 @@ dependencies = [ "webrtc-util 0.9.0", ] +[[package]] +name = "io-kit-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b" +dependencies = [ + "core-foundation-sys", + "mach2", +] + [[package]] name = "ipnet" version = "2.11.0" @@ -2346,6 +2410,16 @@ dependencies = [ "redox_syscall 0.7.0", ] +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -2656,6 +2730,18 @@ dependencies = [ "pin-utils", ] +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.10.0", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -3133,6 +3219,7 @@ dependencies = [ "evdev", "ffmpeg-next", "futures-util", + "gilrs", "hex", "http", "image", @@ -4960,6 +5047,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version_check" version = "0.9.5" diff --git a/opennow-streamer/Cargo.toml b/opennow-streamer/Cargo.toml index 0058880..93c8e4b 100644 --- a/opennow-streamer/Cargo.toml +++ b/opennow-streamer/Cargo.toml @@ -36,6 +36,9 @@ openh264 = "0.6" # Audio playback (cross-platform) cpal = "0.15" +# Gamepad/Controller support (cross-platform) +gilrs = "0.11" + # Window & Graphics winit = "0.30" wgpu = "27" diff --git a/opennow-streamer/src/api/cloudmatch.rs b/opennow-streamer/src/api/cloudmatch.rs index 6deb6f8..ca52ef9 100644 --- a/opennow-streamer/src/api/cloudmatch.rs +++ b/opennow-streamer/src/api/cloudmatch.rs @@ -3,13 +3,14 @@ //! Create and manage GFN streaming sessions. use anyhow::{Result, Context}; -use log::{info, debug, warn}; +use log::{info, debug, warn, error}; use crate::app::session::*; use crate::app::Settings; use crate::auth; use crate::utils::generate_uuid; use super::GfnApiClient; +use super::error_codes::SessionError; /// GFN client version const GFN_CLIENT_VERSION: &str = "2.0.80.173"; @@ -166,20 +167,34 @@ impl GfnApiClient { &response_text[..response_text.len().min(500)]); if !status.is_success() { - return Err(anyhow::anyhow!("CloudMatch request failed: {} - {}", - status, &response_text[..response_text.len().min(200)])); + // Parse error response for user-friendly message + let session_error = SessionError::from_response(status.as_u16(), &response_text); + error!("CloudMatch session error: {} - {} (code: {}, unified: {:?})", + session_error.title, + session_error.description, + session_error.gfn_error_code, + session_error.unified_error_code); + + return Err(anyhow::anyhow!("{}: {}", + session_error.title, + session_error.description)); } let api_response: CloudMatchResponse = serde_json::from_str(&response_text) .context("Failed to parse CloudMatch response")?; if api_response.request_status.status_code != 1 { - let error_desc = api_response.request_status.status_description - .unwrap_or_else(|| "Unknown error".to_string()); - return Err(anyhow::anyhow!("CloudMatch error: {} (code: {}, unified: {})", - error_desc, + // Parse error for user-friendly message + let session_error = SessionError::from_response(200, &response_text); + error!("CloudMatch API error: {} - {} (statusCode: {}, unified: {})", + session_error.title, + session_error.description, api_response.request_status.status_code, - api_response.request_status.unified_error_code)); + api_response.request_status.unified_error_code); + + return Err(anyhow::anyhow!("{}: {}", + session_error.title, + session_error.description)); } let session_data = api_response.session; diff --git a/opennow-streamer/src/api/error_codes.rs b/opennow-streamer/src/api/error_codes.rs new file mode 100644 index 0000000..5e1e8c6 --- /dev/null +++ b/opennow-streamer/src/api/error_codes.rs @@ -0,0 +1,455 @@ +//! GFN CloudMatch Error Codes +//! +//! Error code mappings extracted from the official GFN web client. +//! These provide user-friendly error messages for session failures. + +use std::collections::HashMap; +use once_cell::sync::Lazy; + +/// GFN Session Error Codes from official client +#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +#[repr(i64)] +pub enum GfnErrorCode { + // Success codes + Success = 15859712, + + // Client-side errors (3237085xxx - 3237093xxx) + InvalidOperation = 3237085186, + NetworkError = 3237089282, + GetActiveSessionServerError = 3237089283, + AuthTokenNotUpdated = 3237093377, + SessionFinishedState = 3237093378, + ResponseParseFailure = 3237093379, + InvalidServerResponse = 3237093381, + PutOrPostInProgress = 3237093382, + GridServerNotInitialized = 3237093383, + DOMExceptionInSessionControl = 3237093384, + InvalidAdStateTransition = 3237093386, + AuthTokenUpdateTimeout = 3237093387, + + // Server error codes (base 3237093632 + statusCode) + SessionServerErrorBegin = 3237093632, + RequestForbidden = 3237093634, // statusCode 2 + ServerInternalTimeout = 3237093635, // statusCode 3 + ServerInternalError = 3237093636, // statusCode 4 + ServerInvalidRequest = 3237093637, // statusCode 5 + ServerInvalidRequestVersion = 3237093638, // statusCode 6 + SessionListLimitExceeded = 3237093639, // statusCode 7 + InvalidRequestDataMalformed = 3237093640, // statusCode 8 + InvalidRequestDataMissing = 3237093641, // statusCode 9 + RequestLimitExceeded = 3237093642, // statusCode 10 + SessionLimitExceeded = 3237093643, // statusCode 11 + InvalidRequestVersionOutOfDate = 3237093644, // statusCode 12 + SessionEntitledTimeExceeded = 3237093645, // statusCode 13 + AuthFailure = 3237093646, // statusCode 14 + InvalidAuthenticationMalformed = 3237093647, // statusCode 15 + InvalidAuthenticationExpired = 3237093648, // statusCode 16 + InvalidAuthenticationNotFound = 3237093649, // statusCode 17 + EntitlementFailure = 3237093650, // statusCode 18 + InvalidAppIdNotAvailable = 3237093651, // statusCode 19 + InvalidAppIdNotFound = 3237093652, // statusCode 20 + InvalidSessionIdMalformed = 3237093653, // statusCode 21 + InvalidSessionIdNotFound = 3237093654, // statusCode 22 + EulaUnAccepted = 3237093655, // statusCode 23 + MaintenanceStatus = 3237093656, // statusCode 24 + ServiceUnAvailable = 3237093657, // statusCode 25 + SteamGuardRequired = 3237093658, // statusCode 26 + SteamLoginRequired = 3237093659, // statusCode 27 + SteamGuardInvalid = 3237093660, // statusCode 28 + SteamProfilePrivate = 3237093661, // statusCode 29 + InvalidCountryCode = 3237093662, // statusCode 30 + InvalidLanguageCode = 3237093663, // statusCode 31 + MissingCountryCode = 3237093664, // statusCode 32 + MissingLanguageCode = 3237093665, // statusCode 33 + SessionNotPaused = 3237093666, // statusCode 34 + EmailNotVerified = 3237093667, // statusCode 35 + InvalidAuthenticationUnsupportedProtocol = 3237093668, // statusCode 36 + InvalidAuthenticationUnknownToken = 3237093669, // statusCode 37 + InvalidAuthenticationCredentials = 3237093670, // statusCode 38 + SessionNotPlaying = 3237093671, // statusCode 39 + InvalidServiceResponse = 3237093672, // statusCode 40 + AppPatching = 3237093673, // statusCode 41 + GameNotFound = 3237093674, // statusCode 42 + NotEnoughCredits = 3237093675, // statusCode 43 + InvitationOnlyRegistration = 3237093676, // statusCode 44 + RegionNotSupportedForRegistration = 3237093677, // statusCode 45 + SessionTerminatedByAnotherClient = 3237093678, // statusCode 46 + DeviceIdAlreadyUsed = 3237093679, // statusCode 47 + ServiceNotExist = 3237093680, // statusCode 48 + SessionExpired = 3237093681, // statusCode 49 + SessionLimitPerDeviceReached = 3237093682, // statusCode 50 + ForwardingZoneOutOfCapacity = 3237093683, // statusCode 51 + RegionNotSupportedIndefinitely = 3237093684, // statusCode 52 + RegionBanned = 3237093685, // statusCode 53 + RegionOnHoldForFree = 3237093686, // statusCode 54 + RegionOnHoldForPaid = 3237093687, // statusCode 55 + AppMaintenanceStatus = 3237093688, // statusCode 56 + ResourcePoolNotConfigured = 3237093689, // statusCode 57 + InsufficientVmCapacity = 3237093690, // statusCode 58 + InsufficientRouteCapacity = 3237093691, // statusCode 59 + InsufficientScratchSpaceCapacity = 3237093692, // statusCode 60 + RequiredSeatInstanceTypeNotSupported = 3237093693, // statusCode 61 + ServerSessionQueueLengthExceeded = 3237093694, // statusCode 62 + RegionNotSupportedForStreaming = 3237093695, // statusCode 63 + SessionForwardRequestAllocationTimeExpired = 3237093696, // statusCode 64 + SessionForwardGameBinariesNotAvailable = 3237093697, // statusCode 65 + GameBinariesNotAvailableInRegion = 3237093698, // statusCode 66 + UekRetrievalFailed = 3237093699, // statusCode 67 + EntitlementFailureForResource = 3237093700, // statusCode 68 + SessionInQueueAbandoned = 3237093701, // statusCode 69 + MemberTerminated = 3237093702, // statusCode 70 + SessionRemovedFromQueueMaintenance = 3237093703, // statusCode 71 + ZoneMaintenanceStatus = 3237093704, // statusCode 72 + GuestModeCampaignDisabled = 3237093705, // statusCode 73 + RegionNotSupportedAnonymousAccess = 3237093706, // statusCode 74 + InstanceTypeNotSupportedInSingleRegion = 3237093707, // statusCode 75 + InvalidZoneForQueuedSession = 3237093710, // statusCode 78 + SessionWaitingAdsTimeExpired = 3237093711, // statusCode 79 + UserCancelledWatchingAds = 3237093712, // statusCode 80 + StreamingNotAllowedInLimitedMode = 3237093713, // statusCode 81 + ForwardRequestJPMFailed = 3237093714, // statusCode 82 + MaxSessionNumberLimitExceeded = 3237093715, // statusCode 83 + GuestModePartnerCapacityDisabled = 3237093716, // statusCode 84 + SessionRejectedNoCapacity = 3237093717, // statusCode 85 + SessionInsufficientPlayabilityLevel = 3237093718, // statusCode 86 + ForwardRequestLOFNFailed = 3237093719, // statusCode 87 + InvalidTransportRequest = 3237093720, // statusCode 88 + UserStorageNotAvailable = 3237093721, // statusCode 89 + GfnStorageNotAvailable = 3237093722, // statusCode 90 + SessionServerErrorEnd = 3237093887, + + // Session setup cancelled + SessionSetupCancelled = 15867905, + SessionSetupCancelledDuringQueuing = 15867906, + RequestCancelled = 15867907, + SystemSleepDuringSessionSetup = 15867909, + NoInternetDuringSessionSetup = 15868417, + + // Network errors (3237101xxx) + SocketError = 3237101580, + AddressResolveFailed = 3237101581, + ConnectFailed = 3237101582, + SslError = 3237101583, + ConnectionTimeout = 3237101584, + DataReceiveTimeout = 3237101585, + PeerNoResponse = 3237101586, + UnexpectedHttpRedirect = 3237101587, + DataSendFailure = 3237101588, + DataReceiveFailure = 3237101589, + CertificateRejected = 3237101590, + DataNotAllowed = 3237101591, + NetworkErrorUnknown = 3237101592, +} + +/// User-friendly error messages +static ERROR_MESSAGES: Lazy> = Lazy::new(|| { + let mut m = HashMap::new(); + + // (Title, Description) + m.insert(15859712, ("Success", "Session started successfully.")); + + // Client errors + m.insert(3237085186, ("Invalid Operation", "The requested operation is not valid at this time.")); + m.insert(3237089282, ("Network Error", "A network error occurred. Please check your internet connection.")); + m.insert(3237093377, ("Authentication Required", "Your session has expired. Please log in again.")); + m.insert(3237093379, ("Server Response Error", "Failed to parse server response. Please try again.")); + m.insert(3237093381, ("Invalid Server Response", "The server returned an invalid response.")); + m.insert(3237093384, ("Session Error", "An error occurred during session setup.")); + m.insert(3237093387, ("Authentication Timeout", "Authentication token update timed out. Please log in again.")); + + // Server errors (most common ones with user-friendly messages) + m.insert(3237093634, ("Access Forbidden", "Access to this service is forbidden.")); + m.insert(3237093635, ("Server Timeout", "The server timed out. Please try again.")); + m.insert(3237093636, ("Server Error", "An internal server error occurred. Please try again later.")); + m.insert(3237093637, ("Invalid Request", "The request was invalid.")); + m.insert(3237093639, ("Too Many Sessions", "You have too many active sessions. Please close some sessions and try again.")); + m.insert(3237093643, ("Session Limit Exceeded", "You have reached your session limit. Another session may already be running on your account.")); + m.insert(3237093645, ("Session Time Exceeded", "Your session time has been exceeded.")); + m.insert(3237093646, ("Authentication Failed", "Authentication failed. Please log in again.")); + m.insert(3237093648, ("Session Expired", "Your authentication has expired. Please log in again.")); + m.insert(3237093650, ("Entitlement Error", "You don't have access to this game or service.")); + m.insert(3237093651, ("Game Not Available", "This game is not currently available.")); + m.insert(3237093652, ("Game Not Found", "This game was not found in the library.")); + m.insert(3237093655, ("EULA Required", "You must accept the End User License Agreement to continue.")); + m.insert(3237093656, ("Under Maintenance", "GeForce NOW is currently under maintenance. Please try again later.")); + m.insert(3237093657, ("Service Unavailable", "The service is temporarily unavailable. Please try again later.")); + m.insert(3237093658, ("Steam Guard Required", "Steam Guard authentication is required. Please complete Steam Guard verification.")); + m.insert(3237093659, ("Steam Login Required", "You need to link your Steam account to play this game.")); + m.insert(3237093660, ("Steam Guard Invalid", "Steam Guard code is invalid. Please try again.")); + m.insert(3237093661, ("Steam Profile Private", "Your Steam profile is private. Please make it public or friends-only.")); + m.insert(3237093667, ("Email Not Verified", "Please verify your email address to continue.")); + m.insert(3237093673, ("Game Updating", "This game is currently being updated. Please try again later.")); + m.insert(3237093674, ("Game Not Found", "This game was not found.")); + m.insert(3237093675, ("Insufficient Credits", "You don't have enough credits for this session.")); + m.insert(3237093678, ("Session Taken Over", "Your session was taken over by another device.")); + m.insert(3237093681, ("Session Expired", "Your session has expired.")); + m.insert(3237093682, ("Device Limit Reached", "You have reached the session limit for this device.")); + m.insert(3237093683, ("Region At Capacity", "Your region is currently at capacity. Please try again later.")); + m.insert(3237093684, ("Region Not Supported", "GeForce NOW is not available in your region.")); + m.insert(3237093685, ("Region Banned", "GeForce NOW is not available in your region.")); + m.insert(3237093686, ("Free Tier On Hold", "Free tier is temporarily unavailable in your region.")); + m.insert(3237093687, ("Paid Tier On Hold", "Paid tier is temporarily unavailable in your region.")); + m.insert(3237093688, ("Game Maintenance", "This game is currently under maintenance.")); + m.insert(3237093690, ("No Capacity", "No gaming rigs are available right now. Please try again later or join the queue.")); + m.insert(3237093694, ("Queue Full", "The queue is currently full. Please try again later.")); + m.insert(3237093695, ("Region Not Supported", "Streaming is not supported in your region.")); + m.insert(3237093698, ("Game Not Available", "This game is not available in your region.")); + m.insert(3237093701, ("Queue Abandoned", "Your session in queue was abandoned.")); + m.insert(3237093702, ("Account Terminated", "Your account has been terminated.")); + m.insert(3237093703, ("Queue Maintenance", "The queue was cleared due to maintenance.")); + m.insert(3237093704, ("Zone Maintenance", "This server zone is under maintenance.")); + m.insert(3237093715, ("Session Limit", "Maximum number of sessions reached.")); + m.insert(3237093717, ("No Capacity", "No gaming rigs are available. Please try again later.")); + m.insert(3237093718, ("Playability Level Issue", "Your account's playability level is insufficient. This may mean another session is already running, or there's a subscription issue.")); + m.insert(3237093721, ("Storage Unavailable", "User storage is not available.")); + m.insert(3237093722, ("Storage Error", "GFN storage is not available.")); + + // Cancellation + m.insert(15867905, ("Session Cancelled", "Session setup was cancelled.")); + m.insert(15867906, ("Queue Cancelled", "You left the queue.")); + m.insert(15867907, ("Request Cancelled", "The request was cancelled.")); + m.insert(15867909, ("System Sleep", "Session setup was interrupted by system sleep.")); + m.insert(15868417, ("No Internet", "No internet connection during session setup.")); + + // Network errors + m.insert(3237101580, ("Socket Error", "A socket error occurred. Please check your network.")); + m.insert(3237101581, ("DNS Error", "Failed to resolve server address. Please check your network.")); + m.insert(3237101582, ("Connection Failed", "Failed to connect to the server. Please check your network.")); + m.insert(3237101583, ("SSL Error", "A secure connection error occurred.")); + m.insert(3237101584, ("Connection Timeout", "Connection timed out. Please check your network.")); + m.insert(3237101585, ("Receive Timeout", "Data receive timed out. Please check your network.")); + m.insert(3237101586, ("No Response", "Server not responding. Please try again.")); + m.insert(3237101590, ("Certificate Error", "Server certificate was rejected.")); + + m +}); + +/// Parsed error information from CloudMatch response +#[derive(Debug, Clone)] +pub struct SessionError { + /// HTTP status code (e.g., 403) + pub http_status: u16, + /// CloudMatch status code from requestStatus.statusCode + pub status_code: i32, + /// Status description from requestStatus.statusDescription + pub status_description: Option, + /// Unified error code from requestStatus.unifiedErrorCode + pub unified_error_code: Option, + /// Session error code from session.errorCode + pub session_error_code: Option, + /// Computed GFN error code + pub gfn_error_code: i64, + /// User-friendly title + pub title: String, + /// User-friendly description + pub description: String, +} + +impl SessionError { + /// Parse error from CloudMatch response JSON + pub fn from_response(http_status: u16, response_body: &str) -> Self { + // Try to parse JSON + let json: serde_json::Value = serde_json::from_str(response_body) + .unwrap_or(serde_json::Value::Null); + + // Extract fields + let status_code = json["requestStatus"]["statusCode"] + .as_i64() + .unwrap_or(0) as i32; + + let status_description = json["requestStatus"]["statusDescription"] + .as_str() + .map(|s| s.to_string()); + + let unified_error_code = json["requestStatus"]["unifiedErrorCode"] + .as_i64(); + + let session_error_code = json["session"]["errorCode"] + .as_i64() + .map(|c| c as i32); + + // Compute GFN error code using official client logic + let gfn_error_code = Self::compute_error_code(status_code, unified_error_code); + + // Get user-friendly message + let (title, description) = Self::get_error_message( + gfn_error_code, + &status_description, + http_status, + ); + + SessionError { + http_status, + status_code, + status_description, + unified_error_code, + session_error_code, + gfn_error_code, + title, + description, + } + } + + /// Compute GFN error code from CloudMatch response (matching official client logic) + fn compute_error_code(status_code: i32, unified_error_code: Option) -> i64 { + // Base error code + let mut error_code: i64 = 3237093632; // SessionServerErrorBegin + + // Convert statusCode to error code + if status_code == 1 { + error_code = 15859712; // Success + } else if status_code > 0 && status_code < 255 { + error_code = 3237093632 + status_code as i64; + } + + // Use unifiedErrorCode if available and error_code is generic + if let Some(unified) = unified_error_code { + match error_code { + 3237093632 | 3237093636 | 3237093381 => { + error_code = unified; + } + _ => {} + } + } + + error_code + } + + /// Get user-friendly error message + fn get_error_message( + error_code: i64, + status_description: &Option, + http_status: u16, + ) -> (String, String) { + // Check for known error code + if let Some((title, desc)) = ERROR_MESSAGES.get(&error_code) { + return (title.to_string(), desc.to_string()); + } + + // Parse status description for known patterns + if let Some(desc) = status_description { + let desc_upper = desc.to_uppercase(); + + if desc_upper.contains("INSUFFICIENT_PLAYABILITY") { + return ( + "Session Already Active".to_string(), + "Another session is already running on your account. Please close it first or wait for it to timeout.".to_string() + ); + } + + if desc_upper.contains("SESSION_LIMIT") { + return ( + "Session Limit Exceeded".to_string(), + "You have reached your maximum number of concurrent sessions.".to_string() + ); + } + + if desc_upper.contains("MAINTENANCE") { + return ( + "Under Maintenance".to_string(), + "The service is currently under maintenance. Please try again later.".to_string() + ); + } + + if desc_upper.contains("CAPACITY") || desc_upper.contains("QUEUE") { + return ( + "No Capacity Available".to_string(), + "All gaming rigs are currently in use. Please try again later.".to_string() + ); + } + + if desc_upper.contains("AUTH") || desc_upper.contains("TOKEN") { + return ( + "Authentication Error".to_string(), + "Please log in again.".to_string() + ); + } + + if desc_upper.contains("ENTITLEMENT") { + return ( + "Access Denied".to_string(), + "You don't have access to this game or service.".to_string() + ); + } + } + + // Fallback based on HTTP status + match http_status { + 401 => ("Unauthorized".to_string(), "Please log in again.".to_string()), + 403 => ("Access Denied".to_string(), "Access to this resource was denied.".to_string()), + 404 => ("Not Found".to_string(), "The requested resource was not found.".to_string()), + 429 => ("Too Many Requests".to_string(), "Please wait a moment and try again.".to_string()), + 500..=599 => ("Server Error".to_string(), "A server error occurred. Please try again later.".to_string()), + _ => ("Error".to_string(), format!("An error occurred (HTTP {}).", http_status)), + } + } + + /// Check if this error indicates another session is running + pub fn is_session_conflict(&self) -> bool { + matches!(self.gfn_error_code, + 3237093643 | // SessionLimitExceeded + 3237093682 | // SessionLimitPerDeviceReached + 3237093715 | // MaxSessionNumberLimitExceeded + 3237093718 // SessionInsufficientPlayabilityLevel + ) || self.status_description.as_ref() + .map(|d| d.to_uppercase().contains("INSUFFICIENT_PLAYABILITY")) + .unwrap_or(false) + } + + /// Check if this is a temporary error that might resolve with retry + pub fn is_retryable(&self) -> bool { + matches!(self.gfn_error_code, + 3237089282 | // NetworkError + 3237093635 | // ServerInternalTimeout + 3237093636 | // ServerInternalError + 3237093683 | // ForwardingZoneOutOfCapacity + 3237093690 | // InsufficientVmCapacity + 3237093717 | // SessionRejectedNoCapacity + 3237101584 | // ConnectionTimeout + 3237101585 | // DataReceiveTimeout + 3237101586 // PeerNoResponse + ) + } + + /// Check if user needs to log in again + pub fn needs_reauth(&self) -> bool { + matches!(self.gfn_error_code, + 3237093377 | // AuthTokenNotUpdated + 3237093387 | // AuthTokenUpdateTimeout + 3237093646 | // AuthFailure + 3237093647 | // InvalidAuthenticationMalformed + 3237093648 | // InvalidAuthenticationExpired + 3237093649 | // InvalidAuthenticationNotFound + 3237093668 | // InvalidAuthenticationUnsupportedProtocol + 3237093669 | // InvalidAuthenticationUnknownToken + 3237093670 // InvalidAuthenticationCredentials + ) || self.http_status == 401 + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_parse_insufficient_playability() { + let response = r#"{"session":{"sessionId":"test","errorCode":1},"requestStatus":{"statusCode":86,"statusDescription":"INSUFFICIENT_PLAYABILITY_LEVEL 8192C105","unifiedErrorCode":-2121088763}}"#; + + let error = SessionError::from_response(403, response); + + assert_eq!(error.status_code, 86); + assert_eq!(error.gfn_error_code, 3237093718); // 3237093632 + 86 + assert!(error.is_session_conflict()); + assert_eq!(error.title, "Session Already Active"); + } + + #[test] + fn test_parse_session_limit() { + let response = r#"{"requestStatus":{"statusCode":11,"statusDescription":"SESSION_LIMIT_EXCEEDED"}}"#; + + let error = SessionError::from_response(403, response); + + assert_eq!(error.gfn_error_code, 3237093643); // 3237093632 + 11 + assert!(error.is_session_conflict()); + } +} diff --git a/opennow-streamer/src/api/mod.rs b/opennow-streamer/src/api/mod.rs index 6b3183a..8d9f2b9 100644 --- a/opennow-streamer/src/api/mod.rs +++ b/opennow-streamer/src/api/mod.rs @@ -4,10 +4,12 @@ mod cloudmatch; mod games; +pub mod error_codes; #[allow(unused_imports)] pub use cloudmatch::*; pub use games::*; +pub use error_codes::SessionError; use reqwest::Client; use parking_lot::RwLock; diff --git a/opennow-streamer/src/app/config.rs b/opennow-streamer/src/app/config.rs index 55d6a21..e2e5d0c 100644 --- a/opennow-streamer/src/app/config.rs +++ b/opennow-streamer/src/app/config.rs @@ -88,7 +88,7 @@ impl Default for Settings { resolution: "1920x1080".to_string(), fps: 60, codec: VideoCodec::H264, - max_bitrate_mbps: 50, + max_bitrate_mbps: 150, // Audio audio_codec: AudioCodec::Opus, @@ -295,8 +295,7 @@ impl VideoCodec { /// Get all available codecs pub fn all() -> &'static [VideoCodec] { - // AV1 disabled for now due to color space issues with NVIDIA CUVID decoder - &[VideoCodec::H264, VideoCodec::H265] + &[VideoCodec::H264, VideoCodec::H265, VideoCodec::AV1] } } diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 76d0ece..6ebeb30 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -12,6 +12,7 @@ use winit::window::{Window, WindowAttributes, Fullscreen, CursorGrabMode}; #[cfg(target_os = "macos")] use winit::raw_window_handle::{HasWindowHandle, RawWindowHandle}; +use wgpu::util::DeviceExt; use crate::app::{App, AppState, UiAction, GamesTab, SettingChange, GameInfo}; use crate::app::session::ActiveSessionInfo; @@ -22,6 +23,9 @@ use super::shaders::{VIDEO_SHADER, NV12_SHADER}; use super::screens::{render_login_screen, render_session_screen, render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog}; use std::collections::HashMap; +// Color conversion is now hardcoded in the shader using official GFN client BT.709 values +// This eliminates potential initialization bugs with uniform buffers + /// Main renderer pub struct Renderer { window: Arc, @@ -2078,6 +2082,18 @@ impl Renderer { }); }); + // Hover effect - green glow + let card_rect = response.response.rect; + if ui.rect_contains_pointer(card_rect) { + ui.ctx().set_cursor_icon(egui::CursorIcon::PointingHand); + ui.painter().rect_stroke( + card_rect, + 8.0, + egui::Stroke::new(2.0, egui::Color32::from_rgb(118, 185, 0)), + egui::StrokeKind::Outside, + ); + } + if response.response.interact(egui::Sense::click()).clicked() { actions.push(UiAction::OpenGamePopup(game_for_click)); } @@ -2107,63 +2123,167 @@ fn render_stats_panel(ctx: &egui::Context, stats: &crate::media::StreamStats, po .show(ctx, |ui| { egui::Frame::new() .fill(Color32::from_rgba_unmultiplied(0, 0, 0, 200)) - .corner_radius(6.0) - .inner_margin(egui::Margin::same(10)) + .corner_radius(4.0) + .inner_margin(8.0) .show(ui, |ui| { - ui.horizontal(|ui| { - // Video stats (left) - ui.vertical(|ui| { - ui.label( - RichText::new("VIDEO") - .font(FontId::monospace(10.0)) - .color(Color32::from_rgb(120, 200, 120)) - ); - ui.label( - RichText::new(&stats.resolution) - .font(FontId::monospace(11.0)) - .color(Color32::WHITE) - ); - ui.label( - RichText::new(format!("{:.1} fps", stats.fps)) - .font(FontId::monospace(11.0)) - .color(Color32::WHITE) - ); - ui.label( - RichText::new(&stats.codec) - .font(FontId::monospace(11.0)) - .color(Color32::LIGHT_GRAY) - ); - }); + ui.set_min_width(200.0); - ui.add_space(20.0); + // Resolution + let res_text = if stats.resolution.is_empty() { + "Connecting...".to_string() + } else { + stats.resolution.clone() + }; - // Network stats (right) - ui.vertical(|ui| { - ui.label( - RichText::new("NETWORK") - .font(FontId::monospace(10.0)) - .color(Color32::from_rgb(120, 120, 200)) - ); - ui.label( - RichText::new(format!("{:.1} Mbps", stats.bitrate_mbps)) - .font(FontId::monospace(11.0)) - .color(Color32::WHITE) - ); + ui.label( + RichText::new(res_text) + .font(FontId::monospace(13.0)) + .color(Color32::WHITE) + ); + + // Decoded FPS vs Render FPS (shows if renderer is bottlenecked) + let decode_fps = stats.fps; + let render_fps = stats.render_fps; + let target_fps = stats.target_fps as f32; + + // Decode FPS color + let decode_color = if target_fps > 0.0 { + let ratio = decode_fps / target_fps; + if ratio >= 0.8 { Color32::GREEN } + else if ratio >= 0.5 { Color32::YELLOW } + else { Color32::from_rgb(255, 100, 100) } + } else { Color32::WHITE }; + + // Render FPS color (critical - this is what you actually see) + let render_color = if target_fps > 0.0 { + let ratio = render_fps / target_fps; + if ratio >= 0.8 { Color32::GREEN } + else if ratio >= 0.5 { Color32::YELLOW } + else { Color32::from_rgb(255, 100, 100) } + } else { Color32::WHITE }; + + // Show both FPS values + ui.horizontal(|ui| { + ui.label( + RichText::new(format!("Decode: {:.0}", decode_fps)) + .font(FontId::monospace(11.0)) + .color(decode_color) + ); + ui.label( + RichText::new(format!(" | Render: {:.0}", render_fps)) + .font(FontId::monospace(11.0)) + .color(render_color) + ); + if stats.target_fps > 0 { ui.label( - RichText::new(format!("{:.1}ms", stats.latency_ms)) + RichText::new(format!(" / {} fps", stats.target_fps)) .font(FontId::monospace(11.0)) - .color(Color32::WHITE) + .color(Color32::GRAY) ); - // Show packet loss if relevant - if stats.packet_loss > 0.0 { - ui.label( - RichText::new(format!("{:.1}% loss", stats.packet_loss)) - .font(FontId::monospace(11.0)) - .color(Color32::from_rgb(255, 100, 100)) - ); - } - }); + } }); + + // Codec and bitrate + if !stats.codec.is_empty() { + ui.label( + RichText::new(format!( + "{} | {:.1} Mbps", + stats.codec, + stats.bitrate_mbps + )) + .font(FontId::monospace(11.0)) + .color(Color32::LIGHT_GRAY) + ); + } + + // Latency (decode pipeline) + let latency_color = if stats.latency_ms < 30.0 { + Color32::GREEN + } else if stats.latency_ms < 60.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("Decode: {:.0} ms", stats.latency_ms)) + .font(FontId::monospace(11.0)) + .color(latency_color) + ); + + // Input latency (event creation to transmission) + if stats.input_latency_ms > 0.0 { + let input_color = if stats.input_latency_ms < 2.0 { + Color32::GREEN + } else if stats.input_latency_ms < 5.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("Input: {:.1} ms", stats.input_latency_ms)) + .font(FontId::monospace(11.0)) + .color(input_color) + ); + } + + if stats.packet_loss > 0.0 { + let loss_color = if stats.packet_loss < 1.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("Packet Loss: {:.1}%", stats.packet_loss)) + .font(FontId::monospace(11.0)) + .color(loss_color) + ); + } + + // Decode and render times + if stats.decode_time_ms > 0.0 || stats.render_time_ms > 0.0 { + ui.label( + RichText::new(format!( + "Decode: {:.1} ms | Render: {:.1} ms", + stats.decode_time_ms, + stats.render_time_ms + )) + .font(FontId::monospace(10.0)) + .color(Color32::GRAY) + ); + } + + // Frame stats + if stats.frames_received > 0 { + ui.label( + RichText::new(format!( + "Frames: {} rx, {} dec, {} drop", + stats.frames_received, + stats.frames_decoded, + stats.frames_dropped + )) + .font(FontId::monospace(10.0)) + .color(Color32::DARK_GRAY) + ); + } + + // GPU and server info + if !stats.gpu_type.is_empty() || !stats.server_region.is_empty() { + let info = format!( + "{}{}{}", + stats.gpu_type, + if !stats.gpu_type.is_empty() && !stats.server_region.is_empty() { " | " } else { "" }, + stats.server_region + ); + + ui.label( + RichText::new(info) + .font(FontId::monospace(10.0)) + .color(Color32::DARK_GRAY) + ); + } }); }); } diff --git a/opennow-streamer/src/gui/screens/dialogs.rs b/opennow-streamer/src/gui/screens/dialogs.rs deleted file mode 100644 index bc3f46d..0000000 --- a/opennow-streamer/src/gui/screens/dialogs.rs +++ /dev/null @@ -1,606 +0,0 @@ -//! Dialog Components -//! -//! Modal dialogs for settings, session conflicts, and warnings. - -use crate::app::{GameInfo, Settings, ServerInfo, ServerStatus, UiAction, SettingChange}; -use crate::app::session::ActiveSessionInfo; - -/// Render the settings modal -pub fn render_settings_modal( - ctx: &egui::Context, - settings: &Settings, - servers: &[ServerInfo], - selected_server_index: usize, - auto_server_selection: bool, - ping_testing: bool, - actions: &mut Vec, -) { - let modal_width = 500.0; - let modal_height = 600.0; - - // Dark overlay - egui::Area::new(egui::Id::new("settings_overlay")) - .fixed_pos(egui::pos2(0.0, 0.0)) - .order(egui::Order::Middle) - .show(ctx, |ui| { - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - ui.allocate_response(screen_rect.size(), egui::Sense::click()); - ui.painter().rect_filled( - screen_rect, - 0.0, - egui::Color32::from_rgba_unmultiplied(0, 0, 0, 180), - ); - }); - - // Modal window - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - let modal_pos = egui::pos2( - (screen_rect.width() - modal_width) / 2.0, - (screen_rect.height() - modal_height) / 2.0, - ); - - egui::Area::new(egui::Id::new("settings_modal")) - .fixed_pos(modal_pos) - .order(egui::Order::Foreground) - .show(ctx, |ui| { - egui::Frame::new() - .fill(egui::Color32::from_rgb(28, 28, 35)) - .corner_radius(12.0) - .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) - .inner_margin(egui::Margin::same(20)) - .show(ui, |ui| { - ui.set_min_size(egui::vec2(modal_width, modal_height)); - - // Header with close button - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Settings") - .size(20.0) - .strong() - .color(egui::Color32::WHITE) - ); - - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - let close_btn = egui::Button::new( - egui::RichText::new("✕") - .size(16.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::TRANSPARENT) - .corner_radius(4.0); - - if ui.add(close_btn).clicked() { - actions.push(UiAction::ToggleSettingsModal); - } - }); - }); - - ui.add_space(15.0); - ui.separator(); - ui.add_space(15.0); - - egui::ScrollArea::vertical() - .max_height(modal_height - 100.0) - .show(ui, |ui| { - // === Stream Settings Section === - ui.label( - egui::RichText::new("Stream Settings") - .size(16.0) - .strong() - .color(egui::Color32::WHITE) - ); - ui.add_space(15.0); - - egui::Grid::new("settings_grid") - .num_columns(2) - .spacing([20.0, 12.0]) - .min_col_width(100.0) - .show(ui, |ui| { - // Resolution dropdown - ui.label( - egui::RichText::new("Resolution") - .size(13.0) - .color(egui::Color32::GRAY) - ); - egui::ComboBox::from_id_salt("resolution_combo") - .selected_text(&settings.resolution) - .width(180.0) - .show_ui(ui, |ui| { - for res in crate::app::config::RESOLUTIONS { - if ui.selectable_label(settings.resolution == res.0, format!("{} ({})", res.0, res.1)).clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res.0.to_string()))); - } - } - }); - ui.end_row(); - - // FPS dropdown - ui.label( - egui::RichText::new("FPS") - .size(13.0) - .color(egui::Color32::GRAY) - ); - egui::ComboBox::from_id_salt("fps_combo") - .selected_text(format!("{} FPS", settings.fps)) - .width(180.0) - .show_ui(ui, |ui| { - for fps in crate::app::config::FPS_OPTIONS { - if ui.selectable_label(settings.fps == *fps, format!("{} FPS", fps)).clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Fps(*fps))); - } - } - }); - ui.end_row(); - - // Codec dropdown - ui.label( - egui::RichText::new("Video Codec") - .size(13.0) - .color(egui::Color32::GRAY) - ); - egui::ComboBox::from_id_salt("codec_combo") - .selected_text(settings.codec.display_name()) - .width(180.0) - .show_ui(ui, |ui| { - for codec in crate::app::config::VideoCodec::all() { - if ui.selectable_label(settings.codec == *codec, codec.display_name()).clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Codec(*codec))); - } - } - }); - ui.end_row(); - - // Max Bitrate slider - ui.label( - egui::RichText::new("Max Bitrate") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.horizontal(|ui| { - ui.label( - egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)) - .size(13.0) - .color(egui::Color32::WHITE) - ); - ui.label( - egui::RichText::new("(200 = unlimited)") - .size(10.0) - .color(egui::Color32::GRAY) - ); - }); - ui.end_row(); - }); - - ui.add_space(25.0); - ui.separator(); - ui.add_space(15.0); - - // === Server Region Section === - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Server Region") - .size(16.0) - .strong() - .color(egui::Color32::WHITE) - ); - - ui.add_space(20.0); - - // Ping test button - let ping_btn_text = if ping_testing { "Testing..." } else { "Test Ping" }; - let ping_btn = egui::Button::new( - egui::RichText::new(ping_btn_text) - .size(11.0) - .color(egui::Color32::WHITE) - ) - .fill(if ping_testing { - egui::Color32::from_rgb(80, 80, 100) - } else { - egui::Color32::from_rgb(60, 120, 60) - }) - .corner_radius(4.0); - - if ui.add_sized([80.0, 24.0], ping_btn).clicked() && !ping_testing { - actions.push(UiAction::StartPingTest); - } - - if ping_testing { - ui.spinner(); - } - }); - ui.add_space(10.0); - - // Server dropdown with Auto option and best server highlighted - let selected_text = if auto_server_selection { - // Find best server for display - let best = servers.iter() - .filter(|s| s.status == ServerStatus::Online && s.ping_ms.is_some()) - .min_by_key(|s| s.ping_ms.unwrap_or(9999)); - if let Some(best_server) = best { - format!("Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) - } else { - "Auto (Best Ping)".to_string() - } - } else { - servers.get(selected_server_index) - .map(|s| { - if let Some(ping) = s.ping_ms { - format!("{} ({}ms)", s.name, ping) - } else { - s.name.clone() - } - }) - .unwrap_or_else(|| "Select a server...".to_string()) - }; - - egui::ComboBox::from_id_salt("server_combo") - .selected_text(selected_text) - .width(300.0) - .show_ui(ui, |ui| { - // Auto option at the top - let auto_label = { - let best = servers.iter() - .filter(|s| s.status == ServerStatus::Online && s.ping_ms.is_some()) - .min_by_key(|s| s.ping_ms.unwrap_or(9999)); - if let Some(best_server) = best { - format!("✨ Auto: {} ({}ms)", best_server.name, best_server.ping_ms.unwrap_or(0)) - } else { - "✨ Auto (Best Ping)".to_string() - } - }; - - if ui.selectable_label(auto_server_selection, auto_label).clicked() { - actions.push(UiAction::SetAutoServerSelection(true)); - } - - ui.separator(); - ui.add_space(5.0); - - // Group by region - let regions = ["Europe", "North America", "Canada", "Asia-Pacific", "Other"]; - for region in regions { - let region_servers: Vec<_> = servers - .iter() - .enumerate() - .filter(|(_, s)| s.region == region) - .collect(); - - if region_servers.is_empty() { - continue; - } - - ui.label( - egui::RichText::new(region) - .size(11.0) - .strong() - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - - for (idx, server) in region_servers { - let is_selected = !auto_server_selection && idx == selected_server_index; - let ping_text = match server.status { - ServerStatus::Online => { - server.ping_ms.map(|p| format!(" ({}ms)", p)).unwrap_or_default() - } - ServerStatus::Testing => " (testing...)".to_string(), - ServerStatus::Offline => " (offline)".to_string(), - ServerStatus::Unknown => "".to_string(), - }; - - let label = format!(" {}{}", server.name, ping_text); - if ui.selectable_label(is_selected, label).clicked() { - actions.push(UiAction::SelectServer(idx)); - } - } - - ui.add_space(5.0); - } - }); - - ui.add_space(20.0); - }); - }); - }); -} - -/// Render the session conflict dialog -pub fn render_session_conflict_dialog( - ctx: &egui::Context, - active_sessions: &[ActiveSessionInfo], - pending_game: Option<&GameInfo>, - actions: &mut Vec, -) { - let modal_width = 500.0; - let modal_height = 300.0; - - egui::Area::new(egui::Id::new("session_conflict_overlay")) - .fixed_pos(egui::pos2(0.0, 0.0)) - .order(egui::Order::Middle) - .show(ctx, |ui| { - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - ui.allocate_response(screen_rect.size(), egui::Sense::click()); - ui.painter().rect_filled( - screen_rect, - 0.0, - egui::Color32::from_rgba_unmultiplied(0, 0, 0, 200), - ); - }); - - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - let modal_pos = egui::pos2( - (screen_rect.width() - modal_width) / 2.0, - (screen_rect.height() - modal_height) / 2.0, - ); - - egui::Area::new(egui::Id::new("session_conflict_modal")) - .fixed_pos(modal_pos) - .order(egui::Order::Foreground) - .show(ctx, |ui| { - egui::Frame::new() - .fill(egui::Color32::from_rgb(28, 28, 35)) - .corner_radius(12.0) - .stroke(egui::Stroke::new(1.0, egui::Color32::from_rgb(60, 60, 75))) - .inner_margin(egui::Margin::same(20)) - .show(ui, |ui| { - ui.set_min_size(egui::vec2(modal_width, modal_height)); - - ui.label( - egui::RichText::new("⚠ Active Session Detected") - .size(20.0) - .strong() - .color(egui::Color32::from_rgb(255, 200, 80)) - ); - - ui.add_space(15.0); - - if let Some(session) = active_sessions.first() { - ui.label( - egui::RichText::new("You have an active GFN session running:") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - - ui.add_space(10.0); - - egui::Frame::new() - .fill(egui::Color32::from_rgb(40, 40, 50)) - .corner_radius(8.0) - .inner_margin(egui::Margin::same(12)) - .show(ui, |ui| { - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("App ID:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(format!("{}", session.app_id)) - .size(13.0) - .color(egui::Color32::WHITE) - ); - }); - - if let Some(ref gpu) = session.gpu_type { - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("GPU:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(gpu) - .size(13.0) - .color(egui::Color32::WHITE) - ); - }); - } - - if let Some(ref res) = session.resolution { - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Resolution:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(format!("{} @ {}fps", res, session.fps.unwrap_or(60))) - .size(13.0) - .color(egui::Color32::WHITE) - ); - }); - } - - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Status:") - .size(13.0) - .color(egui::Color32::GRAY) - ); - let status_text = match session.status { - 2 => "Ready", - 3 => "Running", - _ => "Unknown", - }; - ui.label( - egui::RichText::new(status_text) - .size(13.0) - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - }); - }); - - ui.add_space(15.0); - - if pending_game.is_some() { - ui.label( - egui::RichText::new("GFN only allows one session at a time. You can either:") - .size(13.0) - .color(egui::Color32::LIGHT_GRAY) - ); - } else { - ui.label( - egui::RichText::new("What would you like to do?") - .size(13.0) - .color(egui::Color32::LIGHT_GRAY) - ); - } - - ui.add_space(15.0); - - ui.vertical_centered(|ui| { - let resume_btn = egui::Button::new( - egui::RichText::new("Resume Existing Session") - .size(14.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::from_rgb(118, 185, 0)) - .min_size(egui::vec2(200.0, 35.0)); - - if ui.add(resume_btn).clicked() { - actions.push(UiAction::ResumeSession(session.clone())); - } - - ui.add_space(8.0); - - if let Some(game) = pending_game { - let terminate_btn = egui::Button::new( - egui::RichText::new(format!("End Session & Launch \"{}\"", game.title)) - .size(14.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::from_rgb(220, 60, 60)) - .min_size(egui::vec2(200.0, 35.0)); - - if ui.add(terminate_btn).clicked() { - actions.push(UiAction::TerminateAndLaunch(session.session_id.clone(), game.clone())); - } - - ui.add_space(8.0); - } - - let cancel_btn = egui::Button::new( - egui::RichText::new("Cancel") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ) - .fill(egui::Color32::from_rgb(60, 60, 75)) - .min_size(egui::vec2(200.0, 35.0)); - - if ui.add(cancel_btn).clicked() { - actions.push(UiAction::CloseSessionConflict); - } - }); - } - }); - }); -} - -/// Render the AV1 hardware warning dialog -pub fn render_av1_warning_dialog( - ctx: &egui::Context, - actions: &mut Vec, -) { - let modal_width = 450.0; - let modal_height = 280.0; - - // Dark overlay - egui::Area::new(egui::Id::new("av1_warning_overlay")) - .fixed_pos(egui::pos2(0.0, 0.0)) - .order(egui::Order::Foreground) - .show(ctx, |ui| { - #[allow(deprecated)] - let screen_rect = ctx.screen_rect(); - let overlay_rect = egui::Rect::from_min_size( - egui::pos2(0.0, 0.0), - screen_rect.size() - ); - - ui.painter().rect_filled( - overlay_rect, - 0.0, - egui::Color32::from_rgba_unmultiplied(0, 0, 0, 200) - ); - - // Modal window - let modal_pos = egui::pos2( - (screen_rect.width() - modal_width) / 2.0, - (screen_rect.height() - modal_height) / 2.0 - ); - - egui::Area::new(egui::Id::new("av1_warning_modal")) - .fixed_pos(modal_pos) - .order(egui::Order::Foreground) - .show(ctx, |ui| { - egui::Frame::new() - .fill(egui::Color32::from_rgb(35, 35, 45)) - .corner_radius(12.0) - .inner_margin(egui::Margin::same(25)) - .show(ui, |ui| { - ui.set_width(modal_width - 50.0); - - // Warning icon and title - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("⚠") - .size(28.0) - .color(egui::Color32::from_rgb(255, 180, 0)) - ); - ui.add_space(10.0); - ui.label( - egui::RichText::new("AV1 Hardware Not Detected") - .size(20.0) - .strong() - .color(egui::Color32::WHITE) - ); - }); - - ui.add_space(20.0); - - // Warning message - ui.label( - egui::RichText::new( - "Your system does not appear to have hardware AV1 decoding support. \ - AV1 requires:\n\n\ - • NVIDIA RTX 30 series or newer\n\ - • Intel 11th Gen (Tiger Lake) or newer\n\ - • AMD RX 6000 series or newer (Linux)\n\ - • Apple M3 or newer (macOS)" - ) - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - - ui.add_space(15.0); - - ui.label( - egui::RichText::new( - "Software decoding will be used, which may cause high CPU usage and poor performance." - ) - .size(13.0) - .color(egui::Color32::from_rgb(255, 150, 100)) - ); - - ui.add_space(25.0); - - // Buttons - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - let ok_btn = egui::Button::new( - egui::RichText::new("I Understand") - .size(14.0) - .color(egui::Color32::WHITE) - ) - .fill(egui::Color32::from_rgb(118, 185, 0)) - .min_size(egui::vec2(130.0, 35.0)); - - if ui.add(ok_btn).clicked() { - actions.push(UiAction::CloseAV1Warning); - } - }); - }); - }); - }); -} diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs index 89097b5..6b91941 100644 --- a/opennow-streamer/src/gui/screens/mod.rs +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -1,11 +1,358 @@ -//! UI Screens +//! Screen Components //! -//! Standalone UI rendering functions for different application screens. +//! UI screens and dialogs for the application. mod login; mod session; -mod dialogs; pub use login::render_login_screen; pub use session::render_session_screen; -pub use dialogs::{render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog}; + +use crate::app::{UiAction, Settings, GameInfo, ServerInfo, SettingChange}; +use crate::app::config::{RESOLUTIONS, FPS_OPTIONS}; +use crate::app::session::ActiveSessionInfo; + +/// Render the settings modal with bitrate slider and other options +pub fn render_settings_modal( + ctx: &egui::Context, + settings: &Settings, + servers: &[ServerInfo], + selected_server_index: usize, + auto_server_selection: bool, + ping_testing: bool, + actions: &mut Vec, +) { + egui::Window::new("Settings") + .collapsible(false) + .resizable(false) + .fixed_size([450.0, 400.0]) + .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) + .show(ctx, |ui| { + egui::ScrollArea::vertical().show(ui, |ui| { + ui.vertical(|ui| { + // === Video Settings === + ui.label( + egui::RichText::new("Video") + .size(16.0) + .strong() + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + ui.add_space(8.0); + + // Max Bitrate slider + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Max Bitrate") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + ui.label( + egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)) + .size(14.0) + .color(egui::Color32::WHITE) + ); + }); + }); + + let mut bitrate = settings.max_bitrate_mbps as f32; + let slider = egui::Slider::new(&mut bitrate, 10.0..=200.0) + .show_value(false) + .step_by(5.0); + if ui.add(slider).changed() { + actions.push(UiAction::UpdateSetting(SettingChange::MaxBitrate(bitrate as u32))); + } + + ui.add_space(4.0); + ui.label( + egui::RichText::new("Higher bitrate = better quality, requires faster connection") + .size(11.0) + .color(egui::Color32::GRAY) + ); + + ui.add_space(16.0); + + // Resolution selection + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Resolution") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + // Find display name for current resolution + let current_display = RESOLUTIONS.iter() + .find(|(res, _)| *res == settings.resolution) + .map(|(_, name)| *name) + .unwrap_or(&settings.resolution); + + egui::ComboBox::from_id_salt("resolution_combo") + .selected_text(current_display) + .show_ui(ui, |ui| { + for (res, name) in RESOLUTIONS { + if ui.selectable_label(settings.resolution == *res, *name).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res.to_string()))); + } + } + }); + }); + }); + + ui.add_space(12.0); + + // FPS selection + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Frame Rate") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + egui::ComboBox::from_id_salt("fps_combo") + .selected_text(format!("{} FPS", settings.fps)) + .show_ui(ui, |ui| { + for &fps in FPS_OPTIONS { + if ui.selectable_label(settings.fps == fps, format!("{} FPS", fps)).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Fps(fps))); + } + } + }); + }); + }); + + ui.add_space(12.0); + + // Codec selection + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Video Codec") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + let codec_text = match settings.codec { + crate::app::VideoCodec::H264 => "H.264", + crate::app::VideoCodec::H265 => "H.265", + crate::app::VideoCodec::AV1 => "AV1", + }; + egui::ComboBox::from_id_salt("codec_combo") + .selected_text(codec_text) + .show_ui(ui, |ui| { + if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::H264), "H.264").clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::H264))); + } + if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::H265), "H.265").clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::H265))); + } + if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::AV1), "AV1").clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::AV1))); + } + }); + }); + }); + + ui.add_space(20.0); + ui.separator(); + ui.add_space(12.0); + + // === Server Selection === + ui.label( + egui::RichText::new("Server") + .size(16.0) + .strong() + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + ui.add_space(8.0); + + // Auto selection toggle + let mut auto_select = auto_server_selection; + if ui.checkbox(&mut auto_select, "Auto-select best server").changed() { + actions.push(UiAction::SetAutoServerSelection(auto_select)); + } + + if !auto_server_selection && !servers.is_empty() { + ui.add_space(8.0); + + // Server dropdown + let current_server = servers.get(selected_server_index) + .map(|s| format!("{} ({}ms)", s.name, s.ping_ms.unwrap_or(0))) + .unwrap_or_else(|| "Select server".to_string()); + + egui::ComboBox::from_id_salt("server_combo") + .selected_text(current_server) + .width(300.0) + .show_ui(ui, |ui| { + for (i, server) in servers.iter().enumerate() { + let ping_str = server.ping_ms + .map(|p| format!(" ({}ms)", p)) + .unwrap_or_default(); + let label = format!("{}{}", server.name, ping_str); + if ui.selectable_label(i == selected_server_index, label).clicked() { + actions.push(UiAction::SelectServer(i)); + } + } + }); + + // Test ping button + ui.add_space(8.0); + if ping_testing { + ui.horizontal(|ui| { + ui.spinner(); + ui.label("Testing ping..."); + }); + } else if ui.button("Test Ping").clicked() { + actions.push(UiAction::StartPingTest); + } + } + + ui.add_space(20.0); + + // Close button + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + if ui.button("Close").clicked() { + actions.push(UiAction::ToggleSettingsModal); + } + }); + }); + }); + }); +} + +/// Render session conflict dialog when user has active sessions +pub fn render_session_conflict_dialog( + ctx: &egui::Context, + active_sessions: &[ActiveSessionInfo], + pending_game: Option<&GameInfo>, + actions: &mut Vec, +) { + egui::Window::new("Active Session") + .collapsible(false) + .resizable(false) + .fixed_size([400.0, 250.0]) + .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) + .show(ctx, |ui| { + ui.vertical_centered(|ui| { + ui.add_space(10.0); + + ui.label( + egui::RichText::new("You have an active session") + .size(18.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.add_space(15.0); + + // Show active session info + if let Some(session) = active_sessions.first() { + ui.label( + egui::RichText::new(format!("Session ID: {}", &session.session_id)) + .size(14.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + ); + + ui.add_space(5.0); + + if let Some(ref server_ip) = session.server_ip { + ui.label( + egui::RichText::new(format!("Server: {}", server_ip)) + .size(12.0) + .color(egui::Color32::GRAY) + ); + } + } + + ui.add_space(25.0); + + ui.horizontal(|ui| { + // Resume existing session + let resume_btn = egui::Button::new( + egui::RichText::new("Resume Session") + .size(14.0) + ) + .fill(egui::Color32::from_rgb(70, 130, 70)) + .min_size(egui::vec2(130.0, 35.0)); + + if ui.add(resume_btn).clicked() { + if let Some(session) = active_sessions.first() { + actions.push(UiAction::ResumeSession(session.clone())); + } + actions.push(UiAction::CloseSessionConflict); + } + + ui.add_space(10.0); + + // Terminate and start new + if let Some(game) = pending_game { + let new_btn = egui::Button::new( + egui::RichText::new("Start New Game") + .size(14.0) + ) + .fill(egui::Color32::from_rgb(130, 70, 70)) + .min_size(egui::vec2(130.0, 35.0)); + + if ui.add(new_btn).clicked() { + if let Some(session) = active_sessions.first() { + actions.push(UiAction::TerminateAndLaunch(session.session_id.clone(), game.clone())); + } + actions.push(UiAction::CloseSessionConflict); + } + } + }); + + ui.add_space(15.0); + + // Cancel + if ui.button("Cancel").clicked() { + actions.push(UiAction::CloseSessionConflict); + } + }); + }); +} + +/// Render AV1 hardware warning dialog +pub fn render_av1_warning_dialog( + ctx: &egui::Context, + actions: &mut Vec, +) { + egui::Window::new("AV1 Not Supported") + .collapsible(false) + .resizable(false) + .fixed_size([400.0, 180.0]) + .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) + .show(ctx, |ui| { + ui.vertical_centered(|ui| { + ui.add_space(15.0); + + ui.label( + egui::RichText::new("⚠ AV1 Hardware Decoding Not Available") + .size(16.0) + .strong() + .color(egui::Color32::from_rgb(255, 180, 50)) + ); + + ui.add_space(15.0); + + ui.label( + egui::RichText::new("Your GPU does not support AV1 hardware decoding.\nAV1 requires an NVIDIA RTX 30 series or newer GPU.") + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + ui.add_space(20.0); + + ui.horizontal(|ui| { + if ui.button("Switch to H.265").clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::H265))); + actions.push(UiAction::CloseAV1Warning); + } + + ui.add_space(10.0); + + if ui.button("Close").clicked() { + actions.push(UiAction::CloseAV1Warning); + } + }); + }); + }); +} diff --git a/opennow-streamer/src/gui/shaders.rs b/opennow-streamer/src/gui/shaders.rs index f316a6b..87ff0bf 100644 --- a/opennow-streamer/src/gui/shaders.rs +++ b/opennow-streamer/src/gui/shaders.rs @@ -1,10 +1,10 @@ //! GPU Shaders for video rendering //! //! WGSL shaders for YUV to RGB conversion on the GPU. +//! BT.709 limited range conversion matching NVIDIA's H.265 encoder output. -/// WGSL shader for full-screen video quad with YUV to RGB conversion -/// Uses 3 separate textures (Y, U, V) for GPU-accelerated color conversion -/// This eliminates the CPU bottleneck of converting ~600M pixels/sec at 1440p165 +/// WGSL shader for YUV420P format (3 separate planes) +/// Fallback path when NV12 is not available pub const VIDEO_SHADER: &str = r#" struct VertexOutput { @builtin(position) position: vec4, @@ -51,34 +51,29 @@ var video_sampler: sampler; @fragment fn fs_main(input: VertexOutput) -> @location(0) vec4 { // Sample Y, U, V planes - // Y is full resolution, U/V are half resolution (4:2:0 subsampling) - // The sampler handles the upscaling of U/V automatically let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; let u_raw = textureSample(u_texture, video_sampler, input.tex_coord).r; let v_raw = textureSample(v_texture, video_sampler, input.tex_coord).r; - // BT.709 YUV to RGB conversion (limited/TV range) - // Video uses limited range: Y [16-235], UV [16-240] - // First convert from limited range to full range - let y = (y_raw - 0.0625) * 1.1644; // (Y - 16/255) * (255/219) - let u = (u_raw - 0.5) * 1.1384; // (U - 128/255) * (255/224) - let v = (v_raw - 0.5) * 1.1384; // (V - 128/255) * (255/224) - - // BT.709 color matrix (HD content: 720p and above) - // R = Y + 1.5748 * V - // G = Y - 0.1873 * U - 0.4681 * V - // B = Y + 1.8556 * U - let r = y + 1.5748 * v; - let g = y - 0.1873 * u - 0.4681 * v; - let b = y + 1.8556 * u; + // BT.709 Limited Range (TV range: Y 16-235, UV 16-240) + // Despite CUVID reporting "Full", NVIDIA's H.265 encoder typically outputs Limited range + // Scale from limited [16/255, 235/255] to full [0, 1] + let y = (y_raw - 0.0627) * 1.164; // (y - 16/255) * (255/219) + let u = (u_raw - 0.5) * 1.138; // (u - 128/255) * (255/224) + let v = (v_raw - 0.5) * 1.138; + + // BT.709 color matrix + let r = y + 1.793 * v; + let g = y - 0.213 * u - 0.533 * v; + let b = y + 2.112 * u; return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); } "#; -/// WGSL shader for NV12 format (VideoToolbox on macOS, CUVID on Windows) -/// NV12 has Y plane (R8) and interleaved UV plane (Rg8) -/// This shader deinterleaves UV on the GPU - much faster than CPU scaler +/// WGSL shader for NV12 format (CUVID on Windows, VideoToolbox on macOS) +/// Primary GPU path - Y plane (R8) + interleaved UV plane (Rg8) +/// BT.709 limited range YUV to RGB conversion pub const NV12_SHADER: &str = r#" struct VertexOutput { @builtin(position) position: vec4, @@ -124,21 +119,21 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4 { // Sample Y (full res) and UV (half res, interleaved) let y_raw = textureSample(y_texture, video_sampler, input.tex_coord).r; let uv = textureSample(uv_texture, video_sampler, input.tex_coord); - // NVIDIA CUVID outputs NV12 with standard UV order (U in R, V in G) - // but some decoders output NV21 (V in R, U in G) - try swapping if colors are wrong - let u_raw = uv.r; // U is in red channel (first byte of pair) - let v_raw = uv.g; // V is in green channel (second byte of pair) - - // BT.709 YUV to RGB conversion (full range for NVIDIA CUVID) - // NVIDIA hardware decoders typically output full range [0-255] - let y = y_raw; - let u = u_raw - 0.5; // Center around 0 (128/255 = 0.5) - let v = v_raw - 0.5; // Center around 0 - - // BT.709 color matrix (HD content: 720p and above) - let r = y + 1.5748 * v; - let g = y - 0.1873 * u - 0.4681 * v; - let b = y + 1.8556 * u; + + // NV12 format: U in R channel, V in G channel + let u_raw = uv.r; + let v_raw = uv.g; + + // BT.709 Limited Range (TV range: Y 16-235, UV 16-240) + // Despite CUVID reporting "Full", NVIDIA's H.265 encoder typically outputs Limited range + let y = (y_raw - 0.0627) * 1.164; + let u = (u_raw - 0.5) * 1.138; + let v = (v_raw - 0.5) * 1.138; + + // BT.709 color matrix + let r = y + 1.793 * v; + let g = y - 0.213 * u - 0.533 * v; + let b = y + 2.112 * u; return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); } diff --git a/opennow-streamer/src/input/controller.rs b/opennow-streamer/src/input/controller.rs new file mode 100644 index 0000000..6fd0ae2 --- /dev/null +++ b/opennow-streamer/src/input/controller.rs @@ -0,0 +1,276 @@ +use std::sync::{Arc, atomic::{AtomicBool, Ordering}}; +use std::time::Duration; +use parking_lot::Mutex; +use tokio::sync::mpsc; +use log::{info, warn, error, debug, trace}; +use gilrs::{Gilrs, Event, EventType, Button, Axis}; + +use crate::webrtc::InputEvent; +use super::get_timestamp_us; + +/// XInput button format (confirmed from web client analysis) +/// This is the standard XInput wButtons format used by GFN: +/// +/// 0x0001 = DPad Up +/// 0x0002 = DPad Down +/// 0x0004 = DPad Left +/// 0x0008 = DPad Right +/// 0x0010 = Start +/// 0x0020 = Back/Select +/// 0x0040 = L3 (Left Stick Click) +/// 0x0080 = R3 (Right Stick Click) +/// 0x0100 = LB (Left Bumper) +/// 0x0200 = RB (Right Bumper) +/// 0x1000 = A +/// 0x2000 = B +/// 0x4000 = X +/// 0x8000 = Y +const XINPUT_DPAD_UP: u16 = 0x0001; +const XINPUT_DPAD_DOWN: u16 = 0x0002; +const XINPUT_DPAD_LEFT: u16 = 0x0004; +const XINPUT_DPAD_RIGHT: u16 = 0x0008; +const XINPUT_START: u16 = 0x0010; +const XINPUT_BACK: u16 = 0x0020; +const XINPUT_L3: u16 = 0x0040; +const XINPUT_R3: u16 = 0x0080; +const XINPUT_LB: u16 = 0x0100; +const XINPUT_RB: u16 = 0x0200; +const XINPUT_A: u16 = 0x1000; +const XINPUT_B: u16 = 0x2000; +const XINPUT_X: u16 = 0x4000; +const XINPUT_Y: u16 = 0x8000; + +/// Deadzone for analog sticks (15% as per GFN docs) +const STICK_DEADZONE: f32 = 0.15; + +/// Controller manager to handle gamepad input +pub struct ControllerManager { + running: Arc, + event_tx: Mutex>>, +} + +impl ControllerManager { + pub fn new() -> Self { + Self { + running: Arc::new(AtomicBool::new(false)), + event_tx: Mutex::new(None), + } + } + + /// Set the input event sender + pub fn set_event_sender(&self, tx: mpsc::Sender) { + *self.event_tx.lock() = Some(tx); + } + + /// Start the controller input loop + pub fn start(&self) { + if self.running.load(Ordering::SeqCst) { + return; + } + + self.running.store(true, Ordering::SeqCst); + let running = self.running.clone(); + + let tx_opt = self.event_tx.lock().clone(); + + if tx_opt.is_none() { + warn!("ControllerManager started without event sender!"); + return; + } + let tx = tx_opt.unwrap(); + + std::thread::spawn(move || { + info!("Controller input thread starting..."); + + let mut gilrs = match Gilrs::new() { + Ok(g) => { + info!("gilrs initialized successfully"); + g + } + Err(e) => { + error!("Failed to initialize gilrs: {}", e); + return; + } + }; + + // Report connected gamepads + let mut gamepad_count = 0; + for (id, gamepad) in gilrs.gamepads() { + gamepad_count += 1; + info!("Gamepad {} detected: '{}' (UUID: {:?})", + id, gamepad.name(), gamepad.uuid()); + + // Log supported features + debug!(" Power info: {:?}", gamepad.power_info()); + debug!(" Is connected: {}", gamepad.is_connected()); + } + + if gamepad_count == 0 { + warn!("No gamepads detected at startup. Connect a controller to use gamepad input."); + } else { + info!("Found {} gamepad(s)", gamepad_count); + } + + let mut last_button_flags: u16 = 0; + let mut event_count: u64 = 0; + + while running.load(Ordering::Relaxed) { + // Poll events + while let Some(Event { id, event, time, .. }) = gilrs.next_event() { + let gamepad = gilrs.gamepad(id); + event_count += 1; + + // Log first few events for debugging + if event_count <= 10 { + debug!("Controller event #{}: {:?} from '{}' at {:?}", + event_count, event, gamepad.name(), time); + } + + // Use gamepad index as controller ID (0-3) + // GamepadId is opaque, but we can use usize conversion + let controller_id: u8 = usize::from(id) as u8; + + match event { + EventType::Connected => { + info!("Gamepad connected: {} (id={})", gamepad.name(), controller_id); + } + EventType::Disconnected => { + info!("Gamepad disconnected: {} (id={})", gamepad.name(), controller_id); + } + _ => { + // Build XInput button bitmap (confirmed from web client) + let mut button_flags: u16 = 0; + + // D-Pad (bits 0-3) + if gamepad.is_pressed(Button::DPadUp) { button_flags |= XINPUT_DPAD_UP; } + if gamepad.is_pressed(Button::DPadDown) { button_flags |= XINPUT_DPAD_DOWN; } + if gamepad.is_pressed(Button::DPadLeft) { button_flags |= XINPUT_DPAD_LEFT; } + if gamepad.is_pressed(Button::DPadRight) { button_flags |= XINPUT_DPAD_RIGHT; } + + // Center buttons (bits 4-5) + if gamepad.is_pressed(Button::Start) { button_flags |= XINPUT_START; } + if gamepad.is_pressed(Button::Select) { button_flags |= XINPUT_BACK; } + + // Stick clicks (bits 6-7) + if gamepad.is_pressed(Button::LeftThumb) { button_flags |= XINPUT_L3; } + if gamepad.is_pressed(Button::RightThumb) { button_flags |= XINPUT_R3; } + + // Shoulder buttons / bumpers (bits 8-9) + // gilrs: LeftTrigger = L1/LB (digital bumper) + // gilrs: RightTrigger = R1/RB (digital bumper) + if gamepad.is_pressed(Button::LeftTrigger) { button_flags |= XINPUT_LB; } + if gamepad.is_pressed(Button::RightTrigger) { button_flags |= XINPUT_RB; } + + // Face buttons (bits 12-15) + // gilrs uses cardinal directions: South=A, East=B, West=X, North=Y + if gamepad.is_pressed(Button::South) { button_flags |= XINPUT_A; } + if gamepad.is_pressed(Button::East) { button_flags |= XINPUT_B; } + if gamepad.is_pressed(Button::West) { button_flags |= XINPUT_X; } + if gamepad.is_pressed(Button::North) { button_flags |= XINPUT_Y; } + + // Analog triggers (0-255) + // gilrs uses different axes for different controllers + // Try LeftZ/RightZ first (common), then fall back to trigger buttons + let lt_axis = gamepad.value(Axis::LeftZ); + let rt_axis = gamepad.value(Axis::RightZ); + + // Triggers typically range from 0.0 to 1.0 (or -1.0 to 1.0 on some controllers) + // Normalize to 0-255 + let left_trigger = if lt_axis.abs() < 0.01 && gamepad.is_pressed(Button::LeftTrigger2) { + 255u8 // Fallback: if no axis but button pressed, assume full + } else { + // Handle both 0..1 and -1..1 ranges + let normalized = if lt_axis < 0.0 { (lt_axis + 1.0) / 2.0 } else { lt_axis }; + (normalized.clamp(0.0, 1.0) * 255.0) as u8 + }; + + let right_trigger = if rt_axis.abs() < 0.01 && gamepad.is_pressed(Button::RightTrigger2) { + 255u8 + } else { + let normalized = if rt_axis < 0.0 { (rt_axis + 1.0) / 2.0 } else { rt_axis }; + (normalized.clamp(0.0, 1.0) * 255.0) as u8 + }; + + // Analog sticks (-32768 to 32767) + let lx_val = gamepad.value(Axis::LeftStickX); + let ly_val = gamepad.value(Axis::LeftStickY); + let rx_val = gamepad.value(Axis::RightStickX); + let ry_val = gamepad.value(Axis::RightStickY); + + // Apply deadzone + let apply_deadzone = |val: f32| -> f32 { + if val.abs() < STICK_DEADZONE { + 0.0 + } else { + // Scale remaining range to full range + let sign = val.signum(); + let magnitude = (val.abs() - STICK_DEADZONE) / (1.0 - STICK_DEADZONE); + sign * magnitude + } + }; + + let lx = apply_deadzone(lx_val); + let ly = apply_deadzone(ly_val); + let rx = apply_deadzone(rx_val); + let ry = apply_deadzone(ry_val); + + // Convert to i16 range + let left_stick_x = (lx * 32767.0).clamp(-32768.0, 32767.0) as i16; + let left_stick_y = (ly * 32767.0).clamp(-32768.0, 32767.0) as i16; + let right_stick_x = (rx * 32767.0).clamp(-32768.0, 32767.0) as i16; + let right_stick_y = (ry * 32767.0).clamp(-32768.0, 32767.0) as i16; + + // Log button changes + if button_flags != last_button_flags { + debug!("Button state changed: 0x{:04X} -> 0x{:04X}", + last_button_flags, button_flags); + last_button_flags = button_flags; + } + + // Log stick movement occasionally + if left_stick_x != 0 || left_stick_y != 0 || right_stick_x != 0 || right_stick_y != 0 { + trace!("Sticks: L({}, {}) R({}, {}) Triggers: L={} R={}", + left_stick_x, left_stick_y, right_stick_x, right_stick_y, + left_trigger, right_trigger); + } + + let event = InputEvent::Gamepad { + controller_id, + button_flags, + left_trigger, + right_trigger, + left_stick_x, + left_stick_y, + right_stick_x, + right_stick_y, + flags: 1, // 1 = controller connected + timestamp_us: get_timestamp_us(), + }; + + // Send event + if let Err(e) = tx.try_send(event) { + trace!("Controller event channel full: {:?}", e); + } + } + } + } + + // Poll sleep - 4ms for 250Hz polling rate + std::thread::sleep(Duration::from_millis(4)); + } + + info!("Controller input thread stopped (processed {} events)", event_count); + }); + } + + /// Stop the controller input loop + pub fn stop(&self) { + self.running.store(false, Ordering::SeqCst); + } +} + +impl Default for ControllerManager { + fn default() -> Self { + Self::new() + } +} diff --git a/opennow-streamer/src/input/mod.rs b/opennow-streamer/src/input/mod.rs index 68e6570..38acee5 100644 --- a/opennow-streamer/src/input/mod.rs +++ b/opennow-streamer/src/input/mod.rs @@ -15,8 +15,10 @@ mod macos; // For now, stubs are provided below for Linux mod protocol; +pub mod controller; pub use protocol::*; +pub use controller::ControllerManager; // Re-export raw input functions for Windows #[cfg(target_os = "windows")] diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index 60100ee..f003c2e 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -393,8 +393,8 @@ impl AudioPlayer { info!("Using audio config: {}Hz, {} channels, format {:?}", actual_rate.0, actual_channels, sample_format); - // Buffer for ~200ms of audio - let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) / 5; + // Buffer for ~500ms of audio (larger buffer for jitter tolerance) + let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) / 2; let buffer = Arc::new(Mutex::new(AudioBuffer::new(buffer_size))); let config = supported_range.with_sample_rate(actual_rate).into(); diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs index 0473f65..27c2990 100644 --- a/opennow-streamer/src/media/mod.rs +++ b/opennow-streamer/src/media/mod.rs @@ -46,6 +46,32 @@ pub struct VideoFrame { pub timestamp_us: u64, /// Pixel format (YUV420P or NV12) pub format: PixelFormat, + /// Color range (Limited or Full) + pub color_range: ColorRange, + /// Color space (matrix coefficients) + pub color_space: ColorSpace, +} + +/// Video color range +#[derive(Debug, Clone, Copy, PartialEq, Default)] +pub enum ColorRange { + /// Limited range (16-235 for Y, 16-240 for UV) - Standard for TV/Video + #[default] + Limited, + /// Full range (0-255) - Standard for PC/JPEG + Full, +} + +/// Video color space (matrix coefficients) +#[derive(Debug, Clone, Copy, PartialEq, Default)] +pub enum ColorSpace { + /// BT.709 (HDTV) - Default + #[default] + BT709, + /// BT.601 (SDTV) + BT601, + /// BT.2020 (UHDTV) + BT2020, } impl VideoFrame { @@ -65,6 +91,8 @@ impl VideoFrame { v_stride: width / 2, timestamp_us: 0, format: PixelFormat::YUV420P, + color_range: ColorRange::Limited, + color_space: ColorSpace::BT709, } } diff --git a/opennow-streamer/src/media/rtp.rs b/opennow-streamer/src/media/rtp.rs index 929f3f2..fbd73ee 100644 --- a/opennow-streamer/src/media/rtp.rs +++ b/opennow-streamer/src/media/rtp.rs @@ -2,7 +2,7 @@ //! //! Depacketizes RTP payloads for H.264, H.265/HEVC, and AV1 video codecs. -use log::{debug, info, warn}; +use log::{debug, warn}; /// Codec type for depacketizer #[derive(Debug, Clone, Copy, PartialEq)] @@ -28,6 +28,8 @@ pub struct RtpDepacketizer { av1_frame_buffer: Vec, /// Cached AV1 SEQUENCE_HEADER OBU - must be present at start of each frame av1_sequence_header: Option>, + /// Accumulated NAL units for current H.264/H.265 frame (sent when marker bit is set) + nal_frame_buffer: Vec, } impl RtpDepacketizer { @@ -46,6 +48,7 @@ impl RtpDepacketizer { pps: None, av1_frame_buffer: Vec::with_capacity(256 * 1024), av1_sequence_header: None, + nal_frame_buffer: Vec::with_capacity(256 * 1024), } } @@ -60,12 +63,134 @@ impl RtpDepacketizer { self.in_fragment = false; self.av1_frame_buffer.clear(); self.av1_sequence_header = None; + self.nal_frame_buffer.clear(); } - /// Accumulate an OBU for the current AV1 frame - /// Call take_accumulated_frame() when marker bit is set to get complete frame - pub fn accumulate_obu(&mut self, obu: Vec) { - self.av1_frame_buffer.extend_from_slice(&obu); + /// Process AV1 RTP payload and accumulate directly to frame buffer + /// This handles GFN's non-standard AV1 RTP which has continuation packets + /// that don't properly follow RFC 9000 fragmentation rules + pub fn process_av1_raw(&mut self, payload: &[u8]) { + if payload.is_empty() { + return; + } + + let agg_header = payload[0]; + let z_flag = (agg_header & 0x80) != 0; + let y_flag = (agg_header & 0x40) != 0; + let w_field = (agg_header >> 4) & 0x03; + let n_flag = (agg_header & 0x08) != 0; + + if n_flag { + // New coded video sequence - clear everything + self.av1_frame_buffer.clear(); + self.buffer.clear(); + self.in_fragment = false; + } + + let mut offset = 1; + + // GFN bug workaround: When we're in the middle of accumulating a large OBU + // (like TILE_GROUP), treat ALL subsequent packets as raw continuation data + // until marker bit arrives. GFN doesn't properly set Z=1 flag. + if self.in_fragment { + // Just append raw data - don't try to parse aggregation header semantics + self.buffer.extend_from_slice(&payload[offset..]); + // Stay in fragment mode until marker bit triggers flush + return; + } + + if z_flag { + // Standard continuation packet (Z=1) + self.buffer.extend_from_slice(&payload[offset..]); + + if y_flag { + // Fragment complete - try to reconstruct OBU + if !self.buffer.is_empty() { + if let Some(obu) = Self::reconstruct_obu_with_size(&self.buffer) { + self.av1_frame_buffer.extend_from_slice(&obu); + } + } + self.buffer.clear(); + self.in_fragment = false; + } + return; + } + + // Not a continuation - parse OBU elements + let obu_count = if w_field == 0 { 1 } else { w_field as usize }; + + for i in 0..obu_count { + if offset >= payload.len() { + break; + } + + let obu_size = if w_field > 0 && i < obu_count - 1 { + let (size, bytes_read) = Self::read_leb128(&payload[offset..]); + offset += bytes_read; + size as usize + } else { + payload.len() - offset + }; + + if offset + obu_size > payload.len() { + break; + } + + let obu_data = &payload[offset..offset + obu_size]; + let obu_type = if !obu_data.is_empty() { (obu_data[0] >> 3) & 0x0F } else { 0 }; + + // Check if last OBU is fragmented or is a large OBU type that might span packets + // GFN bug: sometimes marks Y=1 even when TILE_GROUP/FRAME spans packets + let is_last = i == obu_count - 1; + let is_large_obu = obu_type == 4 || obu_type == 6; // TILE_GROUP or FRAME + + if is_last && (!y_flag || is_large_obu) { + // Start/continue fragmented OBU - save for potential continuation + self.buffer.clear(); + self.buffer.extend_from_slice(obu_data); + self.in_fragment = true; + } else if !obu_data.is_empty() { + // Complete OBU - reconstruct with size field and accumulate + if let Some(obu) = Self::reconstruct_obu_with_size(obu_data) { + self.av1_frame_buffer.extend_from_slice(&obu); + } + } + + offset += obu_size; + } + } + + /// Accumulate a NAL unit for the current H.264/H.265 frame + /// Each NAL unit is prefixed with Annex B start code (0x00 0x00 0x00 0x01) + /// Call take_nal_frame() when marker bit is set to get complete frame + pub fn accumulate_nal(&mut self, nal: Vec) { + // Add Annex B start code before each NAL unit + self.nal_frame_buffer.extend_from_slice(&[0x00, 0x00, 0x00, 0x01]); + self.nal_frame_buffer.extend_from_slice(&nal); + } + + /// Take the accumulated H.264/H.265 frame data (all NAL units with start codes) + /// Returns None if no data accumulated + pub fn take_nal_frame(&mut self) -> Option> { + if self.nal_frame_buffer.is_empty() { + return None; + } + let frame = std::mem::take(&mut self.nal_frame_buffer); + // Pre-allocate for next frame + self.nal_frame_buffer = Vec::with_capacity(256 * 1024); + Some(frame) + } + + /// Flush any pending OBU fragment to the frame buffer + /// Call this when marker bit is set before take_accumulated_frame() + pub fn flush_pending_obu(&mut self) { + if self.in_fragment && !self.buffer.is_empty() { + if let Some(obu) = Self::reconstruct_obu_with_size(&self.buffer) { + self.av1_frame_buffer.extend_from_slice(&obu); + } + self.buffer.clear(); + self.in_fragment = false; + } } /// Take the accumulated AV1 frame data (all OBUs concatenated) @@ -83,14 +208,8 @@ impl RtpDepacketizer { if !Self::av1_frame_has_picture_data(&frame) { // But still extract and cache SEQUENCE_HEADER if present if let Some(seq_hdr) = Self::extract_sequence_header(&frame) { - info!("AV1: Caching SEQUENCE_HEADER ({} bytes) from header-only packet", seq_hdr.len()); self.av1_sequence_header = Some(seq_hdr); } - static SKIPPED_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); - let logged = SKIPPED_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); - if logged < 5 { - warn!("AV1: Skipping frame without picture data ({} bytes)", frame.len()); - } return None; } @@ -100,31 +219,16 @@ impl RtpDepacketizer { // If frame has SEQUENCE_HEADER, cache it for future frames if has_sequence_header { if let Some(seq_hdr) = Self::extract_sequence_header(&frame) { - if self.av1_sequence_header.is_none() { - info!("AV1: Caching SEQUENCE_HEADER ({} bytes)", seq_hdr.len()); - } self.av1_sequence_header = Some(seq_hdr); } } else if let Some(ref seq_hdr) = self.av1_sequence_header { // Prepend cached SEQUENCE_HEADER to frame - static PREPEND_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); - let logged = PREPEND_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); - if logged < 5 { - info!("AV1: Prepending cached SEQUENCE_HEADER ({} bytes) to frame", seq_hdr.len()); - } let mut new_frame = Vec::with_capacity(seq_hdr.len() + frame.len()); new_frame.extend_from_slice(seq_hdr); new_frame.extend_from_slice(&frame); frame = new_frame; } - static FRAMES_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); - let logged = FRAMES_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); - if logged < 10 { - info!("AV1: Sending complete frame to decoder: {} bytes (has_seq_hdr={})", - frame.len(), has_sequence_header || self.av1_sequence_header.is_some()); - } - Some(frame) } @@ -209,12 +313,13 @@ impl RtpDepacketizer { None } - /// Process an RTP payload and return complete NAL units (or OBUs for AV1) + /// Process an RTP payload and return complete NAL units + /// Note: For AV1, use process_av1_raw() instead - this returns empty for AV1 pub fn process(&mut self, payload: &[u8]) -> Vec> { match self.codec { DepacketizerCodec::H264 => self.process_h264(payload), DepacketizerCodec::H265 => self.process_h265(payload), - DepacketizerCodec::AV1 => self.process_av1(payload), + DepacketizerCodec::AV1 => Vec::new(), // Use process_av1_raw() for AV1 } } @@ -447,111 +552,6 @@ impl RtpDepacketizer { result } - /// Process AV1 RTP payload (RFC 9000 - RTP Payload Format for AV1) - /// AV1 uses OBUs (Open Bitstream Units) instead of NAL units - /// - /// The RTP payload format omits the obu_size field from OBU headers. - /// We need to reconstruct full OBUs with size fields for the decoder. - fn process_av1(&mut self, payload: &[u8]) -> Vec> { - let mut result = Vec::new(); - - if payload.is_empty() { - return result; - } - - // AV1 aggregation header (first byte) - // Z (1 bit): Continuation of previous OBU fragment - // Y (1 bit): Last OBU fragment (or complete OBU) - // W (2 bits): Number of OBU elements (0=1 OBU, 1-3=W OBUs with sizes) - // N (1 bit): First packet of a coded video sequence - // Reserved (3 bits) - let agg_header = payload[0]; - let z_flag = (agg_header & 0x80) != 0; // continuation - let y_flag = (agg_header & 0x40) != 0; // last fragment / complete - let w_field = (agg_header >> 4) & 0x03; - let n_flag = (agg_header & 0x08) != 0; // new coded video sequence - - // Log first few packets to debug - static PACKETS_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); - let logged = PACKETS_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); - if logged < 20 { - info!("AV1 RTP: len={} Z={} Y={} W={} N={} header=0x{:02x}", - payload.len(), z_flag as u8, y_flag as u8, w_field, n_flag as u8, agg_header); - } - - if n_flag { - info!("AV1: New coded video sequence"); - // Clear any pending fragments and collected OBUs - self.buffer.clear(); - self.fragments.clear(); - self.in_fragment = false; - } - - let mut offset = 1; - - // Handle fragmented OBU (Z=1 means this is a continuation) - if z_flag { - if self.in_fragment { - self.buffer.extend_from_slice(&payload[offset..]); - if y_flag { - // Last fragment - reconstruct full OBU with size field - self.in_fragment = false; - if let Some(obu) = Self::reconstruct_obu_with_size(&self.buffer) { - result.push(obu); - } - self.buffer.clear(); - } - } - return result; - } - - // Not a continuation - parse new OBU elements - // W=0: single OBU element occupying the rest of the packet - // W=1,2,3: W OBU elements, each preceded by LEB128 size (except last) - let obu_count = if w_field == 0 { 1 } else { w_field as usize }; - - for i in 0..obu_count { - if offset >= payload.len() { - break; - } - - // Read OBU size (LEB128) for all but the last element when W > 0 - let obu_size = if w_field > 0 && i < obu_count - 1 { - let (size, bytes_read) = Self::read_leb128(&payload[offset..]); - offset += bytes_read; - size as usize - } else { - // Last OBU (or only OBU when W=0) takes remaining bytes - payload.len() - offset - }; - - if offset + obu_size > payload.len() { - warn!("AV1: Invalid OBU size {} at offset {} (payload len {})", - obu_size, offset, payload.len()); - break; - } - - let obu_data = &payload[offset..offset + obu_size]; - - // Check if this starts a fragmented OBU - // Y=0 on the last OBU means it's fragmented across packets - if i == obu_count - 1 && !y_flag { - self.buffer.clear(); - self.buffer.extend_from_slice(obu_data); - self.in_fragment = true; - } else if !obu_data.is_empty() { - // Complete OBU - reconstruct with proper size field - if let Some(obu) = Self::reconstruct_obu_with_size(obu_data) { - result.push(obu); - } - } - - offset += obu_size; - } - - result - } - /// Reconstruct an OBU with the obu_size field included /// RTP format strips the size field, but decoders need it fn reconstruct_obu_with_size(obu_data: &[u8]) -> Option> { @@ -561,7 +561,6 @@ impl RtpDepacketizer { // Parse OBU header let header = obu_data[0]; - let obu_type = (header >> 3) & 0x0F; let has_extension = (header & 0x04) != 0; let has_size_field = (header & 0x02) != 0; @@ -595,28 +594,6 @@ impl RtpDepacketizer { // Copy payload new_obu.extend_from_slice(&obu_data[header_size..]); - // Log OBU types for debugging - let obu_type_name = match obu_type { - 1 => "SEQUENCE_HEADER", - 2 => "TEMPORAL_DELIMITER", - 3 => "FRAME_HEADER", - 4 => "TILE_GROUP", - 5 => "METADATA", - 6 => "FRAME", - 7 => "REDUNDANT_FRAME_HEADER", - 8 => "TILE_LIST", - 15 => "PADDING", - _ => "UNKNOWN", - }; - - // Log first few OBUs at info level - static OBUS_LOGGED: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0); - let logged = OBUS_LOGGED.fetch_add(1, std::sync::atomic::Ordering::Relaxed); - if logged < 30 { - info!("AV1: Reconstructed OBU type {} ({}) payload_size={} total_size={}", - obu_type, obu_type_name, payload_size, new_obu.len()); - } - Some(new_obu) } diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 998ca02..f3782c5 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -16,7 +16,7 @@ use tokio::sync::mpsc as tokio_mpsc; #[cfg(target_os = "windows")] use std::path::Path; -use super::{VideoFrame, PixelFormat}; +use super::{VideoFrame, PixelFormat, ColorRange, ColorSpace}; use crate::app::{VideoCodec, SharedFrame}; extern crate ffmpeg_next as ffmpeg; @@ -318,10 +318,13 @@ impl VideoDecoder { stats_tx: Option>, ) -> Result { // Create decoder synchronously to report hw_accel status + info!("Creating decoder for codec {:?}...", codec_id); let (decoder, hw_accel) = Self::create_decoder(codec_id)?; + info!("Decoder created, hw_accel={}", hw_accel); // Spawn thread to handle decoding thread::spawn(move || { + info!("Decoder thread started for {:?}", codec_id); let mut decoder = decoder; let mut scaler: Option = None; let mut width = 0u32; @@ -330,6 +333,7 @@ impl VideoDecoder { let mut consecutive_failures = 0u32; let mut packets_received = 0u64; const KEYFRAME_REQUEST_THRESHOLD: u32 = 10; // Request keyframe after 10 consecutive failures (was 30) + const FRAMES_TO_SKIP: u64 = 3; // Skip first N frames to let decoder settle with reference frames while let Ok(cmd) = cmd_rx.recv() { match cmd { @@ -395,9 +399,15 @@ impl VideoDecoder { }; // Write frame directly to SharedFrame (zero-copy handoff) + // Skip first few frames to let decoder settle with proper reference frames + // This prevents green/corrupted frames during stream startup if let Some(frame) = result { - if let Some(ref sf) = shared_frame { - sf.write(frame); + if frames_decoded > FRAMES_TO_SKIP { + if let Some(ref sf) = shared_frame { + sf.write(frame); + } + } else { + debug!("Skipping frame {} (waiting for decoder to settle)", frames_decoded); } } @@ -557,33 +567,41 @@ impl VideoDecoder { // Try hardware decoders (Windows/Linux) #[cfg(not(target_os = "macos"))] - for hw_name in &hw_decoder_names { - if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { - // new_with_codec returns Context directly, not Result - let mut ctx = CodecContext::new_with_codec(hw_codec); - ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); - - match ctx.decoder().video() { - Ok(dec) => { - info!("Successfully created hardware decoder: {}", hw_name); - return Ok((dec, true)); - } - Err(e) => { - debug!("Failed to open hardware decoder {}: {:?}", hw_name, e); + { + info!("Attempting hardware decoders for {:?}: {:?}", codec_id, hw_decoder_names); + for hw_name in &hw_decoder_names { + if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { + info!("Found hardware decoder: {}, attempting to open...", hw_name); + // new_with_codec returns Context directly, not Result + let mut ctx = CodecContext::new_with_codec(hw_codec); + ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + match ctx.decoder().video() { + Ok(dec) => { + info!("Successfully created hardware decoder: {}", hw_name); + return Ok((dec, true)); + } + Err(e) => { + warn!("Failed to open hardware decoder {}: {:?}", hw_name, e); + } } + } else { + debug!("Hardware decoder not found: {}", hw_name); } } } // Fall back to software decoder - info!("Using software decoder (hardware acceleration not available)"); + info!("Using software decoder for {:?}", codec_id); let codec = ffmpeg::codec::decoder::find(codec_id) .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; + info!("Found software decoder: {:?}", codec.name()); let mut ctx = CodecContext::new_with_codec(codec); ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); let decoder = ctx.decoder().video()?; + info!("Software decoder opened successfully"); Ok((decoder, false)) } @@ -641,6 +659,11 @@ impl VideoDecoder { } } + /// Calculate 256-byte aligned stride for GPU compatibility (wgpu/DX12 requirement) + fn get_aligned_stride(width: u32) -> u32 { + (width + 255) & !255 + } + /// Decode a single frame (called in decoder thread) fn decode_frame( decoder: &mut decoder::Video, @@ -672,6 +695,7 @@ impl VideoDecoder { if let Some(pkt_data) = packet.data_mut() { pkt_data.copy_from_slice(&data); } else { + warn!("Failed to allocate packet data"); return None; } @@ -680,7 +704,7 @@ impl VideoDecoder { // EAGAIN means we need to receive frames first match e { ffmpeg::Error::Other { errno } if errno == libc::EAGAIN => {} - _ => debug!("Send packet error: {:?}", e), + _ => warn!("Send packet error: {:?}", e), } } @@ -700,47 +724,85 @@ impl VideoDecoder { let frame_to_use = sw_frame.as_ref().unwrap_or(&frame); let actual_format = frame_to_use.format(); + // Extract color metadata + let color_range = match frame_to_use.color_range() { + ffmpeg::util::color::range::Range::JPEG => ColorRange::Full, + ffmpeg::util::color::range::Range::MPEG => ColorRange::Limited, + _ => ColorRange::Limited, // Default to limited if unspecified (safest for video) + }; + + let color_space = match frame_to_use.color_space() { + ffmpeg::util::color::space::Space::BT709 => ColorSpace::BT709, + ffmpeg::util::color::space::Space::BT470BG => ColorSpace::BT601, + ffmpeg::util::color::space::Space::SMPTE170M => ColorSpace::BT601, + ffmpeg::util::color::space::Space::BT2020NCL => ColorSpace::BT2020, + _ => ColorSpace::BT709, // Default to BT.709 for HD content + }; + if *frames_decoded == 1 { - info!("First decoded frame: {}x{}, format: {:?} (hw: {:?})", w, h, actual_format, format); + info!("First decoded frame: {}x{}, format: {:?} (hw: {:?}), range: {:?}, space: {:?}", + w, h, actual_format, format, color_range, color_space); } // Check if frame is NV12 - skip CPU scaler and pass directly to GPU // NV12 has Y plane (full res) and UV plane (half res, interleaved) - // GPU shader will deinterleave UV - much faster than CPU scaler + // GPU shader will handle color conversion - much faster than CPU scaler if actual_format == Pixel::NV12 { *width = w; *height = h; - // Extract Y plane (plane 0) - let y_plane = frame_to_use.data(0).to_vec(); let y_stride = frame_to_use.stride(0) as u32; - - // Extract interleaved UV plane (plane 1) - // NV12: UV plane is half height, full width, 2 bytes per pixel (U, V interleaved) - let uv_plane = frame_to_use.data(1).to_vec(); let uv_stride = frame_to_use.stride(1) as u32; + let uv_height = h / 2; + + // GPU texture upload requires 256-byte aligned rows (wgpu restriction) + let aligned_y_stride = Self::get_aligned_stride(w); + let aligned_uv_stride = Self::get_aligned_stride(w); + + let y_data = frame_to_use.data(0); + let uv_data = frame_to_use.data(1); + + // Copy Y plane with alignment + let mut y_plane = vec![0u8; (aligned_y_stride * h) as usize]; + for row in 0..h { + let src_start = (row * y_stride) as usize; + let src_end = src_start + w as usize; + let dst_start = (row * aligned_y_stride) as usize; + if src_end <= y_data.len() { + y_plane[dst_start..dst_start + w as usize] + .copy_from_slice(&y_data[src_start..src_end]); + } + } + + // Copy UV plane with alignment + let mut uv_plane = vec![0u8; (aligned_uv_stride * uv_height) as usize]; + for row in 0..uv_height { + let src_start = (row * uv_stride) as usize; + let src_end = src_start + w as usize; + let dst_start = (row * aligned_uv_stride) as usize; + if src_end <= uv_data.len() { + uv_plane[dst_start..dst_start + w as usize] + .copy_from_slice(&uv_data[src_start..src_end]); + } + } if *frames_decoded == 1 { - // Debug: Check UV plane data for green screen debugging - let uv_non_zero = uv_plane.iter().filter(|&&b| b != 0 && b != 128).take(10).count(); - let uv_sample: Vec = uv_plane.iter().take(32).cloned().collect(); - info!("NV12 direct path: Y {}x{} stride {}, UV stride {} - GPU will handle conversion", - w, h, y_stride, uv_stride); - info!("UV plane: {} bytes, non-zero/128 samples: {}, first 32 bytes: {:?}", - uv_plane.len(), uv_non_zero, uv_sample); + info!("NV12 direct GPU path: {}x{} - bypassing CPU scaler", w, h); } return Some(VideoFrame { width: w, height: h, y_plane, - u_plane: uv_plane, // Interleaved UV data - v_plane: Vec::new(), // Empty for NV12 - y_stride, - u_stride: uv_stride, + u_plane: uv_plane, + v_plane: Vec::new(), + y_stride: aligned_y_stride, + u_stride: aligned_uv_stride, v_stride: 0, timestamp_us: 0, format: PixelFormat::NV12, + color_range, + color_space, }); } @@ -749,6 +811,8 @@ impl VideoDecoder { *width = w; *height = h; + info!("Creating scaler: {:?} {}x{} -> YUV420P {}x{}", actual_format, w, h, w, h); + match ScalerContext::get( actual_format, w, @@ -767,7 +831,11 @@ impl VideoDecoder { } // Convert to YUV420P - let mut yuv_frame = FfmpegFrame::empty(); + // We must allocate the destination frame first! + let mut yuv_frame = FfmpegFrame::new(Pixel::YUV420P, w, h); + // get_buffer is not exposed/needed in this safe wrapper, FfmpegFrame::new handles structure + // Ideally we should just verify the scaler works. + if let Some(ref mut s) = scaler { if let Err(e) = s.run(frame_to_use, &mut yuv_frame) { warn!("Scaler run failed: {:?}", e); @@ -777,26 +845,49 @@ impl VideoDecoder { return None; } - // Extract YUV planes - let y_plane = yuv_frame.data(0).to_vec(); - let u_plane = yuv_frame.data(1).to_vec(); - let v_plane = yuv_frame.data(2).to_vec(); - + // Extract YUV planes with alignment let y_stride = yuv_frame.stride(0) as u32; let u_stride = yuv_frame.stride(1) as u32; let v_stride = yuv_frame.stride(2) as u32; + let aligned_y_stride = Self::get_aligned_stride(w); + let aligned_u_stride = Self::get_aligned_stride(w / 2); + let aligned_v_stride = Self::get_aligned_stride(w / 2); + + let y_height = h; + let uv_height = h / 2; + + let dim_y = w; + let dim_uv = w / 2; + + // Helper to copy plane with alignment + let copy_plane = |src: &[u8], src_stride: usize, dst_stride: usize, width: usize, height: usize| -> Vec { + let mut dst = vec![0u8; dst_stride * height]; + for row in 0..height { + let src_start = row * src_stride; + let src_end = src_start + width; + let dst_start = row * dst_stride; + let dst_end = dst_start + width; + if src_end <= src.len() { + dst[dst_start..dst_end].copy_from_slice(&src[src_start..src_end]); + } + } + dst + }; + Some(VideoFrame { width: w, height: h, - y_plane, - u_plane, - v_plane, - y_stride, - u_stride, - v_stride, + y_plane: copy_plane(yuv_frame.data(0), y_stride as usize, aligned_y_stride as usize, dim_y as usize, y_height as usize), + u_plane: copy_plane(yuv_frame.data(1), u_stride as usize, aligned_u_stride as usize, dim_uv as usize, uv_height as usize), + v_plane: copy_plane(yuv_frame.data(2), v_stride as usize, aligned_v_stride as usize, dim_uv as usize, uv_height as usize), + y_stride: aligned_y_stride, + u_stride: aligned_u_stride, + v_stride: aligned_v_stride, timestamp_us: 0, format: PixelFormat::YUV420P, + color_range, + color_space, }) } Err(ffmpeg::Error::Other { errno }) if errno == libc::EAGAIN => None, diff --git a/opennow-streamer/src/webrtc/datachannel.rs b/opennow-streamer/src/webrtc/datachannel.rs index 3076823..efa885b 100644 --- a/opennow-streamer/src/webrtc/datachannel.rs +++ b/opennow-streamer/src/webrtc/datachannel.rs @@ -14,6 +14,7 @@ pub const INPUT_MOUSE_REL: u32 = 7; pub const INPUT_MOUSE_BUTTON_DOWN: u32 = 8; pub const INPUT_MOUSE_BUTTON_UP: u32 = 9; pub const INPUT_MOUSE_WHEEL: u32 = 10; +pub const INPUT_GAMEPAD: u32 = 12; // Type 12 = Gamepad state (NOT 6!) /// Mouse buttons pub const MOUSE_BUTTON_LEFT: u8 = 0; @@ -62,6 +63,19 @@ pub enum InputEvent { }, /// Heartbeat (keep-alive) Heartbeat, + /// Gamepad state update + Gamepad { + controller_id: u8, + button_flags: u16, + left_trigger: u8, + right_trigger: u8, + left_stick_x: i16, + left_stick_y: i16, + right_stick_x: i16, + right_stick_y: i16, + flags: u16, + timestamp_us: u64, + }, } /// Encoder for GFN input protocol @@ -158,6 +172,58 @@ impl InputEncoder { // Type 2 (Heartbeat): 4 bytes self.buffer.put_u32_le(INPUT_HEARTBEAT); } + + InputEvent::Gamepad { + controller_id, + button_flags, + left_trigger, + right_trigger, + left_stick_x, + left_stick_y, + right_stick_x, + right_stick_y, + flags, + timestamp_us, + } => { + // Type 12 (Gamepad): 38 bytes total - from web client analysis + // Web client uses ALL LITTLE ENDIAN (DataView getUint16(true) = LE) + // + // Structure (from vendor_beautified.js fd() decoder): + // [0x00] Type: 4B LE (event type = 12) + // [0x04] Padding: 2B LE (reserved) + // [0x06] Index: 2B LE (gamepad index 0-3) + // [0x08] Bitmap: 2B LE (device type bitmap / flags) + // [0x0A] Padding: 2B LE (reserved) + // [0x0C] Buttons: 2B LE (button state bitmask) + // [0x0E] Trigger: 2B LE (packed: low=LT, high=RT, 0-255 each) + // [0x10] Axes[0]: 2B LE signed (Left X) + // [0x12] Axes[1]: 2B LE signed (Left Y) + // [0x14] Axes[2]: 2B LE signed (Right X) + // [0x16] Axes[3]: 2B LE signed (Right Y) + // [0x18] Padding: 2B LE (reserved) + // [0x1A] Padding: 2B LE (reserved) + // [0x1C] Padding: 2B LE (reserved) + // [0x1E] Timestamp: 8B LE (capture timestamp in microseconds) + // Total: 38 bytes + + self.buffer.put_u32_le(INPUT_GAMEPAD); // 0x00: Type = 12 (LE) + self.buffer.put_u16_le(0); // 0x04: Padding + self.buffer.put_u16_le(*controller_id as u16); // 0x06: Index (LE) + self.buffer.put_u16_le(*flags); // 0x08: Bitmap/flags (LE) + self.buffer.put_u16_le(0); // 0x0A: Padding + self.buffer.put_u16_le(*button_flags); // 0x0C: Buttons (LE) + // Pack triggers: low byte = LT, high byte = RT + let packed_triggers = (*left_trigger as u16) | ((*right_trigger as u16) << 8); + self.buffer.put_u16_le(packed_triggers); // 0x0E: Triggers packed (LE) + self.buffer.put_i16_le(*left_stick_x); // 0x10: Left X (LE) + self.buffer.put_i16_le(*left_stick_y); // 0x12: Left Y (LE) + self.buffer.put_i16_le(*right_stick_x); // 0x14: Right X (LE) + self.buffer.put_i16_le(*right_stick_y); // 0x16: Right Y (LE) + self.buffer.put_u16_le(0); // 0x18: Padding + self.buffer.put_u16_le(0); // 0x1A: Padding + self.buffer.put_u16_le(0); // 0x1C: Padding + self.buffer.put_u64_le(*timestamp_us); // 0x1E: Timestamp (LE) + } } // Protocol v3+ requires single event wrapper diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index 453e5fa..dfc70f6 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -19,7 +19,7 @@ use log::{info, warn, error, debug}; use crate::app::{SessionInfo, Settings, VideoCodec, SharedFrame}; use crate::media::{StreamStats, VideoDecoder, AudioDecoder, AudioPlayer, RtpDepacketizer, DepacketizerCodec}; -use crate::input::InputHandler; +use crate::input::{InputHandler, ControllerManager}; /// Active streaming session pub struct StreamingSession { @@ -85,15 +85,14 @@ fn build_nvst_sdp( ]; // DRC/DFC settings based on FPS + // Always disable DRC to allow full bitrate + lines.push("a=vqos.drc.enable:0".to_string()); if is_high_fps { - lines.push("a=vqos.drc.enable:0".to_string()); lines.push("a=vqos.dfc.enable:1".to_string()); lines.push("a=vqos.dfc.decodeFpsAdjPercent:85".to_string()); lines.push("a=vqos.dfc.targetDownCooldownMs:250".to_string()); lines.push("a=vqos.dfc.dfcAlgoVersion:2".to_string()); lines.push(format!("a=vqos.dfc.minTargetFps:{}", if is_120_fps { 100 } else { 60 })); - } else { - lines.push("a=vqos.drc.minRequiredBitrateCheckEnabled:1".to_string()); } // Video encoder settings @@ -257,7 +256,7 @@ pub async fn run_streaming( let depacketizer_codec = match codec { VideoCodec::H264 => DepacketizerCodec::H264, VideoCodec::H265 => DepacketizerCodec::H265, - VideoCodec::AV1 => DepacketizerCodec::H264, // AV1 uses different packetization, fallback for now + VideoCodec::AV1 => DepacketizerCodec::AV1, }; let mut rtp_depacketizer = RtpDepacketizer::with_codec(depacketizer_codec); info!("RTP depacketizer using {:?} mode", depacketizer_codec); @@ -265,7 +264,7 @@ pub async fn run_streaming( let mut audio_decoder = AudioDecoder::new(48000, 2)?; // Audio player is created in a separate thread due to cpal::Stream not being Send - let (audio_tx, mut audio_rx) = mpsc::channel::>(32); + let (audio_tx, mut audio_rx) = mpsc::channel::>(256); std::thread::spawn(move || { if let Ok(audio_player) = AudioPlayer::new(48000, 2) { info!("Audio player thread started"); @@ -304,14 +303,20 @@ pub async fn run_streaming( // Also set raw input sender for direct mouse events (Windows/macOS) #[cfg(any(target_os = "windows", target_os = "macos"))] - crate::input::set_raw_input_sender(input_event_tx); + crate::input::set_raw_input_sender(input_event_tx.clone()); info!("Input handler connected to streaming loop"); + // Initialize and start ControllerManager + let controller_manager = Arc::new(ControllerManager::new()); + controller_manager.set_event_sender(input_event_tx.clone()); + controller_manager.start(); + info!("Controller manager started"); + // Channel for input task to send encoded packets to the WebRTC peer // This decouples input processing from video decoding completely - // Tuple: (encoded_data, is_mouse, latency_us) - let (input_packet_tx, mut input_packet_rx) = mpsc::channel::<(Vec, bool, u64)>(1024); + // Tuple: (encoded_data, is_mouse, is_controller, latency_us) + let (input_packet_tx, mut input_packet_rx) = mpsc::channel::<(Vec, bool, bool, u64)>(1024); // Stats interval timer (must be created OUTSIDE the loop to persist across iterations) let mut stats_interval = tokio::time::interval(std::time::Duration::from_secs(1)); @@ -348,7 +353,8 @@ pub async fn run_streaming( InputEvent::MouseMove { timestamp_us, .. } | InputEvent::MouseButtonDown { timestamp_us, .. } | InputEvent::MouseButtonUp { timestamp_us, .. } | - InputEvent::MouseWheel { timestamp_us, .. } => *timestamp_us, + InputEvent::MouseWheel { timestamp_us, .. } | + InputEvent::Gamepad { timestamp_us, .. } => *timestamp_us, InputEvent::Heartbeat => 0, }; @@ -359,7 +365,7 @@ pub async fn run_streaming( // Encode the event let encoded = input_encoder.encode(&event); - // Determine if this is a mouse event (for channel selection) + // Determine if this is a mouse event let is_mouse = matches!( &event, InputEvent::MouseMove { .. } | @@ -368,9 +374,15 @@ pub async fn run_streaming( InputEvent::MouseWheel { .. } ); + // Determine if this is a gamepad/controller event + let is_controller = matches!( + &event, + InputEvent::Gamepad { .. } + ); + // Send to main loop for WebRTC transmission // Use try_send to never block the input thread - if input_packet_tx_clone.try_send((encoded, is_mouse, latency_us)).is_err() { + if input_packet_tx_clone.try_send((encoded, is_mouse, is_controller, latency_us)).is_err() { // Channel full - this is fine, old packets can be dropped for mouse } } @@ -389,18 +401,26 @@ pub async fn run_streaming( // Process encoded input packets from the input task (high priority) biased; - Some((encoded, is_mouse, latency_us)) = input_packet_rx.recv() => { + Some((encoded, is_mouse, is_controller, latency_us)) = input_packet_rx.recv() => { // Track input latency for stats if latency_us > 0 { input_latency_sum += latency_us as f64; input_latency_count += 1; } - if is_mouse { + if is_controller { + // Controller input (Input Channel V1) + // "input_channel_v1 needs to be only controller" + let _ = peer.send_controller_input(&encoded).await; + } else if is_mouse { // Mouse events - use partially reliable channel (8ms lifetime) + // Attempt to send on mouse channel, drop if not ready (no fallback to V1) let _ = peer.send_mouse_input(&encoded).await; } else { - // Keyboard events - use reliable channel + // Keyboard events + // Currently uses send_input (V1) + // If user requires V1 to be *strictly* controller, we might need to route keyboard elsewhere? + // But usually keyboard shares reliable channel. For now, keep it here. let _ = peer.send_input(&encoded).await; } } @@ -514,7 +534,7 @@ pub async fn run_streaming( warn!("WebRTC disconnected"); break; } - WebRtcEvent::VideoFrame { payload, rtp_timestamp: _ } => { + WebRtcEvent::VideoFrame { payload, rtp_timestamp: _, marker } => { frames_received += 1; bytes_received += payload.len() as u64; let packet_receive_time = std::time::Instant::now(); @@ -524,14 +544,40 @@ pub async fn run_streaming( info!("First video RTP packet received: {} bytes", payload.len()); } - // Depacketize RTP - may return multiple NAL units (e.g., from STAP-A/AP) - let nal_units = rtp_depacketizer.process(&payload); - for nal_unit in nal_units { - // NON-BLOCKING decode - fire and forget! - // The decoder thread will write directly to SharedFrame - // This ensures the main loop never stalls waiting for decode - if let Err(e) = video_decoder.decode_async(&nal_unit, packet_receive_time) { - warn!("Decode async failed: {}", e); + // Accumulate NAL units/OBUs and send complete frames on marker bit + // This is required for proper H.264/H.265/AV1 decoding + if codec == VideoCodec::AV1 { + // AV1: process and accumulate in one step (handles GFN's non-standard fragmentation) + rtp_depacketizer.process_av1_raw(&payload); + + // On marker bit, we have a complete frame - send accumulated OBUs + if marker { + // Flush any pending OBU (TILE_GROUP/FRAME that was held for possible continuation) + rtp_depacketizer.flush_pending_obu(); + + if let Some(frame_data) = rtp_depacketizer.take_accumulated_frame() { + if let Err(e) = video_decoder.decode_async(&frame_data, packet_receive_time) { + warn!("Decode async failed: {}", e); + } + } + } + } else { + // H.264/H.265: depacketize RTP and accumulate NAL units + let nal_units = rtp_depacketizer.process(&payload); + + // H.264/H.265: accumulate NAL units until marker bit (end of frame) + // Each frame consists of multiple NAL units that must be sent together + for nal_unit in nal_units { + rtp_depacketizer.accumulate_nal(nal_unit); + } + + // On marker bit, we have a complete Access Unit - send to decoder + if marker { + if let Some(frame_data) = rtp_depacketizer.take_nal_frame() { + if let Err(e) = video_decoder.decode_async(&frame_data, packet_receive_time) { + warn!("Decode async failed: {}", e); + } + } } } } @@ -662,6 +708,9 @@ pub async fn run_streaming( } } + // Stop controller manager + controller_manager.stop(); + // Clean up raw input sender #[cfg(any(target_os = "windows", target_os = "macos"))] crate::input::clear_raw_input_sender(); diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs index e366c80..0191837 100644 --- a/opennow-streamer/src/webrtc/peer.rs +++ b/opennow-streamer/src/webrtc/peer.rs @@ -36,8 +36,8 @@ use super::sdp::is_ice_lite; pub enum WebRtcEvent { Connected, Disconnected, - /// Video frame with RTP timestamp (90kHz clock) - VideoFrame { payload: Vec, rtp_timestamp: u32 }, + /// Video frame with RTP timestamp (90kHz clock) and marker bit + VideoFrame { payload: Vec, rtp_timestamp: u32, marker: bool }, AudioFrame(Vec), DataChannelOpen(String), DataChannelMessage(String, Vec), @@ -293,6 +293,7 @@ impl WebRtcPeer { if let Err(e) = tx_clone.send(WebRtcEvent::VideoFrame { payload: rtp_packet.payload.to_vec(), rtp_timestamp: rtp_packet.header.timestamp, + marker: rtp_packet.header.marker, }).await { warn!("Failed to send video frame event: {:?}", e); break; @@ -488,6 +489,14 @@ impl WebRtcPeer { Ok(()) } + /// Explicitly send controller input (aliases send_input/input_channel_v1 for now) + /// Used to enforce logical separation + pub async fn send_controller_input(&mut self, data: &[u8]) -> Result<()> { + // "input_channel_v1 needs to be only controller" + // We use the reliable channel (v1) for controller + self.send_input(data).await + } + /// Send mouse input over partially reliable channel (lower latency) /// Falls back to reliable channel if mouse channel not ready pub async fn send_mouse_input(&mut self, data: &[u8]) -> Result<()> { @@ -498,8 +507,12 @@ impl WebRtcPeer { return Ok(()); } } - // Fall back to reliable channel - self.send_input(data).await + // Fall back to reliable channel? + // User reports "controller needs to be only path not same as mouse" + // Removing fallback to ensure mouse never pollutes controller channel + // self.send_input(data).await + warn!("Mouse channel not ready, dropping mouse event"); + Ok(()) } /// Check if mouse channel is ready From 54681bce974a3be124e3b6553b577f7e406df56c Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 01:30:36 +0100 Subject: [PATCH 13/67] docs: remove IMPLEMENTATION_PLAN.md --- opennow-streamer/IMPLEMENTATION_PLAN.md | 1008 ----------------------- 1 file changed, 1008 deletions(-) delete mode 100644 opennow-streamer/IMPLEMENTATION_PLAN.md diff --git a/opennow-streamer/IMPLEMENTATION_PLAN.md b/opennow-streamer/IMPLEMENTATION_PLAN.md deleted file mode 100644 index d038309..0000000 --- a/opennow-streamer/IMPLEMENTATION_PLAN.md +++ /dev/null @@ -1,1008 +0,0 @@ -# OpenNow Streamer - Native Client Implementation Plan - -## Executive Summary - -A high-performance, cross-platform native streaming client for GeForce NOW that: -- Works on **Windows, macOS, and Linux** -- Supports **all video codecs**: H.264, H.265/HEVC, AV1 -- Uses **native mouse capture** for minimal latency -- Runs efficiently on **low-end hardware** -- Features the same **stats panel** (bottom-left) as the web client - ---- - -## Architecture Overview - -``` -┌─────────────────────────────────────────────────────────────────┐ -│ OpenNow Streamer │ -├─────────────────────────────────────────────────────────────────┤ -│ ┌──────────────┐ ┌──────────────┐ ┌──────────────────────┐ │ -│ │ GUI Layer │ │ Stats Panel │ │ Settings/Config │ │ -│ │ (winit/wgpu)│ │ (bottom-left)│ │ (JSON persistent) │ │ -│ └──────┬───────┘ └──────┬───────┘ └──────────┬───────────┘ │ -│ │ │ │ │ -│ ┌──────▼─────────────────▼─────────────────────▼───────────┐ │ -│ │ Application Core │ │ -│ │ - Session Management (CloudMatch API) │ │ -│ │ - Authentication (OAuth/JWT) │ │ -│ │ - WebRTC State Machine │ │ -│ └──────┬───────────────────────────────────────┬───────────┘ │ -│ │ │ │ -│ ┌──────▼───────┐ ┌───────────────┐ ┌────────▼────────────┐ │ -│ │ WebRTC │ │ Video Decode │ │ Input Handler │ │ -│ │ (webrtc-rs) │ │ (FFmpeg) │ │ (Platform-native) │ │ -│ │ - Signaling │ │ - H.264 │ │ - Windows: RawInput│ │ -│ │ - ICE/DTLS │ │ - H.265 │ │ - macOS: CGEvent │ │ -│ │ - DataChan │ │ - AV1 │ │ - Linux: evdev │ │ -│ └──────┬───────┘ └───────┬───────┘ └─────────┬───────────┘ │ -│ │ │ │ │ -│ ┌──────▼──────────────────▼────────────────────▼───────────┐ │ -│ │ Media Pipeline │ │ -│ │ RTP → Depacketize → Decode → YUV→RGB → GPU Texture │ │ -│ │ Audio: Opus → PCM → CPAL (cross-platform audio) │ │ -│ └──────────────────────────────────────────────────────────┘ │ -└─────────────────────────────────────────────────────────────────┘ -``` - ---- - -## Component Breakdown - -### 1. Project Structure - -``` -opennow-streamer/ -├── Cargo.toml # Workspace dependencies -├── src/ -│ ├── main.rs # Entry point, CLI args -│ ├── lib.rs # Library exports -│ │ -│ ├── app/ -│ │ ├── mod.rs # Application state machine -│ │ ├── config.rs # Settings (JSON, persistent) -│ │ └── session.rs # GFN session lifecycle -│ │ -│ ├── auth/ -│ │ ├── mod.rs # OAuth flow, token management -│ │ └── jwt.rs # JWT/GFN token handling -│ │ -│ ├── api/ -│ │ ├── mod.rs # HTTP client wrapper -│ │ ├── cloudmatch.rs # Session API (CloudMatch) -│ │ └── games.rs # Game library fetching -│ │ -│ ├── webrtc/ -│ │ ├── mod.rs # WebRTC state machine -│ │ ├── signaling.rs # WebSocket signaling (GFN protocol) -│ │ ├── peer.rs # RTCPeerConnection wrapper -│ │ ├── sdp.rs # SDP parsing/manipulation -│ │ └── datachannel.rs # Input/control channels -│ │ -│ ├── media/ -│ │ ├── mod.rs # Media pipeline orchestration -│ │ ├── rtp.rs # RTP depacketization -│ │ ├── video_decoder.rs # FFmpeg video decode (H.264/H.265/AV1) -│ │ ├── audio_decoder.rs # Opus decode -│ │ └── renderer.rs # GPU texture upload, frame queue -│ │ -│ ├── input/ -│ │ ├── mod.rs # Cross-platform input abstraction -│ │ ├── protocol.rs # GFN binary input protocol encoder -│ │ ├── windows.rs # Windows RawInput + cursor clip -│ │ ├── macos.rs # macOS CGEvent + CGWarpMouseCursorPosition -│ │ └── linux.rs # Linux evdev/libinput -│ │ -│ ├── gui/ -│ │ ├── mod.rs # GUI framework setup -│ │ ├── window.rs # winit window management -│ │ ├── renderer.rs # wgpu rendering pipeline -│ │ ├── stats_panel.rs # Stats overlay (bottom-left) -│ │ └── fullscreen.rs # Fullscreen management -│ │ -│ └── utils/ -│ ├── mod.rs -│ ├── logging.rs # File + console logging -│ └── time.rs # High-precision timestamps -│ -├── assets/ -│ └── shaders/ -│ ├── video.wgsl # YUV→RGB shader -│ └── ui.wgsl # Stats panel shader -│ -└── build.rs # FFmpeg linking, platform setup -``` - -### 2. Core Dependencies (Cargo.toml) - -```toml -[package] -name = "opennow-streamer" -version = "0.1.0" -edition = "2021" - -[dependencies] -# Async runtime -tokio = { version = "1", features = ["full"] } - -# WebRTC -webrtc = "0.12" - -# HTTP client -reqwest = { version = "0.12", features = ["json", "rustls-tls"] } - -# WebSocket (signaling) -tokio-tungstenite = { version = "0.24", features = ["rustls-tls-native-roots"] } - -# Video decoding (FFmpeg bindings) -ffmpeg-next = "7" - -# Audio decoding -opus = "0.3" -audiopus = "0.3" - -# Audio playback (cross-platform) -cpal = "0.15" - -# Window & Graphics -winit = "0.30" -wgpu = "23" -bytemuck = { version = "1", features = ["derive"] } - -# Serialization -serde = { version = "1", features = ["derive"] } -serde_json = "1" - -# Utilities -anyhow = "1" -log = "0.4" -env_logger = "0.11" -parking_lot = "0.12" -bytes = "1" -base64 = "0.22" -sha2 = "0.10" -uuid = { version = "1", features = ["v4"] } -chrono = "0.4" - -# Platform-specific -[target.'cfg(windows)'.dependencies] -windows = { version = "0.58", features = [ - "Win32_UI_WindowsAndMessaging", - "Win32_UI_Input", - "Win32_UI_Input_KeyboardAndMouse", - "Win32_Graphics_Gdi", - "Win32_Foundation", -] } - -[target.'cfg(target_os = "macos")'.dependencies] -core-foundation = "0.10" -core-graphics = "0.24" - -[target.'cfg(target_os = "linux")'.dependencies] -evdev = "0.12" -x11 = { version = "2.21", features = ["xlib"] } -``` - ---- - -## Implementation Phases - -### Phase 1: Core Infrastructure (Week 1) - -#### 1.1 Project Setup -- [ ] Create Cargo workspace -- [ ] Set up build.rs for FFmpeg linking -- [ ] Configure cross-compilation for Windows/macOS/Linux -- [ ] Set up logging infrastructure - -#### 1.2 Configuration System -```rust -// src/app/config.rs -#[derive(Serialize, Deserialize, Default)] -pub struct Settings { - // Video settings - pub resolution: Resolution, - pub fps: u32, // 30, 60, 120, 240, 360 - pub codec: VideoCodec, // H264, H265, AV1 - pub max_bitrate_mbps: u32, // 5-200, 200 = unlimited - - // Audio settings - pub audio_codec: AudioCodec, - pub surround: bool, - - // Performance - pub vsync: bool, - pub low_latency_mode: bool, - pub nvidia_reflex: bool, - - // Input - pub mouse_sensitivity: f32, - pub raw_input: bool, // Windows only - - // Display - pub fullscreen: bool, - pub borderless: bool, - pub stats_panel: bool, - pub stats_position: StatsPosition, - - // Network - pub preferred_region: Option, - pub proxy: Option, -} - -#[derive(Serialize, Deserialize)] -pub enum VideoCodec { - H264, - H265, - AV1, - Auto, // Let server decide -} -``` - -#### 1.3 Authentication Module -- Port OAuth flow from web client -- JWT token management -- Token persistence and refresh - -### Phase 2: WebRTC Implementation (Week 2) - -#### 2.1 Signaling Protocol -```rust -// src/webrtc/signaling.rs -// Ported from native/signaling.rs with improvements - -pub struct GfnSignaling { - server_ip: String, - session_id: String, - ws: Option, - event_tx: mpsc::Sender, -} - -impl GfnSignaling { - pub async fn connect(&mut self) -> Result<()> { - // WebSocket URL: wss://{server}/nvst/sign_in?peer_id=peer-{random}&version=2 - // Subprotocol: x-nv-sessionid.{session_id} - - // Key implementation details from web client: - // 1. Accept self-signed certs (GFN servers) - // 2. Send peer_info immediately after connect - // 3. Handle heartbeats (hb) every 5 seconds - // 4. ACK all messages with ackid - } - - pub async fn send_answer(&self, sdp: &str) -> Result<()>; - pub async fn send_ice_candidate(&self, candidate: &IceCandidate) -> Result<()>; -} -``` - -#### 2.2 Peer Connection Management -```rust -// src/webrtc/peer.rs -// Enhanced from existing webrtc_client.rs - -pub struct WebRtcPeer { - connection: RTCPeerConnection, - input_channel: Option>, - video_track_rx: mpsc::Receiver>, - audio_track_rx: mpsc::Receiver>, -} - -impl WebRtcPeer { - pub async fn handle_offer(&mut self, sdp: &str, ice_servers: Vec) -> Result { - // CRITICAL: Create input_channel_v1 BEFORE setRemoteDescription - // This is required by GFN protocol (discovered from web client) - - let input_channel = self.connection.create_data_channel( - "input_channel_v1", - Some(RTCDataChannelInit { - ordered: Some(false), // Unordered for lowest latency - max_retransmits: Some(0), // No retransmits - ..Default::default() - }), - ).await?; - - // Set remote description (server's offer) - // Create and send answer - // Wait for ICE gathering - } -} -``` - -#### 2.3 SDP Manipulation -```rust -// src/webrtc/sdp.rs -// Codec forcing logic from streaming.ts preferCodec() - -pub fn prefer_codec(sdp: &str, codec: VideoCodec) -> String { - // Parse SDP lines - // Find video section (m=video) - // Identify payload types for each codec via a=rtpmap - // Rewrite m=video line to only include preferred codec payloads - // Remove a=rtpmap, a=fmtp, a=rtcp-fb lines for other codecs -} - -pub fn fix_ice_candidates(sdp: &str, server_ip: &str) -> String { - // Replace 0.0.0.0 with actual server IP - // Add host candidates for ice-lite compatibility -} -``` - -### Phase 3: Media Pipeline (Week 3) - -#### 3.1 RTP Depacketization -```rust -// src/media/rtp.rs - -pub struct RtpDepacketizer { - codec: VideoCodec, - // H.264: NAL unit assembly from fragmented packets - // H.265: Similar NAL unit handling - // AV1: OBU (Open Bitstream Unit) assembly -} - -impl RtpDepacketizer { - pub fn process_packet(&mut self, rtp_data: &[u8]) -> Option { - // Extract payload from RTP - // Handle fragmentation (FU-A for H.264) - // Assemble complete NAL units - // Return complete frames for decoding - } -} -``` - -#### 3.2 Video Decoder (FFmpeg) -```rust -// src/media/video_decoder.rs - -pub struct VideoDecoder { - decoder: ffmpeg::decoder::Video, - scaler: Option, - hw_accel: bool, -} - -impl VideoDecoder { - pub fn new(codec: VideoCodec, hw_accel: bool) -> Result { - let codec_id = match codec { - VideoCodec::H264 => ffmpeg::codec::Id::H264, - VideoCodec::H265 => ffmpeg::codec::Id::HEVC, - VideoCodec::AV1 => ffmpeg::codec::Id::AV1, - }; - - let mut decoder = ffmpeg::decoder::find(codec_id) - .ok_or(anyhow!("Codec not found"))? - .video()?; - - // Try hardware acceleration - if hw_accel { - #[cfg(target_os = "windows")] - Self::try_dxva2(&mut decoder); - - #[cfg(target_os = "macos")] - Self::try_videotoolbox(&mut decoder); - - #[cfg(target_os = "linux")] - Self::try_vaapi(&mut decoder); - } - - Ok(Self { decoder, scaler: None, hw_accel }) - } - - pub fn decode(&mut self, data: &[u8]) -> Result> { - // Send packet to decoder - // Receive frame (YUV420P typically) - // Return decoded frame for rendering - } -} -``` - -#### 3.3 GPU Rendering (wgpu) -```rust -// src/gui/renderer.rs - -pub struct VideoRenderer { - device: wgpu::Device, - queue: wgpu::Queue, - texture: wgpu::Texture, - pipeline: wgpu::RenderPipeline, - // YUV textures for efficient upload - y_texture: wgpu::Texture, - u_texture: wgpu::Texture, - v_texture: wgpu::Texture, -} - -impl VideoRenderer { - pub fn upload_frame(&mut self, frame: &DecodedFrame) { - // Upload Y, U, V planes separately - // This is more efficient than CPU RGB conversion - - self.queue.write_texture( - self.y_texture.as_image_copy(), - &frame.y_plane, - // ... - ); - // Same for U and V - } - - pub fn render(&self, encoder: &mut wgpu::CommandEncoder, view: &wgpu::TextureView) { - // Run YUV→RGB shader - // Draw fullscreen quad with video texture - } -} -``` - -#### 3.4 YUV to RGB Shader -```wgsl -// assets/shaders/video.wgsl - -@group(0) @binding(0) var y_texture: texture_2d; -@group(0) @binding(1) var u_texture: texture_2d; -@group(0) @binding(2) var v_texture: texture_2d; -@group(0) @binding(3) var tex_sampler: sampler; - -@fragment -fn fs_main(@location(0) tex_coords: vec2) -> @location(0) vec4 { - let y = textureSample(y_texture, tex_sampler, tex_coords).r; - let u = textureSample(u_texture, tex_sampler, tex_coords).r - 0.5; - let v = textureSample(v_texture, tex_sampler, tex_coords).r - 0.5; - - // BT.709 YUV to RGB conversion (for HD content) - let r = y + 1.5748 * v; - let g = y - 0.1873 * u - 0.4681 * v; - let b = y + 1.8556 * u; - - return vec4(r, g, b, 1.0); -} -``` - -### Phase 4: Audio Pipeline (Week 4) - -#### 4.1 Opus Decoder -```rust -// src/media/audio_decoder.rs - -pub struct AudioDecoder { - decoder: opus::Decoder, - sample_rate: u32, - channels: opus::Channels, -} - -impl AudioDecoder { - pub fn new(sample_rate: u32, channels: u32) -> Result { - let channels = match channels { - 1 => opus::Channels::Mono, - 2 => opus::Channels::Stereo, - _ => return Err(anyhow!("Unsupported channel count")), - }; - - let decoder = opus::Decoder::new(sample_rate, channels)?; - Ok(Self { decoder, sample_rate, channels }) - } - - pub fn decode(&mut self, data: &[u8]) -> Result> { - let mut output = vec![0i16; 5760]; // Max frame size - let samples = self.decoder.decode(data, &mut output, false)?; - output.truncate(samples * self.channels.count()); - Ok(output) - } -} -``` - -#### 4.2 Audio Playback (cpal) -```rust -// src/media/audio_player.rs - -pub struct AudioPlayer { - stream: cpal::Stream, - buffer_tx: mpsc::Sender>, -} - -impl AudioPlayer { - pub fn new() -> Result { - let host = cpal::default_host(); - let device = host.default_output_device() - .ok_or(anyhow!("No audio output device"))?; - - let config = device.default_output_config()?; - - let (buffer_tx, mut buffer_rx) = mpsc::channel::>(64); - - let stream = device.build_output_stream( - &config.into(), - move |data: &mut [i16], _| { - // Fill from buffer_rx - if let Ok(samples) = buffer_rx.try_recv() { - for (i, sample) in samples.iter().enumerate() { - if i < data.len() { - data[i] = *sample; - } - } - } - }, - |err| eprintln!("Audio error: {}", err), - None, - )?; - - stream.play()?; - Ok(Self { stream, buffer_tx }) - } - - pub fn push_samples(&self, samples: Vec) { - let _ = self.buffer_tx.try_send(samples); - } -} -``` - -### Phase 5: Input System (Week 5) - -#### 5.1 GFN Binary Input Protocol -```rust -// src/input/protocol.rs -// Ported from native/input.rs with full protocol support - -pub const INPUT_HEARTBEAT: u32 = 2; -pub const INPUT_KEY_UP: u32 = 3; -pub const INPUT_KEY_DOWN: u32 = 4; -pub const INPUT_MOUSE_ABS: u32 = 5; -pub const INPUT_MOUSE_REL: u32 = 7; -pub const INPUT_MOUSE_BUTTON_DOWN: u32 = 8; -pub const INPUT_MOUSE_BUTTON_UP: u32 = 9; -pub const INPUT_MOUSE_WHEEL: u32 = 10; - -pub struct InputEncoder { - protocol_version: u8, - stream_start_time: Instant, -} - -impl InputEncoder { - pub fn encode(&self, event: &InputEvent) -> Vec { - let mut buf = BytesMut::with_capacity(32); - - match event { - InputEvent::MouseMove { dx, dy } => { - // Type 7 (Mouse Relative): 22 bytes - // [type 4B LE][dx 2B BE][dy 2B BE][reserved 6B][timestamp 8B BE] - buf.put_u32_le(INPUT_MOUSE_REL); - buf.put_i16(*dx); // BE - buf.put_i16(*dy); // BE - buf.put_u16(0); // Reserved - buf.put_u32(0); // Reserved - buf.put_u64(self.timestamp_us()); - } - InputEvent::KeyDown { scancode, modifiers } => { - // Type 4 (Key Down): 18 bytes - // [type 4B LE][keycode 2B BE][modifiers 2B BE][scancode 2B BE][timestamp 8B BE] - buf.put_u32_le(INPUT_KEY_DOWN); - buf.put_u16(0); // Keycode (unused) - buf.put_u16(*modifiers); - buf.put_u16(*scancode); - buf.put_u64(self.timestamp_us()); - } - // ... other event types - } - - // Protocol v3+ requires header wrapper - if self.protocol_version > 2 { - let mut final_buf = BytesMut::with_capacity(10 + buf.len()); - final_buf.put_u8(0x23); // Header marker - final_buf.put_u64(self.timestamp_us()); - final_buf.put_u8(0x22); // Single event wrapper - final_buf.extend_from_slice(&buf); - final_buf.to_vec() - } else { - buf.to_vec() - } - } - - fn timestamp_us(&self) -> u64 { - self.stream_start_time.elapsed().as_micros() as u64 - } -} -``` - -#### 5.2 Windows Input (Raw Input + Cursor Clip) -```rust -// src/input/windows.rs - -use windows::Win32::UI::Input::*; -use windows::Win32::UI::WindowsAndMessaging::*; - -pub struct WindowsInputHandler { - hwnd: HWND, - cursor_captured: bool, - accumulated_dx: AtomicI32, - accumulated_dy: AtomicI32, -} - -impl WindowsInputHandler { - pub fn capture_cursor(&mut self) -> Result<()> { - unsafe { - // Register for raw input (high-frequency mouse) - let rid = RAWINPUTDEVICE { - usUsagePage: 0x01, // Generic Desktop - usUsage: 0x02, // Mouse - dwFlags: RIDEV_INPUTSINK, - hwndTarget: self.hwnd, - }; - RegisterRawInputDevices(&[rid], std::mem::size_of::() as u32)?; - - // Clip cursor to window - let mut rect = RECT::default(); - GetClientRect(self.hwnd, &mut rect)?; - ClientToScreen(self.hwnd, &mut rect as *mut _ as *mut POINT)?; - ClipCursor(Some(&rect))?; - - // Hide cursor - ShowCursor(false); - - self.cursor_captured = true; - } - Ok(()) - } - - pub fn process_raw_input(&self, raw: &RAWINPUT) -> Option { - if raw.header.dwType == RIM_TYPEMOUSE as u32 { - let mouse = unsafe { raw.data.mouse }; - - // Accumulate deltas (for high-frequency polling) - self.accumulated_dx.fetch_add(mouse.lLastX, Ordering::Relaxed); - self.accumulated_dy.fetch_add(mouse.lLastY, Ordering::Relaxed); - - Some(InputEvent::MouseMove { - dx: mouse.lLastX as i16, - dy: mouse.lLastY as i16, - }) - } else { - None - } - } - - pub fn release_cursor(&mut self) { - unsafe { - ClipCursor(None); - ShowCursor(true); - self.cursor_captured = false; - } - } -} -``` - -#### 5.3 macOS Input (CGEvent + Quartz) -```rust -// src/input/macos.rs - -use core_graphics::event::*; -use core_graphics::display::*; - -pub struct MacOSInputHandler { - event_tap: CFMachPortRef, - run_loop_source: CFRunLoopSourceRef, - cursor_captured: bool, - center_x: f64, - center_y: f64, -} - -impl MacOSInputHandler { - pub fn capture_cursor(&mut self, window_bounds: CGRect) -> Result<()> { - // Calculate window center - self.center_x = window_bounds.origin.x + window_bounds.size.width / 2.0; - self.center_y = window_bounds.origin.y + window_bounds.size.height / 2.0; - - // Hide cursor - CGDisplayHideCursor(CGMainDisplayID()); - - // Warp cursor to center - CGWarpMouseCursorPosition(CGPoint { x: self.center_x, y: self.center_y }); - - // Disassociate mouse and cursor (for FPS games) - CGAssociateMouseAndMouseCursorPosition(0); - - self.cursor_captured = true; - Ok(()) - } - - pub fn handle_mouse_moved(&self, event: CGEvent) -> InputEvent { - let dx = event.get_integer_value_field(CGEventField::MouseEventDeltaX); - let dy = event.get_integer_value_field(CGEventField::MouseEventDeltaY); - - InputEvent::MouseMove { - dx: dx as i16, - dy: dy as i16, - } - } - - pub fn release_cursor(&mut self) { - CGDisplayShowCursor(CGMainDisplayID()); - CGAssociateMouseAndMouseCursorPosition(1); - self.cursor_captured = false; - } -} -``` - -#### 5.4 Linux Input (evdev/libinput) -```rust -// src/input/linux.rs - -use evdev::{Device, InputEventKind, RelativeAxisType}; - -pub struct LinuxInputHandler { - mouse_device: Option, - cursor_captured: bool, -} - -impl LinuxInputHandler { - pub fn new() -> Result { - // Find mouse device - let mouse = evdev::enumerate() - .filter_map(|(_, device)| { - if device.supported_relative_axes().map_or(false, |axes| { - axes.contains(RelativeAxisType::REL_X) && axes.contains(RelativeAxisType::REL_Y) - }) { - Some(device) - } else { - None - } - }) - .next(); - - Ok(Self { - mouse_device: mouse, - cursor_captured: false, - }) - } - - pub fn capture_cursor(&mut self, window: &Window) -> Result<()> { - // Grab mouse device exclusively - if let Some(ref mut device) = self.mouse_device { - device.grab()?; - } - - // Use XGrabPointer for X11 or zwp_pointer_constraints for Wayland - // Hide cursor - - self.cursor_captured = true; - Ok(()) - } - - pub fn poll_events(&mut self) -> Vec { - let mut events = Vec::new(); - - if let Some(ref mut device) = self.mouse_device { - for ev in device.fetch_events().ok().into_iter().flatten() { - match ev.kind() { - InputEventKind::RelAxis(axis) => { - match axis { - RelativeAxisType::REL_X => { - events.push(InputEvent::MouseMove { - dx: ev.value() as i16, - dy: 0, - }); - } - RelativeAxisType::REL_Y => { - events.push(InputEvent::MouseMove { - dx: 0, - dy: ev.value() as i16, - }); - } - _ => {} - } - } - _ => {} - } - } - } - - events - } -} -``` - -### Phase 6: GUI & Stats Panel (Week 6) - -#### 6.1 Stats Panel (Bottom-Left) -```rust -// src/gui/stats_panel.rs - -pub struct StatsPanel { - visible: bool, - position: StatsPosition, // TopLeft, TopRight, BottomLeft, BottomRight - stats: StreamStats, -} - -#[derive(Default)] -pub struct StreamStats { - pub resolution: String, // "1920x1080" - pub fps: f32, // Current FPS - pub target_fps: u32, // Target FPS - pub bitrate_mbps: f32, // Video bitrate - pub latency_ms: f32, // Network latency - pub decode_time_ms: f32, // Frame decode time - pub render_time_ms: f32, // Frame render time - pub codec: String, // "H.264" / "H.265" / "AV1" - pub gpu_type: String, // "RTX 4080" etc - pub server_region: String, // "EU West" - pub packet_loss: f32, // % - pub jitter_ms: f32, -} - -impl StatsPanel { - pub fn render(&self, ctx: &egui::Context) { - if !self.visible { - return; - } - - let anchor = match self.position { - StatsPosition::BottomLeft => egui::Align2::LEFT_BOTTOM, - StatsPosition::BottomRight => egui::Align2::RIGHT_BOTTOM, - StatsPosition::TopLeft => egui::Align2::LEFT_TOP, - StatsPosition::TopRight => egui::Align2::RIGHT_TOP, - }; - - egui::Area::new("stats_panel") - .anchor(anchor, [10.0, -10.0]) - .show(ctx, |ui| { - ui.style_mut().override_font_id = Some(egui::FontId::monospace(12.0)); - - egui::Frame::none() - .fill(egui::Color32::from_rgba_unmultiplied(0, 0, 0, 180)) - .rounding(4.0) - .inner_margin(8.0) - .show(ui, |ui| { - ui.colored_label(egui::Color32::WHITE, format!( - "{} @ {} fps", self.stats.resolution, self.stats.fps as u32 - )); - ui.colored_label(egui::Color32::LIGHT_GRAY, format!( - "{} • {:.1} Mbps", self.stats.codec, self.stats.bitrate_mbps - )); - ui.colored_label(egui::Color32::LIGHT_GRAY, format!( - "Latency: {:.0} ms • Loss: {:.1}%", - self.stats.latency_ms, self.stats.packet_loss - )); - ui.colored_label(egui::Color32::LIGHT_GRAY, format!( - "Decode: {:.1} ms • Render: {:.1} ms", - self.stats.decode_time_ms, self.stats.render_time_ms - )); - ui.colored_label(egui::Color32::DARK_GRAY, format!( - "{} • {}", self.stats.gpu_type, self.stats.server_region - )); - }); - }); - } -} -``` - -#### 6.2 Window Management -```rust -// src/gui/window.rs - -pub struct MainWindow { - window: winit::window::Window, - surface: wgpu::Surface, - device: wgpu::Device, - queue: wgpu::Queue, - fullscreen: bool, -} - -impl MainWindow { - pub fn new(event_loop: &EventLoop<()>) -> Result { - let window = WindowBuilder::new() - .with_title("OpenNow Streamer") - .with_inner_size(LogicalSize::new(1920.0, 1080.0)) - .with_resizable(true) - .build(event_loop)?; - - // Set up wgpu surface - let instance = wgpu::Instance::default(); - let surface = instance.create_surface(&window)?; - - let adapter = pollster::block_on(instance.request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::HighPerformance, - compatible_surface: Some(&surface), - force_fallback_adapter: false, - })).ok_or(anyhow!("No suitable GPU adapter"))?; - - let (device, queue) = pollster::block_on(adapter.request_device( - &wgpu::DeviceDescriptor::default(), - None, - ))?; - - Ok(Self { window, surface, device, queue, fullscreen: false }) - } - - pub fn toggle_fullscreen(&mut self) { - self.fullscreen = !self.fullscreen; - self.window.set_fullscreen(if self.fullscreen { - Some(winit::window::Fullscreen::Borderless(None)) - } else { - None - }); - } -} -``` - ---- - -## Performance Optimizations - -### 1. Low-Latency Video Pipeline -``` -RTP Packet → Zero-Copy Depacketize → HW Decode → Direct GPU Upload - ↓ - Ring buffer (3 frames) - ↓ - Present with minimal vsync delay -``` - -### 2. Input Optimizations -- **Windows**: Raw Input API at 1000Hz polling -- **macOS**: CGEvent tap with disassociated cursor -- **Linux**: evdev with exclusive grab - -### 3. Memory Optimizations -- Pre-allocated frame buffers -- Ring buffer for decoded frames -- Zero-copy where possible - -### 4. Thread Architecture -``` -Main Thread: Window events, rendering -Decode Thread: Video decoding (FFmpeg) -Audio Thread: Audio decode + playback -Network Thread: WebRTC, signaling -Input Thread: High-frequency input polling (Windows) -``` - ---- - -## Build & Distribution - -### Cross-Compilation - -```bash -# Windows (MSVC) -cargo build --release --target x86_64-pc-windows-msvc - -# macOS (Universal) -cargo build --release --target aarch64-apple-darwin -cargo build --release --target x86_64-apple-darwin -lipo -create -output target/opennow-streamer \ - target/aarch64-apple-darwin/release/opennow-streamer \ - target/x86_64-apple-darwin/release/opennow-streamer - -# Linux -cargo build --release --target x86_64-unknown-linux-gnu -``` - -### FFmpeg Bundling -- Windows: Bundle ffmpeg.dll (or statically link) -- macOS: Bundle dylibs or use VideoToolbox -- Linux: Require libffmpeg as system dependency - ---- - -## Testing Strategy - -1. **Unit Tests**: Input encoding, SDP parsing, RTP depacketization -2. **Integration Tests**: WebRTC connection with mock server -3. **Manual Tests**: Real GFN server connection -4. **Performance Tests**: Frame latency, input latency, CPU/GPU usage - ---- - -## Timeline Summary - -| Phase | Duration | Deliverables | -|-------|----------|--------------| -| 1. Core | Week 1 | Project setup, config, auth | -| 2. WebRTC | Week 2 | Signaling, peer connection, SDP | -| 3. Video | Week 3 | RTP, FFmpeg decode, GPU render | -| 4. Audio | Week 4 | Opus decode, cpal playback | -| 5. Input | Week 5 | Platform-native capture | -| 6. GUI | Week 6 | Stats panel, fullscreen, polish | - ---- - -## Next Steps - -1. **Approve this plan** or suggest modifications -2. **Start with Phase 1**: Create project structure -3. **Iterate**: Build incrementally, test each component From d477bab149aa7f6c2f300adb3de14c46ebdff0bb Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 01:42:06 +0100 Subject: [PATCH 14/67] feat: Update CI FFmpeg source for Windows, add `libasound2-dev` for ARM64 Linux builds, and simplify the pull request template. --- .github/PULL_REQUEST_TEMPLATE.md | 43 -------------------------------- .github/workflows/auto-build.yml | 13 +++++----- 2 files changed, 7 insertions(+), 49 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 43b6a14..12dce24 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,46 +1,3 @@ ## Description - -## Related Issue - - -Fixes # - -## Type of Change - - - -- [ ] Bug fix (non-breaking change that fixes an issue) -- [ ] New feature (non-breaking change that adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] Documentation update -- [ ] Refactoring (no functional changes) -- [ ] Performance improvement -- [ ] CI/CD changes - -## Platform Tested - - - -- [ ] macOS -- [ ] Windows -- [ ] Linux - -## Checklist - - - -- [ ] My code follows the project's coding style -- [ ] I have tested my changes locally -- [ ] I have added/updated documentation as needed -- [ ] My changes don't introduce new warnings -- [ ] I have checked that there aren't other open PRs for the same issue - -## Screenshots (if applicable) - - - -## Additional Notes - - diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 0b214da..3e1812d 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -224,12 +224,12 @@ jobs: shell: pwsh run: | # Download shared FFmpeg build from BtbN (GitHub releases) - use master-latest for stability - $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-lgpl-shared.zip" + $ffmpegUrl = "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z" Write-Host "Downloading FFmpeg x64 from $ffmpegUrl..." - Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip + Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.7z Write-Host "Extracting FFmpeg..." - Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg + 7z x ffmpeg.7z -offmpeg $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName Write-Host "FFmpeg extracted to: $ffmpegDir" @@ -325,7 +325,8 @@ jobs: clang \ libclang-dev \ wget \ - libssl-dev:arm64 + libssl-dev:arm64 \ + libasound2-dev:arm64 # Download pre-built FFmpeg ARM64 from BtbN - use master-latest for stability FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm64-lgpl-shared.tar.xz" @@ -351,7 +352,7 @@ jobs: echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=$FFMPEG_DIR/lib/pkgconfig" >> $GITHUB_ENV + echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:$FFMPEG_DIR/lib/pkgconfig" >> $GITHUB_ENV # Set OpenSSL paths for ARM64 cross-compilation echo "OPENSSL_DIR=/usr" >> $GITHUB_ENV @@ -466,7 +467,7 @@ jobs: install_name_tool -id "@executable_path/libs/$libname" "$BUNDLE_DIR/libs/$libname" 2>/dev/null || true return 0 fi - return 1 + return 0 } # Function to fix references in a binary/library From 7f5a7f6016ef3549600979cdd5bd898fd5fd42d6 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 02:00:41 +0100 Subject: [PATCH 15/67] fix: Add FFmpeg DLL.A to LIB renaming for MSVC compatibility and include libudev-dev dependency for ARM64 builds. --- .github/workflows/auto-build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 3e1812d..76b1619 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -261,7 +261,12 @@ jobs: Write-Host "Extracting FFmpeg..." Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName - Write-Host "FFmpeg extracted to: $ffmpegDir" + # Rename .dll.a to .lib for MSVC compatibility (MinGW -> MSVC hack) + Get-ChildItem "$ffmpegDir\lib\*.dll.a" | Rename-Item -NewName { $_.Name -replace '\.dll\.a','.lib' -replace '^lib','' } + + # Verify renaming + Write-Host "`n=== Renamed Lib directory ===" + Get-ChildItem "$ffmpegDir\lib" # Set environment variables for ffmpeg-next crate echo "FFMPEG_DIR=$ffmpegDir" >> $env:GITHUB_ENV @@ -326,7 +331,8 @@ jobs: libclang-dev \ wget \ libssl-dev:arm64 \ - libasound2-dev:arm64 + libasound2-dev:arm64 \ + libudev-dev:arm64 # Download pre-built FFmpeg ARM64 from BtbN - use master-latest for stability FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm64-lgpl-shared.tar.xz" From e551261fb37590c428db48ea7ee8f224fe1c8f49 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 02:15:19 +0100 Subject: [PATCH 16/67] feat: Add GPU vendor detection for optimized hardware video decoder selection and improve build workflow's ffmpeg library renaming and cross-compilation setup. --- .github/workflows/auto-build.yml | 6 +- opennow-streamer/src/media/video.rs | 196 +++++++++++++++++++++++++--- 2 files changed, 179 insertions(+), 23 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 76b1619..1d7bb6c 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -262,7 +262,7 @@ jobs: Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName # Rename .dll.a to .lib for MSVC compatibility (MinGW -> MSVC hack) - Get-ChildItem "$ffmpegDir\lib\*.dll.a" | Rename-Item -NewName { $_.Name -replace '\.dll\.a','.lib' -replace '^lib','' } + Get-ChildItem "$ffmpegDir\lib\*.dll.a" | Rename-Item -NewName { $_.Name -replace '\.dll\.a','.lib' -replace '^lib','' } -Force # Verify renaming Write-Host "`n=== Renamed Lib directory ===" @@ -354,8 +354,8 @@ jobs: echo "FFMPEG_BIN_DIR=$FFMPEG_DIR/bin" >> $GITHUB_ENV # Set cross-compilation environment - echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV - echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV + echo "CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc" >> $GITHUB_ENV + echo "CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++" >> $GITHUB_ENV echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:$FFMPEG_DIR/lib/pkgconfig" >> $GITHUB_ENV diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index f3782c5..3861c7e 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -27,6 +27,102 @@ use ffmpeg::software::scaling::{context::Context as ScalerContext, flag::Flags a use ffmpeg::util::frame::video::Video as FfmpegFrame; use ffmpeg::Packet; +/// GPU Vendor for decoder optimization +#[derive(Debug, PartialEq, Clone, Copy)] +enum GpuVendor { + Nvidia, + Intel, + Amd, + Apple, + Other, + Unknown, +} + +/// Detect the primary GPU vendor using wgpu, prioritizing discrete GPUs +fn detect_gpu_vendor() -> GpuVendor { + // blocked_on because we are in a sync context (VideoDecoder::new) + // but wgpu adapter request is async + pollster::block_on(async { + let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::default()); + + // Enumerate all available adapters + let adapters = instance.enumerate_adapters(wgpu::Backends::all()); + + let mut best_score = -1; + let mut best_vendor = GpuVendor::Unknown; + + info!("Available GPU adapters:"); + + for adapter in adapters { + let info = adapter.get_info(); + let name = info.name.to_lowercase(); + let mut score = 0; + let mut vendor = GpuVendor::Other; + + // Identify vendor + if name.contains("nvidia") || name.contains("geforce") || name.contains("quadro") { + vendor = GpuVendor::Nvidia; + score += 100; + } else if name.contains("amd") || name.contains("adeon") || name.contains("ryzen") { + vendor = GpuVendor::Amd; + score += 80; + } else if name.contains("intel") || name.contains("uhd") || name.contains("iris") || name.contains("arc") { + vendor = GpuVendor::Intel; + score += 50; + } else if name.contains("apple") || name.contains("m1") || name.contains("m2") || name.contains("m3") { + vendor = GpuVendor::Apple; + score += 90; // Apple Silicon is high perf + } + + // Prioritize discrete GPUs + match info.device_type { + wgpu::DeviceType::DiscreteGpu => { + score += 50; + } + wgpu::DeviceType::IntegratedGpu => { + score += 10; + } + _ => {} + } + + info!(" - {} ({:?}, Vendor: {:?}, Score: {})", info.name, info.device_type, vendor, score); + + if score > best_score { + best_score = score; + best_vendor = vendor; + } + } + + if best_vendor != GpuVendor::Unknown { + info!("Selected best GPU vendor: {:?}", best_vendor); + best_vendor + } else { + // Fallback to default request if enumeration fails + warn!("Adapter enumeration yielded no results, trying default request"); + let adapter = instance + .request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::HighPerformance, + compatible_surface: None, + force_fallback_adapter: false, + }) + .await; + + if let Some(adapter) = adapter { + let info = adapter.get_info(); + let name = info.name.to_lowercase(); + + if name.contains("nvidia") { GpuVendor::Nvidia } + else if name.contains("intel") { GpuVendor::Intel } + else if name.contains("amd") { GpuVendor::Amd } + else if name.contains("apple") { GpuVendor::Apple } + else { GpuVendor::Other } + } else { + GpuVendor::Unknown + } + } + }) +} + /// Check if Intel QSV runtime is available on the system /// Returns true if the required DLLs are found #[cfg(target_os = "windows")] @@ -95,6 +191,11 @@ fn is_qsv_runtime_available() -> bool { // On Linux, check for libmfx.so or libvpl.so use std::process::Command; + // QSV is only supported on Intel architectures + if !cfg!(target_arch = "x86") && !cfg!(target_arch = "x86_64") { + return false; + } + if let Ok(output) = Command::new("ldconfig").arg("-p").output() { let libs = String::from_utf8_lossy(&output.stdout); if libs.contains("libmfx") || libs.contains("libvpl") { @@ -498,6 +599,10 @@ impl VideoDecoder { #[cfg(not(target_os = "macos"))] let qsv_available = check_qsv_available(); + // Detect GPU vendor to prioritize correct decoder + #[cfg(not(target_os = "macos"))] + let gpu_vendor = detect_gpu_vendor(); + // Try hardware decoders in order of preference // Platform-specific hardware decoders: // - Windows: CUVID (NVIDIA), QSV (Intel), D3D11VA, DXVA2 @@ -507,58 +612,109 @@ impl VideoDecoder { ffmpeg::codec::Id::H264 => { #[cfg(target_os = "windows")] { - let mut decoders = vec!["h264_cuvid"]; // NVIDIA first - if qsv_available { - decoders.push("h264_qsv"); // Intel QSV (only if runtime detected) + // Default priority: D3D11 (safe/modern) + let mut decoders = Vec::new(); + + // Prioritize based on vendor + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("h264_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), + _ => {} } - decoders.push("h264_d3d11va"); // Windows D3D11 (AMD/Intel/NVIDIA) - decoders.push("h264_dxva2"); // Windows DXVA2 (older API) + + // Add standard APIs + decoders.push("h264_d3d11va"); + + // Add remaining helpers as fallback + if gpu_vendor != GpuVendor::Nvidia { decoders.push("h264_cuvid"); } // Try CUDA anyway just in case + if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("h264_qsv"); } + + decoders.push("h264_dxva2"); decoders } #[cfg(target_os = "linux")] { - let mut decoders = vec!["h264_cuvid", "h264_vaapi"]; - if qsv_available { - decoders.push("h264_qsv"); + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("h264_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), + GpuVendor::Amd => decoders.push("h264_vaapi"), + _ => {} } + + // Fallbacks + if !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } + if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } + if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } + decoders } } ffmpeg::codec::Id::HEVC => { #[cfg(target_os = "windows")] { - let mut decoders = vec!["hevc_cuvid"]; - if qsv_available { - decoders.push("hevc_qsv"); + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("hevc_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), + _ => {} } decoders.push("hevc_d3d11va"); + + if gpu_vendor != GpuVendor::Nvidia { decoders.push("hevc_cuvid"); } + if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("hevc_qsv"); } + decoders.push("hevc_dxva2"); decoders } #[cfg(target_os = "linux")] { - let mut decoders = vec!["hevc_cuvid", "hevc_vaapi"]; - if qsv_available { - decoders.push("hevc_qsv"); + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("hevc_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), + GpuVendor::Amd => decoders.push("hevc_vaapi"), + _ => {} } + + if !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } + if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } + if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } + decoders } } ffmpeg::codec::Id::AV1 => { #[cfg(target_os = "windows")] { - let mut decoders = vec!["av1_cuvid"]; - if qsv_available { - decoders.push("av1_qsv"); + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("av1_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), + _ => {} } + // AV1 D3D11 is often "av1_d3d11va" or managed automatically, but FFmpeg naming varies. + // Usually av1_cuvid / av1_qsv are the explicit ones. + + if gpu_vendor != GpuVendor::Nvidia { decoders.push("av1_cuvid"); } + if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("av1_qsv"); } + decoders } #[cfg(target_os = "linux")] { - let mut decoders = vec!["av1_cuvid", "av1_vaapi"]; - if qsv_available { - decoders.push("av1_qsv"); + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("av1_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), + GpuVendor::Amd => decoders.push("av1_vaapi"), + _ => {} } + + if !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } + if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } + if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } + decoders } } From f309bc7ed52c77dbaf8d1c9f7cfcb9ef6626f938 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 02:18:40 +0100 Subject: [PATCH 17/67] fix: Adapt to wgpu API changes by borrowing `InstanceDescriptor` and handling `request_adapter` as a `Result`. --- opennow-streamer/src/media/video.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 3861c7e..2d8a5cc 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -43,7 +43,7 @@ fn detect_gpu_vendor() -> GpuVendor { // blocked_on because we are in a sync context (VideoDecoder::new) // but wgpu adapter request is async pollster::block_on(async { - let instance = wgpu::Instance::new(wgpu::InstanceDescriptor::default()); + let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor::default()); // Needs borrow // Enumerate all available adapters let adapters = instance.enumerate_adapters(wgpu::Backends::all()); @@ -99,7 +99,18 @@ fn detect_gpu_vendor() -> GpuVendor { } else { // Fallback to default request if enumeration fails warn!("Adapter enumeration yielded no results, trying default request"); - let adapter = instance + // request_adapter returns impl Future> in 0.19/0.20, but compiler says Result? + // Checking wgpu 0.17+ it returns Option. + // Wait, the error says: expected `Result`, found `Option<_>` + // NOTE: This implies the user is on wgpu v22+ or v23+ where it might return Result. + // Actually, usually request_adapter returns an Option. + // Let's re-read the error carefully: + // 110: if let Some(adapter) = adapter { + // ^^^ this expression has type `std::result::Result` + // So `adapter` is a `Result`. + // `request_adapter` returned a future that resolved to `Result`. + + let adapter_result = instance .request_adapter(&wgpu::RequestAdapterOptions { power_preference: wgpu::PowerPreference::HighPerformance, compatible_surface: None, @@ -107,7 +118,8 @@ fn detect_gpu_vendor() -> GpuVendor { }) .await; - if let Some(adapter) = adapter { + // Handle Result + if let Ok(adapter) = adapter_result { let info = adapter.get_info(); let name = info.name.to_lowercase(); From 28fda44f5b1266e3db8eab9d67cf996195c4a723 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 02:27:21 +0100 Subject: [PATCH 18/67] fix: Suppress errors when renaming FFmpeg library files in the auto-build workflow. --- .github/workflows/auto-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 1d7bb6c..40fc813 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -262,7 +262,7 @@ jobs: Expand-Archive -Path ffmpeg.zip -DestinationPath ffmpeg $ffmpegDir = (Get-ChildItem -Path ffmpeg -Directory)[0].FullName # Rename .dll.a to .lib for MSVC compatibility (MinGW -> MSVC hack) - Get-ChildItem "$ffmpegDir\lib\*.dll.a" | Rename-Item -NewName { $_.Name -replace '\.dll\.a','.lib' -replace '^lib','' } -Force + Get-ChildItem "$ffmpegDir\lib\*.dll.a" | Rename-Item -NewName { $_.Name -replace '\.dll\.a','.lib' -replace '^lib','' } -Force -ErrorAction SilentlyContinue # Verify renaming Write-Host "`n=== Renamed Lib directory ===" From 2abdf9fa2f1d94b89e464546e28fdc8da4f4c1cc Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 02:51:56 +0100 Subject: [PATCH 19/67] feat: Add user-selectable video decoder backends with UI and platform-specific detection. --- opennow-streamer/src/app/config.rs | 51 +++ opennow-streamer/src/app/mod.rs | 1 + opennow-streamer/src/app/types.rs | 3 +- opennow-streamer/src/gui/screens/mod.rs | 28 +- opennow-streamer/src/media/mod.rs | 2 +- opennow-streamer/src/media/video.rs | 468 +++++++++++++----------- opennow-streamer/src/webrtc/mod.rs | 2 +- 7 files changed, 345 insertions(+), 210 deletions(-) diff --git a/opennow-streamer/src/app/config.rs b/opennow-streamer/src/app/config.rs index e2e5d0c..1f3be5d 100644 --- a/opennow-streamer/src/app/config.rs +++ b/opennow-streamer/src/app/config.rs @@ -26,6 +26,9 @@ pub struct Settings { /// Maximum bitrate in Mbps (200 = unlimited) pub max_bitrate_mbps: u32, + /// Preferred video decoder backend + pub decoder_backend: VideoDecoderBackend, + // === Audio Settings === /// Audio codec pub audio_codec: AudioCodec, @@ -89,6 +92,7 @@ impl Default for Settings { fps: 60, codec: VideoCodec::H264, max_bitrate_mbps: 150, + decoder_backend: VideoDecoderBackend::Auto, // Audio audio_codec: AudioCodec::Opus, @@ -275,6 +279,53 @@ pub enum VideoCodec { AV1, } +/// Video decoder backend preference +#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)] +#[serde(rename_all = "lowercase")] +pub enum VideoDecoderBackend { + /// Auto-detect best decoder + #[default] + Auto, + /// NVIDIA CUDA/CUVID + Cuvid, + /// Intel QuickSync + Qsv, + /// AMD VA-API + Vaapi, + /// DirectX 11/12 (Windows) + Dxva, + /// VideoToolbox (macOS) + VideoToolbox, + /// Software decoding (CPU) + Software, +} + +impl VideoDecoderBackend { + pub fn as_str(&self) -> &'static str { + match self { + VideoDecoderBackend::Auto => "Auto", + VideoDecoderBackend::Cuvid => "NVIDIA (CUDA)", + VideoDecoderBackend::Qsv => "Intel (QuickSync)", + VideoDecoderBackend::Vaapi => "AMD (VA-API)", + VideoDecoderBackend::Dxva => "DirectX (DXVA)", + VideoDecoderBackend::VideoToolbox => "VideoToolbox", + VideoDecoderBackend::Software => "Software (CPU)", + } + } + + pub fn all() -> &'static [VideoDecoderBackend] { + &[ + VideoDecoderBackend::Auto, + VideoDecoderBackend::Cuvid, + VideoDecoderBackend::Qsv, + VideoDecoderBackend::Vaapi, + VideoDecoderBackend::Dxva, + VideoDecoderBackend::VideoToolbox, + VideoDecoderBackend::Software, + ] + } +} + impl VideoCodec { pub fn as_str(&self) -> &'static str { match self { diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index 2e8f46e..9ada3ae 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -290,6 +290,7 @@ impl App { SettingChange::Fullscreen(fs) => self.settings.fullscreen = fs, SettingChange::VSync(vsync) => self.settings.vsync = vsync, SettingChange::LowLatency(ll) => self.settings.low_latency_mode = ll, + SettingChange::DecoderBackend(backend) => self.settings.decoder_backend = backend, } self.save_settings(); } diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index 9c79b92..2e7e8b6 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -6,7 +6,7 @@ use std::sync::atomic::{AtomicU64, Ordering}; use parking_lot::Mutex; use crate::media::VideoFrame; -use super::config::VideoCodec; +use super::config::{VideoCodec, VideoDecoderBackend}; /// Shared frame holder for zero-latency frame delivery /// Decoder writes latest frame, renderer reads it - no buffering @@ -190,6 +190,7 @@ pub enum SettingChange { Fullscreen(bool), VSync(bool), LowLatency(bool), + DecoderBackend(VideoDecoderBackend), } /// Application state enum diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs index 6b91941..36efcd3 100644 --- a/opennow-streamer/src/gui/screens/mod.rs +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -144,8 +144,32 @@ pub fn render_settings_modal( if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::H265), "H.265").clicked() { actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::H265))); } - if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::AV1), "AV1").clicked() { - actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::AV1))); + if crate::media::is_av1_hardware_supported() { + if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::AV1), "AV1").clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::AV1))); + } + } + }); + }); + }); + + ui.add_space(12.0); + + // Decoder selection + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Video Decoder") + .size(14.0) + .color(egui::Color32::LIGHT_GRAY) + ); + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + egui::ComboBox::from_id_salt("decoder_combo") + .selected_text(settings.decoder_backend.as_str()) + .show_ui(ui, |ui| { + for backend in crate::media::get_supported_decoder_backends() { + if ui.selectable_label(settings.decoder_backend == backend, backend.as_str()).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::DecoderBackend(backend))); + } } }); }); diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs index 27c2990..6ca11fd 100644 --- a/opennow-streamer/src/media/mod.rs +++ b/opennow-streamer/src/media/mod.rs @@ -9,7 +9,7 @@ mod rtp; #[cfg(target_os = "macos")] pub mod videotoolbox; -pub use video::{VideoDecoder, DecodeStats, is_av1_hardware_supported}; +pub use video::{VideoDecoder, DecodeStats, is_av1_hardware_supported, get_supported_decoder_backends}; pub use rtp::{RtpDepacketizer, DepacketizerCodec}; pub use audio::*; diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 2d8a5cc..557e4c3 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -17,7 +17,7 @@ use tokio::sync::mpsc as tokio_mpsc; use std::path::Path; use super::{VideoFrame, PixelFormat, ColorRange, ColorSpace}; -use crate::app::{VideoCodec, SharedFrame}; +use crate::app::{VideoCodec, SharedFrame, config::VideoDecoderBackend}; extern crate ffmpeg_next as ffmpeg; @@ -29,7 +29,7 @@ use ffmpeg::Packet; /// GPU Vendor for decoder optimization #[derive(Debug, PartialEq, Clone, Copy)] -enum GpuVendor { +pub enum GpuVendor { Nvidia, Intel, Amd, @@ -39,7 +39,7 @@ enum GpuVendor { } /// Detect the primary GPU vendor using wgpu, prioritizing discrete GPUs -fn detect_gpu_vendor() -> GpuVendor { +pub fn detect_gpu_vendor() -> GpuVendor { // blocked_on because we are in a sync context (VideoDecoder::new) // but wgpu adapter request is async pollster::block_on(async { @@ -289,6 +289,54 @@ pub fn is_av1_hardware_supported() -> bool { }) } +/// Get list of supported decoder backends for the current system +pub fn get_supported_decoder_backends() -> Vec { + let mut backends = vec![VideoDecoderBackend::Auto]; + + // Always check what's actually available + #[cfg(target_os = "macos")] + { + backends.push(VideoDecoderBackend::VideoToolbox); + } + + #[cfg(target_os = "windows")] + { + let gpu = detect_gpu_vendor(); + let qsv = check_qsv_available(); + + if gpu == GpuVendor::Nvidia { + backends.push(VideoDecoderBackend::Cuvid); + } + + if qsv || gpu == GpuVendor::Intel { + backends.push(VideoDecoderBackend::Qsv); + } + + // DXVA is generally available on Windows + backends.push(VideoDecoderBackend::Dxva); + } + + #[cfg(target_os = "linux")] + { + let gpu = detect_gpu_vendor(); + let qsv = check_qsv_available(); + + if gpu == GpuVendor::Nvidia { + backends.push(VideoDecoderBackend::Cuvid); + } + + if qsv || gpu == GpuVendor::Intel { + backends.push(VideoDecoderBackend::Qsv); + } + + // VAAPI is generally available on Linux (AMD/Intel) + backends.push(VideoDecoderBackend::Vaapi); + } + + backends.push(VideoDecoderBackend::Software); + backends +} + /// Commands sent to the decoder thread enum DecoderCommand { /// Decode a packet and return result via channel (blocking mode) @@ -327,7 +375,7 @@ pub struct VideoDecoder { impl VideoDecoder { /// Create a new video decoder with hardware acceleration - pub fn new(codec: VideoCodec) -> Result { + pub fn new(codec: VideoCodec, backend: VideoDecoderBackend) -> Result { // Initialize FFmpeg ffmpeg::init().map_err(|e| anyhow!("Failed to initialize FFmpeg: {:?}", e))?; @@ -336,7 +384,7 @@ impl VideoDecoder { ffmpeg::ffi::av_log_set_level(ffmpeg::ffi::AV_LOG_ERROR as i32); } - info!("Creating FFmpeg video decoder for {:?}", codec); + info!("Creating FFmpeg video decoder for {:?} (backend: {:?})", codec, backend); // Find the decoder let decoder_id = match codec { @@ -350,7 +398,7 @@ impl VideoDecoder { let (frame_tx, frame_rx) = mpsc::channel::>(); // Create decoder in a separate thread (FFmpeg types are not Send) - let hw_accel = Self::spawn_decoder_thread(decoder_id, cmd_rx, frame_tx, None, None)?; + let hw_accel = Self::spawn_decoder_thread(decoder_id, cmd_rx, frame_tx, None, None, backend)?; if hw_accel { info!("Using hardware-accelerated decoder"); @@ -370,7 +418,7 @@ impl VideoDecoder { /// Create a new video decoder configured for non-blocking async mode /// Decoded frames are written directly to the SharedFrame - pub fn new_async(codec: VideoCodec, shared_frame: Arc) -> Result<(Self, tokio_mpsc::Receiver)> { + pub fn new_async(codec: VideoCodec, backend: VideoDecoderBackend, shared_frame: Arc) -> Result<(Self, tokio_mpsc::Receiver)> { // Initialize FFmpeg ffmpeg::init().map_err(|e| anyhow!("Failed to initialize FFmpeg: {:?}", e))?; @@ -379,7 +427,7 @@ impl VideoDecoder { ffmpeg::ffi::av_log_set_level(ffmpeg::ffi::AV_LOG_ERROR as i32); } - info!("Creating FFmpeg video decoder (async mode) for {:?}", codec); + info!("Creating FFmpeg video decoder (async mode) for {:?} (backend: {:?})", codec, backend); // Find the decoder let decoder_id = match codec { @@ -402,6 +450,7 @@ impl VideoDecoder { frame_tx, Some(shared_frame.clone()), Some(stats_tx), + backend )?; if hw_accel { @@ -429,10 +478,11 @@ impl VideoDecoder { frame_tx: mpsc::Sender>, shared_frame: Option>, stats_tx: Option>, + backend: VideoDecoderBackend, ) -> Result { // Create decoder synchronously to report hw_accel status info!("Creating decoder for codec {:?}...", codec_id); - let (decoder, hw_accel) = Self::create_decoder(codec_id)?; + let (decoder, hw_accel) = Self::create_decoder(codec_id, backend)?; info!("Decoder created, hw_accel={}", hw_accel); // Spawn thread to handle decoding @@ -541,221 +591,229 @@ impl VideoDecoder { Ok(hw_accel) } - /// Create decoder, trying hardware acceleration first - fn create_decoder(codec_id: ffmpeg::codec::Id) -> Result<(decoder::Video, bool)> { + /// Create decoder, trying hardware acceleration based on preference + fn create_decoder(codec_id: ffmpeg::codec::Id, backend: VideoDecoderBackend) -> Result<(decoder::Video, bool)> { + info!("create_decoder: {:?} with backend preference {:?}", codec_id, backend); + // On macOS, try VideoToolbox hardware acceleration #[cfg(target_os = "macos")] { - info!("macOS detected - attempting VideoToolbox hardware acceleration"); - - // Try to set up VideoToolbox hwaccel using FFmpeg's device API - unsafe { - use ffmpeg::ffi::*; - use std::ptr; - - // Find the standard decoder - let codec = ffmpeg::codec::decoder::find(codec_id) - .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; - - let mut ctx = CodecContext::new_with_codec(codec); - - // Get raw pointer to AVCodecContext - let raw_ctx = ctx.as_mut_ptr(); - - // Create VideoToolbox hardware device context - let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); - let ret = av_hwdevice_ctx_create( - &mut hw_device_ctx, - AVHWDeviceType::AV_HWDEVICE_TYPE_VIDEOTOOLBOX, - ptr::null(), - ptr::null_mut(), - 0, - ); - - if ret >= 0 && !hw_device_ctx.is_null() { - // Attach hardware device context to codec context - (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); - - // Enable multi-threading - (*raw_ctx).thread_count = 4; - - match ctx.decoder().video() { - Ok(decoder) => { - info!("VideoToolbox hardware decoder created successfully"); - // Don't free hw_device_ctx - it's now owned by the codec context - return Ok((decoder, true)); - } - Err(e) => { - warn!("Failed to open VideoToolbox decoder: {:?}", e); - av_buffer_unref(&mut hw_device_ctx); + if backend == VideoDecoderBackend::Auto || backend == VideoDecoderBackend::VideoToolbox { + info!("macOS detected - attempting VideoToolbox hardware acceleration"); + + // Try to set up VideoToolbox hwaccel using FFmpeg's device API + unsafe { + use ffmpeg::ffi::*; + use std::ptr; + + // Find the standard decoder + let codec = ffmpeg::codec::decoder::find(codec_id) + .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; + + let mut ctx = CodecContext::new_with_codec(codec); + + // Get raw pointer to AVCodecContext + let raw_ctx = ctx.as_mut_ptr(); + + // Create VideoToolbox hardware device context + let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); + let ret = av_hwdevice_ctx_create( + &mut hw_device_ctx, + AVHWDeviceType::AV_HWDEVICE_TYPE_VIDEOTOOLBOX, + ptr::null(), + ptr::null_mut(), + 0, + ); + + if ret >= 0 && !hw_device_ctx.is_null() { + // Attach hardware device context to codec context + (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); + + // Enable multi-threading + (*raw_ctx).thread_count = 4; + + match ctx.decoder().video() { + Ok(decoder) => { + info!("VideoToolbox hardware decoder created successfully"); + // Don't free hw_device_ctx - it's now owned by the codec context + return Ok((decoder, true)); + } + Err(e) => { + warn!("Failed to open VideoToolbox decoder: {:?}", e); + av_buffer_unref(&mut hw_device_ctx); + } } + } else { + warn!("Failed to create VideoToolbox device context (error {})", ret); } - } else { - warn!("Failed to create VideoToolbox device context (error {})", ret); } + } else { + info!("VideoToolbox disabled by preference: {:?}", backend); } - - // Fall back to software decoder on macOS - info!("Falling back to software decoder on macOS"); - let codec = ffmpeg::codec::decoder::find(codec_id) - .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id))?; - - let mut ctx = CodecContext::new_with_codec(codec); - ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); - - let decoder = ctx.decoder().video()?; - return Ok((decoder, false)); } - // Check if Intel QSV runtime is available (cached, only checks once) + // Platform-specific hardware decoders (Windows/Linux) #[cfg(not(target_os = "macos"))] - let qsv_available = check_qsv_available(); - - // Detect GPU vendor to prioritize correct decoder - #[cfg(not(target_os = "macos"))] - let gpu_vendor = detect_gpu_vendor(); - - // Try hardware decoders in order of preference - // Platform-specific hardware decoders: - // - Windows: CUVID (NVIDIA), QSV (Intel), D3D11VA, DXVA2 - // - Linux: CUVID, VAAPI, QSV - #[cfg(not(target_os = "macos"))] - let hw_decoder_names: Vec<&str> = match codec_id { - ffmpeg::codec::Id::H264 => { - #[cfg(target_os = "windows")] - { - // Default priority: D3D11 (safe/modern) - let mut decoders = Vec::new(); - - // Prioritize based on vendor - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("h264_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), - _ => {} - } - - // Add standard APIs - decoders.push("h264_d3d11va"); - - // Add remaining helpers as fallback - if gpu_vendor != GpuVendor::Nvidia { decoders.push("h264_cuvid"); } // Try CUDA anyway just in case - if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("h264_qsv"); } - - decoders.push("h264_dxva2"); - decoders - } - #[cfg(target_os = "linux")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("h264_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), - GpuVendor::Amd => decoders.push("h264_vaapi"), - _ => {} - } - - // Fallbacks - if !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } - if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } - if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } - - decoders - } - } - ffmpeg::codec::Id::HEVC => { - #[cfg(target_os = "windows")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("hevc_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), - _ => {} + { + let hw_decoder_names: Vec<&str> = if backend == VideoDecoderBackend::Software { + info!("Hardware acceleration disabled by preference (Software selected)"); + vec![] + } else if backend != VideoDecoderBackend::Auto { + // Explicit backend selection + match (backend, codec_id) { + (VideoDecoderBackend::Cuvid, ffmpeg::codec::Id::H264) => vec!["h264_cuvid"], + (VideoDecoderBackend::Cuvid, ffmpeg::codec::Id::HEVC) => vec!["hevc_cuvid"], + (VideoDecoderBackend::Cuvid, ffmpeg::codec::Id::AV1) => vec!["av1_cuvid"], + + (VideoDecoderBackend::Qsv, ffmpeg::codec::Id::H264) => vec!["h264_qsv"], + (VideoDecoderBackend::Qsv, ffmpeg::codec::Id::HEVC) => vec!["hevc_qsv"], + (VideoDecoderBackend::Qsv, ffmpeg::codec::Id::AV1) => vec!["av1_qsv"], + + (VideoDecoderBackend::Vaapi, ffmpeg::codec::Id::H264) => vec!["h264_vaapi"], + (VideoDecoderBackend::Vaapi, ffmpeg::codec::Id::HEVC) => vec!["hevc_vaapi"], + (VideoDecoderBackend::Vaapi, ffmpeg::codec::Id::AV1) => vec!["av1_vaapi"], + + (VideoDecoderBackend::Dxva, ffmpeg::codec::Id::H264) => vec!["h264_d3d11va", "h264_dxva2"], + (VideoDecoderBackend::Dxva, ffmpeg::codec::Id::HEVC) => vec!["hevc_d3d11va", "hevc_dxva2"], + (VideoDecoderBackend::Dxva, ffmpeg::codec::Id::AV1) => vec!["av1_d3d11va", "av1_dxva2"], + + _ => { + warn!("No decoder found for backend {:?} and codec {:?}", backend, codec_id); + vec![] } - decoders.push("hevc_d3d11va"); - - if gpu_vendor != GpuVendor::Nvidia { decoders.push("hevc_cuvid"); } - if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("hevc_qsv"); } - - decoders.push("hevc_dxva2"); - decoders } - #[cfg(target_os = "linux")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("hevc_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), - GpuVendor::Amd => decoders.push("hevc_vaapi"), - _ => {} + } else { + // Auto detection logic + let qsv_available = check_qsv_available(); + let gpu_vendor = detect_gpu_vendor(); + + match codec_id { + ffmpeg::codec::Id::H264 => { + #[cfg(target_os = "windows")] + { + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("h264_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), + _ => {} + } + decoders.push("h264_d3d11va"); // Standard API + // Fallback + if gpu_vendor != GpuVendor::Nvidia { decoders.push("h264_cuvid"); } + if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("h264_qsv"); } + decoders.push("h264_dxva2"); + decoders + } + #[cfg(target_os = "linux")] + { + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("h264_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), + GpuVendor::Amd => decoders.push("h264_vaapi"), + _ => {} + } + if !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } + if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } + if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } + decoders + } + #[cfg(not(any(target_os = "windows", target_os = "linux")))] + vec![] } - - if !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } - if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } - if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } - - decoders - } - } - ffmpeg::codec::Id::AV1 => { - #[cfg(target_os = "windows")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("av1_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), - _ => {} + ffmpeg::codec::Id::HEVC => { + #[cfg(target_os = "windows")] + { + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("hevc_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), + _ => {} + } + decoders.push("hevc_d3d11va"); + if gpu_vendor != GpuVendor::Nvidia { decoders.push("hevc_cuvid"); } + if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("hevc_qsv"); } + decoders.push("hevc_dxva2"); + decoders + } + #[cfg(target_os = "linux")] + { + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("hevc_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), + GpuVendor::Amd => decoders.push("hevc_vaapi"), + _ => {} + } + if !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } + if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } + if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } + decoders + } + #[cfg(not(any(target_os = "windows", target_os = "linux")))] + vec![] } - // AV1 D3D11 is often "av1_d3d11va" or managed automatically, but FFmpeg naming varies. - // Usually av1_cuvid / av1_qsv are the explicit ones. - - if gpu_vendor != GpuVendor::Nvidia { decoders.push("av1_cuvid"); } - if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("av1_qsv"); } - - decoders - } - #[cfg(target_os = "linux")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("av1_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), - GpuVendor::Amd => decoders.push("av1_vaapi"), - _ => {} + ffmpeg::codec::Id::AV1 => { + #[cfg(target_os = "windows")] + { + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("av1_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), + _ => {} + } + if gpu_vendor != GpuVendor::Nvidia { decoders.push("av1_cuvid"); } + if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("av1_qsv"); } + decoders + } + #[cfg(target_os = "linux")] + { + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("av1_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), + GpuVendor::Amd => decoders.push("av1_vaapi"), + _ => {} + } + if !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } + if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } + if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } + decoders + } + #[cfg(not(any(target_os = "windows", target_os = "linux")))] + vec![] } - - if !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } - if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } - if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } - - decoders + _ => vec![], } - } - _ => vec![], - }; - - // Try hardware decoders (Windows/Linux) - #[cfg(not(target_os = "macos"))] - { - info!("Attempting hardware decoders for {:?}: {:?}", codec_id, hw_decoder_names); - for hw_name in &hw_decoder_names { - if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { - info!("Found hardware decoder: {}, attempting to open...", hw_name); - // new_with_codec returns Context directly, not Result - let mut ctx = CodecContext::new_with_codec(hw_codec); - ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); - - match ctx.decoder().video() { - Ok(dec) => { - info!("Successfully created hardware decoder: {}", hw_name); - return Ok((dec, true)); - } - Err(e) => { - warn!("Failed to open hardware decoder {}: {:?}", hw_name, e); + }; + + if !hw_decoder_names.is_empty() { + info!("Attempting hardware decoders for {:?}: {:?}", codec_id, hw_decoder_names); + for hw_name in &hw_decoder_names { + if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { + info!("Found hardware decoder: {}, attempting to open...", hw_name); + let mut ctx = CodecContext::new_with_codec(hw_codec); + ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + match ctx.decoder().video() { + Ok(dec) => { + info!("Successfully created hardware decoder: {}", hw_name); + return Ok((dec, true)); + } + Err(e) => { + warn!("Failed to open hardware decoder {}: {:?}", hw_name, e); + } } + } else { + debug!("Hardware decoder not found: {}", hw_name); } - } else { - debug!("Hardware decoder not found: {}", hw_name); } + + if backend != VideoDecoderBackend::Auto { + warn!("Explicitly selected backend {:?} failed to initialize. Falling back to software.", backend); + } + } else if backend != VideoDecoderBackend::Software && backend != VideoDecoderBackend::Auto { + warn!("No decoder mapped for explicit backend {:?} with codec {:?}", backend, codec_id); } } diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index dfc70f6..4254b26 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -250,7 +250,7 @@ pub async fn run_streaming( // Video decoder - use async mode for non-blocking decode // Decoded frames are written directly to SharedFrame by the decoder thread - let (mut video_decoder, mut decode_stats_rx) = VideoDecoder::new_async(codec, shared_frame.clone())?; + let (mut video_decoder, mut decode_stats_rx) = VideoDecoder::new_async(codec, settings.decoder_backend, shared_frame.clone())?; // Create RTP depacketizer with correct codec let depacketizer_codec = match codec { From fce1dc06b42f3b53de06df42f20e5a775923f401 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 11:49:08 +0100 Subject: [PATCH 20/67] feat: Introduce initial client application with session management, CloudMatch API integration, and reverse engineering documentation. --- opennow-streamer/reverse/audio.md | 242 +++++++++++++++ opennow-streamer/reverse/controller.md | 268 ++++++++++++++++ opennow-streamer/reverse/cursor.md | 274 ++++++++++++++++ opennow-streamer/reverse/datachannel.md | 306 ++++++++++++++++++ opennow-streamer/reverse/index.md | 147 +++++++++ opennow-streamer/reverse/keyboard.md | 273 ++++++++++++++++ opennow-streamer/reverse/protocol.md | 315 +++++++++++++++++++ opennow-streamer/reverse/rendering.md | 314 +++++++++++++++++++ opennow-streamer/reverse/session.md | 396 ++++++++++++++++++++++++ opennow-streamer/reverse/statistics.md | 347 +++++++++++++++++++++ opennow-streamer/reverse/video.md | 276 +++++++++++++++++ opennow-streamer/src/api/cloudmatch.rs | 14 +- opennow-streamer/src/app/mod.rs | 88 ++++++ opennow-streamer/src/app/session.rs | 28 +- opennow-streamer/src/gui/renderer.rs | 6 +- opennow-streamer/src/main.rs | 4 +- opennow-streamer/src/media/video.rs | 242 +++++++-------- 17 files changed, 3406 insertions(+), 134 deletions(-) create mode 100644 opennow-streamer/reverse/audio.md create mode 100644 opennow-streamer/reverse/controller.md create mode 100644 opennow-streamer/reverse/cursor.md create mode 100644 opennow-streamer/reverse/datachannel.md create mode 100644 opennow-streamer/reverse/index.md create mode 100644 opennow-streamer/reverse/keyboard.md create mode 100644 opennow-streamer/reverse/protocol.md create mode 100644 opennow-streamer/reverse/rendering.md create mode 100644 opennow-streamer/reverse/session.md create mode 100644 opennow-streamer/reverse/statistics.md create mode 100644 opennow-streamer/reverse/video.md diff --git a/opennow-streamer/reverse/audio.md b/opennow-streamer/reverse/audio.md new file mode 100644 index 0000000..64d4123 --- /dev/null +++ b/opennow-streamer/reverse/audio.md @@ -0,0 +1,242 @@ +# GeForce NOW Audio Handling - Reverse Engineering Documentation + +## 1. Audio Codec Details + +### Opus Configuration +- **Codec**: Opus (RFC 6716) +- **Sample Rate**: 48000 Hz +- **Channels**: 2 (stereo) or up to 8 (multiopus) +- **Payload Types**: + - 101: opus/48000/2 (standard stereo) + - 100: multiopus/48000/N (N = 2, 4, 6, or 8 channels) + +### SDP Configuration +``` +a=rtpmap:101 opus/48000/2 +a=fmtp:101 minptime=10;useinbandfec=1 + +a=rtpmap:100 multiopus/48000/2 +a=fmtp:100 minptime=10;useinbandfec=1;coupled_streams=2 +``` + +### Multiopus Channel Mapping +``` +4-channel: FL, FR, BL, BR +6-channel: FL, FR, C, LFE, BL, BR (5.1 surround) +8-channel: FL, FR, C, LFE, BL, BR, SL, SR (7.1 surround) +``` + +--- + +## 2. RTP Packet Structure + +### RTP Header for Audio +``` +0 1 2 3 +0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +|V=2|P|X| CC |M| PT | sequence number | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| timestamp | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| synchronization source (SSRC) identifier | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +``` + +**Fields:** +- V: 2 (RTP version) +- P: 0 (no padding) +- X: 0 (no extension typically) +- CC: 0 (no CSRC) +- M: 1 = last packet of frame +- PT: 100 (multiopus) or 101 (opus) +- Timestamp: 48 kHz audio clock + +### Opus RTP Payload (RFC 7587) +``` +[TOC Byte] [Opus Frame Data...] + +TOC Byte: F(1) | C(1) | VBR(2) | MODE(4) +``` + +--- + +## 3. Frame Sizes + +### Opus at 48 kHz +``` +10 ms = 480 samples +20 ms = 960 samples (default) +40 ms = 1920 samples +60 ms = 2880 samples +``` + +### Typical Configuration +- Default frame size: 20 ms (960 samples) +- Minimum packet interval: 10 ms +- Bitrate: 64-96 kbps for stereo + +--- + +## 4. Audio Buffer Management + +### OpenNow AudioBuffer Structure +```rust +struct AudioBuffer { + samples: Vec, + read_pos: usize, + write_pos: usize, + capacity: usize, // ~200ms at 48kHz + total_written: u64, + total_read: u64, +} +``` + +### Buffer Size Calculation +```rust +// At 48000 Hz, 2 channels: +// 48000 * 2 / 5 = 19200 samples = ~200ms buffering +let buffer_size = (sample_rate as usize) * (channels as usize) / 5; +``` + +### Jitter Handling +- Circular buffer with read/write pointers +- Underrun: Output silence (zeros) +- Overrun: Drop oldest samples +- RTP sequence numbers for packet ordering + +--- + +## 5. Sample Format & Conversion + +### PCM Sample Format +``` +Output: 16-bit signed PCM (i16) +Range: -32768 to +32767 +Channels: Interleaved stereo [L0, R0, L1, R1, ...] +``` + +### Format Conversion + +**From F32 Planar:** +```rust +let sample = (plane[i] * 32767.0).clamp(-32768.0, 32767.0) as i16; +``` + +**From I16 Planar (Interleave):** +```rust +for i in 0..nb_samples { + for ch in 0..channels { + let plane = frame.plane::(ch); + output.push(plane[i]); + } +} +``` + +--- + +## 6. Audio/Video Synchronization + +### RTP Timestamp Alignment +``` +Video: 90 kHz clock +Audio: 48 kHz clock + +Frame at 60 FPS: + Video: 1500 RTP ticks (90000/60) + Audio: 800 RTP ticks for 16.67ms (48000 * 0.01667) +``` + +### OpenNow Sync Method +- RTP timestamps provide absolute timing +- Both streams timestamped from server clock +- Audio buffer maintains timing through sample count + +--- + +## 7. Decode Process Flow + +``` +RTP Packet Received (peer.rs) + ↓ +Extract RTP Payload + ↓ +Send to AudioDecoder (mpsc channel) + ↓ +FFmpeg Opus Decode + ↓ +Convert to i16 samples + ↓ +Write to AudioBuffer + ↓ +AudioPlayer reads from buffer + ↓ +Output to audio device (cpal) +``` + +### OpenNow Implementation +```rust +// webrtc/mod.rs line 265-276 +let mut audio_decoder = AudioDecoder::new(48000, 2)?; +let (audio_tx, mut audio_rx) = mpsc::channel::>(32); + +std::thread::spawn(move || { + if let Ok(audio_player) = AudioPlayer::new(48000, 2) { + while let Some(samples) = audio_rx.blocking_recv() { + audio_player.push_samples(&samples); + } + } +}); +``` + +--- + +## 8. Device Configuration + +### Sample Rate Selection Priority +```rust +1. Use requested 48 kHz if supported +2. Fallback to 44.1 kHz if 48 kHz not supported +3. Use device maximum as last resort +``` + +### Output Format Selection +```rust +// Scoring system: +// F32 format: 100 points (preferred) +// I16 format: 50 points +// Matching channels: +50 points +// Matching sample rate: +100 points +``` + +--- + +## 9. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Codec | Opus/Multiopus | Opus | Opus (FFmpeg) | +| Sample Rate | 48 kHz | 48 kHz | 48 kHz | +| Channels | 2-8 (dynamic) | 2-8 | 2 (hardcoded) | +| Decoding | Browser | Native C++ | FFmpeg | +| Output | WebAudio API | WASAPI/etc | cpal | +| Jitter Buffer | Built-in | Yes | RTP seq-based | +| FEC Support | useinbandfec=1 | Yes | No | +| Surround | Yes (8ch) | Yes | Not yet | +| Latency | 20-50ms | 15-30ms | 20-40ms | +| Buffer Size | ~500ms | ~200ms | ~200ms | + +--- + +## 10. OpenNow Limitations + +**Current:** +- Hardcoded stereo (2 channels) +- No explicit jitter buffer +- No FEC recovery implementation +- Basic circular buffer + +**Future Extensions:** +1. Add surround sound support (modify `AudioDecoder::new()`) +2. Implement jitter buffer with RTP reordering +3. Add FEC parsing for packet loss recovery diff --git a/opennow-streamer/reverse/controller.md b/opennow-streamer/reverse/controller.md new file mode 100644 index 0000000..052e21c --- /dev/null +++ b/opennow-streamer/reverse/controller.md @@ -0,0 +1,268 @@ +# GeForce NOW Controller/Gamepad Input - Reverse Engineering Documentation + +## 1. Controller Detection + +### Web Client (Gamepad API) +```javascript +let gamepads = navigator.getGamepads(); + +// Event-driven detection +window.addEventListener("gamepadconnected", handler); +window.addEventListener("gamepaddisconnected", handler); +``` + +### Detection Priority +1. **PlayStation 4/5**: Vendor ID `054c`, 18+ buttons +2. **Xbox Controllers**: Device ID contains "Xbox" or "xinput" +3. **Nvidia Shield**: Shield ID check +4. **Standard Gamepad**: HID-compliant fallback +5. **Virtual Gamepad**: Software emulation + +### Polling Rate +- Default: 4ms (250Hz) +- Configurable via URL: `?gamepadpoll=X` + +--- + +## 2. Gamepad State Structure + +### Standard Format (XInput-style) +``` +[Offset] [Size] [Field] [Type] +0x00 4B Type u32 LE (event type) +0x04 2B Index u16 BE (gamepad index 0-3) +0x06 2B Bitmap u16 BE (button state bitmask) +0x08 2B Reserved u16 BE +0x0A 2B Buttons u16 BE (button bitmask) +0x0C 2B Trigger u16 BE (combined analog triggers) +0x0E 4×2B Axes[0-3] 4× i16 BE (left X/Y, right X/Y) +0x16 8B CaptureTs u64 BE (timestamp) +``` + +--- + +## 3. Button Mapping + +### Standard Button IDs (Xbox Layout) +``` +Index Xbox Name PlayStation Physical Position +0 A ○ (Circle) Bottom/Right +1 B ✕ (Cross) Right +2 X □ (Square) Left +3 Y △ (Triangle) Top +4 LB L1 Left Shoulder +5 RB R1 Right Shoulder +6 LT L2 Left Trigger (analog) +7 RT R2 Right Trigger (analog) +8 Back Select/Share Left Center +9 Start Options Right Center +10 Left Stick L3 Left Stick Click +11 Right Stick R3 Right Stick Click +12 Guide PS Button Center +13-15 [Reserved] [Reserved] [Reserved] +``` + +### Button Bitmap Encoding +- Bit 0: Y / △ +- Bit 1: X / □ +- Bit 2: A / ○ +- Bit 3: B / ✕ +- Bit 4-7: Shoulder buttons +- Bit 8-11: Start/Select/Sticks +- Bit 12: Guide button + +--- + +## 4. Trigger Handling + +### Packed Format (u16) +``` +Low byte (0xFF): Left Trigger (L2/LT) 0-255 +High byte (0xFF): Right Trigger (R2/RT) 0-255 + +Example: 0xFF00 = LT fully pressed (255), RT released (0) +``` + +### Quantization +```javascript +let left_trigger = Math.round(255 * (axis_lt + 1) / 2); +let right_trigger = Math.round(255 * (axis_rt + 1) / 2); +let packed = (right_trigger << 8) | left_trigger; +``` + +--- + +## 5. Analog Stick Handling + +### Axis Mapping +- Axis[0]: Left Stick X (-1.0 to 1.0) +- Axis[1]: Left Stick Y (-1.0 to 1.0, inverted) +- Axis[2]: Right Stick X (-1.0 to 1.0) +- Axis[3]: Right Stick Y (-1.0 to 1.0, inverted) + +### Dead Zone +- Typical: 0.15 (15% of full range) +- Applied per-axis before quantization + +### Quantization to i16 +```javascript +if (Math.abs(axis_value) < 0.15) { + axis_value = 0; // Dead zone +} +let quantized = Math.round(axis_value * 32767); + +// Special value for unchanged axes +if (axis_value === last_axis_value) { + quantized = 2; // "Unchanged" marker +} +``` + +--- + +## 6. Vibration/Rumble + +### Dual-Rumble API +```javascript +if (gamepad.vibrationActuator?.type === "dual-rumble") { + gamepad.vibrationActuator.playEffect("dual-rumble", { + startDelay: 0, + duration: milliseconds, + strongMagnitude: 0.0-1.0, // Left motor + weakMagnitude: 0.0-1.0, // Right motor + }); +} +``` + +### Stop Rumble +```javascript +gamepad.vibrationActuator.playEffect("dual-rumble", { + duration: 0, + strongMagnitude: 0, + weakMagnitude: 0, +}); +``` + +### Support Matrix +- Xbox Controllers: Full dual-rumble +- DualSense: Full dual-rumble +- DualShock 4: Limited (single motor emulated) +- Generic: Varies by device + +--- + +## 7. Controller Type Identification + +### Vendor IDs +``` +Sony (DualShock/DualSense): 054c +Microsoft (Xbox): 045e +Nintendo (Switch): 057e +Nvidia (Shield): Custom +Generic HID: Various +``` + +### Type Classification +| Type | Detected By | Button Mapper | +|------|-------------|---------------| +| Xbox Series | "Xbox" in ID | KA() | +| Xbox Wired | "Xbox" in ID | YA() | +| DualShock 4 | VID=054c, 18+ btns | NA() | +| DualSense | Device ID check | _A() | +| Shield | Shield ID check | GA() | +| Standard | Generic HID | NA() | + +--- + +## 8. DualShock 4/DualSense Format + +### Extended Format +``` +[Offset] [Size] [Field] +...standard header... +0x0E 3B ds4Btns[3] Sony-specific buttons +0x11 2B triggers[2] L2/R2 analog (0-255) +0x13 4B axes[4] Analog (0-255, centered at 128) +``` + +--- + +## 9. Data Channel Configuration + +### WebRTC Data Channel +- Name: `input_channel_v1` (reliable) +- Ordered: Yes +- Reliable: Yes +- Used for: Gamepad state updates + +--- + +## 10. Handshake Protocol + +### Server → Client +``` +[0]: 0x0E (handshake marker) +[1]: Major version +[2]: Minor version +[3]: Flags +``` + +### Client → Server +Echo same bytes back to confirm ready state. + +--- + +## 11. Protocol Versions + +### Version 2 (Legacy) +- Direct event encoding +- No wrapper + +### Version 3+ (Modern) +- Events wrapped with 0x22 prefix +``` +[0]: 0x22 (wrapper marker) +[1...]: Event payload +``` + +--- + +## 12. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Input API | Gamepad API | HID (Raw Input) | HID + Gamepad | +| Controllers | 19 types | Static list | Mouse/KB only | +| Polling Rate | 4ms (250Hz) | Hardware interrupt | 4ms | +| Triggers | Packed u16 or u8 | Analog u8 | N/A | +| Vibration | Full dual-rumble | Full support | Not implemented | +| Dead Zone | 0.15 per-axis | Hardware-level | Mouse only | +| Multi-controller | Up to 4 | Up to 4 | Not supported | + +--- + +## 13. Limitations + +### Web Client +- Max 4 controllers (Gamepad API limit) +- Vibration not supported on all devices + +### OpenNow +- Controller support not implemented +- Only mouse/keyboard input +- No rumble feedback + +### Official Client +- VID-based detection may miss non-standard controllers +- 18+ button requirement excludes older gamepads + +--- + +## 14. Implementation Notes + +1. **Always initialize session timing** before first input +2. **Flush mouse events before button events** +3. **Use correct timestamp format** (microseconds) +4. **Implement 4ms coalescing** for consistency +5. **Handle protocol version negotiation** +6. **Test with multiple controller types** +7. **Reserve unused fields as zeros** diff --git a/opennow-streamer/reverse/cursor.md b/opennow-streamer/reverse/cursor.md new file mode 100644 index 0000000..9804be5 --- /dev/null +++ b/opennow-streamer/reverse/cursor.md @@ -0,0 +1,274 @@ +# GeForce NOW Mouse/Cursor Handling - Reverse Engineering Documentation + +## 1. Data Channels + +### Input Channels + +**Primary Input Channel (Reliable)** +- Name: `input_channel_v1` +- Ordered: Yes +- Reliable: Yes +- Used for: Keyboard, mouse buttons, wheel, handshake + +**Mouse Channel (Partially Reliable)** +- Name: `input_channel_partially_reliable` +- Ordered: No +- Reliable: No (8ms max lifetime) +- Used for: Low-latency mouse movement + +**Cursor Channel** +- Name: `cursor_channel` +- Ordered: Yes +- Reliable: Yes +- Used for: Cursor image updates, hotspot coordinates + +--- + +## 2. Mouse Movement (Type 7 - INPUT_MOUSE_REL) + +### Binary Format (22 bytes) +``` +[0-3] Type: 0x07 (4 bytes, Little Endian) +[4-5] Delta X: i16 (2 bytes, Big Endian, signed) +[6-7] Delta Y: i16 (2 bytes, Big Endian, signed) +[8-9] Reserved: u16 (0x00 0x00) +[10-13] Reserved: u32 (0x00 0x00 0x00 0x00) +[14-21] Timestamp: u64 (8 bytes, Big Endian, microseconds) +``` + +### Coalescing +- Interval: 4ms (250Hz effective rate) +- Accumulates dx/dy deltas +- Flushed on interval expiry OR before button events + +--- + +## 3. Mouse Button Down (Type 8) + +### Binary Format (18 bytes) +``` +[0-3] Type: 0x08 (4 bytes, Little Endian) +[4] Button: u8 (0=Left, 1=Right, 2=Middle, 3=Back, 4=Forward) +[5] Padding: u8 (0) +[6-9] Reserved: u32 (0) +[10-17] Timestamp: u64 (Big Endian, microseconds) +``` + +--- + +## 4. Mouse Button Up (Type 9) + +### Binary Format (18 bytes) +``` +[0-3] Type: 0x09 (4 bytes, Little Endian) +[4] Button: u8 (0=Left, 1=Right, 2=Middle, 3=Back, 4=Forward) +[5] Padding: u8 (0) +[6-9] Reserved: u32 (0) +[10-17] Timestamp: u64 (Big Endian, microseconds) +``` + +--- + +## 5. Mouse Wheel (Type 10) + +### Binary Format (22 bytes) +``` +[0-3] Type: 0x0A (4 bytes, Little Endian) +[4-5] Horizontal Delta: i16 (Big Endian, usually 0) +[6-7] Vertical Delta: i16 (Big Endian, positive=scroll up) +[8-9] Reserved: u16 (0) +[10-13] Reserved: u32 (0) +[14-21] Timestamp: u64 (Big Endian, microseconds) +``` + +### Wheel Delta Values +- Standard: WHEEL_DELTA = 120 per notch +- Positive = scroll up +- Negative = scroll down + +--- + +## 6. Cursor Capture Modes + +### Windows Implementation +```rust +// Preferred: Confined to window +CursorGrabMode::Confined + +// Fallback: Locked (hidden) +CursorGrabMode::Locked + +// Released: Normal cursor +CursorGrabMode::None +``` + +### macOS Implementation +- Uses Core Graphics Event Taps +- Captures at HID level: `CGEventTapLocation::HIDEventTap` + +--- + +## 7. Raw Input (Windows) + +### HID Registration +```rust +let device = RAWINPUTDEVICE { + usage_page: 0x01, // HID_USAGE_PAGE_GENERIC + usage: 0x02, // HID_USAGE_GENERIC_MOUSE + flags: 0, // Only when window focused + hwnd_target: hwnd, +}; +``` + +### Benefits +- No OS acceleration applied +- Hardware-level relative deltas +- Lower latency than standard events + +--- + +## 8. Local Cursor Rendering + +### Position Tracking +```rust +struct LocalCursor { + x: AtomicI32, + y: AtomicI32, + visible: AtomicBool, + stream_width: AtomicU32, + stream_height: AtomicU32, +} +``` + +### Update Logic +- Updated on every raw input event +- Bounded to stream dimensions +- Provides instant visual feedback + +--- + +## 9. Mouse Coalescing + +### Implementation +```rust +pub struct MouseCoalescer { + accumulated_dx: AtomicI32, + accumulated_dy: AtomicI32, + last_send_us: AtomicU64, + coalesce_interval_us: u64, // 4000 (4ms) +} + +pub fn accumulate(&self, dx: i32, dy: i32) -> Option<(i16, i16, u64)> { + self.accumulated_dx.fetch_add(dx, Ordering::Relaxed); + self.accumulated_dy.fetch_add(dy, Ordering::Relaxed); + + let now_us = session_elapsed_us(); + if now_us - last_send >= coalesce_interval_us { + // Flush accumulated movement + Some((dx as i16, dy as i16, timestamp_us)) + } else { + None + } +} +``` + +### Event Ordering +Movement is **flushed BEFORE button events**: +``` +MouseMove(100,200) → MouseButtonDown → MouseMove(50,50) +``` + +--- + +## 10. Cursor Image Updates + +### Cursor Channel Messages +- Image data (PNG format) +- Hotspot coordinates (X, Y) +- Visibility state + +### Cursor Type Values +``` +CursorType = { + None: 0, + Mouse: 1, + Keyboard: 2, + Gamepad: 4, + Touch: 8, + All: 15 +} +``` + +--- + +## 11. Timestamp Generation + +```rust +pub fn get_timestamp_us() -> u64 { + if let Some(ref t) = *SESSION_TIMING.read() { + let elapsed_us = t.start.elapsed().as_micros() as u64; + t.unix_us.wrapping_add(elapsed_us) + } else { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .map(|d| d.as_micros() as u64) + .unwrap_or(0) + } +} +``` + +--- + +## 12. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Input API | Pointer Lock API | Raw Input | Raw Input + winit | +| Coalescing | 4-16ms | Hardware optimized | 4ms | +| Cursor Capture | Pointer Lock | Native capture | CursorGrabMode | +| Local Cursor | Canvas rendering | Native rendering | GPU rendering | +| Latency | 40-80ms | 10-30ms | 20-40ms | + +--- + +## 13. Error Codes + +- `StreamCursorChannelError` (3237093897): Cursor channel failure +- `StreamerCursorChannelNotOpen` (3237093920): Channel not established +- `ServerDisconnectedInvalidMouseState` (3237094150): Invalid mouse state + +--- + +## 14. Protocol v3+ Wrapper + +For protocol version 3+: +``` +[0] 0x22 (wrapper marker) +[1...N] Raw mouse event bytes +``` + +--- + +## 15. Byte-Level Example + +### Mouse Movement (dx=100, dy=-50) +``` +Hex: 07 00 00 00 00 64 FF CE 00 00 00 00 00 00 12 34 56 78 9A BC DE F0 + +[00-03] 07 00 00 00 = Type 7 (LE) = MOUSE_REL +[04-05] 00 64 = dx=100 (BE i16) +[06-07] FF CE = dy=-50 (BE i16, two's complement) +[08-13] 00 00 00 00 00 00 = Reserved +[14-21] Timestamp (BE u64) +``` + +### Mouse Button Down (Left Click) +``` +Hex: 08 00 00 00 00 00 00 00 00 00 12 34 56 78 9A BC DE F0 + +[00-03] 08 00 00 00 = Type 8 (LE) = MOUSE_BUTTON_DOWN +[04] 00 = Button 0 (Left) +[05] 00 = Padding +[06-09] 00 00 00 00 = Reserved +[10-17] Timestamp (BE u64) +``` diff --git a/opennow-streamer/reverse/datachannel.md b/opennow-streamer/reverse/datachannel.md new file mode 100644 index 0000000..d9d6ddc --- /dev/null +++ b/opennow-streamer/reverse/datachannel.md @@ -0,0 +1,306 @@ +# GeForce NOW Data Channel Protocol - Reverse Engineering Documentation + +## 1. Data Channel Names & Configuration + +### Input Channels + +**input_channel_v1 (Reliable)** +``` +Name: input_channel_v1 +Ordered: true +Reliable: true +MaxRetransmits: 0 +binaryType: arraybuffer +Used for: Keyboard, mouse buttons, wheel, handshake +``` + +**input_channel_partially_reliable (Low Latency)** +``` +Name: input_channel_partially_reliable +Ordered: false +Reliable: false +MaxPacketLifeTime: 8ms +Used for: Mouse movement (can drop packets) +``` + +### Other Channels + +**cursor_channel** +``` +Ordered: true +Reliable: true +Used for: Cursor image updates, hotspot coordinates +``` + +**control_channel** +``` +Ordered: true +Reliable: true +Used for: Server-to-client JSON messages (network test results) +``` + +**stats_channel** +``` +Used for: Telemetry data (optional) +``` + +--- + +## 2. Input Message Types + +| Type | Value | Size | Description | +|------|-------|------|-------------| +| HEARTBEAT | 0x02 | 4B | Keep-alive | +| KEY_DOWN | 0x03 | 18B | Keyboard pressed | +| KEY_UP | 0x04 | 18B | Keyboard released | +| MOUSE_ABS | 0x05 | - | Absolute mouse position | +| MOUSE_REL | 0x07 | 22B | Relative mouse movement | +| MOUSE_BUTTON_DOWN | 0x08 | 18B | Mouse button pressed | +| MOUSE_BUTTON_UP | 0x09 | 18B | Mouse button released | +| MOUSE_WHEEL | 0x0A | 22B | Mouse wheel scroll | + +--- + +## 3. Binary Message Structures + +### Heartbeat (4 bytes) +``` +[0-3] Type: 0x02 (Little Endian u32) +``` + +### Key Down/Up (18 bytes) +``` +[0-3] Type: 0x03 or 0x04 (LE u32) +[4-5] Keycode: u16 (BE) - Windows VK code +[6-7] Modifiers: u16 (BE) - SHIFT|CTRL|ALT|META|CAPS|NUMLOCK +[8-9] Scancode: u16 (BE) - USB HID scancode +[10-17] Timestamp: u64 (BE) - Microseconds +``` + +### Mouse Relative (22 bytes) +``` +[0-3] Type: 0x07 (LE u32) +[4-5] dx: i16 (BE) - Relative X movement +[6-7] dy: i16 (BE) - Relative Y movement +[8-9] Reserved: u16 (0) +[10-13] Reserved: u32 (0) +[14-21] Timestamp: u64 (BE) +``` + +### Mouse Button Down/Up (18 bytes) +``` +[0-3] Type: 0x08 or 0x09 (LE u32) +[4] Button: u8 (0=LEFT, 1=RIGHT, 2=MIDDLE, 3=BACK, 4=FORWARD) +[5] Padding: u8 (0) +[6-9] Reserved: u32 (0) +[10-17] Timestamp: u64 (BE) +``` + +### Mouse Wheel (22 bytes) +``` +[0-3] Type: 0x0A (LE u32) +[4-5] Horizontal: i16 (BE) - Usually 0 +[6-7] Vertical: i16 (BE) - Positive=scroll up +[8-9] Reserved: u16 (0) +[10-13] Reserved: u32 (0) +[14-21] Timestamp: u64 (BE) +``` + +--- + +## 4. Handshake Protocol + +### Server Initiates +Sends handshake on input_channel_v1: +``` +New Format: [0x0E, major_version, minor_version, flags] +Old Format: Direct version bytes +``` + +### Client Response +Echo the same bytes back to signal ready state. + +### Version Detection +```rust +if data.len() >= 4 { + // New format: version at bytes 2-4 + let version = u16::from_le_bytes([data[2], data[3]]); +} else { + // Old format: version is first word + let version = u16::from_le_bytes([data[0], data[1]]); +} +``` + +--- + +## 5. Protocol Versions + +### Version 2 (Legacy) +- Direct event encoding +- No wrapper + +### Version 3+ (Modern) +Each event wrapped with marker byte: +``` +[0] 0x22 (wrapper marker = 34 decimal) +[1...N] Original message bytes +``` + +--- + +## 6. Modifier Flags + +``` +SHIFT: 0x01 +CTRL: 0x02 +ALT: 0x04 +META: 0x08 +CAPS_LOCK: 0x10 +NUM_LOCK: 0x20 +``` + +--- + +## 7. USB HID Scancodes + +``` +A-Z: 0x04-0x1D +0-9: 0x1E-0x27 +ENTER: 0x28 +ESCAPE: 0x29 +BACKSPACE: 0x2A +TAB: 0x2B +SPACE: 0x2C +F1-F12: 0x3A-0x45 +LEFT_CTRL: 0xE0 +LEFT_SHIFT: 0xE1 +LEFT_ALT: 0xE2 +LEFT_META: 0xE3 +RIGHT_CTRL: 0xE4 +RIGHT_SHIFT: 0xE5 +RIGHT_ALT: 0xE6 +RIGHT_META: 0xE7 +``` + +--- + +## 8. Mouse Coalescing + +### Configuration +- Interval: 4ms (250Hz effective rate) +- Constant: `MOUSE_COALESCE_INTERVAL_US = 4_000` + +### Behavior +- Accumulates dx/dy deltas atomically +- Flushed when interval expires OR on button events +- Button events always flush pending movement first + +--- + +## 9. Control Channel Messages + +### finAck (Network Test Result) +```json +{ + "finAck": { + "downlinkBandwidth": , + "packetLoss": , + "latency": + } +} +``` + +### fin (Graceful Shutdown) +```json +{ + "fin": { + "sessionId": "", + "packetsLost": , + "packetsReceived": + } +} +``` + +--- + +## 10. Timestamp Encoding + +### Format +- Type: u64 +- Unit: Microseconds since session start +- Encoding: Big-Endian in event messages + +### Generation +```rust +pub fn get_timestamp_us() -> u64 { + let elapsed = session_start.elapsed().as_micros() as u64; + unix_start_us.wrapping_add(elapsed) +} +``` + +--- + +## 11. Reliability & Ordering + +| Channel | Ordered | Reliable | MaxLifetime | Use Case | +|---------|---------|----------|-------------|----------| +| input_channel_v1 | YES | YES | ∞ | Keyboard, handshake | +| input_channel_partially_reliable | NO | NO | 8ms | Mouse movement | +| cursor_channel | YES | YES | ∞ | Cursor images | +| control_channel | YES | YES | ∞ | Bidirectional control | +| stats_channel | YES | YES | ∞ | Telemetry | + +--- + +## 12. Byte-Level Examples + +### Key Down (Shift+A) +``` +Hex: 03 00 00 00 00 41 00 01 00 00 12 34 56 78 9A BC DE F0 + +[00-03] 03 00 00 00 = Type 3 (LE) = KEY_DOWN +[04-05] 00 41 = Keycode 0x0041 (VK_A) (BE) +[06-07] 00 01 = Modifiers 0x0001 (SHIFT) (BE) +[08-09] 00 00 = Scancode 0x0000 (BE) +[10-17] = Timestamp (BE u64) +``` + +### Mouse Movement (dx=100, dy=-50) +``` +Hex: 07 00 00 00 00 64 FF CE 00 00 00 00 00 00 12 34 56 78 9A BC DE F0 + +[00-03] 07 00 00 00 = Type 7 (LE) = MOUSE_REL +[04-05] 00 64 = dx=100 (BE i16) +[06-07] FF CE = dy=-50 (BE i16, two's complement) +[08-13] = Reserved +[14-21] = Timestamp (BE u64) +``` + +### Protocol v3+ Wrapped Event +``` +[0] 0x22 = Wrapper marker +[1...] Raw event bytes +``` + +--- + +## 13. Implementation Notes + +1. **Channel Creation Order**: Input channels MUST be created BEFORE SDP negotiation +2. **Timestamp Synchronization**: Microseconds relative to session start +3. **Mouse Channel Fallback**: Use reliable channel if partially_reliable not ready +4. **Handshake Required**: No input processed until handshake response echoed +5. **Event Coalescing**: Mouse events coalesce every 4ms +6. **Data Types**: Mixed endianness - opcodes LE, fields BE + +--- + +## 14. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Channel Creation | Explicit | Native C++ | webrtc-rs | +| Coalescing | 4-16ms | Hardware | 4ms | +| Protocol Version | v2/v3+ | Proprietary | v2/v3+ | +| Input Encoding | DataView | Native | bytes crate | +| Channel Types | 4+ channels | Similar | 2 input channels | diff --git a/opennow-streamer/reverse/index.md b/opennow-streamer/reverse/index.md new file mode 100644 index 0000000..8ecb5c6 --- /dev/null +++ b/opennow-streamer/reverse/index.md @@ -0,0 +1,147 @@ +# GeForce NOW Reverse Engineering Documentation + +**Last Updated:** 2026-01-01 +**Sources Analyzed:** +- Official Web Client: `C:\Users\Zortos\CustomGFNClient\research` +- Official GFN Client: `C:\Users\Zortos\AppData\Local\NVIDIA Corporation\GeForceNOW` +- OpenNow Implementation: `C:\Users\Zortos\CustomGFNClient\gfn-client\opennow-streamer` + +--- + +## Overview + +This documentation provides comprehensive reverse engineering analysis of NVIDIA GeForce NOW's streaming protocol, comparing three implementations: the official web client, official native client, and the OpenNow open-source implementation. + +--- + +## Documentation Index + +### Core Protocol + +| Document | Description | +|----------|-------------| +| [protocol.md](protocol.md) | WebRTC/RTP protocol details, SDP, ICE, signaling | +| [session.md](session.md) | CloudMatch API, authentication, session management | +| [datachannel.md](datachannel.md) | Data channel message formats and binary protocols | + +### Media + +| Document | Description | +|----------|-------------| +| [video.md](video.md) | Video decoding, RTP packetization, codecs (H.264/H.265/AV1) | +| [audio.md](audio.md) | Audio handling, Opus codec, RTP, synchronization | +| [rendering.md](rendering.md) | GPU rendering, shaders, YUV-RGB conversion | + +### Input + +| Document | Description | +|----------|-------------| +| [keyboard.md](keyboard.md) | Keyboard input protocol, keycodes, modifiers | +| [cursor.md](cursor.md) | Mouse/cursor handling, capture, rendering | +| [controller.md](controller.md) | Gamepad/controller input, button mapping, rumble | + +### Telemetry + +| Document | Description | +|----------|-------------| +| [statistics.md](statistics.md) | QoS metrics, bitrate adaptation, RTCP stats | + +--- + +## Quick Reference + +### Key Endpoints + +``` +Authentication: https://login.nvidia.com/authorize +Token: https://login.nvidia.com/token +CloudMatch: https://{zone}.cloudmatchbeta.nvidiagrid.net/v2/session +Games: https://games.geforce.com/graphql +Service URLs: https://pcs.geforcenow.com/v1/serviceUrls +``` + +### Key Headers + +``` +Authorization: GFNJWT {token} +nv-client-id: {uuid} +nv-client-type: NATIVE +nv-client-version: 2.0.80.173 +nv-client-streamer: NVIDIA-CLASSIC +``` + +### Data Channel Names + +| Channel | Purpose | Reliability | +|---------|---------|-------------| +| `input_channel_v1` | Keyboard, handshake | Reliable, ordered | +| `input_channel_partially_reliable` | Mouse movement | Unreliable, 8ms lifetime | +| `cursor_channel` | Cursor updates | Reliable, ordered | +| `control_channel` | Control messages | Reliable, ordered | + +### Input Message Types + +| Type | Value | Size | Description | +|------|-------|------|-------------| +| HEARTBEAT | 0x02 | 4B | Keep-alive | +| KEY_DOWN | 0x03 | 18B | Keyboard press | +| KEY_UP | 0x04 | 18B | Keyboard release | +| MOUSE_REL | 0x07 | 22B | Relative mouse movement | +| MOUSE_BUTTON_DOWN | 0x08 | 18B | Mouse button press | +| MOUSE_BUTTON_UP | 0x09 | 18B | Mouse button release | +| MOUSE_WHEEL | 0x0A | 22B | Mouse scroll | + +### Video Codecs + +| Codec | Payload Type | Clock Rate | +|-------|--------------|------------| +| H.264 | 96 | 90000 Hz | +| H.265/HEVC | 127 | 90000 Hz | +| AV1 | 98 | 90000 Hz | + +### Audio Codec + +| Codec | Payload Type | Sample Rate | Channels | +|-------|--------------|-------------|----------| +| Opus | 111 | 48000 Hz | 2 (stereo) | +| Multiopus | 100 | 48000 Hz | 2-8 | + +### Color Space (BT.709) + +``` +Y' = (Y - 16/255) * 1.1644 +U' = (U - 128/255) * 1.1384 +V' = (V - 128/255) * 1.1384 + +R = Y' + 1.5748 * V' +G = Y' - 0.1873 * U' - 0.4681 * V' +B = Y' + 1.8556 * U' +``` + +--- + +## Implementation Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| **Language** | JavaScript | C++ (CEF) | Rust | +| **WebRTC** | Browser native | libwebrtc | webrtc-rs | +| **Video Decode** | Browser | NVDEC | FFmpeg + CUVID | +| **Rendering** | WebGL/WebGPU | DirectX 12 | wgpu | +| **Input** | DOM Events | Raw Input | winit + Raw Input | +| **Audio** | WebAudio | Native | cpal + Opus | + +--- + +## Protocol Version + +- **Client Version:** 2.0.80.173 +- **Input Protocol:** v2/v3+ +- **WebRTC SDP:** Custom nvstSdp extensions +- **OAuth:** PKCE with code_challenge_method=S256 + +--- + +## License + +This documentation is for educational and reverse engineering purposes only. diff --git a/opennow-streamer/reverse/keyboard.md b/opennow-streamer/reverse/keyboard.md new file mode 100644 index 0000000..57c8ea6 --- /dev/null +++ b/opennow-streamer/reverse/keyboard.md @@ -0,0 +1,273 @@ +# GeForce NOW Keyboard Input Protocol - Reverse Engineering Documentation + +## 1. Key Event Structure + +### Binary Message Format + +#### KeyDown Event (Type 3) +``` +Byte Layout (18 bytes total): +[0-3] Type: 0x03 (4 bytes, Little Endian) = INPUT_KEY_DOWN +[4-5] Keycode: u16 (2 bytes, Big Endian) = Windows Virtual Key code +[6-7] Modifiers: u16 (2 bytes, Big Endian) = Modifier flags bitmask +[8-9] Scancode: u16 (2 bytes, Big Endian) = USB HID scancode (usually 0) +[10-17] Timestamp: u64 (8 bytes, Big Endian) = Microseconds since session start +``` + +#### KeyUp Event (Type 4) +``` +Byte Layout (18 bytes total): +[0-3] Type: 0x04 (4 bytes, Little Endian) = INPUT_KEY_UP +[4-5] Keycode: u16 (2 bytes, Big Endian) = Windows Virtual Key code +[6-7] Modifiers: u16 (2 bytes, Big Endian) = Modifier flags bitmask +[8-9] Scancode: u16 (2 bytes, Big Endian) = USB HID scancode (usually 0) +[10-17] Timestamp: u64 (8 bytes, Big Endian) = Microseconds since session start +``` + +### Protocol v3+ Wrapper +For protocol version 3+, single events are wrapped: +``` +[0] Wrapper Marker: 0x22 (34 decimal) +[1-18] Keyboard event payload +Total: 19 bytes for v3+ +``` + +--- + +## 2. Virtual Key Codes + +GFN uses **Windows Virtual Key codes** (VK codes), NOT scancodes. + +### Alphabetic Keys +``` +VK_A (0x41) through VK_Z (0x5A) +``` + +### Numeric Keys +``` +VK_0 (0x30) through VK_9 (0x39) +``` + +### Function Keys +``` +VK_F1 (0x70) through VK_F12 (0x7B) +VK_F13 (0x7C) through VK_F24 (0x87) +``` + +### Special Keys +``` +VK_ESCAPE (0x1B) +VK_TAB (0x09) +VK_CAPITAL (0x14) - CapsLock +VK_SPACE (0x20) +VK_ENTER (0x0D) +VK_BACKSPACE (0x08) +VK_DELETE (0x2E) +VK_INSERT (0x2D) +VK_HOME (0x24) +VK_END (0x23) +VK_PRIOR (0x21) - Page Up +VK_NEXT (0x22) - Page Down +``` + +### Arrow Keys +``` +VK_UP (0x26) +VK_DOWN (0x28) +VK_LEFT (0x25) +VK_RIGHT (0x27) +``` + +### Numpad Keys +``` +VK_NUMPAD0 (0x60) through VK_NUMPAD9 (0x69) +VK_MULTIPLY (0x6A) +VK_ADD (0x6B) +VK_SUBTRACT (0x6D) +VK_DECIMAL (0x6E) +VK_DIVIDE (0x6F) +VK_NUMLOCK (0x90) +``` + +### Modifier Keys +``` +VK_LSHIFT (0xA0) - Left Shift +VK_RSHIFT (0xA1) - Right Shift +VK_LCONTROL (0xA2) - Left Control +VK_RCONTROL (0xA3) - Right Control +VK_LMENU (0xA4) - Left Alt +VK_RMENU (0xA5) - Right Alt +VK_LWIN (0x5B) - Left Windows/Meta +VK_RWIN (0x5C) - Right Windows/Meta +``` + +### Punctuation Keys +``` +VK_OEM_MINUS (0xBD) - Minus/Underscore +VK_OEM_PLUS (0xBB) - Plus/Equals +VK_OEM_LBRACKET (0xDB) - Left Bracket +VK_OEM_RBRACKET (0xDD) - Right Bracket +VK_OEM_BACKSLASH (0xDC) - Backslash +VK_OEM_SEMICOLON (0xBA) - Semicolon +VK_OEM_QUOTE (0xDE) - Quote +VK_OEM_TILDE (0xC0) - Backtick/Tilde +VK_OEM_COMMA (0xBC) - Comma +VK_OEM_PERIOD (0xBE) - Period +VK_OEM_SLASH (0xBF) - Forward Slash +``` + +--- + +## 3. Modifier Flags + +Modifiers are encoded as a 16-bit bitmask: + +``` +SHIFT: 0x01 +CTRL: 0x02 +ALT: 0x04 +META: 0x08 +CAPS_LOCK: 0x10 +NUM_LOCK: 0x20 +``` + +### Important Modifier Behavior + +When a modifier key itself is pressed, the modifiers field should be **0x0000**: +``` +Shift key down: keycode=0xA0, modifiers=0x00 (not 0x01) +A key down (with Shift held): keycode=0x41, modifiers=0x01 +``` + +--- + +## 4. USB HID Scancodes + +The scancode field is typically set to **0x0000** (unused) in GFN. + +Reference scancodes (if needed): +``` +0x04 = A through 0x1D = Z +0x1E = 1 through 0x27 = 0 +0x28 = Enter +0x29 = Escape +0x2A = Backspace +0x2B = Tab +0x2C = Space +0x3A - 0x45 = F1 through F12 +0xE0-0xE7 = Modifier keys +``` + +--- + +## 5. Key Repeat Handling + +Key repeat events are **filtered out**: + +```rust +if event.repeat { + return; // Skip key repeat events +} +``` + +### Key State Tracking + +Both clients track currently pressed keys: +```rust +pub struct InputHandler { + pressed_keys: Mutex>, +} +``` + +### Focus Loss Handling + +When window loses focus, all keys are released: +```rust +pub fn release_all_keys(&self) { + let keys_to_release: Vec = pressed_keys.drain().collect(); + for keycode in keys_to_release { + send_key_up(keycode, 0, 0, timestamp_us); + } +} +``` + +--- + +## 6. IME (Input Method Editor) Support + +### Two Independent Channels + +1. **Raw Keyboard Events**: KeyDown/KeyUp via WebRTC data channel +2. **Text Composition Events**: UTF-8 text via event emitter + +### Text Composition Event +```javascript +this.emit("TextComposition", { + compositionText: "input_text", + imeRecommendation: true +}); +``` + +--- + +## 7. Data Channel Usage + +- **Channel Name**: `input_channel_v1` +- **Ordered**: Yes +- **Reliable**: Yes + +Keyboard events are always sent via reliable channel (no tolerance for dropped events). + +--- + +## 8. Timestamp Format + +Each keyboard event carries a microsecond-precision timestamp: + +```rust +fn get_timestamp_us() -> u64 { + let elapsed_us = session_start.elapsed().as_micros() as u64; + unix_start_us.wrapping_add(elapsed_us) +} +``` + +--- + +## 9. Byte-Level Example + +### KeyDown for Shift+A +``` +Hex: 03 00 00 00 41 00 01 00 00 00 12 34 56 78 9A BC DE F0 + +[00-03] 03 00 00 00 = Type 3 (LE) = KeyDown +[04-05] 00 41 = Keycode 0x0041 (VK_A) (BE) +[06-07] 00 01 = Modifiers 0x0001 (SHIFT) (BE) +[08-09] 00 00 = Scancode 0x0000 (BE) +[10-17] 12 34 56 78 9A BC DE F0 = Timestamp (BE) +``` + +--- + +## 10. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Key Mapping | so.get()/Fo.get() maps | Platform-native | Rust match | +| Timestamp | Browser timeStamp | System clock | Session-relative | +| IME Support | Full composition | Basic | Not implemented | +| Key Repeat | DOM event.repeat | Manual filtering | Manual filtering | +| Scancode | Always 0x0000 | Always 0x0000 | Always 0x0000 | + +--- + +## 11. Implementation Checklist + +- [ ] Map event.code to Windows VK codes +- [ ] Extract modifier state (ctrl/alt/shift/meta) +- [ ] Skip events with event.repeat === true +- [ ] Create 18-byte binary message +- [ ] Include microsecond timestamp +- [ ] Set scancode to 0x0000 +- [ ] Send via `input_channel_v1` +- [ ] Track pressed keys to avoid duplicates +- [ ] Release all keys on window focus loss diff --git a/opennow-streamer/reverse/protocol.md b/opennow-streamer/reverse/protocol.md new file mode 100644 index 0000000..ffbcf06 --- /dev/null +++ b/opennow-streamer/reverse/protocol.md @@ -0,0 +1,315 @@ +# GeForce NOW WebRTC & RTP Protocol - Reverse Engineering Documentation + +## 1. Authentication Flow + +### OAuth 2.0 with PKCE +``` +Endpoint: https://login.nvidia.com/authorize +Token: https://login.nvidia.com/token +Client ID: ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ +Scopes: openid consent email tk_client age +``` + +### Request Parameters +```json +{ + "response_type": "code", + "device_id": "sha256(hostname + username + 'opennow-streamer')", + "scope": "openid consent email tk_client age", + "client_id": "ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ", + "redirect_uri": "http://localhost:{port}", + "code_challenge": "sha256_base64(verifier)", + "code_challenge_method": "S256", + "idp_id": "PDiAhv2kJTFeQ7WOPqiQ2tRZ7lGhR2X11dXvM4TZSxg" +} +``` + +### Token Response +```json +{ + "access_token": "...", + "refresh_token": "...", + "id_token": "...", + "expires_in": 86400 +} +``` + +### Authorization Header +``` +Authorization: GFNJWT {token} +``` + +--- + +## 2. CloudMatch Session API + +### Base URL +``` +https://{zone}.cloudmatchbeta.nvidiagrid.net/v2/session +``` + +### Required Headers +``` +Authorization: GFNJWT {token} +Content-Type: application/json +nv-client-id: {uuid} +nv-client-type: NATIVE +nv-client-version: 2.0.80.173 +nv-client-streamer: NVIDIA-CLASSIC +nv-device-os: WINDOWS +nv-device-type: DESKTOP +x-device-id: {device-id} +Origin: https://play.geforcenow.com +``` + +### Create Session (POST /v2/session) +```json +{ + "sessionRequestData": { + "appId": "string", + "internalTitle": "Game Title", + "clientIdentification": "GFN-PC", + "deviceHashId": "{uuid}", + "clientVersion": "30.0", + "clientPlatformName": "windows", + "clientRequestMonitorSettings": [{ + "widthInPixels": 1920, + "heightInPixels": 1080, + "framesPerSecond": 60 + }], + "metaData": [ + {"key": "GSStreamerType", "value": "WebRTC"}, + {"key": "wssignaling", "value": "1"} + ], + "requestedStreamingFeatures": { + "reflex": false, + "trueHdr": false + } + } +} +``` + +### Session Response +```json +{ + "session": { + "sessionId": "string", + "status": 2, + "gpuType": "RTX_A5000", + "connectionInfo": [{ + "ip": "server_ip", + "port": 47998, + "usage": 14 + }] + }, + "requestStatus": { + "statusCode": 1, + "serverId": "NP-AMS-08" + } +} +``` + +### Session States +- **1**: Setting up / Launching +- **2**: Ready for streaming +- **3**: Already streaming +- **6**: Initialization pending + +--- + +## 3. WebSocket Signaling + +### Connection +``` +URL: wss://{server_ip}:443/nvst/sign_in?peer_id={peer_name}&version=2 +Subprotocol: x-nv-sessionid.{sessionId} +``` + +### Peer Info Message +```json +{ + "ackid": 1, + "peer_info": { + "id": 2, + "name": "peer-{random}", + "browser": "Chrome", + "browserVersion": "131", + "connected": true, + "peerRole": 0, + "resolution": "1920x1080", + "version": 2 + } +} +``` + +### Heartbeat (every 5s) +```json +{"hb": 1} +``` + +### Acknowledgment +```json +{"ack": 1} +``` + +### SDP Offer (from server) +```json +{ + "ackid": 2, + "peer_msg": { + "from": 1, + "to": 2, + "msg": "{\"type\":\"offer\",\"sdp\":\"v=0\\r\\no=...\"}" + } +} +``` + +### SDP Answer (to server) +```json +{ + "ackid": 3, + "peer_msg": { + "from": 2, + "to": 1, + "msg": "{\"type\":\"answer\",\"sdp\":\"...\",\"nvstSdp\":\"v=0\\r\\n...\"}" + } +} +``` + +### ICE Candidate +```json +{ + "ackid": 4, + "peer_msg": { + "from": 2, + "to": 1, + "msg": "{\"candidate\":\"candidate:...\",\"sdpMid\":\"...\",\"sdpMLineIndex\":0}" + } +} +``` + +--- + +## 4. SDP (Session Description Protocol) + +### ICE-Lite Detection +``` +a=ice-lite +``` +When server is ice-lite: +- Client MUST respond with `a=setup:active` +- Client initiates DTLS ClientHello + +### nvstSdp Attributes + +**FEC Settings:** +``` +a=vqos.fec.rateDropWindow:10 +a=vqos.fec.minRequiredFecPackets:2 +a=vqos.fec.repairMinPercent:5 +a=vqos.fec.repairMaxPercent:35 +``` + +**Dynamic Quality Control:** +``` +a=vqos.dfc.enable:1 +a=vqos.dfc.decodeFpsAdjPercent:85 +a=vqos.dfc.targetDownCooldownMs:250 +a=vqos.dfc.minTargetFps:100 +``` + +**Bitrate Control:** +``` +a=video.initialBitrateKbps:25000 +a=vqos.bw.maximumBitrateKbps:50000 +a=vqos.bw.minimumBitrateKbps:5000 +a=bwe.useOwdCongestionControl:1 +``` + +**NACK Settings:** +``` +a=video.enableRtpNack:1 +a=video.rtpNackQueueLength:1024 +a=video.rtpNackQueueMaxPackets:512 +``` + +--- + +## 5. RTP Protocol + +### Video Payload Types +- **96**: H.264 +- **127**: H.265/HEVC +- **98**: AV1 + +### Audio Payload Types +- **111**: Opus (stereo) +- **100**: Multiopus (up to 8 channels) + +### Clock Rates +- Video: 90000 Hz +- Audio: 48000 Hz + +--- + +## 6. RTCP Feedback + +### PLI (Picture Loss Indication) +```rust +let pli = PictureLossIndication { + sender_ssrc: 0, + media_ssrc: VIDEO_SSRC, +}; +peer_connection.write_rtcp(&[Box::new(pli)]).await? +``` + +### NACK (Negative Acknowledgment) +``` +Bitmask of missing sequence numbers +Requests retransmission of specific packets +``` + +--- + +## 7. Data Channels + +### Channel Names +| Channel | Ordered | Reliable | Purpose | +|---------|---------|----------|---------| +| input_channel_v1 | Yes | Yes | Keyboard, handshake | +| input_channel_partially_reliable | No | No (8ms) | Mouse movement | +| cursor_channel | Yes | Yes | Cursor updates | +| control_channel | Yes | Yes | Control messages | + +### Handshake Protocol +``` +Server → Client: [0x0e, major, minor, flags] +Client → Server: Echo same bytes +``` + +--- + +## 8. DTLS/TLS Security + +### Handshake States +1. ice-gathering +2. ice-connected +3. dtls-connecting +4. dtls-connected +5. peer-connected + +### Certificate Handling +- Self-signed certificates accepted +- `danger_accept_invalid_certs(true)` + +--- + +## 9. Comparison + +| Feature | Web Client | OpenNow | Official Client | +|---------|-----------|---------|-----------------| +| WebRTC | Browser | webrtc-rs | libwebrtc | +| Signaling | JavaScript | Tokio WS | Native C++ | +| ICE | Browser | Manual | libwebrtc | +| DTLS | Browser | webrtc-rs | Native | +| Data Channels | Browser | webrtc-rs | Native | diff --git a/opennow-streamer/reverse/rendering.md b/opennow-streamer/reverse/rendering.md new file mode 100644 index 0000000..019fdfa --- /dev/null +++ b/opennow-streamer/reverse/rendering.md @@ -0,0 +1,314 @@ +# GeForce NOW Video Rendering & Shaders - Reverse Engineering Documentation + +## 1. GPU Architecture + +### Framework Selection +- **Windows**: wgpu with DirectX 12 backend (exclusive fullscreen support) +- **macOS**: wgpu with Metal backend +- **Linux**: wgpu with Vulkan backend + +### Backend Priority +```rust +#[cfg(target_os = "windows")] +let backends = wgpu::Backends::DX12; // Forced for exclusive fullscreen + +#[cfg(target_os = "macos")] +let backends = wgpu::Backends::METAL; + +#[cfg(target_os = "linux")] +let backends = wgpu::Backends::VULKAN; +``` + +--- + +## 2. WGSL Shader Architecture + +### Video Shader (YUV420P) +3 separate texture planes: +- Y plane: R8Unorm (full resolution) +- U plane: R8Unorm (half resolution) +- V plane: R8Unorm (half resolution) + +```wgsl +@group(0) @binding(0) var y_texture: texture_2d; +@group(0) @binding(1) var u_texture: texture_2d; +@group(0) @binding(2) var v_texture: texture_2d; +@group(0) @binding(3) var tex_sampler: sampler; + +@fragment +fn fs_main(@location(0) tex_coord: vec2) -> @location(0) vec4 { + let y_raw = textureSample(y_texture, tex_sampler, tex_coord).r; + let u_raw = textureSample(u_texture, tex_sampler, tex_coord).r; + let v_raw = textureSample(v_texture, tex_sampler, tex_coord).r; + + // BT.709 limited range to full range + let y = (y_raw - 0.0625) * 1.1644; + let u = (u_raw - 0.5) * 1.1384; + let v = (v_raw - 0.5) * 1.1384; + + // BT.709 color matrix + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; + + return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); +} +``` + +### NV12 Shader (Semi-planar) +2 planes with interleaved UV: +- Y plane: R8Unorm (full resolution) +- UV plane: Rg8Unorm (half resolution, interleaved) + +```wgsl +@group(0) @binding(0) var y_texture: texture_2d; +@group(0) @binding(1) var uv_texture: texture_2d; +@group(0) @binding(2) var tex_sampler: sampler; + +@fragment +fn fs_main(@location(0) tex_coord: vec2) -> @location(0) vec4 { + let y_raw = textureSample(y_texture, tex_sampler, tex_coord).r; + let uv = textureSample(uv_texture, tex_sampler, tex_coord).rg; + + let y = (y_raw - 0.0625) * 1.1644; + let u = (uv.r - 0.5) * 1.1384; + let v = (uv.g - 0.5) * 1.1384; + + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; + + return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); +} +``` + +--- + +## 3. BT.709 Color Space Conversion + +### Limited Range to Full Range +``` +Y' = (Y - 16/255) × (255/219) = (Y - 0.0625) × 1.1644 +U' = (U - 128/255) × (255/224) = (U - 0.5) × 1.1384 +V' = (V - 128/255) × (255/224) = (V - 0.5) × 1.1384 +``` + +### BT.709 Matrix +``` +R = Y' + 1.5748 × V' +G = Y' - 0.1873 × U' - 0.4681 × V' +B = Y' + 1.8556 × U' +``` + +### Matrix Form +``` +[R] [1.0000 0.0000 1.5748] [Y'] +[G] = [1.0000 -0.1873 -0.4681] [U'] +[B] [1.0000 1.8556 0.0000] [V'] +``` + +### CPU Fallback (Integer Math) +```rust +let r = (y + ((359 * v) >> 8)).clamp(0, 255) as u8; +let g = (y - ((88 * u + 183 * v) >> 8)).clamp(0, 255) as u8; +let b = (y + ((454 * u) >> 8)).clamp(0, 255) as u8; +``` + +--- + +## 4. Texture Formats + +### YUV420P Memory Layout (1920×1080) +``` +Y plane: 1920 × 1080 = 2,073,600 bytes +U plane: 960 × 540 = 518,400 bytes +V plane: 960 × 540 = 518,400 bytes +Total: 3,110,400 bytes (2.97 MB/frame) +``` + +### NV12 Memory Layout (1920×1080) +``` +Y plane: 1920 × 1080 = 2,073,600 bytes +UV plane: 1920 × 540 = 1,036,800 bytes (interleaved) +Total: 3,110,400 bytes (same size) +``` + +--- + +## 5. Present Mode Configuration + +### Latency Optimization +```rust +let present_mode = if caps.contains(&wgpu::PresentMode::Immediate) { + wgpu::PresentMode::Immediate // Best latency +} else if caps.contains(&wgpu::PresentMode::Mailbox) { + wgpu::PresentMode::Mailbox // Intermediate +} else { + wgpu::PresentMode::Fifo // VSync (fallback) +}; + +// Minimum frame latency +config.desired_maximum_frame_latency = 1; +``` + +### Present Mode Hierarchy +1. **Immediate**: No vsync, submit immediately (lowest latency) +2. **Mailbox**: Non-blocking buffer swap (intermediate) +3. **Fifo**: VSync blocking (highest latency) + +--- + +## 6. Exclusive Fullscreen (Windows) + +### DWM Bypass +- Bypasses Desktop Window Manager compositor +- Enables higher refresh rates (120Hz+) +- Lower input latency + +### Implementation +```rust +// Find video mode with highest refresh rate +let modes = monitor.video_modes(); +let best_mode = modes + .filter(|m| m.size().width >= width && m.size().height >= height) + .max_by_key(|m| m.refresh_rate_millihertz()); + +window.set_fullscreen(Some(Fullscreen::Exclusive(best_mode))); +``` + +--- + +## 7. macOS ProMotion Support + +### Frame Rate Configuration +```rust +struct CAFrameRateRange { + minimum: 120.0, + maximum: 120.0, + preferred: 120.0, // Force 120Hz +} +``` + +### High-Performance Mode +- `NSActivityUserInitiated`: Prevents App Nap +- `NSActivityLatencyCritical`: Low-latency scheduling +- Disables auto-termination + +--- + +## 8. Render Pipeline Stages + +### Order of Operations +1. **Swapchain Error Recovery**: Handle Outdated/Lost surface +2. **Video Frame Update**: Upload YUV/NV12 planes to GPU +3. **Video Render Pass**: Execute shader on full-screen quad +4. **egui UI Render Pass**: Render overlay UI +5. **Present**: Display to screen + +--- + +## 9. Hardware Decoder Integration + +### Decoder Priority (Windows/Linux) +1. NVIDIA CUVID (H.264, H.265, AV1) +2. Intel QSV (H.264, H.265, AV1) +3. D3D11VA (Windows) +4. VAAPI (Linux) +5. Software decoder (fallback) + +### Decoder Priority (macOS) +1. VideoToolbox (native) +2. Software decoder (fallback) + +### Output Formats +- **NV12**: Direct from VideoToolbox, CUVID, QSV (preferred) +- **YUV420P**: Converted via FFmpeg if needed + +--- + +## 10. Zero-Latency Frame Delivery + +### SharedFrame Structure +```rust +pub struct SharedFrame { + frame: Mutex>, + frame_count: AtomicU64, + last_read_count: AtomicU64, +} +``` + +### Design Principles +- Decoder writes latest frame to SharedFrame +- Renderer reads via take() (zero copy) +- No frame buffering = always most recent +- Atomic frame counter detects new frames + +--- + +## 11. Comparison + +| Feature | Web Client | OpenNow | Official Client | +|---------|-----------|---------|-----------------| +| Rendering API | WebGL/WebGPU | wgpu (Rust) | DirectX 12/Vulkan | +| YUV Conversion | GPU shader | WGSL shader | HLSL shader | +| Color Space | BT.709 | BT.709 | BT.709 | +| Texture Format | YUV420P/NV12 | YUV420P/NV12 | NV12 | +| Present Mode | Vsync | Immediate | Exclusive fullscreen | +| Latency | 40-80ms | <20ms | 10-30ms | +| CPU Load | ~5-10% | ~5% | ~3-5% | + +--- + +## 12. Performance Metrics + +### GPU Memory (1440p) +``` +Per-frame textures: + Y plane: 2560 × 1440 = 3,686,400 bytes + U plane: 1280 × 720 = 921,600 bytes + V plane: 1280 × 720 = 921,600 bytes + Total: 5,529,600 bytes (~5.3 MB) + +Triple buffering: ~15.9 MB total +``` + +### Frame Timing (1440p120) +``` +Decode time: 8-12ms (hardware accelerated) +GPU shader: <1ms +Render pass: <2ms +Total: <15ms per frame +``` + +--- + +## 13. Why BT.709? + +- **HD Content Standard**: Streams are 720p+ +- **Color Accuracy**: Better flesh tones +- **Industry Standard**: Used by all streaming services +- **Apple/NVIDIA Alignment**: Both prefer BT.709 + +--- + +## 14. NV12 Optimization Benefits + +1. **No interleaving**: Single memory layout +2. **Fewer textures**: 2 instead of 3 +3. **GPU efficiency**: Direct from hardware decoders +4. **Bandwidth**: Fewer texture fetch operations + +--- + +## 15. HDR Considerations + +### Current Status +- Not implemented in OpenNow +- Surface format: Linear (non-sRGB) +- No HDR10 texture formats +- No BT.2020 color space + +### Future Requirements +- SCRGB (Extended Dynamic Range) +- BT.2020 color primaries +- SMPTE ST.2084 tone-mapping diff --git a/opennow-streamer/reverse/session.md b/opennow-streamer/reverse/session.md new file mode 100644 index 0000000..022bd5f --- /dev/null +++ b/opennow-streamer/reverse/session.md @@ -0,0 +1,396 @@ +# GeForce NOW Session & API Management - Reverse Engineering Documentation + +## 1. Authentication Flow + +### OAuth 2.0 with PKCE +``` +Endpoint: https://login.nvidia.com/authorize +Token: https://login.nvidia.com/token +Client ID: ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ +Scopes: openid consent email tk_client age +IDP ID: PDiAhv2kJTFeQ7WOPqiQ2tRZ7lGhR2X11dXvM4TZSxg +``` + +### PKCE Parameters +```json +{ + "response_type": "code", + "device_id": "sha256(hostname + username + 'opennow-streamer')", + "scope": "openid consent email tk_client age", + "client_id": "ZU7sPN-miLujMD95LfOQ453IB0AtjM8sMyvgJ9wCXEQ", + "redirect_uri": "http://localhost:{port}", + "code_challenge": "sha256_base64(verifier)", + "code_challenge_method": "S256", + "idp_id": "PDiAhv2kJTFeQ7WOPqiQ2tRZ7lGhR2X11dXvM4TZSxg" +} +``` + +### Token Response +```json +{ + "access_token": "...", + "refresh_token": "...", + "id_token": "jwt_token", + "expires_in": 86400 +} +``` + +### Authorization Headers +``` +Native: Authorization: GFNJWT {token} +Partner: Authorization: GFNPartnerJWT auth={token} +OAuth: Authorization: Bearer {token} +``` + +--- + +## 2. Service URLs API + +### Endpoint +``` +GET https://pcs.geforcenow.com/v1/serviceUrls +``` + +### Response +Array of login providers with: +- `idp_id`: Identity provider ID +- `streaming_service_url`: Region-specific base URL + +### Alliance Partners +- KDD, TWM, BPC/bro.game, etc. +- Custom streaming URLs from serviceUrls response + +--- + +## 3. CloudMatch Session API + +### Base URL +``` +https://{zone}.cloudmatchbeta.nvidiagrid.net/v2/session +``` + +### Required Headers +``` +User-Agent: Mozilla/5.0 ... NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173 +Authorization: GFNJWT {token} +Content-Type: application/json +Origin: https://play.geforcenow.com +nv-client-id: {uuid} +nv-client-type: NATIVE +nv-client-version: 2.0.80.173 +nv-client-streamer: NVIDIA-CLASSIC +nv-device-os: WINDOWS +nv-device-type: DESKTOP +x-device-id: {uuid} +``` + +--- + +## 4. Create Session + +### POST /v2/session +```json +{ + "sessionRequestData": { + "appId": "string", + "internalTitle": "Game Name", + "clientIdentification": "GFN-PC", + "deviceHashId": "{uuid}", + "clientVersion": "30.0", + "clientPlatformName": "windows", + "clientRequestMonitorSettings": [{ + "widthInPixels": 1920, + "heightInPixels": 1080, + "framesPerSecond": 60 + }], + "metaData": [ + {"key": "GSStreamerType", "value": "WebRTC"}, + {"key": "wssignaling", "value": "1"} + ], + "requestedStreamingFeatures": { + "reflex": false, + "trueHdr": false + } + } +} +``` + +### Session Response +```json +{ + "session": { + "sessionId": "string", + "status": 2, + "gpuType": "RTX_A5000", + "connectionInfo": [{ + "ip": "server_ip", + "port": 443, + "usage": 14, + "protocol": 1, + "resourcePath": "/nvst/" + }], + "iceServerConfiguration": { + "iceServers": [ + {"urls": "turn:server:port", "username": "...", "credential": "..."} + ] + } + }, + "requestStatus": { + "statusCode": 1, + "serverId": "NP-AMS-08" + } +} +``` + +--- + +## 5. Session States + +| Status | Description | +|--------|-------------| +| 1 | Launching / Setting up | +| 2 | Ready for streaming | +| 3 | Actively streaming | +| 6 | Initialization pending | + +--- + +## 6. Poll Session + +### GET /v2/session/{sessionId} +Same response format as create session. + +--- + +## 7. Stop Session + +### DELETE /v2/session/{sessionId} +Terminates the session. + +--- + +## 8. Resume Session + +### PUT /v2/session/{sessionId} +```json +{ + "action": 2, + "data": "RESUME", + "sessionRequestData": { ... } +} +``` + +--- + +## 9. Error Codes + +### CloudMatch Status Codes +| Code | Description | +|------|-------------| +| 1 | Success | +| 2 | Forbidden | +| 3 | Timeout | +| 4 | Internal Error | +| 11 | Session Limit Exceeded | +| 14 | Auth Failure | +| 16 | Token Expired | +| 25 | Service Unavailable | +| 50 | Device Limit Reached | +| 51 | Zone At Capacity | +| 86 | Insufficient Playability | + +### Unified Error Codes (i64) +``` +15859712: Success +3237093643: Session Limit Exceeded +3237093648: Token Expired +3237093657: Service Unavailable +3237093682: Device Session Limit +3237093715: Max Session Limit +3237093718: Insufficient Playability +``` + +--- + +## 10. WebSocket Signaling + +### Connection URL +``` +wss://{server_ip}:443/nvst/sign_in?peer_id={peer_name}&version=2 + +Subprotocol: x-nv-sessionid.{sessionId} +``` + +### Peer Info Message +```json +{ + "ackid": 1, + "peer_info": { + "id": 2, + "name": "peer-{random}", + "browser": "Chrome", + "browserVersion": "131", + "connected": true, + "peerRole": 0, + "resolution": "1920x1080", + "version": 2 + } +} +``` + +### Heartbeat (Every 5s) +```json +{"hb": 1} +``` + +### Acknowledgment +```json +{"ack": 1} +``` + +### SDP Offer (from server) +```json +{ + "ackid": 2, + "peer_msg": { + "from": 1, + "to": 2, + "msg": "{\"type\":\"offer\",\"sdp\":\"v=0\\r\\no=...\"}" + } +} +``` + +### SDP Answer (to server) +```json +{ + "ackid": 3, + "peer_msg": { + "from": 2, + "to": 1, + "msg": "{\"type\":\"answer\",\"sdp\":\"...\",\"nvstSdp\":\"v=0\\r\\n...\"}" + } +} +``` + +### ICE Candidate +```json +{ + "ackid": 4, + "peer_msg": { + "from": 2, + "to": 1, + "msg": "{\"candidate\":\"candidate:...\",\"sdpMid\":\"...\",\"sdpMLineIndex\":0}" + } +} +``` + +--- + +## 11. nvstSdp Parameters + +### FEC Settings +``` +a=vqos.fec.rateDropWindow:10 +a=vqos.fec.minRequiredFecPackets:2 +a=vqos.fec.repairMinPercent:5 +a=vqos.fec.repairMaxPercent:35 +``` + +### Dynamic Quality Control +``` +a=vqos.dfc.enable:1 +a=vqos.dfc.decodeFpsAdjPercent:85 +a=vqos.dfc.targetDownCooldownMs:250 +a=vqos.dfc.minTargetFps:100 +``` + +### Bitrate Control +``` +a=video.initialBitrateKbps:25000 +a=vqos.bw.maximumBitrateKbps:50000 +a=vqos.bw.minimumBitrateKbps:5000 +a=bwe.useOwdCongestionControl:1 +``` + +### NACK Settings +``` +a=video.enableRtpNack:1 +a=video.rtpNackQueueLength:1024 +a=video.rtpNackQueueMaxPackets:512 +``` + +--- + +## 12. Game Library API + +### GraphQL Endpoint +``` +POST https://games.geforce.com/graphql + +Persisted Query Hash: f8e26265a5db5c20e1334a6872cf04b6e3970507697f6ae55a6ddefa5420daf0 +``` + +### Public Games List +``` +GET https://static.nvidiagrid.net/supported-public-game-list/locales/gfnpc-en-US.json +``` + +### Game Images +``` +https://cdn.cloudflare.steamstatic.com/steam/apps/{steam_id}/library_600x900.jpg +``` + +--- + +## 13. Subscription API + +### Endpoint +``` +GET https://mes.geforcenow.com/v4/subscriptions +?serviceName=gfn_pc&languageCode=en_US&vpcId={vpc_id}&userId={user_id} +``` + +--- + +## 14. Server Info + +### GET /v2/serverInfo +```json +{ + "requestStatus": { + "serverId": "NP-AMS-08" + }, + "metaData": [ + {"key": "region_name", "value": "https://region.cloudmatchbeta.nvidiagrid.net/"} + ] +} +``` + +--- + +## 15. Client Type Headers + +### Native Client +``` +nv-client-type: NATIVE +nv-client-streamer: NVIDIA-CLASSIC +``` + +### Browser/WebRTC +``` +nv-client-type: BROWSER +nv-client-streamer: WEBRTC +``` + +--- + +## 16. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Session API | /v2/session POST | /v2/session POST | /v2/session POST | +| Auth Header | GFNJWT | GFNJWT | GFNJWT | +| WS Signaling | Custom JS | Native C++ | Tokio WebSocket | +| Session Polling | Callback-based | Polling loop | Async polling | +| Heartbeat | Every 5s | Every 5s | Every 5s | +| Alliance Partners | Full support | Full support | Full support | diff --git a/opennow-streamer/reverse/statistics.md b/opennow-streamer/reverse/statistics.md new file mode 100644 index 0000000..197f3f5 --- /dev/null +++ b/opennow-streamer/reverse/statistics.md @@ -0,0 +1,347 @@ +# GeForce NOW Statistics & QoS - Reverse Engineering Documentation + +## 1. Statistics Structure + +### StreamStats (OpenNow) +```rust +pub struct StreamStats { + pub resolution: String, + pub fps: f32, + pub render_fps: f32, + pub target_fps: u32, + pub bitrate_mbps: f32, + pub latency_ms: f32, + pub decode_time_ms: f32, + pub render_time_ms: f32, + pub input_latency_ms: f32, + pub codec: String, + pub gpu_type: String, + pub server_region: String, + pub packet_loss: f32, + pub jitter_ms: f32, + pub frames_received: u64, + pub frames_decoded: u64, + pub frames_dropped: u64, + pub frames_rendered: u64, +} +``` + +### DecodeStats +```rust +pub struct DecodeStats { + pub decode_time_ms: f32, + pub frame_produced: bool, + pub needs_keyframe: bool, +} +``` + +--- + +## 2. QoS SDP Parameters + +### FEC (Forward Error Correction) +``` +a=vqos.fec.rateDropWindow:10 +a=vqos.fec.minRequiredFecPackets:2 +a=vqos.fec.repairMinPercent:5 +a=vqos.fec.repairPercent:5 +a=vqos.fec.repairMaxPercent:35 +``` + +### DFC (Dynamic FPS Control) +``` +a=vqos.dfc.enable:1 +a=vqos.dfc.decodeFpsAdjPercent:85 +a=vqos.dfc.targetDownCooldownMs:250 +a=vqos.dfc.dfcAlgoVersion:2 +a=vqos.dfc.minTargetFps:100 (or 60 for lower fps) +``` + +### DRC (Dynamic Resolution Control) +``` +a=vqos.drc.minQpHeadroom:20 +a=vqos.drc.lowerQpThreshold:100 +a=vqos.drc.upperQpThreshold:200 +a=vqos.drc.minAdaptiveQpThreshold:180 +a=vqos.drc.iirFilterFactor:100 +``` + +### Bitrate Control +``` +a=vqos.bw.maximumBitrateKbps:{max_bitrate} +a=vqos.bw.minimumBitrateKbps:{max_bitrate / 10} +a=video.initialBitrateKbps:{max_bitrate / 2} +a=video.initialPeakBitrateKbps:{max_bitrate / 2} +``` + +### BWE (Bandwidth Estimation) +``` +a=bwe.useOwdCongestionControl:1 +a=bwe.iirFilterFactor:8 +a=vqos.drc.bitrateIirFilterFactor:18 +``` + +### NACK (Retransmission) +``` +a=video.enableRtpNack:1 +a=video.rtpNackQueueLength:1024 +a=video.rtpNackQueueMaxPackets:512 +a=video.rtpNackMaxPacketCount:25 +``` + +### Packet Pacing +``` +a=packetPacing.minNumPacketsPerGroup:15 +a=packetPacing.numGroups:3 (or 5 for 60fps) +a=packetPacing.maxDelayUs:1000 +a=packetPacing.minNumPacketsFrame:10 +``` + +--- + +## 3. RTCP Statistics Collection + +### Inbound RTP Video Stats +``` +packetsReceived - Total packets received +packetsLost - Total packets lost +bytesReceived - Total bytes received +framesReceived - Total frames received +framesDecoded - Total frames decoded +framesDropped - Total frames dropped +pliCount - Picture Loss Indication count +jitter - Network jitter +jitterBufferDelay - Jitter buffer delay (ms) +totalInterFrameDelay - Total inter-frame delay +totalDecodeTime - Total decode time +frameHeight/Width - Frame dimensions +``` + +### Connection Stats +``` +currentRoundTripTime - RTT (ms) +availableOutgoingBitrate +availableIncomingBitrate +``` + +### Audio Stats +``` +audioLevel +concealedSamples +jitterBufferDelay +totalSamplesDuration +``` + +--- + +## 4. Frame Timing Metrics + +### Decode Time Tracking +- Measured from packet receive to decode completion +- Tracked per-frame in DecodeStats +- Average calculated over 1-second intervals + +### Latency Calculations +``` +Pipeline Latency = Sum(decode_times) / frame_count +Input Latency = Time from event creation to transmission +Network Latency = RTT / 2 (approximation) +Total Latency = Network + Decode + Render +``` + +--- + +## 5. Bitrate Adaptation + +### Calculation +```rust +bitrate_mbps = (bytes_received * 8) / (elapsed_seconds * 1_000_000) +``` + +### Server-Side Adaptation Triggers +- Decode time exceeds threshold +- Frame drop rate increases +- Packet loss percentage increases +- QP (Quantization Parameter) feedback + +### Packet Loss Calculation +``` +PacketLoss% = (packetsLost * 100) / (packetsLost + packetsReceived) +``` + +--- + +## 6. OSD (On-Screen Display) + +### Display Locations +- BottomLeft (default) +- BottomRight +- TopLeft +- TopRight + +### Display Information +``` +Resolution & FPS: "1920x1080 @ 60 fps" +Codec & Bitrate: "H.264 • 25.5 Mbps" +Latency: Color-coded (Green <30ms, Yellow 30-60ms, Red >60ms) +Packet Loss: Only shown if >0% (Yellow <1%, Red >=1%) +Decode & Render: "Decode: 5.2 ms • Render: 1.8 ms" +Frame Stats: "Frames: 1204 rx, 1198 dec, 6 drop" +GPU & Region: "RTX 4090 • us-east-1" +``` + +--- + +## 7. Telemetry Binary Format + +### Audio Stats (Type 4) +``` +Float64: audioLevel +Uint32: concealedSamples +Uint32: concealmentEvents +Uint32: insertedSamplesForDeceleration +Float64: jitterBufferDelay +Uint32: jitterBufferEmittedCount +Uint32: removedSamplesForAcceleration +Uint32: silentConcealedSamples +Float64: totalSamplesReceived +Float64: totalSamplesDuration +Float64: timestamp +``` + +### Video Stats (Type 3) +``` +Uint32: framesDecoded +Uint32: framesDropped +Uint32: frameHeight +Uint32: frameWidth +Uint32: framesReceived +Float64: jitterBufferDelay +Uint32: jitterBufferEmittedCount +Float64: timestamp +``` + +### Inbound RTP Stats (Type 2) +``` +Uint32: packetsReceived +Uint32: bytesReceived +Uint32: packetsLost +Float64: lastPacketReceivedTimestamp +Float64: jitter +Float64: timestamp +``` + +--- + +## 8. Quality Adjustment Parameters + +### QP (Quantization Parameter) Thresholds +``` +a=vqos.drc.minQpHeadroom:20 +a=vqos.drc.lowerQpThreshold:100 +a=vqos.drc.upperQpThreshold:200 +a=vqos.drc.minAdaptiveQpThreshold:180 +a=vqos.drc.qpMaxResThresholdAdj:4 +a=vqos.grc.qpMaxResThresholdAdj:4 +``` + +### Decode Time Thresholds +``` +a=vqos.resControl.cpmRtc.decodeTimeThresholdMs:9 +a=vqos.resControl.cpmRtc.badNwSkipFramesCount:600 +``` + +--- + +## 9. PLI (Picture Loss Indication) + +### Trigger Conditions +- 10 consecutive packets without decoded frame +- After 5+ failures, sent every 20 packets + +### Implementation +```rust +let pli = PictureLossIndication { + sender_ssrc: 0, + media_ssrc: video_ssrc, +}; +peer_connection.write_rtcp(&[Box::new(pli)]).await? +``` + +--- + +## 10. High FPS Optimizations (120+) + +### SDP Parameters +``` +a=video.encoderFeatureSetting:47 +a=video.encoderPreset:6 +a=video.fbcDynamicFpsGrabTimeoutMs:6 +a=bwe.iirFilterFactor:8 +``` + +### 240+ FPS +``` +a=video.enableNextCaptureMode:1 +a=vqos.maxStreamFpsEstimate:240 +a=video.videoSplitEncodeStripsPerFrame:3 +a=video.fbcDynamicFpsGrabTimeoutMs:18 +``` + +--- + +## 11. Comparison + +| Feature | Web Client | Official Client | OpenNow | +|---------|-----------|-----------------|---------| +| Stats Collection | Full WebRTC getStats() | Native C++ | Basic StreamStats | +| Adaptive Bitrate | Server-side | Server-side | Not implemented | +| Adaptive Resolution | DRC algorithm | DRC/DFC hybrid | Not implemented | +| Adaptive FPS | DFC for high-FPS | DFC | Not implemented | +| Telemetry | Binary format | GEAR events | Basic logging | +| RTCP Stats | Full RFC 3550 | Native RTCP | Not implemented | +| BWE Algorithm | OWD congestion | Advanced | Not implemented | +| FEC | SDP configured | Dynamic | SDP configured | +| NACK | Full support | Full support | SDP configured | + +--- + +## 12. Telemetry Events + +### Web Client Events +``` +TelemetryHandlerChanged +WorkerProblem +WebWorkerProblem +VideoPaused +MissingInboundRtpVideo +InboundVideoStats +TURN Server Details +Worker Thread Creation Failed +``` + +--- + +## 13. Control Channel Messages + +### finAck (Network Test Result) +```json +{ + "finAck": { + "downlinkBandwidth": , + "packetLoss": , + "latency": + } +} +``` + +### fin (Graceful Shutdown) +```json +{ + "fin": { + "sessionId": "", + "packetsLost": , + "packetsReceived": + } +} +``` diff --git a/opennow-streamer/reverse/video.md b/opennow-streamer/reverse/video.md new file mode 100644 index 0000000..4ba18d0 --- /dev/null +++ b/opennow-streamer/reverse/video.md @@ -0,0 +1,276 @@ +# GeForce NOW Video Handling - Reverse Engineering Documentation + +## 1. Video Codec Support + +### Supported Codecs +- **H.264/AVC** (primary, widest compatibility) +- **H.265/HEVC** (better compression, dynamic payload type negotiation) +- **AV1** (newest codec, RTX 40+ only, requires CUVID or QSV) + +### Codec Registration (WebRTC) +From `src/webrtc/peer.rs`: +- H.264: Standard registered via `register_default_codecs()` +- H.265: Custom registration with MIME type `"video/H265"`, clock rate 90kHz, payload type 0 (dynamic) +- AV1: Custom registration with MIME type `"video/AV1"`, clock rate 90kHz, payload type 0 (dynamic) + +--- + +## 2. RTP Packet Structure & Depacketization + +### RTP Header Format (RFC 3550) +``` +0 1 2 3 +0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +|V=2|P|X| CC |M| PT | sequence number | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| timestamp | ++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +| synchronization source (SSRC) identifier | ++=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +``` + +Key fields: +- **V (Version)**: 2 +- **M (Marker)**: 1 on last packet of frame (critical for frame boundaries) +- **PT (Payload Type)**: 96 (H.264), 127 (H.265), 98 (AV1) +- **Timestamp**: 90 kHz clock for video + +### H.264 RTP Payload Types (RFC 6184) + +**Single NAL Unit (PT 1-23):** +- Payload is raw NAL unit without start code +- Decoder adds start code: `0x00 0x00 0x00 0x01` + +**STAP-A (Single-Time Aggregation Packet, PT 24):** +``` +[0x18] + [Size1:2B BE] + [NAL1] + [Size2:2B BE] + [NAL2] + ... +``` + +**FU-A (Fragmentation Unit, PT 28):** +``` +[0x7C] + [FU Header: S|E|R|Type] + [Fragment Payload] +FU Header: S=1 (start), E=1 (end), R=0 (reserved) +``` + +### H.265/HEVC RTP Payload (RFC 7798) + +**NAL Unit Header: 2 bytes** +``` +Byte 0: F(1) | Type(6) | LayerId_hi(1) +Byte 1: LayerId_lo(5) | TId_plus1(3) +``` + +**AP (Aggregation Packet, Type 48):** +``` +[Header:2B] + [Size1:2B BE] + [NAL1] + [Size2:2B BE] + [NAL2] + ... +``` + +**FU (Fragmentation Unit, Type 49):** +``` +[Header:2B] + [FU Header: S|E|Reserved|Type] + [Fragment Payload] +``` + +### AV1 RTP Payload (RFC 9000) + +**Aggregation Header (1 byte):** +``` +Z(1) | Y(1) | W(2) | N(1) | Reserved(3) +Z: Continuation of previous OBU fragment +Y: Last OBU fragment or complete OBU +W: Number of OBU elements +N: First packet of coded video sequence +``` + +**OBU Types:** +- 1: SEQUENCE_HEADER (critical, must precede picture data) +- 4: TILE_GROUP (contains picture data) +- 6: FRAME (complete frame) + +--- + +## 3. NAL Unit Types + +### H.264 NAL Unit Types +``` +1: Slice (Non-IDR) - P-frame/B-frame +5: IDR Slice - Keyframe +6: SEI (Supplemental Enhancement Information) +7: SPS (Sequence Parameter Set) +8: PPS (Picture Parameter Set) +24: STAP-A (aggregation) +28: FU-A (fragmentation) +``` + +### H.265/HEVC NAL Unit Types +``` +19: IDR_W_RADL - Keyframe +20: IDR_N_LP - Keyframe +32: VPS (Video Parameter Set) +33: SPS (Sequence Parameter Set) +34: PPS (Picture Parameter Set) +48: AP (Aggregation Packet) +49: FU (Fragmentation Unit) +``` + +### SPS/PPS Caching Strategy +- H.264: Type 7 (SPS) and Type 8 (PPS) cached, prepended to IDR frames (type 5) +- H.265: Types 32/33/34 (VPS/SPS/PPS) cached, prepended to IDR frames (types 19-20) +- AV1: SEQUENCE_HEADER (type 1) cached, prepended to frames missing it + +--- + +## 4. Color Space & Pixel Formats + +### YUV420P (Planar) +``` +Layout: +Y Plane: height * stride (full resolution) +U Plane: (height/2) * (stride/2) +V Plane: (height/2) * (stride/2) +``` + +### NV12 (Semi-planar) +``` +Layout: +Y Plane: height * stride_y (full resolution) +UV Plane: (height/2) * stride_uv (interleaved U,V pairs) +``` + +### YUV to RGB Conversion (BT.709) + +**Limited Range to Full Range:** +``` +y = (y_raw - 0.0625) * 1.1644 // (Y - 16/255) * (255/219) +u = (u_raw - 0.5) * 1.1384 // (U - 128/255) * (255/224) +v = (v_raw - 0.5) * 1.1384 // (V - 128/255) * (255/224) +``` + +**BT.709 Matrix:** +``` +R = Y + 1.5748 * V +G = Y - 0.1873 * U - 0.4681 * V +B = Y + 1.8556 * U +``` + +**Integer Math (Fast CPU Fallback):** +``` +R = (y + ((359 * v) >> 8)).clamp(0, 255) +G = (y - ((88 * u + 183 * v) >> 8)).clamp(0, 255) +B = (y + ((454 * u) >> 8)).clamp(0, 255) +``` + +--- + +## 5. Hardware Acceleration + +### Decoder Priority Order + +**Windows:** +1. h264_cuvid / hevc_cuvid / av1_cuvid (NVIDIA CUDA) +2. h264_qsv / hevc_qsv / av1_qsv (Intel QuickSync) +3. h264_d3d11va / hevc_d3d11va (DirectX 11) +4. Software fallback + +**macOS:** +- VideoToolbox (native macOS, NV12 output) + +**Linux:** +1. CUVID (NVIDIA) +2. VAAPI (AMD/Intel) +3. Software fallback + +--- + +## 6. Frame Timing & Synchronization + +### RTP Timestamp Calculation +``` +90 kHz clock rate: +- 60 FPS = 1500 RTP ticks per frame (90000/60) +- 120 FPS = 750 RTP ticks per frame (90000/120) +- 240 FPS = 375 RTP ticks per frame (90000/240) +``` + +### Picture Loss Indication (PLI) +From `src/webrtc/peer.rs`: +```rust +let pli = PictureLossIndication { + sender_ssrc: 0, + media_ssrc: video_ssrc, +}; +peer_connection.write_rtcp(&[Box::new(pli)]).await? +``` + +**Trigger Conditions:** +- 10 consecutive packets without decoded frame +- Additional requests every 20 packets if still failing + +--- + +## 7. Streaming Parameters (SDP) + +### Video Quality Settings +``` +a=video.packetSize:1140 +a=video.maxFPS:120 +a=video.initialBitrateKbps:25000 +a=vqos.bw.maximumBitrateKbps:50000 +a=vqos.bw.minimumBitrateKbps:5000 +``` + +### NACK Configuration +``` +a=video.enableRtpNack:1 +a=video.rtpNackQueueLength:1024 +a=video.rtpNackQueueMaxPackets:512 +a=video.rtpNackMaxPacketCount:25 +``` + +### High FPS Optimizations (120+) +``` +a=video.encoderFeatureSetting:47 +a=video.encoderPreset:6 +a=video.fbcDynamicFpsGrabTimeoutMs:6 +a=bwe.iirFilterFactor:8 +``` + +### 240+ FPS +``` +a=video.enableNextCaptureMode:1 +a=vqos.maxStreamFpsEstimate:240 +a=video.videoSplitEncodeStripsPerFrame:3 +``` + +--- + +## 8. Decode Process Flow + +``` +RTP Packet Received + ↓ +Depacketize (H.264/H.265/AV1) + ↓ +Decode Async (FFmpeg + Hardware) + ↓ +Extract Planes (YUV420P or NV12) + ↓ +Upload to GPU Textures + ↓ +GPU Shader (YUV→RGB) + ↓ +Present to Screen +``` + +--- + +## 9. Comparison + +| Feature | Web Client | OpenNow | Official Client | +|---------|-----------|---------|-----------------| +| RTP Parsing | libwebrtc | Custom Rust | libwebrtc | +| H.265 Support | Yes | Yes | Yes | +| AV1 Support | Yes | Yes (RTX 40+) | Yes | +| Hardware Decode | Browser | CUVID/QSV/VT | NVDEC | +| Color Space | BT.709 | BT.709 | BT.709 | +| Frame Format | Varies | YUV420P/NV12 | NV12 | diff --git a/opennow-streamer/src/api/cloudmatch.rs b/opennow-streamer/src/api/cloudmatch.rs index ca52ef9..46a7956 100644 --- a/opennow-streamer/src/api/cloudmatch.rs +++ b/opennow-streamer/src/api/cloudmatch.rs @@ -538,7 +538,7 @@ impl GfnApiClient { .map(|s| { let app_id = s.session_request_data .as_ref() - .map(|d| d.app_id) + .map(|d| d.get_app_id()) .unwrap_or(0); let server_ip = s.session_control_info @@ -559,8 +559,12 @@ impl GfnApiClient { .as_ref() .and_then(|ms| ms.first()) .map(|m| ( - Some(format!("{}x{}", m.width_in_pixels, m.height_in_pixels)), - Some(m.frames_per_second) + Some(format!( + "{}x{}", + m.width_in_pixels.unwrap_or(0), + m.height_in_pixels.unwrap_or(0) + )), + m.frames_per_second )) .unwrap_or((None, None)); @@ -721,9 +725,9 @@ impl GfnApiClient { let get_url = format!("https://{}/v2/session/{}", server_ip, session_id); - for attempt in 1..=10 { + for attempt in 1..=60 { if attempt > 1 { - tokio::time::sleep(tokio::time::Duration::from_millis(500)).await; + tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await; } let poll_response = self.client.get(&get_url) diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index 9ada3ae..7dea745 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -191,6 +191,25 @@ impl App { } }); + // Start checking active sessions if we have a token + if has_token { + let rt = runtime.clone(); + let token = auth_tokens.as_ref().unwrap().jwt().to_string(); + rt.spawn(async move { + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + match api_client.get_active_sessions().await { + Ok(sessions) => { + info!("Checked active sessions at startup: found {}", sessions.len()); + cache::save_active_sessions_cache(&sessions); + } + Err(e) => { + warn!("Failed to check active sessions at startup: {}", e); + } + } + }); + } + Self { state: initial_state, runtime, @@ -490,6 +509,9 @@ impl App { self.fetch_games(); self.fetch_subscription(); // Also fetch subscription info self.load_servers(); // Load servers (fetches dynamic regions) + + // Check for active sessions after login + self.check_active_sessions(); } } } @@ -549,6 +571,14 @@ impl App { self.pending_game_launch = Some(pending); self.show_session_conflict = true; cache::clear_active_sessions_cache(); + } else if !self.active_sessions.is_empty() { + // Auto-resume logic: no pending game, but active sessions exist -> resume the first one + if let Some(session) = self.active_sessions.first() { + info!("Auto-resuming active session found: {}", session.session_id); + let session_clone = session.clone(); + self.resume_session(session_clone); + cache::clear_active_sessions_cache(); + } } } @@ -809,6 +839,32 @@ impl App { } } + /// Check for active sessions explicitly + pub fn check_active_sessions(&mut self) { + if self.auth_tokens.is_none() { + return; + } + + let token = self.auth_tokens.as_ref().unwrap().jwt().to_string(); + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.get_active_sessions().await { + Ok(sessions) => { + info!("Checked active sessions: found {}", sessions.len()); + if !sessions.is_empty() { + cache::save_active_sessions_cache(&sessions); + } + } + Err(e) => { + warn!("Failed to check active sessions: {}", e); + } + } + }); + } + /// Start ping test for all servers pub fn start_ping_test(&mut self) { if self.ping_testing { @@ -1268,6 +1324,38 @@ impl App { }); } + /// Terminate current session via API and stop streaming + pub fn terminate_current_session(&mut self) { + if let Some(session) = &self.session { + info!("Ctrl+Shift+Q: Terminating active session: {}", session.session_id); + + let token = match &self.auth_tokens { + Some(t) => t.jwt().to_string(), + None => { + self.stop_streaming(); + return; + } + }; + + let session_id = session.session_id.clone(); + let zone = session.zone.clone(); + let server_ip = if session.server_ip.is_empty() { None } else { Some(session.server_ip.clone()) }; + + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.stop_session(&session_id, &zone, server_ip.as_deref()).await { + Ok(_) => info!("Session {} terminated successfully", session_id), + Err(e) => warn!("Failed to stop session {}: {}", session_id, e), + } + }); + } + + self.stop_streaming(); + } + /// Stop streaming and return to games pub fn stop_streaming(&mut self) { info!("Stopping streaming"); diff --git a/opennow-streamer/src/app/session.rs b/opennow-streamer/src/app/session.rs index 0c7f1e7..38f0952 100644 --- a/opennow-streamer/src/app/session.rs +++ b/opennow-streamer/src/app/session.rs @@ -403,16 +403,38 @@ pub struct SessionFromApi { #[serde(default)] pub connection_info: Option>, #[serde(default)] - pub monitor_settings: Option>, + pub monitor_settings: Option>, +} + +/// Lenient MonitorSettings for API response +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct MonitorSettingsFromApi { + #[serde(default)] + pub width_in_pixels: Option, + #[serde(default)] + pub height_in_pixels: Option, + #[serde(default)] + pub frames_per_second: Option, } /// Session request data from API (contains app_id) #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub struct SessionRequestDataFromApi { - /// App ID as i64 (API returns it as number) + /// App ID can be string or number #[serde(default)] - pub app_id: i64, + pub app_id: Option, +} + +impl SessionRequestDataFromApi { + pub fn get_app_id(&self) -> i64 { + match &self.app_id { + Some(serde_json::Value::Number(n)) => n.as_i64().unwrap_or(0), + Some(serde_json::Value::String(s)) => s.parse::().unwrap_or(0), + _ => 0, + } + } } /// Simplified active session info for UI diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 6ebeb30..e2cc1e5 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -12,9 +12,9 @@ use winit::window::{Window, WindowAttributes, Fullscreen, CursorGrabMode}; #[cfg(target_os = "macos")] use winit::raw_window_handle::{HasWindowHandle, RawWindowHandle}; -use wgpu::util::DeviceExt; +// use wgpu::util::DeviceExt; -use crate::app::{App, AppState, UiAction, GamesTab, SettingChange, GameInfo}; +use crate::app::{App, AppState, UiAction, GamesTab, GameInfo}; use crate::app::session::ActiveSessionInfo; use crate::media::{VideoFrame, PixelFormat}; use super::StatsPanel; @@ -79,7 +79,7 @@ impl Renderer { pub async fn new(event_loop: &ActiveEventLoop) -> Result { // Create window attributes let window_attrs = WindowAttributes::default() - .with_title("OpenNOW") + .with_title("OpenNow") .with_inner_size(PhysicalSize::new(1280, 720)) .with_min_inner_size(PhysicalSize::new(640, 480)) .with_resizable(true); diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index b5b7ba8..a4eca8d 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -192,8 +192,8 @@ impl ApplicationHandler for OpenNowApp { } if self.modifiers.state().control_key() && self.modifiers.state().shift_key() => { let mut app = self.app.lock(); if app.state == AppState::Streaming { - info!("Ctrl+Shift+Q pressed - stopping stream"); - app.stop_streaming(); + info!("Ctrl+Shift+Q pressed - terminating session"); + app.terminate_current_session(); } } WindowEvent::KeyboardInput { diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 557e4c3..5c889de 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -38,100 +38,95 @@ pub enum GpuVendor { Unknown, } +/// Cached GPU vendor +static GPU_VENDOR: std::sync::OnceLock = std::sync::OnceLock::new(); + /// Detect the primary GPU vendor using wgpu, prioritizing discrete GPUs pub fn detect_gpu_vendor() -> GpuVendor { - // blocked_on because we are in a sync context (VideoDecoder::new) - // but wgpu adapter request is async - pollster::block_on(async { - let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor::default()); // Needs borrow - - // Enumerate all available adapters - let adapters = instance.enumerate_adapters(wgpu::Backends::all()); - - let mut best_score = -1; - let mut best_vendor = GpuVendor::Unknown; - - info!("Available GPU adapters:"); - - for adapter in adapters { - let info = adapter.get_info(); - let name = info.name.to_lowercase(); - let mut score = 0; - let mut vendor = GpuVendor::Other; + *GPU_VENDOR.get_or_init(|| { + // blocked_on because we are in a sync context (VideoDecoder::new) + // but wgpu adapter request is async + pollster::block_on(async { + let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor::default()); // Needs borrow - // Identify vendor - if name.contains("nvidia") || name.contains("geforce") || name.contains("quadro") { - vendor = GpuVendor::Nvidia; - score += 100; - } else if name.contains("amd") || name.contains("adeon") || name.contains("ryzen") { - vendor = GpuVendor::Amd; - score += 80; - } else if name.contains("intel") || name.contains("uhd") || name.contains("iris") || name.contains("arc") { - vendor = GpuVendor::Intel; - score += 50; - } else if name.contains("apple") || name.contains("m1") || name.contains("m2") || name.contains("m3") { - vendor = GpuVendor::Apple; - score += 90; // Apple Silicon is high perf - } + // Enumerate all available adapters + let adapters = instance.enumerate_adapters(wgpu::Backends::all()); - // Prioritize discrete GPUs - match info.device_type { - wgpu::DeviceType::DiscreteGpu => { - score += 50; - } - wgpu::DeviceType::IntegratedGpu => { - score += 10; - } - _ => {} - } + let mut best_score = -1; + let mut best_vendor = GpuVendor::Unknown; - info!(" - {} ({:?}, Vendor: {:?}, Score: {})", info.name, info.device_type, vendor, score); + info!("Available GPU adapters:"); - if score > best_score { - best_score = score; - best_vendor = vendor; - } - } - - if best_vendor != GpuVendor::Unknown { - info!("Selected best GPU vendor: {:?}", best_vendor); - best_vendor - } else { - // Fallback to default request if enumeration fails - warn!("Adapter enumeration yielded no results, trying default request"); - // request_adapter returns impl Future> in 0.19/0.20, but compiler says Result? - // Checking wgpu 0.17+ it returns Option. - // Wait, the error says: expected `Result`, found `Option<_>` - // NOTE: This implies the user is on wgpu v22+ or v23+ where it might return Result. - // Actually, usually request_adapter returns an Option. - // Let's re-read the error carefully: - // 110: if let Some(adapter) = adapter { - // ^^^ this expression has type `std::result::Result` - // So `adapter` is a `Result`. - // `request_adapter` returned a future that resolved to `Result`. - - let adapter_result = instance - .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::HighPerformance, - compatible_surface: None, - force_fallback_adapter: false, - }) - .await; - - // Handle Result - if let Ok(adapter) = adapter_result { + for adapter in adapters { let info = adapter.get_info(); let name = info.name.to_lowercase(); + let mut score = 0; + let mut vendor = GpuVendor::Other; - if name.contains("nvidia") { GpuVendor::Nvidia } - else if name.contains("intel") { GpuVendor::Intel } - else if name.contains("amd") { GpuVendor::Amd } - else if name.contains("apple") { GpuVendor::Apple } - else { GpuVendor::Other } + // Identify vendor + if name.contains("nvidia") || name.contains("geforce") || name.contains("quadro") { + vendor = GpuVendor::Nvidia; + score += 100; + } else if name.contains("amd") || name.contains("adeon") || name.contains("ryzen") { + vendor = GpuVendor::Amd; + score += 80; + } else if name.contains("intel") || name.contains("uhd") || name.contains("iris") || name.contains("arc") { + vendor = GpuVendor::Intel; + score += 50; + } else if name.contains("apple") || name.contains("m1") || name.contains("m2") || name.contains("m3") { + vendor = GpuVendor::Apple; + score += 90; // Apple Silicon is high perf + } + + // Prioritize discrete GPUs + match info.device_type { + wgpu::DeviceType::DiscreteGpu => { + score += 50; + } + wgpu::DeviceType::IntegratedGpu => { + score += 10; + } + _ => {} + } + + info!(" - {} ({:?}, Vendor: {:?}, Score: {})", info.name, info.device_type, vendor, score); + + if score > best_score { + best_score = score; + best_vendor = vendor; + } + } + + if best_vendor != GpuVendor::Unknown { + info!("Selected best GPU vendor: {:?}", best_vendor); + best_vendor } else { - GpuVendor::Unknown + // Fallback to default request if enumeration fails + warn!("Adapter enumeration yielded no results, trying default request"); + + let adapter_result = instance + .request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::HighPerformance, + compatible_surface: None, + force_fallback_adapter: false, + }) + .await; + + // Handle Result + if let Ok(adapter) = adapter_result { + let info = adapter.get_info(); + let name = info.name.to_lowercase(); + + if name.contains("nvidia") { GpuVendor::Nvidia } + else if name.contains("intel") { GpuVendor::Intel } + else if name.contains("amd") { GpuVendor::Amd } + else if name.contains("apple") { GpuVendor::Apple } + else { GpuVendor::Other } + } else { + GpuVendor::Unknown + } } - } + }) }) } @@ -289,52 +284,57 @@ pub fn is_av1_hardware_supported() -> bool { }) } +/// Cached supported decoder backends +static SUPPORTED_BACKENDS: std::sync::OnceLock> = std::sync::OnceLock::new(); + /// Get list of supported decoder backends for the current system pub fn get_supported_decoder_backends() -> Vec { - let mut backends = vec![VideoDecoderBackend::Auto]; - - // Always check what's actually available - #[cfg(target_os = "macos")] - { - backends.push(VideoDecoderBackend::VideoToolbox); - } + SUPPORTED_BACKENDS.get_or_init(|| { + let mut backends = vec![VideoDecoderBackend::Auto]; - #[cfg(target_os = "windows")] - { - let gpu = detect_gpu_vendor(); - let qsv = check_qsv_available(); - - if gpu == GpuVendor::Nvidia { - backends.push(VideoDecoderBackend::Cuvid); - } - - if qsv || gpu == GpuVendor::Intel { - backends.push(VideoDecoderBackend::Qsv); + // Always check what's actually available + #[cfg(target_os = "macos")] + { + backends.push(VideoDecoderBackend::VideoToolbox); } - - // DXVA is generally available on Windows - backends.push(VideoDecoderBackend::Dxva); - } - #[cfg(target_os = "linux")] - { - let gpu = detect_gpu_vendor(); - let qsv = check_qsv_available(); - - if gpu == GpuVendor::Nvidia { - backends.push(VideoDecoderBackend::Cuvid); + #[cfg(target_os = "windows")] + { + let gpu = detect_gpu_vendor(); + let qsv = check_qsv_available(); + + if gpu == GpuVendor::Nvidia { + backends.push(VideoDecoderBackend::Cuvid); + } + + if qsv || gpu == GpuVendor::Intel { + backends.push(VideoDecoderBackend::Qsv); + } + + // DXVA is generally available on Windows + backends.push(VideoDecoderBackend::Dxva); } - - if qsv || gpu == GpuVendor::Intel { - backends.push(VideoDecoderBackend::Qsv); + + #[cfg(target_os = "linux")] + { + let gpu = detect_gpu_vendor(); + let qsv = check_qsv_available(); + + if gpu == GpuVendor::Nvidia { + backends.push(VideoDecoderBackend::Cuvid); + } + + if qsv || gpu == GpuVendor::Intel { + backends.push(VideoDecoderBackend::Qsv); + } + + // VAAPI is generally available on Linux (AMD/Intel) + backends.push(VideoDecoderBackend::Vaapi); } - // VAAPI is generally available on Linux (AMD/Intel) - backends.push(VideoDecoderBackend::Vaapi); - } - - backends.push(VideoDecoderBackend::Software); - backends + backends.push(VideoDecoderBackend::Software); + backends + }).clone() } /// Commands sent to the decoder thread From b1fb8228b531f7f2787bb8cd3b5bea1d10429ba4 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 12:17:36 +0100 Subject: [PATCH 21/67] feat: Implement core application state management, API interactions, and WebRTC streaming infrastructure. --- opennow-streamer/src/api/cloudmatch.rs | 3 +- opennow-streamer/src/api/games.rs | 96 +++++++++++++++++++++++- opennow-streamer/src/app/mod.rs | 20 ++++- opennow-streamer/src/app/types.rs | 2 + opennow-streamer/src/webrtc/peer.rs | 1 + opennow-streamer/src/webrtc/signaling.rs | 4 +- 6 files changed, 120 insertions(+), 6 deletions(-) diff --git a/opennow-streamer/src/api/cloudmatch.rs b/opennow-streamer/src/api/cloudmatch.rs index 46a7956..005ce2b 100644 --- a/opennow-streamer/src/api/cloudmatch.rs +++ b/opennow-streamer/src/api/cloudmatch.rs @@ -31,6 +31,7 @@ impl GfnApiClient { game_title: &str, settings: &Settings, zone: &str, + account_linked: bool, ) -> Result { let token = self.token() .context("No access token")?; @@ -95,7 +96,7 @@ impl GfnApiClient { app_launch_mode: 1, secure_rtsp_supported: false, partner_custom_data: Some("".to_string()), - account_linked: true, + account_linked, enable_persisting_in_game_settings: true, user_age: 26, requested_streaming_features: Some(StreamingFeatures { diff --git a/opennow-streamer/src/api/games.rs b/opennow-streamer/src/api/games.rs index 3228924..de10d62 100644 --- a/opennow-streamer/src/api/games.rs +++ b/opennow-streamer/src/api/games.rs @@ -17,6 +17,9 @@ const GRAPHQL_URL: &str = "https://games.geforce.com/graphql"; /// Persisted query hash for panels (MAIN, LIBRARY, etc.) const PANELS_QUERY_HASH: &str = "f8e26265a5db5c20e1334a6872cf04b6e3970507697f6ae55a6ddefa5420daf0"; +/// Persisted query hash for app metadata +const APP_METADATA_QUERY_HASH: &str = "39187e85b6dcf60b7279a5f233288b0a8b69a8b1dbcfb5b25555afdcb988f0d7"; + /// GFN CEF User-Agent const GFN_USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 NVIDIACEFClient/HEAD/debb5919f6 GFN-PC/2.0.80.173"; @@ -42,6 +45,22 @@ struct GraphQLResponse { errors: Option>, } +#[derive(Debug, Deserialize)] +struct AppMetaDataResponse { + data: Option, + errors: Option>, +} + +#[derive(Debug, Deserialize)] +struct AppsData { + apps: ItemsData, +} + +#[derive(Debug, Deserialize)] +struct ItemsData { + items: Vec, +} + #[derive(Debug, Deserialize)] struct GraphQLError { message: String, @@ -139,6 +158,8 @@ struct VariantLibraryStatus { struct AppGfnStatus { #[serde(default)] playability_state: Option, + #[serde(default)] + play_type: Option, } // ============================================ @@ -315,6 +336,12 @@ impl GfnApiClient { .and_then(|i| i.game_box_art.as_ref().or(i.tv_banner.as_ref()).or(i.hero_image.as_ref())) .map(|url| optimize_image_url(url, 272)); + // Check if playType is INSTALL_TO_PLAY + let is_install_to_play = app.gfn.as_ref() + .and_then(|g| g.play_type.as_deref()) + .map(|t| t == "INSTALL_TO_PLAY") + .unwrap_or(false); + GameInfo { id: if variant_id.is_empty() { app.id } else { variant_id }, title: app.title, @@ -322,6 +349,7 @@ impl GfnApiClient { image_url, store, app_id, + is_install_to_play, } } @@ -461,6 +489,7 @@ impl GfnApiClient { image_url, store, app_id, + is_install_to_play: false, }) }) .collect(); @@ -468,8 +497,7 @@ impl GfnApiClient { info!("Parsed {} games from public list", games.len()); Ok(games) } - - /// Search games by title + /// Search games by title pub fn search_games<'a>(games: &'a [GameInfo], query: &str) -> Vec<&'a GameInfo> { let query_lower = query.to_lowercase(); @@ -477,8 +505,72 @@ impl GfnApiClient { .filter(|g| g.title.to_lowercase().contains(&query_lower)) .collect() } + + /// Fetch full details for a specific app (including playType) + pub async fn fetch_app_details(&self, app_id: &str) -> Result> { + let token = self.token() + .context("No access token for app details")?; + + // Get VPC ID + let vpc_id = super::get_vpc_id(&self.client, Some(token)).await; + + let variables = serde_json::json!({ + "vpcId": vpc_id, + "locale": DEFAULT_LOCALE, + "appIds": [app_id], + }); + + let extensions = serde_json::json!({ + "persistedQuery": { + "sha256Hash": APP_METADATA_QUERY_HASH + } + }); + + let variables_str = serde_json::to_string(&variables)?; + let extensions_str = serde_json::to_string(&extensions)?; + let hu_id = generate_hu_id(); + + let url = format!( + "{}?requestType=appMetaData&extensions={}&huId={}&variables={}", + GRAPHQL_URL, + urlencoding::encode(&extensions_str), + urlencoding::encode(&hu_id), + urlencoding::encode(&variables_str) + ); + + debug!("Fetching app details from: {}", url); + + let response = self.client + .get(&url) + .header("User-Agent", GFN_USER_AGENT) + .header("Accept", "application/json") + .header("Content-Type", "application/graphql") // Although it's GET, GFN native uses this + .header("Authorization", format!("GFNJWT {}", token)) + .header("nv-client-id", LCARS_CLIENT_ID) + .send() + .await + .context("App details request failed")?; + + if !response.status().is_success() { + return Err(anyhow::anyhow!("App details failed: {}", response.status())); + } + + let body = response.text().await?; + let response_data: AppMetaDataResponse = serde_json::from_str(&body) + .context("Failed to parse app details")?; + + if let Some(data) = response_data.data { + if let Some(app) = data.apps.items.into_iter().next() { + return Ok(Some(Self::app_to_game_info(app))); + } + } + + Ok(None) + } } + + /// Fetch server info to get VPC ID for current provider pub async fn fetch_server_info(access_token: Option<&str>) -> Result { let base_url = auth::get_streaming_base_url(); diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index 7dea745..83585db 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -1071,12 +1071,29 @@ impl App { .map(|s| s.id.clone()) .unwrap_or_else(|| "eu-netherlands-south".to_string()); + let is_install_to_play = game.is_install_to_play; + let mut api_client = GfnApiClient::new(); api_client.set_access_token(token); let runtime = self.runtime.clone(); runtime.spawn(async move { - match api_client.create_session(&app_id, &game_title, &settings, &zone).await { + // Fetch latest app details to check for playType="INSTALL_TO_PLAY" + // This is critical for demos which require account_linked=false + let mut account_linked = !is_install_to_play; + + match api_client.fetch_app_details(&app_id).await { + Ok(Some(details)) => { + info!("Fetched fresh app details: is_install_to_play={}", details.is_install_to_play); + account_linked = !details.is_install_to_play; + } + Ok(None) => warn!("App details not found, using cached info: is_install_to_play={}", is_install_to_play), + Err(e) => warn!("Failed to fetch app details ({}): {}", app_id, e), + } + + info!("Starting session for '{}' with account_linked: {}", game_title, account_linked); + + match api_client.create_session(&app_id, &game_title, &settings, &zone, account_linked).await { Ok(session) => { info!("Session created: {} (state: {:?})", session.session_id, session.state); cache::save_session_cache(&session); @@ -1266,6 +1283,7 @@ impl App { /// Start streaming once session is ready pub fn start_streaming(&mut self, session: SessionInfo) { info!("Starting streaming to {}", session.server_ip); + info!("Session Info Debug: {:?}", session); self.session = Some(session.clone()); self.state = AppState::Streaming; diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index 2e7e8b6..db469c3 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -87,6 +87,8 @@ pub struct GameInfo { pub image_url: Option, pub store: String, pub app_id: Option, + #[serde(default)] + pub is_install_to_play: bool, } /// Subscription information diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs index 0191837..8eeb77d 100644 --- a/opennow-streamer/src/webrtc/peer.rs +++ b/opennow-streamer/src/webrtc/peer.rs @@ -189,6 +189,7 @@ impl WebRtcPeer { Box::pin(async move { if let Some(c) = candidate { let candidate_str = c.to_json().map(|j| j.candidate).unwrap_or_default(); + info!("Gathered local ICE candidate: {}", candidate_str); let sdp_mid = c.to_json().ok().and_then(|j| j.sdp_mid); let sdp_mline_index = c.to_json().ok().and_then(|j| j.sdp_mline_index); let _ = tx.send(WebRtcEvent::IceCandidate( diff --git a/opennow-streamer/src/webrtc/signaling.rs b/opennow-streamer/src/webrtc/signaling.rs index f2f6c8d..649a1d4 100644 --- a/opennow-streamer/src/webrtc/signaling.rs +++ b/opennow-streamer/src/webrtc/signaling.rs @@ -207,7 +207,7 @@ impl GfnSignaling { while let Some(msg_result) = read.next().await { match msg_result { Ok(Message::Text(text)) => { - debug!("Received: {}", &text[..text.len().min(200)]); + info!("Received: {}", &text[..text.len().min(1000)]); if let Ok(msg) = serde_json::from_str::(&text) { // Send ACK for messages with ackid @@ -333,7 +333,7 @@ impl GfnSignaling { }); msg_tx.send(Message::Text(peer_msg.to_string())).await?; - debug!("Sent ICE candidate"); + info!("Sent ICE candidate: {}", candidate); Ok(()) } From 663ec4ee4b096030720dd5c309cf860748f2a98b Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 12:19:08 +0100 Subject: [PATCH 22/67] feat: Add the core application state and logic for the OpenNow Streamer. --- opennow-streamer/src/app/mod.rs | 43 ++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index 83585db..c0f5f77 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -155,6 +155,10 @@ pub struct App { render_frame_count: u64, last_render_fps_time: std::time::Instant, last_render_frame_count: u64, + + + /// Number of times we've polled after session became ready (to ensure candidates) + session_ready_poll_count: u32, } /// Poll interval for session status (2 seconds) @@ -248,11 +252,13 @@ impl App { active_sessions: Vec::new(), show_session_conflict: false, show_av1_warning: false, + pending_game_launch: None, last_poll_time: std::time::Instant::now(), render_frame_count: 0, last_render_fps_time: std::time::Instant::now(), last_render_frame_count: 0, + session_ready_poll_count: 0, } } @@ -1202,17 +1208,29 @@ impl App { /// Poll session state and update UI fn poll_session_status(&mut self) { + // First check cache for state updates (from in-flight or completed requests) // First check cache for state updates (from in-flight or completed requests) if let Some(session) = cache::load_session_cache() { if session.state == SessionState::Ready { - info!("Session ready! GPU: {:?}, Server: {}", session.gpu_type, session.server_ip); - self.status_message = format!( - "Connecting to GPU: {}", - session.gpu_type.as_deref().unwrap_or("Unknown") - ); - cache::clear_session_cache(); - self.start_streaming(session); - return; + // User requested: "make it pull few times before connecting to it so you can get the candidates" + // We delay streaming start until we've polled a few times in Ready state + if self.session_ready_poll_count < 3 { + self.status_message = format!("Session ready, finalizing connection ({}/3)...", self.session_ready_poll_count + 1); + // Don't return, allow fall-through to polling logic + } else { + info!("Session ready! GPU: {:?}, Server: {}", session.gpu_type, session.server_ip); + + // Update status message + if let Some(gpu) = &session.gpu_type { + self.status_message = format!("Connecting to GPU: {}", gpu); + } else { + self.status_message = format!("Connecting to server: {}", session.server_ip); + } + + cache::clear_session_cache(); + self.start_streaming(session); + return; + } } else if let SessionState::InQueue { position, eta_secs } = session.state { self.status_message = format!("Queue position: {} (ETA: {}s)", position, eta_secs); } else if let SessionState::Error(ref msg) = session.state { @@ -1232,11 +1250,18 @@ impl App { } if let Some(session) = cache::load_session_cache() { - let should_poll = matches!( + let mut should_poll = matches!( session.state, SessionState::Requesting | SessionState::Launching | SessionState::InQueue { .. } ); + // Also poll if Ready but count < 3 + if session.state == SessionState::Ready && self.session_ready_poll_count < 3 { + should_poll = true; + // Increment poll count here, as we are about to poll + self.session_ready_poll_count += 1; + } + if should_poll { // Update timestamp to rate limit next poll self.last_poll_time = now; From 0c48a4b68a9c4c2971af7badd8d26b008d3dc49e Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 17:12:40 +0100 Subject: [PATCH 23/67] feat: Implement GFN game catalog GraphQL API, foundational application structure, and Claude AI development permissions. --- opennow-streamer/src/api/games.rs | 93 +++++++- opennow-streamer/src/app/cache.rs | 77 ++++++- opennow-streamer/src/app/mod.rs | 102 ++++++++- opennow-streamer/src/app/types.rs | 25 ++- opennow-streamer/src/gui/renderer.rs | 304 +++++++++++++++++++++------ opennow-streamer/src/webrtc/mod.rs | 113 +++++++--- 6 files changed, 611 insertions(+), 103 deletions(-) diff --git a/opennow-streamer/src/api/games.rs b/opennow-streamer/src/api/games.rs index de10d62..fdc623c 100644 --- a/opennow-streamer/src/api/games.rs +++ b/opennow-streamer/src/api/games.rs @@ -3,11 +3,11 @@ //! Fetch and search GFN game catalog using GraphQL. use anyhow::{Result, Context}; -use log::{info, debug, warn}; +use log::{info, debug, warn, error}; use serde::Deserialize; use std::time::{SystemTime, UNIX_EPOCH}; -use crate::app::GameInfo; +use crate::app::{GameInfo, GameSection}; use crate::auth; use super::GfnApiClient; @@ -83,10 +83,8 @@ struct Panel { #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] struct PanelSection { - #[allow(dead_code)] #[serde(default)] id: Option, - #[allow(dead_code)] #[serde(default)] title: Option, #[serde(default)] @@ -108,6 +106,10 @@ struct AppData { id: String, title: String, #[serde(default)] + description: Option, + #[serde(default)] + long_description: Option, + #[serde(default)] images: Option, #[serde(default)] variants: Option>, @@ -160,6 +162,19 @@ struct AppGfnStatus { playability_state: Option, #[serde(default)] play_type: Option, + #[serde(default)] + minimum_membership_tier_label: Option, + #[serde(default)] + catalog_sku_strings: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "SCREAMING_SNAKE_CASE")] +struct CatalogSkuStrings { + #[serde(default)] + sku_based_playability_text: Option, + #[serde(default)] + sku_based_tag: Option, } // ============================================ @@ -343,13 +358,18 @@ impl GfnApiClient { .unwrap_or(false); GameInfo { - id: if variant_id.is_empty() { app.id } else { variant_id }, + id: if variant_id.is_empty() { app.id.clone() } else { variant_id }, title: app.title, publisher: None, image_url, store, app_id, is_install_to_play, + play_type: app.gfn.as_ref().and_then(|g| g.play_type.clone()), + membership_tier_label: app.gfn.as_ref().and_then(|g| g.minimum_membership_tier_label.clone()), + playability_text: app.gfn.as_ref().and_then(|g| g.catalog_sku_strings.as_ref()).and_then(|s| s.sku_based_playability_text.clone()), + uuid: Some(app.id.clone()), + description: app.description.or(app.long_description), } } @@ -387,6 +407,56 @@ impl GfnApiClient { Ok(games) } + /// Fetch games organized by section (Home view) + /// Returns sections with titles like "Trending", "Free to Play", etc. + pub async fn fetch_sectioned_games(&self, vpc_id: Option<&str>) -> Result> { + // Use provided VPC ID or fetch dynamically from serverInfo + let vpc = match vpc_id { + Some(v) => v.to_string(), + None => { + let token = self.token().map(|s| s.as_str()); + super::get_vpc_id(&self.client, token).await + } + }; + + info!("Fetching sectioned games from GraphQL (VPC: {})", vpc); + + let panels = self.fetch_panels(&["MAIN"], &vpc).await?; + + let mut sections: Vec = Vec::new(); + + for panel in panels { + info!("Panel '{}' has {} sections", panel.name, panel.sections.len()); + for section in panel.sections { + let section_title = section.title.clone().unwrap_or_else(|| "Games".to_string()); + debug!("Section '{}' has {} items", section_title, section.items.len()); + + let games: Vec = section.items + .into_iter() + .filter_map(|item| { + if let PanelItem::GameItem { app } = item { + Some(Self::app_to_game_info(app)) + } else { + None + } + }) + .collect(); + + if !games.is_empty() { + info!("Section '{}': {} games", section_title, games.len()); + sections.push(GameSection { + id: section.id, + title: section_title, + games, + }); + } + } + } + + info!("Fetched {} sections from MAIN panel", sections.len()); + Ok(sections) + } + /// Fetch user's library (GraphQL) pub async fn fetch_library(&self, vpc_id: Option<&str>) -> Result> { // Use provided VPC ID or fetch dynamically from serverInfo @@ -490,6 +560,11 @@ impl GfnApiClient { store, app_id, is_install_to_play: false, + play_type: None, + membership_tier_label: None, + playability_text: None, + uuid: None, + description: None, }) }) .collect(); @@ -539,12 +614,13 @@ impl GfnApiClient { ); debug!("Fetching app details from: {}", url); + info!("Fetching app details for ID: {} (Variables: {})", app_id, variables_str); let response = self.client .get(&url) .header("User-Agent", GFN_USER_AGENT) .header("Accept", "application/json") - .header("Content-Type", "application/graphql") // Although it's GET, GFN native uses this + .header("Content-Type", "application/graphql") .header("Authorization", format!("GFNJWT {}", token)) .header("nv-client-id", LCARS_CLIENT_ID) .send() @@ -552,7 +628,10 @@ impl GfnApiClient { .context("App details request failed")?; if !response.status().is_success() { - return Err(anyhow::anyhow!("App details failed: {}", response.status())); + let status = response.status(); + let error_body = response.text().await.unwrap_or_else(|_| "Could not read error body".to_string()); + error!("App details failed for {}: {} - Body: {}", app_id, status, error_body); + return Err(anyhow::anyhow!("App details failed: {} - {}", status, error_body)); } let body = response.text().await?; diff --git a/opennow-streamer/src/app/cache.rs b/opennow-streamer/src/app/cache.rs index 241c753..ac4b226 100644 --- a/opennow-streamer/src/app/cache.rs +++ b/opennow-streamer/src/app/cache.rs @@ -6,7 +6,7 @@ use log::{error, info, warn}; use std::path::PathBuf; use crate::auth::AuthTokens; -use super::{GameInfo, SubscriptionInfo, SessionInfo, SessionState, ActiveSessionInfo}; +use super::{GameInfo, GameSection, SubscriptionInfo, SessionInfo, SessionState, ActiveSessionInfo}; use crate::app::session::MediaConnectionInfo; /// Get the application data directory @@ -159,6 +159,49 @@ pub fn load_library_cache() -> Option> { serde_json::from_str(&content).ok() } +// ============================================================ +// Game Sections Cache (Home tab) +// ============================================================ + +/// Serializable section for cache +#[derive(serde::Serialize, serde::Deserialize)] +struct CachedSection { + id: Option, + title: String, + games: Vec, +} + +fn sections_cache_path() -> Option { + get_app_data_dir().map(|p| p.join("sections_cache.json")) +} + +pub fn save_sections_cache(sections: &[GameSection]) { + if let Some(path) = sections_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + let cached: Vec = sections.iter().map(|s| CachedSection { + id: s.id.clone(), + title: s.title.clone(), + games: s.games.clone(), + }).collect(); + if let Ok(json) = serde_json::to_string(&cached) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_sections_cache() -> Option> { + let path = sections_cache_path()?; + let content = std::fs::read_to_string(path).ok()?; + let cached: Vec = serde_json::from_str(&content).ok()?; + Some(cached.into_iter().map(|c| GameSection { + id: c.id, + title: c.title, + games: c.games, + }).collect()) +} + // ============================================================ // Subscription Cache // ============================================================ @@ -421,3 +464,35 @@ pub fn load_ping_results() -> Option> { let _ = std::fs::remove_file(&path); Some(results) } + +// ============================================================ +// Popup Game Details Cache +// ============================================================ + +pub fn save_popup_game_details(game: &GameInfo) { + if let Some(path) = get_app_data_dir().map(|p| p.join("popup_game.json")) { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string(game) { + let _ = std::fs::write(path, json); + } + } +} + +pub fn load_popup_game_details() -> Option { + let path = get_app_data_dir()?.join("popup_game.json"); + let content = std::fs::read_to_string(&path).ok()?; + let game: GameInfo = serde_json::from_str(&content).ok()?; + + // Clear the file after loading to prevent stale data + let _ = std::fs::remove_file(&path); + + Some(game) +} + +pub fn clear_popup_game_details() { + if let Some(path) = get_app_data_dir().map(|p| p.join("popup_game.json")) { + let _ = std::fs::remove_file(path); + } +} diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index c0f5f77..da7b898 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -10,7 +10,7 @@ pub mod cache; pub use config::{Settings, VideoCodec, AudioCodec, StreamQuality, StatsPosition}; pub use session::{SessionInfo, SessionState, ActiveSessionInfo}; pub use types::{ - SharedFrame, GameInfo, SubscriptionInfo, GamesTab, ServerInfo, ServerStatus, + SharedFrame, GameInfo, GameSection, SubscriptionInfo, GamesTab, ServerInfo, ServerStatus, UiAction, SettingChange, AppState, parse_resolution, }; @@ -78,9 +78,12 @@ pub struct App { /// Error message (if any) pub error_message: Option, - /// Games list + /// Games list (flat, for All Games tab) pub games: Vec, + /// Game sections (Home tab - Trending, Free to Play, etc.) + pub game_sections: Vec, + /// Search query pub search_query: String, @@ -231,6 +234,7 @@ impl App { status_message: "Welcome to OpenNOW".to_string(), error_message: None, games: Vec::new(), + game_sections: Vec::new(), search_query: String::new(), selected_game: None, stats_rx: None, @@ -242,7 +246,7 @@ impl App { api_client: GfnApiClient::new(), subscription: None, library_games: Vec::new(), - current_tab: GamesTab::AllGames, + current_tab: GamesTab::Home, selected_game_popup: None, servers: Vec::new(), selected_server_index: 0, @@ -277,6 +281,7 @@ impl App { UiAction::LaunchGame(index) => { // Get game from appropriate list based on current tab let game = match self.current_tab { + GamesTab::Home => self.games.get(index).cloned(), // Use flat list for Home too GamesTab::AllGames => self.games.get(index).cloned(), GamesTab::MyLibrary => self.library_games.get(index).cloned(), }; @@ -328,9 +333,47 @@ impl App { if tab == GamesTab::MyLibrary && self.library_games.is_empty() { self.fetch_library(); } + // Fetch sections if switching to Home and sections are empty + if tab == GamesTab::Home && self.game_sections.is_empty() { + self.fetch_sections(); + } } UiAction::OpenGamePopup(game) => { - self.selected_game_popup = Some(game); + self.selected_game_popup = Some(game.clone()); + + // Spawn async task to fetch full details (Play Type, Membership, etc.) only if missing + // User reports library games already have this info, so avoid redundant 400-prone fetches + let mut needs_fetch = game.play_type.is_none(); + + // If we have a description, we definitely don't need to fetch + if game.description.is_some() { + needs_fetch = false; + } + + let token = self.auth_tokens.as_ref().map(|t| t.jwt().to_string()); + let query_id = game.id.clone(); + let runtime = self.runtime.clone(); + + if needs_fetch { + if let Some(token) = token { + runtime.spawn(async move { + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token); + + // Fetch details + match api_client.fetch_app_details(&query_id).await { + Ok(Some(details)) => { + info!("Fetched details for popup: {}", details.title); + cache::save_popup_game_details(&details); + } + Ok(None) => warn!("No details found for popup game: {}", query_id), + Err(e) => warn!("Failed to fetch popup details: {}", e), + } + }); + } + } else { + info!("Using existing details for popup: {}", game.title); + } } UiAction::CloseGamePopup => { self.selected_game_popup = None; @@ -513,6 +556,7 @@ impl App { self.state = AppState::Games; self.status_message = "Login successful!".to_string(); self.fetch_games(); + self.fetch_sections(); // Fetch sections for Home tab self.fetch_subscription(); // Also fetch subscription info self.load_servers(); // Load servers (fetches dynamic regions) @@ -554,6 +598,18 @@ impl App { } } + // Check if sections were fetched and saved to cache (Home tab) + if self.state == AppState::Games && self.current_tab == GamesTab::Home && self.game_sections.is_empty() { + if let Some(sections) = cache::load_sections_cache() { + if !sections.is_empty() { + info!("Loaded {} sections from cache", sections.len()); + self.game_sections = sections; + self.is_loading = false; + self.status_message = format!("Loaded {} sections", self.game_sections.len()); + } + } + } + // Check if subscription was fetched and saved to cache if self.state == AppState::Games && self.subscription.is_none() { if let Some(sub) = cache::load_subscription_cache() { @@ -681,6 +737,33 @@ impl App { }); } + /// Fetch game sections for Home tab (Trending, Free to Play, etc.) + pub fn fetch_sections(&mut self) { + if self.auth_tokens.is_none() { + return; + } + + self.is_loading = true; + self.status_message = "Loading sections...".to_string(); + + let token = self.auth_tokens.as_ref().unwrap().jwt().to_string(); + let mut api_client = GfnApiClient::new(); + api_client.set_access_token(token.clone()); + + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match api_client.fetch_sectioned_games(None).await { + Ok(sections) => { + info!("Fetched {} sections from GraphQL", sections.len()); + cache::save_sections_cache(§ions); + } + Err(e) => { + error!("Failed to fetch sections: {}", e); + } + } + }); + } + /// Fetch subscription info (hours, addons, etc.) pub fn fetch_subscription(&mut self) { if self.auth_tokens.is_none() { @@ -1303,6 +1386,17 @@ impl App { self.is_loading = false; cache::clear_session_error(); } + + // Check for popup game details updates + if let Some(detailed_game) = cache::load_popup_game_details() { + // Only update if we still have the popup open for the same game + if let Some(current_popup) = &self.selected_game_popup { + if current_popup.id == detailed_game.id { + info!("Updating popup with detailed info for: {}", detailed_game.title); + self.selected_game_popup = Some(detailed_game); + } + } + } } /// Start streaming once session is ready diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index db469c3..1334be7 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -89,6 +89,24 @@ pub struct GameInfo { pub app_id: Option, #[serde(default)] pub is_install_to_play: bool, + #[serde(default)] + pub play_type: Option, + #[serde(default)] + pub membership_tier_label: Option, + #[serde(default)] + pub playability_text: Option, + #[serde(default)] + pub uuid: Option, + #[serde(default)] + pub description: Option, +} + +/// Section of games with a title (e.g., "Trending", "Free to Play") +#[derive(Debug, Clone, Default)] +pub struct GameSection { + pub id: Option, + pub title: String, + pub games: Vec, } /// Subscription information @@ -104,13 +122,14 @@ pub struct SubscriptionInfo { /// Current tab in Games view #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum GamesTab { - AllGames, - MyLibrary, + Home, // Sectioned home view (like official GFN client) + AllGames, // Flat grid view + MyLibrary, // User's library } impl Default for GamesTab { fn default() -> Self { - GamesTab::AllGames + GamesTab::Home // Default to sectioned home view } } diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index e2cc1e5..ca50142 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -1316,6 +1316,15 @@ impl Renderer { // Get games based on current tab let games_list: Vec<_> = match current_tab { + GamesTab::Home => { + // For Home tab, we show sections but also need flat list for searches + let query = app.search_query.to_lowercase(); + app.games.iter() + .enumerate() + .filter(|(_, g)| query.is_empty() || g.title.to_lowercase().contains(&query)) + .map(|(i, g)| (i, g.clone())) + .collect() + } GamesTab::AllGames => { app.filtered_games().into_iter() .map(|(i, g)| (i, g.clone())) @@ -1331,6 +1340,9 @@ impl Renderer { } }; + // Get game sections for Home tab + let game_sections = app.game_sections.clone(); + // Clone texture map for rendering (avoid borrow issues) let game_textures = self.game_textures.clone(); let mut new_textures: Vec<(String, egui::TextureHandle)> = Vec::new(); @@ -1357,6 +1369,7 @@ impl Renderer { self.render_games_screen( ctx, &games_list, + &game_sections, &mut search_query, &status_message, show_settings, @@ -1474,6 +1487,7 @@ impl Renderer { &self, ctx: &egui::Context, games: &[(usize, crate::app::GameInfo)], + game_sections: &[crate::app::GameSection], search_query: &mut String, _status_message: &str, _show_settings: bool, @@ -1515,9 +1529,30 @@ impl Renderer { ui.add_space(20.0); // Tab buttons - solid style like login button + let home_selected = current_tab == GamesTab::Home; let all_games_selected = current_tab == GamesTab::AllGames; let library_selected = current_tab == GamesTab::MyLibrary; + // Home tab button + let home_btn = egui::Button::new( + egui::RichText::new("Home") + .size(13.0) + .color(egui::Color32::WHITE) + .strong() + ) + .fill(if home_selected { + egui::Color32::from_rgb(118, 185, 0) + } else { + egui::Color32::from_rgb(50, 50, 65) + }) + .corner_radius(6.0); + + if ui.add_sized([70.0, 32.0], home_btn).clicked() && !home_selected { + actions.push(UiAction::SwitchTab(GamesTab::Home)); + } + + ui.add_space(8.0); + let all_games_btn = egui::Button::new( egui::RichText::new("All Games") .size(13.0) @@ -1749,69 +1784,128 @@ impl Renderer { egui::CentralPanel::default().show(ctx, |ui| { ui.add_space(15.0); - // Games content - let header_text = match current_tab { - GamesTab::AllGames => format!("All Games ({} available)", games.len()), - GamesTab::MyLibrary => format!("My Library ({} games)", games.len()), - }; + // Render based on current tab + match current_tab { + GamesTab::Home => { + // Home tab - horizontal scrolling sections + if game_sections.is_empty() { + ui.vertical_centered(|ui| { + ui.add_space(100.0); + ui.label( + egui::RichText::new("Loading sections...") + .size(14.0) + .color(egui::Color32::from_rgb(120, 120, 120)) + ); + }); + } else { + egui::ScrollArea::vertical() + .auto_shrink([false, false]) + .show(ui, |ui| { + ui.add_space(5.0); + + for section in game_sections { + // Section header + ui.horizontal(|ui| { + ui.add_space(10.0); + ui.label( + egui::RichText::new(§ion.title) + .size(18.0) + .strong() + .color(egui::Color32::WHITE) + ); + }); + + ui.add_space(10.0); + + // Horizontal scroll of game cards + ui.horizontal(|ui| { + ui.add_space(10.0); + egui::ScrollArea::horizontal() + .id_salt(§ion.title) + .auto_shrink([false, false]) + .show(ui, |ui| { + ui.horizontal(|ui| { + for (idx, game) in section.games.iter().enumerate() { + Self::render_game_card(ui, ctx, idx, game, _runtime, game_textures, new_textures, actions); + ui.add_space(12.0); + } + }); + }); + }); + + ui.add_space(20.0); + } + }); + } + } + GamesTab::AllGames | GamesTab::MyLibrary => { + // Grid view for All Games and My Library tabs + let header_text = match current_tab { + GamesTab::AllGames => format!("All Games ({} available)", games.len()), + GamesTab::MyLibrary => format!("My Library ({} games)", games.len()), + _ => String::new(), + }; - ui.horizontal(|ui| { - ui.add_space(10.0); - ui.label( - egui::RichText::new(header_text) - .size(20.0) - .strong() - .color(egui::Color32::WHITE) - ); - }); + ui.horizontal(|ui| { + ui.add_space(10.0); + ui.label( + egui::RichText::new(header_text) + .size(20.0) + .strong() + .color(egui::Color32::WHITE) + ); + }); - ui.add_space(20.0); + ui.add_space(20.0); - if games.is_empty() { - ui.vertical_centered(|ui| { - ui.add_space(100.0); - let empty_text = match current_tab { - GamesTab::AllGames => "No games found", - GamesTab::MyLibrary => "Your library is empty.\nPurchase games from Steam, Epic, or other stores to see them here.", - }; - ui.label( - egui::RichText::new(empty_text) - .size(14.0) - .color(egui::Color32::from_rgb(120, 120, 120)) - ); - }); - } else { - // Games grid - calculate columns based on available width - let available_width = ui.available_width(); - let card_width = 220.0; - let spacing = 16.0; - let num_columns = ((available_width + spacing) / (card_width + spacing)).floor() as usize; - let num_columns = num_columns.max(2).min(6); // Between 2 and 6 columns - - // Collect games to render (avoid borrow issues) - let games_to_render: Vec<_> = games.iter().map(|(idx, game)| (*idx, game.clone())).collect(); - - egui::ScrollArea::vertical() - .auto_shrink([false, false]) - .show(ui, |ui| { - ui.horizontal(|ui| { - ui.add_space(10.0); - ui.vertical(|ui| { - egui::Grid::new("games_grid") - .num_columns(num_columns) - .spacing([spacing, spacing]) - .show(ui, |ui| { - for (col, (idx, game)) in games_to_render.iter().enumerate() { - Self::render_game_card(ui, ctx, *idx, game, _runtime, game_textures, new_textures, actions); - - if (col + 1) % num_columns == 0 { - ui.end_row(); - } - } + if games.is_empty() { + ui.vertical_centered(|ui| { + ui.add_space(100.0); + let empty_text = match current_tab { + GamesTab::AllGames => "No games found", + GamesTab::MyLibrary => "Your library is empty.\nPurchase games from Steam, Epic, or other stores to see them here.", + _ => "", + }; + ui.label( + egui::RichText::new(empty_text) + .size(14.0) + .color(egui::Color32::from_rgb(120, 120, 120)) + ); + }); + } else { + // Games grid - calculate columns based on available width + let available_width = ui.available_width(); + let card_width = 220.0; + let spacing = 16.0; + let num_columns = ((available_width + spacing) / (card_width + spacing)).floor() as usize; + let num_columns = num_columns.max(2).min(6); // Between 2 and 6 columns + + // Collect games to render (avoid borrow issues) + let games_to_render: Vec<_> = games.iter().map(|(idx, game)| (*idx, game.clone())).collect(); + + egui::ScrollArea::vertical() + .auto_shrink([false, false]) + .show(ui, |ui| { + ui.horizontal(|ui| { + ui.add_space(10.0); + ui.vertical(|ui| { + egui::Grid::new("games_grid") + .num_columns(num_columns) + .spacing([spacing, spacing]) + .show(ui, |ui| { + for (col, (idx, game)) in games_to_render.iter().enumerate() { + Self::render_game_card(ui, ctx, *idx, game, _runtime, game_textures, new_textures, actions); + + if (col + 1) % num_columns == 0 { + ui.end_row(); + } + } + }); }); + }); }); - }); - }); + } + } } }); @@ -1847,8 +1941,26 @@ impl Renderer { game_textures: &HashMap, actions: &mut Vec, ) { - let popup_width = 400.0; - let popup_height = 350.0; + let popup_width = 450.0; + let popup_height = 500.0; + + // Modal overlay (darkens background) + egui::Area::new(egui::Id::new("modal_overlay")) + .fixed_pos([0.0, 0.0]) + .interactable(true) + .order(egui::Order::Background) // Draw behind windows + .show(ctx, |ui| { + let screen_rect = ctx.input(|i| i.screen_rect()); + ui.painter().rect_filled( + screen_rect, + 0.0, + egui::Color32::from_black_alpha(200), + ); + // Close popup on background click + if ui.allocate_rect(screen_rect, egui::Sense::click()).clicked() { + actions.push(UiAction::CloseGamePopup); + } + }); egui::Window::new("Game Details") .collapsible(false) @@ -1921,8 +2033,80 @@ impl Renderer { }); } + ui.add_space(8.0); + + // GFN Status (Play Type and Membership) + if let Some(ref play_type) = game.play_type { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Type:") + .size(12.0) + .color(egui::Color32::GRAY) + ); + let color = if play_type == "INSTALL_TO_PLAY" { + egui::Color32::from_rgb(255, 180, 50) // Orange + } else { + egui::Color32::from_rgb(100, 200, 100) // Green + }; + ui.label( + egui::RichText::new(play_type) + .size(12.0) + .color(color) + .strong() + ); + }); + } + + if let Some(ref tier) = game.membership_tier_label { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Requires:") + .size(12.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(tier) + .size(12.0) + .color(egui::Color32::from_rgb(118, 185, 0)) // Nvidia Green + .strong() + ); + }); + } + + if let Some(ref text) = game.playability_text { + ui.add_space(4.0); + ui.add(egui::Label::new( + egui::RichText::new(text) + .size(11.0) + .color(egui::Color32::LIGHT_GRAY) + ).wrap()); + } + ui.add_space(20.0); + // Description + if let Some(ref desc) = game.description { + ui.label( + egui::RichText::new("About this game:") + .size(14.0) + .strong() + .color(egui::Color32::WHITE) + ); + ui.add_space(4.0); + egui::ScrollArea::vertical() + .max_height(100.0) + .show(ui, |ui| { + ui.label( + egui::RichText::new(desc) + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + }); + ui.add_space(15.0); + } else { + ui.add_space(20.0); + } + // Buttons ui.horizontal(|ui| { // Play button diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index 4254b26..5b58ebe 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -16,6 +16,8 @@ use std::sync::Arc; use tokio::sync::mpsc; use anyhow::Result; use log::{info, warn, error, debug}; +use serde_json::json; +use webrtc::ice_transport::ice_server::RTCIceServer; use crate::app::{SessionInfo, Settings, VideoCodec, SharedFrame}; use crate::media::{StreamStats, VideoDecoder, AudioDecoder, AudioPlayer, RtpDepacketizer, DepacketizerCodec}; @@ -201,11 +203,22 @@ fn extract_ice_credentials(sdp: &str) -> (String, String, String) { } /// Extract public IP from server hostname (e.g., "95-178-87-234.zai..." -> "95.178.87.234") -fn extract_public_ip(server_ip: &str) -> Option { - let re = regex::Regex::new(r"^(\d+-\d+-\d+-\d+)\.").ok()?; - re.captures(server_ip) - .and_then(|c| c.get(1)) - .map(|m| m.as_str().replace('-', ".")) +/// Also handles direct IP strings or IPs embedded in signaling URLs +fn extract_public_ip(input: &str) -> Option { + // Check for standard IP-like patterns with dashes (e.g. 80-250-97-38) + let re_dash = regex::Regex::new(r"(\d{1,3})-(\d{1,3})-(\d{1,3})-(\d{1,3})").ok()?; + if let Some(captures) = re_dash.captures(input) { + let ip = format!("{}.{}.{}.{}", &captures[1], &captures[2], &captures[3], &captures[4]); + return Some(ip); + } + + // Check for standard IP patterns (e.g. 80.250.97.38) + let re_dot = regex::Regex::new(r"(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})").ok()?; + if let Some(captures) = re_dot.captures(input) { + return Some(captures[0].to_string()); + } + + None } /// Run the streaming session @@ -429,22 +442,65 @@ pub async fn run_streaming( SignalingEvent::SdpOffer(sdp) => { info!("Received SDP offer, length: {}", sdp.len()); - // Extract public IP and modify SDP - let public_ip = extract_public_ip(&server_ip); + // Detect codec to use + let codec = match settings.codec { + VideoCodec::H264 => "H264", + VideoCodec::H265 => "H265", + VideoCodec::AV1 => "AV1", + }; + + info!("Preferred codec: {}", codec); + + // Use server_ip from SessionInfo for SDP fixup if available + let public_ip = extract_public_ip(&session_info.server_ip); + + // Modify SDP with extracted IP let modified_sdp = if let Some(ref ip) = public_ip { fix_server_ip(&sdp, ip) } else { sdp.clone() }; + + // Prefer codec - let modified_sdp = prefer_codec(&modified_sdp, &codec); + let modified_sdp = prefer_codec(&modified_sdp, &settings.codec); - // CRITICAL: Create input channel BEFORE handling offer (per GFN protocol) + // CRITICAL: Create input channel BEFORE SDP negotiation (per GFN protocol) info!("Creating input channel BEFORE SDP negotiation..."); + // Align with official client: Use ICE servers from SessionInfo (TURN/STUN) + // This corresponds to `iceServerConfiguration` in the CloudMatch response. + let mut ice_servers = Vec::new(); + + // Convert SessionInfo ICE servers to RTCIceServer + for server in &session_info.ice_servers { + let mut s = RTCIceServer { + urls: server.urls.clone(), + ..Default::default() + }; + if let Some(user) = &server.username { + s.username = user.clone(); + } + if let Some(cred) = &server.credential { + s.credential = cred.clone(); + } + ice_servers.push(s); + } + + // Fallback to default NVIDIA STUN if no servers provided + if ice_servers.is_empty() { + info!("No ICE servers from session, adding default NVIDIA STUN"); + ice_servers.push(RTCIceServer { + urls: vec!["stun:stun.gamestream.nvidia.com:19302".to_string()], + ..Default::default() + }); + } else { + info!("Using {} ICE servers from session", ice_servers.len()); + } + // Handle offer and create answer - match peer.handle_offer(&modified_sdp, vec![]).await { + match peer.handle_offer(&modified_sdp, ice_servers).await { Ok(answer_sdp) => { // Create input channel if let Err(e) = peer.create_input_channel().await { @@ -455,22 +511,21 @@ pub async fn run_streaming( let (ufrag, pwd, fingerprint) = extract_ice_credentials(&answer_sdp); // Build nvstSdp - let nvst_sdp = build_nvst_sdp( - &ufrag, - &pwd, - &fingerprint, - width, - height, - fps, - max_bitrate, - ); - - info!("Sending SDP answer with nvstSdp..."); - signaling.send_answer(&answer_sdp, Some(&nvst_sdp)).await?; - - // Add manual ICE candidate ONLY if we have real port from session API - // Otherwise, rely on trickle ICE from server (has real port) - // SDP port 47998 is a DUMMY - never use it! + let nvst_sdp = json!({ + "sdp": answer_sdp, + "type": "answer" + }); + + // Send answer + let nvst_sdp_str = nvst_sdp.to_string(); + signaling.send_answer(&answer_sdp, Some(&nvst_sdp_str)).await?; + + // For resume flow (no media_connection_info), we rely on: + // 1. ICE Servers (STUN/TURN) generating candidates. + // 2. Remote candidates via Trickle ICE. + // 3. Correct ICE negotiation. + // We do NOT manually manufacture a candidate from the signaling URL, + // as the official client does not do this. if let Some(ref mci) = session_info.media_connection_info { info!("Using media port {} from session API", mci.port); let candidate = format!( @@ -480,6 +535,7 @@ pub async fn run_streaming( info!("Adding manual ICE candidate: {}", candidate); if let Err(e) = peer.add_ice_candidate(&candidate, Some("0"), Some(0)).await { warn!("Failed to add manual ICE candidate: {}", e); + // Try other mids just in case for mid in ["1", "2", "3"] { if peer.add_ice_candidate(&candidate, Some(mid), Some(mid.parse().unwrap_or(0))).await.is_ok() { info!("Added ICE candidate with sdpMid={}", mid); @@ -488,14 +544,15 @@ pub async fn run_streaming( } } } else { - info!("No media_connection_info - waiting for trickle ICE from server"); + info!("No media_connection_info (Resume) - waiting for ICE negotiation (STUN/TURN/Trickle)"); } // Update stats with codec info - stats.codec = codec_str.clone(); + stats.codec = codec.to_string(); stats.resolution = format!("{}x{}", width, height); stats.target_fps = fps; } + Err(e) => { error!("Failed to handle offer: {}", e); } From 93ca952e7930547d4096e144097627d5708c4991 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 21:50:36 +0100 Subject: [PATCH 24/67] feat: Implement core WebRTC streaming client components including peer connection, signaling, and supporting modules. --- opennow-streamer/src/api/cloudmatch.rs | 27 ++++-- opennow-streamer/src/api/mod.rs | 48 ++++++++-- opennow-streamer/src/app/cache.rs | 42 +++++++++ opennow-streamer/src/app/mod.rs | 50 ++++++++++- opennow-streamer/src/app/session.rs | 109 ++++++++++++++++++++--- opennow-streamer/src/app/types.rs | 3 + opennow-streamer/src/auth/mod.rs | 4 + opennow-streamer/src/gui/renderer.rs | 72 +++++++++++---- opennow-streamer/src/gui/screens/mod.rs | 80 +++++++++++++++++ opennow-streamer/src/webrtc/mod.rs | 85 +++++++++++------- opennow-streamer/src/webrtc/peer.rs | 4 +- opennow-streamer/src/webrtc/signaling.rs | 7 +- 12 files changed, 450 insertions(+), 81 deletions(-) diff --git a/opennow-streamer/src/api/cloudmatch.rs b/opennow-streamer/src/api/cloudmatch.rs index 005ce2b..d430e71 100644 --- a/opennow-streamer/src/api/cloudmatch.rs +++ b/opennow-streamer/src/api/cloudmatch.rs @@ -449,16 +449,25 @@ impl GfnApiClient { return SessionState::Streaming; } - // Check seat setup info + // Check seat setup info for detailed states if let Some(ref seat_info) = session_data.seat_setup_info { - if seat_info.queue_position > 0 { - return SessionState::InQueue { - position: seat_info.queue_position as u32, - eta_secs: (seat_info.seat_setup_eta / 1000) as u32, - }; - } - if seat_info.seat_setup_step > 0 { - return SessionState::Launching; + match seat_info.seat_setup_step { + 0 => return SessionState::Connecting, + 1 => { + // In queue - show position + return SessionState::InQueue { + position: seat_info.queue_position.max(0) as u32, + eta_secs: (seat_info.seat_setup_eta / 1000).max(0) as u32, + }; + } + 5 => return SessionState::CleaningUp, + 6 => return SessionState::WaitingForStorage, + _ => { + // Other steps = general launching/configuring + if seat_info.seat_setup_step > 0 { + return SessionState::Launching; + } + } } } diff --git a/opennow-streamer/src/api/mod.rs b/opennow-streamer/src/api/mod.rs index 8d9f2b9..c3f768d 100644 --- a/opennow-streamer/src/api/mod.rs +++ b/opennow-streamer/src/api/mod.rs @@ -292,6 +292,8 @@ struct SubscriptionResponse { remaining_time_in_minutes: Option, total_time_in_minutes: Option, #[serde(default)] + sub_type: Option, // TIME_CAPPED or UNLIMITED + #[serde(default)] addons: Vec, } @@ -319,13 +321,38 @@ struct AddonAttribute { /// Fetch subscription info from MES API pub async fn fetch_subscription(token: &str, user_id: &str) -> Result { + use crate::auth; + let client = Client::builder() .gzip(true) .build() .map_err(|e| format!("Failed to create HTTP client: {}", e))?; - // Get VPC ID for request - let vpc_id = { + // For Alliance partners, we need to fetch VPC ID from their serverInfo first + // because the cached VPC ID might be stale or from NVIDIA's serverInfo + let provider = auth::get_selected_provider(); + let vpc_id = if provider.is_alliance_partner() { + // Fetch VPC ID from Alliance partner's serverInfo + info!("Fetching VPC ID for Alliance partner: {}", provider.login_provider_display_name); + let regions = fetch_dynamic_regions(&client, Some(token)).await; + + // The VPC ID gets cached by fetch_dynamic_regions, so try to read it + let cached = CACHED_VPC_ID.read(); + if let Some(vpc) = cached.as_ref() { + info!("Using Alliance VPC ID: {}", vpc); + vpc.clone() + } else { + // Fallback: try to extract from first region URL + if let Some(first_region) = regions.first() { + // Extract VPC-like ID from region name if possible + info!("Using Alliance region as VPC hint: {}", first_region.name); + first_region.name.clone() + } else { + return Err("Could not determine Alliance VPC ID".to_string()); + } + } + } else { + // For NVIDIA, use cached VPC ID or fallback let cached = CACHED_VPC_ID.read(); cached.as_ref().cloned().unwrap_or_else(|| "NP-AMS-08".to_string()) }; @@ -378,14 +405,15 @@ pub async fn fetch_subscription(token: &str, user_id: &str) -> Result = None; for addon in &sub.addons { - if addon.addon_type.as_deref() == Some("ADDON") + // Check for storage addon - API returns type="STORAGE", subType="PERMANENT_STORAGE", status="OK" + if addon.addon_type.as_deref() == Some("STORAGE") && addon.sub_type.as_deref() == Some("PERMANENT_STORAGE") - && addon.status.as_deref() == Some("ACTIVE") + && addon.status.as_deref() == Some("OK") { has_persistent_storage = true; - // Try to find storage size from attributes + // Try to find storage size from attributes (key is "TOTAL_STORAGE_SIZE_IN_GB") for attr in &addon.attributes { - if attr.key.as_deref() == Some("storageSizeInGB") { + if attr.key.as_deref() == Some("TOTAL_STORAGE_SIZE_IN_GB") { if let Some(val) = attr.text_value.as_ref() { storage_size_gb = val.parse().ok(); } @@ -394,8 +422,11 @@ pub async fn fetch_subscription(token: &str, user_id: &str) -> Result Result Option { + get_app_data_dir().map(|p| p.join("login_provider.json")) +} + +pub fn save_login_provider(provider: &LoginProvider) { + if let Some(path) = provider_cache_path() { + if let Some(parent) = path.parent() { + let _ = std::fs::create_dir_all(parent); + } + if let Ok(json) = serde_json::to_string_pretty(provider) { + if let Err(e) = std::fs::write(&path, &json) { + error!("Failed to save login provider: {}", e); + } else { + info!("Saved login provider: {}", provider.login_provider_display_name); + } + } + } +} + +pub fn load_login_provider() -> Option { + let path = provider_cache_path()?; + let content = std::fs::read_to_string(&path).ok()?; + let provider: LoginProvider = serde_json::from_str(&content).ok()?; + info!("Loaded cached login provider: {}", provider.login_provider_display_name); + Some(provider) +} + +pub fn clear_login_provider() { + if let Some(path) = provider_cache_path() { + let _ = std::fs::remove_file(path); + info!("Cleared cached login provider"); + } +} + // ============================================================ // Games Cache // ============================================================ @@ -221,6 +261,7 @@ pub fn save_subscription_cache(sub: &SubscriptionInfo) { "total_hours": sub.total_hours, "has_persistent_storage": sub.has_persistent_storage, "storage_size_gb": sub.storage_size_gb, + "is_unlimited": sub.is_unlimited, }); if let Ok(json) = serde_json::to_string(&cache) { let _ = std::fs::write(path, json); @@ -239,6 +280,7 @@ pub fn load_subscription_cache() -> Option { total_hours: cache.get("total_hours")?.as_f64()? as f32, has_persistent_storage: cache.get("has_persistent_storage")?.as_bool()?, storage_size_gb: cache.get("storage_size_gb").and_then(|v| v.as_u64()).map(|v| v as u32), + is_unlimited: cache.get("is_unlimited").and_then(|v| v.as_bool()).unwrap_or(false), }) } diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index da7b898..e75a4f7 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -148,6 +148,9 @@ pub struct App { /// Whether showing AV1 unsupported warning dialog pub show_av1_warning: bool, + /// Whether showing Alliance experimental warning dialog + pub show_alliance_warning: bool, + /// Pending game launch (waiting for session conflict resolution) pub pending_game_launch: Option, @@ -184,6 +187,11 @@ impl App { let auth_tokens = cache::load_tokens(); let has_token = auth_tokens.as_ref().map(|t| !t.is_expired()).unwrap_or(false); + // Load cached login provider (for Alliance persistence) + if let Some(provider) = cache::load_login_provider() { + auth::set_login_provider(provider); + } + let initial_state = if has_token { AppState::Games } else { @@ -256,6 +264,7 @@ impl App { active_sessions: Vec::new(), show_session_conflict: false, show_av1_warning: false, + show_alliance_warning: false, pending_game_launch: None, last_poll_time: std::time::Instant::now(), @@ -421,6 +430,9 @@ impl App { UiAction::CloseAV1Warning => { self.show_av1_warning = false; } + UiAction::CloseAllianceWarning => { + self.show_alliance_warning = false; + } } } @@ -466,6 +478,13 @@ impl App { self.is_loading = true; self.status_message = "Opening browser for login...".to_string(); + // Clear old caches when switching accounts + self.subscription = None; + self.games.clear(); + self.game_sections.clear(); + self.library_games.clear(); + cache::clear_games_cache(); + let pkce = PkceChallenge::new(); let auth_url = auth::build_auth_url(&pkce, port); let verifier = pkce.verifier.clone(); @@ -562,6 +581,11 @@ impl App { // Check for active sessions after login self.check_active_sessions(); + + // Show Alliance experimental warning if using an Alliance partner + if auth::get_selected_provider().is_alliance_partner() { + self.show_alliance_warning = true; + } } } } @@ -662,10 +686,15 @@ impl App { pub fn logout(&mut self) { self.auth_tokens = None; self.user_info = None; + self.subscription = None; auth::clear_login_provider(); + cache::clear_login_provider(); // Clear persisted provider too cache::clear_tokens(); + cache::clear_games_cache(); // Clear cached games self.state = AppState::Login; self.games.clear(); + self.game_sections.clear(); + self.library_games.clear(); self.status_message = "Logged out".to_string(); } @@ -770,6 +799,9 @@ impl App { return; } + // Clear current subscription so update loop will reload from cache after fetch completes + self.subscription = None; + let token = self.auth_tokens.as_ref().unwrap().jwt().to_string(); let user_id = self.auth_tokens.as_ref().unwrap().user_id().to_string(); @@ -777,11 +809,12 @@ impl App { runtime.spawn(async move { match crate::api::fetch_subscription(&token, &user_id).await { Ok(sub) => { - info!("Fetched subscription: tier={}, hours={:.1}/{:.1}, storage={}", + info!("Fetched subscription: tier={}, hours={:.1}/{:.1}, storage={}, unlimited={}", sub.membership_tier, sub.remaining_hours, sub.total_hours, - sub.has_persistent_storage + sub.has_persistent_storage, + sub.is_unlimited ); cache::save_subscription_cache(&sub); } @@ -1321,6 +1354,12 @@ impl App { self.is_loading = false; cache::clear_session_cache(); return; + } else if session.state == SessionState::Connecting { + self.status_message = "Connecting to server...".to_string(); + } else if session.state == SessionState::CleaningUp { + self.status_message = "Cleaning up previous session...".to_string(); + } else if session.state == SessionState::WaitingForStorage { + self.status_message = "Waiting for storage to be ready...".to_string(); } else { self.status_message = "Setting up session...".to_string(); } @@ -1335,7 +1374,12 @@ impl App { if let Some(session) = cache::load_session_cache() { let mut should_poll = matches!( session.state, - SessionState::Requesting | SessionState::Launching | SessionState::InQueue { .. } + SessionState::Requesting + | SessionState::Launching + | SessionState::Connecting + | SessionState::CleaningUp + | SessionState::WaitingForStorage + | SessionState::InQueue { .. } ); // Also poll if Ready but count < 3 diff --git a/opennow-streamer/src/app/session.rs b/opennow-streamer/src/app/session.rs index 38f0952..8318713 100644 --- a/opennow-streamer/src/app/session.rs +++ b/opennow-streamer/src/app/session.rs @@ -55,15 +55,24 @@ pub enum SessionState { /// Requesting session from CloudMatch Requesting, - /// Session created, seat being set up + /// Connecting to server (seatSetupStep = 0) + Connecting, + + /// Session created, seat being set up (configuring) Launching, - /// In queue waiting for a seat + /// In queue waiting for a seat (seatSetupStep = 1) InQueue { position: u32, eta_secs: u32, }, + /// Cleaning up previous session (seatSetupStep = 5) + CleaningUp, + + /// Waiting for storage to be ready (seatSetupStep = 6) + WaitingForStorage, + /// Session ready for streaming Ready, @@ -323,7 +332,16 @@ impl CloudMatchSession { self.connection_info .as_ref() .and_then(|conns| conns.iter().find(|c| c.usage == 14)) - .and_then(|conn| conn.ip.clone()) + .and_then(|conn| { + // Try direct IP first + conn.ip.clone().or_else(|| { + // If IP is null, extract from resourcePath (Alliance format) + // e.g., "rtsps://161-248-11-132.bpc.geforcenow.nvidiagrid.net:48322" + conn.resource_path.as_ref().and_then(|path| { + Self::extract_host_from_url(path) + }) + }) + }) .or_else(|| { self.session_control_info .as_ref() @@ -331,6 +349,28 @@ impl CloudMatchSession { }) } + /// Extract host from URL (handles rtsps://, wss://, etc.) + fn extract_host_from_url(url: &str) -> Option { + // Remove protocol prefix + let after_proto = url + .strip_prefix("rtsps://") + .or_else(|| url.strip_prefix("rtsp://")) + .or_else(|| url.strip_prefix("wss://")) + .or_else(|| url.strip_prefix("https://"))?; + + // Get host (before port or path) + let host = after_proto + .split(':') + .next() + .or_else(|| after_proto.split('/').next())?; + + if host.is_empty() || host.starts_with('.') { + None + } else { + Some(host.to_string()) + } + } + /// Extract signaling URL from connection info pub fn signaling_url(&self) -> Option { self.connection_info @@ -339,24 +379,73 @@ impl CloudMatchSession { .and_then(|conn| conn.resource_path.clone()) } - /// Extract media connection info (usage=2 or usage=17) + /// Extract media connection info (usage=2, usage=17, or fallback to usage=14 for Alliance) pub fn media_connection_info(&self) -> Option { self.connection_info.as_ref().and_then(|conns| { + // Try standard media paths first (usage=2 or usage=17) let media_conn = conns.iter() .find(|c| c.usage == 2) .or_else(|| conns.iter().find(|c| c.usage == 17)); - media_conn.and_then(|conn| { - conn.ip.as_ref().filter(|_| conn.port > 0).map(|ip| { - MediaConnectionInfo { - ip: ip.clone(), - port: conn.port, + // If found, try to get IP/port + if let Some(conn) = media_conn { + let ip = conn.ip.clone().or_else(|| { + conn.resource_path.as_ref().and_then(|p| Self::extract_host_from_url(p)) + }); + let port = if conn.port > 0 { + conn.port + } else { + conn.resource_path.as_ref().and_then(|p| Self::extract_port_from_url(p)).unwrap_or(0) + }; + + if let Some(ip) = ip { + if port > 0 { + return Some(MediaConnectionInfo { ip, port }); } - }) + } + } + + // For Alliance: fall back to usage=14 with highest port (usually the UDP streaming port) + // Alliance sessions have usage=14 for both signaling and media + let alliance_conn = conns.iter() + .filter(|c| c.usage == 14) + .max_by_key(|c| c.port); + + alliance_conn.and_then(|conn| { + let ip = conn.ip.clone().or_else(|| { + conn.resource_path.as_ref().and_then(|p| Self::extract_host_from_url(p)) + }); + let port = if conn.port > 0 { + conn.port + } else { + conn.resource_path.as_ref().and_then(|p| Self::extract_port_from_url(p)).unwrap_or(0) + }; + + ip.filter(|_| port > 0).map(|ip| MediaConnectionInfo { ip, port }) }) }) } + /// Extract port from URL + fn extract_port_from_url(url: &str) -> Option { + // Find host:port pattern after :// + let after_proto = url + .strip_prefix("rtsps://") + .or_else(|| url.strip_prefix("rtsp://")) + .or_else(|| url.strip_prefix("wss://")) + .or_else(|| url.strip_prefix("https://"))?; + + // Extract port after colon + let parts: Vec<&str> = after_proto.split(':').collect(); + if parts.len() >= 2 { + // Port is after the colon, before any path + let port_str = parts[1].split('/').next()?; + port_str.parse().ok() + } else { + None + } + } + /// Convert ICE server configuration pub fn ice_servers(&self) -> Vec { self.ice_server_configuration diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index 1334be7..577d853 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -117,6 +117,7 @@ pub struct SubscriptionInfo { pub total_hours: f32, pub has_persistent_storage: bool, pub storage_size_gb: Option, + pub is_unlimited: bool, // true if subType is UNLIMITED (no hour cap) } /// Current tab in Games view @@ -199,6 +200,8 @@ pub enum UiAction { CloseSessionConflict, /// Close AV1 warning dialog CloseAV1Warning, + /// Close Alliance experimental warning dialog + CloseAllianceWarning, } /// Setting changes diff --git a/opennow-streamer/src/auth/mod.rs b/opennow-streamer/src/auth/mod.rs index 3bbbf11..5fd32dc 100644 --- a/opennow-streamer/src/auth/mod.rs +++ b/opennow-streamer/src/auth/mod.rs @@ -188,6 +188,10 @@ pub fn get_cached_providers() -> Vec { pub fn set_login_provider(provider: LoginProvider) { info!("Setting login provider to: {} ({})", provider.login_provider_display_name, provider.idp_id); + + // Save to cache for persistence across restarts + crate::app::cache::save_login_provider(&provider); + let mut selected = SELECTED_PROVIDER.write(); *selected = Some(provider); } diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index ca50142..89b8466 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -20,7 +20,7 @@ use crate::media::{VideoFrame, PixelFormat}; use super::StatsPanel; use super::image_cache; use super::shaders::{VIDEO_SHADER, NV12_SHADER}; -use super::screens::{render_login_screen, render_session_screen, render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog}; +use super::screens::{render_login_screen, render_session_screen, render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog, render_alliance_warning_dialog}; use std::collections::HashMap; // Color conversion is now hardcoded in the shader using official GFN client BT.709 values @@ -1387,6 +1387,8 @@ impl Renderer { show_settings_modal, app.show_session_conflict, app.show_av1_warning, + app.show_alliance_warning, + crate::auth::get_selected_provider().login_provider_display_name.as_str(), &app.active_sessions, app.pending_game_launch.as_ref(), &mut actions @@ -1505,6 +1507,8 @@ impl Renderer { show_settings_modal: bool, show_session_conflict: bool, show_av1_warning: bool, + show_alliance_warning: bool, + alliance_provider_name: &str, active_sessions: &[ActiveSessionInfo], pending_game_launch: Option<&GameInfo>, actions: &mut Vec @@ -1685,6 +1689,23 @@ impl Renderer { ); }); + // Alliance badge (if using an Alliance partner) + if crate::auth::get_selected_provider().is_alliance_partner() { + ui.add_space(8.0); + egui::Frame::new() + .fill(egui::Color32::from_rgb(30, 80, 130)) + .corner_radius(4.0) + .inner_margin(egui::Margin { left: 8, right: 8, top: 4, bottom: 4 }) + .show(ui, |ui| { + ui.label( + egui::RichText::new("ALLIANCE") + .size(11.0) + .color(egui::Color32::from_rgb(100, 180, 255)) + .strong() + ); + }); + } + ui.add_space(20.0); // Hours icon and remaining @@ -1695,25 +1716,35 @@ impl Renderer { ); ui.add_space(5.0); - let hours_color = if sub.remaining_hours > 5.0 { - egui::Color32::from_rgb(118, 185, 0) - } else if sub.remaining_hours > 1.0 { - egui::Color32::from_rgb(255, 200, 50) + // Show ∞ for unlimited subscriptions, otherwise show hours + if sub.is_unlimited { + ui.label( + egui::RichText::new("∞") + .size(15.0) + .color(egui::Color32::from_rgb(118, 185, 0)) + .strong() + ); } else { - egui::Color32::from_rgb(255, 80, 80) - }; + let hours_color = if sub.remaining_hours > 5.0 { + egui::Color32::from_rgb(118, 185, 0) + } else if sub.remaining_hours > 1.0 { + egui::Color32::from_rgb(255, 200, 50) + } else { + egui::Color32::from_rgb(255, 80, 80) + }; - ui.label( - egui::RichText::new(format!("{:.1}h", sub.remaining_hours)) - .size(13.0) - .color(hours_color) - .strong() - ); - ui.label( - egui::RichText::new(format!(" / {:.0}h", sub.total_hours)) - .size(12.0) - .color(egui::Color32::GRAY) - ); + ui.label( + egui::RichText::new(format!("{:.1}h", sub.remaining_hours)) + .size(13.0) + .color(hours_color) + .strong() + ); + ui.label( + egui::RichText::new(format!(" / {:.0}h", sub.total_hours)) + .size(12.0) + .color(egui::Color32::GRAY) + ); + } ui.add_space(20.0); @@ -1928,6 +1959,11 @@ impl Renderer { if show_av1_warning { render_av1_warning_dialog(ctx, actions); } + + // Alliance experimental warning dialog + if show_alliance_warning { + render_alliance_warning_dialog(ctx, alliance_provider_name, actions); + } } // Note: render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs index 36efcd3..29ec9f6 100644 --- a/opennow-streamer/src/gui/screens/mod.rs +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -380,3 +380,83 @@ pub fn render_av1_warning_dialog( }); }); } + +/// Render Alliance experimental warning dialog +pub fn render_alliance_warning_dialog( + ctx: &egui::Context, + provider_name: &str, + actions: &mut Vec, +) { + egui::Window::new("Alliance Partner") + .collapsible(false) + .resizable(false) + .fixed_size([420.0, 200.0]) + .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) + .show(ctx, |ui| { + ui.vertical_centered(|ui| { + ui.add_space(10.0); + + // Alliance badge - centered + egui::Frame::new() + .fill(egui::Color32::from_rgb(30, 80, 130)) + .corner_radius(6.0) + .inner_margin(egui::Margin { left: 14, right: 14, top: 6, bottom: 6 }) + .show(ui, |ui| { + ui.label( + egui::RichText::new("ALLIANCE") + .size(14.0) + .color(egui::Color32::from_rgb(100, 180, 255)) + .strong() + ); + }); + + ui.add_space(12.0); + + ui.label( + egui::RichText::new(format!("Welcome to {} via Alliance!", provider_name)) + .size(17.0) + .strong() + .color(egui::Color32::WHITE) + ); + + ui.add_space(10.0); + + ui.label( + egui::RichText::new("Alliance support is still experimental.") + .size(14.0) + .color(egui::Color32::from_rgb(255, 200, 80)) + ); + + ui.add_space(6.0); + + ui.label( + egui::RichText::new("Please report issues: github.com/zortos293/OpenNOW/issues") + .size(13.0) + .color(egui::Color32::LIGHT_GRAY) + ); + + ui.add_space(6.0); + + ui.label( + egui::RichText::new("Note: Feedback from Alliance users is especially valuable!") + .size(12.0) + .color(egui::Color32::GRAY) + .italics() + ); + + ui.add_space(12.0); + + let got_it_btn = egui::Button::new( + egui::RichText::new("Got it!") + .size(14.0) + .strong() + ) + .fill(egui::Color32::from_rgb(70, 130, 70)) + .min_size(egui::vec2(100.0, 32.0)); + + if ui.add(got_it_btn).clicked() { + actions.push(UiAction::CloseAllianceWarning); + } + }); + }); +} diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index 5b58ebe..f9d24f7 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -451,8 +451,10 @@ pub async fn run_streaming( info!("Preferred codec: {}", codec); - // Use server_ip from SessionInfo for SDP fixup if available - let public_ip = extract_public_ip(&session_info.server_ip); + // Use media_connection_info IP first, then server_ip + let public_ip = session_info.media_connection_info.as_ref() + .and_then(|mci| extract_public_ip(&mci.ip)) + .or_else(|| extract_public_ip(&session_info.server_ip)); // Modify SDP with extracted IP let modified_sdp = if let Some(ref ip) = public_ip { @@ -488,15 +490,23 @@ pub async fn run_streaming( ice_servers.push(s); } - // Fallback to default NVIDIA STUN if no servers provided - if ice_servers.is_empty() { - info!("No ICE servers from session, adding default NVIDIA STUN"); - ice_servers.push(RTCIceServer { - urls: vec!["stun:stun.gamestream.nvidia.com:19302".to_string()], - ..Default::default() - }); + // Always add default STUN servers as fallback (Alliance robustness) + ice_servers.push(RTCIceServer { + urls: vec!["stun:s1.stun.gamestream.nvidia.com:19308".to_string()], + ..Default::default() + }); + ice_servers.push(RTCIceServer { + urls: vec![ + "stun:stun.l.google.com:19302".to_string(), + "stun:stun1.l.google.com:19302".to_string() + ], + ..Default::default() + }); + + if ice_servers.len() <= 2 { + info!("Using default/fallback ICE servers only"); } else { - info!("Using {} ICE servers from session", ice_servers.len()); + info!("Using {} ICE servers (session + fallback)", ice_servers.len()); } // Handle offer and create answer @@ -510,41 +520,55 @@ pub async fn run_streaming( // Extract ICE credentials from our answer let (ufrag, pwd, fingerprint) = extract_ice_credentials(&answer_sdp); - // Build nvstSdp - let nvst_sdp = json!({ - "sdp": answer_sdp, - "type": "answer" - }); - - // Send answer - let nvst_sdp_str = nvst_sdp.to_string(); - signaling.send_answer(&answer_sdp, Some(&nvst_sdp_str)).await?; - - // For resume flow (no media_connection_info), we rely on: - // 1. ICE Servers (STUN/TURN) generating candidates. - // 2. Remote candidates via Trickle ICE. - // 3. Correct ICE negotiation. - // We do NOT manually manufacture a candidate from the signaling URL, - // as the official client does not do this. + // Build rich GFN-specific SDP (nvstSdp) + let nvst_sdp_content = build_nvst_sdp( + &ufrag, &pwd, &fingerprint, + width, height, fps, max_bitrate + ); + info!("Generated nvstSdp, length: {}", nvst_sdp_content.len()); + + // Use raw nvstSdp string (no wrapper object) + signaling.send_answer(&answer_sdp, Some(&nvst_sdp_content)).await?; + + // For resume flow or Alliance partners (manual candidate needed) if let Some(ref mci) = session_info.media_connection_info { info!("Using media port {} from session API", mci.port); + + // EXTRACT RAW IP from hostname (needed for valid ICE candidate) + // Use extract_public_ip which handles "x-x-x-x" format or direct IP + let raw_ip = extract_public_ip(&mci.ip) + .or_else(|| { + // Fallback: try to resolve hostname + use std::net::ToSocketAddrs; + format!("{}:{}", mci.ip, mci.port) + .to_socket_addrs() + .ok()? + .next() + .map(|addr| addr.ip().to_string()) + }) + .unwrap_or_else(|| mci.ip.clone()); + let candidate = format!( "candidate:1 1 udp 2130706431 {} {} typ host", - mci.ip, mci.port + raw_ip, mci.port ); info!("Adding manual ICE candidate: {}", candidate); - if let Err(e) = peer.add_ice_candidate(&candidate, Some("0"), Some(0)).await { + + // Extract server ufrag from offer (needed for ice-lite) + let (server_ufrag, _, _) = extract_ice_credentials(&sdp); + + if let Err(e) = peer.add_ice_candidate(&candidate, Some("0"), Some(0), Some(server_ufrag.clone())).await { warn!("Failed to add manual ICE candidate: {}", e); // Try other mids just in case for mid in ["1", "2", "3"] { - if peer.add_ice_candidate(&candidate, Some(mid), Some(mid.parse().unwrap_or(0))).await.is_ok() { + if peer.add_ice_candidate(&candidate, Some(mid), Some(mid.parse().unwrap_or(0)), Some(server_ufrag.clone())).await.is_ok() { info!("Added ICE candidate with sdpMid={}", mid); break; } } } } else { - info!("No media_connection_info (Resume) - waiting for ICE negotiation (STUN/TURN/Trickle)"); + info!("No media_connection_info - waiting for ICE negotiation"); } // Update stats with codec info @@ -564,6 +588,7 @@ pub async fn run_streaming( &candidate.candidate, candidate.sdp_mid.as_deref(), candidate.sdp_mline_index.map(|i| i as u16), + None ).await { warn!("Failed to add ICE candidate: {}", e); } diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs index 8eeb77d..00701c5 100644 --- a/opennow-streamer/src/webrtc/peer.rs +++ b/opennow-streamer/src/webrtc/peer.rs @@ -533,14 +533,14 @@ impl WebRtcPeer { } /// Add remote ICE candidate - pub async fn add_ice_candidate(&self, candidate: &str, sdp_mid: Option<&str>, sdp_mline_index: Option) -> Result<()> { + pub async fn add_ice_candidate(&self, candidate: &str, sdp_mid: Option<&str>, sdp_mline_index: Option, ufrag: Option) -> Result<()> { let pc = self.peer_connection.as_ref().context("No peer connection")?; let candidate = webrtc::ice_transport::ice_candidate::RTCIceCandidateInit { candidate: candidate.to_string(), sdp_mid: sdp_mid.map(|s| s.to_string()), sdp_mline_index, - username_fragment: None, + username_fragment: ufrag, }; pc.add_ice_candidate(candidate).await?; diff --git a/opennow-streamer/src/webrtc/signaling.rs b/opennow-streamer/src/webrtc/signaling.rs index 649a1d4..7d90fab 100644 --- a/opennow-streamer/src/webrtc/signaling.rs +++ b/opennow-streamer/src/webrtc/signaling.rs @@ -296,7 +296,12 @@ impl GfnSignaling { }); if let Some(nvst) = nvst_sdp { - answer["nvstSdp"] = json!(nvst); + // Try to parse as JSON object (for nvstSdp wrapper), otherwise treat as string + if let Ok(val) = serde_json::from_str::(nvst) { + answer["nvstSdp"] = val; + } else { + answer["nvstSdp"] = json!(nvst); + } } let peer_msg = json!({ From f6ccce09e79bf2f5fd6c9ade6c0af9c3738cf31a Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 23:15:10 +0100 Subject: [PATCH 25/67] feat: Establish initial GUI screen architecture with login, session, and a comprehensive settings modal. --- opennow-streamer/src/gui/screens/mod.rs | 253 +++++++++++------------- opennow-streamer/src/main.rs | 6 +- 2 files changed, 119 insertions(+), 140 deletions(-) diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs index 29ec9f6..2c3e6fd 100644 --- a/opennow-streamer/src/gui/screens/mod.rs +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -12,6 +12,7 @@ use crate::app::{UiAction, Settings, GameInfo, ServerInfo, SettingChange}; use crate::app::config::{RESOLUTIONS, FPS_OPTIONS}; use crate::app::session::ActiveSessionInfo; +/// Render the settings modal with bitrate slider and other options /// Render the settings modal with bitrate slider and other options pub fn render_settings_modal( ctx: &egui::Context, @@ -25,62 +26,42 @@ pub fn render_settings_modal( egui::Window::new("Settings") .collapsible(false) .resizable(false) - .fixed_size([450.0, 400.0]) + .fixed_size([500.0, 450.0]) // Increased size for cleaner layout .anchor(egui::Align2::CENTER_CENTER, [0.0, 0.0]) .show(ctx, |ui| { egui::ScrollArea::vertical().show(ui, |ui| { - ui.vertical(|ui| { - // === Video Settings === - ui.label( - egui::RichText::new("Video") - .size(16.0) - .strong() - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - ui.add_space(8.0); + ui.add_space(8.0); - // Max Bitrate slider - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Max Bitrate") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - ui.label( - egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)) - .size(14.0) - .color(egui::Color32::WHITE) - ); + // === Video Settings Section === + ui.heading(egui::RichText::new("Video").color(egui::Color32::from_rgb(118, 185, 0))); + ui.add_space(8.0); + + egui::Grid::new("video_settings_grid") + .num_columns(2) + .spacing([24.0, 16.0]) + .show(ui, |ui| { + // Max Bitrate + ui.label("Max Bitrate") + .on_hover_text("Controls the maximum bandwidth usage for video streaming.\nHigher values improve quality but require a stable, fast internet connection."); + ui.vertical(|ui| { + ui.horizontal(|ui| { + let mut bitrate = settings.max_bitrate_mbps as f32; + let slider = egui::Slider::new(&mut bitrate, 10.0..=200.0) + .show_value(false) + .step_by(5.0); + if ui.add(slider).changed() { + actions.push(UiAction::UpdateSetting(SettingChange::MaxBitrate(bitrate as u32))); + } + ui.label(egui::RichText::new(format!("{} Mbps", settings.max_bitrate_mbps)).strong()); + }); + ui.label(egui::RichText::new("Recommend: 50-75 Mbps for most users").size(10.0).weak()); }); - }); - - let mut bitrate = settings.max_bitrate_mbps as f32; - let slider = egui::Slider::new(&mut bitrate, 10.0..=200.0) - .show_value(false) - .step_by(5.0); - if ui.add(slider).changed() { - actions.push(UiAction::UpdateSetting(SettingChange::MaxBitrate(bitrate as u32))); - } + ui.end_row(); - ui.add_space(4.0); - ui.label( - egui::RichText::new("Higher bitrate = better quality, requires faster connection") - .size(11.0) - .color(egui::Color32::GRAY) - ); - - ui.add_space(16.0); - - // Resolution selection - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Resolution") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - // Find display name for current resolution + // Resolution + ui.label("Resolution") + .on_hover_text("The resolution of the video stream."); + ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { let current_display = RESOLUTIONS.iter() .find(|(res, _)| *res == settings.resolution) .map(|(_, name)| *name) @@ -96,18 +77,12 @@ pub fn render_settings_modal( } }); }); - }); - - ui.add_space(12.0); + ui.end_row(); - // FPS selection - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Frame Rate") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + // Frame Rate + ui.label("Frame Rate") + .on_hover_text("Target frame rate for the stream.\nHigher FPS feels smoother but requires more bandwidth and decoder power."); + ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::ComboBox::from_id_salt("fps_combo") .selected_text(format!("{} FPS", settings.fps)) .show_ui(ui, |ui| { @@ -118,21 +93,15 @@ pub fn render_settings_modal( } }); }); - }); - - ui.add_space(12.0); + ui.end_row(); - // Codec selection - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Video Codec") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + // Video Codec + ui.label("Video Codec") + .on_hover_text("Compression standard used for video.\nAV1 and H.265 (HEVC) offer better quality than H.264 at the same bitrate, but require compatible hardware."); + ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { let codec_text = match settings.codec { crate::app::VideoCodec::H264 => "H.264", - crate::app::VideoCodec::H265 => "H.265", + crate::app::VideoCodec::H265 => "H.265 (HEVC)", crate::app::VideoCodec::AV1 => "AV1", }; egui::ComboBox::from_id_salt("codec_combo") @@ -141,28 +110,24 @@ pub fn render_settings_modal( if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::H264), "H.264").clicked() { actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::H264))); } - if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::H265), "H.265").clicked() { + if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::H265), "H.265 (HEVC)").clicked() { actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::H265))); } if crate::media::is_av1_hardware_supported() { if ui.selectable_label(matches!(settings.codec, crate::app::VideoCodec::AV1), "AV1").clicked() { actions.push(UiAction::UpdateSetting(SettingChange::Codec(crate::app::VideoCodec::AV1))); } + } else { + ui.label(egui::RichText::new("AV1 unavailable (HW unsupported)").weak()); } }); }); - }); + ui.end_row(); - ui.add_space(12.0); - - // Decoder selection - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Video Decoder") - .size(14.0) - .color(egui::Color32::LIGHT_GRAY) - ); - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + // Video Decoder + ui.label("Video Decoder") + .on_hover_text("The hardware/software backend used to decode the video stream.\nUsually 'D3D11' or 'Vulkan' on Windows."); + ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::ComboBox::from_id_salt("decoder_combo") .selected_text(settings.decoder_backend.as_str()) .show_ui(ui, |ui| { @@ -173,71 +138,81 @@ pub fn render_settings_modal( } }); }); + ui.end_row(); }); - ui.add_space(20.0); - ui.separator(); - ui.add_space(12.0); + ui.add_space(20.0); + ui.separator(); + ui.add_space(8.0); - // === Server Selection === - ui.label( - egui::RichText::new("Server") - .size(16.0) - .strong() - .color(egui::Color32::from_rgb(118, 185, 0)) - ); - ui.add_space(8.0); + // === Server Settings Section === + ui.heading(egui::RichText::new("Server & Network").color(egui::Color32::from_rgb(118, 185, 0))); + ui.add_space(8.0); - // Auto selection toggle - let mut auto_select = auto_server_selection; - if ui.checkbox(&mut auto_select, "Auto-select best server").changed() { - actions.push(UiAction::SetAutoServerSelection(auto_select)); - } + egui::Grid::new("server_settings_grid") + .num_columns(2) + .spacing([24.0, 16.0]) + .show(ui, |ui| { + // Auto Selection + ui.label("Server Selection") + .on_hover_text("Choose a specific GeForce NOW server or let the client automatically pick the best one."); + + ui.vertical(|ui| { + let mut auto_select = auto_server_selection; + if ui.checkbox(&mut auto_select, "Auto-select best server").on_hover_text("Automatically selects the server with the lowest ping.").changed() { + actions.push(UiAction::SetAutoServerSelection(auto_select)); + } - if !auto_server_selection && !servers.is_empty() { - ui.add_space(8.0); - - // Server dropdown - let current_server = servers.get(selected_server_index) - .map(|s| format!("{} ({}ms)", s.name, s.ping_ms.unwrap_or(0))) - .unwrap_or_else(|| "Select server".to_string()); - - egui::ComboBox::from_id_salt("server_combo") - .selected_text(current_server) - .width(300.0) - .show_ui(ui, |ui| { - for (i, server) in servers.iter().enumerate() { - let ping_str = server.ping_ms - .map(|p| format!(" ({}ms)", p)) - .unwrap_or_default(); - let label = format!("{}{}", server.name, ping_str); - if ui.selectable_label(i == selected_server_index, label).clicked() { - actions.push(UiAction::SelectServer(i)); - } - } - }); + if !auto_server_selection && !servers.is_empty() { + ui.add_space(4.0); + let current_server = servers.get(selected_server_index) + .map(|s| format!("{} ({}ms)", s.name, s.ping_ms.unwrap_or(0))) + .unwrap_or_else(|| "Select server".to_string()); + + egui::ComboBox::from_id_salt("server_combo") + .selected_text(current_server) + .width(250.0) + .show_ui(ui, |ui| { + for (i, server) in servers.iter().enumerate() { + let ping_str = server.ping_ms + .map(|p| format!(" ({}ms)", p)) + .unwrap_or_default(); + let label = format!("{}{}", server.name, ping_str); + if ui.selectable_label(i == selected_server_index, label).clicked() { + actions.push(UiAction::SelectServer(i)); + } + } + }); + } + }); + ui.end_row(); - // Test ping button - ui.add_space(8.0); - if ping_testing { + // Network Test + if !auto_server_selection && !servers.is_empty() { + ui.label("Network Test") + .on_hover_text("Measure latency to available servers."); ui.horizontal(|ui| { - ui.spinner(); - ui.label("Testing ping..."); + if ping_testing { + ui.spinner(); + ui.label("Testing ping..."); + } else if ui.button("Test Ping").clicked() { + actions.push(UiAction::StartPingTest); + } }); - } else if ui.button("Test Ping").clicked() { - actions.push(UiAction::StartPingTest); - } - } - - ui.add_space(20.0); - - // Close button - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - if ui.button("Close").clicked() { - actions.push(UiAction::ToggleSettingsModal); + ui.end_row(); } }); + + ui.add_space(24.0); + + // Close button centered + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + if ui.button(egui::RichText::new("Close").size(16.0)).clicked() { + actions.push(UiAction::ToggleSettingsModal); + } }); + + ui.add_space(8.0); }); }); } diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index a4eca8d..9fb6026 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -297,7 +297,11 @@ impl ApplicationHandler for OpenNowApp { let target_fps = if app_guard.state == AppState::Streaming { app_guard.stats.target_fps.max(60) // Use stream's target FPS (min 60) } else { - 60 // UI mode: 60fps is enough + // UI mode: Sync to monitor refresh rate (default 60 if detection fails) + renderer.window().current_monitor() + .and_then(|m| m.refresh_rate_millihertz()) + .map(|mhz| (mhz as f32 / 1000.0).ceil() as u32) + .unwrap_or(60) }; drop(app_guard); From 2ccd73e2be58c4d9b3438d3026d3d31f7a660871 Mon Sep 17 00:00:00 2001 From: Zortos Date: Fri, 2 Jan 2026 23:24:26 +0100 Subject: [PATCH 26/67] feat: Add core GPU renderer with wgpu for video frames and UI overlays, including egui integration and macOS optimizations. --- opennow-streamer/src/gui/renderer.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 89b8466..c19ab3c 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -1671,9 +1671,12 @@ impl Renderer { if let Some(sub) = subscription { // Membership tier badge let (tier_bg, tier_fg) = match sub.membership_tier.as_str() { - "ULTIMATE" => (egui::Color32::from_rgb(80, 50, 120), egui::Color32::from_rgb(200, 150, 255)), - "PERFORMANCE" | "PRIORITY" => (egui::Color32::from_rgb(30, 70, 100), egui::Color32::from_rgb(100, 200, 255)), - _ => (egui::Color32::from_rgb(50, 50, 60), egui::Color32::GRAY), + // Ultimate: Gold/Bronze theme + "ULTIMATE" => (egui::Color32::from_rgb(80, 60, 10), egui::Color32::from_rgb(255, 215, 0)), + // Priority/Performance: Brown theme + "PERFORMANCE" | "PRIORITY" => (egui::Color32::from_rgb(70, 40, 20), egui::Color32::from_rgb(205, 175, 149)), + // Free: Gray theme + _ => (egui::Color32::from_rgb(45, 45, 45), egui::Color32::from_rgb(180, 180, 180)), }; egui::Frame::new() From 81f674ac7a51fbd088c919d6013725642a285cc3 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 02:02:22 +0100 Subject: [PATCH 27/67] feat: implement robust macOS VideoToolbox hardware decoding with explicit format negotiation and optimized frame transfer. --- opennow-streamer/src/api/mod.rs | 38 ++++ opennow-streamer/src/app/cache.rs | 4 + opennow-streamer/src/app/mod.rs | 16 ++ opennow-streamer/src/app/types.rs | 8 + opennow-streamer/src/gui/renderer.rs | 10 +- opennow-streamer/src/gui/screens/mod.rs | 114 ++++++++++- opennow-streamer/src/input/controller.rs | 4 +- opennow-streamer/src/main.rs | 27 ++- opennow-streamer/src/media/audio.rs | 6 +- opennow-streamer/src/media/video.rs | 229 +++++++++++++++++------ 10 files changed, 379 insertions(+), 77 deletions(-) diff --git a/opennow-streamer/src/api/mod.rs b/opennow-streamer/src/api/mod.rs index c3f768d..63c610a 100644 --- a/opennow-streamer/src/api/mod.rs +++ b/opennow-streamer/src/api/mod.rs @@ -295,6 +295,23 @@ struct SubscriptionResponse { sub_type: Option, // TIME_CAPPED or UNLIMITED #[serde(default)] addons: Vec, + features: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct SubscriptionFeatures { + #[serde(default)] + resolutions: Vec, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +struct SubscriptionResolution { + height_in_pixels: u32, + width_in_pixels: u32, + frames_per_second: u32, + is_entitled: bool, } fn default_tier() -> String { @@ -428,6 +445,26 @@ pub async fn fetch_subscription(token: &str, user_id: &str) -> Result Result Option { has_persistent_storage: cache.get("has_persistent_storage")?.as_bool()?, storage_size_gb: cache.get("storage_size_gb").and_then(|v| v.as_u64()).map(|v| v as u32), is_unlimited: cache.get("is_unlimited").and_then(|v| v.as_bool()).unwrap_or(false), + entitled_resolutions: cache.get("entitled_resolutions") + .and_then(|v| serde_json::from_value(v.clone()).ok()) + .unwrap_or_default(), }) } diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index e75a4f7..e0dc0df 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -223,6 +223,22 @@ impl App { } } }); + + // Also fetch subscription info to ensure dynamic resolutions are available + let rt = runtime.clone(); + let token = auth_tokens.as_ref().unwrap().jwt().to_string(); + let user_id = auth_tokens.as_ref().unwrap().user_id().to_string(); + rt.spawn(async move { + match crate::api::fetch_subscription(&token, &user_id).await { + Ok(sub) => { + info!("Fetched subscription startup: tier={}", sub.membership_tier); + cache::save_subscription_cache(&sub); + } + Err(e) => { + warn!("Failed to fetch subscription at startup: {}", e); + } + } + }); } Self { diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index 577d853..fddca0b 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -118,6 +118,14 @@ pub struct SubscriptionInfo { pub has_persistent_storage: bool, pub storage_size_gb: Option, pub is_unlimited: bool, // true if subType is UNLIMITED (no hour cap) + pub entitled_resolutions: Vec, +} + +#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, serde::Serialize, serde::Deserialize)] +pub struct EntitledResolution { + pub width: u32, + pub height: u32, + pub fps: u32, } /// Current tab in Games view diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index c19ab3c..81a25d2 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -179,7 +179,13 @@ impl Renderer { width: size.width, height: size.height, present_mode, - alpha_mode: surface_caps.alpha_modes[0], + alpha_mode: if surface_caps.alpha_modes.contains(&wgpu::CompositeAlphaMode::PostMultiplied) { + wgpu::CompositeAlphaMode::PostMultiplied + } else if surface_caps.alpha_modes.contains(&wgpu::CompositeAlphaMode::PreMultiplied) { + wgpu::CompositeAlphaMode::PreMultiplied + } else { + surface_caps.alpha_modes[0] + }, view_formats: vec![], desired_maximum_frame_latency: 1, // Minimum latency for streaming }; @@ -1950,7 +1956,7 @@ impl Renderer { // Settings modal if show_settings_modal { - render_settings_modal(ctx, settings, servers, selected_server_index, auto_server_selection, ping_testing, actions); + render_settings_modal(ctx, settings, servers, selected_server_index, auto_server_selection, ping_testing, subscription, actions); } // Session conflict dialog diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs index 2c3e6fd..6b6a90c 100644 --- a/opennow-streamer/src/gui/screens/mod.rs +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -21,6 +21,7 @@ pub fn render_settings_modal( selected_server_index: usize, auto_server_selection: bool, ping_testing: bool, + subscription: Option<&crate::app::SubscriptionInfo>, actions: &mut Vec, ) { egui::Window::new("Settings") @@ -70,6 +71,80 @@ pub fn render_settings_modal( egui::ComboBox::from_id_salt("resolution_combo") .selected_text(current_display) .show_ui(ui, |ui| { + // Use entitled resolutions if available + if let Some(sub) = subscription { + if !sub.entitled_resolutions.is_empty() { + // 1. Deduplicate unique resolutions + let mut unique_resolutions = std::collections::HashSet::new(); + let mut resolutions = Vec::new(); + + // Sort by width then height descending first + let mut sorted_res = sub.entitled_resolutions.clone(); + sorted_res.sort_by(|a, b| b.width.cmp(&a.width).then(b.height.cmp(&a.height))); + + for res in sorted_res { + let key = (res.width, res.height); + if unique_resolutions.contains(&key) { + continue; + } + unique_resolutions.insert(key); + resolutions.push(res); + } + + // 2. Group by Aspect Ratio + let mut groups: std::collections::BTreeMap> = std::collections::BTreeMap::new(); + + for res in resolutions { + let ratio = res.width as f32 / res.height as f32; + let category = if (ratio - 16.0/9.0).abs() < 0.05 { + "16:9 Standard" + } else if (ratio - 16.0/10.0).abs() < 0.05 { + "16:10 Widescreen" + } else if (ratio - 21.0/9.0).abs() < 0.05 { + "21:9 Ultrawide" + } else if (ratio - 32.0/9.0).abs() < 0.05 { + "32:9 Super Ultrawide" + } else if (ratio - 4.0/3.0).abs() < 0.05 { + "4:3 Legacy" + } else { + "Other" + }; + + groups.entry(category.to_string()).or_default().push(res); + } + + // Define preferred order of categories + let order = ["16:9 Standard", "16:10 Widescreen", "21:9 Ultrawide", "32:9 Super Ultrawide", "4:3 Legacy", "Other"]; + + for category in order.iter() { + if let Some(res_list) = groups.get(*category) { + ui.heading(*category); + for res in res_list { + let res_str = format!("{}x{}", res.width, res.height); + + // Friendly name logic + let name = match (res.width, res.height) { + (1280, 720) => "720p (HD)".to_string(), + (1920, 1080) => "1080p (FHD)".to_string(), + (2560, 1440) => "1440p (QHD)".to_string(), + (3840, 2160) => "4K (UHD)".to_string(), + (2560, 1080) => "2560x1080 (Ultrawide)".to_string(), + (3440, 1440) => "3440x1440 (Ultrawide)".to_string(), + (w, h) => format!("{}x{}", w, h), + }; + + if ui.selectable_label(settings.resolution == res_str, name).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res_str))); + } + } + ui.separator(); + } + } + return; + } + } + + // Fallback to static list for (res, name) in RESOLUTIONS { if ui.selectable_label(settings.resolution == *res, *name).clicked() { actions.push(UiAction::UpdateSetting(SettingChange::Resolution(res.to_string()))); @@ -81,11 +156,48 @@ pub fn render_settings_modal( // Frame Rate ui.label("Frame Rate") - .on_hover_text("Target frame rate for the stream.\nHigher FPS feels smoother but requires more bandwidth and decoder power."); + .on_hover_text("Target frame rate for the stream.\nHigh FPS requires more bandwidth and decoder power."); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::ComboBox::from_id_salt("fps_combo") .selected_text(format!("{} FPS", settings.fps)) .show_ui(ui, |ui| { + // Use entitled FPS for the current resolution if available + if let Some(sub) = subscription { + if !sub.entitled_resolutions.is_empty() { + let (w, h) = crate::app::types::parse_resolution(&settings.resolution); + + // Find max FPS for this resolution + let mut available_fps = Vec::new(); + for res in &sub.entitled_resolutions { + if res.width == w && res.height == h { + available_fps.push(res.fps); + } + } + + // Also include global max FPS just in case resolution match fails + // or if we want to allow users to force lower FPS + if available_fps.is_empty() { + // Fallback to all entitled FPS + for res in &sub.entitled_resolutions { + available_fps.push(res.fps); + } + } + + available_fps.sort(); + available_fps.dedup(); + + if !available_fps.is_empty() { + for fps in available_fps { + if ui.selectable_label(settings.fps == fps, format!("{} FPS", fps)).clicked() { + actions.push(UiAction::UpdateSetting(SettingChange::Fps(fps))); + } + } + return; + } + } + } + + // Fallback to static list for &fps in FPS_OPTIONS { if ui.selectable_label(settings.fps == fps, format!("{} FPS", fps)).clicked() { actions.push(UiAction::UpdateSetting(SettingChange::Fps(fps))); diff --git a/opennow-streamer/src/input/controller.rs b/opennow-streamer/src/input/controller.rs index 6fd0ae2..5fcfb49 100644 --- a/opennow-streamer/src/input/controller.rs +++ b/opennow-streamer/src/input/controller.rs @@ -255,8 +255,8 @@ impl ControllerManager { } } - // Poll sleep - 4ms for 250Hz polling rate - std::thread::sleep(Duration::from_millis(4)); + // Poll sleep - 1ms for 1000Hz polling rate (low latency) + std::thread::sleep(Duration::from_millis(1)); } info!("Controller input thread stopped (processed {} events)", event_count); diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index 9fb6026..4b6ff17 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -409,17 +409,28 @@ impl ApplicationHandler for OpenNowApp { // No polling needed here - raw input sends directly to the WebRTC input channel // This keeps mouse latency minimal and independent of render rate - // Frame rate limiting - sync render rate to stream's target FPS - // This prevents the render loop from running at 500+ FPS when decode is only 120 FPS + // Check if there's a new frame available BEFORE sleeping + // This minimizes latency by rendering new frames immediately + let has_new_frame = app_guard.shared_frame.as_ref() + .map(|sf| sf.has_new_frame()) + .unwrap_or(false); + let target_fps = app_guard.stats.target_fps.max(60); drop(app_guard); // Release lock before potential sleep - let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps as f64); - let elapsed = self.last_frame_time.elapsed(); - if elapsed < frame_duration { - let sleep_time = frame_duration - elapsed; - if sleep_time.as_micros() > 500 { - std::thread::sleep(sleep_time - std::time::Duration::from_micros(500)); + // Only sleep if no new frame is available + // This ensures frames are rendered as soon as they arrive + if !has_new_frame { + let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps as f64); + let elapsed = self.last_frame_time.elapsed(); + if elapsed < frame_duration { + let sleep_time = frame_duration - elapsed; + // Use shorter sleep (1ms max) to stay responsive to new frames + let max_sleep = std::time::Duration::from_millis(1); + let actual_sleep = sleep_time.min(max_sleep); + if actual_sleep.as_micros() > 200 { + std::thread::sleep(actual_sleep); + } } } self.last_frame_time = std::time::Instant::now(); diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index f003c2e..089cf58 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -393,8 +393,10 @@ impl AudioPlayer { info!("Using audio config: {}Hz, {} channels, format {:?}", actual_rate.0, actual_channels, sample_format); - // Buffer for ~500ms of audio (larger buffer for jitter tolerance) - let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) / 2; + // Buffer for ~20ms of audio (ultra-low latency for gaming) + // 48000Hz * 2ch * 0.02s = 1920 samples + // Note: If audio crackles, increase to 30-40ms + let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) * 20 / 1000; let buffer = Arc::new(Mutex::new(AudioBuffer::new(buffer_size))); let config = supported_range.with_sample_rate(actual_rate).into(); diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 5c889de..6fa6ebd 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -591,6 +591,41 @@ impl VideoDecoder { Ok(hw_accel) } + + + /// FFI Callback for format negotiation (VideoToolbox) + #[cfg(target_os = "macos")] + unsafe extern "C" fn get_videotoolbox_format( + _ctx: *mut ffmpeg::ffi::AVCodecContext, + mut fmt: *const ffmpeg::ffi::AVPixelFormat, + ) -> ffmpeg::ffi::AVPixelFormat { + use ffmpeg::ffi::*; + + // Log all available formats for debugging + let mut available_formats = Vec::new(); + let mut check_fmt = fmt; + while *check_fmt != AVPixelFormat::AV_PIX_FMT_NONE { + available_formats.push(*check_fmt as i32); + check_fmt = check_fmt.add(1); + } + info!("get_format callback: available formats: {:?} (VIDEOTOOLBOX={}, NV12={}, YUV420P={})", + available_formats, + AVPixelFormat::AV_PIX_FMT_VIDEOTOOLBOX as i32, + AVPixelFormat::AV_PIX_FMT_NV12 as i32, + AVPixelFormat::AV_PIX_FMT_YUV420P as i32); + + while *fmt != AVPixelFormat::AV_PIX_FMT_NONE { + if *fmt == AVPixelFormat::AV_PIX_FMT_VIDEOTOOLBOX { + info!("get_format: selecting VIDEOTOOLBOX hardware format"); + return AVPixelFormat::AV_PIX_FMT_VIDEOTOOLBOX; + } + fmt = fmt.add(1); + } + + info!("get_format: VIDEOTOOLBOX not available, falling back to NV12"); + AVPixelFormat::AV_PIX_FMT_NV12 + } + /// Create decoder, trying hardware acceleration based on preference fn create_decoder(codec_id: ffmpeg::codec::Id, backend: VideoDecoderBackend) -> Result<(decoder::Video, bool)> { info!("create_decoder: {:?} with backend preference {:?}", codec_id, backend); @@ -601,6 +636,63 @@ impl VideoDecoder { if backend == VideoDecoderBackend::Auto || backend == VideoDecoderBackend::VideoToolbox { info!("macOS detected - attempting VideoToolbox hardware acceleration"); + // First try to find specific VideoToolbox decoders + let vt_decoder_name = match codec_id { + ffmpeg::codec::Id::AV1 => Some("av1_videotoolbox"), + ffmpeg::codec::Id::HEVC => Some("hevc_videotoolbox"), + ffmpeg::codec::Id::H264 => Some("h264_videotoolbox"), + _ => None, + }; + + if let Some(name) = vt_decoder_name { + if let Some(codec) = ffmpeg::codec::decoder::find_by_name(name) { + info!("Found specific VideoToolbox decoder: {}", name); + + // Try to use explicit decoder with hardware context attached + // This helps ensure we get VIDEOTOOLBOX frames even without set_get_format + let res = unsafe { + use ffmpeg::ffi::*; + use std::ptr; + + let mut ctx = CodecContext::new_with_codec(codec); + + // Create HW device context + let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); + let ret = av_hwdevice_ctx_create( + &mut hw_device_ctx, + AVHWDeviceType::AV_HWDEVICE_TYPE_VIDEOTOOLBOX, + ptr::null(), + ptr::null_mut(), + 0, + ); + + if ret >= 0 && !hw_device_ctx.is_null() { + let raw_ctx = ctx.as_mut_ptr(); + (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); + av_buffer_unref(&mut hw_device_ctx); + + // FORCE VIDEOTOOLBOX FORMAT via callback and simple hint + (*raw_ctx).get_format = Some(Self::get_videotoolbox_format); + (*raw_ctx).pix_fmt = AVPixelFormat::AV_PIX_FMT_VIDEOTOOLBOX; + } + + ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + ctx.decoder().video() + }; + + match res { + Ok(decoder) => { + info!("Specific VideoToolbox decoder ({}) opened successfully", name); + return Ok((decoder, true)); + } + Err(e) => { + warn!("Failed to open specific VideoToolbox decoder {}: {:?}", name, e); + } + } + } + } + + // Fallback: Generic decoder with manual hw_device_ctx attachment // Try to set up VideoToolbox hwaccel using FFmpeg's device API unsafe { use ffmpeg::ffi::*; @@ -628,19 +720,22 @@ impl VideoDecoder { if ret >= 0 && !hw_device_ctx.is_null() { // Attach hardware device context to codec context (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); + av_buffer_unref(&mut hw_device_ctx); + + // CRITICAL: Set get_format callback to request VideoToolbox pixel format + // Without this, the decoder will output software frames (YUV420P) + (*raw_ctx).get_format = Some(Self::get_videotoolbox_format); - // Enable multi-threading - (*raw_ctx).thread_count = 4; + // Enable multi-threading for software fallback paths + (*raw_ctx).thread_count = 0; // 0 = auto (use all cores) match ctx.decoder().video() { Ok(decoder) => { - info!("VideoToolbox hardware decoder created successfully"); - // Don't free hw_device_ctx - it's now owned by the codec context + info!("VideoToolbox hardware decoder created successfully (generic + hw_device + get_format)"); return Ok((decoder, true)); } Err(e) => { warn!("Failed to open VideoToolbox decoder: {:?}", e); - av_buffer_unref(&mut hw_device_ctx); } } } else { @@ -855,6 +950,7 @@ impl VideoDecoder { return None; } + // Hardware frame detected - need to transfer to system memory debug!("Transferring hardware frame (format: {:?}) to system memory", format); unsafe { @@ -988,29 +1084,30 @@ impl VideoDecoder { let y_data = frame_to_use.data(0); let uv_data = frame_to_use.data(1); - // Copy Y plane with alignment - let mut y_plane = vec![0u8; (aligned_y_stride * h) as usize]; - for row in 0..h { - let src_start = (row * y_stride) as usize; - let src_end = src_start + w as usize; - let dst_start = (row * aligned_y_stride) as usize; - if src_end <= y_data.len() { - y_plane[dst_start..dst_start + w as usize] - .copy_from_slice(&y_data[src_start..src_end]); + // Optimized copy - fast path when strides match + let copy_plane_fast = |src: &[u8], src_stride: u32, dst_stride: u32, width: u32, height: u32| -> Vec { + let total_size = (dst_stride * height) as usize; + if src_stride == dst_stride && src.len() >= total_size { + // Fast path: single memcpy + src[..total_size].to_vec() + } else { + // Slow path: row-by-row + let mut dst = vec![0u8; total_size]; + for row in 0..height as usize { + let src_start = row * src_stride as usize; + let src_end = src_start + width as usize; + let dst_start = row * dst_stride as usize; + if src_end <= src.len() { + dst[dst_start..dst_start + width as usize] + .copy_from_slice(&src[src_start..src_end]); + } + } + dst } - } + }; - // Copy UV plane with alignment - let mut uv_plane = vec![0u8; (aligned_uv_stride * uv_height) as usize]; - for row in 0..uv_height { - let src_start = (row * uv_stride) as usize; - let src_end = src_start + w as usize; - let dst_start = (row * aligned_uv_stride) as usize; - if src_end <= uv_data.len() { - uv_plane[dst_start..dst_start + w as usize] - .copy_from_slice(&uv_data[src_start..src_end]); - } - } + let y_plane = copy_plane_fast(y_data, y_stride, aligned_y_stride, w, h); + let uv_plane = copy_plane_fast(uv_data, uv_stride, aligned_uv_stride, w, uv_height); if *frames_decoded == 1 { info!("NV12 direct GPU path: {}x{} - bypassing CPU scaler", w, h); @@ -1032,21 +1129,24 @@ impl VideoDecoder { }); } - // For other formats, use scaler to convert to YUV420P + // For other formats, use scaler to convert to NV12 + // NV12 is more efficient for GPU upload and hardware decoders at high bitrates + // Use POINT (nearest neighbor) since we're not resizing - just color format conversion + // This is much faster than BILINEAR for same-size conversion if scaler.is_none() || *width != w || *height != h { *width = w; *height = h; - info!("Creating scaler: {:?} {}x{} -> YUV420P {}x{}", actual_format, w, h, w, h); + info!("Creating scaler: {:?} {}x{} -> NV12 {}x{} (POINT mode)", actual_format, w, h, w, h); match ScalerContext::get( actual_format, w, h, - Pixel::YUV420P, + Pixel::NV12, w, h, - ScalerFlags::BILINEAR, + ScalerFlags::POINT, // Fastest - no interpolation needed for same-size conversion ) { Ok(s) => *scaler = Some(s), Err(e) => { @@ -1056,14 +1156,12 @@ impl VideoDecoder { } } - // Convert to YUV420P + // Convert to NV12 // We must allocate the destination frame first! - let mut yuv_frame = FfmpegFrame::new(Pixel::YUV420P, w, h); - // get_buffer is not exposed/needed in this safe wrapper, FfmpegFrame::new handles structure - // Ideally we should just verify the scaler works. + let mut nv12_frame = FfmpegFrame::new(Pixel::NV12, w, h); if let Some(ref mut s) = scaler { - if let Err(e) = s.run(frame_to_use, &mut yuv_frame) { + if let Err(e) = s.run(frame_to_use, &mut nv12_frame) { warn!("Scaler run failed: {:?}", e); return None; } @@ -1071,47 +1169,54 @@ impl VideoDecoder { return None; } - // Extract YUV planes with alignment - let y_stride = yuv_frame.stride(0) as u32; - let u_stride = yuv_frame.stride(1) as u32; - let v_stride = yuv_frame.stride(2) as u32; + // Extract NV12 planes with alignment + // NV12: Y plane (full res) + UV plane (half height, interleaved) + let y_stride = nv12_frame.stride(0) as u32; + let uv_stride = nv12_frame.stride(1) as u32; let aligned_y_stride = Self::get_aligned_stride(w); - let aligned_u_stride = Self::get_aligned_stride(w / 2); - let aligned_v_stride = Self::get_aligned_stride(w / 2); + let aligned_uv_stride = Self::get_aligned_stride(w); - let y_height = h; let uv_height = h / 2; - let dim_y = w; - let dim_uv = w / 2; - - // Helper to copy plane with alignment - let copy_plane = |src: &[u8], src_stride: usize, dst_stride: usize, width: usize, height: usize| -> Vec { - let mut dst = vec![0u8; dst_stride * height]; - for row in 0..height { - let src_start = row * src_stride; - let src_end = src_start + width; - let dst_start = row * dst_stride; - let dst_end = dst_start + width; - if src_end <= src.len() { - dst[dst_start..dst_end].copy_from_slice(&src[src_start..src_end]); + // Optimized plane copy - use bulk copy when strides match, row-by-row otherwise + let copy_plane_optimized = |src: &[u8], src_stride: u32, dst_stride: u32, width: u32, height: u32| -> Vec { + let total_size = (dst_stride * height) as usize; + + // Fast path: if source stride equals destination stride AND covers the data we need, + // we can do a single memcpy + if src_stride == dst_stride && src.len() >= total_size { + src[..total_size].to_vec() + } else { + // Slow path: row-by-row copy with stride conversion + let mut dst = vec![0u8; total_size]; + let width = width as usize; + let src_stride = src_stride as usize; + let dst_stride = dst_stride as usize; + + for row in 0..height as usize { + let src_start = row * src_stride; + let src_end = src_start + width; + let dst_start = row * dst_stride; + if src_end <= src.len() { + dst[dst_start..dst_start + width].copy_from_slice(&src[src_start..src_end]); + } } + dst } - dst }; Some(VideoFrame { width: w, height: h, - y_plane: copy_plane(yuv_frame.data(0), y_stride as usize, aligned_y_stride as usize, dim_y as usize, y_height as usize), - u_plane: copy_plane(yuv_frame.data(1), u_stride as usize, aligned_u_stride as usize, dim_uv as usize, uv_height as usize), - v_plane: copy_plane(yuv_frame.data(2), v_stride as usize, aligned_v_stride as usize, dim_uv as usize, uv_height as usize), + y_plane: copy_plane_optimized(nv12_frame.data(0), y_stride, aligned_y_stride, w, h), + u_plane: copy_plane_optimized(nv12_frame.data(1), uv_stride, aligned_uv_stride, w, uv_height), + v_plane: Vec::new(), // NV12 has no separate V plane y_stride: aligned_y_stride, - u_stride: aligned_u_stride, - v_stride: aligned_v_stride, + u_stride: aligned_uv_stride, + v_stride: 0, timestamp_us: 0, - format: PixelFormat::YUV420P, + format: PixelFormat::NV12, color_range, color_space, }) From 5849593000a66336e2e2cb24791b3a708e6f9ad8 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 15:47:22 +0100 Subject: [PATCH 28/67] feat: Implement D3D11VA zero-copy video for Windows, optimize audio playback with a lock-free ring buffer, and add detailed streaming statistics. --- opennow-streamer/Cargo.lock | 455 ++++++------ opennow-streamer/Cargo.toml | 30 +- opennow-streamer/src/app/mod.rs | 7 + opennow-streamer/src/app/types.rs | 2 + opennow-streamer/src/gui/renderer.rs | 822 ++++++++++++++++++++- opennow-streamer/src/gui/screens/mod.rs | 21 +- opennow-streamer/src/gui/shaders.rs | 51 ++ opennow-streamer/src/gui/stats_panel.rs | 66 +- opennow-streamer/src/input/macos.rs | 108 ++- opennow-streamer/src/input/mod.rs | 4 +- opennow-streamer/src/media/audio.rs | 177 +++-- opennow-streamer/src/media/d3d11.rs | 321 ++++++++ opennow-streamer/src/media/mod.rs | 30 +- opennow-streamer/src/media/video.rs | 142 +++- opennow-streamer/src/media/videotoolbox.rs | 732 +++++++++++++++++- opennow-streamer/src/webrtc/mod.rs | 91 ++- opennow-streamer/src/webrtc/peer.rs | 73 ++ 17 files changed, 2726 insertions(+), 406 deletions(-) create mode 100644 opennow-streamer/src/media/d3d11.rs diff --git a/opennow-streamer/Cargo.lock b/opennow-streamer/Cargo.lock index 3488065..d2218b6 100644 --- a/opennow-streamer/Cargo.lock +++ b/opennow-streamer/Cargo.lock @@ -18,6 +18,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618" +[[package]] +name = "accesskit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf203f9d3bd8f29f98833d1fbef628df18f759248a547e7e01cfbf63cda36a99" + [[package]] name = "adler2" version = "2.0.1" @@ -81,6 +87,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "alsa" version = "0.9.1" @@ -302,7 +314,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", "synstructure 0.13.2", ] @@ -325,7 +337,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -349,7 +361,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -412,7 +424,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -510,7 +522,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -725,6 +737,15 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "color" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18ef4657441fb193b65f34dc39b3781f0dfec23d3bd94d0eeb4e88cde421edb" +dependencies = [ + "bytemuck", +] + [[package]] name = "colorchoice" version = "1.0.4" @@ -996,7 +1017,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -1115,7 +1136,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -1165,8 +1186,7 @@ dependencies = [ [[package]] name = "ecolor" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ddb8ac7643d1dba1bb02110e804406dd459a838efcb14011ced10556711a8e" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" dependencies = [ "bytemuck", "emath", @@ -1175,9 +1195,9 @@ dependencies = [ [[package]] name = "egui" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9b567d356674e9a5121ed3fedfb0a7c31e059fe71f6972b691bcd0bfc284e3" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" dependencies = [ + "accesskit", "ahash", "bitflags 2.10.0", "emath", @@ -1192,13 +1212,11 @@ dependencies = [ [[package]] name = "egui-wgpu" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d209971c84b2352a06174abdba701af1e552ce56b144d96f2bd50a3c91236" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" dependencies = [ "ahash", "bytemuck", "document-features", - "egui", "epaint", "log", "profiling", @@ -1211,8 +1229,7 @@ dependencies = [ [[package]] name = "egui-winit" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec6687e5bb551702f4ad10ac428bab12acf9d53047ebb1082d4a0ed8c6251a29" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" dependencies = [ "arboard", "bytemuck", @@ -1259,8 +1276,7 @@ dependencies = [ [[package]] name = "emath" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "491bdf728bf25ddd9ad60d4cf1c48588fa82c013a2440b91aa7fc43e34a07c32" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" dependencies = [ "bytemuck", ] @@ -1300,10 +1316,8 @@ dependencies = [ [[package]] name = "epaint" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "009d0dd3c2163823a0abdb899451ecbc78798dec545ee91b43aff1fa790bab62" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" dependencies = [ - "ab_glyph", "ahash", "bytemuck", "ecolor", @@ -1313,13 +1327,15 @@ dependencies = [ "nohash-hasher", "parking_lot", "profiling", + "self_cell", + "skrifa", + "vello_cpu", ] [[package]] name = "epaint_default_fonts" version = "0.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fbe202b6578d3d56428fa185cdf114a05e49da05f477b3c7f0fbb221f1862" +source = "git+https://github.com/zortos293/egui?branch=wgpu-28#10d32ba834ad158a1f0d0d55762da0fc78c2eb56" [[package]] name = "equivalent" @@ -1343,6 +1359,15 @@ version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" +[[package]] +name = "euclid" +version = "0.22.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48" +dependencies = [ + "num-traits", +] + [[package]] name = "evdev" version = "0.12.2" @@ -1379,7 +1404,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -1391,6 +1416,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "fearless_simd" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903" +dependencies = [ + "bytemuck", +] + [[package]] name = "ff" version = "0.13.1" @@ -1466,6 +1500,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" +[[package]] +name = "font-types" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5" +dependencies = [ + "bytemuck", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -1493,7 +1536,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -1579,7 +1622,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -1742,35 +1785,18 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "gpu-alloc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171" -dependencies = [ - "bitflags 2.10.0", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4" -dependencies = [ - "bitflags 2.10.0", -] - [[package]] name = "gpu-allocator" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd" +checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795" dependencies = [ + "ash", + "hashbrown 0.16.1", "log", "presser", - "thiserror 1.0.69", - "windows 0.58.0", + "thiserror 2.0.17", + "windows 0.62.2", ] [[package]] @@ -1850,6 +1876,8 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ + "allocator-api2", + "equivalent", "foldhash 0.2.0", ] @@ -2309,7 +2337,7 @@ checksum = "b787bebb543f8969132630c51fd0afab173a86c6abae56ff3b9e5e3e3f9f6e58" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -2371,6 +2399,17 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" +[[package]] +name = "kurbo" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9729cc38c18d86123ab736fd2e7151763ba226ac2490ec092d1dd148825e32" +dependencies = [ + "arrayvec", + "euclid", + "smallvec", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -2379,9 +2418,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" [[package]] name = "libloading" @@ -2420,6 +2459,12 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "linebender_resource_handle" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4" + [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -2528,24 +2573,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" -dependencies = [ - "bitflags 2.10.0", - "block", - "core-graphics-types 0.1.3", - "foreign-types 0.5.0", - "log", - "objc", - "paste", -] - -[[package]] -name = "metal" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" +checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ "bitflags 2.10.0", "block", @@ -2601,9 +2631,8 @@ dependencies = [ [[package]] name = "naga" -version = "27.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "arrayvec", "bit-set", @@ -2782,7 +2811,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -2833,7 +2862,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -3218,6 +3247,7 @@ dependencies = [ "env_logger", "evdev", "ffmpeg-next", + "foreign-types 0.5.0", "futures-util", "gilrs", "hex", @@ -3226,7 +3256,7 @@ dependencies = [ "lazy_static", "libc", "log", - "metal 0.31.0", + "metal", "native-tls", "objc", "once_cell", @@ -3249,6 +3279,7 @@ dependencies = [ "webrtc", "webrtc-util 0.8.1", "wgpu", + "wgpu-hal", "windows 0.62.2", "winit", "x11", @@ -3277,7 +3308,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -3312,10 +3343,11 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orbclient" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" +checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd" dependencies = [ + "libc", "libredox", ] @@ -3415,6 +3447,19 @@ dependencies = [ "base64ct", ] +[[package]] +name = "peniko" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3c76095c9a636173600478e0373218c7b955335048c2bcd12dc6a79657649d8" +dependencies = [ + "bytemuck", + "color", + "kurbo", + "linebender_resource_handle", + "smallvec", +] + [[package]] name = "percent-encoding" version = "2.3.2" @@ -3438,7 +3483,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -3609,9 +3654,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.37.5" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" +checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c" dependencies = [ "memchr", ] @@ -3777,6 +3822,16 @@ dependencies = [ "yasna", ] +[[package]] +name = "read-fonts" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358" +dependencies = [ + "bytemuck", + "font-types", +] + [[package]] name = "redox_syscall" version = "0.4.1" @@ -4172,6 +4227,12 @@ dependencies = [ "libc", ] +[[package]] +name = "self_cell" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" + [[package]] name = "semver" version = "1.0.27" @@ -4205,7 +4266,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -4287,6 +4348,16 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +[[package]] +name = "skrifa" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.11" @@ -4484,9 +4555,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.111" +version = "2.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4" dependencies = [ "proc-macro2", "quote", @@ -4522,7 +4593,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -4600,7 +4671,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -4611,7 +4682,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -4711,9 +4782,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", @@ -4734,7 +4805,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -4968,9 +5039,9 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -5053,6 +5124,30 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "vello_common" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a235ba928b3109ad9e7696270edb09445a52ae1c7c08e6d31a19b1cdd6cbc24a" +dependencies = [ + "bytemuck", + "fearless_simd", + "log", + "peniko", + "skrifa", + "smallvec", +] + +[[package]] +name = "vello_cpu" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0bd1fcf9c1814f17a491e07113623d44e3ec1125a9f3401f5e047d6d326da21" +dependencies = [ + "bytemuck", + "vello_common", +] + [[package]] name = "version_check" version = "0.9.5" @@ -5147,7 +5242,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", "wasm-bindgen-shared", ] @@ -5162,9 +5257,9 @@ dependencies = [ [[package]] name = "wayland-backend" -version = "0.3.11" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35" +checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9" dependencies = [ "cc", "downcast-rs", @@ -5176,9 +5271,9 @@ dependencies = [ [[package]] name = "wayland-client" -version = "0.31.11" +version = "0.31.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d" +checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec" dependencies = [ "bitflags 2.10.0", "rustix 1.1.3", @@ -5199,9 +5294,9 @@ dependencies = [ [[package]] name = "wayland-cursor" -version = "0.31.11" +version = "0.31.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29" +checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078" dependencies = [ "rustix 1.1.3", "wayland-client", @@ -5210,9 +5305,9 @@ dependencies = [ [[package]] name = "wayland-protocols" -version = "0.32.9" +version = "0.32.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901" +checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -5235,9 +5330,9 @@ dependencies = [ [[package]] name = "wayland-protocols-misc" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfe33d551eb8bffd03ff067a8b44bb963919157841a99957151299a6307d19c" +checksum = "791c58fdeec5406aa37169dd815327d1e47f334219b523444bc26d70ceb4c34e" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -5248,9 +5343,9 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032" +checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -5261,9 +5356,9 @@ dependencies = [ [[package]] name = "wayland-protocols-wlr" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec" +checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -5274,9 +5369,9 @@ dependencies = [ [[package]] name = "wayland-scanner" -version = "0.31.7" +version = "0.31.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3" +checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3" dependencies = [ "proc-macro2", "quick-xml", @@ -5285,9 +5380,9 @@ dependencies = [ [[package]] name = "wayland-sys" -version = "0.31.7" +version = "0.31.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142" +checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd" dependencies = [ "dlib", "log", @@ -5333,9 +5428,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c" dependencies = [ "rustls-pki-types", ] @@ -5577,12 +5672,12 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "27.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "arrayvec", "bitflags 2.10.0", + "bytemuck", "cfg-if", "cfg_aliases", "document-features", @@ -5606,9 +5701,8 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "27.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "arrayvec", "bit-set", @@ -5638,36 +5732,32 @@ dependencies = [ [[package]] name = "wgpu-core-deps-apple" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-windows-linux-android" -version = "27.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "27.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "android_system_properties", "arrayvec", @@ -5681,7 +5771,6 @@ dependencies = [ "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", - "gpu-alloc", "gpu-allocator", "gpu-descriptor", "hashbrown 0.16.1", @@ -5690,7 +5779,7 @@ dependencies = [ "libc", "libloading", "log", - "metal 0.32.0", + "metal", "naga", "ndk-sys 0.6.0+11769913", "objc", @@ -5708,21 +5797,19 @@ dependencies = [ "wasm-bindgen", "web-sys", "wgpu-types", - "windows 0.58.0", - "windows-core 0.58.0", + "windows 0.62.2", + "windows-core 0.62.2", ] [[package]] name = "wgpu-types" -version = "27.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb" +version = "28.0.0" +source = "git+https://github.com/gfx-rs/wgpu?tag=v28.0.0#3f02781bb5a0a1fe1922ea36c9bdacf9792abcbc" dependencies = [ "bitflags 2.10.0", "bytemuck", "js-sys", "log", - "thiserror 2.0.17", "web-sys", ] @@ -5777,16 +5864,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.62.2" @@ -5818,30 +5895,17 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ - "windows-implement 0.60.2", - "windows-interface 0.59.3", + "windows-implement", + "windows-interface", "windows-link", "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-strings", ] [[package]] @@ -5855,17 +5919,6 @@ dependencies = [ "windows-threading", ] -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -5874,18 +5927,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", -] - -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -5896,7 +5938,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -5923,7 +5965,7 @@ checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ "windows-link", "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-strings", ] [[package]] @@ -5935,15 +5977,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-result" version = "0.4.1" @@ -5953,16 +5986,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-strings" version = "0.5.1" @@ -6491,7 +6514,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", "synstructure 0.13.2", ] @@ -6512,7 +6535,7 @@ checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -6532,7 +6555,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", "synstructure 0.13.2", ] @@ -6553,7 +6576,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] @@ -6586,14 +6609,14 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.111", + "syn 2.0.112", ] [[package]] name = "zmij" -version = "1.0.2" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4a4e8e9dc5c62d159f04fcdbe07f4c3fb710415aab4754bf11505501e3251d" +checksum = "317f17ff091ac4515f17cc7a190d2769a8c9a96d227de5d64b500b01cda8f2cd" [[package]] name = "zune-core" diff --git a/opennow-streamer/Cargo.toml b/opennow-streamer/Cargo.toml index 93c8e4b..3fe0083 100644 --- a/opennow-streamer/Cargo.toml +++ b/opennow-streamer/Cargo.toml @@ -41,7 +41,7 @@ gilrs = "0.11" # Window & Graphics winit = "0.30" -wgpu = "27" +wgpu = { version = "28", features = ["wgpu-core", "metal"] } pollster = "0.4" bytemuck = { version = "1", features = ["derive"] } @@ -88,6 +88,12 @@ windows = { version = "0.62", features = [ "Win32_Graphics_Gdi", "Win32_Foundation", "Win32_System_LibraryLoader", + # D3D11/DXGI for zero-copy video + "Win32_Graphics_Direct3D", + "Win32_Graphics_Direct3D11", + "Win32_Graphics_Dxgi", + "Win32_Graphics_Dxgi_Common", + "Win32_Security", ] } [target.'cfg(target_os = "macos")'.dependencies] @@ -95,10 +101,16 @@ core-foundation = "0.10" core-graphics = "0.24" cocoa = "0.26" objc = "0.2" -# Zero-copy video: VideoToolbox -> IOSurface -> Metal texture -metal = "0.31" +# Zero-copy video: VideoToolbox -> IOSurface -> Metal texture -> wgpu +metal = "0.33" +wgpu-hal = { version = "28", features = ["metal"] } +foreign-types = "0.5" block = "0.1" +[target.'cfg(windows)'.dependencies.wgpu-hal] +version = "28" +features = ["dx12"] + [target.'cfg(target_os = "linux")'.dependencies] evdev = "0.12" x11 = { version = "2.21", features = ["xlib"] } @@ -111,3 +123,15 @@ strip = true [profile.dev] opt-level = 1 + +# Force all dependencies to use wgpu 28 (needed for External Texture support) +# Using forked egui with wgpu 28 support +[patch.crates-io] +wgpu = { git = "https://github.com/gfx-rs/wgpu", tag = "v28.0.0" } +wgpu-core = { git = "https://github.com/gfx-rs/wgpu", tag = "v28.0.0" } +wgpu-types = { git = "https://github.com/gfx-rs/wgpu", tag = "v28.0.0" } +wgpu-hal = { git = "https://github.com/gfx-rs/wgpu", tag = "v28.0.0" } +naga = { git = "https://github.com/gfx-rs/wgpu", tag = "v28.0.0" } +egui-wgpu = { git = "https://github.com/zortos293/egui", branch = "wgpu-28" } +egui-winit = { git = "https://github.com/zortos293/egui", branch = "wgpu-28" } +egui = { git = "https://github.com/zortos293/egui", branch = "wgpu-28" } diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index e0dc0df..c284968 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -449,6 +449,13 @@ impl App { UiAction::CloseAllianceWarning => { self.show_alliance_warning = false; } + UiAction::ResetSettings => { + info!("Resetting all settings to defaults"); + self.settings = Settings::default(); + if let Err(e) = self.settings.save() { + warn!("Failed to save default settings: {}", e); + } + } } } diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index fddca0b..a3b4312 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -210,6 +210,8 @@ pub enum UiAction { CloseAV1Warning, /// Close Alliance experimental warning dialog CloseAllianceWarning, + /// Reset all settings to defaults + ResetSettings, } /// Setting changes diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 81a25d2..70f79bf 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -17,9 +17,13 @@ use winit::raw_window_handle::{HasWindowHandle, RawWindowHandle}; use crate::app::{App, AppState, UiAction, GamesTab, GameInfo}; use crate::app::session::ActiveSessionInfo; use crate::media::{VideoFrame, PixelFormat}; +#[cfg(target_os = "macos")] +use crate::media::{ZeroCopyTextureManager, CVMetalTexture, MetalVideoRenderer}; +#[cfg(target_os = "windows")] +use crate::media::D3D11TextureWrapper; use super::StatsPanel; use super::image_cache; -use super::shaders::{VIDEO_SHADER, NV12_SHADER}; +use super::shaders::{VIDEO_SHADER, NV12_SHADER, EXTERNAL_TEXTURE_SHADER}; use super::screens::{render_login_screen, render_session_screen, render_settings_modal, render_session_conflict_dialog, render_av1_warning_dialog, render_alliance_warning_dialog}; use std::collections::HashMap; @@ -60,6 +64,13 @@ pub struct Renderer { // Current pixel format current_format: PixelFormat, + // External Texture pipeline (true zero-copy hardware YUV->RGB) + external_texture_pipeline: Option, + external_texture_bind_group_layout: Option, + external_texture_bind_group: Option, + external_texture: Option, + external_texture_supported: bool, + // Stats panel stats_panel: StatsPanel, @@ -72,6 +83,17 @@ pub struct Renderer { // Game art texture cache (URL -> TextureHandle) game_textures: HashMap, + + // macOS zero-copy video rendering (Metal-based, no CPU copy) + #[cfg(target_os = "macos")] + zero_copy_manager: Option, + #[cfg(target_os = "macos")] + zero_copy_enabled: bool, + // Store current CVMetalTextures to keep them alive during rendering + #[cfg(target_os = "macos")] + current_y_cv_texture: Option, + #[cfg(target_os = "macos")] + current_uv_cv_texture: Option, } impl Renderer { @@ -147,8 +169,28 @@ impl Renderer { )); // Create device and queue + // Request EXTERNAL_TEXTURE feature for true zero-copy video rendering + let mut required_features = wgpu::Features::empty(); + let adapter_features = adapter.features(); + + // Check if EXTERNAL_TEXTURE is supported (hardware YUV->RGB conversion) + let external_texture_supported = adapter_features.contains(wgpu::Features::EXTERNAL_TEXTURE); + if external_texture_supported { + required_features |= wgpu::Features::EXTERNAL_TEXTURE; + info!("EXTERNAL_TEXTURE feature supported - enabling true zero-copy video"); + } else { + info!("EXTERNAL_TEXTURE not supported - using NV12 shader path"); + } + let (device, queue) = adapter - .request_device(&wgpu::DeviceDescriptor::default()) + .request_device(&wgpu::DeviceDescriptor { + label: Some("OpenNow Device"), + required_features, + required_limits: wgpu::Limits::default(), + memory_hints: wgpu::MemoryHints::Performance, + experimental_features: wgpu::ExperimentalFeatures::disabled(), + trace: wgpu::Trace::Off, + }) .await .context("Failed to create device")?; @@ -268,7 +310,7 @@ impl Renderer { let video_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { label: Some("Video Pipeline Layout"), bind_group_layouts: &[&video_bind_group_layout], - push_constant_ranges: &[], + immediate_size: 0, }); let video_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { @@ -301,7 +343,7 @@ impl Renderer { }, depth_stencil: None, multisample: wgpu::MultisampleState::default(), - multiview: None, + multiview_mask: None, cache: None, }); @@ -312,7 +354,7 @@ impl Renderer { address_mode_w: wgpu::AddressMode::ClampToEdge, mag_filter: wgpu::FilterMode::Linear, min_filter: wgpu::FilterMode::Linear, - mipmap_filter: wgpu::FilterMode::Nearest, + mipmap_filter: wgpu::MipmapFilterMode::Nearest, ..Default::default() }); @@ -360,7 +402,7 @@ impl Renderer { let nv12_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { label: Some("NV12 Pipeline Layout"), bind_group_layouts: &[&nv12_bind_group_layout], - push_constant_ranges: &[], + immediate_size: 0, }); let nv12_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { @@ -393,10 +435,83 @@ impl Renderer { }, depth_stencil: None, multisample: wgpu::MultisampleState::default(), - multiview: None, + multiview_mask: None, cache: None, }); + // Create External Texture pipeline (true zero-copy hardware YUV->RGB) + let (external_texture_pipeline, external_texture_bind_group_layout) = if external_texture_supported { + let external_texture_shader = device.create_shader_module(wgpu::ShaderModuleDescriptor { + label: Some("External Texture Shader"), + source: wgpu::ShaderSource::Wgsl(EXTERNAL_TEXTURE_SHADER.into()), + }); + + let external_texture_bind_group_layout = device.create_bind_group_layout(&wgpu::BindGroupLayoutDescriptor { + label: Some("External Texture Bind Group Layout"), + entries: &[ + // External texture (hardware YUV->RGB conversion) + wgpu::BindGroupLayoutEntry { + binding: 0, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::ExternalTexture, + count: None, + }, + // Sampler for external texture + wgpu::BindGroupLayoutEntry { + binding: 1, + visibility: wgpu::ShaderStages::FRAGMENT, + ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering), + count: None, + }, + ], + }); + + let external_texture_pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor { + label: Some("External Texture Pipeline Layout"), + bind_group_layouts: &[&external_texture_bind_group_layout], + immediate_size: 0, + }); + + let external_texture_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor { + label: Some("External Texture Pipeline"), + layout: Some(&external_texture_pipeline_layout), + vertex: wgpu::VertexState { + module: &external_texture_shader, + entry_point: Some("vs_main"), + buffers: &[], + compilation_options: Default::default(), + }, + fragment: Some(wgpu::FragmentState { + module: &external_texture_shader, + entry_point: Some("fs_main"), + targets: &[Some(wgpu::ColorTargetState { + format: surface_format, + blend: Some(wgpu::BlendState::REPLACE), + write_mask: wgpu::ColorWrites::ALL, + })], + compilation_options: Default::default(), + }), + primitive: wgpu::PrimitiveState { + topology: wgpu::PrimitiveTopology::TriangleList, + strip_index_format: None, + front_face: wgpu::FrontFace::Ccw, + cull_mode: None, + polygon_mode: wgpu::PolygonMode::Fill, + unclipped_depth: false, + conservative: false, + }, + depth_stencil: None, + multisample: wgpu::MultisampleState::default(), + multiview_mask: None, + cache: None, + }); + + info!("External Texture pipeline created - true zero-copy video rendering enabled"); + (Some(external_texture_pipeline), Some(external_texture_bind_group_layout)) + } else { + (None, None) + }; + // Create stats panel let stats_panel = StatsPanel::new(); @@ -423,10 +538,23 @@ impl Renderer { uv_texture: None, nv12_bind_group: None, current_format: PixelFormat::YUV420P, + external_texture_pipeline, + external_texture_bind_group_layout, + external_texture_bind_group: None, + external_texture: None, + external_texture_supported, stats_panel, fullscreen: false, consecutive_surface_errors: 0, game_textures: HashMap::new(), + #[cfg(target_os = "macos")] + zero_copy_manager: ZeroCopyTextureManager::new(), + #[cfg(target_os = "macos")] + zero_copy_enabled: true, // GPU blit via Metal for zero-copy CVPixelBuffer rendering + #[cfg(target_os = "macos")] + current_y_cv_texture: None, + #[cfg(target_os = "macos")] + current_uv_cv_texture: None, }) } @@ -870,11 +998,36 @@ impl Renderer { /// Update video textures from frame (GPU YUV->RGB conversion) /// Supports both YUV420P (3 planes) and NV12 (2 planes) formats - /// NV12 is faster on macOS as it skips CPU-based scaler + /// On macOS, uses zero-copy path via CVPixelBuffer + Metal blit + /// On Windows, uses D3D11 shared textures pub fn update_video(&mut self, frame: &VideoFrame) { let uv_width = frame.width / 2; let uv_height = frame.height / 2; + // ZERO-COPY PATH: CVPixelBuffer + Metal blit (macOS VideoToolbox) + #[cfg(target_os = "macos")] + if let Some(ref gpu_frame) = frame.gpu_frame { + self.update_video_zero_copy(frame, gpu_frame, uv_width, uv_height); + return; + } + + // ZERO-COPY PATH: D3D11 texture sharing (Windows D3D11VA) + // TODO: Implement true GPU sharing via D3D11/DX12 interop with wgpu + // For now this still uses CPU staging - needs wgpu external memory support + #[cfg(target_os = "windows")] + if let Some(ref gpu_frame) = frame.gpu_frame { + self.update_video_d3d11(frame, gpu_frame, uv_width, uv_height); + return; + } + + // EXTERNAL TEXTURE PATH: Use hardware YUV->RGB conversion when available + // This is faster than our shader-based conversion + // Only use if we have CPU-accessible frame data (y_plane not empty) + if self.external_texture_supported && frame.format == PixelFormat::NV12 && !frame.y_plane.is_empty() { + self.update_video_external_texture(frame, uv_width, uv_height); + return; + } + // Check if we need to recreate textures (size or format change) let format_changed = self.current_format != frame.format; let size_changed = self.video_size != (frame.width, frame.height); @@ -1120,10 +1273,591 @@ impl Renderer { } } + /// TRUE zero-copy video update using CVMetalTextureCache (macOS only) + /// Creates Metal textures that share GPU memory with CVPixelBuffer - NO CPU COPY! + /// Uses wgpu's hal layer to import Metal textures directly, avoiding all CPU involvement. + #[cfg(target_os = "macos")] + fn update_video_zero_copy( + &mut self, + frame: &VideoFrame, + gpu_frame: &std::sync::Arc, + uv_width: u32, + uv_height: u32, + ) { + use objc::{msg_send, sel, sel_impl}; + use objc::runtime::Object; + + // Use CVMetalTextureCache for true zero-copy (no CPU involvement) + if self.zero_copy_enabled { + if let Some(ref manager) = self.zero_copy_manager { + // Create Metal textures directly from CVPixelBuffer - TRUE ZERO-COPY! + // These textures share GPU memory with the decoded video frame + if let Some((y_metal, uv_metal)) = manager.create_textures_from_cv_buffer(gpu_frame) { + // Check if we need to recreate wgpu textures (size changed) + let size_changed = self.video_size != (frame.width, frame.height); + + if size_changed { + self.current_format = frame.format; + self.video_size = (frame.width, frame.height); + + // Create wgpu textures that we'll blit into from Metal + let y_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("Y Texture (Zero-Copy Target)"), + size: wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST | wgpu::TextureUsages::RENDER_ATTACHMENT, + view_formats: &[], + }); + + let uv_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("UV Texture (Zero-Copy Target)"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::Rg8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST | wgpu::TextureUsages::RENDER_ATTACHMENT, + view_formats: &[], + }); + + let y_view = y_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let uv_view = uv_texture.create_view(&wgpu::TextureViewDescriptor::default()); + + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("NV12 Bind Group (Zero-Copy)"), + layout: &self.nv12_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&y_view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::TextureView(&uv_view), + }, + wgpu::BindGroupEntry { + binding: 2, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); + + self.y_texture = Some(y_texture); + self.uv_texture = Some(uv_texture); + self.nv12_bind_group = Some(bind_group); + + log::info!("Zero-copy video textures created: {}x{} (UV: {}x{})", + frame.width, frame.height, uv_width, uv_height); + } + + // GPU-to-GPU blit: Copy from CVMetalTexture to wgpu texture using Metal blit encoder + // This is entirely on GPU - no CPU involvement at all! + unsafe { + // Use the cached command queue from ZeroCopyTextureManager (created once, reused every frame) + let command_queue = manager.command_queue(); + + if !command_queue.is_null() { + let command_buffer: *mut Object = msg_send![command_queue, commandBuffer]; + + if !command_buffer.is_null() { + let blit_encoder: *mut Object = msg_send![command_buffer, blitCommandEncoder]; + + if !blit_encoder.is_null() { + // Get source Metal textures from CVMetalTexture + let y_src = y_metal.metal_texture_ptr(); + let uv_src = uv_metal.metal_texture_ptr(); + + // Get destination Metal textures from wgpu + // wgpu on Metal stores the underlying MTLTexture + if let (Some(ref y_dst_wgpu), Some(ref uv_dst_wgpu)) = (&self.y_texture, &self.uv_texture) { + // Use wgpu's hal API to get underlying Metal textures + let copied = self.blit_metal_textures( + blit_encoder, + y_src, uv_src, + y_dst_wgpu, uv_dst_wgpu, + frame.width, frame.height, + uv_width, uv_height, + ); + + if copied { + let _: () = msg_send![blit_encoder, endEncoding]; + let _: () = msg_send![command_buffer, commit]; + // DON'T wait for completion - let GPU work async + // waitUntilCompleted blocks and adds latency! + // The GPU will naturally synchronize when wgpu renders + + // Store CVMetalTextures to keep them alive + self.current_y_cv_texture = Some(y_metal); + self.current_uv_cv_texture = Some(uv_metal); + + return; // Success! GPU-to-GPU copy complete + } + } + + let _: () = msg_send![blit_encoder, endEncoding]; + } + // Don't commit if blit failed + } + } + } + + } + } + } + + // No CPU fallback - GPU blit is required for smooth playback + log::warn!("GPU blit failed - frame dropped (zero_copy_enabled={}, manager={})", + self.zero_copy_enabled, self.zero_copy_manager.is_some()); + } + + /// Update video textures from D3D11 hardware-decoded frame (Windows) + /// Copies from D3D11 staging texture to wgpu - faster than FFmpeg's av_hwframe_transfer_data + /// because we skip FFmpeg's intermediate copies and work directly with decoder output + #[cfg(target_os = "windows")] + fn update_video_d3d11( + &mut self, + frame: &VideoFrame, + gpu_frame: &std::sync::Arc, + uv_width: u32, + uv_height: u32, + ) { + // Lock the D3D11 texture and get plane data + let planes = match gpu_frame.lock_and_get_planes() { + Ok(p) => p, + Err(e) => { + log::warn!("Failed to lock D3D11 texture: {:?}", e); + return; + } + }; + + // Check if we need to recreate textures (size change) + let size_changed = self.video_size != (frame.width, frame.height); + + if size_changed { + self.video_size = (frame.width, frame.height); + self.current_format = PixelFormat::NV12; + + // Create Y texture (full resolution, R8) + let y_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("Y Texture (D3D11)"), + size: wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + // Create UV texture for NV12 (Rg8 interleaved) + let uv_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("UV Texture (D3D11)"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::Rg8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + let y_view = y_texture.create_view(&wgpu::TextureViewDescriptor::default()); + let uv_view = uv_texture.create_view(&wgpu::TextureViewDescriptor::default()); + + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("NV12 Bind Group (D3D11)"), + layout: &self.nv12_bind_group_layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::TextureView(&y_view), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::TextureView(&uv_view), + }, + wgpu::BindGroupEntry { + binding: 2, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); + + self.y_texture = Some(y_texture); + self.uv_texture = Some(uv_texture); + self.nv12_bind_group = Some(bind_group); + // Clear YUV420P textures + self.u_texture = None; + self.v_texture = None; + self.video_bind_group = None; + + log::info!("D3D11 video textures created: {}x{} (UV: {}x{})", + frame.width, frame.height, uv_width, uv_height); + } + + // Upload Y plane from D3D11 staging texture + if let Some(ref texture) = self.y_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &planes.y_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(planes.y_stride), + rows_per_image: Some(planes.height), + }, + wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + ); + } + + // Upload UV plane from D3D11 staging texture + if let Some(ref texture) = self.uv_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &planes.uv_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(planes.uv_stride), + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } + } + + /// Update video using ExternalTexture for hardware YUV->RGB conversion + /// This uses wgpu's ExternalTexture API which provides hardware-accelerated + /// color space conversion on supported platforms (DX12, Metal, Vulkan) + fn update_video_external_texture( + &mut self, + frame: &VideoFrame, + uv_width: u32, + uv_height: u32, + ) { + // Check if we need to recreate textures (size change) + let size_changed = self.video_size != (frame.width, frame.height); + + if size_changed { + self.video_size = (frame.width, frame.height); + self.current_format = PixelFormat::NV12; + + // Create Y texture (full resolution, R8) + let y_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("Y Texture (External)"), + size: wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::R8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + // Create UV texture for NV12 (Rg8 interleaved) + let uv_texture = self.device.create_texture(&wgpu::TextureDescriptor { + label: Some("UV Texture (External)"), + size: wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format: wgpu::TextureFormat::Rg8Unorm, + usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST, + view_formats: &[], + }); + + self.y_texture = Some(y_texture); + self.uv_texture = Some(uv_texture); + + log::info!("External Texture video created: {}x{} (hardware YUV->RGB)", + frame.width, frame.height); + } + + // Upload Y plane + if let Some(ref texture) = self.y_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.y_plane, + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.y_stride), + rows_per_image: Some(frame.height), + }, + wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }, + ); + } + + // Upload UV plane + if let Some(ref texture) = self.uv_texture { + self.queue.write_texture( + wgpu::TexelCopyTextureInfo { + texture, + mip_level: 0, + origin: wgpu::Origin3d::ZERO, + aspect: wgpu::TextureAspect::All, + }, + &frame.u_plane, // u_plane contains interleaved UV for NV12 + wgpu::TexelCopyBufferLayout { + offset: 0, + bytes_per_row: Some(frame.u_stride), + rows_per_image: Some(uv_height), + }, + wgpu::Extent3d { + width: uv_width, + height: uv_height, + depth_or_array_layers: 1, + }, + ); + } + + // Create texture views for ExternalTexture + let y_view = self.y_texture.as_ref().unwrap() + .create_view(&wgpu::TextureViewDescriptor::default()); + let uv_view = self.uv_texture.as_ref().unwrap() + .create_view(&wgpu::TextureViewDescriptor::default()); + + // BT.709 Limited Range YCbCr to RGB conversion matrix (4x4 column-major) + // This matrix converts from YCbCr (with Y in [16,235] and CbCr in [16,240]) + // to RGB [0,1]. The matrix includes the offset and scaling. + // Standard BT.709 matrix coefficients: + // R = 1.164*(Y-16) + 1.793*(Cr-128) + // G = 1.164*(Y-16) - 0.213*(Cb-128) - 0.533*(Cr-128) + // B = 1.164*(Y-16) + 2.112*(Cb-128) + let yuv_conversion_matrix: [f32; 16] = [ + 1.164, 1.164, 1.164, 0.0, // Column 0: Y coefficients + 0.0, -0.213, 2.112, 0.0, // Column 1: Cb coefficients + 1.793, -0.533, 0.0, 0.0, // Column 2: Cr coefficients + -0.874, 0.531, -1.086, 1.0, // Column 3: Offset (includes -16/255 and -128/255 adjustments) + ]; + + // Identity gamut conversion (no color space conversion needed) + let gamut_conversion_matrix: [f32; 9] = [ + 1.0, 0.0, 0.0, + 0.0, 1.0, 0.0, + 0.0, 0.0, 1.0, + ]; + + // Linear transfer function (video is already gamma-corrected) + let linear_transfer = wgpu::ExternalTextureTransferFunction { + a: 1.0, + b: 0.0, + g: 1.0, + k: 1.0, + }; + + // Identity transforms for texture coordinates + let identity_transform: [f32; 6] = [1.0, 0.0, 0.0, 0.0, 1.0, 0.0]; + + // Create ExternalTexture + let external_texture = self.device.create_external_texture( + &wgpu::ExternalTextureDescriptor { + label: Some("Video External Texture"), + width: frame.width, + height: frame.height, + format: wgpu::ExternalTextureFormat::Nv12, + yuv_conversion_matrix, + gamut_conversion_matrix, + src_transfer_function: linear_transfer.clone(), + dst_transfer_function: linear_transfer, + sample_transform: identity_transform, + load_transform: identity_transform, + }, + &[&y_view, &uv_view], + ); + + // Create bind group with external texture and sampler + if let Some(ref layout) = self.external_texture_bind_group_layout { + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("External Texture Bind Group"), + layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::ExternalTexture(&external_texture), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); + + self.external_texture_bind_group = Some(bind_group); + self.external_texture = Some(external_texture); + } + } + + /// Helper function to blit Metal textures using wgpu's hal layer + /// Returns true if the blit was successful + #[cfg(target_os = "macos")] + unsafe fn blit_metal_textures( + &self, + blit_encoder: *mut objc::runtime::Object, + y_src: *mut objc::runtime::Object, + uv_src: *mut objc::runtime::Object, + y_dst_wgpu: &wgpu::Texture, + uv_dst_wgpu: &wgpu::Texture, + y_width: u32, + y_height: u32, + uv_width: u32, + uv_height: u32, + ) -> bool { + use objc::{msg_send, sel, sel_impl}; + + // Define MTLOrigin and MTLSize structs for Metal API + #[repr(C)] + #[derive(Copy, Clone)] + struct MTLOrigin { x: u64, y: u64, z: u64 } + #[repr(C)] + #[derive(Copy, Clone)] + struct MTLSize { width: u64, height: u64, depth: u64 } + + let origin = MTLOrigin { x: 0, y: 0, z: 0 }; + + // wgpu 27 as_hal API: returns Option> + // IMPORTANT: as_hal holds a read lock - we must get one pointer and drop the result + // before getting the next, otherwise we get a recursive lock panic. + + // Get Y texture pointer and drop hal reference immediately + let y_dst: Option<*mut objc::runtime::Object> = { + let y_hal = y_dst_wgpu.as_hal::(); + y_hal.map(|y_hal_tex| { + let y_metal_tex = (*y_hal_tex).raw_handle(); + *(y_metal_tex as *const _ as *const *mut objc::runtime::Object) + }) + }; // y_hal dropped here, lock released + + // Get UV texture pointer (now safe - Y's lock is released) + let uv_dst: Option<*mut objc::runtime::Object> = { + let uv_hal = uv_dst_wgpu.as_hal::(); + uv_hal.map(|uv_hal_tex| { + let uv_metal_tex = (*uv_hal_tex).raw_handle(); + *(uv_metal_tex as *const _ as *const *mut objc::runtime::Object) + }) + }; // uv_hal dropped here + + if let (Some(y_dst), Some(uv_dst)) = (y_dst, uv_dst) { + + // Blit Y texture (GPU-to-GPU copy) + let y_size = MTLSize { width: y_width as u64, height: y_height as u64, depth: 1 }; + let _: () = msg_send![blit_encoder, + copyFromTexture: y_src + sourceSlice: 0u64 + sourceLevel: 0u64 + sourceOrigin: origin + sourceSize: y_size + toTexture: y_dst as *mut objc::runtime::Object + destinationSlice: 0u64 + destinationLevel: 0u64 + destinationOrigin: origin + ]; + + // Blit UV texture (GPU-to-GPU copy) + let uv_size = MTLSize { width: uv_width as u64, height: uv_height as u64, depth: 1 }; + let uv_origin = MTLOrigin { x: 0, y: 0, z: 0 }; + let _: () = msg_send![blit_encoder, + copyFromTexture: uv_src + sourceSlice: 0u64 + sourceLevel: 0u64 + sourceOrigin: uv_origin + sourceSize: uv_size + toTexture: uv_dst as *mut objc::runtime::Object + destinationSlice: 0u64 + destinationLevel: 0u64 + destinationOrigin: uv_origin + ]; + + log::trace!("GPU blit: Y {}x{}, UV {}x{}", y_width, y_height, uv_width, uv_height); + return true; + } + + log::debug!("Could not get Metal textures from wgpu for GPU blit"); + false + } + /// Render video frame to screen /// Automatically selects the correct pipeline based on current pixel format + /// Priority: External Texture (true zero-copy) > NV12 > YUV420P fn render_video(&self, encoder: &mut wgpu::CommandEncoder, view: &wgpu::TextureView) { - // Determine which pipeline and bind group to use based on format + // Priority 1: Use External Texture pipeline if available (hardware YUV->RGB conversion) + // This is the true zero-copy path with automatic color space conversion + if let (Some(ref pipeline), Some(ref bind_group)) = + (&self.external_texture_pipeline, &self.external_texture_bind_group) + { + let mut render_pass = encoder.begin_render_pass(&wgpu::RenderPassDescriptor { + label: Some("Video Pass (External Texture)"), + color_attachments: &[Some(wgpu::RenderPassColorAttachment { + view, + resolve_target: None, + ops: wgpu::Operations { + load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), + store: wgpu::StoreOp::Store, + }, + depth_slice: None, + })], + depth_stencil_attachment: None, + ..Default::default() + }); + + render_pass.set_pipeline(pipeline); + render_pass.set_bind_group(0, bind_group, &[]); + render_pass.draw(0..6, 0..1); + return; + } + + // Priority 2: Fallback to format-specific pipelines (manual YUV->RGB in shader) let (pipeline, bind_group) = match self.current_format { PixelFormat::NV12 => { if let Some(ref bg) = self.nv12_bind_group { @@ -2440,20 +3174,78 @@ fn render_stats_panel(ctx: &egui::Context, stats: &crate::media::StreamStats, po .color(latency_color) ); - // Input latency (event creation to transmission) - if stats.input_latency_ms > 0.0 { - let input_color = if stats.input_latency_ms < 2.0 { + // Network RTT (round-trip time from ICE) + if stats.rtt_ms > 0.0 { + let rtt_color = if stats.rtt_ms < 30.0 { + Color32::GREEN + } else if stats.rtt_ms < 60.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!("RTT: {:.0} ms", stats.rtt_ms)) + .font(FontId::monospace(11.0)) + .color(rtt_color) + ); + } else { + ui.label( + RichText::new("RTT: N/A") + .font(FontId::monospace(11.0)) + .color(Color32::GRAY) + ); + } + + // Estimated end-to-end latency (motion-to-photon) + if stats.estimated_e2e_ms > 0.0 { + let e2e_color = if stats.estimated_e2e_ms < 80.0 { Color32::GREEN - } else if stats.input_latency_ms < 5.0 { + } else if stats.estimated_e2e_ms < 150.0 { Color32::YELLOW } else { Color32::RED }; ui.label( - RichText::new(format!("Input: {:.1} ms", stats.input_latency_ms)) + RichText::new(format!("E2E: ~{:.0} ms", stats.estimated_e2e_ms)) .font(FontId::monospace(11.0)) - .color(input_color) + .color(e2e_color) + ); + } + + // Input rate and client-side latency + if stats.input_rate > 0.0 || stats.input_latency_ms > 0.0 { + let rate_str = if stats.input_rate > 0.0 { + format!("{:.0}/s", stats.input_rate) + } else { + "0/s".to_string() + }; + let latency_str = if stats.input_latency_ms > 0.001 { + format!("{:.2}ms", stats.input_latency_ms) + } else { + "<0.01ms".to_string() + }; + ui.label( + RichText::new(format!("Input: {} ({})", rate_str, latency_str)) + .font(FontId::monospace(10.0)) + .color(Color32::GRAY) + ); + } + + // Frame delivery latency (RTP to decode) + if stats.frame_delivery_ms > 0.0 { + let delivery_color = if stats.frame_delivery_ms < 10.0 { + Color32::GREEN + } else if stats.frame_delivery_ms < 20.0 { + Color32::YELLOW + } else { + Color32::RED + }; + ui.label( + RichText::new(format!("Frame delivery: {:.1} ms", stats.frame_delivery_ms)) + .font(FontId::monospace(10.0)) + .color(delivery_color) ); } diff --git a/opennow-streamer/src/gui/screens/mod.rs b/opennow-streamer/src/gui/screens/mod.rs index 6b6a90c..00fe071 100644 --- a/opennow-streamer/src/gui/screens/mod.rs +++ b/opennow-streamer/src/gui/screens/mod.rs @@ -316,14 +316,21 @@ pub fn render_settings_modal( }); ui.add_space(24.0); - - // Close button centered - ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { - if ui.button(egui::RichText::new("Close").size(16.0)).clicked() { - actions.push(UiAction::ToggleSettingsModal); - } + + // Buttons row + ui.horizontal(|ui| { + // Reset button on the left + if ui.button(egui::RichText::new("Reset to Defaults").size(14.0).color(egui::Color32::from_rgb(200, 80, 80))).clicked() { + actions.push(UiAction::ResetSettings); + } + + ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| { + if ui.button(egui::RichText::new("Close").size(16.0)).clicked() { + actions.push(UiAction::ToggleSettingsModal); + } + }); }); - + ui.add_space(8.0); }); }); diff --git a/opennow-streamer/src/gui/shaders.rs b/opennow-streamer/src/gui/shaders.rs index 87ff0bf..0fca44f 100644 --- a/opennow-streamer/src/gui/shaders.rs +++ b/opennow-streamer/src/gui/shaders.rs @@ -138,3 +138,54 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4 { return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); } "#; + +/// WGSL shader for ExternalTexture (wgpu 28+ zero-copy video) +/// Uses texture_external which provides hardware-accelerated YUV->RGB conversion +/// This is the fastest path - no manual color conversion needed +pub const EXTERNAL_TEXTURE_SHADER: &str = r#" +struct VertexOutput { + @builtin(position) position: vec4, + @location(0) tex_coord: vec2, +}; + +@vertex +fn vs_main(@builtin(vertex_index) vertex_index: u32) -> VertexOutput { + var positions = array, 6>( + vec2(-1.0, -1.0), + vec2( 1.0, -1.0), + vec2(-1.0, 1.0), + vec2(-1.0, 1.0), + vec2( 1.0, -1.0), + vec2( 1.0, 1.0), + ); + + var tex_coords = array, 6>( + vec2(0.0, 1.0), + vec2(1.0, 1.0), + vec2(0.0, 0.0), + vec2(0.0, 0.0), + vec2(1.0, 1.0), + vec2(1.0, 0.0), + ); + + var output: VertexOutput; + output.position = vec4(positions[vertex_index], 0.0, 1.0); + output.tex_coord = tex_coords[vertex_index]; + return output; +} + +// External texture - hardware-accelerated YUV->RGB conversion +@group(0) @binding(0) +var video_texture: texture_external; + +// Sampler for external texture +@group(0) @binding(1) +var video_sampler: sampler; + +@fragment +fn fs_main(input: VertexOutput) -> @location(0) vec4 { + // textureSampleBaseClampToEdge automatically converts YUV to RGB + // using the color space information from the ExternalTexture descriptor + return textureSampleBaseClampToEdge(video_texture, video_sampler, input.tex_coord); +} +"#; diff --git a/opennow-streamer/src/gui/stats_panel.rs b/opennow-streamer/src/gui/stats_panel.rs index ebe2809..aa1542f 100644 --- a/opennow-streamer/src/gui/stats_panel.rs +++ b/opennow-streamer/src/gui/stats_panel.rs @@ -70,25 +70,31 @@ impl StatsPanel { ); } - // Latency and packet loss - let latency_color = if stats.latency_ms < 30.0 { - Color32::GREEN - } else if stats.latency_ms < 60.0 { - Color32::YELLOW - } else { - Color32::RED - }; + // Network RTT (round-trip time) + if stats.rtt_ms > 0.0 { + let rtt_color = if stats.rtt_ms < 30.0 { + Color32::GREEN + } else if stats.rtt_ms < 60.0 { + Color32::YELLOW + } else { + Color32::RED + }; - ui.label( - RichText::new(format!( - "Latency: {:.0} ms", - stats.latency_ms - )) - .font(FontId::monospace(11.0)) - .color(latency_color) - ); + ui.label( + RichText::new(format!("RTT: {:.0}ms", stats.rtt_ms)) + .font(FontId::monospace(11.0)) + .color(rtt_color) + ); + } else { + ui.label( + RichText::new("RTT: N/A") + .font(FontId::monospace(11.0)) + .color(Color32::GRAY) + ); + } - if stats.packet_loss > 0.0 { + // Packet loss + if stats.packet_loss > 0.1 { let loss_color = if stats.packet_loss < 1.0 { Color32::YELLOW } else { @@ -97,7 +103,7 @@ impl StatsPanel { ui.label( RichText::new(format!( - "Packet Loss: {:.1}%", + "Packet Loss: {:.2}%", stats.packet_loss )) .font(FontId::monospace(11.0)) @@ -105,11 +111,11 @@ impl StatsPanel { ); } - // Decode and render times + // Decode, render, and input latency if stats.decode_time_ms > 0.0 || stats.render_time_ms > 0.0 { ui.label( RichText::new(format!( - "Decode: {:.1} ms • Render: {:.1} ms", + "Decode: {:.1}ms • Render: {:.1}ms", stats.decode_time_ms, stats.render_time_ms )) @@ -118,6 +124,26 @@ impl StatsPanel { ); } + // Input latency (client-side only) + if stats.input_latency_ms > 0.0 { + let input_color = if stats.input_latency_ms < 5.0 { + Color32::GREEN + } else if stats.input_latency_ms < 10.0 { + Color32::YELLOW + } else { + Color32::RED + }; + + ui.label( + RichText::new(format!( + "Input: {:.1}ms", + stats.input_latency_ms + )) + .font(FontId::monospace(10.0)) + .color(input_color) + ); + } + // Frame stats if stats.frames_received > 0 { ui.label( diff --git a/opennow-streamer/src/input/macos.rs b/opennow-streamer/src/input/macos.rs index 11003fd..3326301 100644 --- a/opennow-streamer/src/input/macos.rs +++ b/opennow-streamer/src/input/macos.rs @@ -2,7 +2,12 @@ //! //! Provides hardware-level mouse input using Core Graphics event taps. //! Captures mouse deltas directly for responsive input without OS acceleration effects. -//! Events are coalesced (batched) every 4ms like the official GFN client. +//! Events are coalesced (batched) every 2ms like the official GFN client. +//! +//! Key optimizations matching official GFN client: +//! - Lock-free event accumulation using atomics +//! - Periodic flush timer to prevent event stalls +//! - Local cursor tracking for instant visual feedback use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, AtomicPtr, Ordering}; use std::ffi::c_void; @@ -13,6 +18,10 @@ use parking_lot::Mutex; use crate::webrtc::InputEvent; use super::{get_timestamp_us, session_elapsed_us, MOUSE_COALESCE_INTERVAL_US}; +/// Maximum time between mouse flushes (microseconds) +/// Even if no movement, flush periodically to prevent stale events +const MAX_FLUSH_INTERVAL_US: u64 = 8_000; // 8ms = 125Hz minimum + // Core Graphics bindings #[link(name = "CoreGraphics", kind = "framework")] extern "C" { @@ -153,14 +162,18 @@ static LOCAL_CURSOR_Y: AtomicI32 = AtomicI32::new(540); static LOCAL_CURSOR_WIDTH: AtomicI32 = AtomicI32::new(1920); static LOCAL_CURSOR_HEIGHT: AtomicI32 = AtomicI32::new(1080); -// Event sender +// Event sender - use Mutex but minimize lock time static EVENT_SENDER: Mutex>> = Mutex::new(None); // Run loop reference for stopping (use AtomicPtr for thread-safety with raw pointers) static RUN_LOOP: AtomicPtr = AtomicPtr::new(std::ptr::null_mut()); static EVENT_TAP: AtomicPtr = AtomicPtr::new(std::ptr::null_mut()); +// Flush timer state +static FLUSH_TIMER_ACTIVE: AtomicBool = AtomicBool::new(false); + /// Flush coalesced mouse events +/// Uses try_lock to avoid blocking the event tap callback #[inline] fn flush_coalesced_events() { let dx = COALESCE_DX.swap(0, Ordering::AcqRel); @@ -171,13 +184,33 @@ fn flush_coalesced_events() { let now_us = session_elapsed_us(); COALESCE_LAST_SEND_US.store(now_us, Ordering::Release); - let guard = EVENT_SENDER.lock(); - if let Some(ref sender) = *guard { - let _ = sender.try_send(InputEvent::MouseMove { - dx: dx as i16, - dy: dy as i16, - timestamp_us, - }); + // Log first few flushes to verify input flow + static FLUSH_LOG_COUNT: AtomicU64 = AtomicU64::new(0); + let count = FLUSH_LOG_COUNT.fetch_add(1, Ordering::Relaxed); + if count < 10 { + info!("Mouse flush #{}: dx={}, dy={}", count, dx, dy); + } + + // Use try_lock to avoid blocking - if locked, events stay accumulated for next flush + if let Some(guard) = EVENT_SENDER.try_lock() { + if let Some(ref sender) = *guard { + if sender.try_send(InputEvent::MouseMove { + dx: dx as i16, + dy: dy as i16, + timestamp_us, + }).is_err() { + warn!("Mouse event channel full!"); + } + } else if count < 5 { + warn!("EVENT_SENDER is None - raw input sender not configured!"); + } + } else { + // Lock contention - put deltas back for next flush attempt + COALESCE_DX.fetch_add(dx, Ordering::Relaxed); + COALESCE_DY.fetch_add(dy, Ordering::Relaxed); + if count < 5 { + debug!("Lock contention, deferring mouse flush"); + } } } } @@ -250,15 +283,18 @@ extern "C" fn event_tap_callback( let delta = CGEventGetIntegerValueField(event, CGEventField::ScrollWheelEventDeltaAxis1) as i16; if delta != 0 { let timestamp_us = get_timestamp_us(); - let guard = EVENT_SENDER.lock(); - if let Some(ref sender) = *guard { - // macOS scroll is inverted compared to Windows, and uses different scale - // Multiply by 120 to match Windows WHEEL_DELTA - let _ = sender.try_send(InputEvent::MouseWheel { - delta: delta * 120, - timestamp_us, - }); + // Use try_lock to avoid blocking the event tap callback + if let Some(guard) = EVENT_SENDER.try_lock() { + if let Some(ref sender) = *guard { + // macOS scroll is inverted compared to Windows, and uses different scale + // Multiply by 120 to match Windows WHEEL_DELTA + let _ = sender.try_send(InputEvent::MouseWheel { + delta: delta * 120, + timestamp_us, + }); + } } + // Note: scroll events dropped if lock contention, acceptable for wheel } } _ => {} @@ -268,10 +304,41 @@ extern "C" fn event_tap_callback( event } +/// Start the periodic flush timer thread +/// This ensures mouse events are sent even when there's no new input (prevents stalls) +fn start_flush_timer() { + if FLUSH_TIMER_ACTIVE.swap(true, Ordering::SeqCst) { + return; // Already running + } + + std::thread::spawn(|| { + info!("Mouse flush timer started ({}us interval)", MAX_FLUSH_INTERVAL_US); + + while FLUSH_TIMER_ACTIVE.load(Ordering::SeqCst) && RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + // Sleep for flush interval + std::thread::sleep(std::time::Duration::from_micros(MAX_FLUSH_INTERVAL_US)); + + if RAW_INPUT_ACTIVE.load(Ordering::SeqCst) { + // Check if we should flush based on time since last send + let now_us = session_elapsed_us(); + let last_us = COALESCE_LAST_SEND_US.load(Ordering::Acquire); + + if now_us.saturating_sub(last_us) >= MOUSE_COALESCE_INTERVAL_US { + flush_coalesced_events(); + } + } + } + + FLUSH_TIMER_ACTIVE.store(false, Ordering::SeqCst); + debug!("Mouse flush timer stopped"); + }); +} + /// Start raw input capture pub fn start_raw_input() -> Result<(), String> { if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + start_flush_timer(); // Ensure timer is running info!("Raw input resumed"); return Ok(()); } @@ -325,6 +392,9 @@ pub fn start_raw_input() -> Result<(), String> { RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); info!("Raw input started - capturing mouse events via CGEventTap"); + // Start the periodic flush timer + start_flush_timer(); + // Run the loop (blocks until stopped) CFRunLoopRun(); @@ -365,6 +435,7 @@ pub fn resume_raw_input() { ACCUMULATED_DX.store(0, Ordering::SeqCst); ACCUMULATED_DY.store(0, Ordering::SeqCst); RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); + start_flush_timer(); // Ensure timer is running debug!("Raw input resumed"); } } @@ -373,6 +444,9 @@ pub fn resume_raw_input() { pub fn stop_raw_input() { RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); + // Stop the flush timer + FLUSH_TIMER_ACTIVE.store(false, Ordering::SeqCst); + // Stop the run loop let run_loop = RUN_LOOP.swap(std::ptr::null_mut(), Ordering::AcqRel); if !run_loop.is_null() { diff --git a/opennow-streamer/src/input/mod.rs b/opennow-streamer/src/input/mod.rs index 38acee5..a1a853b 100644 --- a/opennow-streamer/src/input/mod.rs +++ b/opennow-streamer/src/input/mod.rs @@ -171,8 +171,8 @@ use winit::event::{ElementState, MouseButton}; use crate::webrtc::{InputEvent, InputEncoder}; /// Mouse event coalescing interval in microseconds -/// Official client uses 4-16ms depending on browser, we use 4ms for lowest latency -pub const MOUSE_COALESCE_INTERVAL_US: u64 = 4_000; // 4ms = 250Hz effective rate +/// Official client uses 4-16ms depending on browser, we use 2ms for lowest latency +pub const MOUSE_COALESCE_INTERVAL_US: u64 = 2_000; // 2ms = 500Hz effective rate /// Maximum input queue depth before throttling /// Official client maintains 4-8 events ahead of consumption diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index 089cf58..9286009 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -1,13 +1,15 @@ //! Audio Decoder and Player //! //! Decode Opus audio using FFmpeg and play through cpal. +//! Optimized for low-latency streaming with jitter buffer. use anyhow::{Result, Context, anyhow}; -use log::{info, error, debug}; +use log::{info, error, debug, warn}; use std::sync::Arc; use std::sync::mpsc; use std::thread; use parking_lot::Mutex; +use std::sync::atomic::{AtomicUsize, Ordering}; extern crate ffmpeg_next as ffmpeg; @@ -15,20 +17,24 @@ use ffmpeg::codec::{decoder, context::Context as CodecContext}; use ffmpeg::Packet; /// Audio decoder using FFmpeg for Opus +/// Non-blocking: decoded samples are sent to a channel pub struct AudioDecoder { cmd_tx: mpsc::Sender, - frame_rx: mpsc::Receiver>, + /// For async decoding - samples come out here + sample_rx: Option>>, sample_rate: u32, channels: u32, } enum AudioCommand { - Decode(Vec), + /// Decode audio and send result to channel + DecodeAsync(Vec), Stop, } impl AudioDecoder { /// Create a new Opus audio decoder using FFmpeg + /// Returns decoder and a receiver for decoded samples (for async operation) pub fn new(sample_rate: u32, channels: u32) -> Result { info!("Creating Opus audio decoder: {}Hz, {} channels", sample_rate, channels); @@ -37,7 +43,8 @@ impl AudioDecoder { // Create channels for thread communication let (cmd_tx, cmd_rx) = mpsc::channel::(); - let (frame_tx, frame_rx) = mpsc::channel::>(); + // Async channel for decoded samples - large buffer to prevent blocking + let (sample_tx, sample_rx) = tokio::sync::mpsc::channel::>(512); // Spawn decoder thread (FFmpeg types are not Send) let sample_rate_clone = sample_rate; @@ -55,9 +62,6 @@ impl AudioDecoder { let ctx = CodecContext::new_with_codec(codec); - // Set parameters for Opus - // Note: FFmpeg Opus decoder auto-detects most parameters from the bitstream - let mut decoder = match ctx.decoder().audio() { Ok(d) => d, Err(e) => { @@ -66,13 +70,16 @@ impl AudioDecoder { } }; - info!("Opus audio decoder initialized"); + info!("Opus audio decoder initialized (async mode)"); while let Ok(cmd) = cmd_rx.recv() { match cmd { - AudioCommand::Decode(data) => { + AudioCommand::DecodeAsync(data) => { let samples = Self::decode_opus_packet(&mut decoder, &data, sample_rate_clone, channels_clone); - let _ = frame_tx.send(samples); + if !samples.is_empty() { + // Non-blocking send - drop samples if channel is full + let _ = sample_tx.try_send(samples); + } } AudioCommand::Stop => break, } @@ -83,12 +90,17 @@ impl AudioDecoder { Ok(Self { cmd_tx, - frame_rx, + sample_rx: Some(sample_rx), sample_rate, channels, }) } + /// Take the sample receiver (for passing to audio player thread) + pub fn take_sample_receiver(&mut self) -> Option>> { + self.sample_rx.take() + } + /// Decode an Opus packet from RTP payload fn decode_opus_packet( decoder: &mut decoder::Audio, @@ -208,15 +220,10 @@ impl AudioDecoder { output } - /// Decode an Opus packet (sends to decoder thread) - pub fn decode(&mut self, data: &[u8]) -> Result> { - self.cmd_tx.send(AudioCommand::Decode(data.to_vec())) - .map_err(|_| anyhow!("Audio decoder thread closed"))?; - - match self.frame_rx.recv() { - Ok(samples) => Ok(samples), - Err(_) => Err(anyhow!("Audio decoder thread closed")), - } + /// Decode an Opus packet asynchronously (non-blocking, fire-and-forget) + /// Decoded samples are sent to the sample_rx channel + pub fn decode_async(&self, data: &[u8]) { + let _ = self.cmd_tx.send(AudioCommand::DecodeAsync(data.to_vec())); } /// Get sample rate @@ -236,68 +243,84 @@ impl Drop for AudioDecoder { } } -/// Audio player using cpal +/// Audio player using cpal with optimized lock-free-ish ring buffer pub struct AudioPlayer { sample_rate: u32, channels: u32, - buffer: Arc>, + buffer: Arc, _stream: Option, } -struct AudioBuffer { - samples: Vec, - read_pos: usize, - write_pos: usize, +/// Lock-free ring buffer for audio samples +/// Uses atomic indices for read/write positions to minimize lock contention +pub struct AudioRingBuffer { + samples: Mutex>, + read_pos: AtomicUsize, + write_pos: AtomicUsize, capacity: usize, - total_written: u64, - total_read: u64, } -impl AudioBuffer { +impl AudioRingBuffer { fn new(capacity: usize) -> Self { Self { - samples: vec![0i16; capacity], - read_pos: 0, - write_pos: 0, + samples: Mutex::new(vec![0i16; capacity]), + read_pos: AtomicUsize::new(0), + write_pos: AtomicUsize::new(0), capacity, - total_written: 0, - total_read: 0, } } fn available(&self) -> usize { - if self.write_pos >= self.read_pos { - self.write_pos - self.read_pos + let write = self.write_pos.load(Ordering::Acquire); + let read = self.read_pos.load(Ordering::Acquire); + if write >= read { + write - read } else { - self.capacity - self.read_pos + self.write_pos + self.capacity - read + write } } - fn write(&mut self, data: &[i16]) { + fn free_space(&self) -> usize { + self.capacity - 1 - self.available() + } + + /// Write samples to buffer (called from decoder thread) + fn write(&self, data: &[i16]) { + let mut samples = self.samples.lock(); + let mut write_pos = self.write_pos.load(Ordering::Acquire); + let read_pos = self.read_pos.load(Ordering::Acquire); + for &sample in data { - let next_pos = (self.write_pos + 1) % self.capacity; - // Don't overwrite unread data (drop samples if buffer is full) - if next_pos != self.read_pos { - self.samples[self.write_pos] = sample; - self.write_pos = next_pos; - self.total_written += 1; + let next_pos = (write_pos + 1) % self.capacity; + // Don't overwrite unread data + if next_pos != read_pos { + samples[write_pos] = sample; + write_pos = next_pos; + } else { + // Buffer full - drop remaining samples + break; } } + + self.write_pos.store(write_pos, Ordering::Release); } - fn read(&mut self, out: &mut [i16]) -> usize { - let mut count = 0; + /// Read samples from buffer (called from audio callback - must be fast!) + fn read(&self, out: &mut [i16]) { + let mut samples = self.samples.lock(); + let write_pos = self.write_pos.load(Ordering::Acquire); + let mut read_pos = self.read_pos.load(Ordering::Acquire); + for sample in out.iter_mut() { - if self.read_pos == self.write_pos { + if read_pos == write_pos { *sample = 0; // Underrun - output silence } else { - *sample = self.samples[self.read_pos]; - self.read_pos = (self.read_pos + 1) % self.capacity; - count += 1; - self.total_read += 1; + *sample = samples[read_pos]; + read_pos = (read_pos + 1) % self.capacity; } } - count + + self.read_pos.store(read_pos, Ordering::Release); } } @@ -393,28 +416,32 @@ impl AudioPlayer { info!("Using audio config: {}Hz, {} channels, format {:?}", actual_rate.0, actual_channels, sample_format); - // Buffer for ~20ms of audio (ultra-low latency for gaming) - // 48000Hz * 2ch * 0.02s = 1920 samples - // Note: If audio crackles, increase to 30-40ms - let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) * 20 / 1000; - let buffer = Arc::new(Mutex::new(AudioBuffer::new(buffer_size))); + // Buffer for ~150ms of audio (handles network jitter) + // 48000Hz * 2ch * 0.15s = 14400 samples + // Larger buffer prevents underruns from network jitter + let buffer_size = (actual_rate.0 as usize) * (actual_channels as usize) * 150 / 1000; + let buffer = Arc::new(AudioRingBuffer::new(buffer_size)); + + info!("Audio buffer size: {} samples (~{}ms)", buffer_size, + buffer_size * 1000 / (actual_rate.0 as usize * actual_channels as usize)); let config = supported_range.with_sample_rate(actual_rate).into(); let buffer_clone = buffer.clone(); // Build stream based on sample format + // The callback reads from the ring buffer - optimized for low latency let stream = match sample_format { SampleFormat::F32 => { + let buffer_f32 = buffer_clone.clone(); device.build_output_stream( &config, move |data: &mut [f32], _| { - let mut buf = buffer_clone.lock(); - // Read i16 samples and convert to f32 - for sample in data.iter_mut() { - let mut i16_sample = [0i16; 1]; - buf.read(&mut i16_sample); - *sample = i16_sample[0] as f32 / 32768.0; + // Read i16 samples in bulk and convert to f32 + let mut i16_buf = vec![0i16; data.len()]; + buffer_f32.read(&mut i16_buf); + for (out, &sample) in data.iter_mut().zip(i16_buf.iter()) { + *out = sample as f32 / 32768.0; } }, |err| { @@ -424,11 +451,11 @@ impl AudioPlayer { ).context("Failed to create f32 audio stream")? } SampleFormat::I16 => { + let buffer_i16 = buffer_clone.clone(); device.build_output_stream( &config, move |data: &mut [i16], _| { - let mut buf = buffer_clone.lock(); - buf.read(data); + buffer_i16.read(data); }, |err| { error!("Audio stream error: {}", err); @@ -438,14 +465,14 @@ impl AudioPlayer { } _ => { // Fallback: try f32 anyway + let buffer_fallback = buffer_clone.clone(); device.build_output_stream( &config, move |data: &mut [f32], _| { - let mut buf = buffer_clone.lock(); - for sample in data.iter_mut() { - let mut i16_sample = [0i16; 1]; - buf.read(&mut i16_sample); - *sample = i16_sample[0] as f32 / 32768.0; + let mut i16_buf = vec![0i16; data.len()]; + buffer_fallback.read(&mut i16_buf); + for (out, &sample) in data.iter_mut().zip(i16_buf.iter()) { + *out = sample as f32 / 32768.0; } }, |err| { @@ -470,14 +497,12 @@ impl AudioPlayer { /// Push audio samples to the player pub fn push_samples(&self, samples: &[i16]) { - let mut buffer = self.buffer.lock(); - buffer.write(samples); + self.buffer.write(samples); } - /// Get buffer status (for debugging) - pub fn buffer_status(&self) -> (usize, u64, u64) { - let buffer = self.buffer.lock(); - (buffer.available(), buffer.total_written, buffer.total_read) + /// Get buffer fill level + pub fn buffer_available(&self) -> usize { + self.buffer.available() } /// Get sample rate diff --git a/opennow-streamer/src/media/d3d11.rs b/opennow-streamer/src/media/d3d11.rs new file mode 100644 index 0000000..1c0040d --- /dev/null +++ b/opennow-streamer/src/media/d3d11.rs @@ -0,0 +1,321 @@ +//! D3D11 Zero-Copy Video Support for Windows +//! +//! This module provides zero-copy video rendering on Windows by keeping +//! decoded frames on GPU as D3D11 textures and sharing them with wgpu's DX12 backend. +//! +//! Flow: +//! 1. FFmpeg D3D11VA decodes to ID3D11Texture2D (GPU VRAM) +//! 2. We extract the texture from FFmpeg frame +//! 3. Create a DXGI shared handle (NT handle for cross-API sharing) +//! 4. Import into wgpu's DX12 backend via the hal layer +//! +//! This eliminates the expensive GPU->CPU->GPU round-trip that kills latency. + +use std::sync::Arc; +use log::{info, warn, debug}; +use anyhow::{Result, anyhow}; + +use windows::core::Interface; +use windows::Win32::Foundation::HANDLE; +use windows::Win32::Graphics::Direct3D11::{ + ID3D11Device, ID3D11DeviceContext, ID3D11Texture2D, + D3D11_BIND_SHADER_RESOURCE, D3D11_CPU_ACCESS_READ, + D3D11_MAPPED_SUBRESOURCE, D3D11_MAP_READ, D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + D3D11_TEXTURE2D_DESC, D3D11_USAGE_STAGING, +}; +use windows::Win32::Graphics::Dxgi::{ + IDXGIResource1, DXGI_SHARED_RESOURCE_READ, +}; +use windows::Win32::Graphics::Dxgi::Common::DXGI_FORMAT_NV12; + +/// Wrapper for a D3D11 texture from FFmpeg hardware decoder +/// Holds the texture alive and provides access for wgpu import +pub struct D3D11TextureWrapper { + /// The D3D11 texture (NV12 format) + texture: ID3D11Texture2D, + /// Texture array index (for texture arrays used by some decoders) + array_index: u32, + /// Shared NT handle for cross-API sharing (DX11 -> DX12) + shared_handle: Option, + /// Texture dimensions + pub width: u32, + pub height: u32, +} + +// Safety: D3D11 COM objects are thread-safe (they use internal ref counting) +unsafe impl Send for D3D11TextureWrapper {} +unsafe impl Sync for D3D11TextureWrapper {} + +impl std::fmt::Debug for D3D11TextureWrapper { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("D3D11TextureWrapper") + .field("width", &self.width) + .field("height", &self.height) + .field("array_index", &self.array_index) + .field("has_shared_handle", &self.shared_handle.is_some()) + .finish() + } +} + +impl D3D11TextureWrapper { + /// Create a new wrapper from FFmpeg's D3D11VA frame data + /// + /// # Safety + /// The texture pointer must be valid and point to an ID3D11Texture2D + pub unsafe fn from_ffmpeg_frame( + texture_ptr: *mut std::ffi::c_void, + array_index: i32, + ) -> Option { + if texture_ptr.is_null() { + warn!("D3D11 texture pointer is null"); + return None; + } + + // Cast to ID3D11Texture2D + // FFmpeg stores the raw COM pointer in frame->data[0] + let texture: ID3D11Texture2D = std::mem::transmute_copy(&texture_ptr); + + // Get texture description + let mut desc = D3D11_TEXTURE2D_DESC::default(); + texture.GetDesc(&mut desc); + + debug!( + "D3D11 texture: {}x{}, format={:?}, array_size={}, bind_flags={:?}", + desc.Width, desc.Height, desc.Format, desc.ArraySize, desc.BindFlags + ); + + // Verify it's NV12 format (expected from hardware decoders) + if desc.Format != DXGI_FORMAT_NV12 { + warn!("D3D11 texture format is {:?}, expected NV12", desc.Format); + // Still proceed - might work with other formats + } + + Some(Self { + texture, + array_index: array_index as u32, + shared_handle: None, + width: desc.Width, + height: desc.Height, + }) + } + + /// Get or create a shared NT handle for this texture + /// This handle can be used to import the texture into DX12 + pub fn get_shared_handle(&mut self) -> Result { + if let Some(handle) = self.shared_handle { + return Ok(handle); + } + + unsafe { + // Query IDXGIResource1 interface for shared handle creation + let dxgi_resource: IDXGIResource1 = self.texture.cast() + .map_err(|e| anyhow!("Failed to cast to IDXGIResource1: {:?}", e))?; + + // Create shared NT handle + let mut handle = HANDLE::default(); + dxgi_resource.CreateSharedHandle( + None, // No security attributes + DXGI_SHARED_RESOURCE_READ, + None, // No name + &mut handle, + ).map_err(|e| anyhow!("Failed to create shared handle: {:?}", e))?; + + self.shared_handle = Some(handle); + Ok(handle) + } + } + + /// Get the raw D3D11 texture + pub fn texture(&self) -> &ID3D11Texture2D { + &self.texture + } + + /// Get the texture array index + pub fn array_index(&self) -> u32 { + self.array_index + } + + /// Lock the texture and copy Y and UV planes to CPU memory + /// This is the fallback path when zero-copy import fails + pub fn lock_and_get_planes(&self) -> Result { + unsafe { + // Get the device from the texture itself + let mut device: Option = None; + self.texture.GetDevice(&mut device); + let device = device.ok_or_else(|| anyhow!("Failed to get D3D11 device from texture"))?; + + // Get the device context + let mut context: Option = None; + device.GetImmediateContext(&mut context); + let context = context.ok_or_else(|| anyhow!("Failed to get device context"))?; + + // Create a staging texture for CPU access + let mut desc = D3D11_TEXTURE2D_DESC::default(); + self.texture.GetDesc(&mut desc); + + let staging_desc = D3D11_TEXTURE2D_DESC { + Width: desc.Width, + Height: desc.Height, + MipLevels: 1, + ArraySize: 1, + Format: desc.Format, + SampleDesc: desc.SampleDesc, + Usage: D3D11_USAGE_STAGING, + BindFlags: Default::default(), + CPUAccessFlags: D3D11_CPU_ACCESS_READ, + MiscFlags: Default::default(), + }; + + let mut staging_texture: Option = None; + device.CreateTexture2D(&staging_desc, None, Some(&mut staging_texture)) + .map_err(|e| anyhow!("Failed to create staging texture: {:?}", e))?; + let staging_texture = staging_texture.unwrap(); + + // Copy from source texture (specific array slice) to staging + context.CopySubresourceRegion( + &staging_texture, + 0, // Destination subresource + 0, 0, 0, // Destination x, y, z + &self.texture, + self.array_index, // Source subresource (array index) + None, // Copy entire resource + ); + + // Map the staging texture + let mut mapped = D3D11_MAPPED_SUBRESOURCE::default(); + context.Map(&staging_texture, 0, D3D11_MAP_READ, 0, Some(&mut mapped)) + .map_err(|e| anyhow!("Failed to map staging texture: {:?}", e))?; + + // NV12 layout: Y plane (full height) followed by UV plane (half height) + let y_height = desc.Height; + let uv_height = desc.Height / 2; + let row_pitch = mapped.RowPitch; + + // Copy Y plane + let y_size = (row_pitch * y_height) as usize; + let y_data = std::slice::from_raw_parts(mapped.pData as *const u8, y_size); + let y_plane = y_data.to_vec(); + + // Copy UV plane (starts after Y plane) + let uv_offset = y_size; + let uv_size = (row_pitch * uv_height) as usize; + let uv_data = std::slice::from_raw_parts( + (mapped.pData as *const u8).add(uv_offset), + uv_size, + ); + let uv_plane = uv_data.to_vec(); + + // Unmap + context.Unmap(&staging_texture, 0); + + Ok(LockedPlanes { + y_plane, + uv_plane, + y_stride: row_pitch, + uv_stride: row_pitch, + width: desc.Width, + height: desc.Height, + }) + } + } +} + +impl Drop for D3D11TextureWrapper { + fn drop(&mut self) { + // Close the shared handle if we created one + if let Some(handle) = self.shared_handle.take() { + unsafe { + let _ = windows::Win32::Foundation::CloseHandle(handle); + } + } + // COM objects (texture) are automatically released when dropped + } +} + +/// Locked plane data from D3D11 texture +pub struct LockedPlanes { + pub y_plane: Vec, + pub uv_plane: Vec, + pub y_stride: u32, + pub uv_stride: u32, + pub width: u32, + pub height: u32, +} + +/// Manager for D3D11 zero-copy textures +/// Handles device creation and texture import into wgpu +pub struct D3D11ZeroCopyManager { + /// D3D11 device (shared with FFmpeg) + device: ID3D11Device, + /// Whether zero-copy is enabled + enabled: bool, +} + +impl D3D11ZeroCopyManager { + /// Create a new manager with the given D3D11 device + pub fn new(device: ID3D11Device) -> Self { + info!("D3D11 zero-copy manager created"); + Self { + device, + enabled: true, + } + } + + /// Get the D3D11 device + pub fn device(&self) -> &ID3D11Device { + &self.device + } + + /// Check if zero-copy is enabled + pub fn is_enabled(&self) -> bool { + self.enabled + } + + /// Disable zero-copy (fallback to CPU path) + pub fn disable(&mut self) { + warn!("D3D11 zero-copy disabled, falling back to CPU path"); + self.enabled = false; + } +} + +/// Extract D3D11 texture from FFmpeg frame data pointers +/// +/// FFmpeg D3D11VA frame layout: +/// - data[0] = ID3D11Texture2D* +/// - data[1] = texture array index (as intptr_t) +/// +/// # Safety +/// The data pointers must be from a valid D3D11VA decoded frame +pub unsafe fn extract_d3d11_texture_from_frame( + data0: *mut u8, + data1: *mut u8, +) -> Option { + if data0.is_null() { + return None; + } + + let texture_ptr = data0 as *mut std::ffi::c_void; + let array_index = data1 as isize as i32; + + D3D11TextureWrapper::from_ffmpeg_frame(texture_ptr, array_index) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_locked_planes_layout() { + // Test NV12 plane calculations + let width = 1920u32; + let height = 1080u32; + + // Y plane: full resolution + let y_size = width * height; + assert_eq!(y_size, 2073600); + + // UV plane: half height, same width (interleaved) + let uv_size = width * (height / 2); + assert_eq!(uv_size, 1036800); + } +} diff --git a/opennow-streamer/src/media/mod.rs b/opennow-streamer/src/media/mod.rs index 6ca11fd..981bc86 100644 --- a/opennow-streamer/src/media/mod.rs +++ b/opennow-streamer/src/media/mod.rs @@ -9,12 +9,18 @@ mod rtp; #[cfg(target_os = "macos")] pub mod videotoolbox; +#[cfg(target_os = "windows")] +pub mod d3d11; + pub use video::{VideoDecoder, DecodeStats, is_av1_hardware_supported, get_supported_decoder_backends}; pub use rtp::{RtpDepacketizer, DepacketizerCodec}; pub use audio::*; #[cfg(target_os = "macos")] -pub use videotoolbox::{ZeroCopyFrame, ZeroCopyTextureManager, CVPixelBufferWrapper}; +pub use videotoolbox::{ZeroCopyFrame, ZeroCopyTextureManager, CVPixelBufferWrapper, LockedPlanes, CVMetalTexture, MetalVideoRenderer}; + +#[cfg(target_os = "windows")] +pub use d3d11::{D3D11TextureWrapper, D3D11ZeroCopyManager, LockedPlanes as D3D11LockedPlanes}; /// Pixel format of decoded video frame #[derive(Debug, Clone, Copy, PartialEq, Default)] @@ -50,6 +56,14 @@ pub struct VideoFrame { pub color_range: ColorRange, /// Color space (matrix coefficients) pub color_space: ColorSpace, + /// Zero-copy GPU buffer (macOS VideoToolbox only) + /// When present, y_plane/u_plane are empty and rendering uses this directly + #[cfg(target_os = "macos")] + pub gpu_frame: Option>, + /// Zero-copy GPU texture (Windows D3D11VA only) + /// When present, y_plane/u_plane are empty and rendering imports this directly + #[cfg(target_os = "windows")] + pub gpu_frame: Option>, } /// Video color range @@ -93,6 +107,10 @@ impl VideoFrame { format: PixelFormat::YUV420P, color_range: ColorRange::Limited, color_space: ColorSpace::BT709, + #[cfg(target_os = "macos")] + gpu_frame: None, + #[cfg(target_os = "windows")] + gpu_frame: None, } } @@ -202,6 +220,8 @@ pub struct StreamStats { pub packet_loss: f32, /// Network jitter in ms pub jitter_ms: f32, + /// Network RTT (round-trip time) in ms from ICE candidate pair + pub rtt_ms: f32, /// Total frames received pub frames_received: u64, /// Total frames decoded @@ -210,6 +230,14 @@ pub struct StreamStats { pub frames_dropped: u64, /// Total frames rendered pub frames_rendered: u64, + /// Input events sent per second + pub input_rate: f32, + /// Frame delivery latency (RTP arrival to decode complete) in ms + pub frame_delivery_ms: f32, + /// Estimated end-to-end latency in ms (decode_time + estimated network) + pub estimated_e2e_ms: f32, + /// Audio buffer level in ms + pub audio_buffer_ms: f32, } impl StreamStats { diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 6fa6ebd..493fa20 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -48,15 +48,15 @@ pub fn detect_gpu_vendor() -> GpuVendor { // but wgpu adapter request is async pollster::block_on(async { let instance = wgpu::Instance::new(&wgpu::InstanceDescriptor::default()); // Needs borrow - - // Enumerate all available adapters - let adapters = instance.enumerate_adapters(wgpu::Backends::all()); - + + // Enumerate all available adapters (wgpu 28 returns a Future) + let adapters = instance.enumerate_adapters(wgpu::Backends::all()).await; + let mut best_score = -1; let mut best_vendor = GpuVendor::Unknown; - + info!("Available GPU adapters:"); - + for adapter in adapters { let info = adapter.get_info(); let name = info.name.to_lowercase(); @@ -950,9 +950,6 @@ impl VideoDecoder { return None; } - // Hardware frame detected - need to transfer to system memory - debug!("Transferring hardware frame (format: {:?}) to system memory", format); - unsafe { use ffmpeg::ffi::*; @@ -964,6 +961,7 @@ impl VideoDecoder { } // Transfer data from hardware frame to software frame + // This is the main latency source - GPU to CPU copy let ret = av_hwframe_transfer_data(sw_frame_ptr, frame.as_ptr(), 0); if ret < 0 { warn!("Failed to transfer hardware frame to software (error {})", ret); @@ -976,7 +974,6 @@ impl VideoDecoder { (*sw_frame_ptr).height = frame.height() as i32; // Wrap in FFmpeg frame type - // Note: This creates an owned frame that will be freed when dropped Some(FfmpegFrame::wrap(sw_frame_ptr)) } } @@ -1040,29 +1037,122 @@ impl VideoDecoder { let h = frame.height(); let format = frame.format(); - // Check if this is a hardware frame (e.g., VideoToolbox, CUDA, etc.) - // Hardware frames need to be transferred to system memory - let sw_frame = Self::transfer_hw_frame_if_needed(&frame); - let frame_to_use = sw_frame.as_ref().unwrap_or(&frame); - let actual_format = frame_to_use.format(); - - // Extract color metadata - let color_range = match frame_to_use.color_range() { + // Extract color metadata from original frame + let color_range = match frame.color_range() { ffmpeg::util::color::range::Range::JPEG => ColorRange::Full, ffmpeg::util::color::range::Range::MPEG => ColorRange::Limited, - _ => ColorRange::Limited, // Default to limited if unspecified (safest for video) + _ => ColorRange::Limited, }; - let color_space = match frame_to_use.color_space() { + let color_space = match frame.color_space() { ffmpeg::util::color::space::Space::BT709 => ColorSpace::BT709, ffmpeg::util::color::space::Space::BT470BG => ColorSpace::BT601, ffmpeg::util::color::space::Space::SMPTE170M => ColorSpace::BT601, ffmpeg::util::color::space::Space::BT2020NCL => ColorSpace::BT2020, - _ => ColorSpace::BT709, // Default to BT.709 for HD content + _ => ColorSpace::BT709, }; + // ZERO-COPY PATH: For VideoToolbox, extract CVPixelBuffer directly + // This skips the expensive GPU->CPU->GPU copy entirely + #[cfg(target_os = "macos")] + if format == Pixel::VIDEOTOOLBOX { + use crate::media::videotoolbox; + use std::sync::Arc; + + // Extract CVPixelBuffer from frame.data[3] using raw FFmpeg pointer + // We use unsafe FFI because the safe wrapper does bounds checking + // that doesn't work for hardware frames + let cv_buffer = unsafe { + let raw_frame = frame.as_ptr(); + let data_ptr = (*raw_frame).data[3] as *mut u8; + if !data_ptr.is_null() { + videotoolbox::extract_cv_pixel_buffer_from_data(data_ptr) + } else { + None + } + }; + + if let Some(buffer) = cv_buffer { + if *frames_decoded == 1 { + info!("ZERO-COPY: First frame {}x{} via CVPixelBuffer (no CPU transfer!)", w, h); + } + + *width = w; + *height = h; + + return Some(VideoFrame { + width: w, + height: h, + y_plane: Vec::new(), + u_plane: Vec::new(), + v_plane: Vec::new(), + y_stride: 0, + u_stride: 0, + v_stride: 0, + timestamp_us: 0, + format: PixelFormat::NV12, + color_range, + color_space, + gpu_frame: Some(Arc::new(buffer)), + }); + } else { + warn!("Failed to extract CVPixelBuffer, falling back to CPU transfer"); + } + } + + // ZERO-COPY PATH: For D3D11VA, extract D3D11 texture directly + // This skips the expensive GPU->CPU->GPU copy entirely + #[cfg(target_os = "windows")] + if format == Pixel::D3D11 || format == Pixel::D3D11VA_VLD { + use crate::media::d3d11; + use std::sync::Arc; + + // Extract D3D11 texture from frame data + // FFmpeg D3D11VA frame layout: + // - data[0] = ID3D11Texture2D* + // - data[1] = texture array index (as intptr_t) + let d3d11_texture = unsafe { + let raw_frame = frame.as_ptr(); + let data0 = (*raw_frame).data[0] as *mut u8; + let data1 = (*raw_frame).data[1] as *mut u8; + d3d11::extract_d3d11_texture_from_frame(data0, data1) + }; + + if let Some(texture) = d3d11_texture { + if *frames_decoded == 1 { + info!("ZERO-COPY: First frame {}x{} via D3D11 texture (no CPU transfer!)", w, h); + } + + *width = w; + *height = h; + + return Some(VideoFrame { + width: w, + height: h, + y_plane: Vec::new(), + u_plane: Vec::new(), + v_plane: Vec::new(), + y_stride: 0, + u_stride: 0, + v_stride: 0, + timestamp_us: 0, + format: PixelFormat::NV12, + color_range, + color_space, + gpu_frame: Some(Arc::new(texture)), + }); + } else { + warn!("Failed to extract D3D11 texture, falling back to CPU transfer"); + } + } + + // FALLBACK: Transfer hardware frame to CPU memory + let sw_frame = Self::transfer_hw_frame_if_needed(&frame); + let frame_to_use = sw_frame.as_ref().unwrap_or(&frame); + let actual_format = frame_to_use.format(); + if *frames_decoded == 1 { - info!("First decoded frame: {}x{}, format: {:?} (hw: {:?}), range: {:?}, space: {:?}", + info!("First decoded frame: {}x{}, format: {:?} (hw: {:?}), range: {:?}, space: {:?}", w, h, actual_format, format, color_range, color_space); } @@ -1126,6 +1216,10 @@ impl VideoDecoder { format: PixelFormat::NV12, color_range, color_space, + #[cfg(target_os = "macos")] + gpu_frame: None, + #[cfg(target_os = "windows")] + gpu_frame: None, }); } @@ -1219,6 +1313,10 @@ impl VideoDecoder { format: PixelFormat::NV12, color_range, color_space, + #[cfg(target_os = "macos")] + gpu_frame: None, + #[cfg(target_os = "windows")] + gpu_frame: None, }) } Err(ffmpeg::Error::Other { errno }) if errno == libc::EAGAIN => None, diff --git a/opennow-streamer/src/media/videotoolbox.rs b/opennow-streamer/src/media/videotoolbox.rs index 380ac10..e316dd3 100644 --- a/opennow-streamer/src/media/videotoolbox.rs +++ b/opennow-streamer/src/media/videotoolbox.rs @@ -14,6 +14,9 @@ use std::ffi::c_void; use std::sync::Arc; use log::{info, debug, warn}; +use objc::runtime::{Object, YES}; +use objc::{class, msg_send, sel, sel_impl}; +use foreign_types::ForeignType; // Core Video FFI #[link(name = "CoreVideo", kind = "framework")] @@ -24,8 +27,58 @@ extern "C" { fn CVPixelBufferGetHeight(buffer: *mut c_void) -> usize; fn CVPixelBufferGetPixelFormatType(buffer: *mut c_void) -> u32; fn CVPixelBufferGetIOSurface(buffer: *mut c_void) -> *mut c_void; + fn CVPixelBufferLockBaseAddress(buffer: *mut c_void, flags: u64) -> i32; + fn CVPixelBufferUnlockBaseAddress(buffer: *mut c_void, flags: u64) -> i32; + fn CVPixelBufferGetPlaneCount(buffer: *mut c_void) -> usize; + fn CVPixelBufferGetBaseAddressOfPlane(buffer: *mut c_void, plane: usize) -> *mut u8; + fn CVPixelBufferGetBytesPerRowOfPlane(buffer: *mut c_void, plane: usize) -> usize; + fn CVPixelBufferGetHeightOfPlane(buffer: *mut c_void, plane: usize) -> usize; + fn CVPixelBufferGetWidthOfPlane(buffer: *mut c_void, plane: usize) -> usize; } +// Metal FFI for getting the system default device +#[link(name = "Metal", kind = "framework")] +extern "C" { + fn MTLCreateSystemDefaultDevice() -> *mut Object; +} + +// CoreVideo Metal texture cache FFI - TRUE zero-copy +#[link(name = "CoreVideo", kind = "framework")] +extern "C" { + fn CVMetalTextureCacheCreate( + allocator: *const c_void, + cache_attributes: *const c_void, + metal_device: *mut Object, + texture_attributes: *const c_void, + cache_out: *mut *mut c_void, + ) -> i32; + + fn CVMetalTextureCacheCreateTextureFromImage( + allocator: *const c_void, + texture_cache: *mut c_void, + source_image: *mut c_void, // CVPixelBufferRef + texture_attributes: *const c_void, + pixel_format: u64, // MTLPixelFormat + width: usize, + height: usize, + plane_index: usize, + texture_out: *mut *mut c_void, + ) -> i32; + + fn CVMetalTextureGetTexture(texture: *mut c_void) -> *mut Object; // Returns MTLTexture + fn CVMetalTextureCacheFlush(texture_cache: *mut c_void, options: u64); +} + +// kCVReturn success +const K_CV_RETURN_SUCCESS: i32 = 0; + +// MTLPixelFormat values +const MTL_PIXEL_FORMAT_R8_UNORM: u64 = 10; // For Y plane +const MTL_PIXEL_FORMAT_RG8_UNORM: u64 = 30; // For UV plane (interleaved) + +// Lock flags +const K_CV_PIXEL_BUFFER_LOCK_READ_ONLY: u64 = 0x00000001; + // IOSurface FFI #[link(name = "IOSurface", kind = "framework")] extern "C" { @@ -48,6 +101,16 @@ pub struct CVPixelBufferWrapper { is_nv12: bool, } +impl std::fmt::Debug for CVPixelBufferWrapper { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + f.debug_struct("CVPixelBufferWrapper") + .field("width", &self.width) + .field("height", &self.height) + .field("is_nv12", &self.is_nv12) + .finish() + } +} + // CVPixelBuffer is reference-counted and thread-safe unsafe impl Send for CVPixelBufferWrapper {} unsafe impl Sync for CVPixelBufferWrapper {} @@ -114,6 +177,74 @@ impl CVPixelBufferWrapper { pub fn as_raw(&self) -> *mut c_void { self.buffer } + + /// Lock the pixel buffer and get direct access to plane data + /// This maps GPU memory to CPU address space WITHOUT copying + /// Returns (y_data, y_stride, uv_data, uv_stride) for NV12 format + /// IMPORTANT: Call unlock() when done to release the mapping + pub fn lock_and_get_planes(&self) -> Option { + unsafe { + // Lock for read-only access (faster) + let result = CVPixelBufferLockBaseAddress(self.buffer, K_CV_PIXEL_BUFFER_LOCK_READ_ONLY); + if result != 0 { + warn!("Failed to lock CVPixelBuffer: {}", result); + return None; + } + + let plane_count = CVPixelBufferGetPlaneCount(self.buffer); + if plane_count < 2 { + warn!("CVPixelBuffer has {} planes, expected 2 for NV12", plane_count); + CVPixelBufferUnlockBaseAddress(self.buffer, K_CV_PIXEL_BUFFER_LOCK_READ_ONLY); + return None; + } + + // Y plane (plane 0) + let y_ptr = CVPixelBufferGetBaseAddressOfPlane(self.buffer, 0); + let y_stride = CVPixelBufferGetBytesPerRowOfPlane(self.buffer, 0); + let y_height = CVPixelBufferGetHeightOfPlane(self.buffer, 0); + + // UV plane (plane 1) - interleaved for NV12 + let uv_ptr = CVPixelBufferGetBaseAddressOfPlane(self.buffer, 1); + let uv_stride = CVPixelBufferGetBytesPerRowOfPlane(self.buffer, 1); + let uv_height = CVPixelBufferGetHeightOfPlane(self.buffer, 1); + + if y_ptr.is_null() || uv_ptr.is_null() { + warn!("CVPixelBuffer plane pointers are null"); + CVPixelBufferUnlockBaseAddress(self.buffer, K_CV_PIXEL_BUFFER_LOCK_READ_ONLY); + return None; + } + + Some(LockedPlanes { + buffer: self.buffer, + y_data: std::slice::from_raw_parts(y_ptr, y_stride * y_height), + y_stride: y_stride as u32, + y_height: y_height as u32, + uv_data: std::slice::from_raw_parts(uv_ptr, uv_stride * uv_height), + uv_stride: uv_stride as u32, + uv_height: uv_height as u32, + }) + } + } +} + +/// Locked plane data from CVPixelBuffer +/// Automatically unlocks on drop +pub struct LockedPlanes<'a> { + buffer: *mut c_void, + pub y_data: &'a [u8], + pub y_stride: u32, + pub y_height: u32, + pub uv_data: &'a [u8], + pub uv_stride: u32, + pub uv_height: u32, +} + +impl<'a> Drop for LockedPlanes<'a> { + fn drop(&mut self) { + unsafe { + CVPixelBufferUnlockBaseAddress(self.buffer, K_CV_PIXEL_BUFFER_LOCK_READ_ONLY); + } + } } impl Drop for CVPixelBufferWrapper { @@ -220,24 +351,597 @@ impl Drop for IOSurfaceWrapper { } } -// Note: Full zero-copy texture integration with wgpu requires using -// Metal's newTextureWithIOSurface API and wgpu's hal layer. -// This is complex due to wgpu's hal API requirements. -// For now, the NV12 direct path (skipping CPU scaler) provides significant savings. -// TODO: Implement ZeroCopyTextureManager using objc/metal directly +/// Metal texture pair created from IOSurface (Y and UV planes) +/// These textures share memory with the CVPixelBuffer - true zero-copy! +pub struct MetalTexturesFromIOSurface { + pub y_texture: *mut Object, // MTLTexture for Y plane + pub uv_texture: *mut Object, // MTLTexture for UV plane (interleaved) + pub width: u32, + pub height: u32, + // Keep the CVPixelBuffer alive while textures are in use + _cv_buffer: Arc, +} + +unsafe impl Send for MetalTexturesFromIOSurface {} +unsafe impl Sync for MetalTexturesFromIOSurface {} + +impl Drop for MetalTexturesFromIOSurface { + fn drop(&mut self) { + unsafe { + if !self.y_texture.is_null() { + let _: () = msg_send![self.y_texture, release]; + } + if !self.uv_texture.is_null() { + let _: () = msg_send![self.uv_texture, release]; + } + } + } +} + +impl MetalTexturesFromIOSurface { + /// Create Metal textures directly from CVPixelBuffer's IOSurface + /// This is TRUE zero-copy - the textures share GPU memory with the decoded frame + pub fn from_cv_buffer( + cv_buffer: Arc, + metal_device: *mut Object, + ) -> Option { + if metal_device.is_null() { + warn!("Metal device is null"); + return None; + } + + let io_surface = cv_buffer.io_surface()?; + let width = cv_buffer.width(); + let height = cv_buffer.height(); + + unsafe { + // Create Y texture (plane 0) - R8Unorm format + let y_texture = Self::create_texture_from_iosurface( + metal_device, + io_surface, + 0, // plane 0 = Y + width, + height, + 8, // MTLPixelFormatR8Unorm + )?; + + // Create UV texture (plane 1) - RG8Unorm format (interleaved UV) + let uv_texture = Self::create_texture_from_iosurface( + metal_device, + io_surface, + 1, // plane 1 = UV + width / 2, + height / 2, + 30, // MTLPixelFormatRG8Unorm + )?; + + info!("Created Metal textures from IOSurface: {}x{} (zero-copy)", width, height); + + Some(Self { + y_texture, + uv_texture, + width, + height, + _cv_buffer: cv_buffer, + }) + } + } + + /// Create a single Metal texture from an IOSurface plane + unsafe fn create_texture_from_iosurface( + device: *mut Object, + io_surface: *mut c_void, + plane: usize, + width: u32, + height: u32, + pixel_format: u64, + ) -> Option<*mut Object> { + // Create MTLTextureDescriptor + let descriptor: *mut Object = msg_send![class!(MTLTextureDescriptor), new]; + if descriptor.is_null() { + return None; + } + + // Configure descriptor + let _: () = msg_send![descriptor, setTextureType: 2u64]; // MTLTextureType2D + let _: () = msg_send![descriptor, setPixelFormat: pixel_format]; + let _: () = msg_send![descriptor, setWidth: width as u64]; + let _: () = msg_send![descriptor, setHeight: height as u64]; + let _: () = msg_send![descriptor, setStorageMode: 1u64]; // MTLStorageModeManaged (shared on Apple Silicon) + let _: () = msg_send![descriptor, setUsage: 1u64]; // MTLTextureUsageShaderRead + + // Create texture from IOSurface + let texture: *mut Object = msg_send![device, newTextureWithDescriptor:descriptor iosurface:io_surface plane:plane]; + + // Release descriptor + let _: () = msg_send![descriptor, release]; + + if texture.is_null() { + warn!("Failed to create Metal texture from IOSurface plane {}", plane); + return None; + } + + Some(texture) + } +} -/// Placeholder for future zero-copy texture manager +/// Manager for zero-copy GPU textures using CVMetalTextureCache +/// This creates Metal textures that share GPU memory with CVPixelBuffer - NO CPU COPY! pub struct ZeroCopyTextureManager { - _initialized: bool, + metal_device: *mut Object, + texture_cache: *mut c_void, + command_queue: *mut Object, // Cached command queue for GPU blits } +unsafe impl Send for ZeroCopyTextureManager {} +unsafe impl Sync for ZeroCopyTextureManager {} + impl ZeroCopyTextureManager { - /// Create a new texture manager from wgpu device - /// Returns None if zero-copy is not supported or available - pub fn new(_wgpu_device: &wgpu::Device) -> Option { - // TODO: Implement using Metal API directly via objc - // For now, return None to use fallback CPU path - info!("ZeroCopyTextureManager: Not yet implemented, using CPU path"); - None + /// Create a new texture manager with CVMetalTextureCache + pub fn new() -> Option { + unsafe { + // Get system default Metal device + let metal_device = MTLCreateSystemDefaultDevice(); + if metal_device.is_null() { + warn!("Could not get Metal device"); + return None; + } + + // Create CVMetalTextureCache + let mut texture_cache: *mut c_void = std::ptr::null_mut(); + let result = CVMetalTextureCacheCreate( + std::ptr::null(), // default allocator + std::ptr::null(), // no cache attributes + metal_device, + std::ptr::null(), // no texture attributes + &mut texture_cache, + ); + + if result != K_CV_RETURN_SUCCESS || texture_cache.is_null() { + warn!("Failed to create CVMetalTextureCache: {}", result); + let _: () = msg_send![metal_device, release]; + return None; + } + + // Create a persistent command queue for GPU blits + let command_queue: *mut Object = msg_send![metal_device, newCommandQueue]; + if command_queue.is_null() { + warn!("Failed to create Metal command queue"); + CFRelease(texture_cache); + let _: () = msg_send![metal_device, release]; + return None; + } + + info!("ZeroCopyTextureManager: Created with CVMetalTextureCache and command queue (TRUE zero-copy)"); + Some(Self { metal_device, texture_cache, command_queue }) + } + } + + /// Create Metal textures from CVPixelBuffer - TRUE ZERO-COPY + /// Returns (y_texture, uv_texture) as raw MTLTexture pointers + pub fn create_textures_from_cv_buffer( + &self, + cv_buffer: &CVPixelBufferWrapper, + ) -> Option<(CVMetalTexture, CVMetalTexture)> { + let width = cv_buffer.width() as usize; + let height = cv_buffer.height() as usize; + + unsafe { + // Create Y plane texture (plane 0) + let mut y_cv_texture: *mut c_void = std::ptr::null_mut(); + let result = CVMetalTextureCacheCreateTextureFromImage( + std::ptr::null(), + self.texture_cache, + cv_buffer.as_raw(), + std::ptr::null(), + MTL_PIXEL_FORMAT_R8_UNORM, + width, + height, + 0, // plane 0 = Y + &mut y_cv_texture, + ); + + if result != K_CV_RETURN_SUCCESS || y_cv_texture.is_null() { + warn!("Failed to create Y texture from CVPixelBuffer: {}", result); + return None; + } + + // Create UV plane texture (plane 1) + let mut uv_cv_texture: *mut c_void = std::ptr::null_mut(); + let result = CVMetalTextureCacheCreateTextureFromImage( + std::ptr::null(), + self.texture_cache, + cv_buffer.as_raw(), + std::ptr::null(), + MTL_PIXEL_FORMAT_RG8_UNORM, + width / 2, + height / 2, + 1, // plane 1 = UV + &mut uv_cv_texture, + ); + + if result != K_CV_RETURN_SUCCESS || uv_cv_texture.is_null() { + warn!("Failed to create UV texture from CVPixelBuffer: {}", result); + // Clean up Y texture + CFRelease(y_cv_texture); + return None; + } + + Some(( + CVMetalTexture::new(y_cv_texture, width as u32, height as u32, MTL_PIXEL_FORMAT_R8_UNORM), + CVMetalTexture::new(uv_cv_texture, (width / 2) as u32, (height / 2) as u32, MTL_PIXEL_FORMAT_RG8_UNORM), + )) + } + } + + /// Flush the texture cache (call periodically to free unused textures) + pub fn flush(&self) { + unsafe { + CVMetalTextureCacheFlush(self.texture_cache, 0); + } + } + + /// Get the Metal device pointer + pub fn metal_device(&self) -> *mut Object { + self.metal_device + } + + /// Get the cached command queue for GPU blits + pub fn command_queue(&self) -> *mut Object { + self.command_queue + } +} + +impl Default for ZeroCopyTextureManager { + fn default() -> Self { + Self::new().expect("Failed to create CVMetalTextureCache") + } +} + +impl Drop for ZeroCopyTextureManager { + fn drop(&mut self) { + unsafe { + if !self.command_queue.is_null() { + let _: () = msg_send![self.command_queue, release]; + } + if !self.texture_cache.is_null() { + CFRelease(self.texture_cache); + } + if !self.metal_device.is_null() { + let _: () = msg_send![self.metal_device, release]; + } + } + } +} + +// CFRelease for CoreFoundation objects +#[link(name = "CoreFoundation", kind = "framework")] +extern "C" { + fn CFRelease(cf: *mut c_void); + fn CFRetain(cf: *mut c_void) -> *mut c_void; +} + +/// Wrapper around CVMetalTexture that handles release +pub struct CVMetalTexture { + cv_texture: *mut c_void, + width: u32, + height: u32, + format: u64, // MTLPixelFormat +} + +unsafe impl Send for CVMetalTexture {} +unsafe impl Sync for CVMetalTexture {} + +impl CVMetalTexture { + fn new(cv_texture: *mut c_void, width: u32, height: u32, format: u64) -> Self { + Self { cv_texture, width, height, format } + } + + /// Get the underlying MTLTexture pointer - this shares GPU memory with CVPixelBuffer! + pub fn metal_texture_ptr(&self) -> *mut Object { + unsafe { CVMetalTextureGetTexture(self.cv_texture) } + } + + /// Get as metal-rs Texture type (for wgpu-hal integration) + /// The returned texture shares GPU memory with the CVPixelBuffer - TRUE ZERO-COPY! + pub fn as_metal_texture(&self) -> metal::Texture { + unsafe { + let ptr = self.metal_texture_ptr(); + // Retain because metal::Texture will release on drop + let _: () = msg_send![ptr, retain]; + metal::Texture::from_ptr(ptr as *mut _) + } + } + + pub fn width(&self) -> u32 { self.width } + pub fn height(&self) -> u32 { self.height } + pub fn pixel_format(&self) -> u64 { self.format } + + /// Convert MTLPixelFormat to wgpu TextureFormat + pub fn wgpu_format(&self) -> wgpu::TextureFormat { + match self.format { + 10 => wgpu::TextureFormat::R8Unorm, // MTLPixelFormatR8Unorm (Y plane) + 30 => wgpu::TextureFormat::Rg8Unorm, // MTLPixelFormatRG8Unorm (UV plane) + _ => wgpu::TextureFormat::R8Unorm, + } + } +} + +impl Drop for CVMetalTexture { + fn drop(&mut self) { + if !self.cv_texture.is_null() { + unsafe { CFRelease(self.cv_texture); } + } + } +} + +/// Metal-based video renderer for TRUE zero-copy rendering +/// Renders NV12 video directly from CVMetalTexture to the screen +pub struct MetalVideoRenderer { + device: *mut Object, + command_queue: *mut Object, + pipeline_state: *mut Object, + sampler_state: *mut Object, +} + +unsafe impl Send for MetalVideoRenderer {} +unsafe impl Sync for MetalVideoRenderer {} + +impl MetalVideoRenderer { + /// Create a new Metal video renderer + pub fn new(device: *mut Object) -> Option { + unsafe { + if device.is_null() { + return None; + } + + // Retain device + let _: () = msg_send![device, retain]; + + // Create command queue + let command_queue: *mut Object = msg_send![device, newCommandQueue]; + if command_queue.is_null() { + warn!("Failed to create Metal command queue"); + let _: () = msg_send![device, release]; + return None; + } + + // Create sampler state + let sampler_descriptor: *mut Object = msg_send![class!(MTLSamplerDescriptor), new]; + let _: () = msg_send![sampler_descriptor, setMinFilter: 1u64]; // Linear + let _: () = msg_send![sampler_descriptor, setMagFilter: 1u64]; // Linear + let _: () = msg_send![sampler_descriptor, setSAddressMode: 0u64]; // ClampToEdge + let _: () = msg_send![sampler_descriptor, setTAddressMode: 0u64]; // ClampToEdge + + let sampler_state: *mut Object = msg_send![device, newSamplerStateWithDescriptor: sampler_descriptor]; + let _: () = msg_send![sampler_descriptor, release]; + + if sampler_state.is_null() { + warn!("Failed to create Metal sampler state"); + let _: () = msg_send![command_queue, release]; + let _: () = msg_send![device, release]; + return None; + } + + // Create render pipeline for NV12 to RGB conversion + let pipeline_state = Self::create_nv12_pipeline(device)?; + + info!("MetalVideoRenderer: Initialized for zero-copy video rendering"); + + Some(Self { + device, + command_queue, + pipeline_state, + sampler_state, + }) + } + } + + /// Create the NV12 to RGB render pipeline + unsafe fn create_nv12_pipeline(device: *mut Object) -> Option<*mut Object> { + // NV12 to RGB shader source (Metal Shading Language) + let shader_source = r#" + #include + using namespace metal; + + struct VertexOut { + float4 position [[position]]; + float2 texCoord; + }; + + // Full-screen triangle vertex shader + vertex VertexOut nv12_vertex(uint vertexID [[vertex_id]]) { + VertexOut out; + // Generate full-screen triangle + float2 positions[3] = { + float2(-1.0, -1.0), + float2(3.0, -1.0), + float2(-1.0, 3.0) + }; + float2 texCoords[3] = { + float2(0.0, 1.0), + float2(2.0, 1.0), + float2(0.0, -1.0) + }; + out.position = float4(positions[vertexID], 0.0, 1.0); + out.texCoord = texCoords[vertexID]; + return out; + } + + // NV12 to RGB fragment shader (BT.709) + fragment float4 nv12_fragment( + VertexOut in [[stage_in]], + texture2d yTexture [[texture(0)]], + texture2d uvTexture [[texture(1)]], + sampler texSampler [[sampler(0)]] + ) { + float y = yTexture.sample(texSampler, in.texCoord).r; + float2 uv = uvTexture.sample(texSampler, in.texCoord).rg; + + // BT.709 YUV to RGB conversion (video range) + float u = uv.r - 0.5; + float v = uv.g - 0.5; + + // BT.709 matrix + float r = y + 1.5748 * v; + float g = y - 0.1873 * u - 0.4681 * v; + float b = y + 1.8556 * u; + + return float4(saturate(float3(r, g, b)), 1.0); + } + "#; + + // Create shader library + let source_nsstring = Self::create_nsstring(shader_source); + if source_nsstring.is_null() { + return None; + } + + let mut error: *mut Object = std::ptr::null_mut(); + let library: *mut Object = msg_send![device, newLibraryWithSource: source_nsstring options: std::ptr::null::() error: &mut error]; + let _: () = msg_send![source_nsstring, release]; + + if library.is_null() { + if !error.is_null() { + let desc: *mut Object = msg_send![error, localizedDescription]; + let cstr: *const i8 = msg_send![desc, UTF8String]; + if !cstr.is_null() { + let err_str = std::ffi::CStr::from_ptr(cstr).to_string_lossy(); + warn!("Metal shader compilation error: {}", err_str); + } + } + return None; + } + + // Get vertex and fragment functions + let vertex_name = Self::create_nsstring("nv12_vertex"); + let fragment_name = Self::create_nsstring("nv12_fragment"); + + let vertex_fn: *mut Object = msg_send![library, newFunctionWithName: vertex_name]; + let fragment_fn: *mut Object = msg_send![library, newFunctionWithName: fragment_name]; + + let _: () = msg_send![vertex_name, release]; + let _: () = msg_send![fragment_name, release]; + let _: () = msg_send![library, release]; + + if vertex_fn.is_null() || fragment_fn.is_null() { + warn!("Failed to get shader functions"); + return None; + } + + // Create pipeline descriptor + let pipeline_desc: *mut Object = msg_send![class!(MTLRenderPipelineDescriptor), new]; + let _: () = msg_send![pipeline_desc, setVertexFunction: vertex_fn]; + let _: () = msg_send![pipeline_desc, setFragmentFunction: fragment_fn]; + + // Set color attachment format (BGRA8Unorm for Metal drawable) + let color_attachments: *mut Object = msg_send![pipeline_desc, colorAttachments]; + let attachment0: *mut Object = msg_send![color_attachments, objectAtIndexedSubscript: 0usize]; + let _: () = msg_send![attachment0, setPixelFormat: 80u64]; // MTLPixelFormatBGRA8Unorm + + // Create pipeline state + let pipeline_state: *mut Object = msg_send![device, newRenderPipelineStateWithDescriptor: pipeline_desc error: &mut error]; + + let _: () = msg_send![pipeline_desc, release]; + let _: () = msg_send![vertex_fn, release]; + let _: () = msg_send![fragment_fn, release]; + + if pipeline_state.is_null() { + warn!("Failed to create render pipeline state"); + return None; + } + + Some(pipeline_state) + } + + /// Helper to create NSString + unsafe fn create_nsstring(s: &str) -> *mut Object { + let nsstring_class = class!(NSString); + let bytes = s.as_ptr() as *const i8; + let len = s.len(); + msg_send![nsstring_class, stringWithUTF8String: bytes] + } + + /// Render video frame using Metal - TRUE ZERO-COPY + /// Takes CVMetalTextures and renders directly to the provided drawable + pub fn render( + &self, + y_texture: &CVMetalTexture, + uv_texture: &CVMetalTexture, + drawable: *mut Object, // CAMetalDrawable + ) -> bool { + unsafe { + let y_mtl = y_texture.metal_texture_ptr(); + let uv_mtl = uv_texture.metal_texture_ptr(); + + if y_mtl.is_null() || uv_mtl.is_null() || drawable.is_null() { + return false; + } + + // Get drawable texture + let target_texture: *mut Object = msg_send![drawable, texture]; + if target_texture.is_null() { + return false; + } + + // Create command buffer + let command_buffer: *mut Object = msg_send![self.command_queue, commandBuffer]; + if command_buffer.is_null() { + return false; + } + + // Create render pass descriptor + let pass_desc: *mut Object = msg_send![class!(MTLRenderPassDescriptor), renderPassDescriptor]; + let color_attachments: *mut Object = msg_send![pass_desc, colorAttachments]; + let attachment0: *mut Object = msg_send![color_attachments, objectAtIndexedSubscript: 0usize]; + let _: () = msg_send![attachment0, setTexture: target_texture]; + let _: () = msg_send![attachment0, setLoadAction: 2u64]; // Clear + let _: () = msg_send![attachment0, setStoreAction: 1u64]; // Store + + // Create render encoder + let encoder: *mut Object = msg_send![command_buffer, renderCommandEncoderWithDescriptor: pass_desc]; + if encoder.is_null() { + return false; + } + + // Set pipeline state + let _: () = msg_send![encoder, setRenderPipelineState: self.pipeline_state]; + + // Set textures (Y = 0, UV = 1) + let _: () = msg_send![encoder, setFragmentTexture: y_mtl atIndex: 0usize]; + let _: () = msg_send![encoder, setFragmentTexture: uv_mtl atIndex: 1usize]; + let _: () = msg_send![encoder, setFragmentSamplerState: self.sampler_state atIndex: 0usize]; + + // Draw full-screen triangle + let _: () = msg_send![encoder, drawPrimitives: 3u64 vertexStart: 0usize vertexCount: 3usize]; // Triangle + + // End encoding + let _: () = msg_send![encoder, endEncoding]; + + // Present and commit + let _: () = msg_send![command_buffer, presentDrawable: drawable]; + let _: () = msg_send![command_buffer, commit]; + + true + } + } +} + +impl Drop for MetalVideoRenderer { + fn drop(&mut self) { + unsafe { + if !self.sampler_state.is_null() { + let _: () = msg_send![self.sampler_state, release]; + } + if !self.pipeline_state.is_null() { + let _: () = msg_send![self.pipeline_state, release]; + } + if !self.command_queue.is_null() { + let _: () = msg_send![self.command_queue, release]; + } + if !self.device.is_null() { + let _: () = msg_send![self.device, release]; + } + } } } diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index f9d24f7..0edfbb8 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -8,7 +8,7 @@ mod sdp; mod datachannel; pub use signaling::{GfnSignaling, SignalingEvent, IceCandidate}; -pub use peer::{WebRtcPeer, WebRtcEvent, request_keyframe}; +pub use peer::{WebRtcPeer, WebRtcEvent, NetworkStats, request_keyframe}; pub use sdp::*; pub use datachannel::*; @@ -276,13 +276,18 @@ pub async fn run_streaming( let mut audio_decoder = AudioDecoder::new(48000, 2)?; - // Audio player is created in a separate thread due to cpal::Stream not being Send - let (audio_tx, mut audio_rx) = mpsc::channel::>(256); + // Get the sample receiver from the decoder for async operation + let audio_sample_rx = audio_decoder.take_sample_receiver(); + + // Audio player thread - receives decoded samples and plays them + // Uses larger jitter buffer (150ms) to handle network timing variations std::thread::spawn(move || { if let Ok(audio_player) = AudioPlayer::new(48000, 2) { - info!("Audio player thread started"); - while let Some(samples) = audio_rx.blocking_recv() { - audio_player.push_samples(&samples); + info!("Audio player thread started (async mode with jitter buffer)"); + if let Some(mut rx) = audio_sample_rx { + while let Some(samples) = rx.blocking_recv() { + audio_player.push_samples(&samples); + } } } else { warn!("Failed to create audio player - audio disabled"); @@ -306,6 +311,9 @@ pub async fn run_streaming( let mut input_latency_sum: f64 = 0.0; let mut input_latency_count: u64 = 0; + // Input rate tracking (events per second) + let mut input_events_this_period: u64 = 0; + // Input state - use atomic for cross-task communication // input_ready_flag and input_protocol_version_shared are created later with the input task @@ -415,19 +423,34 @@ pub async fn run_streaming( biased; Some((encoded, is_mouse, is_controller, latency_us)) = input_packet_rx.recv() => { - // Track input latency for stats + // Track input latency and count for stats + input_events_this_period += 1; if latency_us > 0 { input_latency_sum += latency_us as f64; input_latency_count += 1; } + // Log first few mouse events to verify flow + static MOUSE_LOG_COUNT: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); + if is_mouse { + let count = MOUSE_LOG_COUNT.fetch_add(1, std::sync::atomic::Ordering::Relaxed); + if count < 10 { + info!("Sending mouse #{}: {} bytes, latency {}us", count, encoded.len(), latency_us); + } + } + if is_controller { // Controller input (Input Channel V1) // "input_channel_v1 needs to be only controller" let _ = peer.send_controller_input(&encoded).await; } else if is_mouse { - // Mouse events - use partially reliable channel (8ms lifetime) - // Attempt to send on mouse channel, drop if not ready (no fallback to V1) + // Log if mouse channel is ready + static MOUSE_READY_LOGGED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false); + if !MOUSE_READY_LOGGED.load(std::sync::atomic::Ordering::Relaxed) { + info!("Mouse events will use PARTIALLY RELIABLE channel (lower latency)"); + MOUSE_READY_LOGGED.store(true, std::sync::atomic::Ordering::Relaxed); + } + // Send mouse on PARTIALLY RELIABLE channel (unordered, low latency) let _ = peer.send_mouse_input(&encoded).await; } else { // Keyboard events @@ -664,10 +687,8 @@ pub async fn run_streaming( } } WebRtcEvent::AudioFrame(rtp_data) => { - // Decode Opus (stubbed for now) - if let Ok(samples) = audio_decoder.decode(&rtp_data) { - let _ = audio_tx.try_send(samples); - } + // Async decode - non-blocking, samples go directly to audio player + audio_decoder.decode_async(&rtp_data); } WebRtcEvent::DataChannelOpen(label) => { info!("Data channel opened: {}", label); @@ -775,6 +796,50 @@ pub async fn run_streaming( input_latency_count = 0; } + // Calculate input rate (events per second) + stats.input_rate = (input_events_this_period as f64 / elapsed) as f32; + input_events_this_period = 0; + + // Calculate frame delivery latency (pipeline latency) + if pipeline_latency_count > 0 { + stats.frame_delivery_ms = (pipeline_latency_sum / pipeline_latency_count as f64) as f32; + pipeline_latency_sum = 0.0; + pipeline_latency_count = 0; + } + + // Get network stats from WebRTC (RTT from ICE candidate pair) + let net_stats = peer.get_network_stats().await; + if net_stats.rtt_ms > 0.0 { + stats.rtt_ms = net_stats.rtt_ms; + } + + // Estimate end-to-end latency: + // E2E = network_rtt/2 (input to server) + server_processing (~16ms at 60fps) + // + network_rtt/2 (video back) + decode_time + render_time + // If RTT is 0 (ice-lite), estimate based on typical values + let (estimated_network_oneway, rtt_source) = if stats.rtt_ms > 0.0 { + (stats.rtt_ms / 2.0, "measured") + } else { + // Estimate ~10ms one-way (20ms RTT) for fiber/good internet connection + // This prevents alarming ~80ms E2E reports on good connections where RTT is unmeasured + (10.0, "estimated") + }; + let server_frame_time = 1000.0 / stats.target_fps.max(1) as f32; // ~16.7ms at 60fps + let server_encode_time = 8.0; // Estimated server encode latency ~8ms + stats.estimated_e2e_ms = estimated_network_oneway * 2.0 // network round trip + + server_frame_time // server processing (1 frame) + + server_encode_time // server encode + + stats.decode_time_ms + + stats.render_time_ms; + + // Log latency breakdown once + static LOGGED_LATENCY: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false); + if !LOGGED_LATENCY.swap(true, std::sync::atomic::Ordering::Relaxed) && stats.decode_time_ms > 0.0 { + info!("Latency breakdown ({}): network={:.0}ms x2, server_frame={:.0}ms, encode=8ms, decode={:.1}ms, render={:.1}ms = ~{:.0}ms E2E", + rtt_source, estimated_network_oneway, server_frame_time, stats.decode_time_ms, stats.render_time_ms, stats.estimated_e2e_ms); + info!("Note: If actual latency is higher, check server distance or try a closer region"); + } + // Log if FPS is significantly below target (more than 20% drop) if stats.fps > 0.0 && stats.fps < (fps as f32 * 0.8) { debug!("FPS below target: {:.1} / {} (dropped: {})", stats.fps, fps, frames_dropped); diff --git a/opennow-streamer/src/webrtc/peer.rs b/opennow-streamer/src/webrtc/peer.rs index 00701c5..8e097a2 100644 --- a/opennow-streamer/src/webrtc/peer.rs +++ b/opennow-streamer/src/webrtc/peer.rs @@ -551,4 +551,77 @@ impl WebRtcPeer { pub fn is_handshake_complete(&self) -> bool { self.handshake_complete } + + /// Get RTT (round-trip time) from ICE candidate pair stats + /// Returns None if no active candidate pair or stats unavailable + pub async fn get_rtt_ms(&self) -> Option { + let pc = self.peer_connection.as_ref()?; + let stats = pc.get_stats().await; + + // Look for ICE candidate pair stats with RTT + for (_, stat) in stats.reports.iter() { + if let webrtc::stats::StatsReportType::CandidatePair(pair) = stat { + // Only use nominated/active pairs + if pair.nominated && pair.current_round_trip_time > 0.0 { + // current_round_trip_time is in seconds, convert to ms + return Some((pair.current_round_trip_time * 1000.0) as f32); + } + } + } + None + } + + /// Get comprehensive network stats (RTT, jitter, packet loss) + pub async fn get_network_stats(&self) -> NetworkStats { + let mut stats = NetworkStats::default(); + + let Some(pc) = self.peer_connection.as_ref() else { + return stats; + }; + + let report = pc.get_stats().await; + + // Debug: log candidate pair stats once + static LOGGED_STATS: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false); + let should_log = !LOGGED_STATS.swap(true, std::sync::atomic::Ordering::Relaxed); + + for (id, stat) in report.reports.iter() { + match stat { + webrtc::stats::StatsReportType::CandidatePair(pair) => { + if should_log { + info!("CandidatePair {}: nominated={}, state={:?}, rtt={}s", + id, pair.nominated, pair.state, pair.current_round_trip_time); + } + // Use any pair with RTT data (not just nominated - ice-lite may behave differently) + if pair.current_round_trip_time > 0.0 && stats.rtt_ms == 0.0 { + stats.rtt_ms = (pair.current_round_trip_time * 1000.0) as f32; + } + if pair.nominated { + stats.bytes_received = pair.bytes_received; + stats.bytes_sent = pair.bytes_sent; + stats.packets_received = pair.packets_received as u64; + } + } + webrtc::stats::StatsReportType::InboundRTP(inbound) => { + // Video track stats - packets_received available + if inbound.kind == "video" { + stats.video_packets_received = inbound.packets_received; + } + } + _ => {} + } + } + + stats + } +} + +/// Network statistics from WebRTC +#[derive(Debug, Clone, Default)] +pub struct NetworkStats { + pub rtt_ms: f32, + pub packets_received: u64, + pub video_packets_received: u64, + pub bytes_received: u64, + pub bytes_sent: u64, } From 4d5bea3126a23b0985ef90a697b173663eac056a Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 15:51:18 +0100 Subject: [PATCH 29/67] feat: implement macOS raw input capture and WebRTC streaming initialization. --- opennow-streamer/src/input/macos.rs | 5 ++++- opennow-streamer/src/webrtc/mod.rs | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/opennow-streamer/src/input/macos.rs b/opennow-streamer/src/input/macos.rs index 3326301..2d84afd 100644 --- a/opennow-streamer/src/input/macos.rs +++ b/opennow-streamer/src/input/macos.rs @@ -199,7 +199,10 @@ fn flush_coalesced_events() { dy: dy as i16, timestamp_us, }).is_err() { - warn!("Mouse event channel full!"); + // Channel full - put deltas back for next attempt (conflation) + COALESCE_DX.fetch_add(dx, Ordering::Relaxed); + COALESCE_DY.fetch_add(dy, Ordering::Relaxed); + warn!("Input channel full (backpressure) - coalescing events"); } } else if count < 5 { warn!("EVENT_SENDER is None - raw input sender not configured!"); diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index 0edfbb8..f4a08d1 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -318,8 +318,9 @@ pub async fn run_streaming( // input_ready_flag and input_protocol_version_shared are created later with the input task // Input channel - connect InputHandler to the streaming loop - // Large buffer (1024) to handle high-frequency mouse events without blocking - let (input_event_tx, input_event_rx) = mpsc::channel::(1024); + // Reduced buffer (32) to prevent latency buildup (buffer bloat) + // If consumer is slow, we want to conflate events, not buffer them + let (input_event_tx, input_event_rx) = mpsc::channel::(32); input_handler.set_event_sender(input_event_tx.clone()); // Also set raw input sender for direct mouse events (Windows/macOS) From f7118ff0a78204e8e610a65f3dadd5d994416501 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 17:57:21 +0100 Subject: [PATCH 30/67] feat: Add WGPU renderer, media handling (audio, video, D3D11), and WebRTC integration. --- opennow-streamer/src/gui/renderer.rs | 201 ++++++++++++++++++++++++++- opennow-streamer/src/media/audio.rs | 4 +- opennow-streamer/src/media/d3d11.rs | 41 +++--- opennow-streamer/src/media/video.rs | 165 ++++++++++++++++++++-- opennow-streamer/src/webrtc/mod.rs | 3 +- 5 files changed, 373 insertions(+), 41 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 70f79bf..c254968 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -21,6 +21,15 @@ use crate::media::{VideoFrame, PixelFormat}; use crate::media::{ZeroCopyTextureManager, CVMetalTexture, MetalVideoRenderer}; #[cfg(target_os = "windows")] use crate::media::D3D11TextureWrapper; +#[cfg(target_os = "windows")] +use windows::Win32::Foundation::HANDLE; +#[cfg(target_os = "windows")] +use windows::Win32::Graphics::Direct3D12::{ID3D12Device, ID3D12Resource}; +#[cfg(target_os = "windows")] +// unused: use windows::core::Interface; +#[cfg(target_os = "windows")] +#[cfg(target_os = "macos")] +use wgpu_hal::dx12; use super::StatsPanel; use super::image_cache; use super::shaders::{VIDEO_SHADER, NV12_SHADER, EXTERNAL_TEXTURE_SHADER}; @@ -94,6 +103,10 @@ pub struct Renderer { current_y_cv_texture: Option, #[cfg(target_os = "macos")] current_uv_cv_texture: Option, + #[cfg(target_os = "windows")] + current_imported_handle: Option, + #[cfg(target_os = "windows")] + current_imported_texture: Option, } impl Renderer { @@ -555,6 +568,10 @@ impl Renderer { current_y_cv_texture: None, #[cfg(target_os = "macos")] current_uv_cv_texture: None, + #[cfg(target_os = "windows")] + current_imported_handle: None, + #[cfg(target_os = "windows")] + current_imported_texture: None, }) } @@ -1432,7 +1449,177 @@ impl Renderer { uv_width: u32, uv_height: u32, ) { - // Lock the D3D11 texture and get plane data + // Try zero-copy via Shared Handle first + // This eliminates the CPU copy by importing the D3D11 texture directly into DX12 + if let Ok(handle) = gpu_frame.get_shared_handle() { + let mut handle_changed = false; + + // Check if we need to re-import (handle changed or texture missing) + let needs_import = match self.current_imported_handle { + Some(current) => current != handle, + None => true, + }; + + if needs_import || self.current_imported_texture.is_none() { + // Import the shared handle into DX12 + // We must use unsafe to access the raw DX12 device via wgpu-hal + let imported_texture = unsafe { + match self.device.as_hal::() { + Some(hal_device) => { + let d3d12_device: &ID3D12Device = hal_device.raw_device(); + + // Open the shared handle as a D3D12 resource + let mut resource: Option = None; + if let Err(e) = d3d12_device.OpenSharedHandle(handle, &mut resource) { + warn!("Failed to OpenSharedHandle: {:?}", e); + return; // Fallback to CPU copy + } + let resource = resource.unwrap(); + + // Wrap it in a wgpu::Texture + let size = wgpu::Extent3d { + width: frame.width, + height: frame.height, + depth_or_array_layers: 1, + }; + + let format = wgpu::TextureFormat::NV12; + let usage = wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST; + + // Create wgpu-hal texture from raw resource + let hal_texture = wgpu_hal::dx12::Device::texture_from_raw( + resource, + format, + wgpu::TextureDimension::D2, + size, + 1, // mip_levels + 1, // sample_count + ); + + // Create wgpu Texture from HAL texture + let descriptor = wgpu::TextureDescriptor { + label: Some("Imported D3D11 Texture"), + size, + mip_level_count: 1, + sample_count: 1, + dimension: wgpu::TextureDimension::D2, + format, + usage, + view_formats: &[], + }; + + Some(self.device.create_texture_from_hal::( + hal_texture, + &descriptor + )) + }, + None => { + warn!("Failed to get DX12 HAL device"); + None + } + } + }; + + if let Some(texture) = imported_texture { + self.current_imported_texture = Some(texture); + self.current_imported_handle = Some(handle); + handle_changed = true; + // Log success once per session or on change + debug!("Zero-copy: Imported D3D11 texture handle {:?} -> DX12", handle); + } else { + // Import failed - clear cache and fall through to CPU path + self.current_imported_handle = None; + self.current_imported_texture = None; + } + } + + // If we have a valid imported texture, use it! + if let Some(ref texture) = self.current_imported_texture { + // If the handle changed OR if we don't have an external texture bind group yet (e.g. resize) + // we need to recreate the bind group. + // Note: video_size check handles resolution changes + let size_changed = self.video_size != (frame.width, frame.height); + + if handle_changed || size_changed || self.external_texture_bind_group.is_none() { + self.video_size = (frame.width, frame.height); + self.current_format = PixelFormat::NV12; + + // Create views for Y and UV planes + let y_view = texture.create_view(&wgpu::TextureViewDescriptor { + label: Some("Plane 0 View"), + aspect: wgpu::TextureAspect::Plane0, + ..Default::default() + }); + + let uv_view = texture.create_view(&wgpu::TextureViewDescriptor { + label: Some("Plane 1 View"), + aspect: wgpu::TextureAspect::Plane1, + ..Default::default() + }); + + // Create ExternalTexture logic (copied from update_video_external_texture) + // BT.709 Limited Range YCbCr to RGB conversion matrix (4x4 column-major) + let yuv_conversion_matrix: [f32; 16] = [ + 1.164, 1.164, 1.164, 0.0, + 0.0, -0.213, 2.112, 0.0, + 1.793, -0.533, 0.0, 0.0, + -0.874, 0.531, -1.086, 1.0, + ]; + + let gamut_conversion_matrix: [f32; 9] = [ + 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, + ]; + + let linear_transfer = wgpu::ExternalTextureTransferFunction { + a: 1.0, b: 0.0, g: 1.0, k: 1.0, + }; + + let identity_transform: [f32; 6] = [1.0, 0.0, 0.0, 0.0, 1.0, 0.0]; + + let external_texture = self.device.create_external_texture( + &wgpu::ExternalTextureDescriptor { + label: Some("Zero-Copy External Texture"), + width: frame.width, + height: frame.height, + format: wgpu::ExternalTextureFormat::Nv12, + yuv_conversion_matrix, + gamut_conversion_matrix, + src_transfer_function: linear_transfer.clone(), + dst_transfer_function: linear_transfer, + sample_transform: identity_transform, + load_transform: identity_transform, + }, + &[&y_view, &uv_view], + ); + + if let Some(ref layout) = self.external_texture_bind_group_layout { + let bind_group = self.device.create_bind_group(&wgpu::BindGroupDescriptor { + label: Some("Zero-Copy Bind Group"), + layout, + entries: &[ + wgpu::BindGroupEntry { + binding: 0, + resource: wgpu::BindingResource::ExternalTexture(&external_texture), + }, + wgpu::BindGroupEntry { + binding: 1, + resource: wgpu::BindingResource::Sampler(&self.video_sampler), + }, + ], + }); + + self.external_texture_bind_group = Some(bind_group); + self.external_texture = Some(external_texture); + log::info!("Zero-copy pipeline configured for {}x{}", frame.width, frame.height); + } + } + + // Success! We are set up for zero-copy rendering. + return; + } + } + + // Fallback: Lock the D3D11 texture and get plane data (CPU Copy) let planes = match gpu_frame.lock_and_get_planes() { Ok(p) => p, Err(e) => { @@ -2087,9 +2274,9 @@ impl Renderer { let game_textures = self.game_textures.clone(); let mut new_textures: Vec<(String, egui::TextureHandle)> = Vec::new(); - let full_output = self.egui_ctx.run(raw_input, |ctx| { + let full_output = self.egui_ctx.run_ui(raw_input, |ctx| { // Custom styling - let mut style = (*ctx.style()).clone(); + let mut style = (*ctx.global_style()).clone(); style.visuals.window_fill = egui::Color32::from_rgb(20, 20, 30); style.visuals.panel_fill = egui::Color32::from_rgb(25, 25, 35); style.visuals.widgets.noninteractive.bg_fill = egui::Color32::from_rgb(35, 35, 50); @@ -2097,7 +2284,7 @@ impl Renderer { style.visuals.widgets.hovered.bg_fill = egui::Color32::from_rgb(60, 60, 90); style.visuals.widgets.active.bg_fill = egui::Color32::from_rgb(80, 180, 80); style.visuals.selection.bg_fill = egui::Color32::from_rgb(60, 120, 60); - ctx.set_style(style); + ctx.set_global_style(style); match app_state { AppState::Login => { @@ -2254,7 +2441,7 @@ impl Renderer { actions: &mut Vec ) { // Top bar with tabs, search, and logout - subscription info moved to bottom - egui::TopBottomPanel::top("top_bar") + egui::Panel::top("top_bar") .frame(egui::Frame::new() .fill(egui::Color32::from_rgb(22, 22, 30)) .inner_margin(egui::Margin { left: 0, right: 0, top: 10, bottom: 10 })) @@ -2402,7 +2589,7 @@ impl Renderer { }); // Bottom bar with subscription stats - egui::TopBottomPanel::bottom("bottom_bar") + egui::Panel::bottom("bottom_bar") .frame(egui::Frame::new() .fill(egui::Color32::from_rgb(22, 22, 30)) .inner_margin(egui::Margin { left: 15, right: 15, top: 8, bottom: 8 })) @@ -2729,7 +2916,7 @@ impl Renderer { .interactable(true) .order(egui::Order::Background) // Draw behind windows .show(ctx, |ui| { - let screen_rect = ctx.input(|i| i.screen_rect()); + let screen_rect = ctx.input(|i| i.viewport_rect()); ui.painter().rect_filled( screen_rect, 0.0, diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index 9286009..276ee44 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -4,7 +4,7 @@ //! Optimized for low-latency streaming with jitter buffer. use anyhow::{Result, Context, anyhow}; -use log::{info, error, debug, warn}; +use log::{info, error, debug}; use std::sync::Arc; use std::sync::mpsc; use std::thread; @@ -307,7 +307,7 @@ impl AudioRingBuffer { /// Read samples from buffer (called from audio callback - must be fast!) fn read(&self, out: &mut [i16]) { - let mut samples = self.samples.lock(); + let samples = self.samples.lock(); let write_pos = self.write_pos.load(Ordering::Acquire); let mut read_pos = self.read_pos.load(Ordering::Acquire); diff --git a/opennow-streamer/src/media/d3d11.rs b/opennow-streamer/src/media/d3d11.rs index 1c0040d..fba8a07 100644 --- a/opennow-streamer/src/media/d3d11.rs +++ b/opennow-streamer/src/media/d3d11.rs @@ -11,16 +11,16 @@ //! //! This eliminates the expensive GPU->CPU->GPU round-trip that kills latency. -use std::sync::Arc; use log::{info, warn, debug}; +use parking_lot::Mutex; use anyhow::{Result, anyhow}; use windows::core::Interface; use windows::Win32::Foundation::HANDLE; use windows::Win32::Graphics::Direct3D11::{ - ID3D11Device, ID3D11DeviceContext, ID3D11Texture2D, - D3D11_BIND_SHADER_RESOURCE, D3D11_CPU_ACCESS_READ, - D3D11_MAPPED_SUBRESOURCE, D3D11_MAP_READ, D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + ID3D11Device, ID3D11Texture2D, + D3D11_CPU_ACCESS_READ, + D3D11_MAPPED_SUBRESOURCE, D3D11_MAP_READ, D3D11_TEXTURE2D_DESC, D3D11_USAGE_STAGING, }; use windows::Win32::Graphics::Dxgi::{ @@ -36,7 +36,7 @@ pub struct D3D11TextureWrapper { /// Texture array index (for texture arrays used by some decoders) array_index: u32, /// Shared NT handle for cross-API sharing (DX11 -> DX12) - shared_handle: Option, + shared_handle: Mutex>, /// Texture dimensions pub width: u32, pub height: u32, @@ -52,7 +52,7 @@ impl std::fmt::Debug for D3D11TextureWrapper { .field("width", &self.width) .field("height", &self.height) .field("array_index", &self.array_index) - .field("has_shared_handle", &self.shared_handle.is_some()) + .field("has_shared_handle", &self.shared_handle.lock().is_some()) .finish() } } @@ -93,7 +93,7 @@ impl D3D11TextureWrapper { Some(Self { texture, array_index: array_index as u32, - shared_handle: None, + shared_handle: Mutex::new(None), width: desc.Width, height: desc.Height, }) @@ -101,8 +101,9 @@ impl D3D11TextureWrapper { /// Get or create a shared NT handle for this texture /// This handle can be used to import the texture into DX12 - pub fn get_shared_handle(&mut self) -> Result { - if let Some(handle) = self.shared_handle { + pub fn get_shared_handle(&self) -> Result { + let mut guard = self.shared_handle.lock(); + if let Some(handle) = *guard { return Ok(handle); } @@ -112,15 +113,13 @@ impl D3D11TextureWrapper { .map_err(|e| anyhow!("Failed to cast to IDXGIResource1: {:?}", e))?; // Create shared NT handle - let mut handle = HANDLE::default(); - dxgi_resource.CreateSharedHandle( + let handle = dxgi_resource.CreateSharedHandle( None, // No security attributes - DXGI_SHARED_RESOURCE_READ, + DXGI_SHARED_RESOURCE_READ.0, None, // No name - &mut handle, ).map_err(|e| anyhow!("Failed to create shared handle: {:?}", e))?; - self.shared_handle = Some(handle); + *guard = Some(handle); Ok(handle) } } @@ -140,14 +139,12 @@ impl D3D11TextureWrapper { pub fn lock_and_get_planes(&self) -> Result { unsafe { // Get the device from the texture itself - let mut device: Option = None; - self.texture.GetDevice(&mut device); - let device = device.ok_or_else(|| anyhow!("Failed to get D3D11 device from texture"))?; + let device = self.texture.GetDevice() + .map_err(|e| anyhow!("Failed to get D3D11 device from texture: {:?}", e))?; // Get the device context - let mut context: Option = None; - device.GetImmediateContext(&mut context); - let context = context.ok_or_else(|| anyhow!("Failed to get device context"))?; + let context = device.GetImmediateContext() + .map_err(|e| anyhow!("Failed to get device context: {:?}", e))?; // Create a staging texture for CPU access let mut desc = D3D11_TEXTURE2D_DESC::default(); @@ -162,7 +159,7 @@ impl D3D11TextureWrapper { SampleDesc: desc.SampleDesc, Usage: D3D11_USAGE_STAGING, BindFlags: Default::default(), - CPUAccessFlags: D3D11_CPU_ACCESS_READ, + CPUAccessFlags: D3D11_CPU_ACCESS_READ.0 as u32, MiscFlags: Default::default(), }; @@ -223,7 +220,7 @@ impl D3D11TextureWrapper { impl Drop for D3D11TextureWrapper { fn drop(&mut self) { // Close the shared handle if we created one - if let Some(handle) = self.shared_handle.take() { + if let Some(handle) = self.shared_handle.lock().take() { unsafe { let _ = windows::Win32::Foundation::CloseHandle(handle); } diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 493fa20..3da407d 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -626,6 +626,103 @@ impl VideoDecoder { AVPixelFormat::AV_PIX_FMT_NV12 } + /// FFI Callback for format negotiation (Windows D3D11VA) + /// This callback is called by FFmpeg when it needs to select a pixel format. + /// For D3D11VA to work, we MUST initialize hw_frames_ctx here before returning D3D11 format. + #[cfg(target_os = "windows")] + unsafe extern "C" fn get_d3d11va_format( + ctx: *mut ffmpeg::ffi::AVCodecContext, + fmt: *const ffmpeg::ffi::AVPixelFormat, + ) -> ffmpeg::ffi::AVPixelFormat { + use ffmpeg::ffi::*; + + // Check if D3D11 format is available in the list + let mut has_d3d11 = false; + let mut first_sw_format = AVPixelFormat::AV_PIX_FMT_NONE; + let mut check_fmt = fmt; + while *check_fmt != AVPixelFormat::AV_PIX_FMT_NONE { + if *check_fmt == AVPixelFormat::AV_PIX_FMT_D3D11 { + has_d3d11 = true; + } + // Remember first software format as fallback + if first_sw_format == AVPixelFormat::AV_PIX_FMT_NONE { + match *check_fmt { + AVPixelFormat::AV_PIX_FMT_NV12 | + AVPixelFormat::AV_PIX_FMT_YUV420P | + AVPixelFormat::AV_PIX_FMT_YUVJ420P | + AVPixelFormat::AV_PIX_FMT_YUV420P10LE => { + first_sw_format = *check_fmt; + } + _ => {} + } + } + check_fmt = check_fmt.add(1); + } + + if !has_d3d11 { + info!("get_format: D3D11 not in format list, using software format"); + return if first_sw_format != AVPixelFormat::AV_PIX_FMT_NONE { + first_sw_format + } else { + *fmt // Return first available + }; + } + + // We have D3D11 in the list - now we need to set up hw_frames_ctx + if ctx.is_null() { + warn!("get_format: ctx is null, cannot setup D3D11VA"); + return first_sw_format; + } + + // Check if we have a hw_device_ctx + if (*ctx).hw_device_ctx.is_null() { + warn!("get_format: hw_device_ctx is null, cannot setup D3D11VA hw_frames_ctx"); + return first_sw_format; + } + + // If hw_frames_ctx is already set, just return D3D11 + if !(*ctx).hw_frames_ctx.is_null() { + info!("get_format: hw_frames_ctx already set, selecting D3D11"); + return AVPixelFormat::AV_PIX_FMT_D3D11; + } + + // Allocate hw_frames_ctx from the hw_device_ctx + let hw_frames_ref = av_hwframe_ctx_alloc((*ctx).hw_device_ctx); + if hw_frames_ref.is_null() { + warn!("get_format: Failed to allocate hw_frames_ctx"); + return first_sw_format; + } + + // Configure the hw_frames_ctx + let frames_ctx = (*hw_frames_ref).data as *mut AVHWFramesContext; + (*frames_ctx).format = AVPixelFormat::AV_PIX_FMT_D3D11; + (*frames_ctx).sw_format = AVPixelFormat::AV_PIX_FMT_NV12; // Software format for CPU transfer + (*frames_ctx).width = (*ctx).coded_width; + (*frames_ctx).height = (*ctx).coded_height; + (*frames_ctx).initial_pool_size = 10; // Pool of D3D11 surfaces + + // Initialize the hw_frames_ctx + let ret = av_hwframe_ctx_init(hw_frames_ref); + if ret < 0 { + warn!("get_format: Failed to init hw_frames_ctx (error {})", ret); + av_buffer_unref(&mut (hw_frames_ref as *mut _)); + return first_sw_format; + } + + // Attach hw_frames_ctx to codec context + (*ctx).hw_frames_ctx = av_buffer_ref(hw_frames_ref); + av_buffer_unref(&mut (hw_frames_ref as *mut _)); + + if (*ctx).hw_frames_ctx.is_null() { + warn!("get_format: Failed to ref hw_frames_ctx"); + return first_sw_format; + } + + info!("get_format: D3D11VA hw_frames_ctx initialized ({}x{}), selecting D3D11", + (*ctx).coded_width, (*ctx).coded_height); + AVPixelFormat::AV_PIX_FMT_D3D11 + } + /// Create decoder, trying hardware acceleration based on preference fn create_decoder(codec_id: ffmpeg::codec::Id, backend: VideoDecoderBackend) -> Result<(decoder::Video, bool)> { info!("create_decoder: {:?} with backend preference {:?}", codec_id, backend); @@ -750,6 +847,54 @@ impl VideoDecoder { // Platform-specific hardware decoders (Windows/Linux) #[cfg(not(target_os = "macos"))] { + // Windows: Try manual D3D11VA initialization first (generic decoder + HW device) + // This is robust against missing specific decoder names like "hevc_d3d11va" + #[cfg(target_os = "windows")] + if backend == VideoDecoderBackend::Auto || backend == VideoDecoderBackend::Dxva { + unsafe { + use ffmpeg::ffi::*; + use std::ptr; + + // Find the standard decoder (e.g., "h264", "hevc", "av1") + if let Some(codec) = ffmpeg::codec::decoder::find(codec_id) { + info!("Attempting manual D3D11VA setup for generic decoder: {}", codec.name()); + + let mut ctx = CodecContext::new_with_codec(codec); + let raw_ctx = ctx.as_mut_ptr(); + + // Create D3D11VA hardware device context + let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); + let ret = av_hwdevice_ctx_create( + &mut hw_device_ctx, + AVHWDeviceType::AV_HWDEVICE_TYPE_D3D11VA, + ptr::null(), + ptr::null_mut(), + 0, + ); + + if ret >= 0 && !hw_device_ctx.is_null() { + (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); + av_buffer_unref(&mut hw_device_ctx); + + (*raw_ctx).get_format = Some(Self::get_d3d11va_format); + (*raw_ctx).thread_count = 0; + + match ctx.decoder().video() { + Ok(decoder) => { + info!("D3D11VA hardware decoder created successfully (manual setup)"); + return Ok((decoder, true)); + } + Err(e) => { + warn!("Failed to open D3D11VA manually: {:?}", e); + } + } + } else { + warn!("Failed to create D3D11VA device context (error {})", ret); + } + } + } + } + let hw_decoder_names: Vec<&str> = if backend == VideoDecoderBackend::Software { info!("Hardware acceleration disabled by preference (Software selected)"); vec![] @@ -787,15 +932,15 @@ impl VideoDecoder { #[cfg(target_os = "windows")] { let mut decoders = Vec::new(); + // Prioritize D3D11VA for zero-copy support + decoders.push("h264_d3d11va"); + match gpu_vendor { GpuVendor::Nvidia => decoders.push("h264_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), _ => {} } - decoders.push("h264_d3d11va"); // Standard API // Fallback - if gpu_vendor != GpuVendor::Nvidia { decoders.push("h264_cuvid"); } - if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("h264_qsv"); } decoders.push("h264_dxva2"); decoders } @@ -820,14 +965,15 @@ impl VideoDecoder { #[cfg(target_os = "windows")] { let mut decoders = Vec::new(); + // Prioritize D3D11VA for zero-copy support + decoders.push("hevc_d3d11va"); + match gpu_vendor { GpuVendor::Nvidia => decoders.push("hevc_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), _ => {} } - decoders.push("hevc_d3d11va"); - if gpu_vendor != GpuVendor::Nvidia { decoders.push("hevc_cuvid"); } - if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("hevc_qsv"); } + // Fallback decoders.push("hevc_dxva2"); decoders } @@ -852,13 +998,16 @@ impl VideoDecoder { #[cfg(target_os = "windows")] { let mut decoders = Vec::new(); + // Prioritize D3D11VA for zero-copy support + decoders.push("av1_d3d11va"); + match gpu_vendor { GpuVendor::Nvidia => decoders.push("av1_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), _ => {} } - if gpu_vendor != GpuVendor::Nvidia { decoders.push("av1_cuvid"); } - if gpu_vendor != GpuVendor::Intel && qsv_available { decoders.push("av1_qsv"); } + // Fallback + decoders.push("av1_dxva2"); decoders } #[cfg(target_os = "linux")] diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index f4a08d1..6a82184 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -16,7 +16,6 @@ use std::sync::Arc; use tokio::sync::mpsc; use anyhow::Result; use log::{info, warn, error, debug}; -use serde_json::json; use webrtc::ice_transport::ice_server::RTCIceServer; use crate::app::{SessionInfo, Settings, VideoCodec, SharedFrame}; @@ -235,7 +234,7 @@ pub async fn run_streaming( let fps = settings.fps; let max_bitrate = settings.max_bitrate_kbps(); let codec = settings.codec; - let codec_str = codec.as_str().to_string(); + let _codec_str = codec.as_str().to_string(); // Create signaling client let (sig_event_tx, mut sig_event_rx) = mpsc::channel::(64); From 007bbb79d773326792adb2b74c8a2deb5afdb4a7 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 20:34:19 +0100 Subject: [PATCH 31/67] feat: Implement wgpu-based rendering for UI and video, alongside new input and video processing modules. --- opennow-streamer/src/gui/renderer.rs | 48 +- opennow-streamer/src/gui/shaders.rs | 41 +- opennow-streamer/src/input/controller.rs | 90 +-- opennow-streamer/src/media/video.rs | 685 ++++++++++++++--------- 4 files changed, 526 insertions(+), 338 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index c254968..3b329d7 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -1037,13 +1037,13 @@ impl Renderer { return; } - // EXTERNAL TEXTURE PATH: Use hardware YUV->RGB conversion when available - // This is faster than our shader-based conversion - // Only use if we have CPU-accessible frame data (y_plane not empty) - if self.external_texture_supported && frame.format == PixelFormat::NV12 && !frame.y_plane.is_empty() { - self.update_video_external_texture(frame, uv_width, uv_height); - return; - } + // EXTERNAL TEXTURE PATH: Disabled for now - using NV12 shader path instead + // The external texture API on Windows DX12 may have issues with our frame lifecycle + // TODO: Re-enable once external texture path is debugged + // if self.external_texture_supported && frame.format == PixelFormat::NV12 && !frame.y_plane.is_empty() { + // self.update_video_external_texture(frame, uv_width, uv_height); + // return; + // } // Check if we need to recreate textures (size or format change) let format_changed = self.current_format != frame.format; @@ -1557,13 +1557,16 @@ impl Renderer { ..Default::default() }); - // Create ExternalTexture logic (copied from update_video_external_texture) - // BT.709 Limited Range YCbCr to RGB conversion matrix (4x4 column-major) + // Create ExternalTexture logic + // BT.709 Full Range YCbCr to RGB conversion matrix (4x4 column-major) + // GFN streams use Full range (PC levels: Y 0-255, UV 0-255) + // Formula: R = Y + 1.5748*V, G = Y - 0.1873*U - 0.4681*V, B = Y + 1.8556*U + // With UV offset of -0.5 baked into the matrix offsets let yuv_conversion_matrix: [f32; 16] = [ - 1.164, 1.164, 1.164, 0.0, - 0.0, -0.213, 2.112, 0.0, - 1.793, -0.533, 0.0, 0.0, - -0.874, 0.531, -1.086, 1.0, + 1.0, 1.0, 1.0, 0.0, // Y coefficients (Full range: no scaling) + 0.0, -0.1873, 1.8556, 0.0, // U coefficients + 1.5748, -0.4681, 0.0, 0.0, // V coefficients + -0.7874, 0.3277, -0.9278, 1.0, // Offsets (UV shift baked in) ]; let gamut_conversion_matrix: [f32; 9] = [ @@ -1855,18 +1858,15 @@ impl Renderer { let uv_view = self.uv_texture.as_ref().unwrap() .create_view(&wgpu::TextureViewDescriptor::default()); - // BT.709 Limited Range YCbCr to RGB conversion matrix (4x4 column-major) - // This matrix converts from YCbCr (with Y in [16,235] and CbCr in [16,240]) - // to RGB [0,1]. The matrix includes the offset and scaling. - // Standard BT.709 matrix coefficients: - // R = 1.164*(Y-16) + 1.793*(Cr-128) - // G = 1.164*(Y-16) - 0.213*(Cb-128) - 0.533*(Cr-128) - // B = 1.164*(Y-16) + 2.112*(Cb-128) + // BT.709 Full Range YCbCr to RGB conversion matrix (4x4 column-major) + // GFN streams use Full range (PC levels: Y 0-255, UV 0-255) + // Formula: R = Y + 1.5748*V, G = Y - 0.1873*U - 0.4681*V, B = Y + 1.8556*U + // With UV offset of -0.5 baked into the matrix offsets let yuv_conversion_matrix: [f32; 16] = [ - 1.164, 1.164, 1.164, 0.0, // Column 0: Y coefficients - 0.0, -0.213, 2.112, 0.0, // Column 1: Cb coefficients - 1.793, -0.533, 0.0, 0.0, // Column 2: Cr coefficients - -0.874, 0.531, -1.086, 1.0, // Column 3: Offset (includes -16/255 and -128/255 adjustments) + 1.0, 1.0, 1.0, 0.0, // Column 0: Y coefficients (Full range: no scaling) + 0.0, -0.1873, 1.8556, 0.0, // Column 1: U coefficients + 1.5748, -0.4681, 0.0, 0.0, // Column 2: V coefficients + -0.7874, 0.3277, -0.9278, 1.0, // Column 3: Offsets (UV shift baked in) ]; // Identity gamut conversion (no color space conversion needed) diff --git a/opennow-streamer/src/gui/shaders.rs b/opennow-streamer/src/gui/shaders.rs index 0fca44f..27bc38e 100644 --- a/opennow-streamer/src/gui/shaders.rs +++ b/opennow-streamer/src/gui/shaders.rs @@ -1,7 +1,7 @@ //! GPU Shaders for video rendering //! //! WGSL shaders for YUV to RGB conversion on the GPU. -//! BT.709 limited range conversion matching NVIDIA's H.265 encoder output. +//! BT.709 Full range conversion for GFN streams. /// WGSL shader for YUV420P format (3 separate planes) /// Fallback path when NV12 is not available @@ -55,17 +55,16 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4 { let u_raw = textureSample(u_texture, video_sampler, input.tex_coord).r; let v_raw = textureSample(v_texture, video_sampler, input.tex_coord).r; - // BT.709 Limited Range (TV range: Y 16-235, UV 16-240) - // Despite CUVID reporting "Full", NVIDIA's H.265 encoder typically outputs Limited range - // Scale from limited [16/255, 235/255] to full [0, 1] - let y = (y_raw - 0.0627) * 1.164; // (y - 16/255) * (255/219) - let u = (u_raw - 0.5) * 1.138; // (u - 128/255) * (255/224) - let v = (v_raw - 0.5) * 1.138; + // BT.709 Full Range (PC range: Y 0-255, UV 0-255) + // GFN streams report Full range - use direct values with no scaling + let y = y_raw; + let u = u_raw - 0.5; + let v = v_raw - 0.5; - // BT.709 color matrix - let r = y + 1.793 * v; - let g = y - 0.213 * u - 0.533 * v; - let b = y + 2.112 * u; + // BT.709 color matrix (Full range coefficients) + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); } @@ -73,7 +72,7 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4 { /// WGSL shader for NV12 format (CUVID on Windows, VideoToolbox on macOS) /// Primary GPU path - Y plane (R8) + interleaved UV plane (Rg8) -/// BT.709 limited range YUV to RGB conversion +/// BT.709 Full range YUV to RGB conversion (GFN streams use Full range) pub const NV12_SHADER: &str = r#" struct VertexOutput { @builtin(position) position: vec4, @@ -124,16 +123,16 @@ fn fs_main(input: VertexOutput) -> @location(0) vec4 { let u_raw = uv.r; let v_raw = uv.g; - // BT.709 Limited Range (TV range: Y 16-235, UV 16-240) - // Despite CUVID reporting "Full", NVIDIA's H.265 encoder typically outputs Limited range - let y = (y_raw - 0.0627) * 1.164; - let u = (u_raw - 0.5) * 1.138; - let v = (v_raw - 0.5) * 1.138; + // BT.709 Full Range (PC range: Y 0-255, UV 0-255) + // GFN streams report Full range - use direct values with no scaling + let y = y_raw; + let u = u_raw - 0.5; + let v = v_raw - 0.5; - // BT.709 color matrix - let r = y + 1.793 * v; - let g = y - 0.213 * u - 0.533 * v; - let b = y + 2.112 * u; + // BT.709 color matrix (Full range coefficients) + let r = y + 1.5748 * v; + let g = y - 0.1873 * u - 0.4681 * v; + let b = y + 1.8556 * u; return vec4(clamp(r, 0.0, 1.0), clamp(g, 0.0, 1.0), clamp(b, 0.0, 1.0), 1.0); } diff --git a/opennow-streamer/src/input/controller.rs b/opennow-streamer/src/input/controller.rs index 5fcfb49..c0fc349 100644 --- a/opennow-streamer/src/input/controller.rs +++ b/opennow-streamer/src/input/controller.rs @@ -3,7 +3,7 @@ use std::time::Duration; use parking_lot::Mutex; use tokio::sync::mpsc; use log::{info, warn, error, debug, trace}; -use gilrs::{Gilrs, Event, EventType, Button, Axis}; +use gilrs::{GilrsBuilder, Event, EventType, Button, Axis}; use crate::webrtc::InputEvent; use super::get_timestamp_us; @@ -82,9 +82,16 @@ impl ControllerManager { std::thread::spawn(move || { info!("Controller input thread starting..."); - let mut gilrs = match Gilrs::new() { + // Initialize gilrs WITHOUT built-in axis filtering + // This gives us raw axis values so our radial deadzone works correctly + // on all controller types (Xbox, PS5, etc.) + let mut gilrs = match GilrsBuilder::new() + .with_default_filters(false) // Disable all default filters + .set_axis_to_btn(0.5, 0.4) // Only used for D-pad on some controllers + .build() + { Ok(g) => { - info!("gilrs initialized successfully"); + info!("gilrs initialized (raw mode - no built-in filtering)"); g } Err(e) => { @@ -169,50 +176,65 @@ impl ControllerManager { if gamepad.is_pressed(Button::North) { button_flags |= XINPUT_Y; } // Analog triggers (0-255) - // gilrs uses different axes for different controllers - // Try LeftZ/RightZ first (common), then fall back to trigger buttons - let lt_axis = gamepad.value(Axis::LeftZ); - let rt_axis = gamepad.value(Axis::RightZ); - - // Triggers typically range from 0.0 to 1.0 (or -1.0 to 1.0 on some controllers) - // Normalize to 0-255 - let left_trigger = if lt_axis.abs() < 0.01 && gamepad.is_pressed(Button::LeftTrigger2) { - 255u8 // Fallback: if no axis but button pressed, assume full - } else { - // Handle both 0..1 and -1..1 ranges - let normalized = if lt_axis < 0.0 { (lt_axis + 1.0) / 2.0 } else { lt_axis }; - (normalized.clamp(0.0, 1.0) * 255.0) as u8 - }; + // gilrs provides trigger values via button_data() for LeftTrigger2/RightTrigger2 + // This is the most reliable method across different controller types + + let get_trigger_value = |button: Button, axis: Axis| -> u8 { + // Method 1: Get analog value from button_data (most reliable) + if let Some(data) = gamepad.button_data(button) { + let val = data.value(); + if val > 0.01 { + return (val.clamp(0.0, 1.0) * 255.0) as u8; + } + } + + // Method 2: Try axis value (some controllers use Z axes) + let axis_val = gamepad.value(axis); + if axis_val.abs() > 0.01 { + // Handle both 0..1 and -1..1 ranges + let normalized = if axis_val < -0.5 { + (axis_val + 1.0) / 2.0 // XInput style: -1 to 1 + } else { + axis_val // Standard: 0 to 1 + }; + let result = (normalized.clamp(0.0, 1.0) * 255.0) as u8; + if result > 0 { + return result; + } + } - let right_trigger = if rt_axis.abs() < 0.01 && gamepad.is_pressed(Button::RightTrigger2) { - 255u8 - } else { - let normalized = if rt_axis < 0.0 { (rt_axis + 1.0) / 2.0 } else { rt_axis }; - (normalized.clamp(0.0, 1.0) * 255.0) as u8 + // Method 3: Digital fallback + if gamepad.is_pressed(button) { + return 255u8; + } + + 0u8 }; + let left_trigger = get_trigger_value(Button::LeftTrigger2, Axis::LeftZ); + let right_trigger = get_trigger_value(Button::RightTrigger2, Axis::RightZ); + // Analog sticks (-32768 to 32767) let lx_val = gamepad.value(Axis::LeftStickX); let ly_val = gamepad.value(Axis::LeftStickY); let rx_val = gamepad.value(Axis::RightStickX); let ry_val = gamepad.value(Axis::RightStickY); - // Apply deadzone - let apply_deadzone = |val: f32| -> f32 { - if val.abs() < STICK_DEADZONE { - 0.0 + // Apply RADIAL deadzone (prevents cardinal snapping) + // Treats the stick as a 2D vector and applies deadzone to magnitude + let apply_radial_deadzone = |x: f32, y: f32| -> (f32, f32) { + let magnitude = (x * x + y * y).sqrt(); + if magnitude < STICK_DEADZONE { + (0.0, 0.0) } else { - // Scale remaining range to full range - let sign = val.signum(); - let magnitude = (val.abs() - STICK_DEADZONE) / (1.0 - STICK_DEADZONE); - sign * magnitude + // Scale remaining range to full range, preserving angle + let scale = (magnitude - STICK_DEADZONE) / (1.0 - STICK_DEADZONE) / magnitude; + (x * scale, y * scale) } }; - let lx = apply_deadzone(lx_val); - let ly = apply_deadzone(ly_val); - let rx = apply_deadzone(rx_val); - let ry = apply_deadzone(ry_val); + let (lx, ly) = apply_radial_deadzone(lx_val, ly_val); + let (rx, ry) = apply_radial_deadzone(rx_val, ry_val); // Convert to i16 range let left_stick_x = (lx * 32767.0).clamp(-32768.0, 32767.0) as i16; diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 3da407d..ed7d61b 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -626,9 +626,10 @@ impl VideoDecoder { AVPixelFormat::AV_PIX_FMT_NV12 } - /// FFI Callback for format negotiation (Windows D3D11VA) - /// This callback is called by FFmpeg when it needs to select a pixel format. - /// For D3D11VA to work, we MUST initialize hw_frames_ctx here before returning D3D11 format. + /// FFI Callback for D3D11VA format negotiation (works on all Windows GPUs) + /// This produces D3D11 textures that can be shared with wgpu via DXGI handles + /// + /// CRITICAL: This callback must set up hw_frames_ctx for D3D11VA to work! #[cfg(target_os = "windows")] unsafe extern "C" fn get_d3d11va_format( ctx: *mut ffmpeg::ffi::AVCodecContext, @@ -636,91 +637,116 @@ impl VideoDecoder { ) -> ffmpeg::ffi::AVPixelFormat { use ffmpeg::ffi::*; - // Check if D3D11 format is available in the list + // Check if D3D11 format is available let mut has_d3d11 = false; - let mut first_sw_format = AVPixelFormat::AV_PIX_FMT_NONE; let mut check_fmt = fmt; while *check_fmt != AVPixelFormat::AV_PIX_FMT_NONE { if *check_fmt == AVPixelFormat::AV_PIX_FMT_D3D11 { has_d3d11 = true; - } - // Remember first software format as fallback - if first_sw_format == AVPixelFormat::AV_PIX_FMT_NONE { - match *check_fmt { - AVPixelFormat::AV_PIX_FMT_NV12 | - AVPixelFormat::AV_PIX_FMT_YUV420P | - AVPixelFormat::AV_PIX_FMT_YUVJ420P | - AVPixelFormat::AV_PIX_FMT_YUV420P10LE => { - first_sw_format = *check_fmt; - } - _ => {} - } + break; } check_fmt = check_fmt.add(1); } if !has_d3d11 { - info!("get_format: D3D11 not in format list, using software format"); - return if first_sw_format != AVPixelFormat::AV_PIX_FMT_NONE { - first_sw_format - } else { - *fmt // Return first available - }; + warn!("get_format: D3D11 not in available formats list"); + // Return the first available format + return *fmt; } - // We have D3D11 in the list - now we need to set up hw_frames_ctx - if ctx.is_null() { - warn!("get_format: ctx is null, cannot setup D3D11VA"); - return first_sw_format; - } - - // Check if we have a hw_device_ctx + // We need hw_device_ctx to create hw_frames_ctx if (*ctx).hw_device_ctx.is_null() { - warn!("get_format: hw_device_ctx is null, cannot setup D3D11VA hw_frames_ctx"); - return first_sw_format; + warn!("get_format: hw_device_ctx is null, cannot use D3D11VA"); + return *fmt; } - // If hw_frames_ctx is already set, just return D3D11 + // Check if hw_frames_ctx already exists (might be called multiple times) if !(*ctx).hw_frames_ctx.is_null() { info!("get_format: hw_frames_ctx already set, selecting D3D11"); return AVPixelFormat::AV_PIX_FMT_D3D11; } - // Allocate hw_frames_ctx from the hw_device_ctx + // Allocate hw_frames_ctx from hw_device_ctx let hw_frames_ref = av_hwframe_ctx_alloc((*ctx).hw_device_ctx); if hw_frames_ref.is_null() { warn!("get_format: Failed to allocate hw_frames_ctx"); - return first_sw_format; + return *fmt; } - // Configure the hw_frames_ctx + // Configure the frames context let frames_ctx = (*hw_frames_ref).data as *mut AVHWFramesContext; (*frames_ctx).format = AVPixelFormat::AV_PIX_FMT_D3D11; - (*frames_ctx).sw_format = AVPixelFormat::AV_PIX_FMT_NV12; // Software format for CPU transfer + + // Determine sw_format based on codec and bit depth + // HEVC Main10 profile needs P010 (10-bit), others use NV12 (8-bit) + let sw_format = if (*ctx).codec_id == AVCodecID::AV_CODEC_ID_HEVC && (*ctx).profile == 2 { + // Main10 profile + info!("get_format: HEVC Main10 detected, using P010 format"); + AVPixelFormat::AV_PIX_FMT_P010LE + } else if (*ctx).pix_fmt == AVPixelFormat::AV_PIX_FMT_YUV420P10LE + || (*ctx).pix_fmt == AVPixelFormat::AV_PIX_FMT_YUV420P10BE { + info!("get_format: 10-bit content detected, using P010 format"); + AVPixelFormat::AV_PIX_FMT_P010LE + } else { + AVPixelFormat::AV_PIX_FMT_NV12 + }; + + (*frames_ctx).sw_format = sw_format; (*frames_ctx).width = (*ctx).coded_width; (*frames_ctx).height = (*ctx).coded_height; - (*frames_ctx).initial_pool_size = 10; // Pool of D3D11 surfaces + (*frames_ctx).initial_pool_size = 20; // Larger pool for smoother decoding + + info!("get_format: Configuring D3D11VA hw_frames_ctx: {}x{}, sw_format={:?}, pool_size=20", + (*ctx).coded_width, (*ctx).coded_height, sw_format as i32); - // Initialize the hw_frames_ctx + // Initialize the frames context let ret = av_hwframe_ctx_init(hw_frames_ref); if ret < 0 { - warn!("get_format: Failed to init hw_frames_ctx (error {})", ret); + // Try again with NV12 if P010 failed + if sw_format != AVPixelFormat::AV_PIX_FMT_NV12 { + warn!("get_format: P010 failed, trying NV12 fallback"); + (*frames_ctx).sw_format = AVPixelFormat::AV_PIX_FMT_NV12; + let ret2 = av_hwframe_ctx_init(hw_frames_ref); + if ret2 >= 0 { + (*ctx).hw_frames_ctx = av_buffer_ref(hw_frames_ref); + av_buffer_unref(&mut (hw_frames_ref as *mut _)); + info!("get_format: D3D11VA hw_frames_ctx initialized with NV12 fallback!"); + return AVPixelFormat::AV_PIX_FMT_D3D11; + } + } + warn!("get_format: Failed to initialize hw_frames_ctx (error {})", ret); av_buffer_unref(&mut (hw_frames_ref as *mut _)); - return first_sw_format; + return *fmt; } - // Attach hw_frames_ctx to codec context + // Attach to codec context (*ctx).hw_frames_ctx = av_buffer_ref(hw_frames_ref); av_buffer_unref(&mut (hw_frames_ref as *mut _)); - if (*ctx).hw_frames_ctx.is_null() { - warn!("get_format: Failed to ref hw_frames_ctx"); - return first_sw_format; + info!("get_format: D3D11VA hw_frames_ctx initialized successfully - zero-copy enabled!"); + AVPixelFormat::AV_PIX_FMT_D3D11 + } + + /// FFI Callback for CUDA format negotiation (NVIDIA CUVID) + #[cfg(target_os = "windows")] + unsafe extern "C" fn get_cuda_format( + _ctx: *mut ffmpeg::ffi::AVCodecContext, + fmt: *const ffmpeg::ffi::AVPixelFormat, + ) -> ffmpeg::ffi::AVPixelFormat { + use ffmpeg::ffi::*; + + let mut check_fmt = fmt; + while *check_fmt != AVPixelFormat::AV_PIX_FMT_NONE { + if *check_fmt == AVPixelFormat::AV_PIX_FMT_CUDA { + info!("get_format: selecting CUDA hardware format"); + return AVPixelFormat::AV_PIX_FMT_CUDA; + } + check_fmt = check_fmt.add(1); } - info!("get_format: D3D11VA hw_frames_ctx initialized ({}x{}), selecting D3D11", - (*ctx).coded_width, (*ctx).coded_height); - AVPixelFormat::AV_PIX_FMT_D3D11 + // Fallback to NV12 + info!("get_format: CUDA not available, falling back to NV12"); + AVPixelFormat::AV_PIX_FMT_NV12 } /// Create decoder, trying hardware acceleration based on preference @@ -847,201 +873,334 @@ impl VideoDecoder { // Platform-specific hardware decoders (Windows/Linux) #[cfg(not(target_os = "macos"))] { - // Windows: Try manual D3D11VA initialization first (generic decoder + HW device) - // This is robust against missing specific decoder names like "hevc_d3d11va" + // Windows hardware decoder selection + // Priority: CUVID (NVIDIA) > QSV (Intel) > D3D11VA (universal but has driver issues) #[cfg(target_os = "windows")] - if backend == VideoDecoderBackend::Auto || backend == VideoDecoderBackend::Dxva { - unsafe { - use ffmpeg::ffi::*; - use std::ptr; + if backend != VideoDecoderBackend::Software { + let gpu_vendor = detect_gpu_vendor(); - // Find the standard decoder (e.g., "h264", "hevc", "av1") - if let Some(codec) = ffmpeg::codec::decoder::find(codec_id) { - info!("Attempting manual D3D11VA setup for generic decoder: {}", codec.name()); - - let mut ctx = CodecContext::new_with_codec(codec); - let raw_ctx = ctx.as_mut_ptr(); - - // Create D3D11VA hardware device context - let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); - let ret = av_hwdevice_ctx_create( - &mut hw_device_ctx, - AVHWDeviceType::AV_HWDEVICE_TYPE_D3D11VA, - ptr::null(), - ptr::null_mut(), - 0, - ); + // For NVIDIA GPUs, skip D3D11VA and use CUVID directly + // CUVID is more reliable and has lower latency on NVIDIA hardware + let try_d3d11va = gpu_vendor != GpuVendor::Nvidia + && (backend == VideoDecoderBackend::Auto || backend == VideoDecoderBackend::Dxva); - if ret >= 0 && !hw_device_ctx.is_null() { - (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); - av_buffer_unref(&mut hw_device_ctx); - - (*raw_ctx).get_format = Some(Self::get_d3d11va_format); - (*raw_ctx).thread_count = 0; + // Try D3D11VA for non-NVIDIA GPUs (AMD, Intel) + if try_d3d11va { + info!("Attempting D3D11VA hardware acceleration (for AMD/Intel GPU)"); - match ctx.decoder().video() { + let codec = ffmpeg::codec::decoder::find(codec_id) + .ok_or_else(|| anyhow!("Decoder not found for {:?}", codec_id)); + + if let Ok(codec) = codec { + let result = unsafe { + use ffmpeg::ffi::*; + use windows::core::Interface; + use windows::Win32::Foundation::HMODULE; + use windows::Win32::Graphics::Direct3D::*; + use windows::Win32::Graphics::Direct3D11::*; + + // Create D3D11 device with VIDEO_SUPPORT flag + // This is critical for D3D11VA to work properly + let mut device: Option = None; + let mut context: Option = None; + let mut feature_level = D3D_FEATURE_LEVEL_11_0; + + let flags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT | D3D11_CREATE_DEVICE_BGRA_SUPPORT; + + let hr = D3D11CreateDevice( + None, // Default adapter + D3D_DRIVER_TYPE_HARDWARE, + HMODULE::default(), // No software rasterizer + flags, + Some(&[D3D_FEATURE_LEVEL_11_1, D3D_FEATURE_LEVEL_11_0]), + D3D11_SDK_VERSION, + Some(&mut device), + Some(&mut feature_level), + Some(&mut context), + ); + + if hr.is_err() || device.is_none() { + warn!("Failed to create D3D11 device with video support: {:?}", hr); + // Fall through to CUVID/QSV + } else { + let device = device.unwrap(); + info!("Created D3D11 device with VIDEO_SUPPORT flag (feature level: {:?})", feature_level); + + // Enable multithread protection + if let Ok(mt) = device.cast::() { + mt.SetMultithreadProtected(true); + } + + // Allocate hw_device_ctx and configure with our device + let hw_device_ref = av_hwdevice_ctx_alloc(AVHWDeviceType::AV_HWDEVICE_TYPE_D3D11VA); + if !hw_device_ref.is_null() { + // Get the D3D11VA device context and set our device + // AVD3D11VADeviceContext structure: first field is ID3D11Device* + let hw_device_ctx = (*hw_device_ref).data as *mut AVHWDeviceContext; + let d3d11_device_hwctx = (*hw_device_ctx).hwctx as *mut *mut std::ffi::c_void; + + // Set the device pointer (first field of AVD3D11VADeviceContext) + *d3d11_device_hwctx = std::mem::transmute_copy(&device); + std::mem::forget(device); // Don't drop, FFmpeg owns it now + + // Initialize the device context + let ret = av_hwdevice_ctx_init(hw_device_ref); + if ret >= 0 { + info!("D3D11VA hw_device_ctx initialized with custom video device"); + + let mut ctx = CodecContext::new_with_codec(codec); + let raw_ctx = ctx.as_mut_ptr(); + + (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ref); + av_buffer_unref(&mut (hw_device_ref as *mut _)); + + // Set format callback to select D3D11 pixel format + (*raw_ctx).get_format = Some(Self::get_d3d11va_format); + + // Low latency flags for streaming + (*raw_ctx).flags |= AV_CODEC_FLAG_LOW_DELAY as i32; + (*raw_ctx).flags2 |= AV_CODEC_FLAG2_FAST as i32; + (*raw_ctx).thread_count = 1; // Single thread for lowest latency + + match ctx.decoder().video() { + Ok(decoder) => { + info!("D3D11VA hardware decoder opened successfully - zero-copy GPU decoding active!"); + return Ok((decoder, true)); + } + Err(e) => { + warn!("D3D11VA decoder failed to open: {:?}", e); + } + } + } else { + warn!("Failed to initialize D3D11VA device context (error {})", ret); + av_buffer_unref(&mut (hw_device_ref as *mut _)); + } + } else { + warn!("Failed to allocate D3D11VA device context"); + } + } + + // D3D11VA failed, return error to try next backend + Err(ffmpeg::Error::Bug) + }; + + match result { + Ok(decoder) => { + info!("D3D11VA hardware decoder opened successfully - zero-copy GPU decoding active!"); + return Ok((decoder, true)); + } + Err(e) => { + warn!("D3D11VA decoder failed to open: {:?}, trying other backends...", e); + } + } + } + } + + // Try dedicated hardware decoders (CUVID/QSV) + // CUVID for NVIDIA, QSV for Intel - these are the most reliable options + let qsv_available = check_qsv_available(); + + // Build prioritized list of hardware decoders to try + let hw_decoders: Vec<&str> = match codec_id { + ffmpeg::codec::Id::H264 => { + let mut list = Vec::new(); + // NVIDIA CUVID first (most reliable for NVIDIA) + if gpu_vendor == GpuVendor::Nvidia || backend == VideoDecoderBackend::Cuvid { + list.push("h264_cuvid"); + } + // Intel QSV + if (gpu_vendor == GpuVendor::Intel && qsv_available) || backend == VideoDecoderBackend::Qsv { + list.push("h264_qsv"); + } + // AMD AMF (if available) + if gpu_vendor == GpuVendor::Amd { + list.push("h264_amf"); + } + // Generic fallbacks + if !list.contains(&"h264_cuvid") { list.push("h264_cuvid"); } + if !list.contains(&"h264_qsv") { list.push("h264_qsv"); } + list + } + ffmpeg::codec::Id::HEVC => { + let mut list = Vec::new(); + // NVIDIA CUVID first (most reliable for NVIDIA) + if gpu_vendor == GpuVendor::Nvidia || backend == VideoDecoderBackend::Cuvid { + list.push("hevc_cuvid"); + } + // Intel QSV + if (gpu_vendor == GpuVendor::Intel && qsv_available) || backend == VideoDecoderBackend::Qsv { + list.push("hevc_qsv"); + } + // AMD AMF (if available) + if gpu_vendor == GpuVendor::Amd { + list.push("hevc_amf"); + } + // Generic fallbacks + if !list.contains(&"hevc_cuvid") { list.push("hevc_cuvid"); } + if !list.contains(&"hevc_qsv") { list.push("hevc_qsv"); } + list + } + ffmpeg::codec::Id::AV1 => { + let mut list = Vec::new(); + // NVIDIA CUVID first (RTX 30+ series) + if gpu_vendor == GpuVendor::Nvidia || backend == VideoDecoderBackend::Cuvid { + list.push("av1_cuvid"); + } + // Intel QSV (11th gen+) + if (gpu_vendor == GpuVendor::Intel && qsv_available) || backend == VideoDecoderBackend::Qsv { + list.push("av1_qsv"); + } + // Generic fallbacks + if !list.contains(&"av1_cuvid") { list.push("av1_cuvid"); } + if !list.contains(&"av1_qsv") { list.push("av1_qsv"); } + list + } + _ => vec![], + }; + + info!("Trying hardware decoders for {:?}: {:?} (GPU: {:?})", codec_id, hw_decoders, gpu_vendor); + + // Try each hardware decoder in order + for decoder_name in &hw_decoders { + if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(decoder_name) { + info!("Found hardware decoder: {}, attempting to open...", decoder_name); + + // For CUVID decoders, we may need CUDA device context + if decoder_name.contains("cuvid") { + let result = unsafe { + use ffmpeg::ffi::*; + use std::ptr; + + let mut ctx = CodecContext::new_with_codec(hw_codec); + let raw_ctx = ctx.as_mut_ptr(); + + // Create CUDA device context for CUVID + let mut hw_device_ctx: *mut AVBufferRef = ptr::null_mut(); + let ret = av_hwdevice_ctx_create( + &mut hw_device_ctx, + AVHWDeviceType::AV_HWDEVICE_TYPE_CUDA, + ptr::null(), + ptr::null_mut(), + 0, + ); + + if ret >= 0 && !hw_device_ctx.is_null() { + (*raw_ctx).hw_device_ctx = av_buffer_ref(hw_device_ctx); + av_buffer_unref(&mut hw_device_ctx); + (*raw_ctx).get_format = Some(Self::get_cuda_format); + } + + // Set low latency flags for streaming + (*raw_ctx).flags |= AV_CODEC_FLAG_LOW_DELAY as i32; + (*raw_ctx).flags2 |= AV_CODEC_FLAG2_FAST as i32; + + ctx.decoder().video() + }; + + match result { Ok(decoder) => { - info!("D3D11VA hardware decoder created successfully (manual setup)"); + info!("CUVID hardware decoder ({}) opened successfully - GPU decoding active!", decoder_name); return Ok((decoder, true)); } Err(e) => { - warn!("Failed to open D3D11VA manually: {:?}", e); + warn!("Failed to open CUVID decoder {}: {:?}", decoder_name, e); } } } else { - warn!("Failed to create D3D11VA device context (error {})", ret); + // For QSV and other decoders, just open directly + let mut ctx = CodecContext::new_with_codec(hw_codec); + + unsafe { + let raw_ctx = ctx.as_mut_ptr(); + // Set low latency flags + (*raw_ctx).flags |= ffmpeg::ffi::AV_CODEC_FLAG_LOW_DELAY as i32; + (*raw_ctx).flags2 |= ffmpeg::ffi::AV_CODEC_FLAG2_FAST as i32; + } + + match ctx.decoder().video() { + Ok(decoder) => { + info!("Hardware decoder ({}) opened successfully - GPU decoding active!", decoder_name); + return Ok((decoder, true)); + } + Err(e) => { + warn!("Failed to open hardware decoder {}: {:?}", decoder_name, e); + } + } } + } else { + debug!("Hardware decoder not found in FFmpeg: {}", decoder_name); } } + + warn!("All hardware decoders failed, will use software decoder"); } - let hw_decoder_names: Vec<&str> = if backend == VideoDecoderBackend::Software { - info!("Hardware acceleration disabled by preference (Software selected)"); - vec![] - } else if backend != VideoDecoderBackend::Auto { - // Explicit backend selection - match (backend, codec_id) { - (VideoDecoderBackend::Cuvid, ffmpeg::codec::Id::H264) => vec!["h264_cuvid"], - (VideoDecoderBackend::Cuvid, ffmpeg::codec::Id::HEVC) => vec!["hevc_cuvid"], - (VideoDecoderBackend::Cuvid, ffmpeg::codec::Id::AV1) => vec!["av1_cuvid"], - - (VideoDecoderBackend::Qsv, ffmpeg::codec::Id::H264) => vec!["h264_qsv"], - (VideoDecoderBackend::Qsv, ffmpeg::codec::Id::HEVC) => vec!["hevc_qsv"], - (VideoDecoderBackend::Qsv, ffmpeg::codec::Id::AV1) => vec!["av1_qsv"], - - (VideoDecoderBackend::Vaapi, ffmpeg::codec::Id::H264) => vec!["h264_vaapi"], - (VideoDecoderBackend::Vaapi, ffmpeg::codec::Id::HEVC) => vec!["hevc_vaapi"], - (VideoDecoderBackend::Vaapi, ffmpeg::codec::Id::AV1) => vec!["av1_vaapi"], - - (VideoDecoderBackend::Dxva, ffmpeg::codec::Id::H264) => vec!["h264_d3d11va", "h264_dxva2"], - (VideoDecoderBackend::Dxva, ffmpeg::codec::Id::HEVC) => vec!["hevc_d3d11va", "hevc_dxva2"], - (VideoDecoderBackend::Dxva, ffmpeg::codec::Id::AV1) => vec!["av1_d3d11va", "av1_dxva2"], - - _ => { - warn!("No decoder found for backend {:?} and codec {:?}", backend, codec_id); - vec![] - } - } - } else { - // Auto detection logic + // Linux hardware decoder handling + #[cfg(target_os = "linux")] + if backend != VideoDecoderBackend::Software { let qsv_available = check_qsv_available(); let gpu_vendor = detect_gpu_vendor(); - - match codec_id { + + let hw_decoder_names: Vec<&str> = match codec_id { ffmpeg::codec::Id::H264 => { - #[cfg(target_os = "windows")] - { - let mut decoders = Vec::new(); - // Prioritize D3D11VA for zero-copy support - decoders.push("h264_d3d11va"); - - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("h264_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), - _ => {} - } - // Fallback - decoders.push("h264_dxva2"); - decoders + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("h264_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), + GpuVendor::Amd => decoders.push("h264_vaapi"), + _ => {} } - #[cfg(target_os = "linux")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("h264_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), - GpuVendor::Amd => decoders.push("h264_vaapi"), - _ => {} - } - if !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } - if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } - if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } - decoders - } - #[cfg(not(any(target_os = "windows", target_os = "linux")))] - vec![] + if !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } + if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } + if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } + decoders } ffmpeg::codec::Id::HEVC => { - #[cfg(target_os = "windows")] - { - let mut decoders = Vec::new(); - // Prioritize D3D11VA for zero-copy support - decoders.push("hevc_d3d11va"); - - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("hevc_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), - _ => {} - } - // Fallback - decoders.push("hevc_dxva2"); - decoders + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("hevc_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), + GpuVendor::Amd => decoders.push("hevc_vaapi"), + _ => {} } - #[cfg(target_os = "linux")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("hevc_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), - GpuVendor::Amd => decoders.push("hevc_vaapi"), - _ => {} - } - if !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } - if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } - if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } - decoders - } - #[cfg(not(any(target_os = "windows", target_os = "linux")))] - vec![] + if !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } + if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } + if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } + decoders } ffmpeg::codec::Id::AV1 => { - #[cfg(target_os = "windows")] - { - let mut decoders = Vec::new(); - // Prioritize D3D11VA for zero-copy support - decoders.push("av1_d3d11va"); - - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("av1_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), - _ => {} - } - // Fallback - decoders.push("av1_dxva2"); - decoders - } - #[cfg(target_os = "linux")] - { - let mut decoders = Vec::new(); - match gpu_vendor { - GpuVendor::Nvidia => decoders.push("av1_cuvid"), - GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), - GpuVendor::Amd => decoders.push("av1_vaapi"), - _ => {} - } - if !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } - if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } - if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } - decoders + let mut decoders = Vec::new(); + match gpu_vendor { + GpuVendor::Nvidia => decoders.push("av1_cuvid"), + GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), + GpuVendor::Amd => decoders.push("av1_vaapi"), + _ => {} } - #[cfg(not(any(target_os = "windows", target_os = "linux")))] - vec![] + if !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } + if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } + if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } + decoders } _ => vec![], - } - }; + }; + + info!("Trying Linux hardware decoders for {:?}: {:?} (GPU: {:?})", codec_id, hw_decoder_names, gpu_vendor); - if !hw_decoder_names.is_empty() { - info!("Attempting hardware decoders for {:?}: {:?}", codec_id, hw_decoder_names); for hw_name in &hw_decoder_names { if let Some(hw_codec) = ffmpeg::codec::decoder::find_by_name(hw_name) { info!("Found hardware decoder: {}, attempting to open...", hw_name); let mut ctx = CodecContext::new_with_codec(hw_codec); - ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + unsafe { + let raw_ctx = ctx.as_mut_ptr(); + // Set low latency flags + (*raw_ctx).flags |= ffmpeg::ffi::AV_CODEC_FLAG_LOW_DELAY as i32; + (*raw_ctx).flags2 |= ffmpeg::ffi::AV_CODEC_FLAG2_FAST as i32; + } match ctx.decoder().video() { Ok(dec) => { - info!("Successfully created hardware decoder: {}", hw_name); + info!("Hardware decoder ({}) opened successfully - GPU decoding active!", hw_name); return Ok((dec, true)); } Err(e) => { @@ -1052,12 +1211,7 @@ impl VideoDecoder { debug!("Hardware decoder not found: {}", hw_name); } } - - if backend != VideoDecoderBackend::Auto { - warn!("Explicitly selected backend {:?} failed to initialize. Falling back to software.", backend); - } - } else if backend != VideoDecoderBackend::Software && backend != VideoDecoderBackend::Auto { - warn!("No decoder mapped for explicit backend {:?} with codec {:?}", backend, codec_id); + warn!("All Linux hardware decoders failed, will use software decoder"); } } @@ -1316,60 +1470,73 @@ impl VideoDecoder { let uv_stride = frame_to_use.stride(1) as u32; let uv_height = h / 2; - // GPU texture upload requires 256-byte aligned rows (wgpu restriction) - let aligned_y_stride = Self::get_aligned_stride(w); - let aligned_uv_stride = Self::get_aligned_stride(w); - let y_data = frame_to_use.data(0); let uv_data = frame_to_use.data(1); - // Optimized copy - fast path when strides match - let copy_plane_fast = |src: &[u8], src_stride: u32, dst_stride: u32, width: u32, height: u32| -> Vec { - let total_size = (dst_stride * height) as usize; - if src_stride == dst_stride && src.len() >= total_size { - // Fast path: single memcpy - src[..total_size].to_vec() - } else { - // Slow path: row-by-row - let mut dst = vec![0u8; total_size]; - for row in 0..height as usize { - let src_start = row * src_stride as usize; - let src_end = src_start + width as usize; - let dst_start = row * dst_stride as usize; - if src_end <= src.len() { - dst[dst_start..dst_start + width as usize] - .copy_from_slice(&src[src_start..src_end]); + // Check if we actually have data + if y_data.is_empty() || uv_data.is_empty() || y_stride == 0 { + warn!("NV12 frame has empty data: y_len={}, uv_len={}, y_stride={}", + y_data.len(), uv_data.len(), y_stride); + // Fall through to scaler path + } else { + // GPU texture upload requires 256-byte aligned rows (wgpu restriction) + let aligned_y_stride = Self::get_aligned_stride(w); + let aligned_uv_stride = Self::get_aligned_stride(w); + + if *frames_decoded == 1 { + info!("NV12 direct path: {}x{}, y_stride={}, uv_stride={}, y_len={}, uv_len={}", + w, h, y_stride, uv_stride, y_data.len(), uv_data.len()); + } + + // Optimized copy - fast path when strides match + let copy_plane_fast = |src: &[u8], src_stride: u32, dst_stride: u32, copy_width: u32, height: u32| -> Vec { + let total_size = (dst_stride * height) as usize; + if src_stride == dst_stride && src.len() >= total_size { + // Fast path: single memcpy + src[..total_size].to_vec() + } else { + // Slow path: row-by-row + let mut dst = vec![0u8; total_size]; + for row in 0..height as usize { + let src_start = row * src_stride as usize; + let src_end = src_start + copy_width as usize; + let dst_start = row * dst_stride as usize; + if src_end <= src.len() { + dst[dst_start..dst_start + copy_width as usize] + .copy_from_slice(&src[src_start..src_end]); + } } + dst } - dst - } - }; + }; - let y_plane = copy_plane_fast(y_data, y_stride, aligned_y_stride, w, h); - let uv_plane = copy_plane_fast(uv_data, uv_stride, aligned_uv_stride, w, uv_height); + let y_plane = copy_plane_fast(y_data, y_stride, aligned_y_stride, w, h); + let uv_plane = copy_plane_fast(uv_data, uv_stride, aligned_uv_stride, w, uv_height); - if *frames_decoded == 1 { - info!("NV12 direct GPU path: {}x{} - bypassing CPU scaler", w, h); - } + if *frames_decoded == 1 { + info!("NV12 direct GPU path: {}x{} - bypassing CPU scaler (y={} bytes, uv={} bytes)", + w, h, y_plane.len(), uv_plane.len()); + } - return Some(VideoFrame { - width: w, - height: h, - y_plane, - u_plane: uv_plane, - v_plane: Vec::new(), - y_stride: aligned_y_stride, - u_stride: aligned_uv_stride, - v_stride: 0, - timestamp_us: 0, - format: PixelFormat::NV12, - color_range, - color_space, - #[cfg(target_os = "macos")] - gpu_frame: None, - #[cfg(target_os = "windows")] - gpu_frame: None, - }); + return Some(VideoFrame { + width: w, + height: h, + y_plane, + u_plane: uv_plane, + v_plane: Vec::new(), + y_stride: aligned_y_stride, + u_stride: aligned_uv_stride, + v_stride: 0, + timestamp_us: 0, + format: PixelFormat::NV12, + color_range, + color_space, + #[cfg(target_os = "macos")] + gpu_frame: None, + #[cfg(target_os = "windows")] + gpu_frame: None, + }); + } } // For other formats, use scaler to convert to NV12 From 9a562edbf7de38b7d9fa80d034e0d4bcf8336fef Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 22:16:14 +0100 Subject: [PATCH 32/67] feat: Add core application state management `App` struct and its associated logic for the streamer. --- opennow-streamer/src/app/mod.rs | 44 +++++++++++++++++++++++++++++++++ opennow-streamer/src/main.rs | 14 +++++++++++ 2 files changed, 58 insertions(+) diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index c284968..f1e35b5 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -165,6 +165,12 @@ pub struct App { /// Number of times we've polled after session became ready (to ensure candidates) session_ready_poll_count: u32, + + /// Anti-AFK mode enabled (Ctrl+Shift+F10 to toggle) + pub anti_afk_enabled: bool, + + /// Last time anti-AFK sent a key press + anti_afk_last_send: std::time::Instant, } /// Poll interval for session status (2 seconds) @@ -288,6 +294,41 @@ impl App { last_render_fps_time: std::time::Instant::now(), last_render_frame_count: 0, session_ready_poll_count: 0, + anti_afk_enabled: false, + anti_afk_last_send: std::time::Instant::now(), + } + } + + /// Toggle anti-AFK mode + pub fn toggle_anti_afk(&mut self) { + self.anti_afk_enabled = !self.anti_afk_enabled; + if self.anti_afk_enabled { + self.anti_afk_last_send = std::time::Instant::now(); + info!("Anti-AFK mode ENABLED - sending F13 every 4 minutes"); + } else { + info!("Anti-AFK mode DISABLED"); + } + } + + /// Send anti-AFK key press (F13) if enabled and interval elapsed + pub fn update_anti_afk(&mut self) { + if !self.anti_afk_enabled || self.state != AppState::Streaming { + return; + } + + // Check if 4 minutes have passed + if self.anti_afk_last_send.elapsed() >= std::time::Duration::from_secs(240) { + if let Some(ref input_handler) = self.input_handler { + // F13 virtual key code is 0x7C (124) + const VK_F13: u16 = 0x7C; + + // Send key down then key up + input_handler.handle_key(VK_F13, true, 0); // Key down + input_handler.handle_key(VK_F13, false, 0); // Key up + + self.anti_afk_last_send = std::time::Instant::now(); + log::debug!("Anti-AFK: sent F13 key press"); + } } } @@ -560,6 +601,9 @@ impl App { self.last_render_fps_time = now; } + // Update anti-AFK (sends F13 every 4 minutes when enabled) + self.update_anti_afk(); + // Check for new video frames from shared frame holder if let Some(ref shared) = self.shared_frame { if let Some(frame) = shared.read() { diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index 4b6ff17..3a58e2d 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -226,6 +226,20 @@ impl ApplicationHandler for OpenNowApp { let mut app = self.app.lock(); app.toggle_stats(); } + // Ctrl+Shift+F10 to toggle anti-AFK mode + WindowEvent::KeyboardInput { + event: KeyEvent { + physical_key: PhysicalKey::Code(KeyCode::F10), + state: ElementState::Pressed, + .. + }, + .. + } if self.modifiers.state().control_key() && self.modifiers.state().shift_key() => { + let mut app = self.app.lock(); + if app.state == AppState::Streaming { + app.toggle_anti_afk(); + } + } WindowEvent::ModifiersChanged(new_modifiers) => { self.modifiers = new_modifiers; } From dc65087b24745c5d1158b712ad057ee466caf822 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 22:26:28 +0100 Subject: [PATCH 33/67] feat: add Opus audio decoder and cpal audio player with dynamic device switching and resampling --- opennow-streamer/src/media/audio.rs | 279 ++++++++++++++++++++++++++-- 1 file changed, 268 insertions(+), 11 deletions(-) diff --git a/opennow-streamer/src/media/audio.rs b/opennow-streamer/src/media/audio.rs index 276ee44..4a59b19 100644 --- a/opennow-streamer/src/media/audio.rs +++ b/opennow-streamer/src/media/audio.rs @@ -2,14 +2,15 @@ //! //! Decode Opus audio using FFmpeg and play through cpal. //! Optimized for low-latency streaming with jitter buffer. +//! Supports dynamic device switching and sample rate conversion. use anyhow::{Result, Context, anyhow}; -use log::{info, error, debug}; +use log::{info, warn, error, debug}; use std::sync::Arc; use std::sync::mpsc; use std::thread; use parking_lot::Mutex; -use std::sync::atomic::{AtomicUsize, Ordering}; +use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering}; extern crate ffmpeg_next as ffmpeg; @@ -244,11 +245,31 @@ impl Drop for AudioDecoder { } /// Audio player using cpal with optimized lock-free-ish ring buffer +/// Supports sample rate conversion and dynamic device switching pub struct AudioPlayer { - sample_rate: u32, + /// Input sample rate (from decoder, typically 48000Hz) + input_sample_rate: u32, + /// Output sample rate (device native rate) + output_sample_rate: u32, channels: u32, buffer: Arc, - _stream: Option, + stream: Arc>>, + /// Flag to indicate stream needs recreation (device change) + needs_restart: Arc, + /// Current device name for change detection + current_device_name: Arc>, + /// Resampler state for 48000 -> device rate conversion + resampler: Arc>, +} + +/// Simple linear resampler for audio rate conversion +struct AudioResampler { + input_rate: u32, + output_rate: u32, + /// Fractional sample position for interpolation + phase: f64, + /// Last sample for interpolation (per channel) + last_samples: Vec, } /// Lock-free ring buffer for audio samples @@ -324,6 +345,84 @@ impl AudioRingBuffer { } } +impl AudioResampler { + fn new(input_rate: u32, output_rate: u32, channels: u32) -> Self { + Self { + input_rate, + output_rate, + phase: 0.0, + last_samples: vec![0i16; channels as usize], + } + } + + /// Resample audio from input_rate to output_rate using linear interpolation + /// Returns resampled samples + fn resample(&mut self, input: &[i16], channels: u32) -> Vec { + if self.input_rate == self.output_rate { + return input.to_vec(); + } + + let ratio = self.input_rate as f64 / self.output_rate as f64; + let input_frames = input.len() / channels as usize; + let output_frames = ((input_frames as f64) / ratio).ceil() as usize; + let mut output = Vec::with_capacity(output_frames * channels as usize); + + let channels = channels as usize; + + for _ in 0..output_frames { + let input_idx = self.phase as usize; + let frac = self.phase - input_idx as f64; + + for ch in 0..channels { + let sample_idx = input_idx * channels + ch; + let next_idx = (input_idx + 1) * channels + ch; + + let s0 = if sample_idx < input.len() { + input[sample_idx] + } else { + self.last_samples.get(ch).copied().unwrap_or(0) + }; + + let s1 = if next_idx < input.len() { + input[next_idx] + } else if sample_idx < input.len() { + input[sample_idx] + } else { + s0 + }; + + // Linear interpolation + let interpolated = s0 as f64 + (s1 as f64 - s0 as f64) * frac; + output.push(interpolated.clamp(-32768.0, 32767.0) as i16); + } + + self.phase += ratio; + } + + // Keep fractional phase, reset integer part + self.phase = self.phase.fract(); + + // Store last samples for next buffer's interpolation + if input.len() >= channels { + for ch in 0..channels { + let idx = input.len() - channels + ch; + self.last_samples[ch] = input[idx]; + } + } + + output + } + + /// Update rates (for device change) + fn set_output_rate(&mut self, output_rate: u32) { + if self.output_rate != output_rate { + self.output_rate = output_rate; + self.phase = 0.0; + info!("Resampler updated: {}Hz -> {}Hz", self.input_rate, output_rate); + } + } +} + impl AudioPlayer { /// Create a new audio player pub fn new(sample_rate: u32, channels: u32) -> Result { @@ -485,19 +584,40 @@ impl AudioPlayer { stream.play().context("Failed to start audio playback")?; - info!("Audio player started successfully"); + let device_name = device.name().unwrap_or_default(); + info!("Audio player started successfully on '{}'", device_name); + + // Create resampler for input_rate -> output_rate conversion + let resampler = AudioResampler::new(sample_rate, actual_rate.0, actual_channels as u32); + + if sample_rate != actual_rate.0 { + info!("Audio resampling enabled: {}Hz -> {}Hz", sample_rate, actual_rate.0); + } Ok(Self { - sample_rate: actual_rate.0, + input_sample_rate: sample_rate, + output_sample_rate: actual_rate.0, channels: actual_channels as u32, buffer, - _stream: Some(stream), + stream: Arc::new(Mutex::new(Some(stream))), + needs_restart: Arc::new(AtomicBool::new(false)), + current_device_name: Arc::new(Mutex::new(device_name)), + resampler: Arc::new(Mutex::new(resampler)), }) } - /// Push audio samples to the player + /// Push audio samples to the player (with automatic resampling) pub fn push_samples(&self, samples: &[i16]) { - self.buffer.write(samples); + // Check if device changed and we need to restart + self.check_device_change(); + + // Resample if needed (48000Hz decoder -> device rate) + let resampled = { + let mut resampler = self.resampler.lock(); + resampler.resample(samples, self.channels) + }; + + self.buffer.write(&resampled); } /// Get buffer fill level @@ -505,13 +625,150 @@ impl AudioPlayer { self.buffer.available() } - /// Get sample rate + /// Get output sample rate (device rate) pub fn sample_rate(&self) -> u32 { - self.sample_rate + self.output_sample_rate } /// Get channel count pub fn channels(&self) -> u32 { self.channels } + + /// Check if the default audio device changed and restart stream if needed + fn check_device_change(&self) { + use cpal::traits::{DeviceTrait, HostTrait, StreamTrait}; + + let host = cpal::default_host(); + let current_device = match host.default_output_device() { + Some(d) => d, + None => return, + }; + + let new_name = current_device.name().unwrap_or_default(); + let current_name = self.current_device_name.lock().clone(); + + if new_name != current_name && !new_name.is_empty() { + warn!("Audio device changed: '{}' -> '{}'", current_name, new_name); + + // Update device name + *self.current_device_name.lock() = new_name.clone(); + + // Recreate the audio stream on the new device + if let Err(e) = self.recreate_stream(¤t_device) { + error!("Failed to switch audio device: {}", e); + } else { + info!("Audio switched to '{}'", new_name); + } + } + } + + /// Recreate the audio stream on a new device + fn recreate_stream(&self, device: &cpal::Device) -> Result<()> { + use cpal::traits::{DeviceTrait, StreamTrait}; + use cpal::SampleFormat; + + // Stop old stream + *self.stream.lock() = None; + + // Query supported configurations + let supported_configs: Vec<_> = device.supported_output_configs() + .map(|configs| configs.collect()) + .unwrap_or_default(); + + if supported_configs.is_empty() { + return Err(anyhow!("No supported audio configurations on new device")); + } + + // Find best config (prefer F32, matching channels) + let target_channels = self.channels as u16; + let mut best_config = None; + let mut best_score = 0i32; + + for cfg in &supported_configs { + let mut score = 0i32; + if cfg.sample_format() == SampleFormat::F32 { score += 100; } + if cfg.channels() == target_channels { score += 50; } + if cfg.max_sample_rate().0 >= 44100 { score += 25; } + + if score > best_score { + best_score = score; + best_config = Some(cfg.clone()); + } + } + + let supported_range = best_config + .ok_or_else(|| anyhow!("No suitable audio config on new device"))?; + + // Pick sample rate + let actual_rate = if cpal::SampleRate(48000) >= supported_range.min_sample_rate() + && cpal::SampleRate(48000) <= supported_range.max_sample_rate() { + cpal::SampleRate(48000) + } else if cpal::SampleRate(44100) >= supported_range.min_sample_rate() + && cpal::SampleRate(44100) <= supported_range.max_sample_rate() { + cpal::SampleRate(44100) + } else { + supported_range.max_sample_rate() + }; + + let sample_format = supported_range.sample_format(); + let config = supported_range.with_sample_rate(actual_rate).into(); + let buffer = self.buffer.clone(); + + info!("New device config: {}Hz, {} channels, {:?}", + actual_rate.0, self.channels, sample_format); + + // Update resampler for new output rate + self.resampler.lock().set_output_rate(actual_rate.0); + + // Build new stream + let stream = match sample_format { + SampleFormat::F32 => { + let buf = buffer.clone(); + device.build_output_stream( + &config, + move |data: &mut [f32], _| { + let mut i16_buf = vec![0i16; data.len()]; + buf.read(&mut i16_buf); + for (out, &sample) in data.iter_mut().zip(i16_buf.iter()) { + *out = sample as f32 / 32768.0; + } + }, + |err| error!("Audio stream error: {}", err), + None, + ).context("Failed to create audio stream")? + } + SampleFormat::I16 => { + let buf = buffer.clone(); + device.build_output_stream( + &config, + move |data: &mut [i16], _| { + buf.read(data); + }, + |err| error!("Audio stream error: {}", err), + None, + ).context("Failed to create audio stream")? + } + _ => { + let buf = buffer.clone(); + device.build_output_stream( + &config, + move |data: &mut [f32], _| { + let mut i16_buf = vec![0i16; data.len()]; + buf.read(&mut i16_buf); + for (out, &sample) in data.iter_mut().zip(i16_buf.iter()) { + *out = sample as f32 / 32768.0; + } + }, + |err| error!("Audio stream error: {}", err), + None, + ).context("Failed to create audio stream")? + } + }; + + stream.play().context("Failed to start audio on new device")?; + *self.stream.lock() = Some(stream); + + Ok(()) + } } From 5b6b496e137df3eac7adbf5917043de319a63b93 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sat, 3 Jan 2026 23:46:09 +0100 Subject: [PATCH 34/67] feat: Implement proactive token refreshing and synchronous refresh on cache load. --- opennow-streamer/src/app/cache.rs | 53 ++++++++++++++++++++++++++++--- opennow-streamer/src/app/mod.rs | 43 +++++++++++++++++++++++++ opennow-streamer/src/auth/mod.rs | 12 +++++++ 3 files changed, 104 insertions(+), 4 deletions(-) diff --git a/opennow-streamer/src/app/cache.rs b/opennow-streamer/src/app/cache.rs index 6a2b35c..5f5f479 100644 --- a/opennow-streamer/src/app/cache.rs +++ b/opennow-streamer/src/app/cache.rs @@ -71,16 +71,61 @@ pub fn load_tokens() -> Option { let content = std::fs::read_to_string(&path).ok()?; let tokens: AuthTokens = serde_json::from_str(&content).ok()?; - // Validate token is not expired + // If token is expired, try to refresh it if tokens.is_expired() { - info!("Saved token expired, clearing auth file"); - let _ = std::fs::remove_file(&path); - return None; + if tokens.can_refresh() { + info!("Token expired, attempting refresh..."); + // Try synchronous refresh using a blocking tokio runtime + match try_refresh_tokens_sync(&tokens) { + Some(new_tokens) => { + info!("Token refresh successful!"); + return Some(new_tokens); + } + None => { + warn!("Token refresh failed, clearing auth file"); + let _ = std::fs::remove_file(&path); + return None; + } + } + } else { + info!("Token expired and no refresh token available, clearing auth file"); + let _ = std::fs::remove_file(&path); + return None; + } } Some(tokens) } +/// Attempt to refresh tokens synchronously (blocking) +/// Used when loading tokens at startup +fn try_refresh_tokens_sync(tokens: &AuthTokens) -> Option { + let refresh_token = tokens.refresh_token.as_ref()?; + + // Create a new tokio runtime for this blocking operation + let rt = tokio::runtime::Builder::new_current_thread() + .enable_all() + .build() + .ok()?; + + let refresh_token_clone = refresh_token.clone(); + let result = rt.block_on(async { + crate::auth::refresh_token(&refresh_token_clone).await + }); + + match result { + Ok(new_tokens) => { + // Save the new tokens + save_tokens(&new_tokens); + Some(new_tokens) + } + Err(e) => { + warn!("Token refresh failed: {}", e); + None + } + } +} + pub fn save_tokens(tokens: &AuthTokens) { if let Some(path) = tokens_path() { if let Some(parent) = path.parent() { diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index f1e35b5..dd736fe 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -171,6 +171,9 @@ pub struct App { /// Last time anti-AFK sent a key press anti_afk_last_send: std::time::Instant, + + /// Whether a token refresh is currently in progress + token_refresh_in_progress: bool, } /// Poll interval for session status (2 seconds) @@ -296,6 +299,7 @@ impl App { session_ready_poll_count: 0, anti_afk_enabled: false, anti_afk_last_send: std::time::Instant::now(), + token_refresh_in_progress: false, } } @@ -604,6 +608,45 @@ impl App { // Update anti-AFK (sends F13 every 4 minutes when enabled) self.update_anti_afk(); + // Proactive token refresh: refresh before expiration to avoid session interruption + if !self.token_refresh_in_progress { + if let Some(ref tokens) = self.auth_tokens { + if tokens.should_refresh() && tokens.can_refresh() { + info!("Token nearing expiry, proactively refreshing..."); + self.token_refresh_in_progress = true; + + let refresh_token = tokens.refresh_token.clone().unwrap(); + let runtime = self.runtime.clone(); + runtime.spawn(async move { + match auth::refresh_token(&refresh_token).await { + Ok(new_tokens) => { + info!("Proactive token refresh successful!"); + cache::save_tokens(&new_tokens); + } + Err(e) => { + warn!("Proactive token refresh failed: {}", e); + } + } + }); + } + } + } + + // Check for refreshed tokens from async refresh task + if self.token_refresh_in_progress { + if let Some(new_tokens) = cache::load_tokens() { + if let Some(ref old_tokens) = self.auth_tokens { + // Check if tokens were actually refreshed (new expires_at) + if new_tokens.expires_at > old_tokens.expires_at { + info!("Loaded refreshed tokens"); + self.auth_tokens = Some(new_tokens.clone()); + self.api_client.set_access_token(new_tokens.jwt().to_string()); + self.token_refresh_in_progress = false; + } + } + } + } + // Check for new video frames from shared frame holder if let Some(ref shared) = self.shared_frame { if let Some(frame) = shared.read() { diff --git a/opennow-streamer/src/auth/mod.rs b/opennow-streamer/src/auth/mod.rs index 5fd32dc..0304454 100644 --- a/opennow-streamer/src/auth/mod.rs +++ b/opennow-streamer/src/auth/mod.rs @@ -236,6 +236,18 @@ impl AuthTokens { now >= self.expires_at } + /// Check if token should be refreshed (expires within 10 minutes) + pub fn should_refresh(&self) -> bool { + let now = chrono::Utc::now().timestamp(); + // Refresh if less than 10 minutes (600 seconds) remaining + self.expires_at - now < 600 + } + + /// Check if we have a refresh token available + pub fn can_refresh(&self) -> bool { + self.refresh_token.is_some() + } + /// Get the JWT token for API calls (id_token if available, else access_token) pub fn jwt(&self) -> &str { self.id_token.as_deref().unwrap_or(&self.access_token) From e4b4aa4dfb88ee4c33122dc9e453d42bdd4451d3 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 00:28:07 +0100 Subject: [PATCH 35/67] perf: Optimize macOS rendering with 60fps minimum and display sync, remove mouse input flush timer, and configure video decoder for low-latency with single-thread and fast flags. --- opennow-streamer/src/gui/renderer.rs | 16 +++--- opennow-streamer/src/input/macos.rs | 83 ++++++---------------------- opennow-streamer/src/media/video.rs | 8 ++- 3 files changed, 32 insertions(+), 75 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 3b329d7..748d79e 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -847,7 +847,7 @@ impl Renderer { } let frame_rate_range = CAFrameRateRange { - minimum: 120.0, // Minimum 120fps - don't allow lower + minimum: 60.0, // Allow 60fps minimum for flexibility maximum: 120.0, preferred: 120.0, }; @@ -856,13 +856,13 @@ impl Renderer { let responds: bool = msg_send![layer, respondsToSelector: sel!(setPreferredFrameRateRange:)]; if responds { let _: () = msg_send![layer, setPreferredFrameRateRange: frame_rate_range]; - info!("macOS: Set preferredFrameRateRange to 120fps fixed (ProMotion)"); + info!("macOS: Set preferredFrameRateRange to 60-120fps (ProMotion)"); } - // Keep displaySync ENABLED for ProMotion - it needs VSync to pace at 120Hz - // Disabling it causes ProMotion to fall back to 60Hz + // Enable displaySync for smooth presentation (no tearing) + // Latency is handled by decoder flags, not here let _: () = msg_send![layer, setDisplaySyncEnabled: true]; - info!("macOS: Configured CAMetalLayer for 120Hz ProMotion"); + info!("macOS: Enabled displaySync on CAMetalLayer for tear-free rendering"); } } } @@ -1410,9 +1410,9 @@ impl Renderer { if copied { let _: () = msg_send![blit_encoder, endEncoding]; let _: () = msg_send![command_buffer, commit]; - // DON'T wait for completion - let GPU work async - // waitUntilCompleted blocks and adds latency! - // The GPU will naturally synchronize when wgpu renders + // NOTE: Not waiting for completion - GPU synchronization + // is handled by the fact that we're rendering immediately after + // and Metal will queue the operations correctly within the same frame // Store CVMetalTextures to keep them alive self.current_y_cv_texture = Some(y_metal); diff --git a/opennow-streamer/src/input/macos.rs b/opennow-streamer/src/input/macos.rs index 2d84afd..4f563dd 100644 --- a/opennow-streamer/src/input/macos.rs +++ b/opennow-streamer/src/input/macos.rs @@ -4,9 +4,8 @@ //! Captures mouse deltas directly for responsive input without OS acceleration effects. //! Events are coalesced (batched) every 2ms like the official GFN client. //! -//! Key optimizations matching official GFN client: +//! Key optimizations: //! - Lock-free event accumulation using atomics -//! - Periodic flush timer to prevent event stalls //! - Local cursor tracking for instant visual feedback use std::sync::atomic::{AtomicBool, AtomicI32, AtomicU64, AtomicPtr, Ordering}; @@ -18,9 +17,7 @@ use parking_lot::Mutex; use crate::webrtc::InputEvent; use super::{get_timestamp_us, session_elapsed_us, MOUSE_COALESCE_INTERVAL_US}; -/// Maximum time between mouse flushes (microseconds) -/// Even if no movement, flush periodically to prevent stale events -const MAX_FLUSH_INTERVAL_US: u64 = 8_000; // 8ms = 125Hz minimum + // Core Graphics bindings #[link(name = "CoreGraphics", kind = "framework")] @@ -169,11 +166,10 @@ static EVENT_SENDER: Mutex>> = Mutex::new(None); static RUN_LOOP: AtomicPtr = AtomicPtr::new(std::ptr::null_mut()); static EVENT_TAP: AtomicPtr = AtomicPtr::new(std::ptr::null_mut()); -// Flush timer state -static FLUSH_TIMER_ACTIVE: AtomicBool = AtomicBool::new(false); + /// Flush coalesced mouse events -/// Uses try_lock to avoid blocking the event tap callback +/// Uses blocking lock to ensure events are never dropped (matches Windows behavior) #[inline] fn flush_coalesced_events() { let dx = COALESCE_DX.swap(0, Ordering::AcqRel); @@ -191,29 +187,20 @@ fn flush_coalesced_events() { info!("Mouse flush #{}: dx={}, dy={}", count, dx, dy); } - // Use try_lock to avoid blocking - if locked, events stay accumulated for next flush - if let Some(guard) = EVENT_SENDER.try_lock() { - if let Some(ref sender) = *guard { - if sender.try_send(InputEvent::MouseMove { - dx: dx as i16, - dy: dy as i16, - timestamp_us, - }).is_err() { - // Channel full - put deltas back for next attempt (conflation) - COALESCE_DX.fetch_add(dx, Ordering::Relaxed); - COALESCE_DY.fetch_add(dy, Ordering::Relaxed); - warn!("Input channel full (backpressure) - coalescing events"); - } - } else if count < 5 { - warn!("EVENT_SENDER is None - raw input sender not configured!"); - } - } else { - // Lock contention - put deltas back for next flush attempt - COALESCE_DX.fetch_add(dx, Ordering::Relaxed); - COALESCE_DY.fetch_add(dy, Ordering::Relaxed); - if count < 5 { - debug!("Lock contention, deferring mouse flush"); + // Use blocking lock to match Windows behavior - never drop events + let guard = EVENT_SENDER.lock(); + if let Some(ref sender) = *guard { + if sender.try_send(InputEvent::MouseMove { + dx: dx as i16, + dy: dy as i16, + timestamp_us, + }).is_err() { + // Channel full - this is a real backpressure situation + // Log it but don't re-queue (would cause more delays) + warn!("Input channel full - event dropped"); } + } else if count < 5 { + warn!("EVENT_SENDER is None - raw input sender not configured!"); } } } @@ -307,41 +294,12 @@ extern "C" fn event_tap_callback( event } -/// Start the periodic flush timer thread -/// This ensures mouse events are sent even when there's no new input (prevents stalls) -fn start_flush_timer() { - if FLUSH_TIMER_ACTIVE.swap(true, Ordering::SeqCst) { - return; // Already running - } - - std::thread::spawn(|| { - info!("Mouse flush timer started ({}us interval)", MAX_FLUSH_INTERVAL_US); - - while FLUSH_TIMER_ACTIVE.load(Ordering::SeqCst) && RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { - // Sleep for flush interval - std::thread::sleep(std::time::Duration::from_micros(MAX_FLUSH_INTERVAL_US)); - - if RAW_INPUT_ACTIVE.load(Ordering::SeqCst) { - // Check if we should flush based on time since last send - let now_us = session_elapsed_us(); - let last_us = COALESCE_LAST_SEND_US.load(Ordering::Acquire); - if now_us.saturating_sub(last_us) >= MOUSE_COALESCE_INTERVAL_US { - flush_coalesced_events(); - } - } - } - - FLUSH_TIMER_ACTIVE.store(false, Ordering::SeqCst); - debug!("Mouse flush timer stopped"); - }); -} /// Start raw input capture pub fn start_raw_input() -> Result<(), String> { if RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); - start_flush_timer(); // Ensure timer is running info!("Raw input resumed"); return Ok(()); } @@ -395,8 +353,7 @@ pub fn start_raw_input() -> Result<(), String> { RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); info!("Raw input started - capturing mouse events via CGEventTap"); - // Start the periodic flush timer - start_flush_timer(); + // Flush timer DISABLED - causes lock contention latency // Run the loop (blocks until stopped) CFRunLoopRun(); @@ -438,7 +395,6 @@ pub fn resume_raw_input() { ACCUMULATED_DX.store(0, Ordering::SeqCst); ACCUMULATED_DY.store(0, Ordering::SeqCst); RAW_INPUT_ACTIVE.store(true, Ordering::SeqCst); - start_flush_timer(); // Ensure timer is running debug!("Raw input resumed"); } } @@ -447,9 +403,6 @@ pub fn resume_raw_input() { pub fn stop_raw_input() { RAW_INPUT_ACTIVE.store(false, Ordering::SeqCst); - // Stop the flush timer - FLUSH_TIMER_ACTIVE.store(false, Ordering::SeqCst); - // Stop the run loop let run_loop = RUN_LOOP.swap(std::ptr::null_mut(), Ordering::AcqRel); if !run_loop.is_null() { diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index ed7d61b..401ebdd 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -849,8 +849,12 @@ impl VideoDecoder { // Without this, the decoder will output software frames (YUV420P) (*raw_ctx).get_format = Some(Self::get_videotoolbox_format); - // Enable multi-threading for software fallback paths - (*raw_ctx).thread_count = 0; // 0 = auto (use all cores) + // Use single thread for lowest latency - multi-threading causes frame reordering delays + (*raw_ctx).thread_count = 1; + + // Low latency flags for streaming (same as Windows D3D11VA) + (*raw_ctx).flags |= AV_CODEC_FLAG_LOW_DELAY as i32; + (*raw_ctx).flags2 |= AV_CODEC_FLAG2_FAST as i32; match ctx.decoder().video() { Ok(decoder) => { From 1585316f091bba9d5ecfaff866a2b6ed1f42395e Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 01:14:43 +0100 Subject: [PATCH 36/67] fix: Apply Cargo.toml version update only to the first 10 lines in auto-build workflow. --- .github/workflows/auto-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 40fc813..823cea8 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -186,11 +186,12 @@ jobs: VERSION="0.1.0" fi - # Update opennow-streamer/Cargo.toml + # Update opennow-streamer/Cargo.toml - only replace the package version (in first 10 lines) + # Using sed's line range to avoid changing dependency versions like wgpu-hal if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" opennow-streamer/Cargo.toml + sed -i '' "1,10s/^version = \"[^\"]*\"/version = \"$VERSION\"/" opennow-streamer/Cargo.toml else - sed -i "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" opennow-streamer/Cargo.toml + sed -i "1,10s/^version = \"[^\"]*\"/version = \"$VERSION\"/" opennow-streamer/Cargo.toml fi # Verify the version was set correctly From 32246f3cb14b7cb5d4b0b81a44ab38009d6e8e78 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 01:27:14 +0100 Subject: [PATCH 37/67] build: Update FFmpeg download to n7.1 builds for Windows and Linux ARM64 for `ffmpeg-next v8.0.0` compatibility. --- .github/workflows/auto-build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 823cea8..8b5c3aa 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -254,8 +254,9 @@ jobs: if: matrix.target == 'windows-arm64' shell: pwsh run: | - # Download ARM64 FFmpeg build from BtbN (GitHub releases) - use master-latest for stability - $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-winarm64-lgpl-shared.zip" + # Download ARM64 FFmpeg build from BtbN (GitHub releases) + # Use FFmpeg 7.1 for compatibility with ffmpeg-next v8.0.0 (master-latest may have unsupported enum variants) + $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.1-latest-winarm64-lgpl-shared.zip" Write-Host "Downloading FFmpeg ARM64 from $ffmpegUrl..." Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip @@ -335,8 +336,9 @@ jobs: libasound2-dev:arm64 \ libudev-dev:arm64 - # Download pre-built FFmpeg ARM64 from BtbN - use master-latest for stability - FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-linuxarm64-lgpl-shared.tar.xz" + # Download pre-built FFmpeg ARM64 from BtbN + # Use FFmpeg 7.1 for compatibility with ffmpeg-next v8.0.0 (master-latest may have unsupported enum variants) + FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.1-latest-linuxarm64-lgpl-shared.tar.xz" echo "Downloading FFmpeg ARM64 from $FFMPEG_URL..." wget -q "$FFMPEG_URL" -O ffmpeg.tar.xz From cf81962fb878614820f8c329c7a0d996f118437d Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 01:32:55 +0100 Subject: [PATCH 38/67] fix: Update FFmpeg ARM64 download URLs to include the version tag. --- .github/workflows/auto-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 8b5c3aa..04bb63f 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -255,8 +255,8 @@ jobs: shell: pwsh run: | # Download ARM64 FFmpeg build from BtbN (GitHub releases) - # Use FFmpeg 7.1 for compatibility with ffmpeg-next v8.0.0 (master-latest may have unsupported enum variants) - $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.1-latest-winarm64-lgpl-shared.zip" + # Use FFmpeg 8.0 stable (not master-latest which may have unsupported enum variants) + $ffmpegUrl = "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-winarm64-lgpl-shared-8.0.zip" Write-Host "Downloading FFmpeg ARM64 from $ffmpegUrl..." Invoke-WebRequest -Uri $ffmpegUrl -OutFile ffmpeg.zip @@ -337,8 +337,8 @@ jobs: libudev-dev:arm64 # Download pre-built FFmpeg ARM64 from BtbN - # Use FFmpeg 7.1 for compatibility with ffmpeg-next v8.0.0 (master-latest may have unsupported enum variants) - FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.1-latest-linuxarm64-lgpl-shared.tar.xz" + # Use FFmpeg 8.0 stable (not master-latest which may have unsupported enum variants) + FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-n8.0-latest-linuxarm64-lgpl-shared-8.0.tar.xz" echo "Downloading FFmpeg ARM64 from $FFMPEG_URL..." wget -q "$FFMPEG_URL" -O ffmpeg.tar.xz From 437f06451ab36c34792490cae93a5eeef9319e94 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 02:12:40 +0100 Subject: [PATCH 39/67] feat: Refactor macOS build to create a proper .app bundle with Info.plist and zip it for release. --- .github/workflows/auto-build.yml | 115 ++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 39 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 04bb63f..5b76019 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -439,41 +439,79 @@ jobs: Write-Host "`n=== Bundled FFmpeg DLLs ===" Get-ChildItem $targetDir -Filter "*.dll" | ForEach-Object { Write-Host " - $($_.Name)" } - - name: Bundle FFmpeg dylibs (macOS) + - name: Bundle macOS App if: matrix.target == 'macos' shell: bash + env: + VERSION: ${{ needs.get-version.outputs.version_number }} run: | set -e cd opennow-streamer BINARY="target/release/opennow-streamer" - BUNDLE_DIR="target/release/bundle" - - echo "Creating bundle directory structure..." - mkdir -p "$BUNDLE_DIR/libs" - - # Check if binary exists + APP_NAME="OpenNOW" + APP_DIR="target/release/$APP_NAME.app" + CONTENTS_DIR="$APP_DIR/Contents" + MACOS_DIR="$CONTENTS_DIR/MacOS" + FRAMEWORKS_DIR="$CONTENTS_DIR/Frameworks" + RESOURCES_DIR="$CONTENTS_DIR/Resources" + + echo "Creating .app bundle structure for $APP_NAME v$VERSION..." + rm -rf "$APP_DIR" + mkdir -p "$MACOS_DIR" "$FRAMEWORKS_DIR" "$RESOURCES_DIR" + + # Check binary if [ ! -f "$BINARY" ]; then echo "ERROR: Binary not found at $BINARY" exit 1 fi - # Copy the binary - cp "$BINARY" "$BUNDLE_DIR/" - chmod +x "$BUNDLE_DIR/opennow-streamer" + # Copy and rename binary + echo "Copying binary..." + cp "$BINARY" "$MACOS_DIR/$APP_NAME" + chmod +x "$MACOS_DIR/$APP_NAME" + + # Create Info.plist + echo "Creating Info.plist..." + cat > "$CONTENTS_DIR/Info.plist" < + + + + CFBundleExecutable + $APP_NAME + CFBundleIdentifier + com.opennow.streamer + CFBundleName + $APP_NAME + CFBundleDisplayName + $APP_NAME + CFBundleVersion + ${VERSION} + CFBundleShortVersionString + ${VERSION} + CFBundlePackageType + APPL + LSMinimumSystemVersion + 12.0 + NSHighResolutionCapable + + + + EOF # Function to copy a library and fix its install name copy_lib() { local lib="$1" local libname=$(basename "$lib") - if [ ! -f "$BUNDLE_DIR/libs/$libname" ] && [ -f "$lib" ]; then + if [ ! -f "$FRAMEWORKS_DIR/$libname" ] && [ -f "$lib" ]; then echo "Copying: $libname" - cp "$lib" "$BUNDLE_DIR/libs/" - chmod 755 "$BUNDLE_DIR/libs/$libname" + cp "$lib" "$FRAMEWORKS_DIR/" + chmod 755 "$FRAMEWORKS_DIR/$libname" - # Fix the library's own install name - install_name_tool -id "@executable_path/libs/$libname" "$BUNDLE_DIR/libs/$libname" 2>/dev/null || true + # Fix the library's own install name to be relative to the framework folder + install_name_tool -id "@executable_path/../Frameworks/$libname" "$FRAMEWORKS_DIR/$libname" 2>/dev/null || true return 0 fi return 0 @@ -482,9 +520,10 @@ jobs: # Function to fix references in a binary/library fix_refs() { local target="$1" + # Only fix references to Homebrew/system libs that we are bundling for dep in $(otool -L "$target" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do local depname=$(basename "$dep") - install_name_tool -change "$dep" "@executable_path/libs/$depname" "$target" 2>/dev/null || true + install_name_tool -change "$dep" "@executable_path/../Frameworks/$depname" "$target" 2>/dev/null || true done } @@ -503,9 +542,8 @@ jobs: echo "=== Phase 2: Copy transitive dependencies (3 passes) ===" for pass in 1 2 3; do echo "Pass $pass..." - # Check if any dylibs exist in the libs directory - if ls "$BUNDLE_DIR/libs/"*.dylib 1>/dev/null 2>&1; then - for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do + if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do [ -f "$bundled_lib" ] || continue for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do copy_lib "$dep" @@ -520,36 +558,35 @@ jobs: echo "" echo "=== Phase 3: Fix all library references ===" # Fix the main binary - fix_refs "$BUNDLE_DIR/opennow-streamer" + fix_refs "$MACOS_DIR/$APP_NAME" - # Fix all bundled libraries if they exist - if ls "$BUNDLE_DIR/libs/"*.dylib 1>/dev/null 2>&1; then - for bundled_lib in "$BUNDLE_DIR/libs/"*.dylib; do + # Fix all bundled libraries + if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do [ -f "$bundled_lib" ] || continue fix_refs "$bundled_lib" done fi echo "" - echo "=== Bundled libraries ===" - if ls "$BUNDLE_DIR/libs/"* 1>/dev/null 2>&1; then - ls -lh "$BUNDLE_DIR/libs/" | head -30 - else - echo " (no libraries bundled - using system/static linking)" - fi + echo "=== Final verification ===" + echo "Binary dependencies:" + otool -L "$MACOS_DIR/$APP_NAME" echo "" - echo "=== Final binary dependencies ===" - otool -L "$BUNDLE_DIR/opennow-streamer" - - echo "" - echo "=== Verifying no remaining Homebrew paths ===" - if otool -L "$BUNDLE_DIR/opennow-streamer" | grep -E '/opt/homebrew|/usr/local'; then - echo "WARNING: Some Homebrew paths remain (may be system libs, which is OK)" + echo "Verifying no remaining Homebrew paths..." + if otool -L "$MACOS_DIR/$APP_NAME" | grep -E '/opt/homebrew|/usr/local'; then + echo "WARNING: Some Homebrew paths remain (may be system libs)" else - echo "All Homebrew dependencies bundled successfully!" + echo "All Homebrew dependencies bundled!" fi + # Zip the app bundle for upload/release + echo "Zipping .app bundle..." + cd target/release + zip -r "OpenNOW-macos-arm64.zip" "$APP_NAME.app" + + - name: Bundle FFmpeg libs (Linux ARM64) if: matrix.target == 'linux-arm64' shell: bash @@ -614,7 +651,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: opennow-streamer-${{ needs.get-version.outputs.version }}-macos - path: opennow-streamer/target/release/bundle/ + path: opennow-streamer/target/release/OpenNOW-macos-arm64.zip retention-days: 30 - name: Upload Linux x64 artifacts @@ -704,7 +741,7 @@ jobs: uses: softprops/action-gh-release@v1 with: tag_name: ${{ needs.get-version.outputs.version }} - files: opennow-streamer/target/release/bundle/* + files: opennow-streamer/target/release/OpenNOW-macos-arm64.zip fail_on_unmatched_files: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ff0184809a2bd8446f990d6d681cea3d6c4b0dcb Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 03:25:47 +0100 Subject: [PATCH 40/67] Fix: RPi5/Vulkan crash by using downlevel device limits --- opennow-streamer/src/gui/renderer.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 748d79e..819a376 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -195,11 +195,19 @@ impl Renderer { info!("EXTERNAL_TEXTURE not supported - using NV12 shader path"); } + // Use downlevel defaults for broader compatibility (e.g., Raspberry Pi 5/Vulcan) + // device.limits() will automatically be clamped to the adapter's actual limits + // but explicit downlevel_defaults avoids requesting limits the driver can't provide. + let limits = wgpu::Limits::downlevel_defaults() + .using_resolution(adapter.limits()); + + info!("Requesting device limits: Max Texture Dimension 2D: {}", limits.max_texture_dimension_2d); + let (device, queue) = adapter .request_device(&wgpu::DeviceDescriptor { label: Some("OpenNow Device"), required_features, - required_limits: wgpu::Limits::default(), + required_limits: limits, memory_hints: wgpu::MemoryHints::Performance, experimental_features: wgpu::ExperimentalFeatures::disabled(), trace: wgpu::Trace::Off, From 790b5112abcc9e51c1343480156c0022ce4d310c Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 03:36:09 +0100 Subject: [PATCH 41/67] Fix: Relax wgpu memory hints and latency to prevent OOM on RPi5 --- opennow-streamer/src/gui/renderer.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 819a376..fd29480 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -208,7 +208,8 @@ impl Renderer { label: Some("OpenNow Device"), required_features, required_limits: limits, - memory_hints: wgpu::MemoryHints::Performance, + // Use MemoryUsage hint to avoid aggressive memory allocation which causes OOM on RPi5 + memory_hints: wgpu::MemoryHints::MemoryUsage, experimental_features: wgpu::ExperimentalFeatures::disabled(), trace: wgpu::Trace::Off, }) @@ -250,7 +251,8 @@ impl Renderer { surface_caps.alpha_modes[0] }, view_formats: vec![], - desired_maximum_frame_latency: 1, // Minimum latency for streaming + view_formats: vec![], + desired_maximum_frame_latency: 2, // Relax latency to avoid OOM on weak devices }; surface.configure(&device, &config); From 8a095b56a618c88b6027f180eca58febfc73914e Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 03:40:23 +0100 Subject: [PATCH 42/67] Fix: Remove duplicate view_formats field --- opennow-streamer/src/gui/renderer.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index fd29480..4e49355 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -251,7 +251,6 @@ impl Renderer { surface_caps.alpha_modes[0] }, view_formats: vec![], - view_formats: vec![], desired_maximum_frame_latency: 2, // Relax latency to avoid OOM on weak devices }; From fabe0d4b4f107cb4f6361bb77287852fcb581b2c Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 13:14:28 +0100 Subject: [PATCH 43/67] feat: implement wgpu-based GUI and video renderer, core application types, and game API integration --- opennow-streamer/src/api/games.rs | 28 +++++++++--- opennow-streamer/src/app/mod.rs | 17 ++++++- opennow-streamer/src/app/types.rs | 17 +++++++ opennow-streamer/src/gui/renderer.rs | 67 ++++++++++++++++++++++------ 4 files changed, 108 insertions(+), 21 deletions(-) diff --git a/opennow-streamer/src/api/games.rs b/opennow-streamer/src/api/games.rs index fdc623c..d256e17 100644 --- a/opennow-streamer/src/api/games.rs +++ b/opennow-streamer/src/api/games.rs @@ -7,7 +7,7 @@ use log::{info, debug, warn, error}; use serde::Deserialize; use std::time::{SystemTime, UNIX_EPOCH}; -use crate::app::{GameInfo, GameSection}; +use crate::app::{GameInfo, GameSection, GameVariant}; use crate::auth; use super::GfnApiClient; @@ -323,18 +323,30 @@ impl GfnApiClient { /// Convert AppData to GameInfo fn app_to_game_info(app: AppData) -> GameInfo { - // Find selected variant (the one marked as selected, or first available) - let selected_variant = app.variants.as_ref() - .and_then(|vars| vars.iter().find(|v| { + // Build variants list from app variants + let variants: Vec = app.variants.as_ref() + .map(|vars| vars.iter().map(|v| GameVariant { + id: v.id.clone(), + store: v.app_store.clone(), + supported_controls: v.supported_controls.clone().unwrap_or_default(), + }).collect()) + .unwrap_or_default(); + + // Find selected variant index (the one marked as selected, or 0 for first) + let selected_variant_index = app.variants.as_ref() + .and_then(|vars| vars.iter().position(|v| { v.gfn.as_ref() .and_then(|g| g.library.as_ref()) .and_then(|l| l.selected) .unwrap_or(false) })) - .or_else(|| app.variants.as_ref().and_then(|v| v.first())); + .unwrap_or(0); + + // Get the selected variant for current store/id + let selected_variant = variants.get(selected_variant_index); let store = selected_variant - .map(|v| v.app_store.clone()) + .map(|v| v.store.clone()) .unwrap_or_else(|| "Unknown".to_string()); // Use variant ID for launching (e.g., "102217611") @@ -370,6 +382,8 @@ impl GfnApiClient { playability_text: app.gfn.as_ref().and_then(|g| g.catalog_sku_strings.as_ref()).and_then(|s| s.sku_based_playability_text.clone()), uuid: Some(app.id.clone()), description: app.description.or(app.long_description), + variants, + selected_variant_index, } } @@ -565,6 +579,8 @@ impl GfnApiClient { playability_text: None, uuid: None, description: None, + variants: Vec::new(), + selected_variant_index: 0, }) }) .collect(); diff --git a/opennow-streamer/src/app/mod.rs b/opennow-streamer/src/app/mod.rs index dd736fe..b541737 100644 --- a/opennow-streamer/src/app/mod.rs +++ b/opennow-streamer/src/app/mod.rs @@ -10,7 +10,7 @@ pub mod cache; pub use config::{Settings, VideoCodec, AudioCodec, StreamQuality, StatsPosition}; pub use session::{SessionInfo, SessionState, ActiveSessionInfo}; pub use types::{ - SharedFrame, GameInfo, GameSection, SubscriptionInfo, GamesTab, ServerInfo, ServerStatus, + SharedFrame, GameInfo, GameSection, GameVariant, SubscriptionInfo, GamesTab, ServerInfo, ServerStatus, UiAction, SettingChange, AppState, parse_resolution, }; @@ -448,6 +448,21 @@ impl App { UiAction::CloseGamePopup => { self.selected_game_popup = None; } + UiAction::SelectVariant(index) => { + // Update the selected variant for the game popup + if let Some(ref mut game) = self.selected_game_popup { + if index < game.variants.len() { + game.selected_variant_index = index; + // Update the game's store and id to match the selected variant + if let Some(variant) = game.variants.get(index) { + game.store = variant.store.clone(); + game.id = variant.id.clone(); + game.app_id = variant.id.parse::().ok(); + info!("Selected platform variant: {} ({})", variant.store, variant.id); + } + } + } + } UiAction::SelectServer(index) => { if index < self.servers.len() { self.selected_server_index = index; diff --git a/opennow-streamer/src/app/types.rs b/opennow-streamer/src/app/types.rs index a3b4312..73692c0 100644 --- a/opennow-streamer/src/app/types.rs +++ b/opennow-streamer/src/app/types.rs @@ -78,6 +78,15 @@ pub fn parse_resolution(res: &str) -> (u32, u32) { } } +/// Game variant (platform/store option) +#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] +pub struct GameVariant { + pub id: String, + pub store: String, + #[serde(default)] + pub supported_controls: Vec, +} + /// Game information #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] pub struct GameInfo { @@ -99,6 +108,12 @@ pub struct GameInfo { pub uuid: Option, #[serde(default)] pub description: Option, + /// Available platform variants (e.g., Steam, Epic, Xbox) + #[serde(default)] + pub variants: Vec, + /// Index of the currently selected variant + #[serde(default)] + pub selected_variant_index: usize, } /// Section of games with a title (e.g., "Trending", "Free to Play") @@ -192,6 +207,8 @@ pub enum UiAction { OpenGamePopup(GameInfo), /// Close game detail popup CloseGamePopup, + /// Select a platform variant for the current game popup + SelectVariant(usize), /// Select a server/region SelectServer(usize), /// Enable auto server selection (best ping) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 4e49355..932df2b 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -2977,20 +2977,59 @@ impl Renderer { ui.add_space(8.0); - // Store badge - ui.horizontal(|ui| { - ui.label( - egui::RichText::new("Store:") - .size(12.0) - .color(egui::Color32::GRAY) - ); - ui.label( - egui::RichText::new(&game.store.to_uppercase()) - .size(12.0) - .color(egui::Color32::from_rgb(100, 180, 255)) - .strong() - ); - }); + // Platform selector (if multiple variants) or store badge (single variant) + if game.variants.len() > 1 { + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Platform:") + .size(12.0) + .color(egui::Color32::GRAY) + ); + + // Show platform buttons + for (idx, variant) in game.variants.iter().enumerate() { + let is_selected = idx == game.selected_variant_index; + let btn_color = if is_selected { + egui::Color32::from_rgb(100, 180, 255) // Bright blue for selected + } else { + egui::Color32::from_rgb(60, 60, 80) // Dark for unselected + }; + let text_color = if is_selected { + egui::Color32::WHITE + } else { + egui::Color32::LIGHT_GRAY + }; + + let btn = egui::Button::new( + egui::RichText::new(variant.store.to_uppercase()) + .size(11.0) + .color(text_color) + ) + .fill(btn_color) + .corner_radius(4.0) + .min_size(egui::vec2(60.0, 24.0)); + + if ui.add(btn).clicked() && !is_selected { + actions.push(UiAction::SelectVariant(idx)); + } + } + }); + } else { + // Single store badge (existing behavior) + ui.horizontal(|ui| { + ui.label( + egui::RichText::new("Store:") + .size(12.0) + .color(egui::Color32::GRAY) + ); + ui.label( + egui::RichText::new(&game.store.to_uppercase()) + .size(12.0) + .color(egui::Color32::from_rgb(100, 180, 255)) + .strong() + ); + }); + } // Publisher if available if let Some(ref publisher) = game.publisher { From c47f3349cc125da1a0aef251d9e2501ff96e5a1a Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 13:21:20 +0100 Subject: [PATCH 44/67] feat: implement macOS and Windows raw mouse input with event coalescing. --- opennow-streamer/src/input/macos.rs | 22 ++++++++++++++++++++-- opennow-streamer/src/input/windows.rs | 24 ++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/opennow-streamer/src/input/macos.rs b/opennow-streamer/src/input/macos.rs index 4f563dd..140705c 100644 --- a/opennow-streamer/src/input/macos.rs +++ b/opennow-streamer/src/input/macos.rs @@ -411,6 +411,21 @@ pub fn stop_raw_input() { } } + // Wait for the thread to actually exit (up to 500ms) + // This prevents race conditions when starting a new session immediately + let start = std::time::Instant::now(); + while RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + if start.elapsed() > std::time::Duration::from_millis(500) { + error!("Raw input thread did not exit in time, forcing reset"); + RAW_INPUT_REGISTERED.store(false, Ordering::SeqCst); + break; + } + std::thread::sleep(std::time::Duration::from_millis(10)); + } + + // Clear the event sender to avoid stale channel issues + clear_raw_input_sender(); + info!("Raw input stopped"); } @@ -486,6 +501,9 @@ pub fn reset_coalescing() { COALESCE_DY.store(0, Ordering::Release); COALESCE_LAST_SEND_US.store(0, Ordering::Release); COALESCED_EVENT_COUNT.store(0, Ordering::Release); - LOCAL_CURSOR_X.store(960, Ordering::Release); - LOCAL_CURSOR_Y.store(540, Ordering::Release); + // Center cursor based on actual dimensions, not hardcoded values + let width = LOCAL_CURSOR_WIDTH.load(Ordering::Acquire); + let height = LOCAL_CURSOR_HEIGHT.load(Ordering::Acquire); + LOCAL_CURSOR_X.store(width / 2, Ordering::Release); + LOCAL_CURSOR_Y.store(height / 2, Ordering::Release); } diff --git a/opennow-streamer/src/input/windows.rs b/opennow-streamer/src/input/windows.rs index 920ca34..6851b87 100644 --- a/opennow-streamer/src/input/windows.rs +++ b/opennow-streamer/src/input/windows.rs @@ -478,6 +478,23 @@ pub fn stop_raw_input() { } } drop(guard); + + // Wait for the thread to actually exit (up to 500ms) + // This prevents race conditions when starting a new session immediately + let start = std::time::Instant::now(); + while RAW_INPUT_REGISTERED.load(Ordering::SeqCst) { + if start.elapsed() > std::time::Duration::from_millis(500) { + error!("Raw input thread did not exit in time, forcing reset"); + RAW_INPUT_REGISTERED.store(false, Ordering::SeqCst); + *MESSAGE_WINDOW.lock() = None; + break; + } + std::thread::sleep(std::time::Duration::from_millis(10)); + } + + // Clear the event sender to avoid stale channel issues + clear_raw_input_sender(); + info!("Raw input stopped"); } @@ -558,6 +575,9 @@ pub fn reset_coalescing() { COALESCE_DY.store(0, Ordering::Release); COALESCE_LAST_SEND_US.store(0, Ordering::Release); COALESCED_EVENT_COUNT.store(0, Ordering::Release); - LOCAL_CURSOR_X.store(960, Ordering::Release); - LOCAL_CURSOR_Y.store(540, Ordering::Release); + // Center cursor based on actual dimensions, not hardcoded values + let width = LOCAL_CURSOR_WIDTH.load(Ordering::Acquire); + let height = LOCAL_CURSOR_HEIGHT.load(Ordering::Acquire); + LOCAL_CURSOR_X.store(width / 2, Ordering::Release); + LOCAL_CURSOR_Y.store(height / 2, Ordering::Release); } From 3959c0664a7007914e488363defe17c9dc8ab84b Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 14:38:07 +0100 Subject: [PATCH 45/67] feat: Add hardware-accelerated H.264/H.265/AV1 video decoder with FFmpeg, GPU detection, and QSV/AV1 support. --- opennow-streamer/src/media/rtp.rs | 11 +++++++ opennow-streamer/src/media/video.rs | 50 +++++++++++++++++++++-------- opennow-streamer/src/webrtc/mod.rs | 3 ++ 3 files changed, 51 insertions(+), 13 deletions(-) diff --git a/opennow-streamer/src/media/rtp.rs b/opennow-streamer/src/media/rtp.rs index fbd73ee..e3379e2 100644 --- a/opennow-streamer/src/media/rtp.rs +++ b/opennow-streamer/src/media/rtp.rs @@ -66,6 +66,17 @@ impl RtpDepacketizer { self.nal_frame_buffer.clear(); } + /// Reset depacketizer state (call after decode errors to resync) + /// Preserves cached SEQUENCE_HEADER but clears all fragment state + pub fn reset_state(&mut self) { + self.buffer.clear(); + self.in_fragment = false; + self.av1_frame_buffer.clear(); + self.nal_frame_buffer.clear(); + // Keep av1_sequence_header cached - we need it for recovery + debug!("RTP depacketizer state reset"); + } + /// Process AV1 RTP payload and accumulate directly to frame buffer /// This handles GFN's non-standard AV1 RTP which has continuation packets /// that don't properly follow RFC 9000 fragmentation rules diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 401ebdd..f1f2445 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -510,12 +510,16 @@ impl VideoDecoder { &mut frames_decoded, &data, codec_id, + false, // No recovery tracking for blocking mode ); let _ = frame_tx.send(result); } DecoderCommand::DecodeAsync { data, receive_time } => { packets_received += 1; + // Check if we're in recovery mode (waiting for keyframe) + let in_recovery = consecutive_failures >= KEYFRAME_REQUEST_THRESHOLD; + // Non-blocking mode - write directly to SharedFrame let result = Self::decode_frame( &mut decoder, @@ -525,6 +529,7 @@ impl VideoDecoder { &mut frames_decoded, &data, codec_id, + in_recovery, ); let decode_time_ms = receive_time.elapsed().as_secs_f32() * 1000.0; @@ -1004,6 +1009,10 @@ impl VideoDecoder { // CUVID for NVIDIA, QSV for Intel - these are the most reliable options let qsv_available = check_qsv_available(); + // Don't try NVIDIA CUVID decoders on non-NVIDIA GPUs (causes libnvcuvid load errors) + let is_nvidia = matches!(gpu_vendor, GpuVendor::Nvidia); + let is_intel = matches!(gpu_vendor, GpuVendor::Intel); + // Build prioritized list of hardware decoders to try let hw_decoders: Vec<&str> = match codec_id { ffmpeg::codec::Id::H264 => { @@ -1020,9 +1029,9 @@ impl VideoDecoder { if gpu_vendor == GpuVendor::Amd { list.push("h264_amf"); } - // Generic fallbacks - if !list.contains(&"h264_cuvid") { list.push("h264_cuvid"); } - if !list.contains(&"h264_qsv") { list.push("h264_qsv"); } + // Generic fallbacks - only add CUVID/QSV for appropriate GPU vendors + if is_nvidia && !list.contains(&"h264_cuvid") { list.push("h264_cuvid"); } + if is_intel && qsv_available && !list.contains(&"h264_qsv") { list.push("h264_qsv"); } list } ffmpeg::codec::Id::HEVC => { @@ -1039,9 +1048,9 @@ impl VideoDecoder { if gpu_vendor == GpuVendor::Amd { list.push("hevc_amf"); } - // Generic fallbacks - if !list.contains(&"hevc_cuvid") { list.push("hevc_cuvid"); } - if !list.contains(&"hevc_qsv") { list.push("hevc_qsv"); } + // Generic fallbacks - only add CUVID/QSV for appropriate GPU vendors + if is_nvidia && !list.contains(&"hevc_cuvid") { list.push("hevc_cuvid"); } + if is_intel && qsv_available && !list.contains(&"hevc_qsv") { list.push("hevc_qsv"); } list } ffmpeg::codec::Id::AV1 => { @@ -1054,9 +1063,9 @@ impl VideoDecoder { if (gpu_vendor == GpuVendor::Intel && qsv_available) || backend == VideoDecoderBackend::Qsv { list.push("av1_qsv"); } - // Generic fallbacks - if !list.contains(&"av1_cuvid") { list.push("av1_cuvid"); } - if !list.contains(&"av1_qsv") { list.push("av1_qsv"); } + // Generic fallbacks - only add CUVID/QSV for appropriate GPU vendors + if is_nvidia && !list.contains(&"av1_cuvid") { list.push("av1_cuvid"); } + if is_intel && qsv_available && !list.contains(&"av1_qsv") { list.push("av1_qsv"); } list } _ => vec![], @@ -1145,6 +1154,9 @@ impl VideoDecoder { let qsv_available = check_qsv_available(); let gpu_vendor = detect_gpu_vendor(); + // Don't try NVIDIA CUVID decoders on non-NVIDIA GPUs (causes libnvcuvid load errors) + let is_nvidia = matches!(gpu_vendor, GpuVendor::Nvidia); + let hw_decoder_names: Vec<&str> = match codec_id { ffmpeg::codec::Id::H264 => { let mut decoders = Vec::new(); @@ -1154,7 +1166,8 @@ impl VideoDecoder { GpuVendor::Amd => decoders.push("h264_vaapi"), _ => {} } - if !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } + // Only add CUVID fallback on NVIDIA or unknown GPUs + if is_nvidia && !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } decoders @@ -1167,7 +1180,8 @@ impl VideoDecoder { GpuVendor::Amd => decoders.push("hevc_vaapi"), _ => {} } - if !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } + // Only add CUVID fallback on NVIDIA GPUs + if is_nvidia && !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } decoders @@ -1180,7 +1194,8 @@ impl VideoDecoder { GpuVendor::Amd => decoders.push("av1_vaapi"), _ => {} } - if !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } + // Only add CUVID fallback on NVIDIA GPUs + if is_nvidia && !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } decoders @@ -1291,6 +1306,7 @@ impl VideoDecoder { } /// Decode a single frame (called in decoder thread) + /// `in_recovery` suppresses repeated warnings when waiting for keyframe fn decode_frame( decoder: &mut decoder::Video, scaler: &mut Option, @@ -1299,6 +1315,7 @@ impl VideoDecoder { frames_decoded: &mut u64, data: &[u8], codec_id: ffmpeg::codec::Id, + in_recovery: bool, ) -> Option { // AV1 uses OBUs directly, no start codes needed // H.264/H.265 need Annex B start codes (0x00 0x00 0x00 0x01) @@ -1330,7 +1347,14 @@ impl VideoDecoder { // EAGAIN means we need to receive frames first match e { ffmpeg::Error::Other { errno } if errno == libc::EAGAIN => {} - _ => warn!("Send packet error: {:?}", e), + _ => { + // Suppress repeated warnings during keyframe recovery + if in_recovery { + debug!("Send packet error (waiting for keyframe): {:?}", e); + } else { + warn!("Send packet error: {:?}", e); + } + } } } diff --git a/opennow-streamer/src/webrtc/mod.rs b/opennow-streamer/src/webrtc/mod.rs index 6a82184..7dcf2ad 100644 --- a/opennow-streamer/src/webrtc/mod.rs +++ b/opennow-streamer/src/webrtc/mod.rs @@ -769,6 +769,9 @@ pub async fn run_streaming( // Request keyframe if decoder is failing if decode_stat.needs_keyframe { + // Reset depacketizer state to clear any corrupted fragment state + // This is critical for recovering from packet loss/corruption + rtp_depacketizer.reset_state(); request_keyframe().await; } } From 3bbdf0a5332b8b4a3e63ce6e4d0dbaec8afaaa89 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 14:52:25 +0100 Subject: [PATCH 46/67] feat: introduce hardware-accelerated video decoding using FFmpeg with GPU vendor detection and AV1/QSV support. --- opennow-streamer/src/media/video.rs | 51 +++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 6 deletions(-) diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index f1f2445..f3f04e4 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -34,6 +34,7 @@ pub enum GpuVendor { Intel, Amd, Apple, + Broadcom, // Raspberry Pi VideoCore Other, Unknown, } @@ -76,6 +77,9 @@ pub fn detect_gpu_vendor() -> GpuVendor { } else if name.contains("apple") || name.contains("m1") || name.contains("m2") || name.contains("m3") { vendor = GpuVendor::Apple; score += 90; // Apple Silicon is high perf + } else if name.contains("videocore") || name.contains("broadcom") || name.contains("v3d") || name.contains("vc4") { + vendor = GpuVendor::Broadcom; + score += 30; // Raspberry Pi - low power device } // Prioritize discrete GPUs @@ -121,6 +125,7 @@ pub fn detect_gpu_vendor() -> GpuVendor { else if name.contains("intel") { GpuVendor::Intel } else if name.contains("amd") { GpuVendor::Amd } else if name.contains("apple") { GpuVendor::Apple } + else if name.contains("videocore") || name.contains("broadcom") || name.contains("v3d") { GpuVendor::Broadcom } else { GpuVendor::Other } } else { GpuVendor::Unknown @@ -1156,6 +1161,12 @@ impl VideoDecoder { // Don't try NVIDIA CUVID decoders on non-NVIDIA GPUs (causes libnvcuvid load errors) let is_nvidia = matches!(gpu_vendor, GpuVendor::Nvidia); + let is_raspberry_pi = matches!(gpu_vendor, GpuVendor::Broadcom); + + // Raspberry Pi 5 note: + // - Only has HEVC hardware decoder (hevc_v4l2m2m) + // - H.264 HW decoder exists but is slower than software, so not enabled + // - No AV1 hardware decoder let hw_decoder_names: Vec<&str> = match codec_id { ffmpeg::codec::Id::H264 => { @@ -1164,11 +1175,16 @@ impl VideoDecoder { GpuVendor::Nvidia => decoders.push("h264_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), GpuVendor::Amd => decoders.push("h264_vaapi"), + // Raspberry Pi 5: H.264 HW decoder is slower than software, skip it + GpuVendor::Broadcom => { + info!("Raspberry Pi detected: H.264 will use software decoder (HW is slower)"); + } _ => {} } - // Only add CUVID fallback on NVIDIA or unknown GPUs + // Only add CUVID fallback on NVIDIA GPUs if is_nvidia && !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } - if !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } + // Don't add VAAPI fallback on Raspberry Pi (not supported) + if !is_raspberry_pi && !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } decoders } @@ -1178,11 +1194,17 @@ impl VideoDecoder { GpuVendor::Nvidia => decoders.push("hevc_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("hevc_qsv"), GpuVendor::Amd => decoders.push("hevc_vaapi"), + // Raspberry Pi 5: Has dedicated HEVC hardware decoder + GpuVendor::Broadcom => { + info!("Raspberry Pi detected: Using V4L2 HEVC hardware decoder"); + decoders.push("hevc_v4l2m2m"); + } _ => {} } // Only add CUVID fallback on NVIDIA GPUs if is_nvidia && !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } - if !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } + // Don't add VAAPI fallback on Raspberry Pi + if !is_raspberry_pi && !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } decoders } @@ -1192,11 +1214,16 @@ impl VideoDecoder { GpuVendor::Nvidia => decoders.push("av1_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("av1_qsv"), GpuVendor::Amd => decoders.push("av1_vaapi"), + // Raspberry Pi 5: No AV1 hardware decoder + GpuVendor::Broadcom => { + info!("Raspberry Pi detected: AV1 will use software decoder (no HW support)"); + } _ => {} } // Only add CUVID fallback on NVIDIA GPUs if is_nvidia && !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } - if !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } + // Don't add VAAPI fallback on Raspberry Pi + if !is_raspberry_pi && !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } decoders } @@ -1241,10 +1268,22 @@ impl VideoDecoder { info!("Found software decoder: {:?}", codec.name()); let mut ctx = CodecContext::new_with_codec(codec); - ctx.set_threading(ffmpeg::codec::threading::Config::count(4)); + + // Use fewer threads on low-power devices to reduce memory usage + let gpu_vendor = detect_gpu_vendor(); + let thread_count = if matches!(gpu_vendor, GpuVendor::Broadcom) { + // Raspberry Pi: Use 2 threads to avoid memory overflow + // Pi 5 has 4 cores but limited RAM bandwidth + info!("Raspberry Pi detected: Using 2 decoder threads to conserve memory"); + 2 + } else { + // Desktop/laptop: Use 4 threads for better performance + 4 + }; + ctx.set_threading(ffmpeg::codec::threading::Config::count(thread_count)); let decoder = ctx.decoder().video()?; - info!("Software decoder opened successfully"); + info!("Software decoder opened successfully with {} threads", thread_count); Ok((decoder, false)) } From a590e31e9af989d20d8194c015b4fa2088cf07f3 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 15:01:50 +0100 Subject: [PATCH 47/67] feat: Add hardware-accelerated video decoder module with GPU detection and AV1 support. --- opennow-streamer/src/media/video.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index f3f04e4..2da19af 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -1159,8 +1159,12 @@ impl VideoDecoder { let qsv_available = check_qsv_available(); let gpu_vendor = detect_gpu_vendor(); - // Don't try NVIDIA CUVID decoders on non-NVIDIA GPUs (causes libnvcuvid load errors) + // Don't try vendor-specific decoders on wrong GPUs + // - CUVID is NVIDIA-only (requires libnvcuvid) + // - QSV is Intel-only (requires Intel Media SDK/OneVPL) + // - VAAPI works on AMD/Intel but not Raspberry Pi let is_nvidia = matches!(gpu_vendor, GpuVendor::Nvidia); + let is_intel = matches!(gpu_vendor, GpuVendor::Intel); let is_raspberry_pi = matches!(gpu_vendor, GpuVendor::Broadcom); // Raspberry Pi 5 note: @@ -1185,7 +1189,8 @@ impl VideoDecoder { if is_nvidia && !decoders.contains(&"h264_cuvid") { decoders.push("h264_cuvid"); } // Don't add VAAPI fallback on Raspberry Pi (not supported) if !is_raspberry_pi && !decoders.contains(&"h264_vaapi") { decoders.push("h264_vaapi"); } - if !decoders.contains(&"h264_qsv") && qsv_available { decoders.push("h264_qsv"); } + // QSV is Intel-only - never add as fallback for other GPUs + if is_intel && qsv_available && !decoders.contains(&"h264_qsv") { decoders.push("h264_qsv"); } decoders } ffmpeg::codec::Id::HEVC => { @@ -1205,7 +1210,8 @@ impl VideoDecoder { if is_nvidia && !decoders.contains(&"hevc_cuvid") { decoders.push("hevc_cuvid"); } // Don't add VAAPI fallback on Raspberry Pi if !is_raspberry_pi && !decoders.contains(&"hevc_vaapi") { decoders.push("hevc_vaapi"); } - if !decoders.contains(&"hevc_qsv") && qsv_available { decoders.push("hevc_qsv"); } + // QSV is Intel-only + if is_intel && qsv_available && !decoders.contains(&"hevc_qsv") { decoders.push("hevc_qsv"); } decoders } ffmpeg::codec::Id::AV1 => { @@ -1224,7 +1230,8 @@ impl VideoDecoder { if is_nvidia && !decoders.contains(&"av1_cuvid") { decoders.push("av1_cuvid"); } // Don't add VAAPI fallback on Raspberry Pi if !is_raspberry_pi && !decoders.contains(&"av1_vaapi") { decoders.push("av1_vaapi"); } - if !decoders.contains(&"av1_qsv") && qsv_available { decoders.push("av1_qsv"); } + // QSV is Intel-only + if is_intel && qsv_available && !decoders.contains(&"av1_qsv") { decoders.push("av1_qsv"); } decoders } _ => vec![], From 3c09d7975afbc6d96270946423f9f3cbf724c7e8 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 15:04:40 +0100 Subject: [PATCH 48/67] feat: Add `wgpu`-based GPU renderer for video frames and UI, supporting various pixel formats, `egui` integration, and platform-specific optimizations. --- opennow-streamer/src/gui/renderer.rs | 39 +++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 932df2b..7dbaa47 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -143,7 +143,14 @@ impl Renderer { // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition #[cfg(target_os = "windows")] let backends = wgpu::Backends::DX12; - #[cfg(not(target_os = "windows"))] + // ARM Linux (Raspberry Pi, etc): Use GL only, avoid Vulkan + // Vulkan on embedded ARM (V3D driver) has high memory overhead causing OOM + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + let backends = { + info!("ARM64 Linux detected - using GL backend to avoid Vulkan memory overhead"); + wgpu::Backends::GL + }; + #[cfg(all(not(target_os = "windows"), not(all(target_os = "linux", target_arch = "aarch64"))))] let backends = wgpu::Backends::all(); info!("Using wgpu backend: {:?}", backends); @@ -195,12 +202,28 @@ impl Renderer { info!("EXTERNAL_TEXTURE not supported - using NV12 shader path"); } + // Detect Raspberry Pi (V3D/VideoCore) for memory-constrained settings + let is_raspberry_pi = adapter_info.name.to_lowercase().contains("v3d") + || adapter_info.name.to_lowercase().contains("videocore") + || adapter_info.name.to_lowercase().contains("broadcom"); + // Use downlevel defaults for broader compatibility (e.g., Raspberry Pi 5/Vulcan) // device.limits() will automatically be clamped to the adapter's actual limits // but explicit downlevel_defaults avoids requesting limits the driver can't provide. - let limits = wgpu::Limits::downlevel_defaults() + let mut limits = wgpu::Limits::downlevel_defaults() .using_resolution(adapter.limits()); + // Raspberry Pi 5: Use very conservative limits to avoid OOM + // The V3D GPU has limited memory and aggressive allocation causes crashes + if is_raspberry_pi { + info!("Raspberry Pi detected - using memory-conservative limits"); + // Reduce max texture size to 2048 (sufficient for 1080p video) + limits.max_texture_dimension_2d = limits.max_texture_dimension_2d.min(2048); + // Reduce buffer sizes + limits.max_buffer_size = limits.max_buffer_size.min(128 * 1024 * 1024); // 128MB max + limits.max_uniform_buffer_binding_size = limits.max_uniform_buffer_binding_size.min(16 * 1024); + } + info!("Requesting device limits: Max Texture Dimension 2D: {}", limits.max_texture_dimension_2d); let (device, queue) = adapter @@ -228,7 +251,11 @@ impl Renderer { .unwrap_or(surface_caps.formats[0]); // Use Immediate for lowest latency - frame pacing is handled by our render loop - let present_mode = if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { + // Exception: Raspberry Pi uses Fifo to reduce memory usage (Immediate needs extra buffers) + let present_mode = if is_raspberry_pi { + info!("Raspberry Pi: Using Fifo present mode to conserve memory"); + wgpu::PresentMode::Fifo + } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { wgpu::PresentMode::Immediate } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Mailbox) { wgpu::PresentMode::Mailbox @@ -237,6 +264,10 @@ impl Renderer { }; info!("Using present mode: {:?}", present_mode); + // Raspberry Pi: Use minimum frame latency (1) to reduce memory usage + // Other devices: Use 2 for smoother frame pacing + let frame_latency = if is_raspberry_pi { 1 } else { 2 }; + let config = wgpu::SurfaceConfiguration { usage: wgpu::TextureUsages::RENDER_ATTACHMENT, format: surface_format, @@ -251,7 +282,7 @@ impl Renderer { surface_caps.alpha_modes[0] }, view_formats: vec![], - desired_maximum_frame_latency: 2, // Relax latency to avoid OOM on weak devices + desired_maximum_frame_latency: frame_latency, }; surface.configure(&device, &config); From 23a43b035f55f8a7051b412ee10330c5951f7ff5 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 15:20:37 +0100 Subject: [PATCH 49/67] feat: Add wgpu GPU renderer for video and UI, and configure Claude AI shell permissions. --- opennow-streamer/src/gui/renderer.rs | 48 +++++++++++++++++++++------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 7dbaa47..6b20d08 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -143,12 +143,13 @@ impl Renderer { // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition #[cfg(target_os = "windows")] let backends = wgpu::Backends::DX12; - // ARM Linux (Raspberry Pi, etc): Use GL only, avoid Vulkan - // Vulkan on embedded ARM (V3D driver) has high memory overhead causing OOM + // ARM Linux (Raspberry Pi, etc): Allow all backends + // Vulkan usually works better than GL for surface creation + // Memory-conservative settings will handle OOM during device creation #[cfg(all(target_os = "linux", target_arch = "aarch64"))] let backends = { - info!("ARM64 Linux detected - using GL backend to avoid Vulkan memory overhead"); - wgpu::Backends::GL + info!("ARM64 Linux detected - using all backends with LowPower preference"); + wgpu::Backends::all() }; #[cfg(all(not(target_os = "windows"), not(all(target_os = "linux", target_arch = "aarch64"))))] let backends = wgpu::Backends::all(); @@ -162,12 +163,29 @@ impl Renderer { // Create surface from Arc let surface = instance.create_surface(window.clone()) - .context("Failed to create surface")?; + .map_err(|e| { + error!("Surface creation failed: {:?}", e); + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + { + error!("ARM64 Linux troubleshooting:"); + error!(" - Try: WAYLAND_DISPLAY= ./run.sh (force X11)"); + error!(" - Try: WGPU_BACKEND=vulkan ./run.sh"); + error!(" - Ensure libEGL and libGLESv2 are installed"); + error!(" - On Raspberry Pi: sudo apt install libegl1-mesa libgles2-mesa"); + } + anyhow::anyhow!("Failed to create surface: {:?}", e) + })?; // Get adapter + // ARM64 Linux: Use LowPower to reduce memory allocation + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + let power_preference = wgpu::PowerPreference::LowPower; + #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))] + let power_preference = wgpu::PowerPreference::HighPerformance; + let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference: wgpu::PowerPreference::HighPerformance, + power_preference, compatible_surface: Some(&surface), force_fallback_adapter: false, }) @@ -217,11 +235,19 @@ impl Renderer { // The V3D GPU has limited memory and aggressive allocation causes crashes if is_raspberry_pi { info!("Raspberry Pi detected - using memory-conservative limits"); - // Reduce max texture size to 2048 (sufficient for 1080p video) - limits.max_texture_dimension_2d = limits.max_texture_dimension_2d.min(2048); - // Reduce buffer sizes - limits.max_buffer_size = limits.max_buffer_size.min(128 * 1024 * 1024); // 128MB max - limits.max_uniform_buffer_binding_size = limits.max_uniform_buffer_binding_size.min(16 * 1024); + // Use absolute minimum limits to avoid OOM + limits.max_texture_dimension_2d = 2048; // 2048 for 1080p, reduce to 1024 if still OOM + limits.max_texture_dimension_1d = 2048; + limits.max_buffer_size = 64 * 1024 * 1024; // 64MB max buffer + limits.max_uniform_buffer_binding_size = 16 * 1024; // 16KB uniform + limits.max_storage_buffer_binding_size = 64 * 1024 * 1024; // 64MB storage + // Reduce bind groups and samplers + limits.max_bind_groups = 4; + limits.max_samplers_per_shader_stage = 4; + limits.max_sampled_textures_per_shader_stage = 8; + info!(" Max texture: {}, Max buffer: {}MB", + limits.max_texture_dimension_2d, + limits.max_buffer_size / (1024 * 1024)); } info!("Requesting device limits: Max Texture Dimension 2D: {}", limits.max_texture_dimension_2d); From d8ee9dfa5b98294bba3af304ef4fe593df6a4369 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 15:21:11 +0100 Subject: [PATCH 50/67] feat: implement wgpu-based GPU renderer for video frames and egui UI, including platform-specific optimizations and memory-conservative settings. --- opennow-streamer/src/gui/renderer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 6b20d08..5e334e4 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -3,7 +3,7 @@ //! wgpu-based rendering for video frames and UI overlays. use anyhow::{Result, Context}; -use log::{info, debug, warn}; +use log::{info, debug, warn, error}; use std::sync::Arc; use winit::dpi::PhysicalSize; use winit::event::WindowEvent; From b3ea7c2f44f129114be8ef15b6cc106be48b6f4a Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 15:34:42 +0100 Subject: [PATCH 51/67] feat: Add Claude AI shell permissions and implement a new wgpu GPU renderer for video and UI. --- opennow-streamer/src/gui/renderer.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 5e334e4..5defa70 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -143,13 +143,21 @@ impl Renderer { // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition #[cfg(target_os = "windows")] let backends = wgpu::Backends::DX12; - // ARM Linux (Raspberry Pi, etc): Allow all backends - // Vulkan usually works better than GL for surface creation - // Memory-conservative settings will handle OOM during device creation + // ARM Linux (Raspberry Pi, etc): Prefer GL over Vulkan + // Vulkan on V3D causes OOM even with conservative limits + // GL/GLES is more memory-efficient on embedded ARM #[cfg(all(target_os = "linux", target_arch = "aarch64"))] let backends = { - info!("ARM64 Linux detected - using all backends with LowPower preference"); - wgpu::Backends::all() + // Check for WGPU_BACKEND env var override + let env_backend = std::env::var("WGPU_BACKEND").ok(); + if env_backend.is_some() { + info!("ARM64 Linux: Using backend from WGPU_BACKEND env var"); + wgpu::Backends::all() + } else { + // Default to GL only on ARM64 - Vulkan V3D driver has memory issues + info!("ARM64 Linux detected - defaulting to GL backend (set WGPU_BACKEND=vulkan to override)"); + wgpu::Backends::GL + } }; #[cfg(all(not(target_os = "windows"), not(all(target_os = "linux", target_arch = "aarch64"))))] let backends = wgpu::Backends::all(); From 125b0784ffeb07eb43bb3199f3cc4be8322e9617 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 15:48:13 +0100 Subject: [PATCH 52/67] feat: Implement GPU renderer for video and UI using `wgpu` and `egui`, and add Claude AI local development settings. --- opennow-streamer/src/gui/renderer.rs | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 5defa70..378ed45 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -185,17 +185,29 @@ impl Renderer { })?; // Get adapter - // ARM64 Linux: Use LowPower to reduce memory allocation + // ARM64 Linux: Try software renderer (llvmpipe) first since V3D Vulkan OOMs + // The V3D driver has memory management issues with wgpu #[cfg(all(target_os = "linux", target_arch = "aarch64"))] - let power_preference = wgpu::PowerPreference::LowPower; + let (power_preference, force_fallback) = { + // Check if user explicitly wants hardware GPU + let force_hw = std::env::var("OPENNOW_FORCE_HARDWARE_GPU").is_ok(); + if force_hw { + info!("ARM64 Linux: Forcing hardware GPU (OPENNOW_FORCE_HARDWARE_GPU set)"); + (wgpu::PowerPreference::LowPower, false) + } else { + info!("ARM64 Linux: Using software renderer (llvmpipe) for stability"); + info!(" Set OPENNOW_FORCE_HARDWARE_GPU=1 to try hardware GPU"); + (wgpu::PowerPreference::LowPower, true) + } + }; #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))] - let power_preference = wgpu::PowerPreference::HighPerformance; + let (power_preference, force_fallback) = (wgpu::PowerPreference::HighPerformance, false); let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { power_preference, compatible_surface: Some(&surface), - force_fallback_adapter: false, + force_fallback_adapter: force_fallback, }) .await .context("Failed to find GPU adapter")?; From 77f0d1f849137c5b12d35a425aca8b54daae709e Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 16:16:08 +0100 Subject: [PATCH 53/67] feat: add wgpu-based GPU renderer for video frames and UI overlays with platform-specific optimizations. --- opennow-streamer/src/gui/renderer.rs | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 378ed45..dd36d7d 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -143,21 +143,14 @@ impl Renderer { // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition #[cfg(target_os = "windows")] let backends = wgpu::Backends::DX12; - // ARM Linux (Raspberry Pi, etc): Prefer GL over Vulkan - // Vulkan on V3D causes OOM even with conservative limits - // GL/GLES is more memory-efficient on embedded ARM + // ARM Linux (Raspberry Pi, etc): Use Vulkan with software renderer (llvmpipe) + // - GL/GLES surface creation fails on Pi 5 Wayland + // - V3D hardware Vulkan OOMs even with conservative limits + // - llvmpipe software Vulkan works reliably #[cfg(all(target_os = "linux", target_arch = "aarch64"))] let backends = { - // Check for WGPU_BACKEND env var override - let env_backend = std::env::var("WGPU_BACKEND").ok(); - if env_backend.is_some() { - info!("ARM64 Linux: Using backend from WGPU_BACKEND env var"); - wgpu::Backends::all() - } else { - // Default to GL only on ARM64 - Vulkan V3D driver has memory issues - info!("ARM64 Linux detected - defaulting to GL backend (set WGPU_BACKEND=vulkan to override)"); - wgpu::Backends::GL - } + info!("ARM64 Linux: Using Vulkan backend (llvmpipe software renderer for stability)"); + wgpu::Backends::VULKAN }; #[cfg(all(not(target_os = "windows"), not(all(target_os = "linux", target_arch = "aarch64"))))] let backends = wgpu::Backends::all(); @@ -176,10 +169,8 @@ impl Renderer { #[cfg(all(target_os = "linux", target_arch = "aarch64"))] { error!("ARM64 Linux troubleshooting:"); + error!(" - Ensure Vulkan drivers are installed: sudo apt install mesa-vulkan-drivers"); error!(" - Try: WAYLAND_DISPLAY= ./run.sh (force X11)"); - error!(" - Try: WGPU_BACKEND=vulkan ./run.sh"); - error!(" - Ensure libEGL and libGLESv2 are installed"); - error!(" - On Raspberry Pi: sudo apt install libegl1-mesa libgles2-mesa"); } anyhow::anyhow!("Failed to create surface: {:?}", e) })?; From 1e3b43ff0cc2ee6dafc43db0c4a5c86e69545303 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 16:25:31 +0100 Subject: [PATCH 54/67] feat: implement initial OpenNow Streamer application with core windowing and input handling. --- opennow-streamer/src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/opennow-streamer/src/main.rs b/opennow-streamer/src/main.rs index 3a58e2d..ed9868f 100644 --- a/opennow-streamer/src/main.rs +++ b/opennow-streamer/src/main.rs @@ -316,10 +316,11 @@ impl ApplicationHandler for OpenNowApp { .and_then(|m| m.refresh_rate_millihertz()) .map(|mhz| (mhz as f32 / 1000.0).ceil() as u32) .unwrap_or(60) + .max(30) // Ensure at least 30 FPS to avoid division by zero }; drop(app_guard); - let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps as f64); + let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps.max(1) as f64); let elapsed = self.last_frame_time.elapsed(); if elapsed < frame_duration { // Sleep for remaining time (avoid busy loop) @@ -435,7 +436,7 @@ impl ApplicationHandler for OpenNowApp { // Only sleep if no new frame is available // This ensures frames are rendered as soon as they arrive if !has_new_frame { - let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps as f64); + let frame_duration = std::time::Duration::from_secs_f64(1.0 / target_fps.max(1) as f64); let elapsed = self.last_frame_time.elapsed(); if elapsed < frame_duration { let sleep_time = frame_duration - elapsed; From d152ed0e019b8ebe676e65d2b1e872c40cbe7fdc Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 16:50:15 +0100 Subject: [PATCH 55/67] feat: Introduce WGPU-based renderer for GUI and video frames, integrating Egui and various video rendering pipelines. --- opennow-streamer/src/gui/renderer.rs | 122 +++++++++++++++------------ 1 file changed, 69 insertions(+), 53 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index dd36d7d..f3d265c 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -176,33 +176,52 @@ impl Renderer { })?; // Get adapter - // ARM64 Linux: Try software renderer (llvmpipe) first since V3D Vulkan OOMs - // The V3D driver has memory management issues with wgpu - #[cfg(all(target_os = "linux", target_arch = "aarch64"))] - let (power_preference, force_fallback) = { - // Check if user explicitly wants hardware GPU - let force_hw = std::env::var("OPENNOW_FORCE_HARDWARE_GPU").is_ok(); - if force_hw { - info!("ARM64 Linux: Forcing hardware GPU (OPENNOW_FORCE_HARDWARE_GPU set)"); - (wgpu::PowerPreference::LowPower, false) - } else { - info!("ARM64 Linux: Using software renderer (llvmpipe) for stability"); - info!(" Set OPENNOW_FORCE_HARDWARE_GPU=1 to try hardware GPU"); - (wgpu::PowerPreference::LowPower, true) - } - }; #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))] - let (power_preference, force_fallback) = (wgpu::PowerPreference::HighPerformance, false); - let adapter = instance .request_adapter(&wgpu::RequestAdapterOptions { - power_preference, + power_preference: wgpu::PowerPreference::HighPerformance, compatible_surface: Some(&surface), - force_fallback_adapter: force_fallback, + force_fallback_adapter: false, }) .await .context("Failed to find GPU adapter")?; + // ARM64 Linux: Try hardware GPU first, fall back to llvmpipe if it fails + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + let adapter = { + let force_sw = std::env::var("OPENNOW_FORCE_SOFTWARE_GPU").is_ok(); + + if force_sw { + info!("ARM64 Linux: Forcing software renderer (OPENNOW_FORCE_SOFTWARE_GPU set)"); + instance.request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::LowPower, + compatible_surface: Some(&surface), + force_fallback_adapter: true, + }).await.context("Failed to find software GPU adapter")? + } else { + // Try hardware GPU first + info!("ARM64 Linux: Trying hardware GPU..."); + match instance.request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::LowPower, + compatible_surface: Some(&surface), + force_fallback_adapter: false, + }).await { + Some(hw_adapter) => { + info!(" Hardware GPU found: {}", hw_adapter.get_info().name); + hw_adapter + } + None => { + warn!(" No hardware GPU found, using software renderer"); + instance.request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::LowPower, + compatible_surface: Some(&surface), + force_fallback_adapter: true, + }).await.context("Failed to find any GPU adapter")? + } + } + } + }; + let adapter_info = adapter.get_info(); info!("GPU: {} (Backend: {:?}, Driver: {})", adapter_info.name, @@ -231,35 +250,32 @@ impl Renderer { info!("EXTERNAL_TEXTURE not supported - using NV12 shader path"); } - // Detect Raspberry Pi (V3D/VideoCore) for memory-constrained settings - let is_raspberry_pi = adapter_info.name.to_lowercase().contains("v3d") - || adapter_info.name.to_lowercase().contains("videocore") - || adapter_info.name.to_lowercase().contains("broadcom"); - - // Use downlevel defaults for broader compatibility (e.g., Raspberry Pi 5/Vulcan) - // device.limits() will automatically be clamped to the adapter's actual limits - // but explicit downlevel_defaults avoids requesting limits the driver can't provide. - let mut limits = wgpu::Limits::downlevel_defaults() - .using_resolution(adapter.limits()); - - // Raspberry Pi 5: Use very conservative limits to avoid OOM - // The V3D GPU has limited memory and aggressive allocation causes crashes - if is_raspberry_pi { - info!("Raspberry Pi detected - using memory-conservative limits"); - // Use absolute minimum limits to avoid OOM - limits.max_texture_dimension_2d = 2048; // 2048 for 1080p, reduce to 1024 if still OOM - limits.max_texture_dimension_1d = 2048; - limits.max_buffer_size = 64 * 1024 * 1024; // 64MB max buffer - limits.max_uniform_buffer_binding_size = 16 * 1024; // 16KB uniform - limits.max_storage_buffer_binding_size = 64 * 1024 * 1024; // 64MB storage - // Reduce bind groups and samplers - limits.max_bind_groups = 4; - limits.max_samplers_per_shader_stage = 4; - limits.max_sampled_textures_per_shader_stage = 8; - info!(" Max texture: {}, Max buffer: {}MB", - limits.max_texture_dimension_2d, - limits.max_buffer_size / (1024 * 1024)); - } + // Detect Raspberry Pi V3D hardware GPU for ultra-minimal settings + let is_v3d_hardware = adapter_info.name.to_lowercase().contains("v3d") + || adapter_info.name.to_lowercase().contains("videocore"); + // Detect if we're on ARM64 Linux (includes llvmpipe on Pi) + let is_arm64_linux = cfg!(all(target_os = "linux", target_arch = "aarch64")); + + // Use appropriate limits based on GPU type + let limits = if is_v3d_hardware { + // V3D hardware: Use WebGL2 defaults (absolute minimum) to avoid OOM + info!("V3D hardware GPU detected - using ultra-minimal WebGL2 limits"); + let mut lim = wgpu::Limits::downlevel_webgl2_defaults(); + // Override with slightly higher values needed for video rendering + lim.max_texture_dimension_2d = 2048; // Need 1920x1080 video + lim.max_buffer_size = 16 * 1024 * 1024; // 16MB - minimal + lim.max_uniform_buffer_binding_size = 16 * 1024; + lim.max_storage_buffer_binding_size = 16 * 1024 * 1024; + info!(" Max texture: 2048, Max buffer: 16MB"); + lim + } else if is_arm64_linux { + // llvmpipe or other ARM64: Use downlevel defaults + info!("ARM64 Linux: Using downlevel defaults"); + wgpu::Limits::downlevel_defaults().using_resolution(adapter.limits()) + } else { + // Desktop: Use full adapter limits + wgpu::Limits::downlevel_defaults().using_resolution(adapter.limits()) + }; info!("Requesting device limits: Max Texture Dimension 2D: {}", limits.max_texture_dimension_2d); @@ -288,9 +304,9 @@ impl Renderer { .unwrap_or(surface_caps.formats[0]); // Use Immediate for lowest latency - frame pacing is handled by our render loop - // Exception: Raspberry Pi uses Fifo to reduce memory usage (Immediate needs extra buffers) - let present_mode = if is_raspberry_pi { - info!("Raspberry Pi: Using Fifo present mode to conserve memory"); + // Exception: V3D hardware uses Fifo to reduce memory usage (Immediate needs extra buffers) + let present_mode = if is_v3d_hardware { + info!("V3D GPU: Using Fifo present mode to conserve memory"); wgpu::PresentMode::Fifo } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { wgpu::PresentMode::Immediate @@ -301,9 +317,9 @@ impl Renderer { }; info!("Using present mode: {:?}", present_mode); - // Raspberry Pi: Use minimum frame latency (1) to reduce memory usage + // V3D hardware: Use minimum frame latency (1) to reduce memory usage // Other devices: Use 2 for smoother frame pacing - let frame_latency = if is_raspberry_pi { 1 } else { 2 }; + let frame_latency = if is_v3d_hardware { 1 } else { 2 }; let config = wgpu::SurfaceConfiguration { usage: wgpu::TextureUsages::RENDER_ATTACHMENT, From ccd260c0bc4c39b255882a45c5378a87808daa6a Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 17:00:32 +0100 Subject: [PATCH 56/67] feat: Introduce hardware-accelerated video decoding via FFmpeg, including GPU vendor detection and AV1/QSV support. --- opennow-streamer/src/media/video.rs | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 2da19af..856bea7 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -1251,6 +1251,41 @@ impl VideoDecoder { (*raw_ctx).flags2 |= ffmpeg::ffi::AV_CODEC_FLAG2_FAST as i32; } + // For V4L2 M2M on Raspberry Pi 5, try common device paths + if hw_name.contains("v4l2m2m") && is_raspberry_pi { + // Pi 5 HEVC decoder is typically at /dev/video19 + // Try scanning for the rpivid decoder device + let v4l2_devices = ["/dev/video19", "/dev/video10", "/dev/video11", "/dev/video12"]; + + for device_path in v4l2_devices { + if std::path::Path::new(device_path).exists() { + info!("Trying V4L2 device: {}", device_path); + // Set device via environment variable (FFmpeg V4L2 M2M respects this) + std::env::set_var("V4L2M2M_DEVICE", device_path); + + match ctx.decoder().video() { + Ok(dec) => { + info!("V4L2 hardware decoder opened with device {} - GPU decoding active!", device_path); + return Ok((dec, true)); + } + Err(e) => { + debug!("V4L2 device {} failed: {:?}", device_path, e); + // Recreate context for next attempt + ctx = CodecContext::new_with_codec(hw_codec); + unsafe { + let raw_ctx = ctx.as_mut_ptr(); + (*raw_ctx).flags |= ffmpeg::ffi::AV_CODEC_FLAG_LOW_DELAY as i32; + (*raw_ctx).flags2 |= ffmpeg::ffi::AV_CODEC_FLAG2_FAST as i32; + } + } + } + } + } + // All V4L2 devices failed, skip to next decoder + warn!("V4L2 M2M: No working device found, falling back..."); + continue; + } + match ctx.decoder().video() { Ok(dec) => { info!("Hardware decoder ({}) opened successfully - GPU decoding active!", hw_name); From 50a603bde217e55989258d019cb0f9aa6ad63f9e Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 17:04:52 +0100 Subject: [PATCH 57/67] feat: Add wgpu-based GUI renderer for video and UI, and configure Claude AI assistant local shell permissions. --- opennow-streamer/src/gui/renderer.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index f3d265c..57f09d8 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -206,12 +206,12 @@ impl Renderer { compatible_surface: Some(&surface), force_fallback_adapter: false, }).await { - Some(hw_adapter) => { + Ok(hw_adapter) => { info!(" Hardware GPU found: {}", hw_adapter.get_info().name); hw_adapter } - None => { - warn!(" No hardware GPU found, using software renderer"); + Err(e) => { + warn!(" Hardware GPU failed: {:?}, using software renderer", e); instance.request_adapter(&wgpu::RequestAdapterOptions { power_preference: wgpu::PowerPreference::LowPower, compatible_surface: Some(&surface), @@ -279,7 +279,7 @@ impl Renderer { info!("Requesting device limits: Max Texture Dimension 2D: {}", limits.max_texture_dimension_2d); - let (device, queue) = adapter + let (device, queue): (wgpu::Device, wgpu::Queue) = adapter .request_device(&wgpu::DeviceDescriptor { label: Some("OpenNow Device"), required_features, From 302588592f50890ce85396da8778bc7de5a8117d Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 18:30:33 +0100 Subject: [PATCH 58/67] feat: Implement hardware-accelerated H.264/H.265/AV1 video decoding with GPU vendor detection and add GUI renderer module. --- opennow-streamer/src/gui/renderer.rs | 21 +++++++++++++++------ opennow-streamer/src/media/video.rs | 13 +++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index 57f09d8..a79b93c 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -143,14 +143,23 @@ impl Renderer { // Vulkan on Windows has issues with exclusive fullscreen transitions causing DWM composition #[cfg(target_os = "windows")] let backends = wgpu::Backends::DX12; - // ARM Linux (Raspberry Pi, etc): Use Vulkan with software renderer (llvmpipe) - // - GL/GLES surface creation fails on Pi 5 Wayland - // - V3D hardware Vulkan OOMs even with conservative limits - // - llvmpipe software Vulkan works reliably + // ARM Linux (Raspberry Pi, etc): Check WGPU_BACKEND env var, default to Vulkan #[cfg(all(target_os = "linux", target_arch = "aarch64"))] let backends = { - info!("ARM64 Linux: Using Vulkan backend (llvmpipe software renderer for stability)"); - wgpu::Backends::VULKAN + match std::env::var("WGPU_BACKEND").ok().as_deref() { + Some("gl") | Some("GL") | Some("gles") | Some("GLES") => { + info!("ARM64 Linux: Using GL backend (from WGPU_BACKEND env var)"); + wgpu::Backends::GL + } + Some("vulkan") | Some("VULKAN") => { + info!("ARM64 Linux: Using Vulkan backend (from WGPU_BACKEND env var)"); + wgpu::Backends::VULKAN + } + _ => { + info!("ARM64 Linux: Using Vulkan backend (default - set WGPU_BACKEND=gl to try OpenGL)"); + wgpu::Backends::VULKAN + } + } }; #[cfg(all(not(target_os = "windows"), not(all(target_os = "linux", target_arch = "aarch64"))))] let backends = wgpu::Backends::all(); diff --git a/opennow-streamer/src/media/video.rs b/opennow-streamer/src/media/video.rs index 856bea7..c8397bb 100644 --- a/opennow-streamer/src/media/video.rs +++ b/opennow-streamer/src/media/video.rs @@ -1167,10 +1167,10 @@ impl VideoDecoder { let is_intel = matches!(gpu_vendor, GpuVendor::Intel); let is_raspberry_pi = matches!(gpu_vendor, GpuVendor::Broadcom); - // Raspberry Pi 5 note: - // - Only has HEVC hardware decoder (hevc_v4l2m2m) - // - H.264 HW decoder exists but is slower than software, so not enabled - // - No AV1 hardware decoder + // Raspberry Pi notes: + // - Pi 4: bcm2835-codec supports H.264 V4L2 (stateful, works great!) + // - Pi 5: Only HEVC V4L2 (stateless, doesn't work with ffmpeg v4l2m2m) + // - Neither has AV1 hardware decoder let hw_decoder_names: Vec<&str> = match codec_id { ffmpeg::codec::Id::H264 => { @@ -1179,9 +1179,10 @@ impl VideoDecoder { GpuVendor::Nvidia => decoders.push("h264_cuvid"), GpuVendor::Intel if qsv_available => decoders.push("h264_qsv"), GpuVendor::Amd => decoders.push("h264_vaapi"), - // Raspberry Pi 5: H.264 HW decoder is slower than software, skip it + // Raspberry Pi: Try V4L2 H.264 decoder (works on Pi 4 with bcm2835-codec) GpuVendor::Broadcom => { - info!("Raspberry Pi detected: H.264 will use software decoder (HW is slower)"); + info!("Raspberry Pi detected: Trying V4L2 H.264 hardware decoder"); + decoders.push("h264_v4l2m2m"); } _ => {} } From 0d7448f3b7067157103795bd53c3adc420bfe930 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 20:51:16 +0100 Subject: [PATCH 59/67] feat: Add GPU renderer for video frames and UI overlays using wgpu and egui. --- opennow-streamer/src/gui/renderer.rs | 132 +++++++++++++++++++++++---- 1 file changed, 113 insertions(+), 19 deletions(-) diff --git a/opennow-streamer/src/gui/renderer.rs b/opennow-streamer/src/gui/renderer.rs index a79b93c..50df7e8 100644 --- a/opennow-streamer/src/gui/renderer.rs +++ b/opennow-streamer/src/gui/renderer.rs @@ -113,9 +113,15 @@ impl Renderer { /// Create a new renderer pub async fn new(event_loop: &ActiveEventLoop) -> Result { // Create window attributes + // ARM64 Linux: Start with smaller window to reduce initial GPU memory usage + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + let initial_size = PhysicalSize::new(800, 600); + #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))] + let initial_size = PhysicalSize::new(1280, 720); + let window_attrs = WindowAttributes::default() .with_title("OpenNow") - .with_inner_size(PhysicalSize::new(1280, 720)) + .with_inner_size(initial_size) .with_min_inner_size(PhysicalSize::new(640, 480)) .with_resizable(true); @@ -200,6 +206,12 @@ impl Renderer { let adapter = { let force_sw = std::env::var("OPENNOW_FORCE_SOFTWARE_GPU").is_ok(); + // Print V3D troubleshooting info + info!("ARM64 Linux: GPU memory tips:"); + info!(" - Check GPU memory: vcgencmd get_mem gpu"); + info!(" - Increase GPU memory: Add 'gpu_mem=512' to /boot/firmware/config.txt"); + info!(" - V3D env vars: MESA_VK_ABORT_ON_DEVICE_LOSS=0 V3D_DEBUG=perf"); + if force_sw { info!("ARM64 Linux: Forcing software renderer (OPENNOW_FORCE_SOFTWARE_GPU set)"); instance.request_adapter(&wgpu::RequestAdapterOptions { @@ -216,7 +228,14 @@ impl Renderer { force_fallback_adapter: false, }).await { Ok(hw_adapter) => { - info!(" Hardware GPU found: {}", hw_adapter.get_info().name); + let info = hw_adapter.get_info(); + info!(" Hardware GPU found: {}", info.name); + // Check if this is V3D and warn about potential OOM + if info.name.to_lowercase().contains("v3d") { + warn!(" V3D GPU detected - may OOM during device creation"); + warn!(" If OOM occurs, try: OPENNOW_FORCE_SOFTWARE_GPU=1 ./run.sh"); + warn!(" Or increase GPU memory to 512MB in config.txt"); + } hw_adapter } Err(e) => { @@ -265,17 +284,30 @@ impl Renderer { // Detect if we're on ARM64 Linux (includes llvmpipe on Pi) let is_arm64_linux = cfg!(all(target_os = "linux", target_arch = "aarch64")); + // V3D: Don't request any optional features to minimize memory + if is_v3d_hardware { + required_features = wgpu::Features::empty(); + info!("V3D hardware: Disabling all optional features to save memory"); + } + // Use appropriate limits based on GPU type let limits = if is_v3d_hardware { - // V3D hardware: Use WebGL2 defaults (absolute minimum) to avoid OOM - info!("V3D hardware GPU detected - using ultra-minimal WebGL2 limits"); + // V3D hardware: Use conservative limits (Pi 4/5 with 512MB+ GPU memory) + info!("V3D hardware GPU detected - using conservative limits for 1080p"); let mut lim = wgpu::Limits::downlevel_webgl2_defaults(); - // Override with slightly higher values needed for video rendering - lim.max_texture_dimension_2d = 2048; // Need 1920x1080 video - lim.max_buffer_size = 16 * 1024 * 1024; // 16MB - minimal - lim.max_uniform_buffer_binding_size = 16 * 1024; - lim.max_storage_buffer_binding_size = 16 * 1024 * 1024; - info!(" Max texture: 2048, Max buffer: 16MB"); + // Support 1080p video (1920x1080) and some headroom + lim.max_texture_dimension_1d = 2048; + lim.max_texture_dimension_2d = 2048; // Enough for 1080p + lim.max_texture_dimension_3d = 256; + lim.max_buffer_size = 32 * 1024 * 1024; // 32MB + lim.max_uniform_buffer_binding_size = 64 * 1024; + lim.max_storage_buffer_binding_size = 32 * 1024 * 1024; + lim.max_vertex_buffers = 8; + lim.max_bind_groups = 4; + lim.max_bindings_per_bind_group = 16; + lim.max_samplers_per_shader_stage = 4; + lim.max_sampled_textures_per_shader_stage = 8; + info!(" Max texture: 2048, Max buffer: 32MB, Bind groups: 4"); lim } else if is_arm64_linux { // llvmpipe or other ARM64: Use downlevel defaults @@ -288,6 +320,66 @@ impl Renderer { info!("Requesting device limits: Max Texture Dimension 2D: {}", limits.max_texture_dimension_2d); + // ARM64 Linux: Try device creation, fallback to software if V3D OOMs + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + let (device, queue, adapter, is_v3d_hardware, required_features, limits): (wgpu::Device, wgpu::Queue, wgpu::Adapter, bool, wgpu::Features, wgpu::Limits) = { + let device_result = adapter + .request_device(&wgpu::DeviceDescriptor { + label: Some("OpenNow Device"), + required_features, + required_limits: limits.clone(), + memory_hints: wgpu::MemoryHints::MemoryUsage, + experimental_features: wgpu::ExperimentalFeatures::disabled(), + trace: wgpu::Trace::Off, + }) + .await; + + match device_result { + Ok((device, queue)) => { + info!("Device created successfully with {}", adapter_info.name); + (device, queue, adapter, is_v3d_hardware, required_features, limits) + } + Err(e) => { + // V3D device creation failed (likely OOM), fallback to software renderer + warn!("Hardware GPU device creation failed: {:?}", e); + warn!("Falling back to software renderer (llvmpipe)..."); + + crate::utils::console_print("[GPU] Hardware GPU failed, using software renderer"); + + // Get software (llvmpipe) adapter + let sw_adapter = instance.request_adapter(&wgpu::RequestAdapterOptions { + power_preference: wgpu::PowerPreference::LowPower, + compatible_surface: Some(&surface), + force_fallback_adapter: true, + }).await.context("Failed to find software GPU adapter after hardware GPU failed")?; + + let sw_info = sw_adapter.get_info(); + info!("Fallback GPU: {} (Backend: {:?})", sw_info.name, sw_info.backend); + + // Use downlevel defaults for llvmpipe + let sw_limits = wgpu::Limits::downlevel_defaults().using_resolution(sw_adapter.limits()); + let sw_features = wgpu::Features::empty(); + + let (device, queue) = sw_adapter + .request_device(&wgpu::DeviceDescriptor { + label: Some("OpenNow Device (Software Fallback)"), + required_features: sw_features, + required_limits: sw_limits.clone(), + memory_hints: wgpu::MemoryHints::MemoryUsage, + experimental_features: wgpu::ExperimentalFeatures::disabled(), + trace: wgpu::Trace::Off, + }) + .await + .context("Failed to create software GPU device")?; + + info!("Software renderer device created successfully"); + (device, queue, sw_adapter, false, sw_features, sw_limits) + } + } + }; + + // Non-ARM64: Standard device creation + #[cfg(not(all(target_os = "linux", target_arch = "aarch64")))] let (device, queue): (wgpu::Device, wgpu::Queue) = adapter .request_device(&wgpu::DeviceDescriptor { label: Some("OpenNow Device"), @@ -301,6 +393,10 @@ impl Renderer { .await .context("Failed to create device")?; + // Update adapter_info after potential ARM64 fallback to software renderer + #[cfg(all(target_os = "linux", target_arch = "aarch64"))] + let adapter_info = adapter.get_info(); + // Configure surface // Use non-sRGB (linear) format for video - H.264/HEVC output is already gamma-corrected // Using sRGB format would apply double gamma correction, causing washed-out colors @@ -313,22 +409,20 @@ impl Renderer { .unwrap_or(surface_caps.formats[0]); // Use Immediate for lowest latency - frame pacing is handled by our render loop - // Exception: V3D hardware uses Fifo to reduce memory usage (Immediate needs extra buffers) - let present_mode = if is_v3d_hardware { - info!("V3D GPU: Using Fifo present mode to conserve memory"); - wgpu::PresentMode::Fifo - } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { + // V3D: Prefer Mailbox for high fps without tearing, fall back to Immediate + let present_mode = if surface_caps.present_modes.contains(&wgpu::PresentMode::Immediate) { + info!("Using Immediate present mode (lowest latency)"); wgpu::PresentMode::Immediate } else if surface_caps.present_modes.contains(&wgpu::PresentMode::Mailbox) { + info!("Using Mailbox present mode (triple buffering)"); wgpu::PresentMode::Mailbox } else { + info!("Using Fifo present mode (vsync)"); wgpu::PresentMode::Fifo }; - info!("Using present mode: {:?}", present_mode); - // V3D hardware: Use minimum frame latency (1) to reduce memory usage - // Other devices: Use 2 for smoother frame pacing - let frame_latency = if is_v3d_hardware { 1 } else { 2 }; + // Frame latency: 2 for smoother pacing + let frame_latency = 2; let config = wgpu::SurfaceConfiguration { usage: wgpu::TextureUsages::RENDER_ATTACHMENT, From 82bca5d48ec515007b95c58042280f35efbe2994 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 21:20:24 +0100 Subject: [PATCH 60/67] feat: Refactor macOS app bundling to explicitly copy FFmpeg libraries and fix internal references using a dedicated script. --- .github/workflows/auto-build.yml | 69 +++++++++++- opennow-streamer/macos/bundle.sh | 173 +++++++++++++++++++++++++++++-- 2 files changed, 231 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 5b76019..56a30e1 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -528,10 +528,48 @@ jobs: } echo "" - echo "=== Phase 1: Copy direct FFmpeg dependencies ===" + echo "=== Phase 1: Explicitly copy FFmpeg libraries ===" + # FFmpeg libraries might not show up in otool if dlopened or linked with @rpath + # So we explicitly find and copy them + + FFMPEG_PREFIX=$(brew --prefix ffmpeg) + echo "FFmpeg prefix: $FFMPEG_PREFIX" + + # List of core FFmpeg libraries to bundle + FFMPEG_LIBS=( + "libavcodec" + "libavdevice" + "libavfilter" + "libavformat" + "libavutil" + "libswresample" + "libswscale" + ) + + for lib_base in "${FFMPEG_LIBS[@]}"; do + # Find the actual dylib file (resolving symlinks if needed, but we usually want the versioned one) + # Looking for *.dylib in lib folder + # We want the main shared library, usually something like libavcodec.60.dylib + + # Using find to locate the main library file + # We avoid symlinks that point to themselves or just the .dylib -> .X.dylib + # We want the file that the binary is likely linked against or will try to load + + echo "Looking for $lib_base in $FFMPEG_PREFIX/lib..." + FOUND_LIBS=$(find "$FFMPEG_PREFIX/lib" -name "${lib_base}.*.dylib" -type f ) + + for lib in $FOUND_LIBS; do + echo "Found FFmpeg lib: $lib" + copy_lib "$lib" + done + done + + + echo "" + echo "=== Phase 2: Copy direct dependencies detected by otool ===" DIRECT_DEPS=$(otool -L "$BINARY" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}' || true) if [ -z "$DIRECT_DEPS" ]; then - echo "No Homebrew dependencies found in binary (may be statically linked or using system libs)" + echo "No Homebrew dependencies found via otool (may be statically linked or using system libs)" else for lib in $DIRECT_DEPS; do copy_lib "$lib" @@ -539,7 +577,7 @@ jobs: fi echo "" - echo "=== Phase 2: Copy transitive dependencies (3 passes) ===" + echo "=== Phase 3: Copy transitive dependencies (3 passes) ===" for pass in 1 2 3; do echo "Pass $pass..." if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then @@ -556,7 +594,7 @@ jobs: done echo "" - echo "=== Phase 3: Fix all library references ===" + echo "=== Phase 4: Fix all library references ===" # Fix the main binary fix_refs "$MACOS_DIR/$APP_NAME" @@ -567,12 +605,34 @@ jobs: fix_refs "$bundled_lib" done fi + + # Special pass: Fix FFmpeg internal references + # e.g. libavformat linking to libavcodec + echo "Fixing internal references in bundled libs..." + if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do + # For each bundled lib, check if it references other bundled libs via absolute path + # and rewrite those to @loader_path + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + local depname=$(basename "$dep") + if [ -f "$FRAMEWORKS_DIR/$depname" ]; then + echo " Fixing ref in $(basename "$bundled_lib") to $depname" + install_name_tool -change "$dep" "@loader_path/$depname" "$bundled_lib" 2>/dev/null || true + fi + done + done + fi + echo "" echo "=== Final verification ===" echo "Binary dependencies:" otool -L "$MACOS_DIR/$APP_NAME" + echo "" + echo "Bundled Frameworks:" + ls -1 "$FRAMEWORKS_DIR" + echo "" echo "Verifying no remaining Homebrew paths..." if otool -L "$MACOS_DIR/$APP_NAME" | grep -E '/opt/homebrew|/usr/local'; then @@ -586,7 +646,6 @@ jobs: cd target/release zip -r "OpenNOW-macos-arm64.zip" "$APP_NAME.app" - - name: Bundle FFmpeg libs (Linux ARM64) if: matrix.target == 'linux-arm64' shell: bash diff --git a/opennow-streamer/macos/bundle.sh b/opennow-streamer/macos/bundle.sh index 07c01d2..234e256 100755 --- a/opennow-streamer/macos/bundle.sh +++ b/opennow-streamer/macos/bundle.sh @@ -7,10 +7,25 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_DIR="$(dirname "$SCRIPT_DIR")" APP_NAME="OpenNOW.app" APP_DIR="$PROJECT_DIR/target/release/$APP_NAME" +CONTENTS_DIR="$APP_DIR/Contents" +MACOS_DIR="$CONTENTS_DIR/MacOS" +FRAMEWORKS_DIR="$CONTENTS_DIR/Frameworks" +BINARY="$PROJECT_DIR/target/release/opennow-streamer" # Build release echo "Building release..." cd "$PROJECT_DIR" + +# Extract version from Cargo.toml if not provided +if [ -z "$VERSION" ]; then + VERSION=$(grep "^version" Cargo.toml | head -1 | awk -F '"' '{print $2}') + echo "Detected version from Cargo.toml: $VERSION" +fi +if [ -z "$VERSION" ]; then + VERSION="0.1.0" + echo "Could not detect version, defaulting to $VERSION" +fi + cargo build --release # Create app bundle structure @@ -19,14 +34,160 @@ rm -rf "$APP_DIR" mkdir -p "$APP_DIR/Contents/MacOS" mkdir -p "$APP_DIR/Contents/Resources" -# Copy binary -cp "$PROJECT_DIR/target/release/opennow-streamer" "$APP_DIR/Contents/MacOS/" +# Copy and rename binary +echo "Copying binary..." +cp "$BINARY" "$MACOS_DIR/$APP_NAME" +chmod +x "$MACOS_DIR/$APP_NAME" + +# Create Info.plist +echo "Creating Info.plist..." +cat > "$CONTENTS_DIR/Info.plist" < + + + + CFBundleExecutable + $APP_NAME + CFBundleIdentifier + com.opennow.streamer + CFBundleName + $APP_NAME + CFBundleDisplayName + $APP_NAME + CFBundleVersion + ${VERSION} + CFBundleShortVersionString + ${VERSION} + CFBundlePackageType + APPL + LSMinimumSystemVersion + 12.0 + NSHighResolutionCapable + + + +EOF + +# Function to copy a library and fix its install name +copy_lib() { + local lib="$1" + local libname=$(basename "$lib") + + if [ ! -f "$FRAMEWORKS_DIR/$libname" ] && [ -f "$lib" ]; then + echo "Copying: $libname" + cp "$lib" "$FRAMEWORKS_DIR/" + chmod 755 "$FRAMEWORKS_DIR/$libname" + + # Fix the library's own install name to be relative to the framework folder + install_name_tool -id "@executable_path/../Frameworks/$libname" "$FRAMEWORKS_DIR/$libname" 2>/dev/null || true + return 0 + fi + return 0 +} + +# Function to fix references in a binary/library +fix_refs() { + local target="$1" + # Only fix references to Homebrew/system libs that we are bundling + for dep in $(otool -L "$target" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + local depname=$(basename "$dep") + install_name_tool -change "$dep" "@executable_path/../Frameworks/$depname" "$target" 2>/dev/null || true + done +} + +echo "" +echo "=== Phase 1: Explicitly copy FFmpeg libraries ===" +# FFmpeg libraries might not show up in otool if dlopened or linked with @rpath +# So we explicitly find and copy them + +FFMPEG_PREFIX=$(brew --prefix ffmpeg) +echo "FFmpeg prefix: $FFMPEG_PREFIX" + +# List of core FFmpeg libraries to bundle +FFMPEG_LIBS=( + "libavcodec" + "libavdevice" + "libavfilter" + "libavformat" + "libavutil" + "libswresample" + "libswscale" +) + +for lib_base in "${FFMPEG_LIBS[@]}"; do + echo "Looking for $lib_base in $FFMPEG_PREFIX/lib..." + FOUND_LIBS=$(find "$FFMPEG_PREFIX/lib" -name "${lib_base}.*.dylib" -type f ) + + for lib in $FOUND_LIBS; do + echo "Found FFmpeg lib: $lib" + copy_lib "$lib" + done +done -# Copy Info.plist -cp "$SCRIPT_DIR/Info.plist" "$APP_DIR/Contents/" -# Create PkgInfo -echo -n "APPL????" > "$APP_DIR/Contents/PkgInfo" +echo "" +echo "=== Phase 2: Copy direct dependencies detected by otool ===" +DIRECT_DEPS=$(otool -L "$MACOS_DIR/$APP_NAME" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}' || true) +if [ -z "$DIRECT_DEPS" ]; then + echo "No Homebrew dependencies found in binary (may be statically linked or using system libs)" +else + for lib in $DIRECT_DEPS; do + copy_lib "$lib" + done +fi + +echo "" +echo "=== Phase 3: Copy transitive dependencies (3 passes) ===" +for pass in 1 2 3; do + echo "Pass $pass..." + if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do + [ -f "$bundled_lib" ] || continue + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + copy_lib "$dep" + done + done + else + echo " No dylibs to process" + break + fi +done + +echo "" +echo "=== Phase 4: Fix all library references ===" +# Fix the main binary +fix_refs "$MACOS_DIR/$APP_NAME" + +# Fix all bundled libraries +if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do + [ -f "$bundled_lib" ] || continue + fix_refs "$bundled_lib" + done +fi + +# Special pass: Fix FFmpeg internal references +echo "Fixing internal references in bundled libs..." +if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do + local depname=$(basename "$dep") + if [ -f "$FRAMEWORKS_DIR/$depname" ]; then + echo " Fixing ref in $(basename "$bundled_lib") to $depname" + install_name_tool -change "$dep" "@loader_path/$depname" "$bundled_lib" 2>/dev/null || true + fi + done + done +fi + +echo "" +echo "=== Final verification ===" +echo "Binary dependencies:" +otool -L "$MACOS_DIR/$APP_NAME" + +echo "" +echo "Bundled Frameworks:" +ls -1 "$FRAMEWORKS_DIR" echo "" echo "App bundle created: $APP_DIR" From 271fece5ed87558cd897f572556d73b2fe4f358b Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 21:30:41 +0100 Subject: [PATCH 61/67] fix: Resolve @rpath dependencies and add ad-hoc code signing to macOS builds. --- .github/workflows/auto-build.yml | 29 ++++++++++++++++++++++-- opennow-streamer/macos/bundle.sh | 39 ++++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 56a30e1..ad19a71 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -578,13 +578,32 @@ jobs: echo "" echo "=== Phase 3: Copy transitive dependencies (3 passes) ===" + BREW_PREFIX=$(brew --prefix) + echo "Resolving @rpath against: $BREW_PREFIX/lib" + for pass in 1 2 3; do echo "Pass $pass..." if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do [ -f "$bundled_lib" ] || continue - for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do - copy_lib "$dep" + # Grep for /opt/homebrew, /usr/local, AND @rpath + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local|@rpath' | awk '{print $1}'); do + + # Handle @rpath references + if [[ "$dep" == "@rpath/"* ]]; then + # Extract filename + local filename="${dep#@rpath/}" + # Construct absolute path assuming it's in Homebrew lib + local resolved_path="$BREW_PREFIX/lib/$filename" + + if [ -f "$resolved_path" ]; then + # echo "Resolved $dep to $resolved_path" + copy_lib "$resolved_path" + fi + else + # Absolute path + copy_lib "$dep" + fi done done else @@ -641,6 +660,12 @@ jobs: echo "All Homebrew dependencies bundled!" fi + echo "" + echo "=== Phase 5: Code Signing ===" + echo "Signing app bundle..." + # Sign with ad-hoc signature (-) to fix invalid signatures caused by install_name_tool + codesign --force --deep --sign - "$APP_DIR" + # Zip the app bundle for upload/release echo "Zipping .app bundle..." cd target/release diff --git a/opennow-streamer/macos/bundle.sh b/opennow-streamer/macos/bundle.sh index 234e256..716ac8f 100755 --- a/opennow-streamer/macos/bundle.sh +++ b/opennow-streamer/macos/bundle.sh @@ -138,13 +138,35 @@ fi echo "" echo "=== Phase 3: Copy transitive dependencies (3 passes) ===" +BREW_PREFIX=$(brew --prefix) +echo "Resolving @rpath against: $BREW_PREFIX/lib" + for pass in 1 2 3; do echo "Pass $pass..." if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do [ -f "$bundled_lib" ] || continue - for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local' | awk '{print $1}'); do - copy_lib "$dep" + # Grep for /opt/homebrew, /usr/local, AND @rpath + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep -E '/opt/homebrew|/usr/local|@rpath' | awk '{print $1}'); do + + # Handle @rpath references + if [[ "$dep" == "@rpath/"* ]]; then + # Extract filename + local filename="${dep#@rpath/}" + # Construct absolute path assuming it's in Homebrew lib + local resolved_path="$BREW_PREFIX/lib/$filename" + + if [ -f "$resolved_path" ]; then + # echo "Resolved $dep to $resolved_path" + copy_lib "$resolved_path" + else + # Try strict FFmpeg prefix if different? usually brew prefix is enough + : + fi + else + # Absolute path + copy_lib "$dep" + fi done done else @@ -189,6 +211,19 @@ echo "" echo "Bundled Frameworks:" ls -1 "$FRAMEWORKS_DIR" +echo "" +echo "=== Phase 5: Code Signing ===" +echo "Signing app bundle..." +# Sign with ad-hoc signature (-) +# Use --force to replace any existing signature +# Use --deep to sign all nested frameworks and plugins +if codesign --force --deep --sign - "$APP_DIR"; then + echo "Code signing successful" +else + echo "Code signing failed" + exit 1 +fi + echo "" echo "App bundle created: $APP_DIR" echo "" From 51c03b756ed2a8d443b314a04daab59e04fa921e Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 21:38:00 +0100 Subject: [PATCH 62/67] refactor: remove 'local' keyword from shell script variable declarations to adjust scope. --- .github/workflows/auto-build.yml | 4 ++-- opennow-streamer/macos/bundle.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index ad19a71..06180a8 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -592,9 +592,9 @@ jobs: # Handle @rpath references if [[ "$dep" == "@rpath/"* ]]; then # Extract filename - local filename="${dep#@rpath/}" + filename="${dep#@rpath/}" # Construct absolute path assuming it's in Homebrew lib - local resolved_path="$BREW_PREFIX/lib/$filename" + resolved_path="$BREW_PREFIX/lib/$filename" if [ -f "$resolved_path" ]; then # echo "Resolved $dep to $resolved_path" diff --git a/opennow-streamer/macos/bundle.sh b/opennow-streamer/macos/bundle.sh index 716ac8f..be72eb3 100755 --- a/opennow-streamer/macos/bundle.sh +++ b/opennow-streamer/macos/bundle.sh @@ -152,9 +152,9 @@ for pass in 1 2 3; do # Handle @rpath references if [[ "$dep" == "@rpath/"* ]]; then # Extract filename - local filename="${dep#@rpath/}" + filename="${dep#@rpath/}" # Construct absolute path assuming it's in Homebrew lib - local resolved_path="$BREW_PREFIX/lib/$filename" + resolved_path="$BREW_PREFIX/lib/$filename" if [ -f "$resolved_path" ]; then # echo "Resolved $dep to $resolved_path" From 4af383b36b7137fb7001013b6006789321bf7ba0 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 21:50:33 +0100 Subject: [PATCH 63/67] build: Add special pass to rewrite @rpath references in bundled macOS dynamic libraries. --- .github/workflows/auto-build.yml | 15 +++++++++++++++ opennow-streamer/macos/bundle.sh | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 06180a8..7c123f3 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -642,6 +642,21 @@ jobs: done fi + # Special pass: Rewrite @rpath references (e.g. libwebp -> libsharpyuv) + echo "Rewriting @rpath references in bundled libs..." + if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do + # Grep for @rpath references + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep "@rpath/" | awk '{print $1}'); do + filename="${dep#@rpath/}" + if [ -f "$FRAMEWORKS_DIR/$filename" ]; then + echo " Rewriting @rpath ref in $(basename "$bundled_lib"): $dep -> @loader_path/$filename" + install_name_tool -change "$dep" "@loader_path/$filename" "$bundled_lib" 2>/dev/null || true + fi + done + done + fi + echo "" echo "=== Final verification ===" diff --git a/opennow-streamer/macos/bundle.sh b/opennow-streamer/macos/bundle.sh index be72eb3..7dc405c 100755 --- a/opennow-streamer/macos/bundle.sh +++ b/opennow-streamer/macos/bundle.sh @@ -202,6 +202,21 @@ if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then done fi +# Special pass: Rewrite @rpath references (e.g. libwebp -> libsharpyuv) +echo "Rewriting @rpath references in bundled libs..." +if ls "$FRAMEWORKS_DIR/"*.dylib 1>/dev/null 2>&1; then + for bundled_lib in "$FRAMEWORKS_DIR/"*.dylib; do + # Grep for @rpath references + for dep in $(otool -L "$bundled_lib" 2>/dev/null | grep "@rpath/" | awk '{print $1}'); do + filename="${dep#@rpath/}" + if [ -f "$FRAMEWORKS_DIR/$filename" ]; then + echo " Rewriting @rpath ref in $(basename "$bundled_lib"): $dep -> @loader_path/$filename" + install_name_tool -change "$dep" "@loader_path/$filename" "$bundled_lib" 2>/dev/null || true + fi + done + done +fi + echo "" echo "=== Final verification ===" echo "Binary dependencies:" From 6fed4fb6bcc9d10265e8819f0f5702fc974a14af Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 22:03:44 +0100 Subject: [PATCH 64/67] build: enforce a minimum version of v0.2.0 in the auto-build workflow. --- .github/workflows/auto-build.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml index 7c123f3..58badd5 100644 --- a/.github/workflows/auto-build.yml +++ b/.github/workflows/auto-build.yml @@ -60,8 +60,15 @@ jobs: # Increment patch version NEW_PATCH=$((PATCH + 1)) - NEW_VERSION="v${MAJOR}.${MINOR}.${NEW_PATCH}" - VERSION_NUMBER="${MAJOR}.${MINOR}.${NEW_PATCH}" + # Force minimum version to v0.2.0 + if [ "$MAJOR" -eq 0 ] && [ "$MINOR" -lt 2 ]; then + echo "Current version ($MAJOR.$MINOR.$PATCH) is older than 0.2.0. Bumping to v0.2.0" + NEW_VERSION="v0.2.0" + VERSION_NUMBER="0.2.0" + else + NEW_VERSION="v${MAJOR}.${MINOR}.${NEW_PATCH}" + VERSION_NUMBER="${MAJOR}.${MINOR}.${NEW_PATCH}" + fi echo "New version: $NEW_VERSION" echo "Version number: $VERSION_NUMBER" From 9cad632997c8415e9dfd6820a7a6fb596b9b7208 Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 22:13:58 +0100 Subject: [PATCH 65/67] docs: Revise README to reflect native Rust implementation, new feature overview, and detailed platform support. --- README.md | 134 +++++++++++++++++++++--------------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index bd1fd91..9ff8462 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ - -

      OpenNOW

      - Open source GeForce NOW client built from the ground up + Open source GeForce NOW client built from the ground up in Native Rust

      +

      Download @@ -12,91 +11,78 @@ Stars - - Sponsor - Discord

      ---- -## Disclaimer +--- -This is an **independent project** not affiliated with NVIDIA Corporation. Created through reverse engineering for educational purposes. GeForce NOW is a trademark of NVIDIA. Use at your own risk. +## Disclaimer +This is an **independent project** not affiliated with NVIDIA Corporation. Created for educational purposes. GeForce NOW is a trademark of NVIDIA. Use at your own risk. --- ## About -OpenNOW is a custom GeForce NOW client created by reverse engineering the official NVIDIA client. Built as a native Rust application with high-performance GPU rendering (wgpu + egui), it removes artificial limitations and gives you full control over your cloud gaming experience. +OpenNOW is a custom GeForce NOW client rewritten entirely in **Native Rust** (moving away from the previous Tauri implementation) for maximum performance and lower resource usage. It uses `wgpu` and `egui` to provide a seamless, high-performance cloud gaming experience. **Why OpenNOW?** -- No artificial limitations on FPS, resolution, or bitrate -- Privacy focused - telemetry disabled by default -- Open source and community-driven -- Works on Windows, macOS, and Linux +- **Native Performance**: Written in Rust with zero-overhead graphics bindings. +- **Uncapped Potential**: No artificial limits on FPS, resolution, or bitrate. +- **Privacy Focused**: No telemetry by default. +- **Cross-Platform**: Designed for Windows, macOS, and Linux. --- -## Screenshot +## Platform Support -

      - OpenNOW Screenshot -

      - ---- - -## Download - -

      - - Windows - - - macOS - - - Linux - -

      +| Platform | Architecture | Status | Notes | +|----------|--------------|--------|-------| +| **macOS** | ARM64 / x64 | ✅ Working | Fully functional foundation. VideoToolbox hardware decoding supported. | +| **Windows** | x64 | ✅ Working | **Nvidia GPUs**: Tested & Working.
      **AMD/Intel**: Untested (likely works via D3D11). | +| **Windows** | ARM64 | ❓ Untested | Should work but not verified. | +| **Linux** | x64 | ⚠️ Kinda Works | **Warning:** Persistent encoding/decoding issues may occur depending on distro/drivers. | +| **Linux** | ARM64 | ⚠️ Kinda Works | **Raspberry Pi 4**: Working (H.264).
      **Raspberry Pi 5**: Untested.
      **Asahi Linux**: ❌ Decode issues (No HW decoder yet). | +| **Android** | ARM64 | 📅 Planned | No ETA. | +| **Apple TV** | ARM64 | 📅 Planned | No ETA. | --- ## Features -### Streaming -| Feature | Description | -|---------|-------------| -| **High FPS Modes** | 60, 120, 240, and 360 FPS streaming | -| **4K & 5K Resolutions** | Up to 5120x2880, ultrawide support (21:9, 32:9) | -| **Video Codecs** | H.264, H.265 (HEVC), and AV1 | -| **Audio Codecs** | Opus mono and stereo | -| **Unlimited Bitrate** | Up to 200 Mbps (no artificial caps) | -| **NVIDIA Reflex** | Low-latency mode for competitive gaming | - -### Input & Controls -| Feature | Description | -|---------|-------------| -| **Raw Mouse Input** | 1:1 movement with `pointerrawupdate` events | -| **Unadjusted Movement** | Bypasses OS mouse acceleration | -| **Clipboard Paste** | Paste text directly into games (Ctrl+V) | -| **Full Keyboard Capture** | All keys captured in fullscreen | - -### Experience -| Feature | Description | -|---------|-------------| -| **Discord Rich Presence** | Shows current game with optional stats | -| **Multi-Region Support** | Connect to any GFN server region | -| **Privacy Focused** | Telemetry disabled by default | -| **GPU Accelerated** | Hardware video decoding (Windows) | -| **Dark UI** | Modern, clean interface | +### ✅ Working +Based on the current v0.2.0 Native Rust codebase: +- **Authentication**: Secure login flow. +- **Game Library**: Search and browse your GFN library (Cloudmatch integration). +- **Streaming**: + - Low-latency RTP/WebRTC streaming. + - **Hardware Decoding**: + - Windows (D3D11/DXGI). + - macOS (VideoToolbox). + - Linux (FFmpeg/VAAPI where supported). +- **Input**: + - Raw Mouse & Keyboard input. + - Gamepad support (via `gilrs`). +- **Audio**: Low-latency audio playback (`cpal`). +- **Overlay**: In-stream stats and settings overlay (`egui`). + +### 🚧 To-Do / In Progress +- [ ] **Multi-account support** +- [ ] **Fix IGPU specific issues** (Intel/AMD integrated graphics quirks) +- [ ] **Clipboard Paste** support +- [ ] **Microphone** support --- ## Building +**Requirements:** +- Rust toolchain (1.75+) +- FFmpeg development libraries (v6.1+ recommended) +- `pkg-config` + ```bash git clone https://github.com/zortos293/GFNClient.git cd GFNClient/opennow-streamer @@ -110,39 +96,23 @@ cd opennow-streamer cargo run ``` -**Requirements:** Rust toolchain (1.70+), FFmpeg development libraries - --- ## Troubleshooting - -### macOS: "App is damaged" or won't open - -macOS quarantines apps downloaded from the internet. To fix this, run: - +### macOS: "App is damaged" +If macOS blocks the app, run: ```bash xattr -d com.apple.quarantine /Applications/OpenNOW.app ``` - -If you encounter issues, please export your logs and attach them to your bug report: - -1. Open **Settings** (gear icon in the top right) -2. Scroll down to the **Troubleshooting** section -3. Click **Export Logs** -4. Save the file and attach it to your [bug report](https://github.com/zortos293/GFNClient/issues/new?template=bug_report.yml) - -Logs are stored at: -- **Windows:** `%APPDATA%\opennow\opennow.log` -- **macOS:** `~/Library/Application Support/opennow/opennow.log` -- **Linux:** `~/.local/share/opennow/opennow.log` - --- ## Support the Project -If OpenNOW is useful to you, consider sponsoring to support development: +OpenNOW is a passion project developed entirely in my free time. I truly believe in open software and giving users control over their experience. + +If you enjoy using the client and want to support its continued development (and keep me caffeinated ☕), please consider becoming a sponsor. Your support helps me dedicate more time to fixing bugs, adding new features, and maintaining the project.

      @@ -150,10 +120,8 @@ If OpenNOW is useful to you, consider sponsoring to support development:

      - --- -

      Made by zortos293

      From 1dff9bab1d5c5727de77c1d2fcfb626a660a8498 Mon Sep 17 00:00:00 2001 From: Zortos <65777760+zortos293@users.noreply.github.com> Date: Sun, 4 Jan 2026 22:17:32 +0100 Subject: [PATCH 66/67] Update opennow-streamer/macos/Info.plist Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- opennow-streamer/macos/Info.plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opennow-streamer/macos/Info.plist b/opennow-streamer/macos/Info.plist index 8140a4f..950ab26 100644 --- a/opennow-streamer/macos/Info.plist +++ b/opennow-streamer/macos/Info.plist @@ -9,9 +9,9 @@ CFBundleIdentifier com.opennow.streamer CFBundleVersion - 0.1.0 + 0.2.0 CFBundleShortVersionString - 0.1.0 + 0.2.0 CFBundleExecutable opennow-streamer CFBundlePackageType From dece5b8dbef99a1ba13dab131b615305cf168cab Mon Sep 17 00:00:00 2001 From: Zortos Date: Sun, 4 Jan 2026 22:22:44 +0100 Subject: [PATCH 67/67] docs: Format Features list as a status table in README --- README.md | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 9ff8462..26aee56 100644 --- a/README.md +++ b/README.md @@ -50,29 +50,22 @@ OpenNOW is a custom GeForce NOW client rewritten entirely in **Native Rust** (mo --- -## Features - -### ✅ Working -Based on the current v0.2.0 Native Rust codebase: -- **Authentication**: Secure login flow. -- **Game Library**: Search and browse your GFN library (Cloudmatch integration). -- **Streaming**: - - Low-latency RTP/WebRTC streaming. - - **Hardware Decoding**: - - Windows (D3D11/DXGI). - - macOS (VideoToolbox). - - Linux (FFmpeg/VAAPI where supported). -- **Input**: - - Raw Mouse & Keyboard input. - - Gamepad support (via `gilrs`). -- **Audio**: Low-latency audio playback (`cpal`). -- **Overlay**: In-stream stats and settings overlay (`egui`). - -### 🚧 To-Do / In Progress -- [ ] **Multi-account support** -- [ ] **Fix IGPU specific issues** (Intel/AMD integrated graphics quirks) -- [ ] **Clipboard Paste** support -- [ ] **Microphone** support +## Features & Implementation Status + +| Component | Feature | Status | Notes | +|-----------|---------|:------:|-------| +| **Core** | Authentication | ✅ | Secure login flow. | +| **Core** | Game Library | ✅ | Search & browse via Cloudmatch integration. | +| **Streaming** | RTP/WebRTC | ✅ | Low-latency streaming implementation. | +| **Streaming** | Hardware Decoding | ✅ | Windows (D3D11), macOS (VideoToolbox), Linux (VAAPI). | +| **Input** | Mouse/Keyboard | ✅ | Raw input capture. | +| **Input** | Gamepad | ✅ | Cross-platform support via `gilrs`. | +| **Input** | Clipboard Paste | 🚧 | Planned. | +| **Audio** | Playback | ✅ | Low-latency audio via `cpal`. | +| **Audio** | Microphone | 🚧 | Planned. | +| **UI** | Overlay | ✅ | In-stream stats & settings (egui). | +| **Core** | Multi-account | 🚧 | Planned. | +| **Fixes** | iGPU Support | 🚧 | Fixes for Intel/AMD quirks in progress. | ---
    • - -

    Select Server

    -

    Choose a server to queue on based on your ping and current wait times.

    - -
    - -
    -
    - Auto (Recommended) - ${autoServer ? `${autoServer.displayName} - Best balance of ping & wait` : 'Best available'} -
    -
    - ${autoServer?.ping_ms ? `${autoServer.ping_ms}ms` : '--'} - ~${formatQueueEta(autoServer?.etaSeconds)} -
    -
    - - ${servers.map(server => ` -
    -
    - ${server.displayName} - ${server.is5080Server ? 'RTX 5080' : 'RTX 4080'} -
    -
    - ${server.ping_ms ? `${server.ping_ms}ms` : '--'} - ~${formatQueueEta(server.etaSeconds)} -
    -
    - `).join('')} -
    - -
    - - -
    - -
    - Powered by PrintedWaste -
    -