From b6196b1c693dff21f586c61dd01ff68d51dab32c Mon Sep 17 00:00:00 2001
From: Kristian Ollikainen <14197772+DatCaptainHorse@users.noreply.github.com>
Date: Sun, 8 Dec 2024 15:37:36 +0200
Subject: [PATCH] feat: Custom gst webrtc signaller, runtime GPU driver package
 install and more (#140)

:fire: :fire:

Yes lots of commits because rebasing and all.. thankfully I know Git
just enough to have backups :sweat_smile:

---------

Co-authored-by: Wanjohi <elviswanjohi47@gmail.com>
Co-authored-by: Kristian Ollikainen <DatCaptainHorse@users.noreply.github.com>
Co-authored-by: Wanjohi <71614375+wanjohiryan@users.noreply.github.com>
Co-authored-by: AquaWolf <3daquawolf@gmail.com>
---
 .gitignore                                    |    2 +-
 Cargo.lock                                    | 2048 +++++++++++++++--
 Cargo.toml                                    |    5 +-
 Containerfile.master                          |  206 ++
 Containerfile.relay                           |   20 +
 Containerfile.runner                          |  119 +
 .../2.nestri-node/3.getting-started.md        |   65 +-
 apps/www/src/routes/play/[id]/index.tsx       |   34 +-
 packages/input/src/webrtc-stream.ts           |  106 +-
 packages/relay/internal/ingest.go             |   12 +-
 packages/relay/internal/participant.go        |    2 +-
 packages/relay/internal/websocket.go          |   16 +-
 packages/scripts/entrypoint.sh                |   65 +
 packages/scripts/entrypoint_nestri.sh         |  156 ++
 packages/scripts/envs.sh                      |    5 +-
 packages/scripts/gpu_helpers.sh               |  319 +--
 packages/scripts/supervisord.conf             |   53 +
 packages/server/Cargo.toml                    |    3 +-
 packages/server/src/args.rs                   |   15 +-
 packages/server/src/args/app_args.rs          |   28 +-
 packages/server/src/enc_helper.rs             |    7 +-
 packages/server/src/main.rs                   |  242 +-
 packages/server/src/messages.rs               |   25 +
 packages/server/src/nestrisink/imp.rs         |  466 ++++
 packages/server/src/nestrisink/mod.rs         |   25 +
 packages/server/src/room.rs                   |  540 -----
 packages/server/src/websocket.rs              |  187 +-
 27 files changed, 3412 insertions(+), 1359 deletions(-)
 create mode 100644 Containerfile.master
 create mode 100644 Containerfile.relay
 create mode 100644 Containerfile.runner
 create mode 100644 packages/scripts/entrypoint.sh
 create mode 100644 packages/scripts/entrypoint_nestri.sh
 create mode 100644 packages/scripts/supervisord.conf
 create mode 100644 packages/server/src/nestrisink/imp.rs
 create mode 100644 packages/server/src/nestrisink/mod.rs
 delete mode 100644 packages/server/src/room.rs

diff --git a/.gitignore b/.gitignore
index 6103291d..0bb76dbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,5 @@ bun.lockb
 #tests
 id_*
 
-# Rust
+#Rust
 target
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index b28e9ec9..b16cadae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -125,6 +125,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "anyhow"
+version = "1.0.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -143,7 +149,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -158,7 +164,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -182,7 +188,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure 0.13.1",
 ]
 
@@ -205,7 +211,18 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
+]
+
+[[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.90",
 ]
 
 [[package]]
@@ -216,7 +233,23 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "async-tungstenite"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90e661b6cb0a6eb34d02c520b052daa3aa9ac0cc02495c9d066bbce13ead132b"
+dependencies = [
+ "futures-io",
+ "futures-util",
+ "log",
+ "native-tls",
+ "pin-project-lite",
+ "tokio",
+ "tokio-native-tls",
+ "tungstenite 0.24.0",
 ]
 
 [[package]]
@@ -237,23 +270,64 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
+[[package]]
+name = "aws-config"
+version = "1.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-sdk-sso",
+ "aws-sdk-ssooidc",
+ "aws-sdk-sts",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "fastrand",
+ "hex",
+ "http 0.2.12",
+ "ring",
+ "time",
+ "tokio",
+ "tracing",
+ "url",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-credential-types"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "zeroize",
+]
+
 [[package]]
 name = "aws-lc-rs"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7c2840b66236045acd2607d5866e274380afd87ef99d6226e961e2cb47df45"
+checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3"
 dependencies = [
  "aws-lc-sys",
- "mirai-annotations",
  "paste",
  "zeroize",
 ]
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3a619a9de81e1d7de1f1186dcba4506ed661a0e483d84410fdef0ee87b2f96"
+checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7"
 dependencies = [
  "bindgen",
  "cc",
@@ -264,6 +338,308 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "aws-runtime"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
+dependencies = [
+ "aws-credential-types",
+ "aws-sigv4",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "fastrand",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "tracing",
+ "uuid",
+]
+
+[[package]]
+name = "aws-sdk-kinesisvideo"
+version = "1.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc26bf0ce49ce8e42b0ac43dd83261712657bbf7135314039420a6a319c47ee"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-kinesisvideosignaling"
+version = "1.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06bade141fd5c0274302bbf9ae52e1cde3553aede5777da75913a9dc99a74764"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-sso"
+version = "1.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-ssooidc"
+version = "1.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-types",
+ "bytes",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sdk-sts"
+version = "1.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ada54e5f26ac246dc79727def52f7f8ed38915cb47781e2a72213957dc3a7d5"
+dependencies = [
+ "aws-credential-types",
+ "aws-runtime",
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-json",
+ "aws-smithy-query",
+ "aws-smithy-runtime",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "aws-smithy-xml",
+ "aws-types",
+ "http 0.2.12",
+ "once_cell",
+ "regex-lite",
+ "tracing",
+]
+
+[[package]]
+name = "aws-sigv4"
+version = "1.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
+dependencies = [
+ "aws-credential-types",
+ "aws-smithy-http",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "form_urlencoded",
+ "hex",
+ "hmac",
+ "http 0.2.12",
+ "http 1.1.0",
+ "once_cell",
+ "percent-encoding",
+ "sha2",
+ "time",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-async"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
+dependencies = [
+ "futures-util",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "aws-smithy-http"
+version = "0.60.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6"
+dependencies = [
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "pin-utils",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-json"
+version = "0.60.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
+dependencies = [
+ "aws-smithy-types",
+]
+
+[[package]]
+name = "aws-smithy-query"
+version = "0.60.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb"
+dependencies = [
+ "aws-smithy-types",
+ "urlencoding",
+]
+
+[[package]]
+name = "aws-smithy-runtime"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-http",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "bytes",
+ "fastrand",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "httparse",
+ "hyper 0.14.31",
+ "hyper-rustls 0.24.2",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "rustls 0.21.12",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "aws-smithy-runtime-api"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92165296a47a812b267b4f41032ff8069ab7ff783696d217f0994a0d7ab585cd"
+dependencies = [
+ "aws-smithy-async",
+ "aws-smithy-types",
+ "bytes",
+ "http 0.2.12",
+ "http 1.1.0",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-smithy-types"
+version = "1.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510"
+dependencies = [
+ "base64-simd",
+ "bytes",
+ "bytes-utils",
+ "futures-core",
+ "http 0.2.12",
+ "http 1.1.0",
+ "http-body 0.4.6",
+ "http-body 1.0.1",
+ "http-body-util",
+ "itoa",
+ "num-integer",
+ "pin-project-lite",
+ "pin-utils",
+ "ryu",
+ "serde",
+ "time",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "aws-smithy-xml"
+version = "0.60.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc"
+dependencies = [
+ "xmlparser",
+]
+
+[[package]]
+name = "aws-types"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5221b91b3e441e6675310829fd8984801b772cb1546ef6c0e54dec9f1ac13fef"
+dependencies = [
+ "aws-credential-types",
+ "aws-smithy-async",
+ "aws-smithy-runtime-api",
+ "aws-smithy-types",
+ "rustc_version",
+ "tracing",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.74"
@@ -276,7 +652,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -297,6 +673,16 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64-simd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
+dependencies = [
+ "outref",
+ "vsimd",
+]
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -331,7 +717,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.87",
+ "syn 2.0.90",
  "which",
 ]
 
@@ -379,9 +765,19 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+
+[[package]]
+name = "bytes-utils"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
+dependencies = [
+ "bytes",
+ "either",
+]
 
 [[package]]
 name = "cbc"
@@ -394,9 +790,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.34"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
 dependencies = [
  "jobserver",
  "libc",
@@ -426,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.17.1"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c360837f8f19e2e4468275138f1c0dec1647d1e17bb7c0215fe3cd7530e93c25"
+checksum = "8d4ba6e40bd1184518716a6e1a781bf9160e286d219ccdb8ab2612e74cfe4789"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -440,6 +836,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[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.38"
@@ -451,7 +853,7 @@ dependencies = [
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -482,6 +884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
+ "clap_derive",
 ]
 
 [[package]]
@@ -496,6 +899,18 @@ dependencies = [
  "strsim",
 ]
 
+[[package]]
+name = "clap_derive"
+version = "4.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "clap_lex"
 version = "0.7.3"
@@ -504,9 +919,9 @@ checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "cmake"
-version = "0.1.51"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a"
+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
 dependencies = [
  "cc",
 ]
@@ -541,9 +956,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -604,6 +1019,16 @@ dependencies = [
  "cipher",
 ]
 
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix 0.29.0",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.3"
@@ -627,7 +1052,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -687,7 +1112,7 @@ dependencies = [
 name = "dev"
 version = "0.1.0"
 dependencies = [
- "reqwest",
+ "reqwest 0.12.9",
  "serde",
  "serde_json",
  "tokio",
@@ -714,7 +1139,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -781,12 +1206,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -811,6 +1236,12 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "flate2"
 version = "1.0.35"
@@ -913,7 +1344,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -964,8 +1395,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -984,10 +1417,26 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
+[[package]]
+name = "gio"
+version = "0.21.0"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8e2f4d0deae111562227082c677961d0a79f8b3a"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys",
+ "glib",
+ "libc",
+ "pin-project-lite",
+ "smallvec",
+]
+
 [[package]]
 name = "gio-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8e2f4d0deae111562227082c677961d0a79f8b3a"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -999,7 +1448,7 @@ dependencies = [
 [[package]]
 name = "glib"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8e2f4d0deae111562227082c677961d0a79f8b3a"
 dependencies = [
  "bitflags 2.6.0",
  "futures-channel",
@@ -1019,19 +1468,19 @@ dependencies = [
 [[package]]
 name = "glib-macros"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8e2f4d0deae111562227082c677961d0a79f8b3a"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "glib-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8e2f4d0deae111562227082c677961d0a79f8b3a"
 dependencies = [
  "libc",
  "system-deps",
@@ -1046,7 +1495,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "gobject-sys"
 version = "0.21.0"
-source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#c3fffcacfb5c420c12475bbb853318dc54ce531e"
+source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=main#8e2f4d0deae111562227082c677961d0a79f8b3a"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1065,15 +1514,113 @@ dependencies = [
 ]
 
 [[package]]
-name = "gstreamer"
-version = "0.24.0"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+name = "gst-plugin-version-helper"
+version = "0.8.1"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs?branch=main#6ee745edee78545da03ef7278e6081c05a524064"
 dependencies = [
- "cfg-if",
- "futures-channel",
- "futures-core",
- "futures-util",
- "glib",
+ "chrono",
+ "toml_edit",
+]
+
+[[package]]
+name = "gst-plugin-webrtc"
+version = "0.14.0-alpha.1"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs?branch=main#6ee745edee78545da03ef7278e6081c05a524064"
+dependencies = [
+ "anyhow",
+ "async-recursion",
+ "async-tungstenite",
+ "aws-config",
+ "aws-credential-types",
+ "aws-sdk-kinesisvideo",
+ "aws-sdk-kinesisvideosignaling",
+ "aws-sigv4",
+ "aws-smithy-http",
+ "aws-smithy-types",
+ "aws-types",
+ "chrono",
+ "ctrlc",
+ "data-encoding",
+ "fastrand",
+ "futures",
+ "gst-plugin-version-helper",
+ "gst-plugin-webrtc-signalling",
+ "gst-plugin-webrtc-signalling-protocol",
+ "gstreamer",
+ "gstreamer-app",
+ "gstreamer-audio",
+ "gstreamer-base",
+ "gstreamer-net",
+ "gstreamer-rtp",
+ "gstreamer-sdp",
+ "gstreamer-utils",
+ "gstreamer-video",
+ "gstreamer-webrtc",
+ "http 1.1.0",
+ "human_bytes",
+ "itertools 0.12.1",
+ "livekit-api",
+ "livekit-protocol",
+ "parse_link_header",
+ "rand",
+ "reqwest 0.11.27",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.3",
+ "tokio",
+ "tokio-native-tls",
+ "tokio-stream",
+ "tracing",
+ "tracing-log",
+ "tracing-subscriber",
+ "url",
+ "url-escape",
+ "uuid",
+ "warp",
+]
+
+[[package]]
+name = "gst-plugin-webrtc-signalling"
+version = "0.14.0-alpha.1"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs?branch=main#6ee745edee78545da03ef7278e6081c05a524064"
+dependencies = [
+ "anyhow",
+ "async-tungstenite",
+ "clap",
+ "futures",
+ "gst-plugin-webrtc-signalling-protocol",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "test-log",
+ "thiserror 2.0.3",
+ "tokio",
+ "tokio-native-tls",
+ "tracing",
+ "tracing-log",
+ "tracing-subscriber",
+ "uuid",
+]
+
+[[package]]
+name = "gst-plugin-webrtc-signalling-protocol"
+version = "0.14.0-alpha.1"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs?branch=main#6ee745edee78545da03ef7278e6081c05a524064"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "gstreamer"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "cfg-if",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "glib",
  "gstreamer-sys",
  "itertools 0.13.0",
  "kstring",
@@ -1084,6 +1631,8 @@ dependencies = [
  "option-operations",
  "paste",
  "pin-project-lite",
+ "serde",
+ "serde_bytes",
  "smallvec",
  "thiserror 2.0.3",
 ]
@@ -1091,7 +1640,7 @@ dependencies = [
 [[package]]
 name = "gstreamer-app"
 version = "0.24.0"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1105,7 +1654,7 @@ dependencies = [
 [[package]]
 name = "gstreamer-app-sys"
 version = "0.24.0"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
 dependencies = [
  "glib-sys",
  "gstreamer-base-sys",
@@ -1114,10 +1663,38 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "gstreamer-audio"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "cfg-if",
+ "glib",
+ "gstreamer",
+ "gstreamer-audio-sys",
+ "gstreamer-base",
+ "libc",
+ "serde",
+ "smallvec",
+]
+
+[[package]]
+name = "gstreamer-audio-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "gstreamer-base-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
 [[package]]
 name = "gstreamer-base"
 version = "0.24.0"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
 dependencies = [
  "atomic_refcell",
  "cfg-if",
@@ -1130,7 +1707,7 @@ dependencies = [
 [[package]]
 name = "gstreamer-base-sys"
 version = "0.24.0"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -1139,10 +1716,77 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "gstreamer-net"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "gio",
+ "glib",
+ "gstreamer",
+ "gstreamer-net-sys",
+]
+
+[[package]]
+name = "gstreamer-net-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-rtp"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib",
+ "gstreamer",
+ "gstreamer-rtp-sys",
+ "libc",
+]
+
+[[package]]
+name = "gstreamer-rtp-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib-sys",
+ "gstreamer-base-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-sdp"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib",
+ "gstreamer",
+ "gstreamer-sdp-sys",
+]
+
+[[package]]
+name = "gstreamer-sdp-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
 [[package]]
 name = "gstreamer-sys"
 version = "0.24.0"
-source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#36eca7cca935f930a3dfa006688a199084f4197a"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
 dependencies = [
  "cfg-if",
  "glib-sys",
@@ -1151,6 +1795,89 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "gstreamer-utils"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "gstreamer",
+ "gstreamer-app",
+ "gstreamer-video",
+ "thiserror 2.0.3",
+]
+
+[[package]]
+name = "gstreamer-video"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "cfg-if",
+ "futures-channel",
+ "glib",
+ "gstreamer",
+ "gstreamer-base",
+ "gstreamer-video-sys",
+ "libc",
+ "serde",
+ "thiserror 2.0.3",
+]
+
+[[package]]
+name = "gstreamer-video-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "gstreamer-base-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gstreamer-webrtc"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib",
+ "gstreamer",
+ "gstreamer-sdp",
+ "gstreamer-webrtc-sys",
+ "libc",
+]
+
+[[package]]
+name = "gstreamer-webrtc-sys"
+version = "0.24.0"
+source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=main#4bb72088232902e84747aae8be34f3aaf5c40ad7"
+dependencies = [
+ "glib-sys",
+ "gstreamer-sdp-sys",
+ "gstreamer-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.7"
@@ -1162,7 +1889,7 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http",
+ "http 1.1.0",
  "indexmap",
  "slab",
  "tokio",
@@ -1172,21 +1899,45 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "headers"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "headers-core",
+ "http 0.2.12",
+ "httpdate",
+ "mime",
+ "sha1",
+]
+
+[[package]]
+name = "headers-core"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+dependencies = [
+ "http 0.2.12",
+]
 
 [[package]]
 name = "heck"
-version = "0.5.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hex"
@@ -1221,6 +1972,17 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
 [[package]]
 name = "http"
 version = "1.1.0"
@@ -1232,6 +1994,17 @@ dependencies = [
  "itoa",
 ]
 
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "http-body"
 version = "1.0.1"
@@ -1239,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http",
+ "http 1.1.0",
 ]
 
 [[package]]
@@ -1250,8 +2023,8 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http",
- "http-body",
+ "http 1.1.0",
+ "http-body 1.0.1",
  "pin-project-lite",
 ]
 
@@ -1261,6 +2034,42 @@ version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "human_bytes"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e"
+
+[[package]]
+name = "hyper"
+version = "0.14.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
 [[package]]
 name = "hyper"
 version = "1.5.1"
@@ -1270,9 +2079,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.4.7",
+ "http 1.1.0",
+ "http-body 1.0.1",
  "httparse",
  "itoa",
  "pin-project-lite",
@@ -1281,6 +2090,22 @@ dependencies = [
  "want",
 ]
 
+[[package]]
+name = "hyper-rustls"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+dependencies = [
+ "futures-util",
+ "http 0.2.12",
+ "hyper 0.14.31",
+ "log",
+ "rustls 0.21.12",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls 0.24.1",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.27.3"
@@ -1288,16 +2113,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 1.1.0",
+ "hyper 1.5.1",
  "hyper-util",
- "rustls",
+ "rustls 0.23.19",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.0",
  "tower-service",
 ]
 
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper 0.14.31",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@@ -1306,7 +2144,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper",
+ "hyper 1.5.1",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -1323,9 +2161,9 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http",
- "http-body",
- "hyper",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "hyper 1.5.1",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -1471,7 +2309,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1497,9 +2335,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1528,7 +2366,7 @@ dependencies = [
  "rand",
  "rtcp",
  "rtp",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "waitgroup",
  "webrtc-srtp",
@@ -1547,6 +2385,15 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -1567,9 +2414,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
@@ -1582,13 +2429,27 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.72"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
+checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
+dependencies = [
+ "base64 0.21.7",
+ "js-sys",
+ "ring",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "kstring"
 version = "2.0.2"
@@ -1612,18 +2473,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1634,9 +2495,48 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "litemap"
-version = "0.7.3"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
+name = "livekit-api"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+checksum = "e20c3fc3de5944ce6b5c8da4084cf828bbae7216671e32e83b767ce61feeb7e0"
+dependencies = [
+ "futures-util",
+ "jsonwebtoken",
+ "livekit-protocol",
+ "log",
+ "parking_lot",
+ "prost",
+ "reqwest 0.11.27",
+ "scopeguard",
+ "serde",
+ "sha2",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-tungstenite 0.20.1",
+ "url",
+]
+
+[[package]]
+name = "livekit-protocol"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a1bd23257110be29d024d8d816adff70df18ea1d22ceb1aab6f3ad4aab0d523"
+dependencies = [
+ "futures-util",
+ "parking_lot",
+ "pbjson",
+ "pbjson-types",
+ "prost",
+ "prost-types",
+ "serde",
+ "thiserror 1.0.69",
+ "tokio",
+]
 
 [[package]]
 name = "lock_api"
@@ -1654,6 +2554,15 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -1685,6 +2594,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -1702,28 +2621,45 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "mirai-annotations"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1"
-
 [[package]]
 name = "muldiv"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0"
 
+[[package]]
+name = "multer"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http 0.2.12",
+ "httparse",
+ "log",
+ "memchr",
+ "mime",
+ "spin",
+ "version_check",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+
 [[package]]
 name = "native-tls"
 version = "0.2.12"
@@ -1749,18 +2685,19 @@ dependencies = [
  "clap",
  "flate2",
  "futures-util",
+ "gst-plugin-webrtc",
  "gstreamer",
- "gstreamer-app",
+ "gstreamer-webrtc",
  "log",
  "num-derive",
  "num-traits",
  "rand",
  "regex",
- "rustls",
+ "rustls 0.23.19",
  "serde",
  "serde_json",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.24.0",
  "tokio-util",
  "webrtc",
 ]
@@ -1778,6 +2715,18 @@ dependencies = [
  "pin-utils",
 ]
 
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -1788,6 +2737,16 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -1812,7 +2771,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1832,6 +2791,7 @@ checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
  "num-integer",
  "num-traits",
+ "serde",
 ]
 
 [[package]]
@@ -1896,7 +2856,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1926,6 +2886,18 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "outref"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "p256"
 version = "0.13.2"
@@ -1970,7 +2942,19 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "parse_link_header"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3687fe9debbbf2a019f381a8bc6b42049b22647449b39af54b3013985c0cf6de"
+dependencies = [
+ "http 0.2.12",
+ "lazy_static",
+ "regex",
+ "url",
 ]
 
 [[package]]
@@ -1979,6 +2963,43 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pbjson"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
+[[package]]
+name = "pbjson-build"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2580e33f2292d34be285c5bc3dba5259542b083cfad6037b6d70345f24dcb735"
+dependencies = [
+ "heck 0.4.1",
+ "itertools 0.11.0",
+ "prost",
+ "prost-types",
+]
+
+[[package]]
+name = "pbjson-types"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18f596653ba4ac51bdecbb4ef6773bc7f56042dc13927910de1684ad3d32aa12"
+dependencies = [
+ "bytes",
+ "chrono",
+ "pbjson",
+ "pbjson-build",
+ "prost",
+ "prost-build",
+ "serde",
+]
+
 [[package]]
 name = "pem"
 version = "3.0.4"
@@ -2004,6 +3025,36 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.15"
@@ -2046,9 +3097,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "powerfmt"
@@ -2072,7 +3123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2095,13 +3146,66 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prost"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+dependencies = [
+ "bytes",
+ "heck 0.5.0",
+ "itertools 0.12.1",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn 2.0.90",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+dependencies = [
+ "anyhow",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+dependencies = [
+ "prost",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@@ -2172,27 +3276,88 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.5",
 ]
 
+[[package]]
+name = "regex-lite"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a"
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
+[[package]]
+name = "reqwest"
+version = "0.11.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+dependencies = [
+ "base64 0.21.7",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.31",
+ "hyper-tls 0.5.0",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile 1.0.4",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "system-configuration 0.5.1",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.12.9"
@@ -2204,13 +3369,13 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.4.7",
+ "http 1.1.0",
+ "http-body 1.0.1",
  "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
+ "hyper 1.5.1",
+ "hyper-rustls 0.27.3",
+ "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
  "js-sys",
@@ -2220,12 +3385,12 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pemfile 2.2.0",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
+ "sync_wrapper 1.0.2",
+ "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
  "tower-service",
@@ -2268,7 +3433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc9f775ff89c5fe7f0cc0abafb7c57688ae25ce688f1a52dd88e277616c76ab2"
 dependencies = [
  "bytes",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -2282,7 +3447,7 @@ dependencies = [
  "portable-atomic",
  "rand",
  "serde",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "webrtc-util",
 ]
 
@@ -2318,9 +3483,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.38"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -2331,20 +3496,67 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.17"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki 0.101.7",
+ "sct",
+]
+
+[[package]]
+name = "rustls"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
  "aws-lc-rs",
  "log",
  "once_cell",
  "ring",
  "rustls-pki-types",
- "rustls-webpki",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "2.2.0"
@@ -2360,6 +3572,16 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustls-webpki"
 version = "0.102.8"
@@ -2380,19 +3602,35 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "schannel"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[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 = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "sdp"
 version = "0.6.2"
@@ -2401,7 +3639,7 @@ checksum = "13254db766b17451aced321e7397ebf0a446ef0c8d2942b6e67a95815421093f"
 dependencies = [
  "rand",
  "substring",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "url",
 ]
 
@@ -2449,12 +3687,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
-name = "serde"
-version = "1.0.215"
+name = "serde"
+version = "1.0.215"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
- "serde_derive",
+ "serde",
 ]
 
 [[package]]
@@ -2465,7 +3712,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2523,6 +3770,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -2574,9 +3830,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2629,7 +3885,7 @@ dependencies = [
  "rand",
  "ring",
  "subtle",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "url",
  "webrtc-util",
@@ -2663,15 +3919,21 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -2701,7 +3963,18 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys 0.5.0",
 ]
 
 [[package]]
@@ -2712,7 +3985,17 @@ checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
  "bitflags 2.6.0",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.6.0",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
 ]
 
 [[package]]
@@ -2732,7 +4015,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005"
 dependencies = [
  "cfg-expr",
- "heck",
+ "heck 0.5.0",
  "pkg-config",
  "toml",
  "version-compare",
@@ -2746,9 +4029,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -2757,13 +4040,34 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "test-log"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dffced63c2b5c7be278154d76b479f9f9920ed34e7574201407f0b14e2bbb93"
+dependencies = [
+ "test-log-macros",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "test-log-macros"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "thiserror"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d171f59dbaa811dbbb1aee1e73db92ec2b122911a48e1390dfe327a821ddede"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.66",
+ "thiserror-impl 1.0.69",
 ]
 
 [[package]]
@@ -2777,13 +4081,13 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b08be0f17bd307950653ce45db00cd31200d82b624b36e181337d9c7d92765b5"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2794,7 +4098,17 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
 ]
 
 [[package]]
@@ -2864,7 +4178,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2877,17 +4191,75 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.12",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+dependencies = [
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-rustls"
 version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls",
+ "rustls 0.23.19",
  "rustls-pki-types",
  "tokio",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+dependencies = [
+ "futures-util",
+ "log",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tungstenite 0.20.1",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.21.0",
+]
+
 [[package]]
 name = "tokio-tungstenite"
 version = "0.24.0"
@@ -2899,7 +4271,7 @@ dependencies = [
  "native-tls",
  "tokio",
  "tokio-native-tls",
- "tungstenite",
+ "tungstenite 0.24.0",
 ]
 
 [[package]]
@@ -2957,21 +4329,64 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
+ "matchers",
+ "nu-ansi-term",
  "once_cell",
+ "regex",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log",
 ]
 
 [[package]]
@@ -2980,6 +4395,45 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 0.2.12",
+ "httparse",
+ "log",
+ "native-tls",
+ "rand",
+ "sha1",
+ "thiserror 1.0.69",
+ "url",
+ "utf-8",
+]
+
+[[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 1.1.0",
+ "httparse",
+ "log",
+ "rand",
+ "sha1",
+ "thiserror 1.0.69",
+ "url",
+ "utf-8",
+]
+
 [[package]]
 name = "tungstenite"
 version = "0.24.0"
@@ -2989,13 +4443,14 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http",
+ "http 1.1.0",
  "httparse",
  "log",
  "native-tls",
  "rand",
  "sha1",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
+ "url",
  "utf-8",
 ]
 
@@ -3014,7 +4469,7 @@ dependencies = [
  "rand",
  "ring",
  "stun",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-util",
  "webrtc-util",
@@ -3026,11 +4481,17 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[package]]
+name = "unicase"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df"
+
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-xid"
@@ -3056,15 +4517,30 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.3"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "url-escape"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44e0ce4d1246d075ca5abec4b41d33e87a6054d08e2366b63205665e950db218"
+dependencies = [
+ "percent-encoding",
+]
+
+[[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"
@@ -3098,6 +4574,12 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -3116,6 +4598,12 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
+[[package]]
+name = "vsimd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
+
 [[package]]
 name = "waitgroup"
 version = "0.1.2"
@@ -3134,6 +4622,37 @@ dependencies = [
  "try-lock",
 ]
 
+[[package]]
+name = "warp"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "headers",
+ "http 0.2.12",
+ "hyper 0.14.31",
+ "log",
+ "mime",
+ "mime_guess",
+ "multer",
+ "percent-encoding",
+ "pin-project",
+ "rustls-pemfile 2.2.0",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tokio-rustls 0.25.0",
+ "tokio-tungstenite 0.21.0",
+ "tokio-util",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3142,9 +4661,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
+checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3153,36 +4672,37 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
+checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.45"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
+checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
 dependencies = [
  "cfg-if",
  "js-sys",
+ "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
+checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3190,28 +4710,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
+checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.95"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
+checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"
 
 [[package]]
 name = "web-sys"
-version = "0.3.72"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
+checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3238,14 +4758,14 @@ dependencies = [
  "ring",
  "rtcp",
  "rtp",
- "rustls",
+ "rustls 0.23.19",
  "sdp",
  "serde",
  "serde_json",
  "sha2",
  "smol_str",
  "stun",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "time",
  "tokio",
  "turn",
@@ -3270,7 +4790,7 @@ dependencies = [
  "bytes",
  "log",
  "portable-atomic",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-sctp",
  "webrtc-util",
@@ -3300,13 +4820,13 @@ dependencies = [
  "rand_core",
  "rcgen",
  "ring",
- "rustls",
+ "rustls 0.23.19",
  "sec1",
  "serde",
  "sha1",
  "sha2",
  "subtle",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
  "x25519-dalek",
@@ -3328,7 +4848,7 @@ dependencies = [
  "serde",
  "serde_json",
  "stun",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "turn",
  "url",
@@ -3346,7 +4866,7 @@ checksum = "c0804694f3b2acfdff48f6df217979b13cb0a00377c63b5effd111daaee7e8c4"
 dependencies = [
  "log",
  "socket2",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3361,7 +4881,7 @@ dependencies = [
  "bytes",
  "rand",
  "rtp",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3377,7 +4897,7 @@ dependencies = [
  "log",
  "portable-atomic",
  "rand",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3400,7 +4920,7 @@ dependencies = [
  "rtp",
  "sha1",
  "subtle",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "webrtc-util",
 ]
@@ -3418,10 +4938,10 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "nix",
+ "nix 0.26.4",
  "portable-atomic",
  "rand",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "tokio",
  "winapi",
 ]
@@ -3466,7 +4986,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3477,7 +4997,7 @@ checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
 dependencies = [
  "windows-result",
  "windows-strings",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3486,7 +5006,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3496,7 +5016,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
  "windows-result",
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[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]]
@@ -3505,7 +5034,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3514,7 +5043,22 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[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]]
@@ -3523,28 +5067,46 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "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_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_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_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"
@@ -3557,24 +5119,48 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[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_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_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_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"
@@ -3590,6 +5176,16 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "write16"
 version = "1.0.0"
@@ -3628,10 +5224,16 @@ dependencies = [
  "oid-registry",
  "ring",
  "rusticata-macros",
- "thiserror 1.0.66",
+ "thiserror 1.0.69",
  "time",
 ]
 
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
@@ -3643,9 +5245,9 @@ dependencies = [
 
 [[package]]
 name = "yoke"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -3655,13 +5257,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure 0.13.1",
 ]
 
@@ -3683,27 +5285,27 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
  "synstructure 0.13.1",
 ]
 
@@ -3724,7 +5326,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3746,5 +5348,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.87",
+ "syn 2.0.90",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c99fb87b..f34abe0c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,5 +12,6 @@ edition = "2021"
 rust-version = "1.80"
 
 [workspace.dependencies]
-gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", version = "0.24.0" }
-gst-app = { package = "gstreamer-app", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", version = "0.24.0" }
+gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main", features = ["v1_24"] }
+gst-webrtc = { package = "gstreamer-webrtc", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", branch = "main", features = ["v1_24"] }
+gstrswebrtc = { package = "gst-plugin-webrtc", git = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs", branch = "main", features = ["v1_22"] }
diff --git a/Containerfile.master b/Containerfile.master
new file mode 100644
index 00000000..14777233
--- /dev/null
+++ b/Containerfile.master
@@ -0,0 +1,206 @@
+#! Runs the docker server that handles everything else
+#******************************************************************************
+#                                                                          base
+#******************************************************************************
+FROM archlinux:base-20241027.0.273886 AS base
+# How to run -  docker run -it --rm --device /dev/dri nestri /bin/bash - DO NOT forget the ports
+# TODO: Migrate XDG_RUNTIME_DIR to /run/user/1000
+# TODO: Add nestri-server to pulseaudio.conf
+# TODO: Add our own entrypoint, with our very own zombie ripper 🧟🏾‍♀️
+# FIXME: Add user root to `pulse-access` group as well :D
+# TODO: Test the whole damn thing
+
+# Update the pacman repo
+RUN \
+    pacman -Syu --noconfirm
+
+#******************************************************************************
+#                                                                       builder
+#******************************************************************************
+
+FROM base AS builder
+
+RUN \
+    pacman -Su --noconfirm \
+    base-devel \
+    git \
+    sudo \
+    vim
+
+WORKDIR /scratch
+
+# Allow nobody user to invoke pacman to install packages (as part of makepkg) and modify the system.
+# This should never exist in a running image, just used by *-build Docker stages.
+RUN \
+  echo "nobody ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers;
+
+ENV ARTIFACTS=/artifacts \
+    CARGO_TARGET_DIR=/build
+
+RUN \
+  mkdir -p /artifacts \
+  && mkdir -p /build
+  
+RUN \
+  chgrp nobody /scratch /artifacts /build \
+  && chmod g+ws /scratch /artifacts /build
+
+#******************************************************************************
+#                                                                  rust-builder
+#******************************************************************************
+
+FROM builder AS rust-builder
+
+RUN \
+    pacman -Su --noconfirm \
+    rustup
+
+RUN \
+    rustup default stable
+
+#******************************************************************************
+#                                                         nestri-server-builder
+#******************************************************************************
+# Builds nestri server binary
+FROM rust-builder AS nestri-server-builder
+
+RUN \
+    pacman -Su --noconfirm \
+    wayland \
+	vpl-gpu-rt \
+	gstreamer \
+	gst-plugin-va \
+	gst-plugins-base \
+	gst-plugins-good \
+	mesa-utils \
+	weston \
+	xorg-xwayland
+
+
+#******************************************************************************
+#                                                          nestri-server-build
+#******************************************************************************
+
+FROM nestri-server-builder AS nestri-server-build
+
+#Allow makepkg to be run as nobody.
+RUN chgrp -R nobody /scratch && chmod -R g+ws /scratch
+
+# USER nobody
+
+# Perform the server build.
+WORKDIR /scratch/server
+
+RUN \
+    git clone https://github.com/nestriness/nestri
+
+WORKDIR /scratch/server/nestri
+
+RUN \
+    git checkout feat/stream \
+    && cargo build -j$(nproc) --release
+
+# COPY packages/server/build/ /scratch/server/
+
+# RUN makepkg && cp *.zst "$ARTIFACTS"
+#******************************************************************************
+#                                                             runtime_base_pkgs
+#******************************************************************************
+
+FROM base AS runtime_base_pkgs
+
+COPY --from=nestri-server-build /build/release/nestri-server /usr/bin/
+
+#******************************************************************************
+#                                                                  runtime_base
+#******************************************************************************
+
+FROM runtime_base_pkgs AS runtime_base
+
+RUN \
+    pacman -Su --noconfirm \
+    weston \
+    sudo \
+    xorg-xwayland \
+    gstreamer \
+    gst-plugins-base \
+    gst-plugins-good \
+    gst-plugin-qsv \
+    gst-plugin-va \
+    gst-plugin-fmp4 \
+    mesa \
+    # Grab GPU encoding packages
+    # Intel (modern VPL + VA-API)
+    vpl-gpu-rt \
+    intel-media-driver \
+    # AMD/ATI (VA-API)
+    libva-mesa-driver \
+    # NVIDIA (proprietary)
+    nvidia-utils \
+    # Audio
+    pulseaudio \
+    # Supervisor
+    supervisor
+    
+RUN \
+    # Set up our non-root user $(nestri)
+    groupadd -g 1000 nestri \
+    && useradd -ms /bin/bash nestri -u 1000 -g 1000  \
+    && passwd -d nestri \
+    # Setup Pulseaudio
+    && useradd -d /var/run/pulse -s /usr/bin/nologin -G audio pulse \
+    && groupadd pulse-access \
+    && usermod -aG audio,input,render,video,pulse-access nestri \
+    && echo "nestri ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
+    && echo "Users created" \
+    # Create an empty machine-id file
+    && touch /etc/machine-id
+
+ENV \
+    XDG_RUNTIME_DIR=/tmp
+
+#******************************************************************************
+#                                                                       runtime
+#******************************************************************************
+
+FROM runtime_base AS runtime
+# Setup supervisor #
+RUN <<-EOF
+    echo -e "
+        [supervisord]
+        user=root
+        nodaemon=true
+        loglevel=info
+        logfile=/tmp/supervisord.log
+        pidfile=/tmp/supervisord.pid
+
+        [program:dbus]
+        user=root
+        command=dbus-daemon --system --nofork
+        logfile=/tmp/dbus.log
+        pidfile=/tmp/dbus.pid
+        stopsignal=INT
+        autostart=true
+        autorestart=true
+        priority=1
+
+        [program:pulseaudio]
+        user=root
+        command=pulseaudio --daemonize=no --system --disallow-module-loading --disallow-exit --exit-idle-time=-1
+        logfile=/tmp/pulseaudio.log
+        pidfile=/tmp/pulseaudio.pid
+        stopsignal=INT
+        autostart=true
+        autorestart=true
+        priority=10
+    " | tee /etc/supervisord.conf
+EOF
+
+RUN \
+    chown -R nestri:nestri /tmp /etc/supervisord.conf
+
+ENV USER=nestri
+USER 1000
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
+# Debug - pactl list
\ No newline at end of file
diff --git a/Containerfile.relay b/Containerfile.relay
new file mode 100644
index 00000000..ee36a64e
--- /dev/null
+++ b/Containerfile.relay
@@ -0,0 +1,20 @@
+FROM docker.io/golang:1.23-alpine AS go-build
+WORKDIR /builder
+COPY packages/relay/ /builder/
+RUN go build
+
+FROM docker.io/golang:1.23-alpine
+COPY --from=go-build /builder/relay /relay/relay
+WORKDIR /relay
+
+# ENV flags
+ENV VERBOSE=false
+ENV ENDPOINT_PORT=8088
+ENV WEBRTC_UDP_START=10000
+ENV WEBRTC_UDP_END=20000
+ENV STUN_SERVER="stun.l.google.com:19302"
+
+EXPOSE $ENDPOINT_PORT
+EXPOSE $WEBRTC_UDP_START-$WEBRTC_UDP_END/udp
+
+ENTRYPOINT ["/relay/relay"]
\ No newline at end of file
diff --git a/Containerfile.runner b/Containerfile.runner
new file mode 100644
index 00000000..64b2a39d
--- /dev/null
+++ b/Containerfile.runner
@@ -0,0 +1,119 @@
+# Container build arguments #
+ARG BASE_IMAGE=docker.io/cachyos/cachyos-v3:latest
+
+#******************************************************************************
+#                                                                   gst-builder
+#******************************************************************************
+FROM ${BASE_IMAGE} AS gst-builder
+WORKDIR /builder/
+
+# Grab build and rust packages #
+RUN pacman -Syu --noconfirm meson pkgconf cmake git gcc make rustup \
+	gstreamer gst-plugins-base gst-plugins-good gst-plugin-rswebrtc
+
+# Setup stable rust toolchain #
+RUN rustup default stable
+# Clone nestri source #
+RUN git clone -b feat/stream https://github.com/DatCaptainHorse/nestri.git
+
+# Build nestri #
+RUN cd nestri/packages/server/ && \
+    cargo build --release
+
+#******************************************************************************
+#                                                            gstwayland-builder
+#******************************************************************************
+FROM ${BASE_IMAGE} AS gstwayland-builder
+WORKDIR /builder/
+
+# Grab build and rust packages #
+RUN pacman -Syu --noconfirm meson pkgconf cmake git gcc make rustup \
+	libxkbcommon wayland gstreamer gst-plugins-base gst-plugins-good libinput
+
+# Setup stable rust toolchain #
+RUN rustup default stable
+# Build required cargo-c package #
+RUN cargo install cargo-c
+# Clone gst plugin source #
+RUN git clone https://github.com/games-on-whales/gst-wayland-display.git
+
+# Build gst plugin #
+RUN mkdir plugin && \
+	cd gst-wayland-display && \
+	cargo cinstall --prefix=/builder/plugin/
+
+
+#******************************************************************************
+#                                                                       runtime
+#******************************************************************************
+FROM ${BASE_IMAGE} AS runtime
+
+## Install Graphics, Media, and Audio packages ##
+RUN pacman -Syu --noconfirm --needed \
+    # Graphics packages
+    sudo xorg-xwayland labwc wlr-randr mangohud \
+    # GStreamer and plugins
+    gstreamer gst-plugins-base gst-plugins-good \
+    gst-plugins-bad gst-plugin-pipewire \
+    gst-plugin-rswebrtc gst-plugin-rsrtp \
+    # Audio packages
+    pipewire pipewire-pulse pipewire-alsa wireplumber \
+    # Other requirements
+    supervisor jq chwd lshw pacman-contrib && \
+    # Clean up pacman cache
+    paccache -rk1
+
+
+## User ##
+# Create and setup user #
+ENV USER="nestri" \
+	UID=99 \
+	GID=100 \
+	USER_PASSWORD="nestri1234"
+
+RUN mkdir -p /home/${USER} && \
+    groupadd -g ${GID} ${USER} && \
+    useradd -d /home/${USER} -u ${UID} -g ${GID} -s /bin/bash ${USER} && \
+    chown -R ${USER}:${USER} /home/${USER} && \
+    echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+    echo "${USER}:${USER_PASSWORD}" | chpasswd
+
+# Run directory #
+RUN mkdir -p /run/user/${UID} && \
+	chown ${USER}:${USER} /run/user/${UID}
+
+# Groups #
+RUN usermod -aG input root && usermod -aG input ${USER} && \
+    usermod -aG video root && usermod -aG video ${USER} && \
+    usermod -aG render root && usermod -aG render ${USER}
+
+## Copy files from builders ##
+# this is done here at end to not trigger full rebuild on changes to builder
+# nestri
+COPY --from=gst-builder /builder/nestri/target/release/nestri-server /usr/bin/nestri-server
+# gstwayland
+COPY --from=gstwayland-builder /builder/plugin/include/libgstwaylanddisplay /usr/include/
+COPY --from=gstwayland-builder /builder/plugin/lib/*libgstwayland* /usr/lib/
+COPY --from=gstwayland-builder /builder/plugin/lib/gstreamer-1.0/libgstwayland* /usr/lib/gstreamer-1.0/
+COPY --from=gstwayland-builder /builder/plugin/lib/pkgconfig/gstwayland* /usr/lib/pkgconfig/
+COPY --from=gstwayland-builder /builder/plugin/lib/pkgconfig/libgstwayland* /usr/lib/pkgconfig/
+
+## Copy scripts ##
+COPY packages/scripts/ /etc/nestri/
+# Set scripts as executable #
+RUN chmod +x /etc/nestri/envs.sh /etc/nestri/entrypoint.sh /etc/nestri/entrypoint_nestri.sh
+
+## Set runtime envs ##
+ENV XDG_RUNTIME_DIR=/run/user/${UID} \
+    HOME=/home/${USER}
+
+# Required for NVIDIA.. they want to be special like that #
+ENV NVIDIA_DRIVER_CAPABILITIES=all
+
+# Wireplumber disable suspend #
+# Remove suspend node
+RUN sed -z -i 's/{[[:space:]]*name = node\/suspend-node\.lua,[[:space:]]*type = script\/lua[[:space:]]*provides = hooks\.node\.suspend[[:space:]]*}[[:space:]]*//g' /usr/share/wireplumber/wireplumber.conf
+# Remove "hooks.node.suspend" want
+RUN sed -i '/wants = \[/{s/hooks\.node\.suspend\s*//; s/,\s*\]/]/}' /usr/share/wireplumber/wireplumber.conf
+
+ENTRYPOINT ["supervisord", "-c", "/etc/nestri/supervisord.conf"]
diff --git a/apps/docs/content/2.nestri-node/3.getting-started.md b/apps/docs/content/2.nestri-node/3.getting-started.md
index 1d8007ac..edffbec8 100644
--- a/apps/docs/content/2.nestri-node/3.getting-started.md
+++ b/apps/docs/content/2.nestri-node/3.getting-started.md
@@ -4,8 +4,20 @@
 Nestri is in a **very early-beta phase**, so errors and bugs may occur.
 ::
 
+### Step 0: Construct Your Docker Image
+Checkout your branch with the latest version of nestri and build the image `<your-nestri-image>` within git root folder:
+```bash
+docker buildx build -t <your-nestri-image>:latest -f Containerfile.runner .
+```
+
+::alert{type="info"}
+You can right now also pull the docker image from DatHorse GitHub Containter Registry with:
+```bash
+docker pull ghcr.io/datcaptainhorse/nestri-cachyos:latest
+```
+::
 
-## Step 1: Navigate to Your Game Directory
+### Step 1: Navigate to Your Game Directory
 First, change your directory to the location of your `.exe` file. For Steam games, this typically means:
 ```bash
 cd $HOME/.steam/steam/steamapps
@@ -18,28 +30,49 @@ echo "$(head /dev/urandom | LC_ALL=C tr -dc 'a-zA-Z0-9' | head -c 16)"
 ```
 This command generates a random 16-character string. Be sure to note this string carefully, as you'll need it for the next step.
 ### Step 3: Launch the Nestri Server
-With your SESSION_ID ready, insert it into the command below, replacing `<paste here>` with your actual session ID. Then, run the command to start the Nestri server:
+With your SESSION_ID ready, insert it into the command below, replacing `<your_session_id>` with your actual session ID, also replace `<relay_url>` with your relay URL and `<your-nestri-image>` with your build nestri image or nestri remote image. Then run the command to start the Nestri server:
+
+```bash
+docker run --rm -it --shm-size=1g --gpus all -e NVIDIA_DRIVER_CAPABILITIES=all --runtime=nvidia -e RELAY_URL='<relay_url>' -e NESTRI_ROOM=<your_session_id> -e RESOLUTION=1920x1080 -e FRAMERATE=60 -e NESTRI_PARAMS='--verbose=true --video-codec=h264 --video-bitrate=4000 --video-bitrate-max=6000'--name nestri -d -v "$(pwd)":/mnt/game/ <your-nestri-image>:latest
+```
+
+### Step 4: Get Into your container
+Get into your container to start your game:
+```bash
+sudo docker exec -it nestri bash
 ```
-docker run --gpus all --device=/dev/dri --name nestri -it --entrypoint /bin/bash -e SESSION_ID=<paste here> -v "$(pwd)":/game -p 8080:8080/udp --cap-add=SYS_NICE --cap-add=SYS_ADMIN ghcr.io/nestriness/nestri/server:nightly
+### Step 5: Installing a Launcher
+For most games that are not DRM free you need a launcher. In this case use the umu launcher and optional mangohud:
+```bash
+pacman -S --overwrite="*" umu-launcher mangohud
 ```
-> \[!TIP]
->
-> Ensure UDP port 8080 is accessible from the internet. Use `ufw allow 8080/udp` or adjust your cloud provider's security group settings accordingly.
-### Step 4: Configure the Game within the Container
-After executing the previous command, you'll be in a new shell within the container (example: `nestri@3f199ee68c01:~$`). Perform the following checks:
-1. Verify the game is mounted by executing `ls -la /game`. If not, exit and ensure you've correctly mounted the game directory as a volume.
-2. Then, start the Nestri server by running `/etc/startup.sh > /dev/null &`.
+
 ### Step 5: Running Your Game
-Wait for the `.X11-unix` directory to appear in `/tmp` (check with `ls -la /tmp`). Once it appears, you're ready to launch your game.
-- With Proton-GE: `nestri-proton -pr <game>.exe`
-- With Wine: `nestri-proton -wr <game>.exe`
+You have to execute your game now with nestri user. If you have a linux game just execute it with the nestri user
+```bash
+su nestri
+source /etc/nestri/envs.sh
+GAMEID=0 PROTONPATH=GE-Proton mangohud umu-run /mnt/game/<your-game.exe>
+```
+
 ### Step 6: Begin Playing
 Finally, construct the play URL with your session ID:
-```
-echo "https://nestri.io/play/$SESSION_ID"
-```
+`https://nestri.io/play/<your_session_id>`
+
 Navigate to this URL in your browser, click on the page to capture your mouse pointer, and start playing!
 
+::alert{type="info"}
+You can also use other relays/frontends depending on your choosen `<relay_url>`
+For testing you can use DatHorse Relay and Frontend:
+
+| **Placeholder**                      | **URL**   |
+| ---------------------------- | ---------- |
+| `<relay_url>`              | `https://relay.dathorse.com/`   |
+| `<frontend_url>`           | `https://nestritest.dathorse.com/play/<your_session_id>` |
+::
+
+
+
 
 <!--
 Nestri Node is easy to install using the provided installation script. Follow the steps below to get started.
diff --git a/apps/www/src/routes/play/[id]/index.tsx b/apps/www/src/routes/play/[id]/index.tsx
index 03d71add..f94dc4ec 100644
--- a/apps/www/src/routes/play/[id]/index.tsx
+++ b/apps/www/src/routes/play/[id]/index.tsx
@@ -17,7 +17,7 @@ export default component$(() => {
       video = document.createElement("video");
       video.id = "stream-video-player";
       video.style.visibility = "hidden";
-      const webrtc = new WebRTCStream("https://relay.dathorse.com", id, (mediaStream) => {
+      const webrtc = new WebRTCStream("http://localhost:8088", id, (mediaStream) => {
         if (video && mediaStream && (video as HTMLVideoElement).srcObject === null) {
           console.log("Setting mediastream");
           (video as HTMLVideoElement).srcObject = mediaStream;
@@ -26,6 +26,8 @@ export default component$(() => {
           window.hasstream = true;
           // @ts-ignore
           window.roomOfflineElement?.remove();
+          // @ts-ignore
+          window.playbtnelement?.remove();
 
           const playbtn = document.createElement("button");
           playbtn.style.position = "absolute";
@@ -81,8 +83,14 @@ export default component$(() => {
             });
           };
           document.body.append(playbtn);
+          // @ts-ignore
+          window.playbtnelement = playbtn;
         } else if (mediaStream === null) {
           console.log("MediaStream is null, Room is offline");
+          // @ts-ignore
+          window.playbtnelement?.remove();
+          // @ts-ignore
+          window.roomOfflineElement?.remove();
           // Add a message to the screen
           const offline = document.createElement("div");
           offline.style.position = "absolute";
@@ -104,6 +112,30 @@ export default component$(() => {
             const ctx = canvas.value.getContext("2d");
             if (ctx) ctx.clearRect(0, 0, canvas.value.width, canvas.value.height);
           }
+        } else if ((video as HTMLVideoElement).srcObject !== null) {
+          console.log("Setting new mediastream");
+          (video as HTMLVideoElement).srcObject = mediaStream;
+          // @ts-ignore
+          window.hasstream = true;
+          // Start video rendering
+          (video as HTMLVideoElement).play().then(() => {
+            // @ts-ignore
+            window.roomOfflineElement?.remove();
+            if (canvas.value) {
+              canvas.value.width = (video as HTMLVideoElement).videoWidth;
+              canvas.value.height = (video as HTMLVideoElement).videoHeight;
+
+              const ctx = canvas.value.getContext("2d");
+              const renderer = () => {
+                // @ts-ignore
+                if (ctx && window.hasstream) {
+                  ctx.drawImage((video as HTMLVideoElement), 0, 0);
+                  (video as HTMLVideoElement).requestVideoFrameCallback(renderer);
+                }
+              }
+              (video as HTMLVideoElement).requestVideoFrameCallback(renderer);
+            }
+          });
         }
       });
     }
diff --git a/packages/input/src/webrtc-stream.ts b/packages/input/src/webrtc-stream.ts
index 09a404c0..ea262092 100644
--- a/packages/input/src/webrtc-stream.ts
+++ b/packages/input/src/webrtc-stream.ts
@@ -25,51 +25,16 @@ export class WebRTCStream {
     }
 
     this._onConnected = connectedCallback;
+    this._setup(serverURL, roomName);
+  }
 
+  private _setup(serverURL: string, roomName: string) {
     console.log("Setting up WebSocket");
     // Replace http/https with ws/wss
     const wsURL = serverURL.replace(/^http/, "ws");
     this._ws = new WebSocket(`${wsURL}/api/ws/${roomName}`);
     this._ws.onopen = async () => {
       console.log("WebSocket opened");
-
-      console.log("Setting up PeerConnection");
-      this._pc = new RTCPeerConnection({
-        iceServers: [
-          {
-            urls: "stun:stun.l.google.com:19302"
-          }
-        ],
-      });
-
-      this._pc.ontrack = (e) => {
-        console.log("Track received: ", e.track);
-        this._mediaStream = e.streams[e.streams.length - 1];
-      };
-
-      this._pc.onconnectionstatechange = () => {
-        console.log("Connection state: ", this._pc!.connectionState);
-        if (this._pc!.connectionState === "connected") {
-          if (this._onConnected && this._mediaStream)
-            this._onConnected(this._mediaStream);
-        }
-      };
-
-      this._pc.onicecandidate = (e) => {
-        if (e.candidate) {
-          const message: MessageICE = {
-            payload_type: "ice",
-            candidate: e.candidate
-          };
-          this._ws!.send(encodeMessage(message));
-        }
-      }
-
-      this._pc.ondatachannel = (e) => {
-        this._dataChannel = e.channel;
-        this._setupDataChannelEvents();
-      }
-
       // Send join message
       const joinMessage: MessageJoin = {
         payload_type: "join",
@@ -87,6 +52,11 @@ export class WebRTCStream {
       const message = await decodeMessage<MessageBase>(e.data);
       switch (message.payload_type) {
         case "sdp":
+          if (!this._pc) {
+            // Setup peer connection now
+            this._setupPeerConnection();
+          }
+          console.log("Received SDP: ", (message as MessageSDP).sdp);
           await this._pc!.setRemoteDescription((message as MessageSDP).sdp);
           // Create our answer
           const answer = await this._pc!.createAnswer();
@@ -99,12 +69,13 @@ export class WebRTCStream {
           }));
           break;
         case "ice":
+          if (!this._pc) break;
           // If remote description is not set yet, hold the ICE candidates
-          if (this._pc!.remoteDescription) {
-            await this._pc!.addIceCandidate((message as MessageICE).candidate);
+          if (this._pc.remoteDescription) {
+            await this._pc.addIceCandidate((message as MessageICE).candidate);
             // Add held ICE candidates
             for (const ice of iceHolder) {
-              await this._pc!.addIceCandidate(ice);
+              await this._pc.addIceCandidate(ice);
             }
             iceHolder = [];
           } else {
@@ -134,7 +105,19 @@ export class WebRTCStream {
     }
 
     this._ws.onclose = () => {
-      console.log("WebSocket closed");
+      console.log("WebSocket closed, reconnecting in 3 seconds");
+      if (this._onConnected)
+        this._onConnected(null);
+
+      // Clear PeerConnection
+      if (this._pc) {
+        this._pc.close();
+        this._pc = undefined;
+      }
+
+      setTimeout(() => {
+        this._setup(serverURL, roomName);
+      }, 3000);
     }
 
     this._ws.onerror = (e) => {
@@ -142,6 +125,45 @@ export class WebRTCStream {
     }
   }
 
+  private _setupPeerConnection() {
+    console.log("Setting up PeerConnection");
+    this._pc = new RTCPeerConnection({
+      iceServers: [
+        {
+          urls: "stun:stun.l.google.com:19302"
+        }
+      ],
+    });
+
+    this._pc.ontrack = (e) => {
+      console.log("Track received: ", e.track);
+      this._mediaStream = e.streams[e.streams.length - 1];
+    };
+
+    this._pc.onconnectionstatechange = () => {
+      console.log("Connection state: ", this._pc!.connectionState);
+      if (this._pc!.connectionState === "connected") {
+        if (this._onConnected && this._mediaStream)
+          this._onConnected(this._mediaStream);
+      }
+    };
+
+    this._pc.onicecandidate = (e) => {
+      if (e.candidate) {
+        const message: MessageICE = {
+          payload_type: "ice",
+          candidate: e.candidate
+        };
+        this._ws!.send(encodeMessage(message));
+      }
+    }
+
+    this._pc.ondatachannel = (e) => {
+      this._dataChannel = e.channel;
+      this._setupDataChannelEvents();
+    }
+  }
+
   // Forces opus to stereo in Chromium browsers, because of course
   private forceOpusStereo(SDP: string): string {
     // Look for "minptime=10;useinbandfec=1" and replace with "minptime=10;useinbandfec=1;stereo=1;sprop-stereo=1;"
diff --git a/packages/relay/internal/ingest.go b/packages/relay/internal/ingest.go
index cb2d4d1c..2053e398 100644
--- a/packages/relay/internal/ingest.go
+++ b/packages/relay/internal/ingest.go
@@ -200,11 +200,15 @@ func ingestHandler(room *Room) {
 	})
 
 	room.WebSocket.RegisterOnClose(func() {
-		// If PeerConnection is not open or does not exist, delete room
-		if (room.PeerConnection != nil && room.PeerConnection.ConnectionState() != webrtc.PeerConnectionStateConnected) ||
-			room.PeerConnection == nil {
-			DeleteRoomIfEmpty(room)
+		// If PeerConnection is still open, close it
+		if room.PeerConnection != nil {
+			if err = room.PeerConnection.Close(); err != nil {
+				log.Printf("Failed to close PeerConnection for room: '%s' - reason: %s\n", room.Name, err)
+			}
+			room.PeerConnection = nil
 		}
+		room.Online = false
+		DeleteRoomIfEmpty(room)
 	})
 
 	log.Printf("Room: '%s' is ready, sending an OK\n", room.Name)
diff --git a/packages/relay/internal/participant.go b/packages/relay/internal/participant.go
index 3e5ae6db..6734990c 100644
--- a/packages/relay/internal/participant.go
+++ b/packages/relay/internal/participant.go
@@ -33,7 +33,7 @@ func (vw *Participant) addTrack(trackLocal *webrtc.TrackLocal) error {
 		rtcpBuffer := make([]byte, 1400)
 		for {
 			if _, _, rtcpErr := rtpSender.Read(rtcpBuffer); rtcpErr != nil {
-				return
+				break
 			}
 		}
 	}()
diff --git a/packages/relay/internal/websocket.go b/packages/relay/internal/websocket.go
index a9c1d503..9b8f3bd9 100644
--- a/packages/relay/internal/websocket.go
+++ b/packages/relay/internal/websocket.go
@@ -10,6 +10,7 @@ import (
 type SafeWebSocket struct {
 	*websocket.Conn
 	sync.Mutex
+	closeCallback   func()                       // OnClose callback
 	binaryCallbacks map[string]OnMessageCallback // MessageBase type -> callback
 }
 
@@ -17,6 +18,7 @@ type SafeWebSocket struct {
 func NewSafeWebSocket(conn *websocket.Conn) *SafeWebSocket {
 	ws := &SafeWebSocket{
 		Conn:            conn,
+		closeCallback:   nil,
 		binaryCallbacks: make(map[string]OnMessageCallback),
 	}
 
@@ -32,10 +34,6 @@ func NewSafeWebSocket(conn *websocket.Conn) *SafeWebSocket {
 				}
 				break
 			} else if websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseAbnormalClosure, websocket.CloseNoStatusReceived) {
-				// If closing, just break
-				if GetFlags().Verbose {
-					log.Printf("WebSocket closing\n")
-				}
 				break
 			} else if err != nil {
 				log.Printf("Failed to read WebSocket message, reason: %s\n", err)
@@ -62,6 +60,11 @@ func NewSafeWebSocket(conn *websocket.Conn) *SafeWebSocket {
 				log.Printf("Unknown WebSocket message type: %d\n", kind)
 			}
 		}
+
+		// Call close callback
+		if ws.closeCallback != nil {
+			ws.closeCallback()
+		}
 	}()
 
 	return ws
@@ -102,13 +105,12 @@ func (ws *SafeWebSocket) UnregisterMessageCallback(msgType string) {
 
 // RegisterOnClose sets the callback for websocket closing
 func (ws *SafeWebSocket) RegisterOnClose(callback func()) {
-	ws.SetCloseHandler(func(code int, text string) error {
+	ws.closeCallback = func() {
 		// Clear our callbacks
 		ws.Lock()
 		ws.binaryCallbacks = nil
 		ws.Unlock()
 		// Call the callback
 		callback()
-		return nil
-	})
+	}
 }
diff --git a/packages/scripts/entrypoint.sh b/packages/scripts/entrypoint.sh
new file mode 100644
index 00000000..acf7a8b3
--- /dev/null
+++ b/packages/scripts/entrypoint.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+set -euo pipefail
+
+# Wait for dbus socket to be ready
+echo "Waiting for DBus system bus socket..."
+DBUS_SOCKET="/run/dbus/system_bus_socket"
+for _ in {1..10}; do # Wait up to 10 seconds
+    if [ -e "$DBUS_SOCKET" ]; then
+        echo "DBus system bus socket is ready."
+        break
+    fi
+    sleep 1
+done
+if [ ! -e "$DBUS_SOCKET" ]; then
+    echo "Error: DBus system bus socket did not appear. Exiting."
+    exit 1
+fi
+
+# Wait for PipeWire to be ready
+echo "Waiting for PipeWire socket..."
+PIPEWIRE_SOCKET="/run/user/${UID}/pipewire-0"
+for _ in {1..10}; do # Wait up to 10 seconds
+    if [ -e "$PIPEWIRE_SOCKET" ]; then
+        echo "PipeWire socket is ready."
+        break
+    fi
+    sleep 1
+done
+if [ ! -e "$PIPEWIRE_SOCKET" ]; then
+    echo "Error: PipeWire socket did not appear. Exiting."
+    exit 1
+fi
+
+# Update system packages before proceeding
+echo "Upgrading system packages..."
+pacman -Syu --noconfirm
+
+echo "Detecting GPU vendor and installing necessary GStreamer plugins..."
+source /etc/nestri/gpu_helpers.sh
+
+get_gpu_info
+
+# Identify vendor
+if [[ "${vendor_full_map[0],,}" =~ "intel" ]]; then
+    echo "Intel GPU detected, installing required packages..."
+    chwd -a
+    pacman -Syu --noconfirm gstreamer-vaapi gst-plugin-va gst-plugin-qsv
+    # chwd missed a thing
+    pacman -Syu --noconfirm vpl-gpu-rt
+elif [[ "${vendor_full_map[0],,}" =~ "amd" ]]; then
+    echo "AMD GPU detected, installing required packages..."
+    chwd -a
+    pacman -Syu --noconfirm gstreamer-vaapi gst-plugin-va
+elif [[ "${vendor_full_map[0],,}" =~ "nvidia" ]]; then
+    echo "NVIDIA GPU detected. Assuming drivers are linked"
+else
+    echo "Unknown GPU vendor. No additional packages will be installed"
+fi
+
+# Clean up remainders
+echo "Cleaning up old package cache..."
+paccache -rk1
+
+echo "Switching to nestri user for application startup..."
+exec sudo -E -u nestri /etc/nestri/entrypoint_nestri.sh
diff --git a/packages/scripts/entrypoint_nestri.sh b/packages/scripts/entrypoint_nestri.sh
new file mode 100644
index 00000000..749b73bb
--- /dev/null
+++ b/packages/scripts/entrypoint_nestri.sh
@@ -0,0 +1,156 @@
+#!/bin/bash
+set -euo pipefail
+
+# Source environment variables from envs.sh
+if [ -f /etc/nestri/envs.sh ]; then
+    echo "Sourcing environment variables from envs.sh..."
+    source /etc/nestri/envs.sh
+else
+    echo "envs.sh not found! Ensure it exists at /etc/nestri/envs.sh."
+    exit 1
+fi
+
+# Configuration
+MAX_RETRIES=3
+
+# Helper function to restart the chain
+restart_chain() {
+    echo "Restarting nestri-server, labwc, and wlr-randr..."
+
+    # Kill all child processes safely (if running)
+    if [[ -n "${NESTRI_PID:-}" ]] && kill -0 "${NESTRI_PID}" 2 >/dev/null; then
+        kill "${NESTRI_PID}"
+    fi
+    if [[ -n "${LABWC_PID:-}" ]] && kill -0 "${LABWC_PID}" 2 >/dev/null; then
+        kill "${LABWC_PID}"
+    fi
+
+    wait || true
+
+    # Start nestri-server
+    start_nestri_server
+    RETRY_COUNT=0
+}
+
+
+# Function to start nestri-server
+start_nestri_server() {
+    echo "Starting nestri-server..."
+    nestri-server $(echo $NESTRI_PARAMS) &
+    NESTRI_PID=$!
+
+    # Wait for Wayland display (wayland-1) to be ready
+    echo "Waiting for Wayland display 'wayland-1' to be ready..."
+    WAYLAND_SOCKET="/run/user/${UID}/wayland-1"
+    for _ in {1..15}; do # Wait up to 15 seconds
+        if [ -e "$WAYLAND_SOCKET" ]; then
+            echo "Wayland display 'wayland-1' is ready."
+            start_labwc
+            return
+        fi
+        sleep 1
+    done
+
+    echo "Error: Wayland display 'wayland-1' did not appear. Incrementing retry count..."
+    ((RETRY_COUNT++))
+    if [ "$RETRY_COUNT" -ge "$MAX_RETRIES" ]; then
+        echo "Max retries reached for nestri-server. Exiting."
+        exit 1
+    fi
+    restart_chain
+}
+
+# Function to start labwc
+start_labwc() {
+    echo "Starting labwc..."
+    rm -rf /tmp/.X11-unix && mkdir -p /tmp/.X11-unix && chown nestri:nestri /tmp/.X11-unix
+    WAYLAND_DISPLAY=wayland-1 WLR_BACKENDS=wayland labwc &
+    LABWC_PID=$!
+
+    # Wait for labwc to initialize (using `wlr-randr` as an indicator)
+    echo "Waiting for labwc to initialize..."
+    for _ in {1..15}; do
+        if wlr-randr --json | jq -e '.[] | select(.enabled == true)' >/dev/null; then
+            echo "labwc is initialized and Wayland outputs are ready."
+            start_wlr_randr
+            return
+        fi
+        sleep 1
+    done
+
+    echo "Error: labwc did not initialize correctly. Incrementing retry count..."
+    ((RETRY_COUNT++))
+    if [ "$RETRY_COUNT" -ge "$MAX_RETRIES" ]; then
+        echo "Max retries reached for labwc. Exiting."
+        exit 1
+    fi
+    restart_chain
+}
+
+# Function to run wlr-randr
+start_wlr_randr() {
+    echo "Configuring resolution with wlr-randr..."
+    OUTPUT_NAME=$(wlr-randr --json | jq -r '.[] | select(.enabled == true) | .name' | head -n 1)
+    if [ -z "$OUTPUT_NAME" ]; then
+        echo "Error: No enabled outputs detected. Skipping wlr-randr."
+        return
+    fi
+
+    # Retry logic for wlr-randr
+    local WLR_RETRIES=0
+    while ! WAYLAND_DISPLAY=wayland-0 wlr-randr --output "$OUTPUT_NAME" --custom-mode "$RESOLUTION"; do
+        echo "Error: Failed to configure wlr-randr. Retrying..."
+        ((WLR_RETRIES++))
+        if [ "$WLR_RETRIES" -ge "$MAX_RETRIES" ]; then
+            echo "Max retries reached for wlr-randr. Moving on without resolution setup."
+            return
+        fi
+        sleep 2
+    done
+    echo "wlr-randr configuration successful."
+}
+
+# Main loop to monitor processes
+main_loop() {
+    trap 'echo "Terminating...";
+if [[ -n "${NESTRI_PID:-}" ]] && kill -0 "${NESTRI_PID}" 2>/dev/null; then
+kill "${NESTRI_PID}"
+fi
+if [[ -n "${LABWC_PID:-}" ]] && kill -0 "${LABWC_PID}" 2>/dev/null; then
+kill "${LABWC_PID}"
+fi
+    exit 0' SIGINT SIGTERM
+
+    while true; do
+        # Wait for any child process to exit
+        wait -n
+
+        # Check which process exited
+        if ! kill -0 ${NESTRI_PID:-} 2 >/dev/null; then
+            echo "nestri-server crashed. Restarting chain..."
+            ((RETRY_COUNT++))
+            if [ "$RETRY_COUNT" -ge "$MAX_RETRIES" ]; then
+                echo "Max retries reached for nestri-server. Exiting."
+                exit 1
+            fi
+            restart_chain
+        elif ! kill -0 ${LABWC_PID:-} 2 >/dev/null; then
+            echo "labwc crashed. Restarting labwc and wlr-randr..."
+            ((RETRY_COUNT++))
+            if [ "$RETRY_COUNT" -ge "$MAX_RETRIES" ]; then
+                echo "Max retries reached for labwc. Exiting."
+                exit 1
+            fi
+            start_labwc
+        fi
+    done
+}
+
+# Initialize retry counter
+RETRY_COUNT=0
+
+# Start the initial chain
+restart_chain
+
+# Enter monitoring loop
+main_loop
diff --git a/packages/scripts/envs.sh b/packages/scripts/envs.sh
index b9d08af5..5fba15ea 100644
--- a/packages/scripts/envs.sh
+++ b/packages/scripts/envs.sh
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/bin/bash
+set -euo pipefail
 
 export XDG_RUNTIME_DIR=/run/user/${UID}/
 export WAYLAND_DISPLAY=wayland-0
@@ -9,4 +10,4 @@ export $(dbus-launch)
 export PROTON_NO_FSYNC=1
 
 # Our preferred prefix
-export WINEPREFIX=${USER_HOME}/.nestripfx/
+export WINEPREFIX=/home/${USER}/.nestripfx/
diff --git a/packages/scripts/gpu_helpers.sh b/packages/scripts/gpu_helpers.sh
index 867fb502..777eb41f 100644
--- a/packages/scripts/gpu_helpers.sh
+++ b/packages/scripts/gpu_helpers.sh
@@ -1,277 +1,52 @@
-#!/bin/bash -e
-
-# Various helper functions for handling available GPUs
-
-declare -ga gpu_map
-declare -gA gpu_bus_map
-declare -gA gpu_card_map
-declare -gA gpu_product_map
-declare -gA vendor_index_map
-declare -gA vendor_full_map
-
-# Map to help get shorter vendor identifiers
-declare -A vendor_keywords=(
-    ["advanced micro devices"]='amd'
-    ["ati"]='amd'
-    ["amd"]='amd'
-    ["radeon"]='amd'
-    ["nvidia"]='nvidia'
-    ["intel"]='intel'
-)
-
-get_gpu_info() {
-  # Clear out previous data
-  gpu_map=()
-  gpu_bus_map=()
-  gpu_card_map=()
-  gpu_product_map=()
-  vendor_index_map=()
-  vendor_full_map=()
-
-  local vendor=""
-  local product=""
-  local bus_info=""
-  local vendor_full=""
-
-  while read -r line; do
-    line="${line##*( )}"
-
-    if [[ "${line,,}" =~ "vendor:" ]]; then
-      vendor=""
-      vendor_full=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
-
-      # Look for short vendor keyword in line
-      for keyword in "${!vendor_keywords[@]}"; do
-        if [[ "${line,,}" == *"$keyword"* ]]; then
-          vendor="${vendor_keywords[$keyword]}"
-          break
+#!/bin/bash
+set -euo pipefail
+
+declare -a vendor_full_map=()
+declare -a vendor_id_map=()
+declare -A vendor_index_map=()
+
+function get_gpu_info {
+    # Initialize arrays/maps to avoid unbound variable errors
+    vendor_full_map=()
+    vendor_id_map=()
+    vendor_index_map=()
+
+    # Use lspci to detect GPU info
+    gpu_info=$(lspci | grep -i 'vga\|3d\|display')
+
+    # Parse each line of GPU info
+    while IFS= read -r line; do
+        # Extract vendor name and ID from lspci output
+        vendor=$(echo "$line" | awk -F: '{print $3}' | sed -E 's/^[[:space:]]+//g' | tr '[:upper:]' '[:lower:]')
+        id=$(echo "$line" | awk '{print $1}')
+
+        # Normalize vendor name
+        if [[ $vendor =~ .*nvidia.* ]]; then
+            vendor="nvidia"
+        elif [[ $vendor =~ .*intel.* ]]; then
+            vendor="intel"
+        elif [[ $vendor =~ .*advanced[[:space:]]micro[[:space:]]devices.* ]]; then
+            vendor="amd"
+        elif [[ $vendor =~ .*ati.* ]]; then
+            vendor="amd"
+        else
+            vendor="unknown"
         fi
-      done
-
-      # If no vendor keywords match, use first word
-      if [[ -z "$vendor" ]]; then
-        vendor=$(echo "$vendor_full" | awk '{print tolower($1)}')
-      fi
-    elif [[ "${line,,}" =~ "product:" ]]; then
-      product=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
-    elif [[ "${line,,}" =~ "bus info:" ]]; then
-      bus_info=$(echo "$line" | awk '{print $3}')
-    fi
-
-    if [[ -n "$vendor" && -n "$product" && -n "$bus_info" && ! "${line,,}" =~ \*"-display" ]]; then
-      # We have gathered all GPU info necessary, store it
-
-      # Check if vendor index is being tracked
-      if [[ -z "${vendor_index_map[$vendor]}" ]]; then
-        # Start new vendor index tracking
-        vendor_index_map[$vendor]=0
-      else
-        # Another GPU of same vendor, increment index
-        vendor_index_map[$vendor]="$((vendor_index_map[$vendor] + 1))"
-      fi
-
-      # Resolved GPU index
-      local gpu_index="${vendor_index_map[$vendor]}"
-      local gpu_key="$vendor:$gpu_index"
-
-      # Get /dev/dri/cardN of GPU
-      local gpu_card=$({ ls -1d /sys/bus/pci/devices/*${bus_info#pci@}/drm/*; } 2>&1 | grep card* | grep -oP '(?<=card)\d+')
-
-      # Store info in maps
-      gpu_map+=("$gpu_key")
-      gpu_bus_map["$gpu_key"]="$bus_info"
-      gpu_product_map["$gpu_key"]="$product"
-      vendor_full_map["$gpu_key"]="$vendor_full"
-
-      if [[ -n "$gpu_card" ]]; then
-        gpu_card_map["$gpu_key"]="$gpu_card"
-      fi
-
-      # Clear values for additional GPUs
-      vendor=""
-      product=""
-      bus_info=""
-      vendor_full=""
-    fi
-
-    if [[ "${line,,}" =~ \*"-display" ]]; then
-      # New GPU found before storing, clear incomplete values to prevent mixing
-      vendor=""
-      product=""
-      bus_info=""
-      vendor_full=""
-    fi
-  done < <(sudo lshw -c video)
-}
-
-check_and_populate_gpus() {
-  if [[ "${#gpu_map[@]}" -eq 0 ]]; then
-    get_gpu_info # Gather info incase info not gathered yet
-    if [[ "${#gpu_map[@]}" -eq 0 ]]; then
-      echo "No GPUs found on this system" >&2
-      return 1
-    fi
-  fi
-}
-
-check_selected_gpu() {
-  local selected_gpu="${1,,}"
-
-  if [[ ! " ${gpu_map[*]} " =~ " $selected_gpu " ]]; then
-    echo "No such GPU: '$selected_gpu'" >&2
-    return 1
-  fi
-
-  echo "$selected_gpu"
-}
-
-list_available_gpus() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  echo "Available GPUs:" >&2
-  for gpu in "${gpu_map[@]}"; do
-    echo " [$gpu] \"${gpu_product_map[$gpu]}\" @[${gpu_bus_map[$gpu]}]"
-  done
-}
-
-convert_bus_id_to_xorg() {
-  local bus_info="$1"
-  IFS=":." read -ra bus_parts <<< "${bus_info#pci@????:}" # Remove "pci@" and the following 4 characters (domain)
-
-  # Check if bus_info has the correct format (at least 3 parts after removing domain)
-  if [[ "${#bus_parts[@]}" -lt 3 ]]; then
-    echo "Invalid bus info format: $bus_info" >&2
-    return 1
-  fi
-
-  # Convert each part from hexadecimal to decimal
-  bus_info_xorg="PCI:"
-  for part in "${bus_parts[@]}"; do
-    bus_info_xorg+="$((16#$part)):"
-  done
-  bus_info_xorg="${bus_info_xorg%:}" # Remove the trailing colon
-
-  echo "$bus_info_xorg"
-}
 
-print_gpu_info() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo "[$selected_gpu]"
-  echo " Vendor: ${vendor_full_map[$selected_gpu]}"
-  echo " Product: ${gpu_product_map[$selected_gpu]}"
-  echo " Bus: ${gpu_bus_map[$selected_gpu]}"
-
-  # Check if card path was found
-  if [[ "${gpu_card_map[$selected_gpu]}" ]]; then
-    echo " Card: /dev/dri/card${gpu_card_map[$selected_gpu]}"
-  fi
-
-  echo
-}
-
-get_gpu_vendor() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo "${selected_gpu%%:*}"
-}
-
-get_gpu_vendor_full() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo "${vendor_full_map[$selected_gpu]}"
-}
-
-get_gpu_index() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo "${selected_gpu#*:}"
-}
-
-get_gpu_product() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo "${gpu_product_map[$selected_gpu]}"
-}
-
-get_gpu_bus() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo "${gpu_bus_map[$selected_gpu]}"
-}
-
-get_gpu_bus_xorg() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  echo $(convert_bus_id_to_xorg "${gpu_bus_map[$selected_gpu]}")
+        # Add to arrays/maps if unique
+        if ! [[ "${vendor_index_map[$vendor]:-}" ]]; then
+            vendor_index_map[$vendor]="${#vendor_full_map[@]}"
+            vendor_full_map+=("$vendor")
+        fi
+        vendor_id_map+=("$id")
+    done <<< "$gpu_info"
 }
 
-get_gpu_card() {
-  if ! check_and_populate_gpus; then
-    return 1
-  fi
-
-  local selected_gpu
-  if ! selected_gpu=$(check_selected_gpu "$1"); then
-    return 1
-  fi
-
-  # Check if card path was found
-  if [[ -z "${gpu_card_map[$selected_gpu]}" ]]; then
-    echo "No card device found for GPU: $selected_gpu" >&2
-    return 1
-  fi
-
-  echo "/dev/dri/card${gpu_card_map[$selected_gpu]}"
+function debug_gpu_info {
+    echo "Vendor Full Map: ${vendor_full_map[*]}"
+    echo "Vendor ID Map: ${vendor_id_map[*]}"
+    echo "Vendor Index Map:"
+    for key in "${!vendor_index_map[@]}"; do
+        echo "  $key: ${vendor_index_map[$key]}"
+    done
 }
diff --git a/packages/scripts/supervisord.conf b/packages/scripts/supervisord.conf
new file mode 100644
index 00000000..35dcd6da
--- /dev/null
+++ b/packages/scripts/supervisord.conf
@@ -0,0 +1,53 @@
+[supervisord]
+user=root
+nodaemon=true
+loglevel=info
+logfile=/tmp/supervisord.log
+
+[program:dbus]
+user=root
+command=dbus-daemon --system --nofork --nopidfile
+autorestart=true
+autostart=true
+startretries=3
+priority=1
+
+[program:seatd]
+user=root
+command=seatd
+autorestart=true
+autostart=true
+startretries=3
+priority=2
+
+[program:pipewire]
+user=nestri
+command=dbus-launch pipewire
+autorestart=true
+autostart=true
+startretries=3
+priority=3
+
+[program:pipewire-pulse]
+user=nestri
+command=dbus-launch pipewire-pulse
+autorestart=true
+autostart=true
+startretries=3
+priority=4
+
+[program:wireplumber]
+user=nestri
+command=dbus-launch wireplumber
+autorestart=true
+autostart=true
+startretries=3
+priority=5
+
+[program:entrypoint]
+user=root
+command=/etc/nestri/entrypoint.sh
+autorestart=false
+autostart=true
+startretries=0
+priority=10
diff --git a/packages/server/Cargo.toml b/packages/server/Cargo.toml
index 93b7d214..fc65ba2e 100644
--- a/packages/server/Cargo.toml
+++ b/packages/server/Cargo.toml
@@ -9,7 +9,8 @@ path = "src/main.rs"
 
 [dependencies]
 gst.workspace = true
-gst-app.workspace = true
+gst-webrtc.workspace = true
+gstrswebrtc.workspace = true
 serde = {version = "1.0.214", features = ["derive"] }
 tokio = { version = "1.41.0", features = ["full"] }
 clap = { version = "4.5.20", features = ["env"] }
diff --git a/packages/server/src/args.rs b/packages/server/src/args.rs
index 445f99ed..71ed1819 100644
--- a/packages/server/src/args.rs
+++ b/packages/server/src/args.rs
@@ -42,7 +42,7 @@ impl Args {
                     .short('u')
                     .long("relay-url")
                     .env("RELAY_URL")
-                    .help("Nestri relay URL")
+                    .help("Nestri relay URL"),
             )
             .arg(
                 Arg::new("resolution")
@@ -64,7 +64,7 @@ impl Args {
                 Arg::new("room")
                     .long("room")
                     .env("NESTRI_ROOM")
-                    .help("Nestri room name/identifier")
+                    .help("Nestri room name/identifier"),
             )
             .arg(
                 Arg::new("gpu-vendor")
@@ -110,7 +110,7 @@ impl Args {
                 Arg::new("video-encoder")
                     .long("video-encoder")
                     .env("VIDEO_ENCODER")
-                    .help("Override video encoder (e.g. 'vah264enc')")
+                    .help("Override video encoder (e.g. 'vah264enc')"),
             )
             .arg(
                 Arg::new("video-rate-control")
@@ -165,7 +165,7 @@ impl Args {
                 Arg::new("audio-encoder")
                     .long("audio-encoder")
                     .env("AUDIO_ENCODER")
-                    .help("Override audio encoder (e.g. 'opusenc')")
+                    .help("Override audio encoder (e.g. 'opusenc')"),
             )
             .arg(
                 Arg::new("audio-rate-control")
@@ -188,6 +188,13 @@ impl Args {
                     .help("Maximum bitrate in kbps")
                     .default_value("192"),
             )
+            .arg(
+                Arg::new("dma-buf")
+                    .long("dma-buf")
+                    .env("DMA_BUF")
+                    .help("Use DMA-BUF for pipeline")
+                    .default_value("false"),
+            )
             .get_matches();
 
         Self {
diff --git a/packages/server/src/args/app_args.rs b/packages/server/src/args/app_args.rs
index 479d537b..ef937f90 100644
--- a/packages/server/src/args/app_args.rs
+++ b/packages/server/src/args/app_args.rs
@@ -15,6 +15,9 @@ pub struct AppArgs {
     pub relay_url: String,
     /// Nestri room name/identifier
     pub room: String,
+
+    /// Experimental DMA-BUF support
+    pub dma_buf: bool,
 }
 impl AppArgs {
     pub fn from_matches(matches: &clap::ArgMatches) -> Self {
@@ -26,23 +29,33 @@ impl AppArgs {
             debug_latency: matches.get_one::<String>("debug-latency").unwrap() == "true"
                 || matches.get_one::<String>("debug-latency").unwrap() == "1",
             resolution: {
-                let res = matches.get_one::<String>("resolution").unwrap().clone();
+                let res = matches
+                    .get_one::<String>("resolution")
+                    .unwrap_or(&"1280x720".to_string())
+                    .clone();
                 let parts: Vec<&str> = res.split('x').collect();
-                (
-                    parts[0].parse::<u32>().unwrap(),
-                    parts[1].parse::<u32>().unwrap(),
-                )
+                if parts.len() >= 2 {
+                    (
+                        parts[0].parse::<u32>().unwrap_or(1280),
+                        parts[1].parse::<u32>().unwrap_or(720),
+                    )
+                } else {
+                    (1280, 720)
+                }
             },
             framerate: matches
                 .get_one::<String>("framerate")
                 .unwrap()
                 .parse::<u32>()
-                .unwrap(),
+                .unwrap_or(60),
             relay_url: matches.get_one::<String>("relay-url").unwrap().clone(),
             // Generate random room name if not provided
-            room: matches.get_one::<String>("room")
+            room: matches
+                .get_one::<String>("room")
                 .unwrap_or(&rand::random::<u32>().to_string())
                 .clone(),
+            dma_buf: matches.get_one::<String>("dma-buf").unwrap() == "true"
+                || matches.get_one::<String>("dma-buf").unwrap() == "1",
         }
     }
 
@@ -55,5 +68,6 @@ impl AppArgs {
         println!("> framerate: {}", self.framerate);
         println!("> relay_url: {}", self.relay_url);
         println!("> room: {}", self.room);
+        println!("> dma_buf: {}", self.dma_buf);
     }
 }
diff --git a/packages/server/src/enc_helper.rs b/packages/server/src/enc_helper.rs
index 8f3dfd4a..18a1666b 100644
--- a/packages/server/src/enc_helper.rs
+++ b/packages/server/src/enc_helper.rs
@@ -197,6 +197,11 @@ fn is_encoder_supported(encoder: &String) -> bool {
     gst::ElementFactory::find(encoder.as_str()).is_some()
 }
 
+fn set_element_property(element: &gst::Element, property: &str, value: &dyn ToValue) {
+    element.set_property(property, value.to_value());
+}
+
+
 /// Helper to set CQP value of known encoder
 /// # Arguments
 /// * `encoder` - Information about the encoder.
@@ -316,7 +321,7 @@ pub fn encoder_gop_params(encoder: &VideoEncoderInfo, gop_size: u32) -> VideoEnc
         let prop_name = prop.name();
 
         // Look for known keys
-        if prop_name.to_lowercase().contains("gop")
+        if prop_name.to_lowercase().contains("gop-size")
             || prop_name.to_lowercase().contains("int-max")
             || prop_name.to_lowercase().contains("max-dist")
             || prop_name.to_lowercase().contains("intra-period-length")
diff --git a/packages/server/src/main.rs b/packages/server/src/main.rs
index 9e856589..9052e09a 100644
--- a/packages/server/src/main.rs
+++ b/packages/server/src/main.rs
@@ -1,21 +1,21 @@
 mod args;
 mod enc_helper;
 mod gpu;
-mod room;
-mod websocket;
 mod latency;
 mod messages;
+mod nestrisink;
+mod websocket;
 
 use crate::args::encoding_args;
+use crate::nestrisink::NestriSignaller;
+use crate::websocket::NestriWebSocket;
+use futures_util::StreamExt;
 use gst::prelude::*;
-use gst_app::AppSink;
+use gstrswebrtc::signaller::Signallable;
+use gstrswebrtc::webrtcsink::BaseWebRTCSink;
 use std::error::Error;
 use std::str::FromStr;
 use std::sync::Arc;
-use futures_util::StreamExt;
-use gst_app::app_sink::AppSinkStream;
-use tokio::sync::{Mutex};
-use crate::websocket::{NestriWebSocket};
 
 // Handles gathering GPU information and selecting the most suitable GPU
 fn handle_gpus(args: &args::Args) -> Option<gpu::GPUInfo> {
@@ -161,20 +161,20 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // Begin connection attempt to the relay WebSocket endpoint
     // replace any http/https with ws/wss
-    let replaced_relay_url
-        = args.app.relay_url.replace("http://", "ws://").replace("https://", "wss://");
-    let ws_url = format!(
-        "{}/api/ws/{}",
-        replaced_relay_url,
-        args.app.room,
-    );
+    let replaced_relay_url = args
+        .app
+        .relay_url
+        .replace("http://", "ws://")
+        .replace("https://", "wss://");
+    let ws_url = format!("{}/api/ws/{}", replaced_relay_url, args.app.room,);
 
     // Setup our websocket
     let nestri_ws = Arc::new(NestriWebSocket::new(ws_url).await?);
     log::set_max_level(log::LevelFilter::Info);
     log::set_boxed_logger(Box::new(nestri_ws.clone())).unwrap();
 
-    let _ = gst::init();
+    gst::init()?;
+    gstrswebrtc::plugin_register_static()?;
 
     // Handle GPU selection
     let gpu = handle_gpus(&args);
@@ -197,12 +197,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
     // Handle audio encoder selection
     let audio_encoder = handle_encoder_audio(&args);
 
-    /*** ROOM SETUP ***/
-    let room = Arc::new(Mutex::new(
-        room::Room::new(nestri_ws.clone()).await?,
-    ));
-
     /*** PIPELINE CREATION ***/
+    // Create the pipeline
+    let pipeline = Arc::new(gst::Pipeline::new());
+
     /* Audio */
     // Audio Source Element
     let audio_source = match args.encoding.audio.capture_method {
@@ -220,7 +218,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     // Audio Rate Element
     let audio_rate = gst::ElementFactory::make("audiorate").build()?;
-    
+
     // Required to fix gstreamer opus issue, where quality sounds off (due to wrong sample rate)
     let audio_capsfilter = gst::ElementFactory::make("capsfilter").build()?;
     let audio_caps = gst::Caps::from_str("audio/x-raw,rate=48000,channels=2").unwrap();
@@ -237,9 +235,6 @@ async fn main() -> Result<(), Box<dyn Error>> {
         },
     );
 
-    // Audio RTP Payloader Element
-    let audio_rtp_payloader = gst::ElementFactory::make("rtpopuspay").build()?;
-
     /* Video */
     // Video Source Element
     let video_source = gst::ElementFactory::make("waylanddisplaysrc").build()?;
@@ -248,13 +243,26 @@ async fn main() -> Result<(), Box<dyn Error>> {
     // Caps Filter Element (resolution, fps)
     let caps_filter = gst::ElementFactory::make("capsfilter").build()?;
     let caps = gst::Caps::from_str(&format!(
-        "video/x-raw,width={},height={},framerate={}/1,format=RGBx",
-        args.app.resolution.0, args.app.resolution.1, args.app.framerate
+        "{},width={},height={},framerate={}/1{}",
+        if args.app.dma_buf {
+            "video/x-raw(memory:DMABuf)"
+        } else {
+            "video/x-raw"
+        },
+        args.app.resolution.0,
+        args.app.resolution.1,
+        args.app.framerate,
+        if args.app.dma_buf { "" } else { ",format=RGBx" }
     ))?;
     caps_filter.set_property("caps", &caps);
 
-    // Video Tee Element
-    let video_tee = gst::ElementFactory::make("tee").build()?;
+    // GL Upload Element
+    let glupload = gst::ElementFactory::make("glupload").build()?;
+
+    // GL upload caps filter
+    let gl_caps_filter = gst::ElementFactory::make("capsfilter").build()?;
+    let gl_caps = gst::Caps::from_str("video/x-raw(memory:VAMemory)")?;
+    gl_caps_filter.set_property("caps", &gl_caps);
 
     // Video Converter Element
     let video_converter = gst::ElementFactory::make("videoconvert").build()?;
@@ -263,82 +271,30 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let video_encoder = gst::ElementFactory::make(video_encoder_info.name.as_str()).build()?;
     video_encoder_info.apply_parameters(&video_encoder, &args.app.verbose);
 
-    // Required for AV1 - av1parse
-    let av1_parse = gst::ElementFactory::make("av1parse").build()?;
-
-    // Video RTP Payloader Element
-    let video_rtp_payloader = gst::ElementFactory::make(
-        format!("rtp{}pay", video_encoder_info.codec.to_gst_str()).as_str(),
-    )
-    .build()?;
-
     /* Output */
-    // Audio AppSink Element
-    let audio_appsink = gst::ElementFactory::make("appsink").build()?;
-    audio_appsink.set_property("emit-signals", &true);
-    let audio_appsink = audio_appsink.downcast_ref::<AppSink>().unwrap();
-
-    // Video AppSink Element
-    let video_appsink = gst::ElementFactory::make("appsink").build()?;
-    video_appsink.set_property("emit-signals", &true);
-    let video_appsink = video_appsink.downcast_ref::<AppSink>().unwrap();
-
-    /* Debug */
-    // Debug Feed Element
-    let debug_latency = gst::ElementFactory::make("timeoverlay").build()?;
-    debug_latency.set_property_from_str("halignment", &"right");
-    debug_latency.set_property_from_str("valignment", &"bottom");
-
-    // Debug Sink Element
-    let debug_sink = gst::ElementFactory::make("ximagesink").build()?;
-
-    // Debug video converter
-    let debug_video_converter = gst::ElementFactory::make("videoconvert").build()?;
-
-    // Queues with max 2ms latency
-    let debug_queue = gst::ElementFactory::make("queue2").build()?;
-    debug_queue.set_property("max-size-time", &1000000u64);
-    let main_video_queue = gst::ElementFactory::make("queue2").build()?;
-    main_video_queue.set_property("max-size-time", &1000000u64);
-    let main_audio_queue = gst::ElementFactory::make("queue2").build()?;
-    main_audio_queue.set_property("max-size-time", &1000000u64);
-
-    // Create the pipeline
-    let pipeline = gst::Pipeline::new();
+    // WebRTC sink Element
+    let signaller = NestriSignaller::new(nestri_ws.clone(), pipeline.clone());
+    let webrtcsink = BaseWebRTCSink::with_signaller(Signallable::from(signaller.clone()));
+    webrtcsink.set_property_from_str("stun-server", "stun://stun.l.google.com:19302");
+    webrtcsink.set_property_from_str("congestion-control", "disabled");
 
     // Add elements to the pipeline
     pipeline.add_many(&[
-        &video_appsink.upcast_ref(),
-        &video_rtp_payloader,
+        webrtcsink.upcast_ref(),
         &video_encoder,
         &video_converter,
-        &video_tee,
         &caps_filter,
         &video_source,
-        &audio_appsink.upcast_ref(),
-        &audio_rtp_payloader,
         &audio_encoder,
         &audio_capsfilter,
         &audio_rate,
         &audio_converter,
         &audio_source,
-        &main_video_queue,
-        &main_audio_queue,
     ])?;
 
-    // Add debug elements if debug is enabled
-    if args.app.debug_feed {
-        pipeline.add_many(&[&debug_sink, &debug_queue, &debug_video_converter])?;
-    }
-
-    // Add debug latency element if debug latency is enabled
-    if args.app.debug_latency {
-        pipeline.add(&debug_latency)?;
-    }
-
-    // Add AV1 parse element if AV1 is selected
-    if video_encoder_info.codec == enc_helper::VideoCodec::AV1 {
-        pipeline.add(&av1_parse)?;
+    // If DMA-BUF is enabled, add glupload and gl caps filter
+    if args.app.dma_buf {
+        pipeline.add_many(&[&glupload, &gl_caps_filter])?;
     }
 
     // Link main audio branch
@@ -348,47 +304,29 @@ async fn main() -> Result<(), Box<dyn Error>> {
         &audio_rate,
         &audio_capsfilter,
         &audio_encoder,
-        &audio_rtp_payloader,
-        &main_audio_queue,
-        &audio_appsink.upcast_ref(),
+        webrtcsink.upcast_ref(),
     ])?;
 
-    // If debug latency, add time overlay before tee
-    if args.app.debug_latency {
-        gst::Element::link_many(&[&video_source, &caps_filter, &debug_latency, &video_tee])?;
-    } else {
-        gst::Element::link_many(&[&video_source, &caps_filter, &video_tee])?;
-    }
-
-    // Link debug branch if debug is enabled
-    if args.app.debug_feed {
-        gst::Element::link_many(&[
-            &video_tee,
-            &debug_video_converter,
-            &debug_queue,
-            &debug_sink,
-        ])?;
-    }
-
-    // Link main video branch, if AV1, add av1_parse
-    if video_encoder_info.codec == enc_helper::VideoCodec::AV1 {
+    // With DMA-BUF, also link glupload and it's caps
+    if args.app.dma_buf {
+        // Link video source to caps_filter, glupload, gl_caps_filter, video_converter, video_encoder, webrtcsink
         gst::Element::link_many(&[
-            &video_tee,
+            &video_source,
+            &caps_filter,
+            &glupload,
+            &gl_caps_filter,
             &video_converter,
             &video_encoder,
-            &av1_parse,
-            &video_rtp_payloader,
-            &main_video_queue,
-            &video_appsink.upcast_ref(),
+            webrtcsink.upcast_ref(),
         ])?;
     } else {
+        // Link video source to caps_filter, video_converter, video_encoder, webrtcsink
         gst::Element::link_many(&[
-            &video_tee,
+            &video_source,
+            &caps_filter,
             &video_converter,
             &video_encoder,
-            &video_rtp_payloader,
-            &main_video_queue,
-            &video_appsink.upcast_ref(),
+            webrtcsink.upcast_ref(),
         ])?;
     }
 
@@ -397,21 +335,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
     audio_source.set_property("do-timestamp", &true);
     pipeline.set_property("latency", &0u64);
 
-    // Wrap the pipeline in Arc<Mutex> to safely share it
-    let pipeline = Arc::new(Mutex::new(pipeline));
-
     // Run both pipeline and websocket tasks concurrently
-    let result = tokio::try_join!(
-        run_room(
-            room.clone(),
-            "audio/opus",
-            video_encoder_info.codec.to_mime_str(),
-            pipeline.clone(),
-            Arc::new(Mutex::new(audio_appsink.stream())),
-            Arc::new(Mutex::new(video_appsink.stream()))
-        ),
-        run_pipeline(pipeline.clone())
-    );
+    let result = run_pipeline(pipeline.clone()).await;
 
     match result {
         Ok(_) => log::info!("All tasks completed successfully"),
@@ -424,53 +349,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-async fn run_room(
-    room: Arc<Mutex<room::Room>>,
-    audio_codec: &str,
-    video_codec: &str,
-    pipeline: Arc<Mutex<gst::Pipeline>>,
-    audio_stream: Arc<Mutex<AppSinkStream>>,
-    video_stream: Arc<Mutex<AppSinkStream>>,
-) -> Result<(), Box<dyn Error>> {
-    // Run loop, with recovery on error
-    loop {
-        let mut room = room.lock().await;
-        tokio::select! {
-            _ = tokio::signal::ctrl_c() => {
-                log::info!("Room interrupted via Ctrl+C");
-                return Ok(());
-            }
-            result = room.run(
-                audio_codec,
-                video_codec,
-                pipeline.clone(),
-                audio_stream.clone(),
-                video_stream.clone(),
-            ) => {
-                if let Err(e) = result {
-                    log::error!("Room error: {}", e);
-                    // Sleep for a while before retrying
-                    tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
-                } else {
-                    return Ok(());
-                }
-            }
-        }
-    }
-}
-
-async fn run_pipeline(
-    pipeline: Arc<Mutex<gst::Pipeline>>,
-) -> Result<(), Box<dyn Error>> {
-    // Take ownership of the bus without holding the lock
-    let bus = {
-        let pipeline = pipeline.lock().await;
-        pipeline.bus().ok_or("Pipeline has no bus")?
-    };
+async fn run_pipeline(pipeline: Arc<gst::Pipeline>) -> Result<(), Box<dyn Error>> {
+    let bus = { pipeline.bus().ok_or("Pipeline has no bus")? };
 
     {
-        // Temporarily lock the pipeline to change state
-        let pipeline = pipeline.lock().await;
         if let Err(e) = pipeline.set_state(gst::State::Playing) {
             log::error!("Failed to start pipeline: {}", e);
             return Err("Failed to start pipeline".into());
@@ -491,8 +373,6 @@ async fn run_pipeline(
     }
 
     {
-        // Temporarily lock the pipeline to reset state
-        let pipeline = pipeline.lock().await;
         pipeline.set_state(gst::State::Null)?;
     }
 
diff --git a/packages/server/src/messages.rs b/packages/server/src/messages.rs
index 0f474537..4cd8d346 100644
--- a/packages/server/src/messages.rs
+++ b/packages/server/src/messages.rs
@@ -10,6 +10,31 @@ use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
 use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
 use crate::latency::LatencyTracker;
 
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(tag = "type")]
+pub enum InputMessage {
+    #[serde(rename = "mousemove")]
+    MouseMove { x: i32, y: i32 },
+
+    #[serde(rename = "mousemoveabs")]
+    MouseMoveAbs { x: i32, y: i32 },
+
+    #[serde(rename = "wheel")]
+    Wheel { x: f64, y: f64 },
+
+    #[serde(rename = "mousedown")]
+    MouseDown { key: i32 },
+    // Add other variants as needed
+    #[serde(rename = "mouseup")]
+    MouseUp { key: i32 },
+
+    #[serde(rename = "keydown")]
+    KeyDown { key: i32 },
+
+    #[serde(rename = "keyup")]
+    KeyUp { key: i32 },
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct MessageBase {
     pub payload_type: String,
diff --git a/packages/server/src/nestrisink/imp.rs b/packages/server/src/nestrisink/imp.rs
new file mode 100644
index 00000000..4df2e499
--- /dev/null
+++ b/packages/server/src/nestrisink/imp.rs
@@ -0,0 +1,466 @@
+use crate::messages::{
+    decode_message_as, encode_message, AnswerType, InputMessage, JoinerType, MessageAnswer,
+    MessageBase, MessageICE, MessageInput, MessageJoin, MessageSDP,
+};
+use crate::websocket::NestriWebSocket;
+use glib::subclass::prelude::*;
+use gst::glib;
+use gst::prelude::*;
+use gst_webrtc::{gst_sdp, WebRTCSDPType, WebRTCSessionDescription};
+use gstrswebrtc::signaller::{Signallable, SignallableImpl};
+use std::collections::HashSet;
+use std::sync::{Arc, LazyLock};
+use std::sync::{Mutex, RwLock};
+use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
+use webrtc::peer_connection::sdp::session_description::RTCSessionDescription;
+
+pub struct Signaller {
+    nestri_ws: RwLock<Option<Arc<NestriWebSocket>>>,
+    pipeline: RwLock<Option<Arc<gst::Pipeline>>>,
+    data_channel: RwLock<Option<gst_webrtc::WebRTCDataChannel>>,
+}
+impl Default for Signaller {
+    fn default() -> Self {
+        Self {
+            nestri_ws: RwLock::new(None),
+            pipeline: RwLock::new(None),
+            data_channel: RwLock::new(None),
+        }
+    }
+}
+impl Signaller {
+    pub fn set_nestri_ws(&self, nestri_ws: Arc<NestriWebSocket>) {
+        *self.nestri_ws.write().unwrap() = Some(nestri_ws);
+    }
+
+    pub fn set_pipeline(&self, pipeline: Arc<gst::Pipeline>) {
+        *self.pipeline.write().unwrap() = Some(pipeline);
+    }
+
+    pub fn get_pipeline(&self) -> Option<Arc<gst::Pipeline>> {
+        self.pipeline.read().unwrap().clone()
+    }
+
+    pub fn set_data_channel(&self, data_channel: gst_webrtc::WebRTCDataChannel) {
+        *self.data_channel.write().unwrap() = Some(data_channel);
+    }
+
+    /// Helper method to clean things up
+    fn register_callbacks(&self) {
+        let nestri_ws = {
+            self.nestri_ws
+                .read()
+                .unwrap()
+                .clone()
+                .expect("NestriWebSocket not set")
+        };
+        {
+            let self_obj = self.obj().clone();
+            let _ = nestri_ws.register_callback("sdp", move |data| {
+                if let Ok(message) = decode_message_as::<MessageSDP>(data) {
+                    let sdp =
+                        gst_sdp::SDPMessage::parse_buffer(message.sdp.sdp.as_bytes()).unwrap();
+                    let answer = WebRTCSessionDescription::new(WebRTCSDPType::Answer, sdp);
+                    self_obj.emit_by_name::<()>(
+                        "session-description",
+                        &[&"unique-session-id", &answer],
+                    );
+                } else {
+                    gst::error!(gst::CAT_DEFAULT, "Failed to decode SDP message");
+                }
+            });
+        }
+        {
+            let self_obj = self.obj().clone();
+            let _ = nestri_ws.register_callback("ice", move |data| {
+                if let Ok(message) = decode_message_as::<MessageICE>(data) {
+                    let candidate = message.candidate;
+                    let sdp_m_line_index = candidate.sdp_mline_index.unwrap_or(0) as u32;
+                    let sdp_mid = candidate.sdp_mid;
+
+                    self_obj.emit_by_name::<()>(
+                        "handle-ice",
+                        &[
+                            &"unique-session-id",
+                            &sdp_m_line_index,
+                            &sdp_mid,
+                            &candidate.candidate,
+                        ],
+                    );
+                } else {
+                    gst::error!(gst::CAT_DEFAULT, "Failed to decode ICE message");
+                }
+            });
+        }
+        {
+            let self_obj = self.obj().clone();
+            let _ = nestri_ws.register_callback("answer", move |data| {
+                if let Ok(answer) = decode_message_as::<MessageAnswer>(data) {
+                    gst::info!(gst::CAT_DEFAULT, "Received answer: {:?}", answer);
+                    match answer.answer_type {
+                        AnswerType::AnswerOK => {
+                            gst::info!(gst::CAT_DEFAULT, "Received OK answer");
+                            // Send our SDP offer
+                            self_obj.emit_by_name::<()>(
+                                "session-requested",
+                                &[
+                                    &"unique-session-id",
+                                    &"consumer-identifier",
+                                    &None::<WebRTCSessionDescription>,
+                                ],
+                            );
+                        }
+                        AnswerType::AnswerInUse => {
+                            gst::error!(gst::CAT_DEFAULT, "Room is in use by another node");
+                        }
+                        AnswerType::AnswerOffline => {
+                            gst::warning!(gst::CAT_DEFAULT, "Room is offline");
+                        }
+                    }
+                } else {
+                    gst::error!(gst::CAT_DEFAULT, "Failed to decode answer");
+                }
+            });
+        }
+        {
+            let self_obj = self.obj().clone();
+            // After creating webrtcsink
+            self_obj.connect_closure(
+                "webrtcbin-ready",
+                false,
+                glib::closure!(move |signaller: &super::NestriSignaller,
+                                     _consumer_identifier: &str,
+                                     webrtcbin: &gst::Element| {
+                    gst::info!(gst::CAT_DEFAULT, "Adding data channels");
+                    // Create data channels on webrtcbin
+                    let data_channel = Some(
+                        webrtcbin.emit_by_name::<gst_webrtc::WebRTCDataChannel>(
+                            "create-data-channel",
+                            &[
+                                &"nestri-data-channel",
+                                &gst::Structure::builder("config")
+                                    .field("ordered", &false)
+                                    .field("max-retransmits", &0u32)
+                                    .build(),
+                            ],
+                        ),
+                    );
+                    if let Some(data_channel) = data_channel {
+                        gst::info!(gst::CAT_DEFAULT, "Data channel created");
+                        if let Some(pipeline) = signaller.imp().get_pipeline() {
+                            setup_data_channel(&data_channel, &pipeline);
+                            signaller.imp().set_data_channel(data_channel);
+                        } else {
+                            gst::error!(gst::CAT_DEFAULT, "Wayland display source not set");
+                        }
+                    } else {
+                        gst::error!(gst::CAT_DEFAULT, "Failed to create data channel");
+                    }
+                }),
+            );
+        }
+    }
+}
+impl SignallableImpl for Signaller {
+    fn start(&self) {
+        gst::info!(gst::CAT_DEFAULT, "Signaller started");
+
+        // Get WebSocket connection
+        let nestri_ws = {
+            self.nestri_ws
+                .read()
+                .unwrap()
+                .clone()
+                .expect("NestriWebSocket not set")
+        };
+
+        // Register message callbacks
+        self.register_callbacks();
+
+        // Subscribe to reconnection notifications
+        let reconnected_notify = nestri_ws.subscribe_reconnected();
+
+        // Clone necessary references
+        let self_clone = self.obj().clone();
+        let nestri_ws_clone = nestri_ws.clone();
+
+        // Spawn a task to handle actions upon reconnection
+        tokio::spawn(async move {
+            loop {
+                // Wait for a reconnection notification
+                reconnected_notify.notified().await;
+
+                println!("Reconnected to relay, re-negotiating...");
+                gst::warning!(gst::CAT_DEFAULT, "Reconnected to relay, re-negotiating...");
+
+                // Emit "session-ended" first to make sure the element is cleaned up
+                self_clone.emit_by_name::<bool>("session-ended", &[&"unique-session-id"]);
+
+                // Send a new join message
+                let join_msg = MessageJoin {
+                    base: MessageBase {
+                        payload_type: "join".to_string(),
+                    },
+                    joiner_type: JoinerType::JoinerNode,
+                };
+                if let Ok(encoded) = encode_message(&join_msg) {
+                    if let Err(e) = nestri_ws_clone.send_message(encoded) {
+                        gst::error!(
+                            gst::CAT_DEFAULT,
+                            "Failed to send join message after reconnection: {:?}",
+                            e
+                        );
+                    }
+                } else {
+                    gst::error!(
+                        gst::CAT_DEFAULT,
+                        "Failed to encode join message after reconnection"
+                    );
+                }
+
+                // If we need to interact with GStreamer or GLib, schedule it on the main thread
+                let self_clone_for_main = self_clone.clone();
+                glib::MainContext::default().invoke(move || {
+                    // Emit the "session-requested" signal
+                    self_clone_for_main.emit_by_name::<()>(
+                        "session-requested",
+                        &[
+                            &"unique-session-id",
+                            &"consumer-identifier",
+                            &None::<WebRTCSessionDescription>,
+                        ],
+                    );
+                });
+            }
+        });
+
+        let join_msg = MessageJoin {
+            base: MessageBase {
+                payload_type: "join".to_string(),
+            },
+            joiner_type: JoinerType::JoinerNode,
+        };
+        if let Ok(encoded) = encode_message(&join_msg) {
+            if let Err(e) = nestri_ws.send_message(encoded) {
+                eprintln!("Failed to send join message: {:?}", e);
+                gst::error!(gst::CAT_DEFAULT, "Failed to send join message: {:?}", e);
+            }
+        } else {
+            gst::error!(gst::CAT_DEFAULT, "Failed to encode join message");
+        }
+    }
+
+    fn stop(&self) {
+        gst::info!(gst::CAT_DEFAULT, "Signaller stopped");
+    }
+
+    fn send_sdp(&self, _session_id: &str, sdp: &WebRTCSessionDescription) {
+        let nestri_ws = {
+            self.nestri_ws
+                .read()
+                .unwrap()
+                .clone()
+                .expect("NestriWebSocket not set")
+        };
+        let sdp_message = MessageSDP {
+            base: MessageBase {
+                payload_type: "sdp".to_string(),
+            },
+            sdp: RTCSessionDescription::offer(sdp.sdp().as_text().unwrap()).unwrap(),
+        };
+        if let Ok(encoded) = encode_message(&sdp_message) {
+            if let Err(e) = nestri_ws.send_message(encoded) {
+                eprintln!("Failed to send SDP message: {:?}", e);
+                gst::error!(gst::CAT_DEFAULT, "Failed to send SDP message: {:?}", e);
+            }
+        } else {
+            gst::error!(gst::CAT_DEFAULT, "Failed to encode SDP message");
+        }
+    }
+
+    fn add_ice(
+        &self,
+        _session_id: &str,
+        candidate: &str,
+        sdp_m_line_index: u32,
+        sdp_mid: Option<String>,
+    ) {
+        let nestri_ws = {
+            self.nestri_ws
+                .read()
+                .unwrap()
+                .clone()
+                .expect("NestriWebSocket not set")
+        };
+        let candidate_init = RTCIceCandidateInit {
+            candidate: candidate.to_string(),
+            sdp_mid,
+            sdp_mline_index: Some(sdp_m_line_index as u16),
+            ..Default::default()
+        };
+        let ice_message = MessageICE {
+            base: MessageBase {
+                payload_type: "ice".to_string(),
+            },
+            candidate: candidate_init,
+        };
+        if let Ok(encoded) = encode_message(&ice_message) {
+            if let Err(e) = nestri_ws.send_message(encoded) {
+                eprintln!("Failed to send ICE message: {:?}", e);
+                gst::error!(gst::CAT_DEFAULT, "Failed to send ICE message: {:?}", e);
+            }
+        } else {
+            gst::error!(gst::CAT_DEFAULT, "Failed to encode ICE message");
+        }
+    }
+
+    fn end_session(&self, session_id: &str) {
+        gst::info!(gst::CAT_DEFAULT, "Ending session: {}", session_id);
+    }
+}
+#[glib::object_subclass]
+impl ObjectSubclass for Signaller {
+    const NAME: &'static str = "NestriSignaller";
+    type Type = super::NestriSignaller;
+    type ParentType = glib::Object;
+    type Interfaces = (Signallable,);
+}
+impl ObjectImpl for Signaller {
+    fn properties() -> &'static [glib::ParamSpec] {
+        static PROPS: LazyLock<Vec<glib::ParamSpec>> = LazyLock::new(|| {
+            vec![glib::ParamSpecBoolean::builder("manual-sdp-munging")
+                .nick("Manual SDP munging")
+                .blurb("Whether the signaller manages SDP munging itself")
+                .default_value(false)
+                .read_only()
+                .build()]
+        });
+
+        PROPS.as_ref()
+    }
+    fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
+        match pspec.name() {
+            "manual-sdp-munging" => false.to_value(),
+            _ => unimplemented!(),
+        }
+    }
+}
+
+fn setup_data_channel(data_channel: &gst_webrtc::WebRTCDataChannel, pipeline: &gst::Pipeline) {
+    let pipeline = pipeline.clone();
+    // A shared state to track currently pressed keys
+    let pressed_keys = Arc::new(Mutex::new(HashSet::new()));
+    let pressed_buttons = Arc::new(Mutex::new(HashSet::new()));
+
+    data_channel.connect_on_message_data(move |_data_channel, data| {
+        if let Some(data) = data {
+            match decode_message_as::<MessageInput>(data.to_vec()) {
+                Ok(message_input) => {
+                    // Deserialize the input message data
+                    if let Ok(input_msg) = serde_json::from_str::<InputMessage>(&message_input.data)
+                    {
+                        // Process the input message and create an event
+                        if let Some(event) =
+                            handle_input_message(input_msg, &pressed_keys, &pressed_buttons)
+                        {
+                            // Send the event to pipeline, result bool is ignored
+                            let _ = pipeline.send_event(event);
+                        }
+                    } else {
+                        eprintln!("Failed to parse InputMessage");
+                    }
+                }
+                Err(e) => {
+                    eprintln!("Failed to decode MessageInput: {:?}", e);
+                }
+            }
+        }
+    });
+}
+
+fn handle_input_message(
+    input_msg: InputMessage,
+    pressed_keys: &Arc<Mutex<HashSet<i32>>>,
+    pressed_buttons: &Arc<Mutex<HashSet<i32>>>,
+) -> Option<gst::Event> {
+    match input_msg {
+        InputMessage::MouseMove { x, y } => {
+            let structure = gst::Structure::builder("MouseMoveRelative")
+                .field("pointer_x", x as f64)
+                .field("pointer_y", y as f64)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::MouseMoveAbs { x, y } => {
+            let structure = gst::Structure::builder("MouseMoveAbsolute")
+                .field("pointer_x", x as f64)
+                .field("pointer_y", y as f64)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::KeyDown { key } => {
+            let mut keys = pressed_keys.lock().unwrap();
+            // If the key is already pressed, return to prevent key lockup
+            if keys.contains(&key) {
+                return None;
+            }
+            keys.insert(key);
+
+            let structure = gst::Structure::builder("KeyboardKey")
+                .field("key", key as u32)
+                .field("pressed", true)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::KeyUp { key } => {
+            let mut keys = pressed_keys.lock().unwrap();
+            // Remove the key from the pressed state when released
+            keys.remove(&key);
+
+            let structure = gst::Structure::builder("KeyboardKey")
+                .field("key", key as u32)
+                .field("pressed", false)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::Wheel { x, y } => {
+            let structure = gst::Structure::builder("MouseAxis")
+                .field("x", x as f64)
+                .field("y", y as f64)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::MouseDown { key } => {
+            let mut buttons = pressed_buttons.lock().unwrap();
+            // If the button is already pressed, return to prevent button lockup
+            if buttons.contains(&key) {
+                return None;
+            }
+            buttons.insert(key);
+
+            let structure = gst::Structure::builder("MouseButton")
+                .field("button", key as u32)
+                .field("pressed", true)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+        InputMessage::MouseUp { key } => {
+            let mut buttons = pressed_buttons.lock().unwrap();
+            // Remove the button from the pressed state when released
+            buttons.remove(&key);
+
+            let structure = gst::Structure::builder("MouseButton")
+                .field("button", key as u32)
+                .field("pressed", false)
+                .build();
+
+            Some(gst::event::CustomUpstream::new(structure))
+        }
+    }
+}
diff --git a/packages/server/src/nestrisink/mod.rs b/packages/server/src/nestrisink/mod.rs
new file mode 100644
index 00000000..f182a15f
--- /dev/null
+++ b/packages/server/src/nestrisink/mod.rs
@@ -0,0 +1,25 @@
+use std::sync::Arc;
+use gst::glib;
+use gst::subclass::prelude::*;
+use gstrswebrtc::signaller::Signallable;
+use crate::websocket::NestriWebSocket;
+
+mod imp;
+
+glib::wrapper! {
+    pub struct NestriSignaller(ObjectSubclass<imp::Signaller>) @implements Signallable;
+}
+
+impl NestriSignaller {
+    pub fn new(nestri_ws: Arc<NestriWebSocket>, pipeline: Arc<gst::Pipeline>) -> Self {
+        let obj: Self = glib::Object::new();
+        obj.imp().set_nestri_ws(nestri_ws);
+        obj.imp().set_pipeline(pipeline);
+        obj
+    }
+}
+impl Default for NestriSignaller {
+    fn default() -> Self {
+        panic!("Cannot create NestriSignaller without NestriWebSocket");
+    }
+}
\ No newline at end of file
diff --git a/packages/server/src/room.rs b/packages/server/src/room.rs
deleted file mode 100644
index ae670421..00000000
--- a/packages/server/src/room.rs
+++ /dev/null
@@ -1,540 +0,0 @@
-use serde::{Deserialize, Serialize};
-use serde_json::from_str;
-use std::collections::{HashSet};
-use std::error::Error;
-use std::sync::Arc;
-use futures_util::StreamExt;
-use gst::prelude::ElementExtManual;
-use gst_app::app_sink::AppSinkStream;
-use tokio::sync::{oneshot, Mutex};
-use tokio::sync::{mpsc};
-use webrtc::api::interceptor_registry::register_default_interceptors;
-use webrtc::api::media_engine::MediaEngine;
-use webrtc::api::APIBuilder;
-use webrtc::data_channel::data_channel_init::RTCDataChannelInit;
-use webrtc::data_channel::data_channel_message::DataChannelMessage;
-use webrtc::ice_transport::ice_candidate::RTCIceCandidateInit;
-use webrtc::ice_transport::ice_gathering_state::RTCIceGatheringState;
-use webrtc::ice_transport::ice_server::RTCIceServer;
-use webrtc::interceptor::registry::Registry;
-use webrtc::peer_connection::configuration::RTCConfiguration;
-use webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState;
-use webrtc::rtp_transceiver::rtp_codec::RTCRtpCodecCapability;
-use webrtc::track::track_local::track_local_static_rtp::TrackLocalStaticRTP;
-use webrtc::track::track_local::TrackLocalWriter;
-use crate::messages::*;
-use crate::websocket::NestriWebSocket;
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(tag = "type")]
-enum InputMessage {
-    #[serde(rename = "mousemove")]
-    MouseMove { x: i32, y: i32 },
-
-    #[serde(rename = "mousemoveabs")]
-    MouseMoveAbs { x: i32, y: i32 },
-
-    #[serde(rename = "wheel")]
-    Wheel { x: f64, y: f64 },
-
-    #[serde(rename = "mousedown")]
-    MouseDown { key: i32 },
-    // Add other variants as needed
-    #[serde(rename = "mouseup")]
-    MouseUp { key: i32 },
-
-    #[serde(rename = "keydown")]
-    KeyDown { key: i32 },
-
-    #[serde(rename = "keyup")]
-    KeyUp { key: i32 },
-}
-
-pub struct Room {
-    nestri_ws: Arc<NestriWebSocket>,
-    webrtc_api: webrtc::api::API,
-    webrtc_config: RTCConfiguration,
-}
-
-impl Room {
-    pub async fn new(
-        nestri_ws: Arc<NestriWebSocket>,
-    ) -> Result<Room, Box<dyn Error>> {
-        // Create media engine and register default codecs
-        let mut media_engine = MediaEngine::default();
-        media_engine.register_default_codecs()?;
-
-        // Registry
-        let mut registry = Registry::new();
-        registry = register_default_interceptors(registry, &mut media_engine)?;
-
-        // Create the API object with the MediaEngine
-        let api = APIBuilder::new()
-            .with_media_engine(media_engine)
-            .with_interceptor_registry(registry)
-            .build();
-
-        // Prepare the configuration
-        let config = RTCConfiguration {
-            ice_servers: vec![RTCIceServer {
-                urls: vec!["stun:stun.l.google.com:19302".to_owned()],
-                ..Default::default()
-            }],
-            ..Default::default()
-        };
-
-        Ok(Self {
-            nestri_ws,
-            webrtc_api: api,
-            webrtc_config: config,
-        })
-    }
-
-    pub async fn run(
-        &mut self,
-        audio_codec: &str,
-        video_codec: &str,
-        pipeline: Arc<Mutex<gst::Pipeline>>,
-        audio_sink: Arc<Mutex<AppSinkStream>>,
-        video_sink: Arc<Mutex<AppSinkStream>>,
-    ) -> Result<(), Box<dyn Error>> {
-        let (tx, rx) = oneshot::channel();
-        let tx = Arc::new(std::sync::Mutex::new(Some(tx)));
-        self.nestri_ws
-            .register_callback("answer",  {
-                let tx = tx.clone();
-                move |data| {
-                    if let Ok(answer) = decode_message_as::<MessageAnswer>(data) {
-                        log::info!("Received answer: {:?}", answer);
-                        match answer.answer_type {
-                            AnswerType::AnswerOffline => {
-                                log::warn!("Room is offline, we shouldn't be receiving this");
-                            }
-                            AnswerType::AnswerInUse => {
-                                log::error!("Room is in use by another node!");
-                            }
-                            AnswerType::AnswerOK => {
-                                // Notify that we got an OK answer
-                                if let Some(tx) = tx.lock().unwrap().take() {
-                                    if let Err(_) = tx.send(()) {
-                                        log::error!("Failed to send OK answer signal");
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        log::error!("Failed to decode answer");
-                    }
-                }
-            })
-            .await;
-
-        // Send a request to join the room
-        let join_msg = MessageJoin {
-            base: MessageBase {
-                payload_type: "join".to_string(),
-            },
-            joiner_type: JoinerType::JoinerNode,
-        };
-        if let Ok(encoded) = encode_message(&join_msg) {
-            self.nestri_ws.send_message(encoded).await?;
-        } else {
-            log::error!("Failed to encode join message");
-            return Err("Failed to encode join message".into());
-        }
-
-        // Wait for the signal indicating that we have received an OK answer
-        match rx.await {
-            Ok(()) => {
-                log::info!("Received OK answer, proceeding...");
-            }
-            Err(_) => {
-                log::error!("Oneshot channel closed unexpectedly");
-                return Err("Unexpected error while waiting for OK answer".into());
-            }
-        }
-
-        // Create a new RTCPeerConnection
-        let config = self.webrtc_config.clone();
-        let peer_connection = Arc::new(self.webrtc_api.new_peer_connection(config).await?);
-
-        // Create audio track
-        let audio_track = Arc::new(TrackLocalStaticRTP::new(
-            RTCRtpCodecCapability {
-                mime_type: audio_codec.to_owned(),
-                ..Default::default()
-            },
-            "audio".to_owned(),
-            "audio-nestri-server".to_owned(),
-        ));
-
-        // Create video track
-        let video_track = Arc::new(TrackLocalStaticRTP::new(
-            RTCRtpCodecCapability {
-                mime_type: video_codec.to_owned(),
-                ..Default::default()
-            },
-            "video".to_owned(),
-            "video-nestri-server".to_owned(),
-        ));
-
-        // Cancellation token to stop spawned tasks after peer connection is closed
-        let cancel_token = tokio_util::sync::CancellationToken::new();
-
-        // Add audio track to peer connection
-        let audio_sender = peer_connection.add_track(audio_track.clone()).await?;
-        let audio_sender_token = cancel_token.child_token();
-        tokio::spawn(async move {
-            loop {
-                let mut rtcp_buf = vec![0u8; 1500];
-                tokio::select! {
-                    _ = audio_sender_token.cancelled() => {
-                        break;
-                    }
-                    _ = audio_sender.read(&mut rtcp_buf) => {}
-                }
-            }
-        });
-
-        // Add video track to peer connection
-        let video_sender = peer_connection.add_track(video_track.clone()).await?;
-        let video_sender_token = cancel_token.child_token();
-        tokio::spawn(async move {
-            loop {
-                let mut rtcp_buf = vec![0u8; 1500];
-                tokio::select! {
-                    _ = video_sender_token.cancelled() => {
-                        break;
-                    }
-                    _ = video_sender.read(&mut rtcp_buf) => {}
-                }
-            }
-        });
-
-        // Create a datachannel with label 'input'
-        let data_channel_opts = Some(RTCDataChannelInit {
-            ordered: Some(false),
-            max_retransmits: Some(0),
-            ..Default::default()
-        });
-        let data_channel
-            = peer_connection.create_data_channel("input", data_channel_opts).await?;
-
-        // PeerConnection state change tracker
-        let (pc_sndr, mut pc_recv) = mpsc::channel(1);
-
-        // Peer connection state change handler
-        peer_connection.on_peer_connection_state_change(Box::new(
-            move |s: RTCPeerConnectionState| {
-                let pc_sndr = pc_sndr.clone();
-                Box::pin(async move {
-                    log::info!("PeerConnection State has changed: {s}");
-
-                    if s == RTCPeerConnectionState::Failed
-                        || s == RTCPeerConnectionState::Disconnected
-                        || s == RTCPeerConnectionState::Closed
-                    {
-                        // Notify pc_state that the peer connection has closed
-                        if let Err(e) = pc_sndr.send(s).await {
-                            log::error!("Failed to send PeerConnection state: {}", e);
-                        }
-                    }
-                })
-            },
-        ));
-
-        peer_connection.on_ice_gathering_state_change(Box::new(move |s| {
-            Box::pin(async move {
-                log::info!("ICE Gathering State has changed: {s}");
-            })
-        }));
-
-        peer_connection.on_ice_connection_state_change(Box::new(move |s| {
-            Box::pin(async move {
-                log::info!("ICE Connection State has changed: {s}");
-            })
-        }));
-
-        // Trickle ICE over WebSocket
-        let ws = self.nestri_ws.clone();
-        peer_connection.on_ice_candidate(Box::new(move |c| {
-            let nestri_ws = ws.clone();
-            Box::pin(async move {
-                if let Some(candidate) = c {
-                    let candidate_json = candidate.to_json().unwrap();
-                    let ice_msg = MessageICE {
-                        base: MessageBase {
-                            payload_type: "ice".to_string(),
-                        },
-                        candidate: candidate_json,
-                    };
-                    if let Ok(encoded) = encode_message(&ice_msg) {
-                        let _ = nestri_ws.send_message(encoded);
-                    }
-                }
-            })
-        }));
-
-        // Temporary ICE candidate buffer until remote description is set
-        let ice_holder: Arc<Mutex<Vec<RTCIceCandidateInit>>> = Arc::new(Mutex::new(Vec::new()));
-        // Register set_response_callback for ICE candidate
-        let pc = peer_connection.clone();
-        let ice_clone = ice_holder.clone();
-        self.nestri_ws.register_callback("ice", move |data| {
-            match decode_message_as::<MessageICE>(data) {
-                Ok(message) => {
-                    log::info!("Received ICE message");
-                    let candidate = RTCIceCandidateInit::from(message.candidate);
-                    let pc = pc.clone();
-                    let ice_clone = ice_clone.clone();
-                    tokio::spawn(async move {
-                        // If remote description is not set, buffer ICE candidates
-                        if pc.remote_description().await.is_none() {
-                            let mut ice_holder = ice_clone.lock().await;
-                            ice_holder.push(candidate);
-                        } else {
-                            if let Err(e) = pc.add_ice_candidate(candidate).await {
-                                log::error!("Failed to add ICE candidate: {}", e);
-                            } else {
-                                // Add any held ICE candidates
-                                let mut ice_holder = ice_clone.lock().await;
-                                for candidate in ice_holder.drain(..) {
-                                    if let Err(e) = pc.add_ice_candidate(candidate).await {
-                                        log::error!("Failed to add ICE candidate: {}", e);
-                                    }
-                                }
-                            }
-                        }
-                    });
-                }
-                Err(e) => eprintln!("Failed to decode callback message: {:?}", e),
-            }
-        }).await;
-
-        // A shared state to track currently pressed keys
-        let pressed_keys = Arc::new(Mutex::new(HashSet::new()));
-        let pressed_buttons = Arc::new(Mutex::new(HashSet::new()));
-
-        // Data channel message handler
-        data_channel.on_message(Box::new(move |msg: DataChannelMessage| {
-            let pipeline = pipeline.clone();
-            let pressed_keys = pressed_keys.clone();
-            let pressed_buttons = pressed_buttons.clone();
-            Box::pin({
-                async move {
-                    // We don't care about string messages for now
-                    if !msg.is_string {
-                        // Decode the message as an MessageInput (binary encoded gzip)
-                        match decode_message_as::<MessageInput>(msg.data.to_vec()) {
-                            Ok(message_input) => {
-                                // Handle the input message
-                                if let Ok(input_msg) = from_str::<InputMessage>(&message_input.data) {
-                                    if let Some(event) =
-                                        handle_input_message(input_msg, &pressed_keys, &pressed_buttons).await
-                                    {
-                                        let _ = pipeline.lock().await.send_event(event);
-                                    }
-                                }
-                            }
-                            Err(e) => {
-                                log::error!("Failed to decode input message: {:?}", e);
-                            }
-                        }
-                    }
-                }
-            })
-        }));
-
-        log::info!("Creating offer...");
-
-        // Create an offer to send to the browser
-        let offer = peer_connection.create_offer(None).await?;
-
-        log::info!("Setting local description...");
-
-        // Sets the LocalDescription, and starts our UDP listeners
-        peer_connection.set_local_description(offer).await?;
-
-        log::info!("Local description set...");
-
-        if let Some(local_description) = peer_connection.local_description().await {
-            // Wait until we have gathered all ICE candidates
-            while peer_connection.ice_gathering_state() != RTCIceGatheringState::Complete {
-                tokio::time::sleep(tokio::time::Duration::from_millis(100)).await;
-            }
-
-            // Register set_response_callback for SDP answer
-            let pc = peer_connection.clone();
-            self.nestri_ws.register_callback("sdp", move |data| {
-                match decode_message_as::<MessageSDP>(data) {
-                    Ok(message) => {
-                        log::info!("Received SDP message");
-                        let sdp = message.sdp;
-                        let pc = pc.clone();
-                        tokio::spawn(async move {
-                            if let Err(e) = pc.set_remote_description(sdp).await {
-                                log::error!("Failed to set remote description: {}", e);
-                            }
-                        });
-                    }
-                    Err(e) => eprintln!("Failed to decode callback message: {:?}", e),
-                }
-            }).await;
-
-            log::info!("Sending local description to remote...");
-            // Encode and send the local description via WebSocket
-            let sdp_msg = MessageSDP {
-                base: MessageBase {
-                    payload_type: "sdp".to_string(),
-                },
-                sdp: local_description,
-            };
-            let encoded = encode_message(&sdp_msg)?;
-            self.nestri_ws.send_message(encoded).await?;
-        } else {
-            log::error!("generate local_description failed!");
-            cancel_token.cancel();
-            return Err("generate local_description failed!".into());
-        };
-
-        // Send video and audio data
-        let audio_track = audio_track.clone();
-        tokio::spawn(async move {
-            let mut audio_sink = audio_sink.lock().await;
-            while let Some(sample) = audio_sink.next().await {
-                if let Some(buffer) = sample.buffer() {
-                    if let Ok(map) = buffer.map_readable() {
-                        if let Err(e) = audio_track.write(map.as_slice()).await {
-                            if webrtc::Error::ErrClosedPipe == e {
-                                break;
-                            } else {
-                                log::error!("Failed to write audio track: {}", e);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        let video_track = video_track.clone();
-        tokio::spawn(async move {
-            let mut video_sink = video_sink.lock().await;
-            while let Some(sample) = video_sink.next().await {
-                if let Some(buffer) = sample.buffer() {
-                    if let Ok(map) = buffer.map_readable() {
-                        if let Err(e) = video_track.write(map.as_slice()).await {
-                            if webrtc::Error::ErrClosedPipe == e {
-                                break;
-                            } else {
-                                log::error!("Failed to write video track: {}", e);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-
-        // Block until closed or error
-        tokio::select! {
-            _ = pc_recv.recv() => {
-                log::info!("Peer connection closed with state: {:?}", peer_connection.connection_state());
-            }
-        }
-
-        cancel_token.cancel();
-
-        // Make double-sure to close the peer connection
-        if let Err(e) = peer_connection.close().await {
-            log::error!("Failed to close peer connection: {}", e);
-        }
-
-        Ok(())
-    }
-}
-
-async fn handle_input_message(
-    input_msg: InputMessage,
-    pressed_keys: &Arc<Mutex<HashSet<i32>>>,
-    pressed_buttons: &Arc<Mutex<HashSet<i32>>>,
-) -> Option<gst::Event> {
-    match input_msg {
-        InputMessage::MouseMove { x, y } => {
-            let structure = gst::Structure::builder("MouseMoveRelative")
-                .field("pointer_x", x as f64)
-                .field("pointer_y", y as f64)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-        InputMessage::MouseMoveAbs { x, y } => {
-            let structure = gst::Structure::builder("MouseMoveAbsolute")
-                .field("pointer_x", x as f64)
-                .field("pointer_y", y as f64)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-        InputMessage::KeyDown { key } => {
-            let mut keys = pressed_keys.lock().await;
-            // If the key is already pressed, return to prevent key lockup
-            if keys.contains(&key) {
-                return None;
-            }
-            keys.insert(key);
-
-            let structure = gst::Structure::builder("KeyboardKey")
-                .field("key", key as u32)
-                .field("pressed", true)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-        InputMessage::KeyUp { key } => {
-            let mut keys = pressed_keys.lock().await;
-            // Remove the key from the pressed state when released
-            keys.remove(&key);
-
-            let structure = gst::Structure::builder("KeyboardKey")
-                .field("key", key as u32)
-                .field("pressed", false)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-        InputMessage::Wheel { x, y } => {
-            let structure = gst::Structure::builder("MouseAxis")
-                .field("x", x as f64)
-                .field("y", y as f64)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-        InputMessage::MouseDown { key } => {
-            let mut buttons = pressed_buttons.lock().await;
-            // If the button is already pressed, return to prevent button lockup
-            if buttons.contains(&key) {
-                return None;
-            }
-            buttons.insert(key);
-
-            let structure = gst::Structure::builder("MouseButton")
-                .field("button", key as u32)
-                .field("pressed", true)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-        InputMessage::MouseUp { key } => {
-            let mut buttons = pressed_buttons.lock().await;
-            // Remove the button from the pressed state when released
-            buttons.remove(&key);
-
-            let structure = gst::Structure::builder("MouseButton")
-                .field("button", key as u32)
-                .field("pressed", false)
-                .build();
-
-            Some(gst::event::CustomUpstream::new(structure))
-        }
-    }
-}
diff --git a/packages/server/src/websocket.rs b/packages/server/src/websocket.rs
index 73c4efe1..b850aaab 100644
--- a/packages/server/src/websocket.rs
+++ b/packages/server/src/websocket.rs
@@ -1,18 +1,17 @@
+use crate::messages::{decode_message, encode_message, MessageBase, MessageLog};
 use futures_util::sink::SinkExt;
 use futures_util::stream::{SplitSink, SplitStream};
 use futures_util::StreamExt;
 use log::{Level, Log, Metadata, Record};
 use std::collections::HashMap;
 use std::error::Error;
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 use std::time::Duration;
 use tokio::net::TcpStream;
-use tokio::sync::Mutex;
-use tokio::sync::RwLock;
+use tokio::sync::{mpsc, Mutex, Notify};
 use tokio::time::sleep;
 use tokio_tungstenite::tungstenite::Message;
 use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
-use crate::messages::{decode_message, encode_message, MessageBase, MessageLog};
 
 type Callback = Box<dyn Fn(Vec<u8>) + Send + Sync>;
 type WSRead = SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>;
@@ -21,28 +20,36 @@ type WSWrite = SplitSink<WebSocketStream<MaybeTlsStream<TcpStream>>, Message>;
 #[derive(Clone)]
 pub struct NestriWebSocket {
     ws_url: String,
-    reader: Arc<Mutex<WSRead>>,
-    writer: Arc<Mutex<WSWrite>>,
+    reader: Arc<Mutex<Option<WSRead>>>,
+    writer: Arc<Mutex<Option<WSWrite>>>,
     callbacks: Arc<RwLock<HashMap<String, Callback>>>,
+    message_tx: mpsc::UnboundedSender<Vec<u8>>,
+    reconnected_notify: Arc<Notify>,
 }
 impl NestriWebSocket {
-    pub async fn new(
-        ws_url: String,
-    ) -> Result<NestriWebSocket, Box<dyn Error>> {
+    pub async fn new(ws_url: String) -> Result<NestriWebSocket, Box<dyn Error>> {
         // Attempt to connect to the WebSocket
         let ws_stream = NestriWebSocket::do_connect(&ws_url).await.unwrap();
 
-        // If the connection is successful, split the stream
+        // Split the stream into read and write halves
         let (write, read) = ws_stream.split();
-        let mut ws = NestriWebSocket {
+
+        // Create the message channel
+        let (message_tx, message_rx) = mpsc::unbounded_channel();
+
+        let ws = NestriWebSocket {
             ws_url,
-            reader: Arc::new(Mutex::new(read)),
-            writer: Arc::new(Mutex::new(write)),
+            reader: Arc::new(Mutex::new(Some(read))),
+            writer: Arc::new(Mutex::new(Some(write))),
             callbacks: Arc::new(RwLock::new(HashMap::new())),
+            message_tx: message_tx.clone(),
+            reconnected_notify: Arc::new(Notify::new()),
         };
 
         // Spawn the read loop
         ws.spawn_read_loop();
+        // Spawn the write loop
+        ws.spawn_write_loop(message_rx);
 
         Ok(ws)
     }
@@ -57,89 +64,160 @@ impl NestriWebSocket {
                 }
                 Err(e) => {
                     eprintln!("Failed to connect to WebSocket, retrying: {:?}", e);
-                    sleep(Duration::from_secs(1)).await; // Wait before retrying
+                    sleep(Duration::from_secs(3)).await; // Wait before retrying
                 }
             }
         }
     }
 
     // Handles message -> callback calls and reconnects on error/disconnect
-    fn spawn_read_loop(&mut self) {
+    fn spawn_read_loop(&self) {
         let reader = self.reader.clone();
         let callbacks = self.callbacks.clone();
+        let self_clone = self.clone();
+
+        tokio::spawn(async move {
+            loop {
+                // Lock the reader to get the WSRead, then drop the lock
+                let ws_read_option = {
+                    let mut reader_lock = reader.lock().await;
+                    reader_lock.take()
+                };
+
+                let mut ws_read = match ws_read_option {
+                    Some(ws_read) => ws_read,
+                    None => {
+                        eprintln!("Reader is None, cannot proceed");
+                        return;
+                    }
+                };
+
+                while let Some(message_result) = ws_read.next().await {
+                    match message_result {
+                        Ok(message) => {
+                            let data = message.into_data();
+                            let base_message = match decode_message(&data) {
+                                Ok(base_message) => base_message,
+                                Err(e) => {
+                                    eprintln!("Failed to decode message: {:?}", e);
+                                    continue;
+                                }
+                            };
+
+                            let callbacks_lock = callbacks.read().unwrap();
+                            if let Some(callback) = callbacks_lock.get(&base_message.payload_type) {
+                                let data = data.clone();
+                                callback(data);
+                            }
+                        }
+                        Err(e) => {
+                            eprintln!("Error receiving message: {:?}, reconnecting in 3 seconds...", e);
+                            sleep(Duration::from_secs(3)).await;
+                            self_clone.reconnect().await.unwrap();
+                            break; // Break the inner loop to get a new ws_read
+                        }
+                    }
+                }
+                // After reconnection, the loop continues, and we acquire a new ws_read
+            }
+        });
+    }
 
-        let mut self_clone = self.clone();
+    fn spawn_write_loop(&self, mut message_rx: mpsc::UnboundedReceiver<Vec<u8>>) {
+        let writer = self.writer.clone();
+        let self_clone = self.clone();
 
         tokio::spawn(async move {
             loop {
-                let message = reader.lock().await.next().await;
-                match message {
-                    Some(Ok(message)) => {
-                        let data = message.into_data();
-                        let base_message = match decode_message(&data) {
-                            Ok(base_message) => base_message,
-                            Err(e) => {
-                                eprintln!("Failed to decode message: {:?}", e);
+                // Wait for a message from the channel
+                if let Some(message) = message_rx.recv().await {
+                    loop {
+                        // Acquire the writer lock
+                        let mut writer_lock = writer.lock().await;
+                        if let Some(writer) = writer_lock.as_mut() {
+                            // Try to send the message over the WebSocket
+                            match writer.send(Message::Binary(message.clone())).await {
+                                Ok(_) => {
+                                    // Message sent successfully
+                                    break;
+                                }
+                                Err(e) => {
+                                    eprintln!("Error sending message: {:?}", e);
+                                    // Attempt to reconnect
+                                    if let Err(e) = self_clone.reconnect().await {
+                                        eprintln!("Error during reconnection: {:?}", e);
+                                        // Wait before retrying
+                                        sleep(Duration::from_secs(3)).await;
+                                        continue;
+                                    }
+                                }
+                            }
+                        } else {
+                            eprintln!("Writer is None, cannot send message");
+                            // Attempt to reconnect
+                            if let Err(e) = self_clone.reconnect().await {
+                                eprintln!("Error during reconnection: {:?}", e);
+                                // Wait before retrying
+                                sleep(Duration::from_secs(3)).await;
                                 continue;
                             }
-                        };
-
-                        let callbacks_lock = callbacks.read().await;
-                        if let Some(callback) = callbacks_lock.get(&base_message.payload_type) {
-                            let data = data.clone();
-                            callback(data);
                         }
                     }
-                    Some(Err(e)) => {
-                        eprintln!("Error receiving message: {:?}", e);
-                        self_clone.reconnect().await.unwrap();
-                    }
-                    None => {
-                        eprintln!("WebSocket connection closed, reconnecting...");
-                        self_clone.reconnect().await.unwrap();
-                    }
+                } else {
+                    break;
                 }
             }
         });
     }
 
-    async fn reconnect(&mut self) -> Result<(), Box<dyn Error + Send + Sync>> {
-        // Keep trying to reconnect until successful
+    async fn reconnect(&self) -> Result<(), Box<dyn Error + Send + Sync>> {
         loop {
             match NestriWebSocket::do_connect(&self.ws_url).await {
                 Ok(ws_stream) => {
                     let (write, read) = ws_stream.split();
-                    *self.reader.lock().await = read;
-                    *self.writer.lock().await = write;
+                    {
+                        let mut writer_lock = self.writer.lock().await;
+                        *writer_lock = Some(write);
+                    }
+                    {
+                        let mut reader_lock = self.reader.lock().await;
+                        *reader_lock = Some(read);
+                    }
+                    // Notify subscribers of successful reconnection
+                    self.reconnected_notify.notify_waiters();
                     return Ok(());
                 }
                 Err(e) => {
                     eprintln!("Failed to reconnect to WebSocket: {:?}", e);
-                    sleep(Duration::from_secs(2)).await; // Wait before retrying
+                    sleep(Duration::from_secs(3)).await; // Wait before retrying
                 }
             }
         }
     }
 
-    pub async fn send_message(&self, message: Vec<u8>) -> Result<(), Box<dyn Error>> {
-        let mut writer_lock = self.writer.lock().await;
-        writer_lock
-            .send(Message::Binary(message))
-            .await
-            .map_err(|e| format!("Error sending message: {:?}", e).into())
+    /// Send a message through the WebSocket
+    pub fn send_message(&self, message: Vec<u8>) -> Result<(), Box<dyn Error>> {
+        self.message_tx
+            .send(message)
+            .map_err(|e| format!("Failed to send message: {:?}", e).into())
     }
 
-    pub async fn register_callback<F>(&self, response_type: &str, callback: F)
+    /// Register a callback for a specific response type
+    pub fn register_callback<F>(&self, response_type: &str, callback: F)
     where
         F: Fn(Vec<u8>) + Send + Sync + 'static,
     {
-        let mut callbacks_lock = self.callbacks.write().await;
+        let mut callbacks_lock = self.callbacks.write().unwrap();
         callbacks_lock.insert(response_type.to_string(), Box::new(callback));
     }
+
+    /// Subscribe to event for reconnection
+    pub fn subscribe_reconnected(&self) -> Arc<Notify> {
+        self.reconnected_notify.clone()
+    }
 }
 impl Log for NestriWebSocket {
     fn enabled(&self, metadata: &Metadata) -> bool {
-        // Filter logs by level
         metadata.level() <= Level::Info
     }
 
@@ -162,7 +240,9 @@ impl Log for NestriWebSocket {
                 time,
             };
             if let Ok(encoded_message) = encode_message(&log_message) {
-                let _ = self.send_message(encoded_message);
+                if let Err(e) = self.send_message(encoded_message) {
+                    eprintln!("Failed to send log message: {:?}", e);
+                }
             }
         }
     }
@@ -171,4 +251,3 @@ impl Log for NestriWebSocket {
         // No-op for this logger
     }
 }
-