Merge pull request #10 from versatica/v3

merge

.github/workflows/mediasoup-rust.yaml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         rust:
           - stable
-          - nightly
+          # - nightly
 
     steps:
       - name: Checkout
@@ -51,10 +51,10 @@ jobs:
           command: clippy
           args: -- -D warnings
 
-      - run: npm install
-
       - name: cargo test
         uses: actions-rs/cargo@v1
+        env:
+          KEEP_BUILD_ARTIFACTS: '1'
         with:
           command: test
           args: --verbose

CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 
 
+### 3.7.2 (WIP)
+
+* Update `Catch` to 2.13.5.
+* Update NPM deps.
+
+
+### 3.7.1
+
+* `SimulcastConsumer`: Fix miscalculation when increasing layer (PR #541 by @penguinol).
+* Rust version with thread-based worker (PR #540).
+* Update NPM deps.
+
+
 ### 3.7.0
 
 * Welcome to `mediasoup-rust`! Authored by @nazar-pc (PRs #518 and #533).

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
 members = [
-    "rust"
+    "rust",
+    "worker"
 ]

lib/Worker.js

@@ -68,7 +68,7 @@ class Worker extends EnhancedEventEmitter_1.EnhancedEventEmitter {
         // options
         {
             env: {
-                MEDIASOUP_VERSION: '3.7.0',
+                MEDIASOUP_VERSION: '3.7.1',
                 // Let the worker process inherit all environment variables, useful
                 // if a custom and not in the path GCC is used so the user can set
                 // LD_LIBRARY_PATH environment variable for runtime.

lib/index.d.ts

@@ -9,7 +9,7 @@ export { types };
 /**
  * Expose mediasoup version.
  */
-export declare const version = "3.7.0";
+export declare const version = "3.7.1";
 /**
  * Expose parseScalabilityMode() function.
  */

lib/index.js

@@ -10,7 +10,7 @@ exports.types = types;
 /**
  * Expose mediasoup version.
  */
-exports.version = '3.7.0';
+exports.version = '3.7.1';
 /**
  * Expose parseScalabilityMode() function.
  */

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <[email protected]> (https://inakibaz.me)",
@@ -60,11 +60,11 @@
     "@types/debug": "^4.1.5",
     "@types/random-number": "0.0.0",
     "@types/uuid": "^8.3.0",
-    "@typescript-eslint/eslint-plugin": "^4.19.0",
-    "@typescript-eslint/parser": "^4.19.0",
+    "@typescript-eslint/eslint-plugin": "^4.21.0",
+    "@typescript-eslint/parser": "^4.21.0",
     "cross-env": "^7.0.3",
-    "eslint": "^7.23.0",
-    "eslint-plugin-jest": "^24.3.2",
+    "eslint": "^7.24.0",
+    "eslint-plugin-jest": "^24.3.5",
     "gulp": "^4.0.2",
     "gulp-clang-format": "^1.0.27",
     "jest": "^26.6.3",

rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mediasoup"
-version = "0.6.0"
+version = "0.7.1"
 description = "Cutting Edge WebRTC Video Conferencing in Rust"
 categories = ["api-bindings", "multimedia", "network-programming"]
 authors = ["Nazar Mokrynskyi <[email protected]>"]
@@ -11,51 +11,57 @@ documentation = "https://docs.rs/mediasoup"
 repository = "https://github.com/versatica/mediasoup/tree/v3/rust"
 readme = "readme.md"
 
+[package.metadata.docs.rs]
+default-target = "x86_64-unknown-linux-gnu"
+targets = []
+
 [dependencies]
-async-channel = "1.5.1"
+async-channel = "1.6.1"
 async-executor = "1.4.0"
 async-fs = "1.5.0"
 async-io = "1.3.1"
 async-lock = "2.3.0"
-async-oneshot = "0.4.2"
-async-process = "1.0.1"
-async-trait = "0.1.42"
-bytes = "1.0.0"
+async-oneshot = "0.5.0"
+async-trait = "0.1.48"
+bytes = "1.0.1"
 event-listener-primitives = "0.2.2"
 fastrand = "1.4.0"
 futures-lite = "1.11.3"
 h264-profile-level-id = "0.1.1"
-log = "0.4.11"
-libc = "0.2.82"
-nix = "0.19.1"
-once_cell = "1.5.2"
-serde_json = "1.0.61"
+log = "0.4.14"
+libc = "0.2.90"
+once_cell = "1.7.2"
+serde_json = "1.0.64"
 serde_repr = "0.1.6"
-thiserror = "1.0.23"
+thiserror = "1.0.24"
 
 [dependencies.lru]
 default-features = false
 version = "0.6.5"
 
+[dependencies.mediasoup-sys]
+path = "../worker"
+version = "0.1.1"
+
 [dependencies.parking_lot]
 version = "0.11.1"
 features = ["serde"]
 
 [dependencies.regex]
 default-features = false
 features = ["std", "perf"]
-version = "1.4.2"
+version = "1.4.5"
 
 [dependencies.serde]
 features = ["derive"]
-version = "1.0.118"
+version = "1.0.124"
 
 [dependencies.uuid]
 features = ["serde", "v4"]
-version = "0.8.1"
+version = "0.8.2"
 
 [dev-dependencies]
 actix = "0.10.0"
 actix-web = "3.3.2"
 actix-web-actors = "3.0.0"
-env_logger = "0.8.2"
+env_logger = "0.8.3"

rust/changelog.md

@@ -0,0 +1,15 @@
+# Changelog
+
+### 0.7.0
+
+* Switch from running C++ worker processes to worker threads using mediasoup-sys that wraps mediasoup-worker into library
+* Simplify `WorkerManager::new()` and `WorkerManager::with_executor()` API as the result of above
+* Support `rtxPacketsDiscarded` in `Producer` stats
+* Enable Rust 2018 idioms warnings
+* Make sure all public types have `Debug` implementation on them
+* Enforce docs on public types and add missing documentation
+* Remove `RtpCodecParametersParameters::new()` (`RtpCodecParametersParameters::default()` does the same thing)
+
+### 0.6.0
+
+Initial upstreamed release.

rust/examples/echo.rs

@@ -18,7 +18,6 @@ use mediasoup::worker::WorkerSettings;
 use mediasoup::worker_manager::WorkerManager;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::env;
 use std::num::{NonZeroU32, NonZeroU8};
 
 fn media_codecs() -> Vec<RtpCodecCapability> {
@@ -35,7 +34,7 @@ fn media_codecs() -> Vec<RtpCodecCapability> {
             mime_type: MimeTypeVideo::Vp8,
             preferred_payload_type: None,
             clock_rate: NonZeroU32::new(90000).unwrap(),
-            parameters: RtpCodecParametersParameters::new(),
+            parameters: RtpCodecParametersParameters::default(),
             rtcp_feedback: vec![
                 RtcpFeedback::Nack,
                 RtcpFeedback::NackPli,
@@ -403,11 +402,7 @@ async fn ws_index(
 async fn main() -> std::io::Result<()> {
     env_logger::init();
 
-    let worker_manager = WorkerManager::new(
-        env::var("MEDIASOUP_WORKER_BIN")
-            .map(|path| path.into())
-            .unwrap_or_else(|_| "../worker/out/Release/mediasoup-worker".into()),
-    );
+    let worker_manager = WorkerManager::new();
     HttpServer::new(move || {
         App::new()
             .data(worker_manager.clone())

rust/readme.md

@@ -35,7 +35,7 @@ enable different use cases and scenarios, without any constraint or assumption.
 * Congestion control.
 * Sender and receiver bandwidth estimation with spatial/temporal layers distribution algorithm.
 * Data message exchange (via WebRTC DataChannels, SCTP over plain UDP, and direct termination in Rust/Node.js).
-* Extremely powerful (media worker subprocess coded in C++ on top of [libuv](https://libuv.org)).
+* Extremely powerful (media worker subprocess/thead coded in C++ on top of [libuv](https://libuv.org)).
 
 ## Authors
 * Iñaki Baz Castillo [[website](https://inakibaz.me)|[github](https://github.com/ibc/)]