chore: cleanup deps and fix for release-plz

8xFF · Feb 8, 2025 · 756b49c · 756b49c
1 parent c1f6900
commit 756b49c
Show file tree

Hide file tree

Showing 22 changed files with 445 additions and 391 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
     "bin",
+    "packages/audio_mixer",
     "packages/protocol",
     "packages/media_utils",
     "packages/media_core",
@@ -19,22 +20,84 @@ members = [
 ]
 
 [workspace.dependencies]
+audio-mixer = { package = "atm0s-media-server-audio-mixer", path = "packages/audio_mixer", version = "0.1.0" }
+media-server-utils = { package = "atm0s-media-server-utils", path = "packages/media_utils", version = "0.1.0" }
+media-server-core = { package = "atm0s-media-server-core", path = "packages/media_core", version = "0.1.0" }
+media-server-runner = { package = "atm0s-media-server-runner", path = "packages/media_runner", version = "0.1.0" }
+media-server-protocol = { package = "atm0s-media-server-protocol", path = "packages/protocol", version = "0.1.0" }
+media-server-console-front = { package = "atm0s-media-server-console-front", path = "packages/media_console_front", version = "0.1.0" }
+media-server-connector = { package = "atm0s-media-server-connector", path = "packages/media_connector", version = "0.1.0" }
+media-server-record = { package = "atm0s-media-server-record", path = "packages/media_record", version = "0.1.0", default-features = false }
+media-server-gateway = { package = "atm0s-media-server-gateway", path = "packages/media_gateway", version = "0.1.0" }
+media-server-audio-mixer = { package = "atm0s-media-server-audio-mixer", path = "packages/audio_mixer", version = "0.1.0" }
+media-server-secure = { package = "atm0s-media-server-secure", path = "packages/media_secure", version = "0.1.0", default-features = false }
+media-server-codecs = { package = "atm0s-media-server-codecs", path = "packages/media_codecs", version = "0.1.0", default-features = false }
+media-server-multi-tenancy = { package = "atm0s-media-server-multi-tenancy", path = "packages/multi_tenancy", version = "0.1.0" }
+transport-webrtc = { package = "atm0s-media-server-transport-webrtc", path = "packages/transport_webrtc", version = "0.1.0" }
+transport-rtpengine = { package = "atm0s-media-server-transport-rtpengine", path = "packages/transport_rtpengine", version = "0.1.0" }
+
 sans-io-runtime = { version = "0.3", default-features = false }
-atm0s-sdn = { version = "0.2.5", default-features = false }
-atm0s-sdn-network = { version = "0.6.2", default-features = false }
+atm0s-sdn = { version = "0.2", default-features = false }
+atm0s-sdn-network = { version = "0.6", default-features = false }
 tokio = "1.37"
 tracing-subscriber = { version = "0.3", features = ["env-filter", "std"] }
 convert-enum = "0.1"
 clap = "4.5"
 num_enum = "0.7"
 log = "0.4"
 serde = "1.0"
+serde_json = "1.0"
 derivative = "2.2"
 derive_more = "1.0"
 rand = "0.8"
 mockall = "0.13"
 prost = "0.13"
+prost-build = "0.13"
+tera = "1"
+quinn = "0.11"
+bincode = "1"
 indexmap = "2.2"
 spin = "0.9"
 httpmock = "0.7"
 test-log = "0.2"
+str0m = "0.6"
+sdp-rs = "0.2"
+rtp-rs = "0.6"
+reqwest = "0.12"
+sorted-vec = "0.8"
+uriparse = "0.6"
+serde-querystring = "0.2"
+pin-project-lite = "0.2"
+once_cell = "1.20"
+urlencoding = "2.1"
+poem = "3.0"
+rust-embed = "8.0"
+hex = "0.4"
+mime_guess = "2.0"
+criterion = "0.5"
+jwt-simple = { version = "0.12", default-features = false }
+tokio-util = "0.7"
+rusty-s3 = "0.7"
+futures = "0.3"
+bytes = "1.6"
+surf = "2.3"
+webm = "1.1"
+rtp = "0.11"
+poem-openapi = "5.0"
+chrono = "0.4"
+openssl = "0.10"
+lru = "0.12"
+async-trait = "0.1"
+sea-orm-migration = "1.1.0-rc.1"
+sea-orm = { version = "1.1.0-rc.1" }
+sea-query = "0.32.0-rc.1"
+s3-presign = "0.0.3"
+uuid = "1.10"
+libsoxr = "0.2"
+opusic-sys = "0.5"
+rustls = "0.23"
+sentry = "0.34"
+local-ip-address = "0.6"
+rcgen = "0.13"
+maxminddb = "0.24"
+systemstat = "0.2"
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -8,41 +8,40 @@ description = "Atm0s Media Server"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+media-server-protocol = { workspace = true, features = ["quinn-rpc"] }
+media-server-secure = { workspace = true }
+media-server-console-front = { workspace = true, optional = true }
+media-server-runner = { workspace = true, optional = true }
+media-server-gateway = { workspace = true, optional = true }
+media-server-connector = { workspace = true, optional = true }
+media-server-record = { workspace = true, default-features = false, optional = true }
+media-server-utils = { workspace = true, optional = true }
+media-server-multi-tenancy = { workspace = true, optional = true }
+
 tracing-subscriber = { workspace = true }
 clap = { workspace = true, features = ["env", "derive"] }
 log = { workspace = true }
 rand = { workspace = true }
 prost = { workspace = true }
-poem = { version = "3.0", features = ["static-files"] }
-poem-openapi = { version = "5.0", features = ["swagger-ui"] }
-rust-embed = { version = "8.0", features = ["compression"], optional = true }
+poem = { workspace = true, features = ["static-files"] }
+poem-openapi = { workspace = true, features = ["swagger-ui"] }
+rust-embed = { workspace = true, features = ["compression"], optional = true }
 tokio = { workspace = true, features = ["full"] }
 sans-io-runtime = { workspace = true }
 atm0s-sdn = { workspace = true }
-media-server-protocol = { path = "../packages/protocol", features = [
-    "quinn-rpc",
-] }
-media-server-secure = { path = "../packages/media_secure" }
-media-console-front = { path = "../packages/media_console_front", optional = true }
-media-server-runner = { path = "../packages/media_runner", optional = true }
-media-server-gateway = { path = "../packages/media_gateway", optional = true }
-media-server-connector = { path = "../packages/media_connector", optional = true }
-media-server-record = { path = "../packages/media_record", default-features = false, optional = true }
-media-server-utils = { path = "../packages/media_utils", optional = true }
-media-server-multi-tenancy = { path = "../packages/multi_tenancy", optional = true }
-local-ip-address = "0.6"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = { version = "1.0" }
-quinn = { version = "0.11", optional = true }
-rustls = { version = "0.23", optional = true }
+local-ip-address = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+quinn = { workspace = true, optional = true }
+rustls = { workspace = true, optional = true }
 convert-enum = { workspace = true }
 num_enum = { workspace = true }
 derive_more = { workspace = true, features = ["full"] }
-rcgen = { version = "0.13", optional = true }
-maxminddb = { version = "0.24", optional = true }
-systemstat = { version = "0.2", optional = true }
-reqwest = { version = "0.12", features = ["json"] }
-sentry = "0.34"
+rcgen = { workspace = true, optional = true }
+maxminddb = { workspace = true, optional = true }
+systemstat = { workspace = true, optional = true }
+reqwest = { workspace = true, features = ["json"] }
+sentry = { workspace = true }
 
 [features]
 default = [
@@ -73,7 +72,7 @@ media = [
     "rust-embed",
 ]
 console = [
-    "media-console-front",
+    "media-server-console-front",
     "media-server-utils/embed-files",
     "rust-embed",
 ]

diff --git a/bin/src/http.rs b/bin/src/http.rs
@@ -90,7 +90,7 @@ pub async fn run_console_http_server(
     let ctx = api_console::ConsoleApisCtx { secure, storage, connector };
 
     let route = Route::new()
-        .nest("/", media_console_front::frontend_app())
+        .nest("/", media_server_console_front::frontend_app())
         //node
         .nest("/api/node/", node_service)
         .nest("/api/node/ui", node_ui)

diff --git a/packages/audio_mixer/Cargo.toml b/packages/audio_mixer/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "audio-mixer"
+name = "atm0s-media-server-audio-mixer"
 version = "0.1.0"
 authors = ["Giang Minh <giang.ndm@gmail.com>"]
 edition = "2021"

diff --git a/packages/media_codecs/Cargo.toml b/packages/media_codecs/Cargo.toml
@@ -1,15 +1,14 @@
 [package]
-name = "media-server-codecs"
+name = "atm0s-media-server-codecs"
 version = "0.1.0"
 authors = ["Giang Minh <giang.ndm@gmail.com>"]
 edition = "2021"
 license = "MIT"
 description = "Media Codecs Component for Atm0s Media Server"
 
 [dependencies]
-log = { workspace = true }
-libsoxr = { version = "0.2", optional = true }
-opusic-sys = { version = "0.5", optional = true }
+libsoxr = { workspace = true, optional = true }
+opusic-sys = { workspace = true, optional = true }
 
 [features]
 default = ["opus", "pcma", "resample"]

diff --git a/packages/media_connector/Cargo.toml b/packages/media_connector/Cargo.toml
@@ -1,36 +1,37 @@
 [package]
-name = "media-server-connector"
+name = "atm0s-media-server-connector"
 version = "0.1.0"
 authors = ["Giang Minh <giang.ndm@gmail.com>"]
 edition = "2021"
 license = "MIT"
 description = "Media Connector Component for Atm0s Media Server"
 
 [dependencies]
+media-server-multi-tenancy = { workspace = true }
+media-server-protocol = { workspace = true }
+media-server-utils = { workspace = true }
+
 log = { workspace = true }
 clap = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-media-server-multi-tenancy = { path = "../multi_tenancy" }
-media-server-protocol = { path = "../protocol" }
-media-server-utils = { path = "../media_utils" }
 atm0s-sdn = { workspace = true }
 prost = { workspace = true }
 tokio = { workspace = true, features = ["sync"] }
-lru = "0.12"
-async-trait = "0.1"
-sea-orm-migration = "1.1.0-rc.1"
-sea-orm = { version = "1.1.0-rc.1", features = [
+lru = { workspace = true }
+async-trait = { workspace = true }
+sea-orm-migration = { workspace = true }
+sea-orm = { workspace = true, features = [
     "sqlx-sqlite",
     "sqlx-postgres",
     "sqlx-mysql",
     "runtime-tokio-rustls",
 ] }
-sea-query = "0.32.0-rc.1"
-serde_json = "1.0"
-s3-presign = "0.0.3"
-uuid = { version = "1.10", features = ["fast-rng", "v7"] }
-reqwest = { version = "0.12", features = ["json"] }
+sea-query = { workspace = true }
+serde_json = { workspace = true }
+s3-presign = { workspace = true }
+uuid = { workspace = true, features = ["fast-rng", "v7"] }
+reqwest = { workspace = true, features = ["json"] }
 
 [dev-dependencies]
-tokio = { version = "1", features = ["full"] }
+tokio = { workspace = true, features = ["full"] }
 tracing-subscriber = { workspace = true }
diff --git a/packages/media_console_front/Cargo.toml b/packages/media_console_front/Cargo.toml
@@ -1,14 +1,15 @@
 [package]
-name = "media-console-front"
+name = "atm0s-media-server-console-front"
 version = "0.1.0"
 authors = ["Giang Minh <giang.ndm@gmail.com>"]
 edition = "2021"
 license = "MIT"
 description = "Console Frontend Component for Atm0s Media Server"
 
 [dependencies]
-poem = { version = "3.0", features = [] }
-rust-embed = { version = "8.0", features = ["compression"] }
-reqwest = { version = "0.12" }
+media-server-utils = { workspace = true, features = ["embed-files"] }
+
+poem = { workspace = true, features = [] }
+rust-embed = { workspace = true, features = ["compression"] }
+reqwest = { workspace = true }
 log = { workspace = true }
-media-server-utils = { path = "../media_utils", features = ["embed-files"] }
diff --git a/packages/media_console_front/src/dev_proxy.rs b/packages/media_console_front/src/dev_proxy.rs
@@ -12,7 +12,7 @@
 //!
 //! ```
 //! use poem::{get, handler, listener::TcpListener, web::Path, IntoResponse, Route, Server, EndpointExt};
-//! use media_console_front::dev_proxy::{proxy, ProxyConfig};
+//! use atm0s_media_server_console_front::dev_proxy::{proxy, ProxyConfig};
 //!
 //! let pconfig = ProxyConfig::new( "localhost:5173" )
 //!     .web_insecure()   // Enables proxy-ing web requests, sets the proxy to use http instead of https
@@ -32,7 +32,7 @@
 //! overview:
 //!
 //! ```
-//! use media_console_front::dev_proxy::ProxyConfig;
+//! use atm0s_media_server_console_front::dev_proxy::ProxyConfig;
 //!     
 //! // Configure proxy endpoint, pass in the target server address and port number
 //! let proxy_config = ProxyConfig::new( "localhost:5173" ) // 5173 is for Sveltekit

diff --git a/packages/media_core/Cargo.toml b/packages/media_core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "media-server-core"
+name = "atm0s-media-server-core"
 version = "0.1.0"
 authors = ["Giang Minh <giang.ndm@gmail.com>"]
 edition = "2021"
@@ -9,6 +9,10 @@ description = "Media Core Component for Atm0s Media Server"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+media-server-protocol = { workspace = true }
+media-server-utils = { workspace = true }
+audio-mixer = { workspace = true }
+
 log = { workspace = true }
 num_enum = { workspace = true }
 indexmap = { workspace = true }
@@ -17,10 +21,6 @@ derive_more = { workspace = true, features = ["full"] }
 mockall = { workspace = true }
 sans-io-runtime = { workspace = true, default-features = false }
 atm0s-sdn = { workspace = true }
-media-server-protocol = { path = "../protocol" }
-media-server-utils = { path = "../media_utils" }
-audio-mixer = { path = "../audio_mixer" }
 
 [dev-dependencies]
-tracing-subscriber = { workspace = true }
 test-log = { workspace = true }
diff --git a/packages/media_gateway/Cargo.toml b/packages/media_gateway/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "media-server-gateway"
+name = "atm0s-media-server-gateway"
 version = "0.1.0"
 authors = ["Giang Minh <giang.ndm@gmail.com>"]
 edition = "2021"
@@ -11,14 +11,9 @@ description = "Media Gateway Component for Atm0s Media Server"
 [dependencies]
 log = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-media-server-protocol = { path = "../protocol" }
-media-server-utils = { path = "../media_utils" }
-media-server-secure = { path = "../media_secure", default-features = false }
+media-server-protocol = { workspace = true }
 atm0s-sdn = { workspace = true }
 prost = { workspace = true }
 spin = { workspace = true }
 derive_more = { workspace = true }
 tokio = { workspace = true, features = ["time"] }
-
-[dev-dependencies]
-httpmock = { workspace = true }