Merge branch 'main' into test-whip

.github/CLA.md

@@ -48,3 +48,4 @@ Example:
 - Wen Yang, @fastfeee, 2023/10/10
 - Hongcha Zhang, @hongcha98, 2023/10/10
 - Yuanyuan Zhou, @dfasdfasddf, 2023/11/01
+- Cooper Hzk, @CooperHash, 2024/03/07

Cargo.toml

@@ -9,8 +9,9 @@ description = "A very simple, high performance, edge WebRTC SFU"
 members = [".", "libs/cli", "libs/libwish", "tools/whepfrom", "tools/whipinto"]
 
 [dependencies]
-axum = { version = "0.7.4", features = ["multipart"] }
-tower-http = { version = "0.5.2", features = ["fs", "auth"] }
+http-body-util = "0.1.0"
+axum = { version = "0.7.4", features = ["multipart", "tracing"] }
+tower-http = { version = "0.5.2", features = ["fs", "auth", "trace","cors"] }
 
 # TODO
 # There have error, Next commit can't work with obs studio
@@ -20,8 +21,9 @@ webrtc = { git = "https://github.com/webrtc-rs/webrtc", rev = "3f34e2e055463e88f
 anyhow = { version = "1", features = ["backtrace"] }
 tokio = { version = "1.36", features = ["full"] }
 hyper = "1.2.0"
-log = "0.4.20"
-env_logger = "0.11.2"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+tracing-logfmt = { version = "0.3.3", features = ["ansi_logs"] }
 serde = { version = "1.0.188", features = ["serde_derive"] }
 toml = "0.8.10"
 serde_json = "1.0.114"
@@ -32,7 +34,6 @@ mime_guess = "2.0.4"
 rust-embed = { version = "8.2.0", features = ["axum-ex"] }
 prometheus = "0.13.3"
 lazy_static = "1.4.0"
-thiserror = "1"
 md5 = "0.7.0"
 
 # cargo install cargo-deb
@@ -49,10 +50,34 @@ depends = "libc6 systemd"
 section = "utility"
 priority = "optional"
 assets = [
-    ["target/release/live777", "usr/bin/", "755"],
-    ["target/release/whipinto", "usr/bin/", "755"],
-    ["target/release/whepfrom", "usr/bin/", "755"],
-    ["config-dist.toml", "etc/live777/config.toml", "644"],
-    ["live777.service", "usr/lib/systemd/system/live777.service", "644"],
-    ["README.md", "usr/share/doc/live777/README", "644"],
+    [
+        "target/release/live777",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "target/release/whipinto",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "target/release/whepfrom",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "config-dist.toml",
+        "etc/live777/config.toml",
+        "644",
+    ],
+    [
+        "live777.service",
+        "usr/lib/systemd/system/live777.service",
+        "644",
+    ],
+    [
+        "README.md",
+        "usr/share/doc/live777/README",
+        "644",
+    ],
 ]

assets/index.html

@@ -14,6 +14,10 @@
             padding: 0.5rem;
             margin: 0.5rem;
         }
+
+        section {
+            margin: 0.5rem;
+        }
     </style>
 </head>
 
@@ -32,8 +36,8 @@
         <center>
         <section>
             <button id="whip-device-button" onclick="refreshDevice()">Use Device</button>
-            <br/>Audio Device: <select id="whip-audio-device"><option value="">none</option></select>
-            <br/>Video Device: <select id="whip-video-device"><option value="">none</option></select>
+            <div style="margin: 0.2rem">Audio Device: <select id="whip-audio-device"><option value="">none</option></select></div>
+            <div style="margin: 0.2rem">Video Device: <select id="whip-video-device"><option value="">none</option></select></div>
         </section>
 
         <section>

config-dist.toml

@@ -1,5 +1,9 @@
+[http]
 # Http Server Listen Address
 # listen = "[::]:7777"
+# Cross-Origin Resource Sharing (CORS)
+# reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+# cors = false
 
 [[ice_servers]]
 urls = [
@@ -30,3 +34,4 @@ urls = [
 # Default: info
 # Values: off, error, warn, info, debug, trace
 # level = "warn"
+