diff --git a/Cargo.lock b/Cargo.lock index 170695c6..8228459a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -286,7 +286,7 @@ dependencies = [ "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", "signal-hook 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "svc-agent 0.14.1 (git+https://github.com/netology-group/svc-agent-rs?tag=v0.14.1)", + "svc-agent 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", "svc-authn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "svc-authz 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", "svc-error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1600,26 +1600,10 @@ dependencies = [ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rumq-client" -version = "0.1.0-alpha.10" -source = "git+https://github.com/tekjar/rumq?rev=f765dc8#f765dc8505f71a1ae3597f4b27f27bcc43ee985f" -dependencies = [ - "async-stream 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rumq-core 0.1.0-alpha.10 (git+https://github.com/tekjar/rumq?rev=f765dc8)", - "thiserror 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-rustls 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "webpki 0.21.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rumq-core" version = "0.1.0-alpha.10" -source = "git+https://github.com/tekjar/rumq?rev=f765dc8#f765dc8505f71a1ae3597f4b27f27bcc43ee985f" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "async-trait 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1973,8 +1957,8 @@ dependencies = [ [[package]] name = "svc-agent" -version = "0.14.1" -source = "git+https://github.com/netology-group/svc-agent-rs?tag=v0.14.1#bbcfa5152d61594fb432ac1a1ab787c8fa0bd903" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1984,11 +1968,11 @@ dependencies = [ "futures-channel 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rumq-client 0.1.0-alpha.10 (git+https://github.com/tekjar/rumq?rev=f765dc8)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.53 (registry+https://github.com/rust-lang/crates.io-index)", "svc-authn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "svc-rumq-client 0.1.0-alpha.11 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2040,11 +2024,27 @@ dependencies = [ "sentry 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.110 (registry+https://github.com/rust-lang/crates.io-index)", - "svc-agent 0.14.1 (git+https://github.com/netology-group/svc-agent-rs?tag=v0.14.1)", + "svc-agent 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)", "svc-authn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "svc-authz 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "svc-rumq-client" +version = "0.1.0-alpha.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "async-stream 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures-util 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rumq-core 0.1.0-alpha.10 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-rustls 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "webpki 0.21.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "syn" version = "0.11.11" @@ -2813,8 +2813,7 @@ dependencies = [ "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" "checksum reqwest 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2" "checksum ring 0.16.14 (registry+https://github.com/rust-lang/crates.io-index)" = "06b3fefa4f12272808f809a0af618501fdaba41a58963c5fb72238ab0be09603" -"checksum rumq-client 0.1.0-alpha.10 (git+https://github.com/tekjar/rumq?rev=f765dc8)" = "" -"checksum rumq-core 0.1.0-alpha.10 (git+https://github.com/tekjar/rumq?rev=f765dc8)" = "" +"checksum rumq-core 0.1.0-alpha.10 (registry+https://github.com/rust-lang/crates.io-index)" = "7a9e1af4026f37c89a92e70f0e80208515917990b50128943f6110117a9540af" "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" @@ -2853,10 +2852,11 @@ dependencies = [ "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum surf 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d72c302d4a24b2c9d412f1fe5edd892946778d33c423bba087c6c10deeb656ff" -"checksum svc-agent 0.14.1 (git+https://github.com/netology-group/svc-agent-rs?tag=v0.14.1)" = "" +"checksum svc-agent 0.14.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6c9766035c318505560a625d17129dc7f587424e71f6811c0ffb1108bcf24a60" "checksum svc-authn 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f546e117d9287d7b1274e855315019011d13736fdc5c8f8ef9d09ae00509de6" "checksum svc-authz 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7ace58b8269655614ba2d1e478980545d85ee4be8bd317b291e7929b2687a167" "checksum svc-error 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5ca1419d26952fbb917f2481b0697bc77768c0ad9bde5618fd7cefdf18fd1738" +"checksum svc-rumq-client 0.1.0-alpha.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c34437fee65675f17afcdbbda414068a101dfab942afac9e452e476cd5546b64" "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" "checksum syn 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)" = "1425de3c33b0941002740a420b1a906a350b88d08b82b2c8a01035a3f9447bac" "checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" diff --git a/Cargo.toml b/Cargo.toml index 3157bdf2..a44df529 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,6 +31,3 @@ svc-authz = "0.10" svc-error = { version = "0.1", features = ["diesel", "r2d2", "svc-agent", "svc-authn", "svc-authz", "sentry-extension"] } uuid = { version = "0.6", features = ["v4", "serde"] } webrtc-sdp = "0.1" - -[patch.crates-io] -svc-agent = {git = "https://github.com/netology-group/svc-agent-rs", tag = "v0.14.1"} diff --git a/src/app/endpoint/message.rs b/src/app/endpoint/message.rs index d8f9dd02..c1f36463 100644 --- a/src/app/endpoint/message.rs +++ b/src/app/endpoint/message.rs @@ -154,6 +154,7 @@ impl ResponseHandler for CallbackHandler { long_term_timing, short_term_timing, respp.tracking().clone(), + respp.local_tracking_label().clone(), ); let resp = OutgoingResponse::unicast(payload.to_owned(), props, &reqp, API_VERSION);