summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2019-11-29 20:34:21 +0100
committerSebastian Dröge <sebastian@centricular.com>2019-11-29 20:47:21 +0100
commit9a46977a4c2ba9ed5270eddff9458e6bb62971b1 (patch)
tree4265e34ca854771aa4e0ec531b12f4c19d633a42
parent3d2b63615a4aa1dcaf62a78ebb8792842a7dfba4 (diff)
sendrecv/rust: Port from tokio to async-std and use async/await
-rw-r--r--webrtc/sendrecv/gst-rust/Cargo.lock1268
-rw-r--r--webrtc/sendrecv/gst-rust/Cargo.toml29
-rw-r--r--webrtc/sendrecv/gst-rust/src/macos_workaround.rs67
-rw-r--r--webrtc/sendrecv/gst-rust/src/main.rs1136
4 files changed, 1128 insertions, 1372 deletions
diff --git a/webrtc/sendrecv/gst-rust/Cargo.lock b/webrtc/sendrecv/gst-rust/Cargo.lock
index 5e72632..90d7220 100644
--- a/webrtc/sendrecv/gst-rust/Cargo.lock
+++ b/webrtc/sendrecv/gst-rust/Cargo.lock
@@ -1,75 +1,126 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
-name = "ansi_term"
-version = "0.11.0"
+name = "anyhow"
+version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "arrayvec"
-version = "0.4.12"
+name = "async-macros"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "atty"
-version = "0.2.13"
+name = "async-std"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-macros 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-task 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kv-log-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "autocfg"
-version = "0.1.7"
+name = "async-task"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
-name = "backtrace"
-version = "0.3.40"
+name = "async-tls"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "backtrace-sys"
-version = "0.1.32"
+name = "async-tungstenite"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-tls 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tungstenite 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "base64"
-version = "0.9.3"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "base64"
-version = "0.10.1"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "block-buffer"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "bitflags"
-version = "1.2.1"
+name = "block-padding"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "bumpalo"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "byte-tools"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -96,7 +147,7 @@ dependencies = [
[[package]]
name = "cc"
-version = "1.0.46"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -109,145 +160,194 @@ name = "clap"
version = "2.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "cloudabi"
-version = "0.0.3"
+name = "crossbeam-channel"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core-foundation"
-version = "0.6.4"
+name = "crossbeam-deque"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "core-foundation-sys"
-version = "0.6.2"
+name = "crossbeam-epoch"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
-name = "crossbeam-deque"
-version = "0.7.1"
+name = "crossbeam-utils"
+version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "crossbeam-epoch"
-version = "0.7.2"
+name = "crossbeam-utils"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "crossbeam-queue"
+name = "digest"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fake-simd"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fnv"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fuchsia-zircon"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "crossbeam-utils"
-version = "0.6.6"
+name = "fuchsia-zircon-sys"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "failure"
-version = "0.1.6"
+name = "futures-channel"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "failure_derive"
-version = "0.1.6"
+name = "futures-core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "fnv"
-version = "1.0.6"
+name = "futures-io"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "foreign-types"
-version = "0.3.2"
+name = "futures-macro"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
+name = "futures-sink"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
+name = "futures-task"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
+name = "futures-timer"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
+name = "futures-util"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
-name = "futures"
-version = "0.1.29"
+name = "generic-array"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "getrandom"
-version = "0.1.12"
+version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -260,7 +360,7 @@ dependencies = [
"glib-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -268,8 +368,8 @@ name = "glib-sys"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -278,27 +378,8 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"glib-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "gst-rust"
-version = "0.1.0"
-dependencies = [
- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "gstreamer-sdp 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gstreamer-webrtc 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "websocket 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -313,7 +394,7 @@ dependencies = [
"gobject-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gstreamer-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -339,8 +420,8 @@ dependencies = [
"glib-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gstreamer-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -350,8 +431,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"glib-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gobject-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -366,7 +447,7 @@ dependencies = [
"gstreamer-sdp 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gstreamer-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gstreamer-webrtc-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -378,41 +459,57 @@ dependencies = [
"gobject-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gstreamer-sdp-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gstreamer-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "httparse"
-version = "1.3.4"
+name = "heck"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
-name = "hyper"
-version = "0.10.16"
+name = "hermit-abi"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
+name = "http"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "httparse"
+version = "1.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
name = "idna"
-version = "0.1.5"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "input_buffer"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -420,7 +517,7 @@ name = "iovec"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -429,6 +526,14 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
+name = "js-sys"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
name = "kernel32-sys"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -438,9 +543,12 @@ dependencies = [
]
[[package]]
-name = "language-tags"
-version = "0.2.2"
+name = "kv-log-macro"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "lazy_static"
@@ -449,26 +557,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libc"
-version = "0.2.65"
+version = "0.2.66"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "lock_api"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "log"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "log"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -482,31 +574,29 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "memoffset"
-version = "0.5.1"
+name = "memchr"
+version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "mime"
-version = "0.2.6"
+name = "memoffset"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "mio"
-version = "0.6.19"
+version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -520,8 +610,8 @@ version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -541,36 +631,23 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "native-tls"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)",
- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "net2"
version = "0.2.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "nodrop"
-version = "0.1.14"
+name = "nom"
+version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "num-integer"
@@ -578,7 +655,7 @@ version = "0.1.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -588,12 +665,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "num-traits"
-version = "0.2.8"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -601,74 +678,59 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.10.1"
+version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "openssl"
-version = "0.10.25"
+name = "once_cell"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "openssl-probe"
-version = "0.1.2"
+name = "opaque-debug"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "openssl-sys"
-version = "0.9.52"
+name = "percent-encoding"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "parking_lot"
-version = "0.9.0"
+name = "pin-project"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "parking_lot_core"
-version = "0.6.2"
+name = "pin-project-internal"
+version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "percent-encoding"
-version = "1.0.1"
+name = "pin-project-lite"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0-alpha.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "pkg-config"
-version = "0.3.16"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
@@ -677,96 +739,73 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "proc-macro2"
-version = "1.0.6"
+name = "proc-macro-error"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "quote"
-version = "1.0.2"
+name = "proc-macro-hack"
+version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "rand"
-version = "0.6.5"
+name = "proc-macro-nested"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "rand"
-version = "0.7.2"
+name = "proc-macro2"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "rand_chacha"
-version = "0.1.1"
+name = "quote"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "rand_chacha"
-version = "0.2.1"
+name = "rand"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "rand_core"
-version = "0.3.1"
+name = "rand_chacha"
+version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -778,85 +817,37 @@ dependencies = [
]
[[package]]
-name = "rand_isaac"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_jitter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_os"
-version = "0.1.3"
+name = "ring"
+version = "0.16.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "rand_pcg"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_xorshift"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
+name = "rustc_version"
+version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.2"
+name = "rustls"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -865,41 +856,17 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "safemem"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "schannel"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "scopeguard"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "security-framework"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "0.3.1"
+name = "sct"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -917,33 +884,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde"
-version = "1.0.101"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "serde_derive"
-version = "1.0.101"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde_json"
-version = "1.0.41"
+version = "1.0.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "sha1"
-version = "0.6.0"
+name = "sha-1"
+version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
name = "slab"
@@ -952,46 +925,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "smallvec"
-version = "0.6.10"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "strsim"
-version = "0.8.0"
+name = "sourcefile"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "syn"
-version = "1.0.5"
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "structopt"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "synstructure"
-version = "0.12.1"
+name = "structopt-derive"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
"quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tempfile"
-version = "3.1.0"
+name = "syn"
+version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1003,289 +978,207 @@ dependencies = [
]
[[package]]
-name = "time"
-version = "0.1.42"
+name = "tungstenite"
+version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "input_buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tokio"
-version = "0.1.22"
+name = "typenum"
+version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-codec"
-version = "0.1.1"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tokio-current-thread"
-version = "0.1.6"
+name = "unicode-normalization"
+version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tokio-executor"
-version = "0.1.8"
+name = "unicode-segmentation"
+version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-fs"
+name = "unicode-width"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-io"
-version = "0.1.12"
+name = "unicode-xid"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-reactor"
-version = "0.1.10"
+name = "untrusted"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-sync"
-version = "0.1.7"
+name = "url"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tokio-tcp"
-version = "0.1.3"
+name = "utf-8"
+version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-threadpool"
-version = "0.1.16"
+name = "version_check"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-timer"
-version = "0.2.11"
+name = "wasi"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
[[package]]
-name = "tokio-tls"
-version = "0.2.1"
+name = "wasm-bindgen"
+version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tokio-udp"
-version = "0.1.5"
+name = "wasm-bindgen-backend"
+version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "tokio-uds"
-version = "0.2.5"
+name = "wasm-bindgen-macro"
+version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "traitobject"
-version = "0.1.0"
+name = "wasm-bindgen-macro-support"
+version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
-name = "typeable"
-version = "0.1.2"
+name = "wasm-bindgen-shared"
+version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "unicase"
-version = "1.4.2"
+name = "wasm-bindgen-webidl"
+version = "0.2.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
+name = "web-sys"
+version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "unicode-normalization"
-version = "0.1.8"
+name = "webpki"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "unicode-width"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "url"
-version = "1.7.2"
+name = "webpki-roots"
+version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
-name = "vcpkg"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "vec_map"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasi"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+name = "webrtc-app"
+version = "0.1.0"
+dependencies = [
+ "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "async-tungstenite 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gstreamer 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gstreamer-sdp 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gstreamer-webrtc 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
[[package]]
-name = "websocket"
-version = "0.23.0"
+name = "weedle"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -1327,38 +1220,48 @@ dependencies = [
]
[metadata]
-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "9267dff192e68f3399525901e709a48c1d3982c9c072fa32f2127a0cb0babf14"
+"checksum async-macros 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "644a5a8de80f2085a1e7e57cd1544a2a7438f6e003c0790999bd43b92a77cdb2"
+"checksum async-std 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "513ee3c49800679a319912340f5601afda9e72848d7dea3a48bab489e8c1a46f"
+"checksum async-task 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de6bd58f7b9cc49032559422595c81cbfcf04db2f2133592f70af19e258a1ced"
+"checksum async-tls 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce6977f57fa68da77ffe5542950d47e9c23d65f5bc7cb0a9f8700996913eec7"
+"checksum async-tungstenite 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c24d1cd50a78e107d277c159ccd1eff90e8d2b2c781b2151d7c98eced08ec38"
"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
-"checksum backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)" = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
-"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
+"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
+"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
+"checksum bumpalo 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad807f2fc2bf185eeb98ff3a901bd46dc5ad58163d0fa4577ba0d25674d71708"
+"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
-"checksum cc 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
+"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
-"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
-"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
-"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9"
-"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
+"checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
+"checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef"
-"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+"checksum futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b6f16056ecbb57525ff698bb955162d0cd03bee84e6241c27ff75c08d8ca5987"
+"checksum futures-channel 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fcae98ca17d102fd8a3603727b9259fcf7fa4239b603d2142926189bc8999b86"
+"checksum futures-core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "79564c427afefab1dfb3298535b21eda083ef7935b4f0ecbfcb121f0aec10866"
+"checksum futures-executor 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e274736563f686a837a0568b478bdabfeaec2dca794b5649b04e2fe1627c231"
+"checksum futures-io 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e676577d229e70952ab25f3945795ba5b16d63ca794ca9d2c860e5595d20b5ff"
+"checksum futures-macro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "52e7c56c15537adb4f76d0b7a76ad131cb4d2f4f32d3b0bcabcbe1c7c5e87764"
+"checksum futures-sink 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "171be33efae63c2d59e6dbba34186fe0d6394fb378069a76dfd80fdcffd43c16"
+"checksum futures-task 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0bae52d6b29cf440e298856fec3965ee6fa71b06aa7495178615953fd669e5f9"
+"checksum futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a1de7508b218029b0f01662ed8f61b1c964b3ae99d6f25462d0f55a595109df6"
+"checksum futures-util 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d66274fb76985d3c62c886d1da7ac4c0903a8c9f754e8fe0f35a6a6cc39e76"
+"checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec"
+"checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b"
"checksum glib-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b86a9169fbc9cf9a0ef315039c2304b09d5c575c5fde7defba3576a0311b863"
"checksum gobject-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61d55bc9202447ca776f6ad0048c36e3312010f66f82ab478e97513e93f3604b"
@@ -1368,108 +1271,93 @@ dependencies = [
"checksum gstreamer-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfc2f6cc9b6a1f5159bfd500310fe431cfb0b74b3af17ce3fdf8353cf586975"
"checksum gstreamer-webrtc 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c4e506822afa68a44d7fad6219e781fd1729d84939978b90a23260c07b182590"
"checksum gstreamer-webrtc-sys 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf7375d6737037e01c6c2342ab30e6ff77cf5e36fc64c81d8d43054b33f4fa7"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+"checksum http 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "2790658cddc82e82b08e25176c431d7015a0adeb1718498715cbd20138a0bf68"
"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
-"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273"
-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
+"checksum input_buffer 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e1b822cc844905551931d6f81608ed5f50a79c1078a4e2b4d42dbc7c1eedfbf"
"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum js-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "1c840fdb2167497b0bd0db43d6dfe61e91637fa72f9d061f8bd17ddc44ba6414"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
+"checksum kv-log-macro 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c54d9f465d530a752e6ebdc217e081a7a614b48cb200f6f0aee21ba6bc9aabb"
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
-"checksum lock_api 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8912e782533a93a167888781b836336a6ca5da6175c05944c86cf28c31104dc"
-"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
-"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
-"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0"
-"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
+"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f"
"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
"checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f"
-"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e"
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
-"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
"checksum num-rational 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2885278d5fe2adc2f75ced642d52d879bffaceb5a2e0b1d4309ffdfb239b454"
-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
-"checksum openssl 0.10.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2f372b2b53ce10fb823a337aaa674e3a7d072b957c6264d0f4ff0bd86e657449"
-"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
-"checksum openssl-sys 0.9.52 (registry+https://github.com/rust-lang/crates.io-index)" = "c977d08e1312e2f7e4b86f9ebaa0ed3b19d1daff75fae88bbb88108afbd801fc"
-"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum pkg-config 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
+"checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4"
+"checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72"
+"checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
+"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+"checksum pin-project 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "94b90146c7216e4cb534069fb91366de4ea0ea353105ee45ed297e2d1619e469"
+"checksum pin-project-internal 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "44ca92f893f0656d3cba8158dd0f2b99b94de256a4a54e870bd6922fcc6c8355"
+"checksum pin-project-lite 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f0af6cbca0e6e3ce8692ee19fb8d734b641899e07b68eb73e9bbbd32f1703991"
+"checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587"
+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
+"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097"
+"checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5"
+"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e"
"checksum proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9c9e470a8dc4aeae2dee2f335e8f533e2d4b347e1434e5671afc49b054592f27"
"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
"checksum rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3ae1b169243eaf61759b8475a998f0a385e42042370f3a7dbaf35246eacc8412"
-"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
-"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
-"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
-"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
+"checksum ring 0.16.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6747f8da1f2b1fabbee1aaa4eb8a11abf9adef0bf58a41cee45db5d59cecdfac"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
-"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
-"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021"
"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
-"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2"
-"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56"
+"checksum sct 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c"
"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
-"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-"checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2"
-"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702"
+"checksum serde_derive 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0"
+"checksum serde_json 1.0.42 (registry+https://github.com/rust-lang/crates.io-index)" = "1a3351dcbc1f067e2c92ab7c3c1f288ad1a4cffc470b5aaddb4c2e0a3ae80043"
+"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
-"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-"checksum synstructure 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
+"checksum smallvec 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ecf3b85f68e8abaa7555aa5abdb1153079387e60b718283d732f03897fcfc86"
+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
+"checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+"checksum structopt 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "30b3a3e93f5ad553c38b3301c8a0a0cec829a36783f6a0c467fc4bf553a5f5bf"
+"checksum structopt-derive 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea692d40005b3ceba90a9fe7a78fa8d4b82b0ce627eebbffc329aab850f3410e"
+"checksum syn 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f89693ae015201f8de93fd96bde2d065f8bfc3f97ce006d5bc9f900b97c0c7c0"
"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
-"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
-"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
-"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac"
-"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af"
-"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
-"checksum tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d"
-"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76"
-"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c"
-"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
-"checksum tokio-tls 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c"
-"checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b"
-"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
-"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
-"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum tungstenite 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8a0c2bd5aeb7dcd2bb32e472c8872759308495e5eccc942e929a513cd8d36110"
+"checksum typenum 1.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
+"checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf"
+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95"
-"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
+"checksum untrusted 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60369ef7a31de49bcb3f6ca728d4ba7300d9a1658f94c727d4cab8c8d9f4aece"
+"checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
+"checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
-"checksum websocket 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b255b190f412e45000c35be7fe9b48b39a2ac5eb90d093d421694e5dae8b335c"
+"checksum wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "29ae32af33bacd663a9a28241abecf01f2be64e6a185c6139b04f18b6385c5f2"
+"checksum wasm-bindgen-backend 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "1845584bd3593442dc0de6e6d9f84454a59a057722f36f005e44665d6ab19d85"
+"checksum wasm-bindgen-macro 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "87fcc747e6b73c93d22c947a6334644d22cfec5abd8b66238484dc2b0aeb9fe4"
+"checksum wasm-bindgen-macro-support 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3dc4b3f2c4078c8c4a5f363b92fcf62604c5913cbd16c6ff5aaf0f74ec03f570"
+"checksum wasm-bindgen-shared 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "ca0b78d6d3be8589b95d1d49cdc0794728ca734adf36d7c9f07e6459508bb53d"
+"checksum wasm-bindgen-webidl 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "3126356474ceb717c8fb5549ae387c9fbf4872818454f4d87708bee997214bb5"
+"checksum web-sys 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "98405c0a2e722ed3db341b4c5b70eb9fe0021621f7350bab76df93b09b649bbf"
+"checksum webpki 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d7e664e770ac0110e2384769bcc59ed19e329d81f555916a6e072714957b81b4"
+"checksum webpki-roots 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a262ae37dd9d60f60dd473d1158f9fbebf110ba7b6a5051c8160460f6043718b"
+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/webrtc/sendrecv/gst-rust/Cargo.toml b/webrtc/sendrecv/gst-rust/Cargo.toml
index d245c7e..413a0b8 100644
--- a/webrtc/sendrecv/gst-rust/Cargo.toml
+++ b/webrtc/sendrecv/gst-rust/Cargo.toml
@@ -1,19 +1,20 @@
[package]
-name = "gst-rust"
+name = "webrtc-app"
version = "0.1.0"
-authors = ["maxmcd <max.t.mcdonnell@gmail.com>"]
+authors = ["Sebastian Dröge <sebastian@centricular.com>"]
+edition = "2018"
[dependencies]
-clap = "2.31.2"
-failure = "0.1.1"
-glib = "0.8"
-gstreamer = "0.14"
-gstreamer-sdp = "0.14"
-gstreamer-webrtc = "0.14"
-lazy_static = "1.0"
+futures = "0.3"
+async-std = "1"
+structopt = { version = "0.3", default-features = false }
+anyhow = "1"
+url = "2"
rand = "0.7"
-serde = "1.0.66"
-serde_derive = "1.0.66"
-serde_json = "1.0.19"
-websocket = "0.23"
-tokio = "0.1"
+async-tungstenite = "0.2"
+gst = { package = "gstreamer", version = "0.14", features = ["v1_14"] }
+gst-webrtc = { package = "gstreamer-webrtc", version = "0.14" }
+gst-sdp = { package = "gstreamer-sdp", version = "0.14", features = ["v1_14"] }
+serde = "1"
+serde_derive = "1"
+serde_json = "1"
diff --git a/webrtc/sendrecv/gst-rust/src/macos_workaround.rs b/webrtc/sendrecv/gst-rust/src/macos_workaround.rs
new file mode 100644
index 0000000..f22be66
--- /dev/null
+++ b/webrtc/sendrecv/gst-rust/src/macos_workaround.rs
@@ -0,0 +1,67 @@
+/// macOS has a specific requirement that there must be a run loop running
+/// on the main thread in order to open windows and use OpenGL.
+
+#[cfg(target_os = "macos")]
+mod runloop {
+ use std::os::raw::c_void;
+ #[repr(C)]
+ pub struct CFRunLoop(*mut c_void);
+
+ #[link(name = "foundation", kind = "framework")]
+ extern "C" {
+ fn CFRunLoopRun();
+ fn CFRunLoopGetMain() -> *mut c_void;
+ fn CFRunLoopStop(l: *mut c_void);
+ }
+
+ impl CFRunLoop {
+ pub fn run() {
+ unsafe {
+ CFRunLoopRun();
+ }
+ }
+
+ pub fn get_main() -> CFRunLoop {
+ unsafe {
+ let r = CFRunLoopGetMain();
+ assert!(!r.is_null());
+ CFRunLoop(r)
+ }
+ }
+
+ pub fn stop(&self) {
+ unsafe { CFRunLoopStop(self.0) }
+ }
+ }
+
+ unsafe impl Send for CFRunLoop {}
+}
+
+/// On macOS this launches the callback function on a thread.
+/// On other platforms it's just executed immediately.
+#[cfg(not(target_os = "macos"))]
+pub fn run<T, F: FnOnce() -> T + Send + 'static>(main: F) -> T
+where
+ T: Send + 'static,
+{
+ main()
+}
+
+#[cfg(target_os = "macos")]
+pub fn run<T, F: FnOnce() -> T + Send + 'static>(main: F) -> T
+where
+ T: Send + 'static,
+{
+ use std::thread;
+
+ let l = runloop::CFRunLoop::get_main();
+ let t = thread::spawn(move || {
+ let res = main();
+ l.stop();
+ res
+ });
+
+ runloop::CFRunLoop::run();
+
+ t.join().unwrap()
+}
diff --git a/webrtc/sendrecv/gst-rust/src/main.rs b/webrtc/sendrecv/gst-rust/src/main.rs
index 01e8e5f..e8e28a8 100644
--- a/webrtc/sendrecv/gst-rust/src/main.rs
+++ b/webrtc/sendrecv/gst-rust/src/main.rs
@@ -1,54 +1,53 @@
-extern crate clap;
-#[macro_use]
-extern crate failure;
-extern crate glib;
-#[macro_use]
-extern crate gstreamer as gst;
-extern crate gstreamer_sdp as gst_sdp;
-extern crate gstreamer_webrtc as gst_webrtc;
-extern crate rand;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate tokio;
-extern crate websocket;
-#[macro_use]
-extern crate lazy_static;
-
-use failure::Error;
-use gst::prelude::*;
-use rand::Rng;
+mod macos_workaround;
+
use std::sync::{Arc, Mutex, Weak};
-use tokio::prelude::*;
-use tokio::sync::mpsc;
-use websocket::message::OwnedMessage;
+
+use rand::prelude::*;
+
+use structopt::StructOpt;
+
+use async_std::prelude::*;
+use async_std::task;
+use futures::channel::mpsc;
+use futures::sink::{Sink, SinkExt};
+use futures::stream::StreamExt;
+
+use async_tungstenite::tungstenite;
+use tungstenite::Error as WsError;
+use tungstenite::Message as WsMessage;
+
+use gst::gst_element_error;
+use gst::prelude::*;
+
+use serde_derive::{Deserialize, Serialize};
+
+use anyhow::{anyhow, bail, Context};
const STUN_SERVER: &str = "stun://stun.l.google.com:19302";
-lazy_static! {
- static ref RTP_CAPS_OPUS: gst::Caps = {
- gst::Caps::new_simple(
- "application/x-rtp",
- &[
- ("media", &"audio"),
- ("encoding-name", &"OPUS"),
- ("payload", &(97i32)),
- ],
- )
- };
- static ref RTP_CAPS_VP8: gst::Caps = {
- gst::Caps::new_simple(
- "application/x-rtp",
- &[
- ("media", &"video"),
- ("encoding-name", &"VP8"),
- ("payload", &(96i32)),
- ],
- )
+// upgrade weak reference or return
+#[macro_export]
+macro_rules! upgrade_weak {
+ ($x:ident, $r:expr) => {{
+ match $x.upgrade() {
+ Some(o) => o,
+ None => return $r,
+ }
+ }};
+ ($x:ident) => {
+ upgrade_weak!($x, ())
};
}
+#[derive(Debug, StructOpt)]
+struct Args {
+ #[structopt(short, long, default_value = "wss://webrtc.nirbheek.in:8443")]
+ server: String,
+ #[structopt(short, long)]
+ peer_id: Option<u32>,
+}
+
+// JSON messages we communicate with
#[derive(Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]
enum JsonMsg {
@@ -64,12 +63,6 @@ enum JsonMsg {
},
}
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-enum MediaType {
- Audio,
- Video,
-}
-
// Strong reference to our application state
#[derive(Debug, Clone)]
struct App(Arc<AppInner>);
@@ -81,43 +74,19 @@ struct AppWeak(Weak<AppInner>);
// Actual application state
#[derive(Debug)]
struct AppInner {
- // None if we wait for a peer to appear
- peer_id: Option<String>,
+ args: Args,
pipeline: gst::Pipeline,
webrtcbin: gst::Element,
- send_msg_tx: Mutex<mpsc::UnboundedSender<OwnedMessage>>,
- rtx: bool,
+ send_msg_tx: Mutex<mpsc::UnboundedSender<WsMessage>>,
}
-// Various error types for the different errors that can happen here
-#[derive(Debug, Fail)]
-#[fail(display = "WebSocket error: {:?}", _0)]
-struct WebSocketError(websocket::WebSocketError);
-
-#[derive(Debug, Fail)]
-#[fail(display = "GStreamer error: {:?}", _0)]
-struct GStreamerError(String);
-
-#[derive(Debug, Fail)]
-#[fail(display = "Peer error: {:?}", _0)]
-struct PeerError(String);
-
-#[derive(Debug, Fail)]
-#[fail(display = "Missing elements {:?}", _0)]
-struct MissingElements(Vec<&'static str>);
+// To be able to access the App's fields directly
+impl std::ops::Deref for App {
+ type Target = AppInner;
-// upgrade weak reference or return
-#[macro_export]
-macro_rules! upgrade_weak {
- ($x:ident, $r:expr) => {{
- match $x.upgrade() {
- Some(o) => o,
- None => return $r,
- }
- }};
- ($x:ident) => {
- upgrade_weak!($x, ())
- };
+ fn deref(&self) -> &AppInner {
+ &self.0
+ }
}
impl AppWeak {
@@ -127,347 +96,84 @@ impl AppWeak {
}
}
-impl Drop for AppInner {
- fn drop(&mut self) {
- // When dropping we need to ensure that the final pipeline state is actually Null
- self.pipeline.set_state(gst::State::Null).unwrap();
- }
-}
-
impl App {
// Downgrade the strong reference to a weak reference
fn downgrade(&self) -> AppWeak {
AppWeak(Arc::downgrade(&self.0))
}
- // Post an error message on the bus to asynchronously handle anything that goes
- // wrong on GStreamer threads
- fn post_error(&self, msg: &str) {
- gst_element_error!(self.0.pipeline, gst::LibraryError::Failed, (msg));
- }
-
- // Send a plain text message asynchronously over the WebSocket connection. This can
- // be called from any thread at any time and would send the actual message from the
- // IO threads of the runtime
- fn send_text_msg(&self, msg: String) -> Result<(), Error> {
- self.0
- .send_msg_tx
- .lock()
- .unwrap()
- .try_send(OwnedMessage::Text(msg))
- .map_err(|_| {
- WebSocketError(websocket::WebSocketError::IoError(std::io::Error::new(
- std::io::ErrorKind::BrokenPipe,
- "Connection Closed",
- )))
- .into()
- })
- }
-
- // Send our SDP offer via the WebSocket connection to the peer as JSON message
- fn send_sdp_offer(&self, offer: &gst_webrtc::WebRTCSessionDescription) -> Result<(), Error> {
- let message = serde_json::to_string(&JsonMsg::Sdp {
- type_: "offer".to_string(),
- sdp: offer.get_sdp().as_text().unwrap(),
- })
- .unwrap();
-
- println!("Sending SDP offer to peer: {}", message);
-
- self.send_text_msg(message)
- }
-
- // Once webrtcbin has create the offer SDP for us, handle it by sending it to the peer via the
- // WebSocket connection
- fn on_offer_created(&self, promise: &gst::Promise) -> Result<(), Error> {
- let reply = match promise.wait() {
- gst::PromiseResult::Replied => promise.get_reply().unwrap(),
- err => {
- return Err(GStreamerError(format!(
- "Offer creation future got no reponse: {:?}",
- err
- ))
- .into());
- }
- };
-
- let offer = reply
- .get_value("offer")
- .unwrap()
- .get::<gst_webrtc::WebRTCSessionDescription>()
- .expect("Invalid argument");
- self.0
- .webrtcbin
- .emit("set-local-description", &[&offer, &None::<gst::Promise>])
- .unwrap();
-
- self.send_sdp_offer(&offer)
- }
-
- // Send our SDP answer via the WebSocket connection to the peer as JSON message
- fn send_sdp_answer(&self, offer: &gst_webrtc::WebRTCSessionDescription) -> Result<(), Error> {
- let message = serde_json::to_string(&JsonMsg::Sdp {
- type_: "answer".to_string(),
- sdp: offer.get_sdp().as_text().unwrap(),
- })
- .unwrap();
-
- println!("Sending SDP answer to peer: {}", message);
-
- self.send_text_msg(message)
- }
-
- // Once webrtcbin has create the answer SDP for us, handle it by sending it to the peer via the
- // WebSocket connection
- fn on_answer_created(&self, promise: &gst::Promise) -> Result<(), Error> {
- let reply = match promise.wait() {
- gst::PromiseResult::Replied => promise.get_reply().unwrap(),
- err => {
- return Err(GStreamerError(format!(
- "Offer creation future got no reponse: {:?}",
- err
- ))
- .into());
- }
- };
-
- let answer = reply
- .get_value("answer")
- .unwrap()
- .get::<gst_webrtc::WebRTCSessionDescription>()
- .expect("Invalid argument");
- self.0
- .webrtcbin
- .emit("set-local-description", &[&answer, &None::<gst::Promise>])
- .unwrap();
-
- self.send_sdp_answer(&answer)
- }
-
- // Whenever webrtcbin tells us that (re-)negotiation is needed, simply ask
- // for a new offer SDP from webrtcbin without any customization and then
- // asynchronously send it to the peer via the WebSocket connection
- fn on_negotiation_needed(&self) -> Result<(), Error> {
- println!("Starting negotiation");
-
- let app_clone = self.downgrade();
- let promise = gst::Promise::new_with_change_func(move |promise| {
- let app = upgrade_weak!(app_clone);
-
- if let Err(err) = app.on_offer_created(promise) {
- app.post_error(format!("Failed to send SDP offer: {:?}", err).as_str());
- }
+ fn new(
+ args: Args,
+ ) -> Result<
+ (
+ Self,
+ impl Stream<Item = gst::Message>,
+ impl Stream<Item = WsMessage>,
+ ),
+ anyhow::Error,
+ > {
+ // Create the GStreamer pipeline
+ let pipeline = gst::parse_launch(
+ "videotestsrc pattern=ball is-live=true ! vp8enc deadline=1 ! rtpvp8pay pt=96 ! webrtcbin. \
+ audiotestsrc is-live=true ! opusenc ! rtpopuspay pt=97 ! webrtcbin. \
+ webrtcbin name=webrtcbin"
+ )?;
+
+ // Downcast from gst::Element to gst::Pipeline
+ let pipeline = pipeline
+ .downcast::<gst::Pipeline>()
+ .expect("not a pipeline");
+
+ // Get access to the webrtcbin by name
+ let webrtcbin = pipeline
+ .get_by_name("webrtcbin")
+ .expect("can't find webrtcbin");
+
+ // Set some properties on webrtcbin
+ webrtcbin.set_property_from_str("stun-server", STUN_SERVER);
+ webrtcbin.set_property_from_str("bundle-policy", "max-bundle");
+
+ let bus = pipeline.get_bus().unwrap();
+
+ // Send our bus messages via a futures channel to be handled asynchronously
+ let (send_gst_msg_tx, send_gst_msg_rx) = mpsc::unbounded::<gst::Message>();
+ let send_gst_msg_tx = Mutex::new(send_gst_msg_tx);
+ bus.set_sync_handler(move |_, msg| {
+ let _ = send_gst_msg_tx.lock().unwrap().unbounded_send(msg.clone());
+ gst::BusSyncReply::Drop
});
- self.0
- .webrtcbin
- .emit("create-offer", &[&None::<gst::Structure>, &promise])
- .unwrap();
-
- Ok(())
- }
-
- // Handle a newly decoded stream from decodebin, i.e. one of the streams that the peer is
- // sending to us. Connect it to newly create sink elements and converters.
- fn handle_media_stream(&self, pad: &gst::Pad, media_type: MediaType) -> Result<(), Error> {
- println!("Trying to handle stream {:?}", media_type);
-
- let (q, conv, sink) = match media_type {
- MediaType::Audio => {
- let q = gst::ElementFactory::make("queue", None).unwrap();
- let conv = gst::ElementFactory::make("audioconvert", None).unwrap();
- let sink = gst::ElementFactory::make("autoaudiosink", None).unwrap();
- let resample = gst::ElementFactory::make("audioresample", None).unwrap();
-
- self.0
- .pipeline
- .add_many(&[&q, &conv, &resample, &sink])
- .unwrap();
- gst::Element::link_many(&[&q, &conv, &resample, &sink])?;
-
- resample.sync_state_with_parent()?;
-
- (q, conv, sink)
- }
- MediaType::Video => {
- let q = gst::ElementFactory::make("queue", None).unwrap();
- let conv = gst::ElementFactory::make("videoconvert", None).unwrap();
- let sink = gst::ElementFactory::make("autovideosink", None).unwrap();
-
- self.0.pipeline.add_many(&[&q, &conv, &sink]).unwrap();
- gst::Element::link_many(&[&q, &conv, &sink])?;
-
- (q, conv, sink)
- }
- };
-
- q.sync_state_with_parent()?;
- conv.sync_state_with_parent()?;
- sink.sync_state_with_parent()?;
-
- let qpad = q.get_static_pad("sink").unwrap();
- pad.link(&qpad)?;
-
- Ok(())
- }
-
- // Handle a newly decoded decodebin stream and depending on its type, create the relevant
- // elements or simply ignore it
- fn on_incoming_decodebin_stream(&self, pad: &gst::Pad) -> Result<(), Error> {
- let caps = pad.get_current_caps().unwrap();
- let name = caps.get_structure(0).unwrap().get_name();
-
- if name.starts_with("video/") {
- self.handle_media_stream(&pad, MediaType::Video)
- } else if name.starts_with("audio/") {
- self.handle_media_stream(&pad, MediaType::Audio)
- } else {
- println!("Unknown pad {:?}, ignoring", pad);
- Ok(())
- }
- }
-
- // Whenever there's a new incoming, encoded stream from the peer create a new decodebin
- fn on_incoming_stream(&self, pad: &gst::Pad) -> Result<(), Error> {
- // Early return for the source pads we're adding ourselves
- if pad.get_direction() != gst::PadDirection::Src {
- return Ok(());
- }
+ // Channel for outgoing WebSocket messages from other threads
+ let (send_ws_msg_tx, send_ws_msg_rx) = mpsc::unbounded::<WsMessage>();
- let decodebin = gst::ElementFactory::make("decodebin", None).unwrap();
- let app_clone = self.downgrade();
- decodebin.connect_pad_added(move |_decodebin, pad| {
- let app = upgrade_weak!(app_clone);
-
- if let Err(err) = app.on_incoming_decodebin_stream(pad) {
- app.post_error(format!("Failed to handle decoded stream: {:?}", err).as_str());
- }
+ // Asynchronously set the pipeline to Playing
+ pipeline.call_async(|pipeline| {
+ pipeline
+ .set_state(gst::State::Playing)
+ .expect("Couldn't set pipeline to Playing");
});
- self.0.pipeline.add(&decodebin).unwrap();
-
- decodebin.sync_state_with_parent()?;
-
- let sinkpad = decodebin.get_static_pad("sink").unwrap();
- pad.link(&sinkpad).unwrap();
-
- Ok(())
- }
-
- // Asynchronously send ICE candidates to the peer via the WebSocket connection as a JSON
- // message
- fn send_ice_candidate_message(&self, mlineindex: u32, candidate: String) -> Result<(), Error> {
- let message = serde_json::to_string(&JsonMsg::Ice {
- candidate,
- sdp_mline_index: mlineindex,
- })
- .unwrap();
-
- self.send_text_msg(message)
- }
-
- // Create a video test source plus encoder for the video stream we send to the peer
- fn add_video_source(&self) -> Result<(), Error> {
- let videotestsrc = gst::ElementFactory::make("videotestsrc", None).unwrap();
- let videoconvert = gst::ElementFactory::make("videoconvert", None).unwrap();
- let queue = gst::ElementFactory::make("queue", None).unwrap();
- let vp8enc = gst::ElementFactory::make("vp8enc", None).unwrap();
-
- videotestsrc.set_property_from_str("pattern", "ball");
- videotestsrc.set_property("is-live", &true).unwrap();
- vp8enc.set_property("deadline", &1i64).unwrap();
-
- let rtpvp8pay = gst::ElementFactory::make("rtpvp8pay", None).unwrap();
- let queue2 = gst::ElementFactory::make("queue", None).unwrap();
-
- self.0
- .pipeline
- .add_many(&[
- &videotestsrc,
- &videoconvert,
- &queue,
- &vp8enc,
- &rtpvp8pay,
- &queue2,
- ])
- .unwrap();
-
- gst::Element::link_many(&[
- &videotestsrc,
- &videoconvert,
- &queue,
- &vp8enc,
- &rtpvp8pay,
- &queue2,
- ])?;
-
- queue2.link_filtered(&self.0.webrtcbin, Some(&*RTP_CAPS_VP8))?;
-
- Ok(())
- }
-
- // Create a audio test source plus encoders for the audio stream we send to the peer
- fn add_audio_source(&self) -> Result<(), Error> {
- let audiotestsrc = gst::ElementFactory::make("audiotestsrc", None).unwrap();
- let queue = gst::ElementFactory::make("queue", None).unwrap();
- let audioconvert = gst::ElementFactory::make("audioconvert", None).unwrap();
- let audioresample = gst::ElementFactory::make("audioresample", None).unwrap();
- let queue2 = gst::ElementFactory::make("queue", None).unwrap();
- let opusenc = gst::ElementFactory::make("opusenc", None).unwrap();
- let rtpopuspay = gst::ElementFactory::make("rtpopuspay", None).unwrap();
- let queue3 = gst::ElementFactory::make("queue", None).unwrap();
-
- audiotestsrc.set_property_from_str("wave", "red-noise");
- audiotestsrc.set_property("is-live", &true).unwrap();
-
- self.0
- .pipeline
- .add_many(&[
- &audiotestsrc,
- &queue,
- &audioconvert,
- &audioresample,
- &queue2,
- &opusenc,
- &rtpopuspay,
- &queue3,
- ])
- .unwrap();
-
- gst::Element::link_many(&[
- &audiotestsrc,
- &queue,
- &audioconvert,
- &audioresample,
- &queue2,
- &opusenc,
- &rtpopuspay,
- &queue3,
- ])?;
-
- queue3.link_filtered(&self.0.webrtcbin, Some(&*RTP_CAPS_OPUS))?;
-
- Ok(())
- }
-
- // Finish creating our pipeline and actually start it once the connection with the peer is
- // there
- fn setup_pipeline(&self) -> Result<(), Error> {
- println!("Start pipeline");
-
- // Whenever (re-)negotiation is needed, do so but this is only needed if
- // we send the initial offer
- if self.0.peer_id.is_some() {
- let app_clone = self.downgrade();
- self.0
- .webrtcbin
+ let app = App(Arc::new(AppInner {
+ args,
+ pipeline,
+ webrtcbin,
+ send_msg_tx: Mutex::new(send_ws_msg_tx),
+ }));
+
+ // Connect to on-negotiation-needed to handle sending an Offer
+ if app.args.peer_id.is_some() {
+ let app_clone = app.downgrade();
+ app.webrtcbin
.connect("on-negotiation-needed", false, move |values| {
let _webrtc = values[0].get::<gst::Element>().unwrap();
let app = upgrade_weak!(app_clone, None);
-
if let Err(err) = app.on_negotiation_needed() {
- app.post_error(format!("Failed to start negotiation: {:?}", err).as_str());
+ gst_element_error!(
+ app.pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to negotiate: {:?}", err)
+ );
}
None
@@ -476,9 +182,8 @@ impl App {
}
// Whenever there is a new ICE candidate, send it to the peer
- let app_clone = self.downgrade();
- self.0
- .webrtcbin
+ let app_clone = app.downgrade();
+ app.webrtcbin
.connect("on-ice-candidate", false, move |values| {
let _webrtc = values[0].get::<gst::Element>().expect("Invalid argument");
let mlineindex = values[1].get::<u32>().expect("Invalid argument");
@@ -486,8 +191,12 @@ impl App {
let app = upgrade_weak!(app_clone, None);
- if let Err(err) = app.send_ice_candidate_message(mlineindex, candidate) {
- app.post_error(format!("Failed to send ICE candidate: {:?}", err).as_str());
+ if let Err(err) = app.on_ice_candidate(mlineindex, candidate) {
+ gst_element_error!(
+ app.pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to send ICE candidate: {:?}", err)
+ );
}
None
@@ -495,116 +204,204 @@ impl App {
.unwrap();
// Whenever there is a new stream incoming from the peer, handle it
- let app_clone = self.downgrade();
- self.0.webrtcbin.connect_pad_added(move |_webrtc, pad| {
+ let app_clone = app.downgrade();
+ app.webrtcbin.connect_pad_added(move |_webrtc, pad| {
let app = upgrade_weak!(app_clone);
if let Err(err) = app.on_incoming_stream(pad) {
- app.post_error(format!("Failed to handle incoming stream: {:?}", err).as_str());
+ gst_element_error!(
+ app.pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to handle incoming stream: {:?}", err)
+ );
}
});
- // Create our audio/video sources we send to the peer
- self.add_video_source()?;
- self.add_audio_source()?;
-
- // Enable RTX only for video, Chrome etc al fail SDP negotiation otherwise
- if self.0.rtx {
- let transceiver = self
- .0
- .webrtcbin
- .emit("get-transceiver", &[&0i32])
- .unwrap()
- .unwrap()
- .get::<glib::Object>()
- .unwrap();
- transceiver.set_property("do-nack", &true).unwrap();
- }
+ // Asynchronously set the pipeline to Playing
+ app.pipeline.call_async(|pipeline| {
+ // If this fails, post an error on the bus so we exit
+ if pipeline.set_state(gst::State::Playing).is_err() {
+ gst_element_error!(
+ pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to set pipeline to Playing")
+ );
+ }
+ });
- Ok(())
+ Ok((app, send_gst_msg_rx, send_ws_msg_rx))
}
- // Send ID of the peer we want to talk to via the WebSocket connection
- fn setup_call(&self, peer_id: &str) -> Result<OwnedMessage, Error> {
- println!("Setting up signalling server call with {}", peer_id);
- Ok(OwnedMessage::Text(format!("SESSION {}", peer_id)))
+ // Handle WebSocket messages, both our own as well as WebSocket protocol messages
+ fn handle_websocket_message(&self, msg: &str) -> Result<(), anyhow::Error> {
+ if msg.starts_with("ERROR") {
+ bail!("Got error message: {}", msg);
+ }
+
+ let json_msg: JsonMsg = serde_json::from_str(msg)?;
+
+ match json_msg {
+ JsonMsg::Sdp { type_, sdp } => self.handle_sdp(&type_, &sdp),
+ JsonMsg::Ice {
+ sdp_mline_index,
+ candidate,
+ } => self.handle_ice(sdp_mline_index, &candidate),
+ }
}
- // Once we got the HELLO message from the WebSocket connection, start setting up the call
- fn handle_hello(&self) -> Result<Option<OwnedMessage>, Error> {
- if let Some(ref peer_id) = self.0.peer_id {
- self.setup_call(peer_id).map(Some)
- } else {
- // Wait for a peer to appear
- Ok(None)
+ // Handle GStreamer messages coming from the pipeline
+ fn handle_pipeline_message(&self, message: &gst::Message) -> Result<(), anyhow::Error> {
+ use gst::message::MessageView;
+
+ match message.view() {
+ MessageView::Error(err) => bail!(
+ "Error from element {}: {} ({})",
+ err.get_src()
+ .map(|s| String::from(s.get_path_string()))
+ .unwrap_or_else(|| String::from("None")),
+ err.get_error(),
+ err.get_debug().unwrap_or_else(|| String::from("None")),
+ ),
+ MessageView::Warning(warning) => {
+ println!("Warning: \"{}\"", warning.get_debug().unwrap());
+ }
+ _ => (),
}
+
+ Ok(())
}
- // Once the session is set up correctly we start our pipeline
- fn handle_session_ok(&self) -> Result<Option<OwnedMessage>, Error> {
- self.setup_pipeline()?;
+ // Whenever webrtcbin tells us that (re-)negotiation is needed, simply ask
+ // for a new offer SDP from webrtcbin without any customization and then
+ // asynchronously send it to the peer via the WebSocket connection
+ fn on_negotiation_needed(&self) -> Result<(), anyhow::Error> {
+ println!("starting negotiation");
- // And finally asynchronously start our pipeline
let app_clone = self.downgrade();
- self.0.pipeline.call_async(move |pipeline| {
+ let promise = gst::Promise::new_with_change_func(move |promise| {
let app = upgrade_weak!(app_clone);
- if let Err(err) = pipeline.set_state(gst::State::Playing) {
- app.post_error(format!("Failed to set pipeline to Playing: {:?}", err).as_str());
+ if let Err(err) = app.on_offer_created(promise) {
+ gst_element_error!(
+ app.pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to send SDP offer: {:?}", err)
+ );
}
});
- Ok(None)
+ self.webrtcbin
+ .emit("create-offer", &[&None::<gst::Structure>, &promise])
+ .unwrap();
+
+ Ok(())
+ }
+
+ // Once webrtcbin has create the offer SDP for us, handle it by sending it to the peer via the
+ // WebSocket connection
+ fn on_offer_created(&self, promise: &gst::Promise) -> Result<(), anyhow::Error> {
+ let reply = match promise.wait() {
+ gst::PromiseResult::Replied => promise.get_reply().unwrap(),
+ err => {
+ bail!("Offer creation future got no reponse: {:?}", err);
+ }
+ };
+
+ let offer = reply
+ .get_value("offer")
+ .unwrap()
+ .get::<gst_webrtc::WebRTCSessionDescription>()
+ .expect("Invalid argument");
+ self.webrtcbin
+ .emit("set-local-description", &[&offer, &None::<gst::Promise>])
+ .unwrap();
+
+ println!(
+ "sending SDP offer to peer: {}",
+ offer.get_sdp().as_text().unwrap()
+ );
+
+ let message = serde_json::to_string(&JsonMsg::Sdp {
+ type_: "offer".to_string(),
+ sdp: offer.get_sdp().as_text().unwrap(),
+ })
+ .unwrap();
+
+ self.send_msg_tx
+ .lock()
+ .unwrap()
+ .unbounded_send(WsMessage::Text(message))
+ .with_context(|| format!("Failed to send SDP offer"))?;
+
+ Ok(())
}
- // Handle errors from the peer send to us via the WebSocket connection
- fn handle_error(&self, msg: &str) -> Result<Option<OwnedMessage>, Error> {
- println!("Got error message! {}", msg);
+ // Once webrtcbin has create the answer SDP for us, handle it by sending it to the peer via the
+ // WebSocket connection
+ fn on_answer_created(&self, promise: &gst::Promise) -> Result<(), anyhow::Error> {
+ let reply = match promise.wait() {
+ gst::PromiseResult::Replied => promise.get_reply().unwrap(),
+ err => {
+ bail!("Answer creation future got no reponse: {:?}", err);
+ }
+ };
+
+ let answer = reply
+ .get_value("answer")
+ .unwrap()
+ .get::<gst_webrtc::WebRTCSessionDescription>()
+ .expect("Invalid argument");
+ self.webrtcbin
+ .emit("set-local-description", &[&answer, &None::<gst::Promise>])
+ .unwrap();
- Err(PeerError(msg.into()).into())
+ println!(
+ "sending SDP answer to peer: {}",
+ answer.get_sdp().as_text().unwrap()
+ );
+
+ let message = serde_json::to_string(&JsonMsg::Sdp {
+ type_: "answer".to_string(),
+ sdp: answer.get_sdp().as_text().unwrap(),
+ })
+ .unwrap();
+
+ self.send_msg_tx
+ .lock()
+ .unwrap()
+ .unbounded_send(WsMessage::Text(message))
+ .with_context(|| format!("Failed to send SDP answer"))?;
+
+ Ok(())
}
// Handle incoming SDP answers from the peer
- fn handle_sdp(&self, type_: &str, sdp: &str) -> Result<Option<OwnedMessage>, Error> {
+ fn handle_sdp(&self, type_: &str, sdp: &str) -> Result<(), anyhow::Error> {
if type_ == "answer" {
print!("Received answer:\n{}\n", sdp);
let ret = gst_sdp::SDPMessage::parse_buffer(sdp.as_bytes())
- .map_err(|_| GStreamerError("Failed to parse SDP answer".into()))?;
+ .map_err(|_| anyhow!("Failed to parse SDP answer"))?;
let answer =
gst_webrtc::WebRTCSessionDescription::new(gst_webrtc::WebRTCSDPType::Answer, ret);
- self.0
- .webrtcbin
+
+ self.webrtcbin
.emit("set-remote-description", &[&answer, &None::<gst::Promise>])
.unwrap();
- Ok(None)
+ Ok(())
} else if type_ == "offer" {
print!("Received offer:\n{}\n", sdp);
- // FIXME: We need to do negotiation here based on what the peer offers us in the SDP
- // and what we can produce. For example all RTCP or RTP header extensions we don't
- // understand have to be removed, and similarly we have to negotiate the codecs.
-
- // Need to start the pipeline as a first step here
- self.setup_pipeline()?;
-
let ret = gst_sdp::SDPMessage::parse_buffer(sdp.as_bytes())
- .map_err(|_| GStreamerError("Failed to parse SDP offer".into()))?;
+ .map_err(|_| anyhow!("Failed to parse SDP offer"))?;
// And then asynchronously start our pipeline and do the next steps. The
// pipeline needs to be started before we can create an answer
let app_clone = self.downgrade();
- self.0.pipeline.call_async(move |pipeline| {
+ self.pipeline.call_async(move |_pipeline| {
let app = upgrade_weak!(app_clone);
- if let Err(err) = pipeline.set_state(gst::State::Playing) {
- app.post_error(
- format!("Failed to set pipeline to Playing: {:?}", err).as_str(),
- );
- return;
- }
-
let offer = gst_webrtc::WebRTCSessionDescription::new(
gst_webrtc::WebRTCSDPType::Offer,
ret,
@@ -620,7 +417,11 @@ impl App {
let app = upgrade_weak!(app_clone);
if let Err(err) = app.on_answer_created(promise) {
- app.post_error(format!("Failed to send SDP answer: {:?}", err).as_str());
+ gst_element_error!(
+ app.pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to send SDP answer: {:?}", err)
+ );
}
});
@@ -630,144 +431,184 @@ impl App {
.unwrap();
});
- Ok(None)
+ Ok(())
} else {
- Err(PeerError(format!("Sdp type is not \"answer\" but \"{}\"", type_)).into())
+ bail!("Sdp type is not \"answer\" but \"{}\"", type_)
}
}
// Handle incoming ICE candidates from the peer by passing them to webrtcbin
- fn handle_ice(
- &self,
- sdp_mline_index: u32,
- candidate: &str,
- ) -> Result<Option<OwnedMessage>, Error> {
- self.0
- .webrtcbin
+ fn handle_ice(&self, sdp_mline_index: u32, candidate: &str) -> Result<(), anyhow::Error> {
+ self.webrtcbin
.emit("add-ice-candidate", &[&sdp_mline_index, &candidate])
.unwrap();
- Ok(None)
+ Ok(())
}
- // Handle messages we got from the peer via the WebSocket connection
- fn on_message(&self, msg: &str) -> Result<Option<OwnedMessage>, Error> {
- match msg {
- "HELLO" => self.handle_hello(),
+ // Asynchronously send ICE candidates to the peer via the WebSocket connection as a JSON
+ // message
+ fn on_ice_candidate(&self, mlineindex: u32, candidate: String) -> Result<(), anyhow::Error> {
+ let message = serde_json::to_string(&JsonMsg::Ice {
+ candidate,
+ sdp_mline_index: mlineindex,
+ })
+ .unwrap();
- "SESSION_OK" => self.handle_session_ok(),
+ self.send_msg_tx
+ .lock()
+ .unwrap()
+ .unbounded_send(WsMessage::Text(message))
+ .with_context(|| format!("Failed to send ICE candidate"))?;
- x if x.starts_with("ERROR") => self.handle_error(msg),
+ Ok(())
+ }
- _ => {
- let json_msg: JsonMsg = serde_json::from_str(msg)?;
+ // Whenever there's a new incoming, encoded stream from the peer create a new decodebin
+ fn on_incoming_stream(&self, pad: &gst::Pad) -> Result<(), anyhow::Error> {
+ // Early return for the source pads we're adding ourselves
+ if pad.get_direction() != gst::PadDirection::Src {
+ return Ok(());
+ }
- match json_msg {
- JsonMsg::Sdp { type_, sdp } => self.handle_sdp(&type_, &sdp),
- JsonMsg::Ice {
- sdp_mline_index,
- candidate,
- } => self.handle_ice(sdp_mline_index, &candidate),
- }
+ let decodebin = gst::ElementFactory::make("decodebin", None).unwrap();
+ let app_clone = self.downgrade();
+ decodebin.connect_pad_added(move |_decodebin, pad| {
+ let app = upgrade_weak!(app_clone);
+
+ if let Err(err) = app.on_incoming_decodebin_stream(pad) {
+ gst_element_error!(
+ app.pipeline,
+ gst::LibraryError::Failed,
+ ("Failed to handle decoded stream: {:?}", err)
+ );
}
- }
- }
+ });
- // Handle WebSocket messages, both our own as well as WebSocket protocol messages
- fn handle_websocket_message(
- &self,
- message: OwnedMessage,
- ) -> Result<Option<OwnedMessage>, Error> {
- match message {
- OwnedMessage::Close(_) => Ok(Some(OwnedMessage::Close(None))),
-
- OwnedMessage::Ping(data) => Ok(Some(OwnedMessage::Pong(data))),
-
- OwnedMessage::Text(msg) => self.on_message(&msg),
- OwnedMessage::Binary(_) => Ok(None),
- OwnedMessage::Pong(_) => Ok(None),
- }
+ self.pipeline.add(&decodebin).unwrap();
+ decodebin.sync_state_with_parent().unwrap();
+
+ let sinkpad = decodebin.get_static_pad("sink").unwrap();
+ pad.link(&sinkpad).unwrap();
+
+ Ok(())
}
- // Handle GStreamer messages coming from the pipeline
- fn handle_pipeline_message(
- &self,
- message: &gst::Message,
- ) -> Result<Option<OwnedMessage>, Error> {
- use gst::message::MessageView;
+ // Handle a newly decoded decodebin stream and depending on its type, create the relevant
+ // elements or simply ignore it
+ fn on_incoming_decodebin_stream(&self, pad: &gst::Pad) -> Result<(), anyhow::Error> {
+ let caps = pad.get_current_caps().unwrap();
+ let name = caps.get_structure(0).unwrap().get_name();
- match message.view() {
- MessageView::Error(err) => Err(GStreamerError(format!(
- "Error from element {}: {} ({})",
- err.get_src()
- .map(|s| String::from(s.get_path_string()))
- .unwrap_or_else(|| String::from("None")),
- err.get_error(),
- err.get_debug().unwrap_or_else(|| String::from("None")),
- ))
- .into()),
- MessageView::Warning(warning) => {
- println!("Warning: \"{}\"", warning.get_debug().unwrap());
- Ok(None)
- }
- _ => Ok(None),
- }
+ let sink = if name.starts_with("video/") {
+ gst::parse_bin_from_description(
+ "queue ! videoconvert ! videoscale ! autovideosink",
+ true,
+ )?
+ } else if name.starts_with("audio/") {
+ gst::parse_bin_from_description(
+ "queue ! audioconvert ! audioresample ! autoaudiosink",
+ true,
+ )?
+ } else {
+ println!("Unknown pad {:?}, ignoring", pad);
+ return Ok(());
+ };
+
+ self.pipeline.add(&sink).unwrap();
+ sink.sync_state_with_parent()
+ .with_context(|| format!("can't start sink for stream {:?}", caps))?;
+
+ let sinkpad = sink.get_static_pad("sink").unwrap();
+ pad.link(&sinkpad)
+ .with_context(|| format!("can't link sink for stream {:?}", caps))?;
+
+ Ok(())
}
+}
- // Entry-point to start everything
- fn register_with_server(&self) {
- let our_id = rand::thread_rng().gen_range(10, 10_000);
- println!("Registering id {} with server", our_id);
- self.send_text_msg(format!("HELLO {}", our_id)).unwrap();
+// Make sure to shut down the pipeline when it goes out of scope
+// to release any system resources
+impl Drop for AppInner {
+ fn drop(&mut self) {
+ let _ = self.pipeline.set_state(gst::State::Null);
}
}
-fn parse_args() -> (String, Option<String>, bool) {
- let matches = clap::App::new("Sendrecv rust")
- .arg(
- clap::Arg::with_name("peer-id")
- .help("String ID of the peer to connect to")
- .long("peer-id")
- .required(false)
- .takes_value(true),
- )
- .arg(
- clap::Arg::with_name("server")
- .help("Signalling server to connect to")
- .long("server")
- .required(false)
- .takes_value(true),
- )
- .arg(
- clap::Arg::with_name("rtx")
- .help("Enable retransmissions (RTX)")
- .long("rtx")
- .required(false),
- )
- .get_matches();
-
- let server = matches
- .value_of("server")
- .unwrap_or("wss://webrtc.nirbheek.in:8443");
-
- let peer_id = matches.value_of("peer-id");
-
- let rtx = matches.is_present("rtx");
-
- (server.to_string(), peer_id.map(String::from), rtx)
+async fn run(
+ args: Args,
+ ws: impl Sink<WsMessage, Error = WsError> + Stream<Item = Result<WsMessage, WsError>>,
+) -> Result<(), anyhow::Error> {
+ // Split the websocket into the Sink and Stream
+ let (mut ws_sink, ws_stream) = ws.split();
+ // Fuse the Stream, required for the select macro
+ let mut ws_stream = ws_stream.fuse();
+
+ // Create our application state
+ let (app, send_gst_msg_rx, send_ws_msg_rx) = App::new(args)?;
+
+ let mut send_gst_msg_rx = send_gst_msg_rx.fuse();
+ let mut send_ws_msg_rx = send_ws_msg_rx.fuse();
+
+ // And now let's start our message loop
+ loop {
+ let ws_msg = futures::select! {
+ // Handle the WebSocket messages here
+ ws_msg = ws_stream.select_next_some() => {
+ match ws_msg? {
+ WsMessage::Close(_) => {
+ println!("peer disconnected");
+ break
+ },
+ WsMessage::Ping(data) => Some(WsMessage::Pong(data)),
+ WsMessage::Pong(_) => None,
+ WsMessage::Binary(_) => None,
+ WsMessage::Text(text) => {
+ app.handle_websocket_message(&text)?;
+ None
+ },
+ }
+ },
+ // Pass the GStreamer messages to the application control logic
+ gst_msg = send_gst_msg_rx.select_next_some() => {
+ app.handle_pipeline_message(&gst_msg)?;
+ None
+ },
+ // Handle WebSocket messages we created asynchronously
+ // to send them out now
+ ws_msg = send_ws_msg_rx.select_next_some() => Some(ws_msg),
+ // Once we're done, break the loop and return
+ complete => break,
+ };
+
+ // If there's a message to send out, do so now
+ if let Some(ws_msg) = ws_msg {
+ ws_sink.send(ws_msg).await?;
+ }
+ }
+
+ Ok(())
}
-fn check_plugins() -> Result<(), Error> {
+// Check if all GStreamer plugins we require are available
+fn check_plugins() -> Result<(), anyhow::Error> {
let needed = [
+ "videotestsrc",
+ "audiotestsrc",
+ "videoconvert",
+ "audioconvert",
+ "autodetect",
"opus",
"vpx",
- "nice",
"webrtc",
+ "nice",
"dtls",
"srtp",
"rtpmanager",
- "videotestsrc",
- "audiotestsrc",
+ "rtp",
+ "playback",
+ "videoscale",
+ "audioresample",
];
let registry = gst::Registry::get();
@@ -778,101 +619,60 @@ fn check_plugins() -> Result<(), Error> {
.collect::<Vec<_>>();
if !missing.is_empty() {
- Err(MissingElements(missing))?
+ bail!("Missing plugins: {:?}", missing);
} else {
Ok(())
}
}
-fn main() {
- gst::init().unwrap();
- if let Err(err) = check_plugins() {
- println!("{:?}", err);
- return;
- }
+async fn async_main() -> Result<(), anyhow::Error> {
+ // Initialize GStreamer first
+ gst::init()?;
- let (server, peer_id, rtx) = parse_args();
+ check_plugins()?;
- let mut runtime = tokio::runtime::Runtime::new().unwrap();
+ let args = Args::from_args();
- println!("Connecting to server {}", server);
- let res = runtime.block_on(
- websocket::client::ClientBuilder::new(&server)
- .unwrap()
- .async_connect(None)
- .map_err(|err| Error::from(WebSocketError(err)))
- .and_then(move |(stream, _)| {
- println!("connected");
-
- // Create basic pipeline
- let pipeline = gst::Pipeline::new(Some("main"));
- let webrtcbin = gst::ElementFactory::make("webrtcbin", None).unwrap();
- pipeline.add(&webrtcbin).unwrap();
-
- webrtcbin.set_property_from_str("stun-server", STUN_SERVER);
- webrtcbin.set_property_from_str("bundle-policy", "max-bundle");
-
- let bus = pipeline.get_bus().unwrap();
-
- // Send our bus messages via a futures channel to be handled asynchronously
- let (send_gst_msg_tx, send_gst_msg_rx) = mpsc::unbounded_channel::<gst::Message>();
- let send_gst_msg_tx = Mutex::new(send_gst_msg_tx);
- bus.set_sync_handler(move |_, msg| {
- let _ = send_gst_msg_tx.lock().unwrap().try_send(msg.clone());
- gst::BusSyncReply::Drop
- });
+ // Connect to the given server
+ let url = url::Url::parse(&args.server)?;
+ let (mut ws, _) = async_tungstenite::connect_async(url).await?;
- // Create our application control logic
- let (send_ws_msg_tx, send_ws_msg_rx) = mpsc::unbounded_channel::<OwnedMessage>();
- let app = App(Arc::new(AppInner {
- peer_id,
- pipeline,
- webrtcbin,
- send_msg_tx: Mutex::new(send_ws_msg_tx),
- rtx,
- }));
-
- // Start registration process with the server. This will insert a
- // message into the send_ws_msg channel that will then be sent later
- app.register_with_server();
-
- // Split the stream into the receive part (stream) and send part (sink)
- let (sink, stream) = stream.split();
-
- // Pass the WebSocket messages to our application control logic
- // and convert them into potential messages to send out
- let app_clone = app.clone();
- let ws_messages = stream
- .map_err(|err| Error::from(WebSocketError(err)))
- .and_then(move |msg| app_clone.handle_websocket_message(msg))
- .filter_map(|msg| msg);
-
- // Pass the GStreamer messages to the application control logic
- // and convert them into potential messages to send out
- let app_clone = app.clone();
- let gst_messages = send_gst_msg_rx
- .map_err(Error::from)
- .and_then(move |msg| app_clone.handle_pipeline_message(&msg))
- .filter_map(|msg| msg);
-
- // Merge the two outgoing message streams
- let sync_outgoing_messages = gst_messages.select(ws_messages);
-
- // And here collect all the asynchronous outgoing messages that come
- // from other threads
- let async_outgoing_messages = send_ws_msg_rx.map_err(Error::from);
-
- // Merge both outgoing messages streams and send them out directly
- sink.sink_map_err(|err| Error::from(WebSocketError(err)))
- .send_all(sync_outgoing_messages.select(async_outgoing_messages))
- .map(|_| ())
- }),
- );
-
- if let Err(err) = res {
- println!("Error: {:?}", err);
+ println!("connected");
+
+ // Say HELLO to the server and see if it replies with HELLO
+ let our_id = rand::thread_rng().gen_range(10, 10_000);
+ println!("Registering id {} with server", our_id);
+ ws.send(WsMessage::Text(format!("HELLO {}", our_id)))
+ .await?;
+
+ let msg = ws
+ .next()
+ .await
+ .ok_or_else(|| anyhow!("didn't receive anything"))??;
+
+ if msg != WsMessage::Text("HELLO".into()) {
+ bail!("server didn't say HELLO");
+ }
+
+ if let Some(peer_id) = args.peer_id {
+ // Join the given session
+ ws.send(WsMessage::Text(format!("SESSION {}", peer_id)))
+ .await?;
+
+ let msg = ws
+ .next()
+ .await
+ .ok_or_else(|| anyhow!("didn't receive anything"))??;
+
+ if msg != WsMessage::Text("SESSION_OK".into()) {
+ bail!("server error: {:?}", msg);
+ }
}
- // And now shut down the runtime
- runtime.shutdown_now().wait().unwrap();
+ // All good, let's run our message loop
+ run(args, ws).await
+}
+
+fn main() -> Result<(), anyhow::Error> {
+ macos_workaround::run(|| task::block_on(async_main()))
}