From af908d72ebe86af6d600e0b5117e3d27440457c4 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 15 Jan 2019 15:30:17 +0200
Subject: [PATCH 001/179] Add dependencies for logger

---
 Cargo.toml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 000000000..a2099313c
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "medea"
+version = "0.1.0"
+description = "Medea media server"
+homepage = "https://github.com/instrumentisto/medea"
+documentation = "https://github.com/instrumentisto/medea/tree/master/docs/rfc"
+readme = "README.md"
+edition = "2018"
+
+[dependencies]
+chrono = "0.4.6"
+log = "0.4.6"
+slog = { version = "2.4.1", features = ["max_level_trace", "release_max_level_warn"] }
+slog-async = "2.3.0"
+slog-json = "2.3.0"
+slog-scope = "4.1.1"
+slog-stdlog = "3.0.4-pre"
+slog-stream = "1.2.1"
+slog-term = "2.4.0"

From 023ac33f5a80a66f643ad835a33d18f53fcf5ebd Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 15 Jan 2019 17:40:38 +0200
Subject: [PATCH 002/179] Impl simple logger and dual logger

---
 Cargo.toml     |  5 +----
 src/log/mod.rs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.rs    | 35 +++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 src/log/mod.rs
 create mode 100644 src/main.rs

diff --git a/Cargo.toml b/Cargo.toml
index a2099313c..f9a551f49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,10 +10,7 @@ edition = "2018"
 [dependencies]
 chrono = "0.4.6"
 log = "0.4.6"
-slog = { version = "2.4.1", features = ["max_level_trace", "release_max_level_warn"] }
+slog = { version = "2.4.1", features = ["max_level_info", "release_max_level_warn"] }
 slog-async = "2.3.0"
 slog-json = "2.3.0"
 slog-scope = "4.1.1"
-slog-stdlog = "3.0.4-pre"
-slog-stream = "1.2.1"
-slog-term = "2.4.0"
diff --git a/src/log/mod.rs b/src/log/mod.rs
new file mode 100644
index 000000000..d3d20b322
--- /dev/null
+++ b/src/log/mod.rs
@@ -0,0 +1,56 @@
+use chrono::Local;
+use slog::{o, Drain, Duplicate, FnValue, Fuse, Level, Logger, PushFnValue, Record};
+use slog_async::Async;
+use slog_json::Json;
+use std::io;
+
+/// Build app logger which prints all its logs to STDOUT,
+/// but WARN level (and higher) logs to second writer.
+/// All logs are written in JSON format with key-value pairs
+/// such as level and timestamp.
+pub fn new_dual_logger<W1, W2>(w_out: W1, w_err: W2) -> Logger
+where
+    W1: io::Write + Send + 'static,
+    W2: io::Write + Send + 'static,
+{
+    let drain_out = Json::new(w_out).build().fuse();
+    let drain_err = Json::new(w_err).build().fuse();
+    let drain = Duplicate(
+        drain_out.filter(|r| !r.level().is_at_least(Level::Warning)),
+        drain_err.filter_level(Level::Warning),
+    )
+    .map(Fuse);
+    let drain = Async::new(drain).build().fuse();
+    add_default_keys(Logger::root(drain, o!()))
+}
+
+/// Build logger which writes all its logs to writer.
+/// All logs are written in JSON format with key-value pairs
+/// such as level and timestamp.
+pub fn new_logger<W>(w: W) -> Logger
+where
+    W: io::Write + Send + 'static,
+{
+    let drain = Json::new(w).build().fuse();
+    let drain = Async::new(drain).build().fuse();
+    add_default_keys(Logger::root(drain, o!()))
+}
+
+/// Add default key-values:
+///
+/// * `time` - timestamp
+/// * `lvl` - record logging level name
+/// * `msg` - msg - formatted logging message
+fn add_default_keys(logger: Logger) -> Logger {
+    logger.new(o!(
+        "msg" => PushFnValue(move |record : &Record, ser| {
+            ser.emit(record.msg())
+        }),
+        "time" => PushFnValue(move |_ : &Record, ser| {
+            ser.emit(Local::now().to_rfc3339())
+        }),
+        "lvl" => FnValue(move |rinfo : &Record| {
+            rinfo.level().as_str()
+        }),
+    ))
+}
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 000000000..ff73e49b0
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,35 @@
+use slog::{o, slog_debug, slog_error, slog_info, slog_trace, slog_warn};
+use slog_scope::{debug, error, info, trace, warn};
+
+mod log;
+
+fn main() {
+    let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
+    let _scope_guard = slog_scope::set_global_logger(logger);
+
+    error!("log error");
+
+    slog_scope::scope(
+        &slog_scope::logger().new(o!("scope-extra-data" => "data")),
+        || foo(),
+    );
+
+    info!("log info");
+    warn!("log warning");
+}
+
+fn foo() {
+    info!("log info inside foo");
+
+    // scopes can be nested!
+    slog_scope::scope(
+        &slog_scope::logger().new(o!("even-more-scope-extra-data" => "data2")),
+        || bar(),
+    );
+}
+
+fn bar() {
+    info!("log info inside bar");
+    debug!("debug");
+    trace!("log trace");
+}

From 5d4a315f63558f6cef358525aff01ee731bcf1fc Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 16 Jan 2019 11:12:26 +0200
Subject: [PATCH 003/179] Upd CHANGELOG

---
 CHANGELOG.md   | 23 +++++++++++++++++++++++
 src/log/mod.rs |  6 +++---
 src/main.rs    | 26 +-------------------------
 3 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..74101c5ee
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,23 @@
+Change Log
+==========
+
+All user visible changes to this project will be documented in this file. This project uses to [Semantic Versioning 2.0.0].
+
+
+
+
+## [0.1.0] · 2019-0?-??
+
+[Milestone](/../milestones/1) | [Roadmap](/../issues/10)
+
+#### Implemented
+
+- Application log (!12)
+
+
+
+
+
+[0.1.0]: /../tree/v0.1.0
+
+[Semantic Versioning 2.0.0]: https://semver.org
diff --git a/src/log/mod.rs b/src/log/mod.rs
index d3d20b322..774afd28f 100644
--- a/src/log/mod.rs
+++ b/src/log/mod.rs
@@ -13,8 +13,8 @@ where
     W1: io::Write + Send + 'static,
     W2: io::Write + Send + 'static,
 {
-    let drain_out = Json::new(w_out).build().fuse();
-    let drain_err = Json::new(w_err).build().fuse();
+    let drain_out = Json::new(w_out).build();
+    let drain_err = Json::new(w_err).build();
     let drain = Duplicate(
         drain_out.filter(|r| !r.level().is_at_least(Level::Warning)),
         drain_err.filter_level(Level::Warning),
@@ -36,7 +36,7 @@ where
     add_default_keys(Logger::root(drain, o!()))
 }
 
-/// Add default key-values:
+/// Add default key-values for log:
 ///
 /// * `time` - timestamp
 /// * `lvl` - record logging level name
diff --git a/src/main.rs b/src/main.rs
index ff73e49b0..e376b7e32 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,29 +7,5 @@ fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
     let _scope_guard = slog_scope::set_global_logger(logger);
 
-    error!("log error");
-
-    slog_scope::scope(
-        &slog_scope::logger().new(o!("scope-extra-data" => "data")),
-        || foo(),
-    );
-
-    info!("log info");
-    warn!("log warning");
-}
-
-fn foo() {
-    info!("log info inside foo");
-
-    // scopes can be nested!
-    slog_scope::scope(
-        &slog_scope::logger().new(o!("even-more-scope-extra-data" => "data2")),
-        || bar(),
-    );
-}
-
-fn bar() {
-    info!("log info inside bar");
-    debug!("debug");
-    trace!("log trace");
+    info!("Exit");
 }

From 74b4e127f3fa2a3c4498fbc7b131c331437b8ad1 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 16 Jan 2019 11:33:26 +0200
Subject: [PATCH 004/179] Remove CHANGELOG

---
 CHANGELOG.md |  23 ---
 Cargo.lock   | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 513 insertions(+), 23 deletions(-)
 delete mode 100644 CHANGELOG.md
 create mode 100644 Cargo.lock

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 74101c5ee..000000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Change Log
-==========
-
-All user visible changes to this project will be documented in this file. This project uses to [Semantic Versioning 2.0.0].
-
-
-
-
-## [0.1.0] · 2019-0?-??
-
-[Milestone](/../milestones/1) | [Roadmap](/../issues/10)
-
-#### Implemented
-
-- Application log (!12)
-
-
-
-
-
-[0.1.0]: /../tree/v0.1.0
-
-[Semantic Versioning 2.0.0]: https://semver.org
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 000000000..ae4dbe5f8
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,513 @@
+[[package]]
+name = "arrayvec"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "autocfg"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "chrono"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (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 = [
+ "bitflags 1.0.4 (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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "itoa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "lazy_static"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "lock_api"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "log"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "medea"
+version = "0.1.0"
+dependencies = [
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "nodrop"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "num-integer"
+version = "0.1.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "num_cpus"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "owning_ref"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (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.3.0 (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_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_pcg 0.1.1 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.0"
+source = "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.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.1"
+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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (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 = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.50"
+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)",
+]
+
+[[package]]
+name = "ryu"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "scopeguard"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+version = "1.0.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde_json"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "slog-async"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-json"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-scope"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "smallvec"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "take_mut"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "thread_local"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "time"
+version = "0.1.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unreachable"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
+"checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
+"checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
+"checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
+"checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
+"checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"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 itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
+"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
+"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
+"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
+"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
+"checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+"checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca"
+"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
+"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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
+"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+"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.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa"
+"checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
+"checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
+"checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
+"checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
+"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
+"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

From 52a65d35995a0d06d330d8daba035c362bd7c6c8 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 17 Jan 2019 12:31:03 +0200
Subject: [PATCH 005/179] Impl member and members repository

---
 Cargo.lock                | 750 ++++++++++++++++++++++++++++++++++++++
 Cargo.toml                |  17 +-
 src/api/control/member.rs | 132 +++++++
 src/api/mod.rs            |   3 +
 src/errors/mod.rs         |   7 +
 src/main.rs               |  33 ++
 6 files changed, 936 insertions(+), 6 deletions(-)
 create mode 100644 src/api/control/member.rs
 create mode 100644 src/api/mod.rs
 create mode 100644 src/errors/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index ae4dbe5f8..26c65c7da 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,47 @@
+[[package]]
+name = "actix"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-signal 0.2.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-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix_derive"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "arc-swap"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
@@ -11,11 +55,52 @@ name = "autocfg"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "backtrace"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byteorder"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bytes"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.6"
@@ -95,6 +180,39 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "error-chain"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.10.1 (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"
@@ -109,21 +227,94 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hostname"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "idna"
+version = "0.1.5"
+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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "im"
+version = "12.3.0"
+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)",
+ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ipconfig"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.3"
 source = "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"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lazycell"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
 version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lock_api"
 version = "0.1.5"
@@ -141,16 +332,34 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "lru-cache"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "medea"
 version = "0.1.0"
 dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -158,6 +367,55 @@ name = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "mio"
+version = "0.6.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "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.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (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)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mio-uds"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws2_32-sys 0.2.1 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.13"
@@ -213,6 +471,44 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "percent-encoding"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "quote"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.5.5"
+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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand"
 version = "0.6.4"
@@ -239,6 +535,14 @@ dependencies = [
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.0"
@@ -303,6 +607,20 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "resolv-conf"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -349,6 +667,20 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "signal-hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slog"
 version = "2.4.1"
@@ -393,11 +725,43 @@ dependencies = [
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "syn"
+version = "0.15.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"
@@ -421,6 +785,266 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.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-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-current-thread"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-executor"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-fs"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-io"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-reactor"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-signal"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tcp"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-threadpool"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-timer"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-udp"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-uds"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "typenum"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -429,11 +1053,39 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "url"
+version = "1.7.2"
+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)",
+]
+
+[[package]]
+name = "uuid"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "widestring"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi"
 version = "0.3.6"
@@ -443,6 +1095,11 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -453,10 +1110,43 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winreg"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winutil"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
+"checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
+"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
+"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
@@ -465,14 +1155,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+"checksum im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0627d417829c1d763d602687634869f254fc79f7e22dea6c824dab993db857e4"
+"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
+"checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
+"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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
@@ -480,8 +1189,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
+"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
 "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
@@ -490,6 +1205,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
@@ -497,17 +1214,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa"
+"checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
+"checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
+"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
+"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
+"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
+"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
+"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
+"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
+"checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
+"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
+"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
+"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
+"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
+"checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
+"checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
+"checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
+"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
+"checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
+"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/Cargo.toml b/Cargo.toml
index f9a551f49..1c5d72c06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,9 +8,14 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-chrono = "0.4.6"
-log = "0.4.6"
-slog = { version = "2.4.1", features = ["max_level_info", "release_max_level_warn"] }
-slog-async = "2.3.0"
-slog-json = "2.3.0"
-slog-scope = "4.1.1"
+actix = "0.7"
+chrono = "0.4"
+failure = "0.1"
+futures = "0.1"
+im = "12.3"
+log = "0.4"
+slog = { version = "2.4", features = ["max_level_info", "release_max_level_warn"] }
+slog-async = "2.3"
+slog-json = "2.3"
+slog-scope = "4.1"
+tokio = "0.1"
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
new file mode 100644
index 000000000..bb509b8c4
--- /dev/null
+++ b/src/api/control/member.rs
@@ -0,0 +1,132 @@
+use actix::prelude::*;
+use im::hashmap::HashMap;
+
+use crate::errors::AppError;
+
+pub type Id = u64;
+
+#[derive(Clone)]
+pub struct Member {
+    pub id: Id,
+    pub credentials: String,
+}
+
+pub struct MemberRepository {
+    pub members: HashMap<Id, Member>,
+}
+
+impl Actor for MemberRepository {
+    type Context = Context<Self>;
+}
+
+/// Message for retrieves member by its id.
+pub struct GetMember(pub Id);
+
+impl Message for GetMember {
+    type Result = Result<Member, AppError>;
+}
+
+impl Handler<GetMember> for MemberRepository {
+    type Result = Result<Member, AppError>;
+
+    fn handle(&mut self, msg: GetMember, _: &mut Self::Context) -> Self::Result {
+        self.members
+            .get(&msg.0)
+            .map(|member| member.to_owned())
+            .ok_or(AppError::NotFound)
+    }
+}
+
+/// Message for retrieves member by its credential.
+pub struct GetMemberByCredentials(pub String);
+
+impl Message for GetMemberByCredentials {
+    type Result = Result<Member, AppError>;
+}
+
+impl Handler<GetMemberByCredentials> for MemberRepository {
+    type Result = Result<Member, AppError>;
+
+    fn handle(&mut self, msg: GetMemberByCredentials, _: &mut Self::Context) -> Self::Result {
+        self.members
+            .values()
+            .find(|member| member.credentials.eq(&msg.0))
+            .map(|member| member.to_owned())
+            .ok_or(AppError::NotFound)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::time::{Duration, Instant};
+    use tokio::prelude::*;
+    use tokio::timer::Delay;
+
+    #[test]
+    fn test_get_member_by_id() {
+        System::run(move || {
+            let id = 2;
+            let members = HashMap::unit(
+                id,
+                Member {
+                    id,
+                    credentials: "credentials".to_owned(),
+                },
+            );
+
+            let addr = Arbiter::builder().start(move |_| MemberRepository { members });
+
+            tokio::spawn(
+                addr.send(GetMember(id))
+                    .and_then(|res| {
+                        assert!(res.is_ok());
+                        let member = res.unwrap();
+                        assert_eq!(member.id, 2);
+                        Ok(())
+                    })
+                    .then(move |_| {
+                        Delay::new(Instant::now() + Duration::new(0, 1_000_000)).then(move |_| {
+                            System::current().stop();
+                            future::result(Ok(()))
+                        })
+                    }),
+            );
+        });
+    }
+
+    #[test]
+    fn test_get_member_by_credentials() {
+        System::run(move || {
+            let id = 2;
+            let cred = "credentials";
+            let members = HashMap::unit(
+                id,
+                Member {
+                    id,
+                    credentials: cred.to_owned(),
+                },
+            );
+
+            //let addr = SyncArbiter::start(1, || MemberRepository{members});
+            let addr = Arbiter::builder().start(move |_| MemberRepository { members });
+
+            tokio::spawn(
+                addr.send(GetMemberByCredentials(cred.to_owned()))
+                    .and_then(|res| {
+                        assert!(res.is_ok());
+                        let member = res.unwrap();
+                        assert_eq!(member.id, 2);
+                        assert_eq!(member.credentials, "credentials");
+                        Ok(())
+                    })
+                    .then(move |_| {
+                        Delay::new(Instant::now() + Duration::new(0, 1_000_000)).then(move |_| {
+                            System::current().stop();
+                            future::result(Ok(()))
+                        })
+                    }),
+            );
+        });
+    }
+}
diff --git a/src/api/mod.rs b/src/api/mod.rs
new file mode 100644
index 000000000..f7321d653
--- /dev/null
+++ b/src/api/mod.rs
@@ -0,0 +1,3 @@
+pub mod control {
+    pub mod member;
+}
diff --git a/src/errors/mod.rs b/src/errors/mod.rs
new file mode 100644
index 000000000..b11852caf
--- /dev/null
+++ b/src/errors/mod.rs
@@ -0,0 +1,7 @@
+use failure::Fail;
+
+#[derive(Fail, Debug)]
+pub enum AppError {
+    #[fail(display = "Not found member")]
+    NotFound,
+}
diff --git a/src/main.rs b/src/main.rs
index e376b7e32..64197e375 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,44 @@
+use actix::prelude::*;
+use im::hashmap::HashMap;
+
 use slog::{o, slog_debug, slog_error, slog_info, slog_trace, slog_warn};
 use slog_scope::{debug, error, info, trace, warn};
 
+mod api;
+mod errors;
 mod log;
 
+use crate::api::control::member::{Member, MemberRepository};
+
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
     let _scope_guard = slog_scope::set_global_logger(logger);
 
+    let sys = actix::System::new("medea");
+    run();
+    let _ = sys.run();
+
     info!("Exit");
 }
+
+fn run() {
+    let mut members = HashMap::new();
+    members.insert(
+        1,
+        Member {
+            id: 1,
+            credentials: "user1_credentials".to_owned(),
+        },
+    );
+    members.insert(
+        2,
+        Member {
+            id: 2,
+            credentials: "user2_credentials".to_owned(),
+        },
+    );
+
+    let addr = Arbiter::builder().start(move |_| MemberRepository { members });
+
+    info!("Repository created");
+}

From 122d780ad68c0495310b9d0a6c7e7be58753d338 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 18 Jan 2019 12:53:18 +0200
Subject: [PATCH 006/179] Impl handle WS connection

---
 .env                      |   1 +
 Cargo.lock                | 728 +++++++++++++++++++++++++++++++++++++-
 Cargo.toml                |   7 +-
 src/api/control/member.rs |   9 +
 src/log/mod.rs            |   1 +
 src/main.rs               |  40 +--
 src/server.rs             | 132 +++++++
 7 files changed, 885 insertions(+), 33 deletions(-)
 create mode 100644 .env
 create mode 100644 src/server.rs

diff --git a/.env b/.env
new file mode 100644
index 000000000..a7bcd3f21
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+RUST_LOG=debug
diff --git a/Cargo.lock b/Cargo.lock
index 26c65c7da..3d0e05f37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,82 @@ dependencies = [
  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "actix-net"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.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 0.1.14 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix-web"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_htmlescape 0.3.2 (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 = "actix_derive"
 version = "0.3.2"
@@ -37,6 +113,27 @@ dependencies = [
  "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "adler32"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "aho-corasick"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "arc-swap"
 version = "0.3.7"
@@ -77,11 +174,51 @@ dependencies = [
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "base64"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "brotli-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "brotli2"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "build_const"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.2.7"
@@ -124,6 +261,38 @@ dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cookie"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "crossbeam"
 version = "0.6.0"
@@ -180,6 +349,78 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dotenv"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dtoa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "encoding"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-japanese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-korean"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-simpchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-singlebyte"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-tradchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding_index_tests"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "error-chain"
 version = "0.8.1"
@@ -208,6 +449,17 @@ dependencies = [
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -232,6 +484,32 @@ name = "futures"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-cpupool"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "h2"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hostname"
 version = "0.1.5"
@@ -241,6 +519,21 @@ dependencies = [
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (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.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "httparse"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -260,6 +553,11 @@ dependencies = [
  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "iovec"
 version = "0.1.2"
@@ -281,6 +579,17 @@ dependencies = [
  "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "isatty"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.3"
@@ -295,6 +604,11 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
@@ -324,6 +638,14 @@ dependencies = [
  "scopeguard 0.3.3 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "log"
 version = "0.4.6"
@@ -350,23 +672,91 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "memchr"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (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 = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "mime"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mime_guess"
+version = "2.0.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz-sys"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz_oxide_c_api"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mio"
 version = "0.6.16"
@@ -421,6 +811,14 @@ name = "nodrop"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "nom"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.39"
@@ -476,6 +874,41 @@ name = "percent-encoding"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "phf"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "0.4.24"
@@ -607,6 +1040,43 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.6.2"
@@ -616,6 +1086,17 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ring"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.13"
@@ -634,6 +1115,11 @@ name = "ryu"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "safemem"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -667,6 +1153,22 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "signal-hook"
 version = "0.1.7"
@@ -676,6 +1178,11 @@ dependencies = [
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -696,6 +1203,20 @@ dependencies = [
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "slog-envlogger"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "slog-json"
 version = "2.3.0"
@@ -717,6 +1238,29 @@ dependencies = [
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "slog-stdlog"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-term"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "smallvec"
 version = "0.6.7"
@@ -741,6 +1285,11 @@ name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "string"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "syn"
 version = "0.15.26"
@@ -767,6 +1316,32 @@ name = "take_mut"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "term"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread-id"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread_local"
 version = "0.3.6"
@@ -958,6 +1533,14 @@ dependencies = [
  "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "trust-dns-proto"
 version = "0.5.0"
@@ -1027,6 +1610,27 @@ name = "typenum"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ucd-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicase"
+version = "1.4.2"
+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)",
+]
+
+[[package]]
+name = "unicase"
+version = "2.2.0"
+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)",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -1053,16 +1657,32 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "url"
 version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
 ]
 
+[[package]]
+name = "utf8-ranges"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "utf8-ranges"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "uuid"
 version = "0.7.1"
@@ -1071,6 +1691,41 @@ dependencies = [
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "v_escape"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "v_escape_derive 0.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 = "v_escape_derive"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "v_htmlescape"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape 0.3.2 (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 = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -1137,52 +1792,92 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
+"checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
+"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
+"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4e5f34df7a019573fb8bdc7e24a2bfebe51a2a1d6bfdbaeccedb3c41fc574727"
 "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
+"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
+"checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
 "checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
+"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
+"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+"checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
+"checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0627d417829c1d763d602687634869f254fc79f7e22dea6c824dab993db857e4"
+"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
+"checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 "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 lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
 "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
+"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
+"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
+"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
+"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
@@ -1190,6 +1885,10 @@ dependencies = [
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
@@ -1205,27 +1904,43 @@ dependencies = [
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
+"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
+"checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa"
+"checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
+"checksum slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7c6685180086bf58624e92cb3da5d5f013bebd609454926fc8e2ac6345d384b"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
+"checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
+"checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
 "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
+"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
@@ -1241,16 +1956,27 @@ dependencies = [
 "checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
+"checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
 "checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
 "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 "checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
+"checksum v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b50688edb86f4c092a1a9fe8bda004b0faa3197100897653809e97e09a2814"
+"checksum v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd994c63b487fef7aad31e5394ec04b9e24de7b32ea5251c9fb499cd2cbf44c"
+"checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
diff --git a/Cargo.toml b/Cargo.toml
index 1c5d72c06..619caa63e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,12 +9,15 @@ edition = "2018"
 
 [dependencies]
 actix = "0.7"
+actix-web = "0.7"
 chrono = "0.4"
+dotenv = "0.13"
 failure = "0.1"
 futures = "0.1"
 im = "12.3"
-log = "0.4"
-slog = { version = "2.4", features = ["max_level_info", "release_max_level_warn"] }
+slog = "2.4"
+slog-envlogger = "2.1"
+slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index bb509b8c4..bb4e4078a 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -11,6 +11,15 @@ pub struct Member {
     pub credentials: String,
 }
 
+const CALLER: Member = Member {
+    id: 1,
+    credentials: "caller_credentials".to_owned(),
+};
+const RESPONDER: Member = Member {
+    id: 1,
+    credentials: "responder_credentials".to_owned(),
+};
+
 pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
diff --git a/src/log/mod.rs b/src/log/mod.rs
index 774afd28f..ed57335d1 100644
--- a/src/log/mod.rs
+++ b/src/log/mod.rs
@@ -20,6 +20,7 @@ where
         drain_err.filter_level(Level::Warning),
     )
     .map(Fuse);
+    let drain = slog_envlogger::new(drain).fuse();
     let drain = Async::new(drain).build().fuse();
     add_default_keys(Logger::root(drain, o!()))
 }
diff --git a/src/main.rs b/src/main.rs
index 64197e375..a7ceb2520 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,44 +1,24 @@
-use actix::prelude::*;
-use im::hashmap::HashMap;
+pub use actix::prelude::*;
+use dotenv::dotenv;
 
-use slog::{o, slog_debug, slog_error, slog_info, slog_trace, slog_warn};
-use slog_scope::{debug, error, info, trace, warn};
+pub use slog::{o, slog_debug, slog_error, slog_info, slog_trace, slog_warn};
+pub use slog_scope::{debug, error, info, trace, warn};
 
-mod api;
+pub mod api;
 mod errors;
 mod log;
-
-use crate::api::control::member::{Member, MemberRepository};
+mod server;
 
 fn main() {
+    dotenv().ok();
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
     let _scope_guard = slog_scope::set_global_logger(logger);
+    let _guard = slog_stdlog::init().unwrap();
 
     let sys = actix::System::new("medea");
-    run();
+    init_repo();
+    server::run();
     let _ = sys.run();
 
     info!("Exit");
 }
-
-fn run() {
-    let mut members = HashMap::new();
-    members.insert(
-        1,
-        Member {
-            id: 1,
-            credentials: "user1_credentials".to_owned(),
-        },
-    );
-    members.insert(
-        2,
-        Member {
-            id: 2,
-            credentials: "user2_credentials".to_owned(),
-        },
-    );
-
-    let addr = Arbiter::builder().start(move |_| MemberRepository { members });
-
-    info!("Repository created");
-}
diff --git a/src/server.rs b/src/server.rs
new file mode 100644
index 000000000..b3441c28f
--- /dev/null
+++ b/src/server.rs
@@ -0,0 +1,132 @@
+use crate::*;
+use actix_web::{fs, http, middleware, server, ws, App, Error, HttpRequest, HttpResponse};
+use api::control::member::{Member, MemberRepository};
+use im::hashmap::HashMap;
+use std::time::{Duration, Instant};
+
+/// How often heartbeat pings are sent
+const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
+/// How long before lack of client response causes a timeout
+const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
+
+/// do websocket handshake and start `WsSessions` actor
+fn ws_index(r: &HttpRequest) -> Result<HttpResponse, Error> {
+    ws::start(r, WsSessions::new())
+}
+
+fn index(r: &HttpRequest) -> Result<HttpResponse, Error> {
+    Ok(HttpResponse::Ok().finish())
+}
+
+/// websocket connection is long running connection, it easier
+/// to handle with an actor
+struct WsSessions {
+    /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
+    /// otherwise we drop connection.
+    hb: Instant,
+}
+
+impl Actor for WsSessions {
+    type Context = ws::WebsocketContext<Self>;
+
+    /// Method is called on actor start. We start the heartbeat process here.
+    fn started(&mut self, ctx: &mut Self::Context) {
+        self.hb(ctx);
+    }
+}
+
+/// Handler for `ws::Message`
+impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
+    fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
+        // process websocket messages
+        println!("WS: {:?}", msg);
+        match msg {
+            ws::Message::Ping(msg) => {
+                self.hb = Instant::now();
+                ctx.pong(&msg);
+            }
+            ws::Message::Pong(_) => {
+                self.hb = Instant::now();
+            }
+            ws::Message::Text(text) => ctx.text(text),
+            ws::Message::Binary(bin) => ctx.binary(bin),
+            ws::Message::Close(_) => {
+                ctx.stop();
+            }
+        }
+    }
+}
+
+impl WsSessions {
+    fn new() -> Self {
+        Self { hb: Instant::now() }
+    }
+
+    /// helper method that sends ping to client every second.
+    ///
+    /// also this method checks heartbeats from client
+    fn hb(&self, ctx: &mut <Self as Actor>::Context) {
+        ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
+            // check client heartbeats
+            if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
+                // heartbeat timed out
+                println!("Websocket Client heartbeat failed, disconnecting!");
+
+                // stop actor
+                ctx.stop();
+
+                // don't try to send a ping
+                return;
+            }
+
+            ctx.ping("");
+        });
+    }
+}
+
+/// State with repository address
+struct AppState {
+    members_repo: Addr<MemberRepository>,
+}
+
+pub fn run() {
+    server::new(|| {
+        with_state(AppState {
+            members_repo: addr.clone(),
+        })
+        // enable logger
+        .middleware(middleware::Logger::default())
+        // websocket route
+        .resource("/ws/", |r| r.method(http::Method::GET).f(ws_index))
+        .resource("/get/", |r| r.method(http::Method::GET).f(index))
+    })
+    // start http server on 127.0.0.1:8080
+    .bind("127.0.0.1:8080")
+    .unwrap()
+    .start();
+
+    println!("Started http server: 127.0.0.1:8080");
+    trace!("Started http server: 127.0.0.1:8080");
+}
+
+fn init_repo<A: Actor>() -> Addr<A> {
+    let mut members = HashMap::new();
+    members.insert(
+        1,
+        Member {
+            id: 1,
+            credentials: "user1_credentials".to_owned(),
+        },
+    );
+    members.insert(
+        2,
+        Member {
+            id: 2,
+            credentials: "user2_credentials".to_owned(),
+        },
+    );
+
+    info!("Repository created");
+
+    Arbiter::builder().start(move |_| MemberRepository { members })
+}

From d0d691f99ad0aae4670c5d2c24f4a1b761f18613 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 18 Jan 2019 15:16:08 +0200
Subject: [PATCH 007/179] Impl default caller and responder

---
 Cargo.lock                | 751 +++++++++++++++++++++++++++++++++++++-
 src/api/control/member.rs | 101 ++---
 src/main.rs               |  24 +-
 3 files changed, 811 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ddbe4f280..d89d03043 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,47 @@
+[[package]]
+name = "actix"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-signal 0.2.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-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix_derive"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "arc-swap"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
@@ -11,11 +55,52 @@ name = "autocfg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "backtrace"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "byteorder"
+version = "1.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bytes"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.6"
@@ -95,6 +180,39 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "error-chain"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.10.1 (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"
@@ -109,21 +227,94 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hostname"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "idna"
+version = "0.1.5"
+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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "im"
+version = "12.3.0"
+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)",
+ "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ipconfig"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.3"
 source = "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"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lazycell"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
 version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lock_api"
 version = "0.1.5"
@@ -141,16 +332,33 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "lru-cache"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "matches"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "medea"
 version = "0.1.0"
 dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -158,6 +366,55 @@ name = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "mio"
+version = "0.6.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "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.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (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)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mio-uds"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miow"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ws2_32-sys 0.2.1 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.13"
@@ -213,6 +470,44 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "percent-encoding"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "quote"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.5.5"
+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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand"
 version = "0.6.4"
@@ -239,6 +534,14 @@ dependencies = [
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.0"
@@ -303,6 +606,20 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "resolv-conf"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -349,6 +666,20 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "signal-hook"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slog"
 version = "2.4.1"
@@ -393,11 +724,43 @@ dependencies = [
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "socket2"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "syn"
+version = "0.15.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"
@@ -421,6 +784,266 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tokio"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.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-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-current-thread"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-executor"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-fs"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-io"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-reactor"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-signal"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-tcp"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-threadpool"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-timer"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-udp"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-uds"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "typenum"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -429,11 +1052,39 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "url"
+version = "1.7.2"
+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)",
+]
+
+[[package]]
+name = "uuid"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "widestring"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi"
 version = "0.3.6"
@@ -443,6 +1094,11 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "winapi-build"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -453,10 +1109,43 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winreg"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winutil"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ws2_32-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
+"checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
+"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
+"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
+"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
@@ -465,14 +1154,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+"checksum im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0627d417829c1d763d602687634869f254fc79f7e22dea6c824dab993db857e4"
+"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
+"checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
+"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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
@@ -480,8 +1188,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
+"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
 "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
@@ -490,6 +1204,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
@@ -497,17 +1213,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
+"checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
+"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
+"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
+"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
+"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
+"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
+"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
+"checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
+"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
+"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
+"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
+"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
+"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
+"checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
+"checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
+"checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
+"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
+"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
+"checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
+"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index bb509b8c4..5f86482d8 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -2,6 +2,7 @@ use actix::prelude::*;
 use im::hashmap::HashMap;
 
 use crate::errors::AppError;
+use crate::log::prelude::*;
 
 pub type Id = u64;
 
@@ -15,6 +16,29 @@ pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
 
+/// Creates members repository with default Caller and Responder.
+impl Default for MemberRepository {
+    fn default() -> Self {
+        let mut members = HashMap::new();
+        members.insert(
+            1,
+            Member {
+                id: 1,
+                credentials: "caller_credentials".to_owned(),
+            },
+        );
+        members.insert(
+            2,
+            Member {
+                id: 2,
+                credentials: "responder_credentials".to_owned(),
+            },
+        );
+        info! {"Repository created"};
+        MemberRepository { members }
+    }
+}
+
 impl Actor for MemberRepository {
     type Context = Context<Self>;
 }
@@ -29,7 +53,11 @@ impl Message for GetMember {
 impl Handler<GetMember> for MemberRepository {
     type Result = Result<Member, AppError>;
 
-    fn handle(&mut self, msg: GetMember, _: &mut Self::Context) -> Self::Result {
+    fn handle(
+        &mut self,
+        msg: GetMember,
+        _: &mut Self::Context,
+    ) -> Self::Result {
         self.members
             .get(&msg.0)
             .map(|member| member.to_owned())
@@ -47,7 +75,11 @@ impl Message for GetMemberByCredentials {
 impl Handler<GetMemberByCredentials> for MemberRepository {
     type Result = Result<Member, AppError>;
 
-    fn handle(&mut self, msg: GetMemberByCredentials, _: &mut Self::Context) -> Self::Result {
+    fn handle(
+        &mut self,
+        msg: GetMemberByCredentials,
+        _: &mut Self::Context,
+    ) -> Self::Result {
         self.members
             .values()
             .find(|member| member.credentials.eq(&msg.0))
@@ -66,30 +98,22 @@ mod tests {
     #[test]
     fn test_get_member_by_id() {
         System::run(move || {
-            let id = 2;
-            let members = HashMap::unit(
-                id,
-                Member {
-                    id,
-                    credentials: "credentials".to_owned(),
-                },
-            );
-
-            let addr = Arbiter::builder().start(move |_| MemberRepository { members });
+            let addr = Arbiter::start(move |_| MemberRepository::default());
 
             tokio::spawn(
-                addr.send(GetMember(id))
+                addr.send(GetMember(1))
                     .and_then(|res| {
                         assert!(res.is_ok());
                         let member = res.unwrap();
-                        assert_eq!(member.id, 2);
+                        assert_eq!(member.id, 1);
                         Ok(())
                     })
                     .then(move |_| {
-                        Delay::new(Instant::now() + Duration::new(0, 1_000_000)).then(move |_| {
-                            System::current().stop();
-                            future::result(Ok(()))
-                        })
+                        Delay::new(Instant::now() + Duration::new(0, 1_000_000))
+                            .then(move |_| {
+                                System::current().stop();
+                                future::result(Ok(()))
+                            })
                     }),
             );
         });
@@ -98,34 +122,29 @@ mod tests {
     #[test]
     fn test_get_member_by_credentials() {
         System::run(move || {
-            let id = 2;
-            let cred = "credentials";
-            let members = HashMap::unit(
-                id,
-                Member {
-                    id,
-                    credentials: cred.to_owned(),
-                },
-            );
-
-            //let addr = SyncArbiter::start(1, || MemberRepository{members});
-            let addr = Arbiter::builder().start(move |_| MemberRepository { members });
+            let addr = Arbiter::start(move |_| MemberRepository::default());
 
             tokio::spawn(
-                addr.send(GetMemberByCredentials(cred.to_owned()))
-                    .and_then(|res| {
-                        assert!(res.is_ok());
-                        let member = res.unwrap();
-                        assert_eq!(member.id, 2);
-                        assert_eq!(member.credentials, "credentials");
-                        Ok(())
-                    })
-                    .then(move |_| {
-                        Delay::new(Instant::now() + Duration::new(0, 1_000_000)).then(move |_| {
+                addr.send(GetMemberByCredentials(
+                    "responder_credentials".to_owned(),
+                ))
+                .and_then(|res| {
+                    assert!(res.is_ok());
+                    let member = res.unwrap();
+                    assert_eq!(member.id, 2);
+                    assert_eq!(
+                        member.credentials,
+                        "responder_credentials".to_owned()
+                    );
+                    Ok(())
+                })
+                .then(move |_| {
+                    Delay::new(Instant::now() + Duration::new(0, 1_000_000))
+                        .then(move |_| {
                             System::current().stop();
                             future::result(Ok(()))
                         })
-                    }),
+                }),
             );
         });
     }
diff --git a/src/main.rs b/src/main.rs
index 6965fdc9c..4f055ab27 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -13,31 +13,9 @@ fn main() {
     let _scope_guard = slog_scope::set_global_logger(logger);
 
     let sys = actix::System::new("medea");
-    run();
+    let addr = Arbiter::start(move |_| MemberRepository::default());
     let _ = sys.run();
 
     info!("Hooray!");
     warn!("It works");
 }
-
-fn run() {
-    let mut members = HashMap::new();
-    members.insert(
-        1,
-        Member {
-            id: 1,
-            credentials: "user1_credentials".to_owned(),
-        },
-    );
-    members.insert(
-        2,
-        Member {
-            id: 2,
-            credentials: "user2_credentials".to_owned(),
-        },
-    );
-
-    let addr = Arbiter::builder().start(move |_| MemberRepository { members });
-
-    info!("Repository created");
-}

From 278116de81a3d26880368d4fe53a8de6c3c1f56e Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Mon, 21 Jan 2019 12:26:00 +0200
Subject: [PATCH 008/179] Corrections

---
 src/api/control/member.rs | 6 ++++--
 src/api/control/mod.rs    | 3 +++
 src/api/mod.rs            | 4 +---
 src/main.rs               | 6 ++++--
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 src/api/control/mod.rs

diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 5f86482d8..eea560602 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,8 +1,10 @@
 use actix::prelude::*;
 use im::hashmap::HashMap;
 
-use crate::errors::AppError;
-use crate::log::prelude::*;
+use crate::{
+    errors::AppError,
+    log::prelude::*,
+};
 
 pub type Id = u64;
 
diff --git a/src/api/control/mod.rs b/src/api/control/mod.rs
new file mode 100644
index 000000000..d5d006c34
--- /dev/null
+++ b/src/api/control/mod.rs
@@ -0,0 +1,3 @@
+pub mod member;
+
+pub use self::member::{Member, MemberRepository};
diff --git a/src/api/mod.rs b/src/api/mod.rs
index f7321d653..39958d49a 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,3 +1 @@
-pub mod control {
-    pub mod member;
-}
+pub mod control;
diff --git a/src/main.rs b/src/main.rs
index 4f055ab27..3538170ea 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,10 @@
 use actix::prelude::*;
 use im::hashmap::HashMap;
 
-use crate::api::control::member::{Member, MemberRepository};
-use crate::log::prelude::*;
+use crate::{
+    api::control::{Member, MemberRepository},
+    log::prelude::*,
+};
 
 mod api;
 mod errors;

From 61366f286081c7624356a2f41f2f505a1958423b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 21 Jan 2019 14:02:24 +0200
Subject: [PATCH 009/179] Add state to context ws session

---
 Cargo.lock                | 727 ++++++++++++++++++++++++++++++++++++++
 src/api/control/member.rs |  12 +-
 src/main.rs               |   2 +-
 src/server.rs             |  61 ++--
 4 files changed, 758 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d89d03043..2245a96d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,82 @@ dependencies = [
  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "actix-net"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.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 0.1.14 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix-web"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_htmlescape 0.3.2 (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 = "actix_derive"
 version = "0.3.2"
@@ -37,6 +113,27 @@ dependencies = [
  "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "adler32"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "aho-corasick"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "arc-swap"
 version = "0.3.7"
@@ -77,11 +174,51 @@ dependencies = [
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "base64"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "brotli-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "brotli2"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "build_const"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.2.7"
@@ -124,6 +261,38 @@ dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cookie"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "crossbeam"
 version = "0.6.0"
@@ -180,6 +349,78 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dotenv"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dtoa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "encoding"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-japanese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-korean"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-simpchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-singlebyte"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-tradchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding_index_tests"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "error-chain"
 version = "0.8.1"
@@ -208,6 +449,17 @@ dependencies = [
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -232,6 +484,32 @@ name = "futures"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-cpupool"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "h2"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hostname"
 version = "0.1.5"
@@ -241,6 +519,21 @@ dependencies = [
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (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.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "httparse"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -260,6 +553,11 @@ dependencies = [
  "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "iovec"
 version = "0.1.2"
@@ -281,6 +579,17 @@ dependencies = [
  "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "isatty"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.3"
@@ -295,6 +604,11 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
@@ -324,6 +638,14 @@ dependencies = [
  "scopeguard 0.3.3 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "log"
 version = "0.4.6"
@@ -350,22 +672,91 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "memchr"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (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 = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "mime"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mime_guess"
+version = "2.0.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz-sys"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz_oxide_c_api"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mio"
 version = "0.6.16"
@@ -420,6 +811,14 @@ name = "nodrop"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "nom"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.39"
@@ -475,6 +874,41 @@ name = "percent-encoding"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "phf"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "0.4.25"
@@ -606,6 +1040,43 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.6.2"
@@ -615,6 +1086,17 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ring"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.13"
@@ -633,6 +1115,11 @@ name = "ryu"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "safemem"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -666,6 +1153,22 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "signal-hook"
 version = "0.1.7"
@@ -675,6 +1178,11 @@ dependencies = [
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -695,6 +1203,20 @@ dependencies = [
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "slog-envlogger"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "slog-json"
 version = "2.3.0"
@@ -716,6 +1238,29 @@ dependencies = [
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "slog-stdlog"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-term"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "smallvec"
 version = "0.6.7"
@@ -740,6 +1285,11 @@ name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "string"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "syn"
 version = "0.15.26"
@@ -766,6 +1316,32 @@ name = "take_mut"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "term"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread-id"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread_local"
 version = "0.3.6"
@@ -957,6 +1533,14 @@ dependencies = [
  "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "trust-dns-proto"
 version = "0.5.0"
@@ -1026,6 +1610,27 @@ name = "typenum"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ucd-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicase"
+version = "1.4.2"
+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)",
+]
+
+[[package]]
+name = "unicase"
+version = "2.2.0"
+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)",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -1052,16 +1657,32 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "url"
 version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
 ]
 
+[[package]]
+name = "utf8-ranges"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "utf8-ranges"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "uuid"
 version = "0.7.1"
@@ -1070,6 +1691,41 @@ dependencies = [
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "v_escape"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "v_escape_derive 0.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 = "v_escape_derive"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "v_htmlescape"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape 0.3.2 (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 = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -1136,52 +1792,92 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
+"checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
+"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
+"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
+"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
+"checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
 "checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
+"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
+"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+"checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
+"checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0627d417829c1d763d602687634869f254fc79f7e22dea6c824dab993db857e4"
+"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
+"checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 "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 lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
 "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
+"checksum memchr 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "db4c41318937f6e76648f42826b1d9ade5c09cafb5aef7e351240a70f39206e9"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
+"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
+"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
+"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
@@ -1189,6 +1885,10 @@ dependencies = [
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 "checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
@@ -1204,27 +1904,43 @@ dependencies = [
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
+"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
+"checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
+"checksum slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7c6685180086bf58624e92cb3da5d5f013bebd609454926fc8e2ac6345d384b"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
+"checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
+"checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
 "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
+"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
@@ -1240,16 +1956,27 @@ dependencies = [
 "checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
+"checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
 "checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
 "checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 "checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
+"checksum v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b50688edb86f4c092a1a9fe8bda004b0faa3197100897653809e97e09a2814"
+"checksum v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd994c63b487fef7aad31e5394ec04b9e24de7b32ea5251c9fb499cd2cbf44c"
+"checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 70b7523ae..08d2fbfcd 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -6,21 +6,13 @@ use crate::log::prelude::*;
 
 pub type Id = u64;
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct Member {
     pub id: Id,
     pub credentials: String,
 }
 
-const CALLER: Member = Member {
-    id: 1,
-    credentials: "caller_credentials".to_owned(),
-};
-const RESPONDER: Member = Member {
-    id: 1,
-    credentials: "responder_credentials".to_owned(),
-};
-
+#[derive(Debug)]
 pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
diff --git a/src/main.rs b/src/main.rs
index da5cf1b9e..4b58e18b2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-pub use actix::prelude::*;
+use actix::prelude::*;
 use dotenv::dotenv;
 
 use crate::api::control::member::{Member, MemberRepository};
diff --git a/src/server.rs b/src/server.rs
index b3441c28f..ee2ba7b6f 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,20 +1,23 @@
-use crate::*;
-use actix_web::{fs, http, middleware, server, ws, App, Error, HttpRequest, HttpResponse};
-use api::control::member::{Member, MemberRepository};
-use im::hashmap::HashMap;
 use std::time::{Duration, Instant};
 
+use actix::prelude::*;
+use actix_web::{fs, http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, State};
+use im::hashmap::HashMap;
+
+use crate::api::control::member::{GetMember, Member, MemberRepository};
+use crate::log::prelude::*;
+
 /// How often heartbeat pings are sent
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
 /// How long before lack of client response causes a timeout
 const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
 
 /// do websocket handshake and start `WsSessions` actor
-fn ws_index(r: &HttpRequest) -> Result<HttpResponse, Error> {
+fn ws_index(r: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
     ws::start(r, WsSessions::new())
 }
 
-fn index(r: &HttpRequest) -> Result<HttpResponse, Error> {
+fn index(r: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
     Ok(HttpResponse::Ok().finish())
 }
 
@@ -27,11 +30,24 @@ struct WsSessions {
 }
 
 impl Actor for WsSessions {
-    type Context = ws::WebsocketContext<Self>;
+    type Context = ws::WebsocketContext<Self, AppState>;
 
     /// Method is called on actor start. We start the heartbeat process here.
     fn started(&mut self, ctx: &mut Self::Context) {
         self.hb(ctx);
+        ctx.state()
+            .members_repo
+            .send(GetMember(1))
+            .into_actor(self)
+            .then(|res, act, ctx| {
+                match res {
+                    Ok(res) => debug!{"{:?}", res},
+                    // something is wrong with chat server
+                    _ => ctx.stop(),
+                }
+                fut::ok(())
+            })
+            .wait(ctx);
     }
 }
 
@@ -85,13 +101,15 @@ impl WsSessions {
 }
 
 /// State with repository address
+#[derive(Debug)]
 struct AppState {
     members_repo: Addr<MemberRepository>,
 }
 
 pub fn run() {
-    server::new(|| {
-        with_state(AppState {
+    let addr = Arbiter::start(move |_| MemberRepository::default());
+    server::new(move || {
+        App::with_state(AppState {
             members_repo: addr.clone(),
         })
         // enable logger
@@ -105,28 +123,5 @@ pub fn run() {
     .unwrap()
     .start();
 
-    println!("Started http server: 127.0.0.1:8080");
-    trace!("Started http server: 127.0.0.1:8080");
-}
-
-fn init_repo<A: Actor>() -> Addr<A> {
-    let mut members = HashMap::new();
-    members.insert(
-        1,
-        Member {
-            id: 1,
-            credentials: "user1_credentials".to_owned(),
-        },
-    );
-    members.insert(
-        2,
-        Member {
-            id: 2,
-            credentials: "user2_credentials".to_owned(),
-        },
-    );
-
-    info!("Repository created");
-
-    Arbiter::builder().start(move |_| MemberRepository { members })
+    info!("Started http server: 127.0.0.1:8080");
 }

From 3ef7c30d07eea814a27e0e875a80123aa8685233 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 21 Jan 2019 16:57:52 +0200
Subject: [PATCH 010/179] Add hashmap macro

---
 Cargo.lock                | 28 +++++++++--------------
 Cargo.toml                |  2 +-
 src/api/control/member.rs | 48 +++++++++++++--------------------------
 src/main.rs               | 10 ++++++--
 src/utils/mod.rs          | 31 +++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 52 deletions(-)
 create mode 100644 src/utils/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index d89d03043..3a23d9a4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -232,6 +232,15 @@ name = "futures"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "hashbrown"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hostname"
 version = "0.1.5"
@@ -251,15 +260,6 @@ dependencies = [
  "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "im"
-version = "12.3.0"
-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)",
- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "iovec"
 version = "0.1.2"
@@ -353,7 +353,7 @@ dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1021,11 +1021,6 @@ dependencies = [
  "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -1161,9 +1156,9 @@ dependencies = [
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-"checksum im 12.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0627d417829c1d763d602687634869f254fc79f7e22dea6c824dab993db857e4"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
@@ -1243,7 +1238,6 @@ dependencies = [
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
 "checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
-"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
diff --git a/Cargo.toml b/Cargo.toml
index 40638520a..b0de53f9a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ actix = "0.7"
 chrono = "0.4"
 failure = "0.1"
 futures = "0.1"
-im = "12.3"
+hashbrown = "0.1"
 slog = { version = "2.4", features = ["max_level_info", "release_max_level_warn"] }
 slog-async = "2.3"
 slog-json = "2.3"
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index eea560602..369207621 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,10 +1,7 @@
 use actix::prelude::*;
-use im::hashmap::HashMap;
+use hashbrown::HashMap;
 
-use crate::{
-    errors::AppError,
-    log::prelude::*,
-};
+use crate::{errors::AppError, log::prelude::*};
 
 pub type Id = u64;
 
@@ -18,29 +15,6 @@ pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
 
-/// Creates members repository with default Caller and Responder.
-impl Default for MemberRepository {
-    fn default() -> Self {
-        let mut members = HashMap::new();
-        members.insert(
-            1,
-            Member {
-                id: 1,
-                credentials: "caller_credentials".to_owned(),
-            },
-        );
-        members.insert(
-            2,
-            Member {
-                id: 2,
-                credentials: "responder_credentials".to_owned(),
-            },
-        );
-        info! {"Repository created"};
-        MemberRepository { members }
-    }
-}
-
 impl Actor for MemberRepository {
     type Context = Context<Self>;
 }
@@ -97,10 +71,19 @@ mod tests {
     use tokio::prelude::*;
     use tokio::timer::Delay;
 
+    fn members() -> HashMap<Id, Member> {
+        let members = hashmap! {
+            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+        };
+        members
+    }
+
     #[test]
-    fn test_get_member_by_id() {
+    fn returns_member_by_id() {
         System::run(move || {
-            let addr = Arbiter::start(move |_| MemberRepository::default());
+            let members = members();
+            let addr = Arbiter::start(move |_| MemberRepository { members });
 
             tokio::spawn(
                 addr.send(GetMember(1))
@@ -122,9 +105,10 @@ mod tests {
     }
 
     #[test]
-    fn test_get_member_by_credentials() {
+    fn returns_member_by_credentials() {
         System::run(move || {
-            let addr = Arbiter::start(move |_| MemberRepository::default());
+            let members = members();
+            let addr = Arbiter::start(move |_| MemberRepository { members });
 
             tokio::spawn(
                 addr.send(GetMemberByCredentials(
diff --git a/src/main.rs b/src/main.rs
index 3538170ea..1720766fd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,12 @@
 use actix::prelude::*;
-use im::hashmap::HashMap;
 
 use crate::{
     api::control::{Member, MemberRepository},
     log::prelude::*,
 };
 
+#[macro_use]
+mod utils;
 mod api;
 mod errors;
 mod log;
@@ -14,8 +15,13 @@ fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
     let _scope_guard = slog_scope::set_global_logger(logger);
 
+    let members = hashmap! {
+        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+    };
+
     let sys = actix::System::new("medea");
-    let addr = Arbiter::start(move |_| MemberRepository::default());
+    let _addr = Arbiter::start(move |_| MemberRepository { members });
     let _ = sys.run();
 
     info!("Hooray!");
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
new file mode 100644
index 000000000..e12aa7346
--- /dev/null
+++ b/src/utils/mod.rs
@@ -0,0 +1,31 @@
+#[macro_export]
+/// Create a **HashMap** from a list of key-value pairs.
+///
+/// ## Example
+///
+/// ```
+/// let map = hashmap! {
+///     "a" => 1,
+///     "b" => 2,
+/// };
+/// assert_eq!(map["a"], 1);
+/// assert_eq!(map["b"], 2);
+/// assert_eq!(map.get("c"), None);
+/// # }
+/// ```
+macro_rules! hashmap {
+    (@single $($x:tt)*) => (());
+    (@count $($rest:expr),*) => (<[()]>::len(&[$(hashmap!(@single $rest)),*]));
+
+    ($($key:expr => $value:expr,)+) => { hashmap!($($key => $value),+) };
+    ($($key:expr => $value:expr),*) => {
+        {
+            let _cap = hashmap!(@count $($key),*);
+            let mut _map = ::hashbrown::HashMap::with_capacity(_cap);
+            $(
+                let _ = _map.insert($key, $value);
+            )*
+            _map
+        }
+    };
+}

From 747ab14ffc41a77095a44cac5721938f547c245b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 22 Jan 2019 11:56:38 +0200
Subject: [PATCH 011/179] Impl control API errors

---
 src/api/control/member.rs | 48 +++++++++++++++++++++++++++++++++------
 src/api/control/mod.rs    |  2 +-
 src/errors/mod.rs         |  5 ++--
 3 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 369207621..fa9e1c7b3 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,7 +1,14 @@
 use actix::prelude::*;
+use failure::Fail;
 use hashbrown::HashMap;
 
-use crate::{errors::AppError, log::prelude::*};
+use crate::log::prelude::*;
+
+#[derive(Fail, Debug, PartialEq)]
+pub enum ControlError {
+    #[fail(display = "Not found member")]
+    NotFound,
+}
 
 pub type Id = u64;
 
@@ -23,21 +30,22 @@ impl Actor for MemberRepository {
 pub struct GetMember(pub Id);
 
 impl Message for GetMember {
-    type Result = Result<Member, AppError>;
+    type Result = Result<Member, ControlError>;
 }
 
 impl Handler<GetMember> for MemberRepository {
-    type Result = Result<Member, AppError>;
+    type Result = Result<Member, ControlError>;
 
     fn handle(
         &mut self,
         msg: GetMember,
         _: &mut Self::Context,
     ) -> Self::Result {
+        debug!("GetMember message received");
         self.members
             .get(&msg.0)
             .map(|member| member.to_owned())
-            .ok_or(AppError::NotFound)
+            .ok_or(ControlError::NotFound)
     }
 }
 
@@ -45,22 +53,23 @@ impl Handler<GetMember> for MemberRepository {
 pub struct GetMemberByCredentials(pub String);
 
 impl Message for GetMemberByCredentials {
-    type Result = Result<Member, AppError>;
+    type Result = Result<Member, ControlError>;
 }
 
 impl Handler<GetMemberByCredentials> for MemberRepository {
-    type Result = Result<Member, AppError>;
+    type Result = Result<Member, ControlError>;
 
     fn handle(
         &mut self,
         msg: GetMemberByCredentials,
         _: &mut Self::Context,
     ) -> Self::Result {
+        debug!("GetMemberByCredentials message received");
         self.members
             .values()
             .find(|member| member.credentials.eq(&msg.0))
             .map(|member| member.to_owned())
-            .ok_or(AppError::NotFound)
+            .ok_or(ControlError::NotFound)
     }
 }
 
@@ -134,4 +143,29 @@ mod tests {
             );
         });
     }
+
+    #[test]
+    fn returns_error_not_found() {
+        System::run(move || {
+            let members = members();
+            let addr = Arbiter::start(move |_| MemberRepository { members });
+
+            tokio::spawn(
+                addr.send(GetMember(999))
+                    .and_then(|res| {
+                        assert!(res.is_err());
+                        // let member = res.unwrap();
+                        assert_eq!(res.err(), Some(ControlError::NotFound));
+                        Ok(())
+                    })
+                    .then(move |_| {
+                        Delay::new(Instant::now() + Duration::new(0, 1_000_000))
+                            .then(move |_| {
+                                System::current().stop();
+                                future::result(Ok(()))
+                            })
+                    }),
+            );
+        });
+    }
 }
diff --git a/src/api/control/mod.rs b/src/api/control/mod.rs
index d5d006c34..11c540824 100644
--- a/src/api/control/mod.rs
+++ b/src/api/control/mod.rs
@@ -1,3 +1,3 @@
 pub mod member;
 
-pub use self::member::{Member, MemberRepository};
+pub use self::member::{ControlError, Member, MemberRepository};
diff --git a/src/errors/mod.rs b/src/errors/mod.rs
index b11852caf..c688fc8c7 100644
--- a/src/errors/mod.rs
+++ b/src/errors/mod.rs
@@ -1,7 +1,8 @@
+use crate::api::control::ControlError;
 use failure::Fail;
 
 #[derive(Fail, Debug)]
 pub enum AppError {
-    #[fail(display = "Not found member")]
-    NotFound,
+    #[fail(display = "Not implemented")]
+    Control(#[fail(cause)] ControlError),
 }

From 8b8edb8953cb94b82cc17e0c3e5fcb5049b057af Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 25 Jan 2019 16:46:25 +0200
Subject: [PATCH 012/179] Impl WsSessionRepository

---
 Cargo.lock                | 726 ++++++++++++++++++++++++++++++++++++++
 src/api/client/mod.rs     |   4 +
 src/api/client/server.rs  |  80 +++++
 src/api/client/session.rs | 201 +++++++++++
 src/api/control/member.rs |   5 +-
 src/api/mod.rs            |   1 +
 src/main.rs               |  15 +-
 src/server.rs             | 127 -------
 8 files changed, 1018 insertions(+), 141 deletions(-)
 create mode 100644 src/api/client/mod.rs
 create mode 100644 src/api/client/server.rs
 create mode 100644 src/api/client/session.rs
 delete mode 100644 src/server.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3a23d9a4a..37fb92fa1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,82 @@ dependencies = [
  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "actix-net"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.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 0.1.14 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix-web"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_htmlescape 0.3.2 (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 = "actix_derive"
 version = "0.3.2"
@@ -37,6 +113,27 @@ dependencies = [
  "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "adler32"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "aho-corasick"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "arc-swap"
 version = "0.3.7"
@@ -77,11 +174,51 @@ dependencies = [
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "base64"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "base64"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "brotli-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "brotli2"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "build_const"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.2.7"
@@ -124,6 +261,38 @@ dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "cookie"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "crossbeam"
 version = "0.6.0"
@@ -180,6 +349,78 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dotenv"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dtoa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "encoding"
+version = "0.2.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-japanese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-korean"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-simpchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-singlebyte"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding-index-tradchinese"
+version = "1.20141219.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "encoding_index_tests"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "error-chain"
 version = "0.8.1"
@@ -208,6 +449,17 @@ dependencies = [
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.6"
@@ -232,6 +484,32 @@ name = "futures"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "futures-cpupool"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "h2"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.1.8"
@@ -250,6 +528,21 @@ dependencies = [
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "http"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bytes 0.4.11 (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.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "httparse"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -260,6 +553,11 @@ dependencies = [
  "unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "iovec"
 version = "0.1.2"
@@ -281,6 +579,17 @@ dependencies = [
  "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "isatty"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.3"
@@ -295,6 +604,11 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "language-tags"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
@@ -324,6 +638,14 @@ dependencies = [
  "scopeguard 0.3.3 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "log"
 version = "0.4.6"
@@ -350,22 +672,90 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "memchr"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "mime"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mime_guess"
+version = "2.0.0-alpha.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz-sys"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "miniz_oxide_c_api"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mio"
 version = "0.6.16"
@@ -420,6 +810,14 @@ name = "nodrop"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "nom"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.39"
@@ -475,6 +873,41 @@ name = "percent-encoding"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "phf"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "0.4.25"
@@ -606,6 +1039,43 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex"
+version = "0.1.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "resolv-conf"
 version = "0.6.2"
@@ -615,6 +1085,17 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ring"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.13"
@@ -633,6 +1114,11 @@ name = "ryu"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "safemem"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -666,6 +1152,22 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_urlencoded"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "signal-hook"
 version = "0.1.7"
@@ -675,6 +1177,11 @@ dependencies = [
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -695,6 +1202,20 @@ dependencies = [
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "slog-envlogger"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "slog-json"
 version = "2.3.0"
@@ -716,6 +1237,29 @@ dependencies = [
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "slog-stdlog"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "slog-term"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "smallvec"
 version = "0.6.7"
@@ -740,6 +1284,11 @@ name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "string"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "syn"
 version = "0.15.26"
@@ -766,6 +1315,32 @@ name = "take_mut"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "term"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread-id"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread_local"
 version = "0.3.6"
@@ -957,6 +1532,14 @@ dependencies = [
  "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "tower-service"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "trust-dns-proto"
 version = "0.5.0"
@@ -1021,6 +1604,27 @@ dependencies = [
  "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "ucd-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicase"
+version = "1.4.2"
+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)",
+]
+
+[[package]]
+name = "unicase"
+version = "2.2.0"
+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)",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.4"
@@ -1047,16 +1651,32 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "url"
 version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "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)",
 ]
 
+[[package]]
+name = "utf8-ranges"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "utf8-ranges"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "uuid"
 version = "0.7.1"
@@ -1065,6 +1685,41 @@ dependencies = [
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "v_escape"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "v_escape_derive 0.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 = "v_escape_derive"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "v_htmlescape"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape 0.3.2 (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 = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "void"
 version = "1.0.2"
@@ -1131,52 +1786,92 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
+"checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
+"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
+"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
+"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
+"checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
 "checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
+"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
+"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
+"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
+"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7"
+"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
+"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
+"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
+"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
+"checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
+"checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
+"checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
+"checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 "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 lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
 "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
+"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
+"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
+"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
+"checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
+"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
+"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
@@ -1184,6 +1879,10 @@ dependencies = [
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 "checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
@@ -1199,27 +1898,43 @@ dependencies = [
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
+"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
+"checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
+"checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
+"checksum slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7c6685180086bf58624e92cb3da5d5f013bebd609454926fc8e2ac6345d384b"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
+"checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
+"checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
 "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
+"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
@@ -1235,15 +1950,26 @@ dependencies = [
 "checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
+"checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
 "checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
+"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
+"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 "checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
+"checksum v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b50688edb86f4c092a1a9fe8bda004b0faa3197100897653809e97e09a2814"
+"checksum v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd994c63b487fef7aad31e5394ec04b9e24de7b32ea5251c9fb499cd2cbf44c"
+"checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
new file mode 100644
index 000000000..72e5481c4
--- /dev/null
+++ b/src/api/client/mod.rs
@@ -0,0 +1,4 @@
+pub mod server;
+pub mod session;
+
+pub use self::{server::*, session::*};
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
new file mode 100644
index 000000000..3e844f384
--- /dev/null
+++ b/src/api/client/server.rs
@@ -0,0 +1,80 @@
+use std::time::{Duration, Instant};
+
+use actix::prelude::*;
+use actix_web::{
+    http, middleware, server, ws, App, AsyncResponder, Error, FutureResponse,
+    HttpRequest, HttpResponse, Path,
+};
+use futures::future::Future;
+
+use crate::{
+    api::client::*,
+    api::control::member::{
+        ControlError, GetMember, Id, Member, MemberRepository,
+    },
+    log::prelude::*,
+};
+
+/// do websocket handshake and start `WsSessions` actor
+fn ws_index(
+    (r, id): (HttpRequest<()>, Path<Id>),
+) -> FutureResponse<HttpResponse> {
+    MemberRepository::from_registry()
+        .send(GetMember(id.into_inner()))
+        .from_err()
+        .and_then(move |res| match res {
+            Ok(res) => {
+                info!("{:?}", res);
+                WsSessionRepository::from_registry()
+                    .send(IsConnected(res.id))
+                    .from_err()
+                    .and_then(move |is_connected| {
+                        info!("{:?}", is_connected);
+                        if is_connected {
+                            return Ok(HttpResponse::Conflict().into());
+                        }
+                        ws::start(&r, WsSessions::new(res.id))
+                    })
+                    .wait()
+            }
+            Err(e) => match e {
+                ControlError::NotFound => Ok(HttpResponse::NotFound().into()),
+                _ => Ok(HttpResponse::InternalServerError().into()),
+            },
+        })
+        .responder()
+}
+
+fn index(r: &HttpRequest<()>) -> Result<HttpResponse, Error> {
+    Ok(HttpResponse::Ok().finish())
+}
+
+/// State with repository address
+#[derive(Debug)]
+pub struct AppState {
+    members_repo: Addr<MemberRepository>,
+}
+
+pub fn run() {
+    let members = hashmap! {
+        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+    };
+
+    let addr = Arbiter::start(move |_| MemberRepository { members });
+    System::current().registry().set(addr);
+
+    server::new(move || {
+        App::new()
+            .middleware(middleware::Logger::default())
+            .resource("/ws/{member_id}", |r| {
+                r.method(http::Method::GET).with(ws_index)
+            })
+            .resource("/get/", |r| r.method(http::Method::GET).f(index))
+    })
+    .bind("127.0.0.1:8080")
+    .unwrap()
+    .start();
+
+    info!("Started http server: 127.0.0.1:8080");
+}
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
new file mode 100644
index 000000000..64d416b83
--- /dev/null
+++ b/src/api/client/session.rs
@@ -0,0 +1,201 @@
+use std::time::{Duration, Instant};
+
+use actix::prelude::*;
+use actix_web::ws::CloseCode;
+use actix_web::{
+    http, middleware, server, ws, App, AsyncResponder, Error, FutureResponse,
+    HttpRequest, HttpResponse, Path,
+};
+use failure::Fail;
+use futures::future::Future;
+use hashbrown::{hash_map::Entry, HashMap};
+
+use crate::{
+    api::client::*,
+    api::control::member::{
+        ControlError, GetMember, Id, Member, MemberRepository,
+    },
+    log::prelude::*,
+};
+
+#[derive(Fail, Debug, PartialEq)]
+pub enum ClientError {
+    #[fail(display = "Session already exists")]
+    AlreadyExists,
+}
+
+/// How often heartbeat pings are sent
+const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
+/// How long before lack of client response causes a timeout
+const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
+
+/// websocket connection is long running connection, it easier
+/// to handle with an actor
+#[derive(Debug)]
+pub struct WsSessions {
+    /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
+    /// otherwise we drop connection.
+    hb: Instant,
+    member_id: Id,
+}
+
+impl Actor for WsSessions {
+    type Context = ws::WebsocketContext<Self>;
+
+    /// Method is called on actor start. We start the heartbeat process here.
+    fn started(&mut self, ctx: &mut Self::Context) {
+        self.hb(ctx);
+        let join_msg = JoinMember(self.member_id, ctx.address());
+        WsSessionRepository::from_registry()
+            .send(join_msg)
+            .into_actor(self)
+            .then(|res, act, ctx| match res {
+                Ok(res) => {
+                    info!("{:?}", res);
+                    if let Err(_) = res {
+                        ctx.close(Some(
+                            (
+                                CloseCode::Normal,
+                                "Member already connected!".to_owned(),
+                            )
+                                .into(),
+                        ));
+                        ctx.stop();
+                    }
+                    fut::ok(())
+                }
+                _ => fut::ok(()),
+            })
+            .spawn(ctx);
+    }
+}
+
+/// Handler for `ws::Message`
+impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
+    fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
+        // process websocket messages
+        println!("WS: {:?}", msg);
+        match msg {
+            ws::Message::Ping(msg) => {
+                self.hb = Instant::now();
+                ctx.pong(&msg);
+            }
+            ws::Message::Pong(_) => {
+                self.hb = Instant::now();
+            }
+            ws::Message::Text(text) => ctx.text(text),
+            ws::Message::Binary(bin) => ctx.binary(bin),
+            ws::Message::Close(_) => {
+                ctx.stop();
+            }
+        }
+    }
+}
+
+impl WsSessions {
+    pub fn new(member_id: Id) -> Self {
+        Self {
+            hb: Instant::now(),
+            member_id,
+        }
+    }
+
+    /// helper method that sends ping to client every second.
+    ///
+    /// also this method checks heartbeats from client
+    fn hb(&self, ctx: &mut <Self as Actor>::Context) {
+        ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
+            // check client heartbeats
+            if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
+                // heartbeat timed out
+                println!("Websocket Client heartbeat failed, disconnecting!");
+
+                // stop actor
+                ctx.stop();
+
+                // don't try to send a ping
+                return;
+            }
+
+            ctx.ping("");
+        });
+    }
+}
+
+#[derive(Clone)]
+pub struct JoinMember(pub Id, pub Addr<WsSessions>);
+
+impl Message for JoinMember {
+    type Result = Result<(), ClientError>;
+}
+
+#[derive(Clone, Message)]
+pub struct LeaveMember(pub Id);
+
+#[derive(Clone, Message)]
+#[rtype(result = "bool")]
+pub struct IsConnected(pub Id);
+
+impl Handler<IsConnected> for WsSessionRepository {
+    type Result = MessageResult<IsConnected>;
+
+    fn handle(
+        &mut self,
+        msg: IsConnected,
+        _: &mut Self::Context,
+    ) -> Self::Result {
+        debug!("IsConnected message received");
+        MessageResult(self.sessions.contains_key(&msg.0))
+    }
+}
+
+type Client = Addr<WsSessions>;
+
+#[derive(Default)]
+pub struct WsSessionRepository {
+    sessions: HashMap<Id, Client>,
+}
+
+impl Actor for WsSessionRepository {
+    type Context = Context<Self>;
+
+    fn started(&mut self, ctx: &mut Self::Context) {
+        // self.subscribe_async::<LeaveRoom>(ctx);
+        // self.subscribe_async::<SendMessage>(ctx);
+    }
+}
+
+impl Handler<JoinMember> for WsSessionRepository {
+    type Result = Result<(), ClientError>;
+
+    fn handle(
+        &mut self,
+        msg: JoinMember,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        let JoinMember(id, client) = msg;
+        match self.sessions.get(&id) {
+            Some(_) => {
+                info!("{:?}", self.sessions);
+                Err(ClientError::AlreadyExists)
+            }
+            None => {
+                self.sessions.insert(id, client);
+                info!("{:?}", self.sessions);
+                Ok(())
+            }
+        }
+    }
+}
+
+impl Handler<LeaveMember> for WsSessionRepository {
+    type Result = ();
+
+    fn handle(&mut self, msg: LeaveMember, _ctx: &mut Self::Context) {
+        self.sessions.remove(&msg.0);
+        info!("{:?}", self.sessions);
+    }
+}
+
+impl SystemService for WsSessionRepository {}
+impl Supervised for WsSessionRepository {}
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 5f8ca8e36..a47e12dbc 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -18,7 +18,7 @@ pub struct Member {
     pub credentials: String,
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
@@ -74,6 +74,9 @@ impl Handler<GetMemberByCredentials> for MemberRepository {
     }
 }
 
+impl SystemService for MemberRepository {}
+impl Supervised for MemberRepository {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/src/api/mod.rs b/src/api/mod.rs
index 39958d49a..eda6d8bd3 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1 +1,2 @@
+pub mod client;
 pub mod control;
diff --git a/src/main.rs b/src/main.rs
index a5d14d0bc..d5a2c50a6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,18 +1,13 @@
 use actix::prelude::*;
 use dotenv::dotenv;
-use im::hashmap::HashMap;
 
-use crate::{
-    api::control::{Member, MemberRepository},
-    log::prelude::*,
-};
+use crate::{api::client::*, log::prelude::*};
 
 #[macro_use]
 mod utils;
 mod api;
 mod errors;
 mod log;
-mod server;
 
 fn main() {
     dotenv().ok();
@@ -20,14 +15,8 @@ fn main() {
     let _scope_guard = slog_scope::set_global_logger(logger);
     let _guard = slog_stdlog::init().unwrap();
 
-    let members = hashmap! {
-        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
-        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
-    };
-
-    let sys = actix::System::new("medea");
+    let sys = System::new("medea");
     server::run();
-    let _addr = Arbiter::start(move |_| MemberRepository { members });
     let _ = sys.run();
 
     info!("Hooray!");
diff --git a/src/server.rs b/src/server.rs
deleted file mode 100644
index ee2ba7b6f..000000000
--- a/src/server.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-use std::time::{Duration, Instant};
-
-use actix::prelude::*;
-use actix_web::{fs, http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, State};
-use im::hashmap::HashMap;
-
-use crate::api::control::member::{GetMember, Member, MemberRepository};
-use crate::log::prelude::*;
-
-/// How often heartbeat pings are sent
-const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
-/// How long before lack of client response causes a timeout
-const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
-
-/// do websocket handshake and start `WsSessions` actor
-fn ws_index(r: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
-    ws::start(r, WsSessions::new())
-}
-
-fn index(r: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
-    Ok(HttpResponse::Ok().finish())
-}
-
-/// websocket connection is long running connection, it easier
-/// to handle with an actor
-struct WsSessions {
-    /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
-    /// otherwise we drop connection.
-    hb: Instant,
-}
-
-impl Actor for WsSessions {
-    type Context = ws::WebsocketContext<Self, AppState>;
-
-    /// Method is called on actor start. We start the heartbeat process here.
-    fn started(&mut self, ctx: &mut Self::Context) {
-        self.hb(ctx);
-        ctx.state()
-            .members_repo
-            .send(GetMember(1))
-            .into_actor(self)
-            .then(|res, act, ctx| {
-                match res {
-                    Ok(res) => debug!{"{:?}", res},
-                    // something is wrong with chat server
-                    _ => ctx.stop(),
-                }
-                fut::ok(())
-            })
-            .wait(ctx);
-    }
-}
-
-/// Handler for `ws::Message`
-impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
-    fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
-        // process websocket messages
-        println!("WS: {:?}", msg);
-        match msg {
-            ws::Message::Ping(msg) => {
-                self.hb = Instant::now();
-                ctx.pong(&msg);
-            }
-            ws::Message::Pong(_) => {
-                self.hb = Instant::now();
-            }
-            ws::Message::Text(text) => ctx.text(text),
-            ws::Message::Binary(bin) => ctx.binary(bin),
-            ws::Message::Close(_) => {
-                ctx.stop();
-            }
-        }
-    }
-}
-
-impl WsSessions {
-    fn new() -> Self {
-        Self { hb: Instant::now() }
-    }
-
-    /// helper method that sends ping to client every second.
-    ///
-    /// also this method checks heartbeats from client
-    fn hb(&self, ctx: &mut <Self as Actor>::Context) {
-        ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
-            // check client heartbeats
-            if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
-                // heartbeat timed out
-                println!("Websocket Client heartbeat failed, disconnecting!");
-
-                // stop actor
-                ctx.stop();
-
-                // don't try to send a ping
-                return;
-            }
-
-            ctx.ping("");
-        });
-    }
-}
-
-/// State with repository address
-#[derive(Debug)]
-struct AppState {
-    members_repo: Addr<MemberRepository>,
-}
-
-pub fn run() {
-    let addr = Arbiter::start(move |_| MemberRepository::default());
-    server::new(move || {
-        App::with_state(AppState {
-            members_repo: addr.clone(),
-        })
-        // enable logger
-        .middleware(middleware::Logger::default())
-        // websocket route
-        .resource("/ws/", |r| r.method(http::Method::GET).f(ws_index))
-        .resource("/get/", |r| r.method(http::Method::GET).f(index))
-    })
-    // start http server on 127.0.0.1:8080
-    .bind("127.0.0.1:8080")
-    .unwrap()
-    .start();
-
-    info!("Started http server: 127.0.0.1:8080");
-}

From 04afc2d9e86183c0a4f6606efbeb845e646c4b00 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Mon, 28 Jan 2019 12:00:29 +0200
Subject: [PATCH 013/179] Some corrections

---
 src/errors/mod.rs |  3 ++-
 src/main.rs       | 13 +++++++------
 src/utils/mod.rs  |  7 +++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/errors/mod.rs b/src/errors/mod.rs
index c688fc8c7..bad3b6661 100644
--- a/src/errors/mod.rs
+++ b/src/errors/mod.rs
@@ -1,6 +1,7 @@
-use crate::api::control::ControlError;
 use failure::Fail;
 
+use crate::api::control::ControlError;
+
 #[derive(Fail, Debug)]
 pub enum AppError {
     #[fail(display = "Not implemented")]
diff --git a/src/main.rs b/src/main.rs
index 1720766fd..85b67f8d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,13 +3,13 @@ use actix::prelude::*;
 use crate::{
     api::control::{Member, MemberRepository},
     log::prelude::*,
+    utils::hashmap,
 };
 
-#[macro_use]
-mod utils;
 mod api;
 mod errors;
 mod log;
+mod utils;
 
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
@@ -21,9 +21,10 @@ fn main() {
     };
 
     let sys = actix::System::new("medea");
-    let _addr = Arbiter::start(move |_| MemberRepository { members });
+    let _addr = Arbiter::start(move |_| {
+        info!("Hooray!");
+        warn!("It works");
+        MemberRepository { members }
+    });
     let _ = sys.run();
-
-    info!("Hooray!");
-    warn!("It works");
 }
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index e12aa7346..4d2987ac9 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -1,9 +1,8 @@
-#[macro_export]
-/// Create a **HashMap** from a list of key-value pairs.
+/// Creates new [`::hashbrown::HashMap`] from a list of key-value pairs.
 ///
 /// ## Example
 ///
-/// ```
+/// ```rust
 /// let map = hashmap! {
 ///     "a" => 1,
 ///     "b" => 2,
@@ -11,8 +10,8 @@
 /// assert_eq!(map["a"], 1);
 /// assert_eq!(map["b"], 2);
 /// assert_eq!(map.get("c"), None);
-/// # }
 /// ```
+#[macro_export]
 macro_rules! hashmap {
     (@single $($x:tt)*) => (());
     (@count $($rest:expr),*) => (<[()]>::len(&[$(hashmap!(@single $rest)),*]));

From c00ad3115a067f5ca365b09e98cf1a0842a76c3f Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 28 Jan 2019 14:13:52 +0200
Subject: [PATCH 014/179] Impl remove session from repository

---
 Cargo.lock                | 12 ++++++++
 Cargo.toml                |  1 +
 src/api/client/server.rs  | 13 +++++----
 src/api/client/session.rs | 61 ++++++++++-----------------------------
 4 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 37fb92fa1..ca48398b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,16 @@ dependencies = [
  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "actix-broker"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "actix-net"
 version = "0.2.6"
@@ -672,6 +682,7 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-broker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1786,6 +1797,7 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix-broker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6e35516b71d630755f23fc271db50009ee209f819087c0c1eb5abc10cc4b187b"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
 "checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
diff --git a/Cargo.toml b/Cargo.toml
index 19669db86..625b5126c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ repository = "https://github.com/instrumentisto/medea"
 [dependencies]
 actix = "0.7"
 actix-web = "0.7"
+actix-broker = "0.1"
 chrono = "0.4"
 dotenv = "0.13"
 failure = "0.1"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 3e844f384..68fdb0b2c 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -10,19 +10,20 @@ use futures::future::Future;
 use crate::{
     api::client::*,
     api::control::member::{
-        ControlError, GetMember, Id, Member, MemberRepository,
+        ControlError, GetMemberByCredentials, Id, Member, MemberRepository,
     },
     log::prelude::*,
 };
 
 /// do websocket handshake and start `WsSessions` actor
 fn ws_index(
-    (r, id): (HttpRequest<()>, Path<Id>),
+    (r, creds): (HttpRequest<()>, Path<String>),
 ) -> FutureResponse<HttpResponse> {
+    info!("{:?}", creds);
     MemberRepository::from_registry()
-        .send(GetMember(id.into_inner()))
+        .send(GetMemberByCredentials(creds.into_inner()))
         .from_err()
-        .and_then(move |res| match res {
+        .and_then(|res| match res {
             Ok(res) => {
                 info!("{:?}", res);
                 WsSessionRepository::from_registry()
@@ -63,11 +64,13 @@ pub fn run() {
 
     let addr = Arbiter::start(move |_| MemberRepository { members });
     System::current().registry().set(addr);
+    let addr2 = Arbiter::start(|_| WsSessionRepository::default());
+    System::current().registry().set(addr2);
 
     server::new(move || {
         App::new()
             .middleware(middleware::Logger::default())
-            .resource("/ws/{member_id}", |r| {
+            .resource("/ws/{credentials}", |r| {
                 r.method(http::Method::GET).with(ws_index)
             })
             .resource("/get/", |r| r.method(http::Method::GET).f(index))
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 64d416b83..fc30e367f 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,6 +1,7 @@
 use std::time::{Duration, Instant};
 
 use actix::prelude::*;
+use actix_broker::{BrokerIssue, BrokerSubscribe};
 use actix_web::ws::CloseCode;
 use actix_web::{
     http, middleware, server, ws, App, AsyncResponder, Error, FutureResponse,
@@ -45,28 +46,13 @@ impl Actor for WsSessions {
     /// Method is called on actor start. We start the heartbeat process here.
     fn started(&mut self, ctx: &mut Self::Context) {
         self.hb(ctx);
-        let join_msg = JoinMember(self.member_id, ctx.address());
-        WsSessionRepository::from_registry()
-            .send(join_msg)
-            .into_actor(self)
-            .then(|res, act, ctx| match res {
-                Ok(res) => {
-                    info!("{:?}", res);
-                    if let Err(_) = res {
-                        ctx.close(Some(
-                            (
-                                CloseCode::Normal,
-                                "Member already connected!".to_owned(),
-                            )
-                                .into(),
-                        ));
-                        ctx.stop();
-                    }
-                    fut::ok(())
-                }
-                _ => fut::ok(()),
-            })
-            .spawn(ctx);
+        let msg = JoinMember(self.member_id, ctx.address());
+        self.issue_async(msg);
+    }
+
+    fn stopped(&mut self, ctx: &mut Self::Context) {
+        let msg = LeaveMember(self.member_id);
+        self.issue_async(msg);
     }
 }
 
@@ -122,13 +108,9 @@ impl WsSessions {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Message)]
 pub struct JoinMember(pub Id, pub Addr<WsSessions>);
 
-impl Message for JoinMember {
-    type Result = Result<(), ClientError>;
-}
-
 #[derive(Clone, Message)]
 pub struct LeaveMember(pub Id);
 
@@ -160,31 +142,18 @@ impl Actor for WsSessionRepository {
     type Context = Context<Self>;
 
     fn started(&mut self, ctx: &mut Self::Context) {
-        // self.subscribe_async::<LeaveRoom>(ctx);
-        // self.subscribe_async::<SendMessage>(ctx);
+        self.subscribe_async::<JoinMember>(ctx);
+        self.subscribe_async::<LeaveMember>(ctx);
     }
 }
 
 impl Handler<JoinMember> for WsSessionRepository {
-    type Result = Result<(), ClientError>;
+    type Result = ();
 
-    fn handle(
-        &mut self,
-        msg: JoinMember,
-        _ctx: &mut Self::Context,
-    ) -> Self::Result {
+    fn handle(&mut self, msg: JoinMember, _ctx: &mut Self::Context) {
         let JoinMember(id, client) = msg;
-        match self.sessions.get(&id) {
-            Some(_) => {
-                info!("{:?}", self.sessions);
-                Err(ClientError::AlreadyExists)
-            }
-            None => {
-                self.sessions.insert(id, client);
-                info!("{:?}", self.sessions);
-                Ok(())
-            }
-        }
+        self.sessions.insert(id, client);
+        info!("{:?}", self.sessions);
     }
 }
 

From 251b3e07471c7839a168e6e2143add67dfcc7929 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 28 Jan 2019 16:11:43 +0200
Subject: [PATCH 015/179] Remove impl actor for MemberRepository

---
 src/api/control/member.rs | 148 ++++++++++----------------------------
 src/api/control/mod.rs    |   2 +-
 src/errors/mod.rs         |   2 +
 src/main.rs               |  16 ++---
 4 files changed, 47 insertions(+), 121 deletions(-)

diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index fa9e1c7b3..7c693a22e 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,73 +1,49 @@
-use actix::prelude::*;
 use failure::Fail;
 use hashbrown::HashMap;
 
 use crate::log::prelude::*;
 
+/// This error type encompasses any error that can be returned by this crate.
 #[derive(Fail, Debug, PartialEq)]
 pub enum ControlError {
     #[fail(display = "Not found member")]
     NotFound,
 }
 
+/// Id of Member.
 pub type Id = u64;
 
-#[derive(Clone)]
+/// Member represent user with its id and credentials.
+#[derive(Clone, Debug)]
 pub struct Member {
     pub id: Id,
     pub credentials: String,
 }
 
+/// Repository for store members.
 pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
 
-impl Actor for MemberRepository {
-    type Context = Context<Self>;
-}
-
-/// Message for retrieves member by its id.
-pub struct GetMember(pub Id);
-
-impl Message for GetMember {
-    type Result = Result<Member, ControlError>;
-}
-
-impl Handler<GetMember> for MemberRepository {
-    type Result = Result<Member, ControlError>;
-
-    fn handle(
-        &mut self,
-        msg: GetMember,
-        _: &mut Self::Context,
-    ) -> Self::Result {
-        debug!("GetMember message received");
+impl MemberRepository {
+    /// Returns member by its ID.
+    pub fn get_member(&self, id: Id) -> Result<Member, ControlError> {
+        debug!("retrieve member by id: {}", id);
         self.members
-            .get(&msg.0)
+            .get(&id)
             .map(|member| member.to_owned())
             .ok_or(ControlError::NotFound)
     }
-}
-
-/// Message for retrieves member by its credential.
-pub struct GetMemberByCredentials(pub String);
-
-impl Message for GetMemberByCredentials {
-    type Result = Result<Member, ControlError>;
-}
-
-impl Handler<GetMemberByCredentials> for MemberRepository {
-    type Result = Result<Member, ControlError>;
 
-    fn handle(
-        &mut self,
-        msg: GetMemberByCredentials,
-        _: &mut Self::Context,
-    ) -> Self::Result {
-        debug!("GetMemberByCredentials message received");
+    /// Returns member by its credentials.
+    pub fn get_member_by_credentials(
+        &self,
+        credentials: String,
+    ) -> Result<Member, ControlError> {
+        debug!("retrieve member by credentials: {}", credentials);
         self.members
             .values()
-            .find(|member| member.credentials.eq(&msg.0))
+            .find(|member| member.credentials.eq(&credentials))
             .map(|member| member.to_owned())
             .ok_or(ControlError::NotFound)
     }
@@ -76,9 +52,6 @@ impl Handler<GetMemberByCredentials> for MemberRepository {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::time::{Duration, Instant};
-    use tokio::prelude::*;
-    use tokio::timer::Delay;
 
     fn members() -> HashMap<Id, Member> {
         let members = hashmap! {
@@ -90,82 +63,35 @@ mod tests {
 
     #[test]
     fn returns_member_by_id() {
-        System::run(move || {
-            let members = members();
-            let addr = Arbiter::start(move |_| MemberRepository { members });
+        let members = members();
+        let repo = &MemberRepository { members };
 
-            tokio::spawn(
-                addr.send(GetMember(1))
-                    .and_then(|res| {
-                        assert!(res.is_ok());
-                        let member = res.unwrap();
-                        assert_eq!(member.id, 1);
-                        Ok(())
-                    })
-                    .then(move |_| {
-                        Delay::new(Instant::now() + Duration::new(0, 1_000_000))
-                            .then(move |_| {
-                                System::current().stop();
-                                future::result(Ok(()))
-                            })
-                    }),
-            );
-        });
+        let res = repo.get_member(1);
+        assert!(res.is_ok());
+        let member = res.unwrap();
+        assert_eq!(member.id, 1);
     }
 
     #[test]
     fn returns_member_by_credentials() {
-        System::run(move || {
-            let members = members();
-            let addr = Arbiter::start(move |_| MemberRepository { members });
-
-            tokio::spawn(
-                addr.send(GetMemberByCredentials(
-                    "responder_credentials".to_owned(),
-                ))
-                .and_then(|res| {
-                    assert!(res.is_ok());
-                    let member = res.unwrap();
-                    assert_eq!(member.id, 2);
-                    assert_eq!(
-                        member.credentials,
-                        "responder_credentials".to_owned()
-                    );
-                    Ok(())
-                })
-                .then(move |_| {
-                    Delay::new(Instant::now() + Duration::new(0, 1_000_000))
-                        .then(move |_| {
-                            System::current().stop();
-                            future::result(Ok(()))
-                        })
-                }),
-            );
-        });
+        let members = members();
+        let repo = &MemberRepository { members };
+
+        let res =
+            repo.get_member_by_credentials("responder_credentials".to_owned());
+        assert!(res.is_ok());
+        let member = res.unwrap();
+        assert_eq!(member.id, 2);
+        assert_eq!(member.credentials, "responder_credentials".to_owned());
     }
 
     #[test]
     fn returns_error_not_found() {
-        System::run(move || {
-            let members = members();
-            let addr = Arbiter::start(move |_| MemberRepository { members });
+        let members = members();
+        let repo = &MemberRepository { members };
 
-            tokio::spawn(
-                addr.send(GetMember(999))
-                    .and_then(|res| {
-                        assert!(res.is_err());
-                        // let member = res.unwrap();
-                        assert_eq!(res.err(), Some(ControlError::NotFound));
-                        Ok(())
-                    })
-                    .then(move |_| {
-                        Delay::new(Instant::now() + Duration::new(0, 1_000_000))
-                            .then(move |_| {
-                                System::current().stop();
-                                future::result(Ok(()))
-                            })
-                    }),
-            );
-        });
+        let res = repo.get_member(999);
+        assert!(res.is_err());
+        assert_eq!(res.err(), Some(ControlError::NotFound));
     }
 }
diff --git a/src/api/control/mod.rs b/src/api/control/mod.rs
index 11c540824..9dd654c2a 100644
--- a/src/api/control/mod.rs
+++ b/src/api/control/mod.rs
@@ -1,3 +1,3 @@
 pub mod member;
 
-pub use self::member::{ControlError, Member, MemberRepository};
+pub use self::member::{ControlError, Id, Member, MemberRepository};
diff --git a/src/errors/mod.rs b/src/errors/mod.rs
index bad3b6661..da39a82d2 100644
--- a/src/errors/mod.rs
+++ b/src/errors/mod.rs
@@ -2,8 +2,10 @@ use failure::Fail;
 
 use crate::api::control::ControlError;
 
+/// This type of error covers any error that may occur in this application.
 #[derive(Fail, Debug)]
 pub enum AppError {
+    /// This error encompasses any error that can be returned from Control API.
     #[fail(display = "Not implemented")]
     Control(#[fail(cause)] ControlError),
 }
diff --git a/src/main.rs b/src/main.rs
index 85b67f8d1..4dbefceee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,15 +1,14 @@
-use actix::prelude::*;
-
 use crate::{
     api::control::{Member, MemberRepository},
     log::prelude::*,
-    utils::hashmap,
 };
 
+#[macro_use]
+mod utils;
+
 mod api;
 mod errors;
 mod log;
-mod utils;
 
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
@@ -20,11 +19,10 @@ fn main() {
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
 
-    let sys = actix::System::new("medea");
-    let _addr = Arbiter::start(move |_| {
+    let repo = MemberRepository { members };
+    if let Ok(member) = repo.get_member(1) {
+        info!("{:?}", member);
         info!("Hooray!");
         warn!("It works");
-        MemberRepository { members }
-    });
-    let _ = sys.run();
+    }
 }

From f22945eb851bc0de0bd42eb1a2de681eff12591b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 29 Jan 2019 10:35:30 +0200
Subject: [PATCH 016/179] Remove unused crates

---
 Cargo.lock | 630 -----------------------------------------------------
 Cargo.toml |   3 -
 2 files changed, 633 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3a23d9a4a..a6f8edd65 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,47 +1,3 @@
-[[package]]
-name = "actix"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-signal 0.2.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-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "actix_derive"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "arc-swap"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
@@ -87,15 +43,6 @@ name = "byteorder"
 version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "bytes"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.28"
@@ -180,14 +127,6 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "failure"
 version = "0.1.5"
@@ -208,11 +147,6 @@ dependencies = [
  "synstructure 0.10.1 (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"
@@ -227,11 +161,6 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "futures"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "hashbrown"
 version = "0.1.8"
@@ -241,80 +170,21 @@ dependencies = [
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "hostname"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "idna"
-version = "0.1.5"
-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.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ipconfig"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.3"
 source = "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"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "lazycell"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "libc"
 version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "linked-hash-map"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "lock_api"
 version = "0.1.5"
@@ -324,41 +194,17 @@ dependencies = [
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "lru-cache"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "medea"
 version = "0.1.0"
 dependencies = [
- "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -366,55 +212,6 @@ name = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "mio"
-version = "0.6.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "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.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (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)",
- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "mio-uds"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws2_32-sys 0.2.1 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.13"
@@ -470,11 +267,6 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "percent-encoding"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.25"
@@ -483,11 +275,6 @@ dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "quick-error"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "quote"
 version = "0.6.10"
@@ -496,18 +283,6 @@ dependencies = [
  "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand"
-version = "0.5.5"
-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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.4"
@@ -534,14 +309,6 @@ dependencies = [
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.3.0"
@@ -606,15 +373,6 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "resolv-conf"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.13"
@@ -666,20 +424,6 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "signal-hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "slog"
 version = "2.4.1"
@@ -724,17 +468,6 @@ dependencies = [
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
@@ -784,256 +517,6 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "tokio"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.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-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-udp 0.1.3 (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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-current-thread"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-fs"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-reactor"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-signal"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-tcp"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-threadpool"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-timer"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-udp"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-uds"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "trust-dns-proto"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "trust-dns-proto"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -1047,39 +530,11 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "url"
-version = "1.7.2"
-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)",
-]
-
-[[package]]
-name = "uuid"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "widestring"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "winapi"
 version = "0.3.6"
@@ -1089,11 +544,6 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -1104,42 +554,13 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "winreg"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winutil"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [metadata]
-"checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
-"checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
-"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
-"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
@@ -1149,33 +570,16 @@ dependencies = [
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
-"checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
-"checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
-"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
-"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
-"checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
-"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
-"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
-"checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
-"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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
@@ -1183,14 +587,10 @@ dependencies = [
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
 "checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
-"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
 "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
@@ -1199,7 +599,6 @@ dependencies = [
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
-"checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
@@ -1208,49 +607,20 @@ dependencies = [
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
-"checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
-"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
-"checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
-"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
-"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
-"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
-"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
-"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
-"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
-"checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
-"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
-"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
-"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
-"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
-"checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
-"checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
-"checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
-"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
-"checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-"checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
-"checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
-"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/Cargo.toml b/Cargo.toml
index b0de53f9a..2bbdded1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,13 +10,10 @@ readme = "README.md"
 repository = "https://github.com/instrumentisto/medea"
 
 [dependencies]
-actix = "0.7"
 chrono = "0.4"
 failure = "0.1"
-futures = "0.1"
 hashbrown = "0.1"
 slog = { version = "2.4", features = ["max_level_info", "release_max_level_warn"] }
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
-tokio = "0.1"

From 0e854d0727b3d5ca9d1f5b806bc5f43ab141aab5 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Tue, 29 Jan 2019 17:27:57 +0200
Subject: [PATCH 017/179] Fill up missing docs

---
 src/api/control/member.rs | 17 +++++++++++------
 src/api/control/mod.rs    |  2 ++
 src/api/mod.rs            |  2 ++
 src/errors/mod.rs         |  6 ++++--
 src/main.rs               |  6 +++---
 src/utils/mod.rs          |  2 ++
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 7c693a22e..ca4c94711 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,32 +1,37 @@
+//! Member definitions and implementations.
+
 use failure::Fail;
 use hashbrown::HashMap;
 
 use crate::log::prelude::*;
 
-/// This error type encompasses any error that can be returned by this crate.
+/// Error that can be returned by Control API.
 #[derive(Fail, Debug, PartialEq)]
 pub enum ControlError {
+    /// [`Member`] is not found in repository.
     #[fail(display = "Not found member")]
     NotFound,
 }
 
-/// Id of Member.
+/// ID of [`Member`].
 pub type Id = u64;
 
-/// Member represent user with its id and credentials.
+/// Media server user with its ID and credentials.
 #[derive(Clone, Debug)]
 pub struct Member {
+    /// ID of [`Member`].
     pub id: Id,
+    /// Credentials to authorize [`Member`] with.
     pub credentials: String,
 }
 
-/// Repository for store members.
+/// Repository that stores store [`Member`]s.
 pub struct MemberRepository {
     pub members: HashMap<Id, Member>,
 }
 
 impl MemberRepository {
-    /// Returns member by its ID.
+    /// Returns [`Member`] by its ID.
     pub fn get_member(&self, id: Id) -> Result<Member, ControlError> {
         debug!("retrieve member by id: {}", id);
         self.members
@@ -35,7 +40,7 @@ impl MemberRepository {
             .ok_or(ControlError::NotFound)
     }
 
-    /// Returns member by its credentials.
+    /// Returns [`Member`] by its credentials.
     pub fn get_member_by_credentials(
         &self,
         credentials: String,
diff --git a/src/api/control/mod.rs b/src/api/control/mod.rs
index 9dd654c2a..c20222f72 100644
--- a/src/api/control/mod.rs
+++ b/src/api/control/mod.rs
@@ -1,3 +1,5 @@
+//! Implementation of Control API.
+
 pub mod member;
 
 pub use self::member::{ControlError, Id, Member, MemberRepository};
diff --git a/src/api/mod.rs b/src/api/mod.rs
index 39958d49a..3c2414f0c 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1 +1,3 @@
+//! API implementations provided by application.
+
 pub mod control;
diff --git a/src/errors/mod.rs b/src/errors/mod.rs
index da39a82d2..12dcf5296 100644
--- a/src/errors/mod.rs
+++ b/src/errors/mod.rs
@@ -1,11 +1,13 @@
+//! Common errors used in application.
+
 use failure::Fail;
 
 use crate::api::control::ControlError;
 
-/// This type of error covers any error that may occur in this application.
+/// Any error that may occur in this application.
 #[derive(Fail, Debug)]
 pub enum AppError {
-    /// This error encompasses any error that can be returned from Control API.
+    /// Error returned from Control API.
     #[fail(display = "Not implemented")]
     Control(#[fail(cause)] ControlError),
 }
diff --git a/src/main.rs b/src/main.rs
index 4dbefceee..cafc65439 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,14 +1,14 @@
+//! Medea media server application.
+
 use crate::{
     api::control::{Member, MemberRepository},
     log::prelude::*,
 };
 
-#[macro_use]
-mod utils;
-
 mod api;
 mod errors;
 mod log;
+#[macro_use] mod utils;
 
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 4d2987ac9..cfc1b0155 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -1,3 +1,5 @@
+//! Helper utils used in project.
+
 /// Creates new [`::hashbrown::HashMap`] from a list of key-value pairs.
 ///
 /// ## Example

From 4bb609697903759f291f419fb3964787aa0f6201 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 30 Jan 2019 10:46:38 +0200
Subject: [PATCH 018/179] Remove impl actor for WsSessionRepository

---
 Cargo.lock                |  2 +
 src/api/client/server.rs  | 80 +++++++++++++++++----------------------
 src/api/client/session.rs | 78 ++++++++------------------------------
 src/main.rs               |  6 +--
 4 files changed, 53 insertions(+), 113 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ca48398b7..58608fc6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "actix"
 version = "0.7.9"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 68fdb0b2c..5359b9d3b 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -1,59 +1,46 @@
-use std::time::{Duration, Instant};
+use std::sync::{Arc, Mutex};
 
-use actix::prelude::*;
 use actix_web::{
-    http, middleware, server, ws, App, AsyncResponder, Error, FutureResponse,
-    HttpRequest, HttpResponse, Path,
+    http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, Path,
+    State,
 };
-use futures::future::Future;
 
 use crate::{
     api::client::*,
-    api::control::member::{
-        ControlError, GetMemberByCredentials, Id, Member, MemberRepository,
-    },
+    api::control::member::{ControlError, Member, MemberRepository},
     log::prelude::*,
 };
 
 /// do websocket handshake and start `WsSessions` actor
 fn ws_index(
-    (r, creds): (HttpRequest<()>, Path<String>),
-) -> FutureResponse<HttpResponse> {
+    (r, creds, state): (HttpRequest<AppState>, Path<String>, State<AppState>),
+) -> Result<HttpResponse, Error> {
     info!("{:?}", creds);
-    MemberRepository::from_registry()
-        .send(GetMemberByCredentials(creds.into_inner()))
-        .from_err()
-        .and_then(|res| match res {
-            Ok(res) => {
-                info!("{:?}", res);
-                WsSessionRepository::from_registry()
-                    .send(IsConnected(res.id))
-                    .from_err()
-                    .and_then(move |is_connected| {
-                        info!("{:?}", is_connected);
-                        if is_connected {
-                            return Ok(HttpResponse::Conflict().into());
-                        }
-                        ws::start(&r, WsSessions::new(res.id))
-                    })
-                    .wait()
+    let member_repo = state.members_repo.lock().unwrap();
+    match member_repo.get_member_by_credentials(creds.into_inner()) {
+        Ok(member) => {
+            let session_repo = state.session_repo.lock().unwrap();
+            if session_repo.is_connected(member.id) {
+                Ok(HttpResponse::Conflict().finish())
+            } else {
+                ws::start(&r, WsSessions::new(member.id))
             }
-            Err(e) => match e {
-                ControlError::NotFound => Ok(HttpResponse::NotFound().into()),
-                _ => Ok(HttpResponse::InternalServerError().into()),
-            },
-        })
-        .responder()
+        }
+        Err(e) => match e {
+            ControlError::NotFound => Ok(HttpResponse::NotFound().finish()),
+            _ => Ok(HttpResponse::InternalServerError().finish()),
+        },
+    }
 }
 
-fn index(r: &HttpRequest<()>) -> Result<HttpResponse, Error> {
+fn index(_r: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
     Ok(HttpResponse::Ok().finish())
 }
 
 /// State with repository address
-#[derive(Debug)]
 pub struct AppState {
-    members_repo: Addr<MemberRepository>,
+    pub members_repo: Arc<Mutex<MemberRepository>>,
+    pub session_repo: Arc<Mutex<WsSessionRepository>>,
 }
 
 pub fn run() {
@@ -62,18 +49,19 @@ pub fn run() {
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
 
-    let addr = Arbiter::start(move |_| MemberRepository { members });
-    System::current().registry().set(addr);
-    let addr2 = Arbiter::start(|_| WsSessionRepository::default());
-    System::current().registry().set(addr2);
+    let members_repo = Arc::new(Mutex::new(MemberRepository { members }));
+    let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
 
     server::new(move || {
-        App::new()
-            .middleware(middleware::Logger::default())
-            .resource("/ws/{credentials}", |r| {
-                r.method(http::Method::GET).with(ws_index)
-            })
-            .resource("/get/", |r| r.method(http::Method::GET).f(index))
+        App::with_state(AppState {
+            members_repo: members_repo.clone(),
+            session_repo: session_repo.clone(),
+        })
+        .middleware(middleware::Logger::default())
+        .resource("/ws/{credentials}", |r| {
+            r.method(http::Method::GET).with(ws_index)
+        })
+        .resource("/", |r| r.method(http::Method::GET).f(index))
     })
     .bind("127.0.0.1:8080")
     .unwrap()
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index fc30e367f..b21723425 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,27 +1,19 @@
 use std::time::{Duration, Instant};
 
 use actix::prelude::*;
-use actix_broker::{BrokerIssue, BrokerSubscribe};
-use actix_web::ws::CloseCode;
-use actix_web::{
-    http, middleware, server, ws, App, AsyncResponder, Error, FutureResponse,
-    HttpRequest, HttpResponse, Path,
-};
+use actix_web::ws;
 use failure::Fail;
-use futures::future::Future;
-use hashbrown::{hash_map::Entry, HashMap};
+use hashbrown::HashMap;
 
 use crate::{
     api::client::*,
-    api::control::member::{
-        ControlError, GetMember, Id, Member, MemberRepository,
-    },
+    api::control::member::Id,
     log::prelude::*,
 };
 
 #[derive(Fail, Debug, PartialEq)]
 pub enum ClientError {
-    #[fail(display = "Session already exists")]
+    #[fail(display = "Member already connected")]
     AlreadyExists,
 }
 
@@ -41,18 +33,18 @@ pub struct WsSessions {
 }
 
 impl Actor for WsSessions {
-    type Context = ws::WebsocketContext<Self>;
+    type Context = ws::WebsocketContext<Self, AppState>;
 
     /// Method is called on actor start. We start the heartbeat process here.
     fn started(&mut self, ctx: &mut Self::Context) {
         self.hb(ctx);
-        let msg = JoinMember(self.member_id, ctx.address());
-        self.issue_async(msg);
+        let mut session_repo = ctx.state().session_repo.lock().unwrap();
+        session_repo.add_session(self.member_id, ctx.address());
     }
 
     fn stopped(&mut self, ctx: &mut Self::Context) {
-        let msg = LeaveMember(self.member_id);
-        self.issue_async(msg);
+        let mut session_repo = ctx.state().session_repo.lock().unwrap();
+        session_repo.remove_session(self.member_id);
     }
 }
 
@@ -108,63 +100,25 @@ impl WsSessions {
     }
 }
 
-#[derive(Clone, Message)]
-pub struct JoinMember(pub Id, pub Addr<WsSessions>);
-
-#[derive(Clone, Message)]
-pub struct LeaveMember(pub Id);
-
-#[derive(Clone, Message)]
-#[rtype(result = "bool")]
-pub struct IsConnected(pub Id);
-
-impl Handler<IsConnected> for WsSessionRepository {
-    type Result = MessageResult<IsConnected>;
-
-    fn handle(
-        &mut self,
-        msg: IsConnected,
-        _: &mut Self::Context,
-    ) -> Self::Result {
-        debug!("IsConnected message received");
-        MessageResult(self.sessions.contains_key(&msg.0))
-    }
-}
-
 type Client = Addr<WsSessions>;
 
-#[derive(Default)]
+#[derive(Default, Debug)]
 pub struct WsSessionRepository {
     sessions: HashMap<Id, Client>,
 }
 
-impl Actor for WsSessionRepository {
-    type Context = Context<Self>;
-
-    fn started(&mut self, ctx: &mut Self::Context) {
-        self.subscribe_async::<JoinMember>(ctx);
-        self.subscribe_async::<LeaveMember>(ctx);
+impl WsSessionRepository {
+    pub fn is_connected(&self, member_id: Id) -> bool {
+        self.sessions.contains_key(&member_id)
     }
-}
-
-impl Handler<JoinMember> for WsSessionRepository {
-    type Result = ();
 
-    fn handle(&mut self, msg: JoinMember, _ctx: &mut Self::Context) {
-        let JoinMember(id, client) = msg;
+    pub fn add_session(&mut self, id: Id, client: Client) {
         self.sessions.insert(id, client);
         info!("{:?}", self.sessions);
     }
-}
-
-impl Handler<LeaveMember> for WsSessionRepository {
-    type Result = ();
 
-    fn handle(&mut self, msg: LeaveMember, _ctx: &mut Self::Context) {
-        self.sessions.remove(&msg.0);
+    pub fn remove_session(&mut self, id: Id) {
+        self.sessions.remove(&id);
         info!("{:?}", self.sessions);
     }
 }
-
-impl SystemService for WsSessionRepository {}
-impl Supervised for WsSessionRepository {}
diff --git a/src/main.rs b/src/main.rs
index a75108a46..1b0af7128 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,7 @@
 use actix::prelude::*;
 use dotenv::dotenv;
 
-use crate::{
-    api::client::*,
-    api::control::{Member, MemberRepository},
-    log::prelude::*,
-};
+use crate::api::client::*;
 
 #[macro_use]
 mod utils;

From fcb10728d2f09a8f1e0ac4a94f37ca21fcae1d6f Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 30 Jan 2019 13:43:40 +0200
Subject: [PATCH 019/179] Refactoring and simplify WsSessionRepository

- impl constructor for WsSessionRepository
- rename methods of WsSessionRepository
- remove errors
---
 Cargo.lock                | 108 +-------------------------------------
 Cargo.toml                |   3 +-
 src/api/control/member.rs |  51 +++++++-----------
 src/api/control/mod.rs    |   2 +-
 src/errors/mod.rs         |  13 -----
 src/main.rs               |   8 +--
 6 files changed, 27 insertions(+), 158 deletions(-)
 delete mode 100644 src/errors/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index a6f8edd65..a83447acf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
@@ -11,28 +13,6 @@ name = "autocfg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "backtrace"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "backtrace-sys"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.0.4"
@@ -43,11 +23,6 @@ name = "byteorder"
 version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "cc"
-version = "1.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "cfg-if"
 version = "0.1.6"
@@ -127,26 +102,6 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "failure"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "failure_derive"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -199,7 +154,6 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -267,22 +221,6 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "proc-macro2"
-version = "0.4.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.4"
@@ -373,11 +311,6 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -473,27 +406,6 @@ name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "syn"
-version = "0.15.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "take_mut"
 version = "0.2.2"
@@ -517,11 +429,6 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -557,11 +464,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [metadata]
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
-"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
-"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
-"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
@@ -570,8 +474,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
-"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
-"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "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 hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
@@ -587,8 +489,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
-"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
-"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
 "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
@@ -599,7 +499,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
-"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
@@ -613,12 +512,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
-"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
diff --git a/Cargo.toml b/Cargo.toml
index 2bbdded1f..7281bb4ae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,9 +11,8 @@ repository = "https://github.com/instrumentisto/medea"
 
 [dependencies]
 chrono = "0.4"
-failure = "0.1"
 hashbrown = "0.1"
-slog = { version = "2.4", features = ["max_level_info", "release_max_level_warn"] }
+slog = { version = "2.4", features = ["max_level_debug", "release_max_level_warn"] }
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index ca4c94711..108e3093d 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,18 +1,9 @@
 //! Member definitions and implementations.
 
-use failure::Fail;
 use hashbrown::HashMap;
 
 use crate::log::prelude::*;
 
-/// Error that can be returned by Control API.
-#[derive(Fail, Debug, PartialEq)]
-pub enum ControlError {
-    /// [`Member`] is not found in repository.
-    #[fail(display = "Not found member")]
-    NotFound,
-}
-
 /// ID of [`Member`].
 pub type Id = u64;
 
@@ -26,31 +17,29 @@ pub struct Member {
 }
 
 /// Repository that stores store [`Member`]s.
+#[derive(Default)]
 pub struct MemberRepository {
-    pub members: HashMap<Id, Member>,
+    members: HashMap<Id, Member>,
 }
 
 impl MemberRepository {
+    /// Creates new [`Member`]s repository with passed-in [`Member`]s.
+    pub fn new(members: HashMap<Id, Member>) -> Self {
+        MemberRepository { members }
+    }
+
     /// Returns [`Member`] by its ID.
-    pub fn get_member(&self, id: Id) -> Result<Member, ControlError> {
+    pub fn get(&self, id: Id) -> Option<&Member> {
         debug!("retrieve member by id: {}", id);
-        self.members
-            .get(&id)
-            .map(|member| member.to_owned())
-            .ok_or(ControlError::NotFound)
+        self.members.get(&id)
     }
 
     /// Returns [`Member`] by its credentials.
-    pub fn get_member_by_credentials(
-        &self,
-        credentials: String,
-    ) -> Result<Member, ControlError> {
+    pub fn get_by_credentials(&self, credentials: String) -> Option<&Member> {
         debug!("retrieve member by credentials: {}", credentials);
         self.members
             .values()
             .find(|member| member.credentials.eq(&credentials))
-            .map(|member| member.to_owned())
-            .ok_or(ControlError::NotFound)
     }
 }
 
@@ -69,10 +58,10 @@ mod tests {
     #[test]
     fn returns_member_by_id() {
         let members = members();
-        let repo = &MemberRepository { members };
+        let repo = MemberRepository::new(members);
 
-        let res = repo.get_member(1);
-        assert!(res.is_ok());
+        let res = repo.get(1);
+        assert!(res.is_some());
         let member = res.unwrap();
         assert_eq!(member.id, 1);
     }
@@ -80,11 +69,10 @@ mod tests {
     #[test]
     fn returns_member_by_credentials() {
         let members = members();
-        let repo = &MemberRepository { members };
+        let repo = MemberRepository::new(members);
 
-        let res =
-            repo.get_member_by_credentials("responder_credentials".to_owned());
-        assert!(res.is_ok());
+        let res = repo.get_by_credentials("responder_credentials".to_owned());
+        assert!(res.is_some());
         let member = res.unwrap();
         assert_eq!(member.id, 2);
         assert_eq!(member.credentials, "responder_credentials".to_owned());
@@ -93,10 +81,9 @@ mod tests {
     #[test]
     fn returns_error_not_found() {
         let members = members();
-        let repo = &MemberRepository { members };
+        let repo = MemberRepository::new(members);
 
-        let res = repo.get_member(999);
-        assert!(res.is_err());
-        assert_eq!(res.err(), Some(ControlError::NotFound));
+        let res = repo.get(999);
+        assert!(res.is_none());
     }
 }
diff --git a/src/api/control/mod.rs b/src/api/control/mod.rs
index c20222f72..edcb52719 100644
--- a/src/api/control/mod.rs
+++ b/src/api/control/mod.rs
@@ -2,4 +2,4 @@
 
 pub mod member;
 
-pub use self::member::{ControlError, Id, Member, MemberRepository};
+pub use self::member::{Id, Member, MemberRepository};
diff --git a/src/errors/mod.rs b/src/errors/mod.rs
deleted file mode 100644
index 12dcf5296..000000000
--- a/src/errors/mod.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-//! Common errors used in application.
-
-use failure::Fail;
-
-use crate::api::control::ControlError;
-
-/// Any error that may occur in this application.
-#[derive(Fail, Debug)]
-pub enum AppError {
-    /// Error returned from Control API.
-    #[fail(display = "Not implemented")]
-    Control(#[fail(cause)] ControlError),
-}
diff --git a/src/main.rs b/src/main.rs
index cafc65439..f0b3fe422 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,9 +6,9 @@ use crate::{
 };
 
 mod api;
-mod errors;
 mod log;
-#[macro_use] mod utils;
+#[macro_use]
+mod utils;
 
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
@@ -19,8 +19,8 @@ fn main() {
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
 
-    let repo = MemberRepository { members };
-    if let Ok(member) = repo.get_member(1) {
+    let repo = MemberRepository::new(members);
+    if let Some(member) = repo.get(1) {
         info!("{:?}", member);
         info!("Hooray!");
         warn!("It works");

From 417459776b4f4e0c9760048dea6c4bceb9f29ec5 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 30 Jan 2019 16:13:39 +0200
Subject: [PATCH 020/179] Add docs

---
 Cargo.lock                | 15 -------
 Cargo.toml                |  2 -
 src/api/client/server.rs  | 27 +++++-------
 src/api/client/session.rs | 87 +++++++++++++++++----------------------
 src/main.rs               |  5 ++-
 5 files changed, 51 insertions(+), 85 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 58608fc6a..fb37dd83c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,16 +29,6 @@ dependencies = [
  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "actix-broker"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "actix-net"
 version = "0.2.6"
@@ -684,12 +674,9 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-broker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -697,7 +684,6 @@ dependencies = [
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1799,7 +1785,6 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
-"checksum actix-broker 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6e35516b71d630755f23fc271db50009ee209f819087c0c1eb5abc10cc4b187b"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
 "checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
diff --git a/Cargo.toml b/Cargo.toml
index f8d8e0a77..13f4812ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ actix = "0.7"
 actix-web = "0.7"
 chrono = "0.4"
 dotenv = "0.13"
-futures = "0.1"
 hashbrown = "0.1"
 slog = "2.4"
 slog-envlogger = "2.1"
@@ -22,4 +21,3 @@ slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
-tokio = "0.1"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 5359b9d3b..c2a967029 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -1,3 +1,5 @@
+//! Implementation HTTP server for handle websocket connections.
+
 use std::sync::{Arc, Mutex};
 
 use actix_web::{
@@ -6,19 +8,19 @@ use actix_web::{
 };
 
 use crate::{
-    api::client::*,
-    api::control::member::{ControlError, Member, MemberRepository},
+    api::client::session::{WsSessionRepository, WsSessions},
+    api::control::member::{Member, MemberRepository},
     log::prelude::*,
 };
 
-/// do websocket handshake and start `WsSessions` actor
+/// Do websocket handshake and start `WsSessions` actor
 fn ws_index(
     (r, creds, state): (HttpRequest<AppState>, Path<String>, State<AppState>),
 ) -> Result<HttpResponse, Error> {
-    info!("{:?}", creds);
     let member_repo = state.members_repo.lock().unwrap();
-    match member_repo.get_member_by_credentials(creds.into_inner()) {
-        Ok(member) => {
+    match member_repo.get_by_credentials(creds.into_inner()) {
+        None => Ok(HttpResponse::NotFound().finish()),
+        Some(member) => {
             let session_repo = state.session_repo.lock().unwrap();
             if session_repo.is_connected(member.id) {
                 Ok(HttpResponse::Conflict().finish())
@@ -26,18 +28,10 @@ fn ws_index(
                 ws::start(&r, WsSessions::new(member.id))
             }
         }
-        Err(e) => match e {
-            ControlError::NotFound => Ok(HttpResponse::NotFound().finish()),
-            _ => Ok(HttpResponse::InternalServerError().finish()),
-        },
     }
 }
 
-fn index(_r: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
-    Ok(HttpResponse::Ok().finish())
-}
-
-/// State with repository address
+/// State with repositories addresses
 pub struct AppState {
     pub members_repo: Arc<Mutex<MemberRepository>>,
     pub session_repo: Arc<Mutex<WsSessionRepository>>,
@@ -49,7 +43,7 @@ pub fn run() {
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
 
-    let members_repo = Arc::new(Mutex::new(MemberRepository { members }));
+    let members_repo = Arc::new(Mutex::new(MemberRepository::new(members)));
     let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
 
     server::new(move || {
@@ -61,7 +55,6 @@ pub fn run() {
         .resource("/ws/{credentials}", |r| {
             r.method(http::Method::GET).with(ws_index)
         })
-        .resource("/", |r| r.method(http::Method::GET).f(index))
     })
     .bind("127.0.0.1:8080")
     .unwrap()
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index b21723425..0fbe865c7 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,29 +1,20 @@
+//! Member websocket session definitions and implementations.
+
 use std::time::{Duration, Instant};
 
 use actix::prelude::*;
 use actix_web::ws;
-use failure::Fail;
 use hashbrown::HashMap;
 
-use crate::{
-    api::client::*,
-    api::control::member::Id,
-    log::prelude::*,
-};
-
-#[derive(Fail, Debug, PartialEq)]
-pub enum ClientError {
-    #[fail(display = "Member already connected")]
-    AlreadyExists,
-}
+use crate::{api::client::AppState, api::control::member::Id, log::prelude::*};
 
 /// How often heartbeat pings are sent
 const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
 /// How long before lack of client response causes a timeout
 const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
 
-/// websocket connection is long running connection, it easier
-/// to handle with an actor
+/// Websocket connection is long running connection, it easier
+/// to handle with an actor.
 #[derive(Debug)]
 pub struct WsSessions {
     /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
@@ -32,16 +23,41 @@ pub struct WsSessions {
     member_id: Id,
 }
 
+impl WsSessions {
+    /// Creates new [`Member`] session with passed-in [`Member`] ID.
+    pub fn new(member_id: Id) -> Self {
+        Self {
+            hb: Instant::now(),
+            member_id,
+        }
+    }
+
+    /// Helper method that sends ping to client every second.
+    ///
+    /// Also this method checks heartbeats from client
+    fn hb(&self, ctx: &mut <Self as Actor>::Context) {
+        ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
+            if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
+                ctx.stop();
+                return;
+            }
+            ctx.ping("");
+        });
+    }
+}
+
 impl Actor for WsSessions {
     type Context = ws::WebsocketContext<Self, AppState>;
 
-    /// Method is called on actor start. We start the heartbeat process here.
+    /// Start the heartbeat process and store session in repository
+    /// on start [`Member`] session.
     fn started(&mut self, ctx: &mut Self::Context) {
         self.hb(ctx);
         let mut session_repo = ctx.state().session_repo.lock().unwrap();
         session_repo.add_session(self.member_id, ctx.address());
     }
 
+    /// Remove [`Member`] session repository after stopped session.
     fn stopped(&mut self, ctx: &mut Self::Context) {
         let mut session_repo = ctx.state().session_repo.lock().unwrap();
         session_repo.remove_session(self.member_id);
@@ -51,8 +67,6 @@ impl Actor for WsSessions {
 /// Handler for `ws::Message`
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
-        // process websocket messages
-        println!("WS: {:?}", msg);
         match msg {
             ws::Message::Ping(msg) => {
                 self.hb = Instant::now();
@@ -70,55 +84,30 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     }
 }
 
-impl WsSessions {
-    pub fn new(member_id: Id) -> Self {
-        Self {
-            hb: Instant::now(),
-            member_id,
-        }
-    }
-
-    /// helper method that sends ping to client every second.
-    ///
-    /// also this method checks heartbeats from client
-    fn hb(&self, ctx: &mut <Self as Actor>::Context) {
-        ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
-            // check client heartbeats
-            if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
-                // heartbeat timed out
-                println!("Websocket Client heartbeat failed, disconnecting!");
-
-                // stop actor
-                ctx.stop();
-
-                // don't try to send a ping
-                return;
-            }
-
-            ctx.ping("");
-        });
-    }
-}
-
+/// Address of [`Member`] session for communicate with it.
 type Client = Addr<WsSessions>;
 
+/// Repository that stores [`Member`] sessions.
 #[derive(Default, Debug)]
 pub struct WsSessionRepository {
     sessions: HashMap<Id, Client>,
 }
 
 impl WsSessionRepository {
+    /// Returns `true` if member with given ID is connected at moment.
     pub fn is_connected(&self, member_id: Id) -> bool {
         self.sessions.contains_key(&member_id)
     }
 
+    /// Stores address of [`Member`] session in repository.
     pub fn add_session(&mut self, id: Id, client: Client) {
+        debug!("add session for member: {}", id);
         self.sessions.insert(id, client);
-        info!("{:?}", self.sessions);
     }
 
+    /// Removes address of [`Member`] session in repository.
     pub fn remove_session(&mut self, id: Id) {
+        debug!("remove session for member: {}", id);
         self.sessions.remove(&id);
-        info!("{:?}", self.sessions);
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 8d1326851..0cf7b3036 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,11 +5,12 @@ use dotenv::dotenv;
 
 use crate::api::client::*;
 
-mod api;
-mod log;
 #[macro_use]
 mod utils;
 
+mod api;
+mod log;
+
 fn main() {
     dotenv().ok();
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());

From 1ab77fe28a78a09d420208a9bc00f92d7b5bf9fe Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 31 Jan 2019 10:18:03 +0200
Subject: [PATCH 021/179] Returns cloned member from repo

---
 src/api/control/member.rs | 9 +++++----
 src/main.rs               | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 108e3093d..00365b42a 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -16,7 +16,7 @@ pub struct Member {
     pub credentials: String,
 }
 
-/// Repository that stores store [`Member`]s.
+/// Repository that stores [`Member`]s.
 #[derive(Default)]
 pub struct MemberRepository {
     members: HashMap<Id, Member>,
@@ -29,17 +29,18 @@ impl MemberRepository {
     }
 
     /// Returns [`Member`] by its ID.
-    pub fn get(&self, id: Id) -> Option<&Member> {
+    pub fn get(&self, id: Id) -> Option<Member> {
         debug!("retrieve member by id: {}", id);
-        self.members.get(&id)
+        self.members.get(&id).map(|member| member.clone())
     }
 
     /// Returns [`Member`] by its credentials.
-    pub fn get_by_credentials(&self, credentials: String) -> Option<&Member> {
+    pub fn get_by_credentials(&self, credentials: String) -> Option<Member> {
         debug!("retrieve member by credentials: {}", credentials);
         self.members
             .values()
             .find(|member| member.credentials.eq(&credentials))
+            .map(|member| member.clone())
     }
 }
 
diff --git a/src/main.rs b/src/main.rs
index f0b3fe422..a95242186 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,11 +5,12 @@ use crate::{
     log::prelude::*,
 };
 
-mod api;
-mod log;
 #[macro_use]
 mod utils;
 
+mod api;
+mod log;
+
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
     let _scope_guard = slog_scope::set_global_logger(logger);

From 75b48cc5e98d3600ec57d19740de4c7a5060a8fd Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 31 Jan 2019 14:19:10 +0200
Subject: [PATCH 022/179] Some fix

---
 src/api/client/server.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index c2a967029..477ab8dfe 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -18,7 +18,7 @@ fn ws_index(
     (r, creds, state): (HttpRequest<AppState>, Path<String>, State<AppState>),
 ) -> Result<HttpResponse, Error> {
     let member_repo = state.members_repo.lock().unwrap();
-    match member_repo.get_by_credentials(creds.into_inner()) {
+    match member_repo.get_by_credentials(creds.as_str()) {
         None => Ok(HttpResponse::NotFound().finish()),
         Some(member) => {
             let session_repo = state.session_repo.lock().unwrap();

From f669e414f9ca2faf0026c31cc0bf1aab7772669a Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 31 Jan 2019 15:10:43 +0200
Subject: [PATCH 023/179] Add dependencies

---
 Cargo.lock | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |   2 +
 2 files changed, 172 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index a83447acf..44bc06b3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,13 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "arrayvec"
 version = "0.4.10"
@@ -46,6 +54,21 @@ dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "config"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam"
 version = "0.6.0"
@@ -130,6 +153,11 @@ name = "itoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lazy_static"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
@@ -140,6 +168,20 @@ name = "libc"
 version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lock_api"
 version = "0.1.5"
@@ -154,11 +196,22 @@ name = "medea"
 version = "0.1.0"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -171,6 +224,15 @@ name = "nodrop"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "nom"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.1.3 (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"
 version = "0.1.39"
@@ -179,6 +241,14 @@ dependencies = [
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.6"
@@ -311,6 +381,31 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "regex"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -342,11 +437,28 @@ name = "semver-parser"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "serde"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "serde"
 version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "serde-hjson"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.36"
@@ -357,6 +469,14 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_test"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "slog"
 version = "2.4.1"
@@ -429,6 +549,19 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "toml"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ucd-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -437,6 +570,16 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "utf8-ranges"
+version = "1.0.2"
+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 = "void"
 version = "1.0.2"
@@ -461,7 +604,16 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "yaml-rust"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
+"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
@@ -469,6 +621,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
 "checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
@@ -478,12 +631,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
+"checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
+"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum nom 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b30adc557058ce00c9d0d7cb3c6e0b5bc6f36e2e2eabe74b0ba726d194abd588"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
@@ -499,13 +658,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
+"checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
@@ -515,8 +680,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum yaml-rust 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "95acf0db5515d07da9965ec0e0ba6cc2d825e2caeb7303b66ca441729801254e"
diff --git a/Cargo.toml b/Cargo.toml
index 7281bb4ae..586d3c153 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,9 +10,11 @@ readme = "README.md"
 repository = "https://github.com/instrumentisto/medea"
 
 [dependencies]
+config = "0.9"
 chrono = "0.4"
 hashbrown = "0.1"
 slog = { version = "2.4", features = ["max_level_debug", "release_max_level_warn"] }
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
+toml = "0.4"

From 1852bad9af222da60e311677be73bfd8381514bb Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 4 Feb 2019 15:20:30 +0200
Subject: [PATCH 024/179] Remove checking old connection of member

---
 src/api/client/server.rs  | 17 ++---------------
 src/api/client/session.rs |  5 -----
 src/main.rs               | 11 ++++++++++-
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 477ab8dfe..78c6be818 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -19,15 +19,8 @@ fn ws_index(
 ) -> Result<HttpResponse, Error> {
     let member_repo = state.members_repo.lock().unwrap();
     match member_repo.get_by_credentials(creds.as_str()) {
+        Some(member) => ws::start(&r, WsSessions::new(member.id)),
         None => Ok(HttpResponse::NotFound().finish()),
-        Some(member) => {
-            let session_repo = state.session_repo.lock().unwrap();
-            if session_repo.is_connected(member.id) {
-                Ok(HttpResponse::Conflict().finish())
-            } else {
-                ws::start(&r, WsSessions::new(member.id))
-            }
-        }
     }
 }
 
@@ -37,13 +30,7 @@ pub struct AppState {
     pub session_repo: Arc<Mutex<WsSessionRepository>>,
 }
 
-pub fn run() {
-    let members = hashmap! {
-        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
-        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
-    };
-
-    let members_repo = Arc::new(Mutex::new(MemberRepository::new(members)));
+pub fn run(members_repo: Arc<Mutex<MemberRepository>>) {
     let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
 
     server::new(move || {
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 0fbe865c7..4e6e766d0 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -94,11 +94,6 @@ pub struct WsSessionRepository {
 }
 
 impl WsSessionRepository {
-    /// Returns `true` if member with given ID is connected at moment.
-    pub fn is_connected(&self, member_id: Id) -> bool {
-        self.sessions.contains_key(&member_id)
-    }
-
     /// Stores address of [`Member`] session in repository.
     pub fn add_session(&mut self, id: Id, client: Client) {
         debug!("add session for member: {}", id);
diff --git a/src/main.rs b/src/main.rs
index 0cf7b3036..f09e222f7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,11 @@
 //! Medea media server application.
+use std::sync::{Arc, Mutex};
 
 use actix::prelude::*;
 use dotenv::dotenv;
 
 use crate::api::client::*;
+use crate::api::control::*;
 
 #[macro_use]
 mod utils;
@@ -17,7 +19,14 @@ fn main() {
     let _scope_guard = slog_scope::set_global_logger(logger);
     let _guard = slog_stdlog::init().unwrap();
 
+    let members = hashmap! {
+        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+    };
+
+    let members_repo = Arc::new(Mutex::new(MemberRepository::new(members)));
+
     let sys = System::new("medea");
-    server::run();
+    server::run(members_repo);
     let _ = sys.run();
 }

From 1a3caca35b7c413dc9af1a67e2fcb04d594a21d4 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 5 Feb 2019 11:41:59 +0200
Subject: [PATCH 025/179] Impl test for handler ws connection

---
 Cargo.lock               |  1 +
 Cargo.toml               |  1 +
 src/api/client/server.rs | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index fb37dd83c..b7c5f4b7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -677,6 +677,7 @@ dependencies = [
  "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 13f4812ff..f4f4c538a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ actix = "0.7"
 actix-web = "0.7"
 chrono = "0.4"
 dotenv = "0.13"
+futures = "0.1"
 hashbrown = "0.1"
 slog = "2.4"
 slog-envlogger = "2.1"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 78c6be818..350592e3e 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -49,3 +49,42 @@ pub fn run(members_repo: Arc<Mutex<MemberRepository>>) {
 
     info!("Started http server: 127.0.0.1:8080");
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use actix_web::test;
+    use futures::stream::Stream;
+    use hashbrown::HashMap;
+
+    use crate::api::control::*;
+
+    fn test_members() -> HashMap<Id, Member> {
+        hashmap! {
+            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+        }
+    }
+
+    #[test]
+    fn connect_by_credentials() {
+        let members_repo =
+            Arc::new(Mutex::new(MemberRepository::new(test_members())));
+        let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
+
+        let mut srv = test::TestServer::with_factory(move || {
+            App::with_state(AppState {
+                members_repo: members_repo.clone(),
+                session_repo: session_repo.clone(),
+            })
+            .resource("/ws/{credentials}", |r| {
+                r.method(http::Method::GET).with(ws_index)
+            })
+        });
+        let (reader, mut writer) = srv.ws_at("/ws/caller_credentials").unwrap();
+
+        writer.text("text");
+        let (item, reader) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(item, Some(ws::Message::Text("text".to_owned())));
+    }
+}

From 7cfc1eba5dbe926178f5be8811152e6785d1b6e8 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 6 Feb 2019 11:16:14 +0200
Subject: [PATCH 026/179] Impl handle event

---
 Cargo.lock                |  14 ++++
 Cargo.toml                |   3 +
 src/api/client/server.rs  |  41 +----------
 src/api/client/session.rs | 140 +++++++++++++++++++++++++++++++-------
 src/api/control/member.rs |   1 +
 src/log/mod.rs            |   1 +
 6 files changed, 135 insertions(+), 65 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b7c5f4b7f..2423474af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -679,6 +679,9 @@ dependencies = [
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1142,6 +1145,16 @@ name = "serde"
 version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "serde_derive"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.36"
@@ -1912,6 +1925,7 @@ dependencies = [
 "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.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
 "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
diff --git a/Cargo.toml b/Cargo.toml
index f4f4c538a..f35e5f56f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,9 @@ chrono = "0.4"
 dotenv = "0.13"
 futures = "0.1"
 hashbrown = "0.1"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
 slog = "2.4"
 slog-envlogger = "2.1"
 slog-stdlog = "3.0"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 350592e3e..b97ed3a63 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -9,7 +9,7 @@ use actix_web::{
 
 use crate::{
     api::client::session::{WsSessionRepository, WsSessions},
-    api::control::member::{Member, MemberRepository},
+    api::control::member::MemberRepository,
     log::prelude::*,
 };
 
@@ -49,42 +49,3 @@ pub fn run(members_repo: Arc<Mutex<MemberRepository>>) {
 
     info!("Started http server: 127.0.0.1:8080");
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use actix_web::test;
-    use futures::stream::Stream;
-    use hashbrown::HashMap;
-
-    use crate::api::control::*;
-
-    fn test_members() -> HashMap<Id, Member> {
-        hashmap! {
-            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
-            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
-        }
-    }
-
-    #[test]
-    fn connect_by_credentials() {
-        let members_repo =
-            Arc::new(Mutex::new(MemberRepository::new(test_members())));
-        let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
-
-        let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(AppState {
-                members_repo: members_repo.clone(),
-                session_repo: session_repo.clone(),
-            })
-            .resource("/ws/{credentials}", |r| {
-                r.method(http::Method::GET).with(ws_index)
-            })
-        });
-        let (reader, mut writer) = srv.ws_at("/ws/caller_credentials").unwrap();
-
-        writer.text("text");
-        let (item, reader) = srv.execute(reader.into_future()).unwrap();
-        assert_eq!(item, Some(ws::Message::Text("text".to_owned())));
-    }
-}
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 4e6e766d0..0512f54cc 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,48 +1,59 @@
 //! Member websocket session definitions and implementations.
 
-use std::time::{Duration, Instant};
+use std::time::Duration;
 
 use actix::prelude::*;
 use actix_web::ws;
 use hashbrown::HashMap;
+use serde_derive::{Deserialize, Serialize};
 
 use crate::{api::client::AppState, api::control::member::Id, log::prelude::*};
 
-/// How often heartbeat pings are sent
-const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
-/// How long before lack of client response causes a timeout
-const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
+/// How long before lack of client message causes a timeout.
+const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
+
+#[derive(Debug, Message, Deserialize)]
+enum Event {
+    #[serde(rename = "ping")]
+    Ping(usize),
+}
+
+#[derive(Debug, Serialize)]
+enum Command {
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
 
 /// Websocket connection is long running connection, it easier
 /// to handle with an actor.
 #[derive(Debug)]
 pub struct WsSessions {
-    /// Client must send ping at least once per 10 seconds (CLIENT_TIMEOUT),
-    /// otherwise we drop connection.
-    hb: Instant,
     member_id: Id,
+    /// Client must send any text message at least once per 10 seconds
+    /// (CLIENT_IDLE_TIMEOUT), otherwise we drop connection.
+    idle_timeout_handler: Option<SpawnHandle>,
 }
 
 impl WsSessions {
     /// Creates new [`Member`] session with passed-in [`Member`] ID.
     pub fn new(member_id: Id) -> Self {
         Self {
-            hb: Instant::now(),
             member_id,
+            idle_timeout_handler: None,
         }
     }
 
     /// Helper method that sends ping to client every second.
     ///
     /// Also this method checks heartbeats from client
-    fn hb(&self, ctx: &mut <Self as Actor>::Context) {
-        ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
-            if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {
+    fn hb(&mut self, ctx: &mut <Self as Actor>::Context) {
+        if let Some(handler) = self.idle_timeout_handler {
+            ctx.cancel_future(handler);
+        }
+        self.idle_timeout_handler =
+            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |_, ctx| {
                 ctx.stop();
-                return;
-            }
-            ctx.ping("");
-        });
+            }));
     }
 }
 
@@ -64,22 +75,38 @@ impl Actor for WsSessions {
     }
 }
 
+impl Handler<Event> for WsSessions {
+    type Result = ();
+
+    fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
+        match event {
+            Event::Ping(n) => {
+                ctx.text(serde_json::to_string(&Command::Pong(n)).unwrap())
+            }
+        };
+    }
+}
+
 /// Handler for `ws::Message`
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
         match msg {
-            ws::Message::Ping(msg) => {
-                self.hb = Instant::now();
-                ctx.pong(&msg);
+            ws::Message::Text(text) => {
+                match serde_json::from_str::<Event>(&text) {
+                    Ok(event) => {
+                        println!("Received status:\n{:?}\n", event);
+                        ctx.notify(event);
+                        self.hb(ctx);
+                    }
+                    Err(e) => {
+                        ctx.text(format!("Could not parse event: {}\n", e));
+                    }
+                }
             }
-            ws::Message::Pong(_) => {
-                self.hb = Instant::now();
-            }
-            ws::Message::Text(text) => ctx.text(text),
-            ws::Message::Binary(bin) => ctx.binary(bin),
-            ws::Message::Close(_) => {
+            ws::Message::Binary(_) | ws::Message::Close(_) => {
                 ctx.stop();
             }
+            _ => (),
         }
     }
 }
@@ -106,3 +133,66 @@ impl WsSessionRepository {
         self.sessions.remove(&id);
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::sync::{Arc, Mutex};
+    use std::{thread, time};
+
+    use actix_web::{error, http, test, App};
+    use futures::stream::Stream;
+
+    use super::*;
+    use crate::api::control::*;
+
+    #[test]
+    fn connect_by_credentials() {
+        let members_repo = Arc::new(Mutex::new(MemberRepository::default()));
+        let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
+
+        let mut srv = test::TestServer::with_factory(move || {
+            App::with_state(AppState {
+                members_repo: members_repo.clone(),
+                session_repo: session_repo.clone(),
+            })
+            .resource("/ws/", |r| {
+                r.method(http::Method::GET)
+                    .with(|r| ws::start(&r, WsSessions::new(1)))
+            })
+        });
+        let (reader, mut writer) = srv.ws_at("/ws/").unwrap();
+
+        writer.text(r#"{"ping":33}"#);
+        let (item, _reader) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
+    }
+
+    #[test]
+    fn disconnect_by_timeout() {
+        let members_repo = Arc::new(Mutex::new(MemberRepository::default()));
+        let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
+
+        let mut srv = test::TestServer::with_factory(move || {
+            App::with_state(AppState {
+                members_repo: members_repo.clone(),
+                session_repo: session_repo.clone(),
+            })
+            .resource("/ws/{credentials}", |r| {
+                r.method(http::Method::GET)
+                    .with(|r| ws::start(&r, WsSessions::new(1)))
+            })
+        });
+        let (reader, mut writer) = srv.ws_at("/ws/caller_credentials").unwrap();
+
+        thread::sleep(CLIENT_IDLE_TIMEOUT);
+
+        writer.text(r#"{"ping":33}"#);
+        assert!(match srv.execute(reader.into_future()) {
+            Err((
+                ws::ProtocolError::Payload(error::PayloadError::Io(_)),
+                _,
+            )) => true,
+            _ => false,
+        });
+    }
+}
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index 162ab45b3..d566502dc 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -29,6 +29,7 @@ impl MemberRepository {
     }
 
     /// Returns [`Member`] by its ID.
+    #[allow(dead_code)]
     pub fn get(&self, id: Id) -> Option<Member> {
         debug!("retrieve member by id: {}", id);
         self.members.get(&id).map(|member| member.clone())
diff --git a/src/log/mod.rs b/src/log/mod.rs
index a9b8d4c6b..82aaeaf4c 100644
--- a/src/log/mod.rs
+++ b/src/log/mod.rs
@@ -37,6 +37,7 @@ where
 ///
 /// Created [`Logger`] produces log records with `lvl`, `time` and `msg` fields
 /// by default.
+#[allow(dead_code)]
 pub fn new_logger<W>(w: W) -> Logger
 where
     W: io::Write + Send + 'static,

From 330128465e6a76c5d0fa712969074bd939ccee11 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 6 Feb 2019 15:37:29 +0200
Subject: [PATCH 027/179] Impl settings

---
 Cargo.lock               | 133 +++++++++++++++++++++++++++++++++++++++
 Cargo.toml               |   6 ++
 config.toml              |   0
 src/main.rs              |  10 +++
 src/settings/duration.rs |  53 ++++++++++++++++
 src/settings/mod.rs      |  25 ++++++++
 src/settings/server.rs   |  20 ++++++
 7 files changed, 247 insertions(+)
 create mode 100644 config.toml
 create mode 100644 src/settings/duration.rs
 create mode 100644 src/settings/mod.rs
 create mode 100644 src/settings/server.rs

diff --git a/Cargo.lock b/Cargo.lock
index 44bc06b3f..4b5b609c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,6 +21,28 @@ name = "autocfg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "backtrace"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.0.4"
@@ -31,6 +53,11 @@ name = "byteorder"
 version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cc"
+version = "1.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.6"
@@ -125,6 +152,36 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "dotenv"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -197,7 +254,13 @@ version = "0.1.0"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -291,6 +354,22 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro2"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand"
 version = "0.6.4"
@@ -406,6 +485,11 @@ name = "rust-ini"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -459,6 +543,16 @@ dependencies = [
  "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_derive"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.36"
@@ -526,6 +620,27 @@ name = "stable_deref_trait"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "syn"
+version = "0.15.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "take_mut"
 version = "0.2.2"
@@ -562,6 +677,11 @@ name = "ucd-util"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unreachable"
 version = "1.0.0"
@@ -616,8 +736,11 @@ dependencies = [
 "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
+"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
+"checksum cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)" = "4390a3b5f4f6bce9c1d0c00128379df433e53777fdd30e92f16a529332baec4e"
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
@@ -627,6 +750,9 @@ dependencies = [
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "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 hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
@@ -648,6 +774,8 @@ dependencies = [
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
 "checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
@@ -661,6 +789,7 @@ dependencies = [
 "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
 "checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
@@ -669,6 +798,7 @@ dependencies = [
 "checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
+"checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
@@ -677,11 +807,14 @@ dependencies = [
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
+"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 "checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
diff --git a/Cargo.toml b/Cargo.toml
index 586d3c153..159bfe39a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,13 @@ repository = "https://github.com/instrumentisto/medea"
 [dependencies]
 config = "0.9"
 chrono = "0.4"
+dotenv = "0.13"
+failure = "0.1"
 hashbrown = "0.1"
+lazy_static = "1.2"
+regex = "1"
+serde = "1"
+serde_derive = "1"
 slog = { version = "2.4", features = ["max_level_debug", "release_max_level_warn"] }
 slog-async = "2.3"
 slog-json = "2.3"
diff --git a/config.toml b/config.toml
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/main.rs b/src/main.rs
index 2a30589d0..5532e126b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,11 @@
 //! Medea media server application.
 
+use dotenv::dotenv;
+
 use crate::{
     api::control::{Member, MemberRepository},
     log::prelude::*,
+    settings::Settings,
 };
 
 #[macro_use]
@@ -10,8 +13,10 @@ mod utils;
 
 mod api;
 mod log;
+mod settings;
 
 fn main() {
+    dotenv().ok();
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
     let _scope_guard = slog_scope::set_global_logger(logger);
 
@@ -24,4 +29,9 @@ fn main() {
         info!("Hooray!");
         warn!("It works");
     }
+
+    match Settings::new() {
+        Ok(settings) => info!("{:?}", settings),
+        Err(e) => error!("settings error: {}", e),
+    }
 }
diff --git a/src/settings/duration.rs b/src/settings/duration.rs
new file mode 100644
index 000000000..c0a23862d
--- /dev/null
+++ b/src/settings/duration.rs
@@ -0,0 +1,53 @@
+use std::fmt;
+use std::time::Duration;
+
+use lazy_static::*;
+use regex::Regex;
+use serde::de::{self, Unexpected};
+use serde::Serializer;
+
+lazy_static! {
+    static ref REGEX_DURATION: Regex =
+        Regex::new(r"^(?P<minutes>\d+)m|(?P<seconds>\d+)s$").unwrap();
+}
+
+struct DurationFromStringVisitor;
+
+pub fn deserialize<'de, D>(d: D) -> Result<Duration, D::Error>
+where
+    D: de::Deserializer<'de>,
+{
+    Ok(d.deserialize_str(DurationFromStringVisitor)?)
+}
+
+impl<'de> de::Visitor<'de> for DurationFromStringVisitor {
+    type Value = Duration;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "a string representation of duration")
+    }
+
+    fn visit_str<E>(self, value: &str) -> Result<Duration, E>
+    where
+        E: de::Error,
+    {
+        let caps = REGEX_DURATION
+            .captures(value)
+            .ok_or(de::Error::invalid_value(Unexpected::Str(value), &self))?;
+        let m = caps
+            .name("minutes")
+            .map_or(0, |s| s.as_str().parse::<u64>().unwrap());
+        let s = caps
+            .name("seconds")
+            .map_or(0, |s| s.as_str().parse::<u64>().unwrap());
+
+        Ok(Duration::from_secs(m * 60 + s))
+    }
+}
+
+pub fn serialize<S>(d: &Duration, s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    s.serialize_str(format!("{}s", d.as_secs()).as_str())
+}
diff --git a/src/settings/mod.rs b/src/settings/mod.rs
new file mode 100644
index 000000000..5810a1cdb
--- /dev/null
+++ b/src/settings/mod.rs
@@ -0,0 +1,25 @@
+use config::{Config, Environment, File, FileFormat};
+use failure::Error;
+use serde_derive::{Deserialize, Serialize};
+use toml::to_string;
+
+mod duration;
+mod server;
+
+#[derive(Debug, Default, Deserialize, Serialize)]
+pub struct Settings {
+    server: server::Server,
+}
+
+impl Settings {
+    pub fn new() -> Result<Self, Error> {
+        let mut cfg = Config::new();
+        let defaults = to_string(&Settings::default())?;
+        cfg.merge(File::from_str(defaults.as_str(), FileFormat::Toml))?;
+        cfg.merge(File::with_name("config"))?;
+        cfg.merge(Environment::with_prefix("conf").separator("__"))?;
+
+        let s: Settings = cfg.try_into()?;
+        Ok(s)
+    }
+}
diff --git a/src/settings/server.rs b/src/settings/server.rs
new file mode 100644
index 000000000..0826c64fd
--- /dev/null
+++ b/src/settings/server.rs
@@ -0,0 +1,20 @@
+use std::time::Duration;
+
+use serde_derive::{Deserialize, Serialize};
+
+use crate::settings::duration;
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Server {
+    #[serde(serialize_with = "duration::serialize")]
+    #[serde(deserialize_with = "duration::deserialize")]
+    client_idle_timeout: Duration,
+}
+
+impl Default for Server {
+    fn default() -> Server {
+        Server {
+            client_idle_timeout: Duration::from_secs(10),
+        }
+    }
+}

From 50adeadb61a27a70b82b41b783c948a46d9dddd1 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 6 Feb 2019 17:11:44 +0200
Subject: [PATCH 028/179] Impl handle Command::Close

---
 src/api/client/commands.rs | 12 +++++++
 src/api/client/events.rs   |  8 +++++
 src/api/client/mod.rs      |  4 ++-
 src/api/client/session.rs  | 71 +++++++++++++++++++-------------------
 4 files changed, 58 insertions(+), 37 deletions(-)
 create mode 100644 src/api/client/commands.rs
 create mode 100644 src/api/client/events.rs

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
new file mode 100644
index 000000000..ba046aa4f
--- /dev/null
+++ b/src/api/client/commands.rs
@@ -0,0 +1,12 @@
+use actix::Message;
+use actix_web::ws::CloseReason;
+use serde_derive::Deserialize;
+
+/// Command is WebSocket messages sent by [`Web Client`] to [`Media Server`].
+#[derive(Debug, Message, Deserialize)]
+pub enum Command {
+    #[serde(rename = "ping")]
+    Ping(usize),
+    #[serde(rename = "close")]
+    Close(Option<CloseReason>),
+}
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
new file mode 100644
index 000000000..25736b0e7
--- /dev/null
+++ b/src/api/client/events.rs
@@ -0,0 +1,8 @@
+use serde_derive::Serialize;
+
+/// Event is WebSocket messages sent by [`Media Server`] to [`Web Client`].
+#[derive(Debug, Serialize)]
+pub enum Event {
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 72e5481c4..baed28332 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,4 +1,6 @@
+pub mod commands;
+pub mod events;
 pub mod server;
 pub mod session;
 
-pub use self::{server::*, session::*};
+pub use self::{commands::Command, events::Event, server::*, session::*};
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 0512f54cc..5201422ef 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -5,25 +5,16 @@ use std::time::Duration;
 use actix::prelude::*;
 use actix_web::ws;
 use hashbrown::HashMap;
-use serde_derive::{Deserialize, Serialize};
 
-use crate::{api::client::AppState, api::control::member::Id, log::prelude::*};
+use crate::{
+    api::client::{AppState, Command, Event},
+    api::control::member::Id,
+    log::prelude::*,
+};
 
 /// How long before lack of client message causes a timeout.
 const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
 
-#[derive(Debug, Message, Deserialize)]
-enum Event {
-    #[serde(rename = "ping")]
-    Ping(usize),
-}
-
-#[derive(Debug, Serialize)]
-enum Command {
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
-
 /// Websocket connection is long running connection, it easier
 /// to handle with an actor.
 #[derive(Debug)]
@@ -43,16 +34,15 @@ impl WsSessions {
         }
     }
 
-    /// Helper method that sends ping to client every second.
-    ///
-    /// Also this method checks heartbeats from client
+    /// Helper method that update read timeout handler after every message
+    /// from [`Web Client`].
     fn hb(&mut self, ctx: &mut <Self as Actor>::Context) {
         if let Some(handler) = self.idle_timeout_handler {
             ctx.cancel_future(handler);
         }
         self.idle_timeout_handler =
             Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |_, ctx| {
-                ctx.stop();
+                ctx.notify(Command::Close(Some(ws::CloseCode::Away.into())));
             }));
     }
 }
@@ -63,9 +53,14 @@ impl Actor for WsSessions {
     /// Start the heartbeat process and store session in repository
     /// on start [`Member`] session.
     fn started(&mut self, ctx: &mut Self::Context) {
+        let mut session_repo: WsSessionRepository =
+            ctx.state().session_repo.lock().unwrap();
+        if let Some(old) =
+            session_repo.add_session(self.member_id, ctx.address())
+        {
+            old.send(Command::Close(None));
+        }
         self.hb(ctx);
-        let mut session_repo = ctx.state().session_repo.lock().unwrap();
-        session_repo.add_session(self.member_id, ctx.address());
     }
 
     /// Remove [`Member`] session repository after stopped session.
@@ -75,13 +70,18 @@ impl Actor for WsSessions {
     }
 }
 
-impl Handler<Event> for WsSessions {
+/// Handler for `Command`.
+impl Handler<Command> for WsSessions {
     type Result = ();
 
-    fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
-        match event {
-            Event::Ping(n) => {
-                ctx.text(serde_json::to_string(&Command::Pong(n)).unwrap())
+    fn handle(&mut self, command: Command, ctx: &mut Self::Context) {
+        match command {
+            Command::Ping(n) => {
+                ctx.text(serde_json::to_string(&Event::Pong(n)).unwrap())
+            }
+            Command::Close(reason) => {
+                ctx.close(reason);
+                ctx.stop();
             }
         };
     }
@@ -92,20 +92,19 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
         match msg {
             ws::Message::Text(text) => {
-                match serde_json::from_str::<Event>(&text) {
-                    Ok(event) => {
-                        println!("Received status:\n{:?}\n", event);
-                        ctx.notify(event);
+                match serde_json::from_str::<Command>(&text) {
+                    Ok(command) => {
+                        println!("Received command:\n{:?}\n", command);
+                        ctx.notify(command);
                         self.hb(ctx);
                     }
                     Err(e) => {
-                        ctx.text(format!("Could not parse event: {}\n", e));
+                        ctx.text(format!("Could not parse command: {}\n", e));
                     }
                 }
             }
-            ws::Message::Binary(_) | ws::Message::Close(_) => {
-                ctx.stop();
-            }
+            ws::Message::Binary(_) => ctx.notify(Command::Close(None)),
+            ws::Message::Close(reason) => ctx.notify(Command::Close(reason)),
             _ => (),
         }
     }
@@ -122,9 +121,9 @@ pub struct WsSessionRepository {
 
 impl WsSessionRepository {
     /// Stores address of [`Member`] session in repository.
-    pub fn add_session(&mut self, id: Id, client: Client) {
+    pub fn add_session(&mut self, id: Id, client: Client) -> Option<Client> {
         debug!("add session for member: {}", id);
-        self.sessions.insert(id, client);
+        self.sessions.insert(id, client)
     }
 
     /// Removes address of [`Member`] session in repository.
@@ -137,7 +136,7 @@ impl WsSessionRepository {
 #[cfg(test)]
 mod tests {
     use std::sync::{Arc, Mutex};
-    use std::{thread, time};
+    use std::thread;
 
     use actix_web::{error, http, test, App};
     use futures::stream::Stream;

From 7b84926fb3a3d2f1bf9e62de4370edec568f3b48 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 7 Feb 2019 12:06:37 +0200
Subject: [PATCH 029/179] Impl close message

---
 src/api/client/commands.rs |  3 ---
 src/api/client/session.rs  | 38 ++++++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index ba046aa4f..e0cf10a7f 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -1,5 +1,4 @@
 use actix::Message;
-use actix_web::ws::CloseReason;
 use serde_derive::Deserialize;
 
 /// Command is WebSocket messages sent by [`Web Client`] to [`Media Server`].
@@ -7,6 +6,4 @@ use serde_derive::Deserialize;
 pub enum Command {
     #[serde(rename = "ping")]
     Ping(usize),
-    #[serde(rename = "close")]
-    Close(Option<CloseReason>),
 }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 5201422ef..a457076e3 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -4,6 +4,7 @@ use std::time::Duration;
 
 use actix::prelude::*;
 use actix_web::ws;
+use actix_web::ws::CloseReason;
 use hashbrown::HashMap;
 
 use crate::{
@@ -15,6 +16,10 @@ use crate::{
 /// How long before lack of client message causes a timeout.
 const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
 
+/// Message for close old member session when reconnect [`Web Client`].
+#[derive(Message)]
+struct Close(Option<CloseReason>);
+
 /// Websocket connection is long running connection, it easier
 /// to handle with an actor.
 #[derive(Debug)]
@@ -42,7 +47,9 @@ impl WsSessions {
         }
         self.idle_timeout_handler =
             Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |_, ctx| {
-                ctx.notify(Command::Close(Some(ws::CloseCode::Away.into())));
+                debug!("Client timeout");
+                ctx.close(Some(ws::CloseCode::Away.into()));
+                ctx.stop();
             }));
     }
 }
@@ -53,14 +60,13 @@ impl Actor for WsSessions {
     /// Start the heartbeat process and store session in repository
     /// on start [`Member`] session.
     fn started(&mut self, ctx: &mut Self::Context) {
-        let mut session_repo: WsSessionRepository =
-            ctx.state().session_repo.lock().unwrap();
+        self.hb(ctx);
+        let mut session_repo = ctx.state().session_repo.lock().unwrap();
         if let Some(old) =
             session_repo.add_session(self.member_id, ctx.address())
         {
-            old.send(Command::Close(None));
+            old.do_send(Close(None));
         }
-        self.hb(ctx);
     }
 
     /// Remove [`Member`] session repository after stopped session.
@@ -70,6 +76,16 @@ impl Actor for WsSessions {
     }
 }
 
+/// Handler for `Close`.
+impl Handler<Close> for WsSessions {
+    type Result = ();
+
+    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
+        ctx.close(close.0);
+        ctx.stop();
+    }
+}
+
 /// Handler for `Command`.
 impl Handler<Command> for WsSessions {
     type Result = ();
@@ -79,10 +95,6 @@ impl Handler<Command> for WsSessions {
             Command::Ping(n) => {
                 ctx.text(serde_json::to_string(&Event::Pong(n)).unwrap())
             }
-            Command::Close(reason) => {
-                ctx.close(reason);
-                ctx.stop();
-            }
         };
     }
 }
@@ -94,7 +106,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
             ws::Message::Text(text) => {
                 match serde_json::from_str::<Command>(&text) {
                     Ok(command) => {
-                        println!("Received command:\n{:?}\n", command);
+                        debug!("Received command:\n{:?}\n", command);
                         ctx.notify(command);
                         self.hb(ctx);
                     }
@@ -103,8 +115,10 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
                     }
                 }
             }
-            ws::Message::Binary(_) => ctx.notify(Command::Close(None)),
-            ws::Message::Close(reason) => ctx.notify(Command::Close(reason)),
+            ws::Message::Close(reason) => {
+                ctx.close(reason);
+                ctx.stop();
+            }
             _ => (),
         }
     }

From 4b0a60b8c9d119355321a36c108345ce9f2fe4e3 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 7 Feb 2019 12:48:00 +0200
Subject: [PATCH 030/179] Add docs

---
 config.default.toml      | 5 +++++
 src/settings/duration.rs | 1 +
 src/settings/mod.rs      | 3 +++
 src/settings/server.rs   | 3 +++
 4 files changed, 12 insertions(+)
 create mode 100644 config.default.toml

diff --git a/config.default.toml b/config.default.toml
new file mode 100644
index 000000000..ebf1a99ce
--- /dev/null
+++ b/config.default.toml
@@ -0,0 +1,5 @@
+[server]
+# Timeout for websocket session to wait message from [`Web Client`].
+#
+# Default:
+#   idle_timeout = "10s"
diff --git a/src/settings/duration.rs b/src/settings/duration.rs
index c0a23862d..695666f6c 100644
--- a/src/settings/duration.rs
+++ b/src/settings/duration.rs
@@ -1,3 +1,4 @@
+/// Provides deserialize [`time::Duration`] from string.
 use std::fmt;
 use std::time::Duration;
 
diff --git a/src/settings/mod.rs b/src/settings/mod.rs
index 5810a1cdb..b8f77d051 100644
--- a/src/settings/mod.rs
+++ b/src/settings/mod.rs
@@ -1,3 +1,6 @@
+/// Provides application configuration options.
+///
+/// Configuration options can be parsed from config files in TOML format.
 use config::{Config, Environment, File, FileFormat};
 use failure::Error;
 use serde_derive::{Deserialize, Serialize};
diff --git a/src/settings/server.rs b/src/settings/server.rs
index 0826c64fd..87dfbafac 100644
--- a/src/settings/server.rs
+++ b/src/settings/server.rs
@@ -4,13 +4,16 @@ use serde_derive::{Deserialize, Serialize};
 
 use crate::settings::duration;
 
+/// Server represents [server] configuration section.
 #[derive(Debug, Deserialize, Serialize)]
 pub struct Server {
+    /// Timeout for websocket session to wait message from [`Web Client`].
     #[serde(serialize_with = "duration::serialize")]
     #[serde(deserialize_with = "duration::deserialize")]
     client_idle_timeout: Duration,
 }
 
+/// Default returns default configuration parameters of [server] section.
 impl Default for Server {
     fn default() -> Server {
         Server {

From 7edfc62e9dea290a30371a8ae5aaf6ef298c4d4b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 8 Feb 2019 12:01:30 +0200
Subject: [PATCH 031/179] Add heartbeat messages

---
 src/api/client/commands.rs |  9 -------
 src/api/client/events.rs   |  8 ------
 src/api/client/mod.rs      |  4 +--
 src/api/client/session.rs  | 55 +++++++++++++++-----------------------
 4 files changed, 23 insertions(+), 53 deletions(-)
 delete mode 100644 src/api/client/commands.rs
 delete mode 100644 src/api/client/events.rs

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
deleted file mode 100644
index e0cf10a7f..000000000
--- a/src/api/client/commands.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use actix::Message;
-use serde_derive::Deserialize;
-
-/// Command is WebSocket messages sent by [`Web Client`] to [`Media Server`].
-#[derive(Debug, Message, Deserialize)]
-pub enum Command {
-    #[serde(rename = "ping")]
-    Ping(usize),
-}
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
deleted file mode 100644
index 25736b0e7..000000000
--- a/src/api/client/events.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use serde_derive::Serialize;
-
-/// Event is WebSocket messages sent by [`Media Server`] to [`Web Client`].
-#[derive(Debug, Serialize)]
-pub enum Event {
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index baed28332..72e5481c4 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,6 +1,4 @@
-pub mod commands;
-pub mod events;
 pub mod server;
 pub mod session;
 
-pub use self::{commands::Command, events::Event, server::*, session::*};
+pub use self::{server::*, session::*};
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index a457076e3..0abba2ff5 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -6,12 +6,9 @@ use actix::prelude::*;
 use actix_web::ws;
 use actix_web::ws::CloseReason;
 use hashbrown::HashMap;
+use serde_derive::{Deserialize, Serialize};
 
-use crate::{
-    api::client::{AppState, Command, Event},
-    api::control::member::Id,
-    log::prelude::*,
-};
+use crate::{api::client::AppState, api::control::member::Id, log::prelude::*};
 
 /// How long before lack of client message causes a timeout.
 const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
@@ -20,6 +17,15 @@ const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
 #[derive(Message)]
 struct Close(Option<CloseReason>);
 
+/// Messages to keep [`Web Client`] alive.
+#[derive(Debug, Deserialize, Serialize)]
+pub enum Heartbeat {
+    #[serde(rename = "ping")]
+    Ping(usize),
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
+
 /// Websocket connection is long running connection, it easier
 /// to handle with an actor.
 #[derive(Debug)]
@@ -48,8 +54,7 @@ impl WsSessions {
         self.idle_timeout_handler =
             Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |_, ctx| {
                 debug!("Client timeout");
-                ctx.close(Some(ws::CloseCode::Away.into()));
-                ctx.stop();
+                ctx.notify(Close(Some(ws::CloseCode::Away.into())));
             }));
     }
 }
@@ -86,39 +91,23 @@ impl Handler<Close> for WsSessions {
     }
 }
 
-/// Handler for `Command`.
-impl Handler<Command> for WsSessions {
-    type Result = ();
-
-    fn handle(&mut self, command: Command, ctx: &mut Self::Context) {
-        match command {
-            Command::Ping(n) => {
-                ctx.text(serde_json::to_string(&Event::Pong(n)).unwrap())
-            }
-        };
-    }
-}
-
 /// Handler for `ws::Message`
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
         match msg {
             ws::Message::Text(text) => {
-                match serde_json::from_str::<Command>(&text) {
-                    Ok(command) => {
-                        debug!("Received command:\n{:?}\n", command);
-                        ctx.notify(command);
-                        self.hb(ctx);
+                match serde_json::from_str::<Heartbeat>(&text) {
+                    Ok(Heartbeat::Ping(n)) => {
+                        debug!("Received ping: {}", n);
+                        ctx.text(
+                            serde_json::to_string(&Heartbeat::Pong(n)).unwrap(),
+                        )
                     }
-                    Err(e) => {
-                        ctx.text(format!("Could not parse command: {}\n", e));
-                    }
-                }
-            }
-            ws::Message::Close(reason) => {
-                ctx.close(reason);
-                ctx.stop();
+                    _ => {}
+                };
+                self.hb(ctx);
             }
+            ws::Message::Close(reason) => ctx.notify(Close(reason)),
             _ => (),
         }
     }

From 0ca49875097be5902b96c60ef8fb46b6bb6e0fc7 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 8 Feb 2019 12:31:40 +0200
Subject: [PATCH 032/179] Impl handle heartbeat messages

---
 src/api/client/session.rs | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 0abba2ff5..e4528c25a 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -18,7 +18,7 @@ const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
 struct Close(Option<CloseReason>);
 
 /// Messages to keep [`Web Client`] alive.
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Message, Deserialize, Serialize)]
 pub enum Heartbeat {
     #[serde(rename = "ping")]
     Ping(usize),
@@ -91,19 +91,25 @@ impl Handler<Close> for WsSessions {
     }
 }
 
+/// Handler for `Heartbeat`.
+impl Handler<Heartbeat> for WsSessions {
+    type Result = ();
+
+    fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
+        if let Heartbeat::Ping(n) = msg {
+            debug!("Received ping: {}", n);
+            ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
+        }
+    }
+}
+
 /// Handler for `ws::Message`
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
         match msg {
             ws::Message::Text(text) => {
-                match serde_json::from_str::<Heartbeat>(&text) {
-                    Ok(Heartbeat::Ping(n)) => {
-                        debug!("Received ping: {}", n);
-                        ctx.text(
-                            serde_json::to_string(&Heartbeat::Pong(n)).unwrap(),
-                        )
-                    }
-                    _ => {}
+                if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
+                    ctx.notify(msg);
                 };
                 self.hb(ctx);
             }

From 76ae3b0e2d3fdd0db7bc19a981ec4e691347857e Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 12 Feb 2019 13:47:57 +0200
Subject: [PATCH 033/179] Refactoring repositories

---
 src/api/client/server.rs  | 26 +++++++++-----------
 src/api/client/session.rs | 50 +++++++++++++++++++++++----------------
 src/api/control/member.rs | 15 ++++++++----
 src/main.rs               |  4 +---
 4 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index b97ed3a63..bee8f9afb 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -1,40 +1,36 @@
 //! Implementation HTTP server for handle websocket connections.
 
-use std::sync::{Arc, Mutex};
-
 use actix_web::{
     http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, Path,
     State,
 };
 
 use crate::{
-    api::client::session::{WsSessionRepository, WsSessions},
+    api::client::session::{WsSessionRepository, WsSessionState, WsSessions},
     api::control::member::MemberRepository,
     log::prelude::*,
 };
 
 /// Do websocket handshake and start `WsSessions` actor
 fn ws_index(
-    (r, creds, state): (HttpRequest<AppState>, Path<String>, State<AppState>),
+    (r, creds, state): (
+        HttpRequest<WsSessionState>,
+        Path<String>,
+        State<WsSessionState>,
+    ),
 ) -> Result<HttpResponse, Error> {
-    let member_repo = state.members_repo.lock().unwrap();
-    match member_repo.get_by_credentials(creds.as_str()) {
+    match state.members_repo.get_by_credentials(creds.as_str()) {
         Some(member) => ws::start(&r, WsSessions::new(member.id)),
         None => Ok(HttpResponse::NotFound().finish()),
     }
 }
 
-/// State with repositories addresses
-pub struct AppState {
-    pub members_repo: Arc<Mutex<MemberRepository>>,
-    pub session_repo: Arc<Mutex<WsSessionRepository>>,
-}
-
-pub fn run(members_repo: Arc<Mutex<MemberRepository>>) {
-    let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
+/// Starts HTTP server for handle websocket upgrade request.
+pub fn run(members_repo: MemberRepository) {
+    let session_repo = WsSessionRepository::default();
 
     server::new(move || {
-        App::with_state(AppState {
+        App::with_state(WsSessionState {
             members_repo: members_repo.clone(),
             session_repo: session_repo.clone(),
         })
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index e4528c25a..411fbb377 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,5 +1,6 @@
 //! Member websocket session definitions and implementations.
 
+use std::sync::{Arc, Mutex};
 use std::time::Duration;
 
 use actix::prelude::*;
@@ -8,7 +9,10 @@ use actix_web::ws::CloseReason;
 use hashbrown::HashMap;
 use serde_derive::{Deserialize, Serialize};
 
-use crate::{api::client::AppState, api::control::member::Id, log::prelude::*};
+use crate::{
+    api::control::member::{Id, MemberRepository},
+    log::prelude::*,
+};
 
 /// How long before lack of client message causes a timeout.
 const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
@@ -26,6 +30,12 @@ pub enum Heartbeat {
     Pong(usize),
 }
 
+/// State with repositories addresses
+pub struct WsSessionState {
+    pub members_repo: MemberRepository,
+    pub session_repo: WsSessionRepository,
+}
+
 /// Websocket connection is long running connection, it easier
 /// to handle with an actor.
 #[derive(Debug)]
@@ -45,9 +55,9 @@ impl WsSessions {
         }
     }
 
-    /// Helper method that update read timeout handler after every message
+    /// Helper method that set idle timeout handler after every message
     /// from [`Web Client`].
-    fn hb(&mut self, ctx: &mut <Self as Actor>::Context) {
+    fn set_idle_timeout(&mut self, ctx: &mut <Self as Actor>::Context) {
         if let Some(handler) = self.idle_timeout_handler {
             ctx.cancel_future(handler);
         }
@@ -60,13 +70,13 @@ impl WsSessions {
 }
 
 impl Actor for WsSessions {
-    type Context = ws::WebsocketContext<Self, AppState>;
+    type Context = ws::WebsocketContext<Self, WsSessionState>;
 
     /// Start the heartbeat process and store session in repository
     /// on start [`Member`] session.
     fn started(&mut self, ctx: &mut Self::Context) {
-        self.hb(ctx);
-        let mut session_repo = ctx.state().session_repo.lock().unwrap();
+        self.set_idle_timeout(ctx);
+        let mut session_repo = ctx.state().session_repo.clone();
         if let Some(old) =
             session_repo.add_session(self.member_id, ctx.address())
         {
@@ -76,7 +86,7 @@ impl Actor for WsSessions {
 
     /// Remove [`Member`] session repository after stopped session.
     fn stopped(&mut self, ctx: &mut Self::Context) {
-        let mut session_repo = ctx.state().session_repo.lock().unwrap();
+        let mut session_repo = ctx.state().session_repo.clone();
         session_repo.remove_session(self.member_id);
     }
 }
@@ -111,7 +121,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
                 if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
                     ctx.notify(msg);
                 };
-                self.hb(ctx);
+                self.set_idle_timeout(ctx);
             }
             ws::Message::Close(reason) => ctx.notify(Close(reason)),
             _ => (),
@@ -123,43 +133,43 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
 type Client = Addr<WsSessions>;
 
 /// Repository that stores [`Member`] sessions.
-#[derive(Default, Debug)]
+#[derive(Clone, Default, Debug)]
 pub struct WsSessionRepository {
-    sessions: HashMap<Id, Client>,
+    sessions: Arc<Mutex<HashMap<Id, Client>>>,
 }
 
 impl WsSessionRepository {
     /// Stores address of [`Member`] session in repository.
     pub fn add_session(&mut self, id: Id, client: Client) -> Option<Client> {
         debug!("add session for member: {}", id);
-        self.sessions.insert(id, client)
+        let mut sessions = self.sessions.lock().unwrap();
+        sessions.insert(id, client)
     }
 
     /// Removes address of [`Member`] session in repository.
     pub fn remove_session(&mut self, id: Id) {
         debug!("remove session for member: {}", id);
-        self.sessions.remove(&id);
+        let mut sessions = self.sessions.lock().unwrap();
+        sessions.remove(&id);
     }
 }
 
 #[cfg(test)]
 mod tests {
-    use std::sync::{Arc, Mutex};
     use std::thread;
 
     use actix_web::{error, http, test, App};
     use futures::stream::Stream;
 
     use super::*;
-    use crate::api::control::*;
 
     #[test]
     fn connect_by_credentials() {
-        let members_repo = Arc::new(Mutex::new(MemberRepository::default()));
-        let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
+        let members_repo = MemberRepository::default();
+        let session_repo = WsSessionRepository::default();
 
         let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(AppState {
+            App::with_state(WsSessionState {
                 members_repo: members_repo.clone(),
                 session_repo: session_repo.clone(),
             })
@@ -177,11 +187,11 @@ mod tests {
 
     #[test]
     fn disconnect_by_timeout() {
-        let members_repo = Arc::new(Mutex::new(MemberRepository::default()));
-        let session_repo = Arc::new(Mutex::new(WsSessionRepository::default()));
+        let members_repo = MemberRepository::default();
+        let session_repo = WsSessionRepository::default();
 
         let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(AppState {
+            App::with_state(WsSessionState {
                 members_repo: members_repo.clone(),
                 session_repo: session_repo.clone(),
             })
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index d566502dc..d1087b931 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,4 +1,5 @@
 //! Member definitions and implementations.
+use std::sync::{Arc, Mutex};
 
 use hashbrown::HashMap;
 
@@ -17,28 +18,32 @@ pub struct Member {
 }
 
 /// Repository that stores [`Member`]s.
-#[derive(Default)]
+#[derive(Clone, Default)]
 pub struct MemberRepository {
-    members: HashMap<Id, Member>,
+    members: Arc<Mutex<HashMap<Id, Member>>>,
 }
 
 impl MemberRepository {
     /// Creates new [`Member`]s repository with passed-in [`Member`]s.
     pub fn new(members: HashMap<Id, Member>) -> Self {
-        MemberRepository { members }
+        MemberRepository {
+            members: Arc::new(Mutex::new(members)),
+        }
     }
 
     /// Returns [`Member`] by its ID.
     #[allow(dead_code)]
     pub fn get(&self, id: Id) -> Option<Member> {
         debug!("retrieve member by id: {}", id);
-        self.members.get(&id).map(|member| member.clone())
+        let members = self.members.lock().unwrap();
+        members.get(&id).map(|member| member.clone())
     }
 
     /// Returns [`Member`] by its credentials.
     pub fn get_by_credentials(&self, credentials: &str) -> Option<Member> {
         debug!("retrieve member by credentials: {}", credentials);
-        self.members
+        let members = self.members.lock().unwrap();
+        members
             .values()
             .find(|member| member.credentials.eq(credentials))
             .map(|member| member.clone())
diff --git a/src/main.rs b/src/main.rs
index f09e222f7..c88302764 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,4 @@
 //! Medea media server application.
-use std::sync::{Arc, Mutex};
-
 use actix::prelude::*;
 use dotenv::dotenv;
 
@@ -24,7 +22,7 @@ fn main() {
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
 
-    let members_repo = Arc::new(Mutex::new(MemberRepository::new(members)));
+    let members_repo = MemberRepository::new(members);
 
     let sys = System::new("medea");
     server::run(members_repo);

From 00c76101ee3f968f85e6896e47b91040a7eff321 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 13 Feb 2019 13:47:30 +0200
Subject: [PATCH 034/179] Impl simple peer state machine

---
 Cargo.lock        |  7 +++++
 Cargo.toml        |  1 +
 src/main.rs       |  1 +
 src/media/mod.rs  |  3 +++
 src/media/peer.rs | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 81 insertions(+)
 create mode 100644 src/media/mod.rs
 create mode 100644 src/media/peer.rs

diff --git a/Cargo.lock b/Cargo.lock
index a83447acf..272a5073f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,11 @@ dependencies = [
  "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "assert_matches"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "autocfg"
 version = "0.1.2"
@@ -153,6 +158,7 @@ dependencies = [
 name = "medea"
 version = "0.1.0"
 dependencies = [
+ "assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -463,6 +469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
+"checksum assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7deb0a829ca7bcfaf5da70b073a8d128619259a7be8216a355e23f00763059e5"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
diff --git a/Cargo.toml b/Cargo.toml
index 7281bb4ae..21e61fe61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,7 @@ readme = "README.md"
 repository = "https://github.com/instrumentisto/medea"
 
 [dependencies]
+assert_matches = "1.3"
 chrono = "0.4"
 hashbrown = "0.1"
 slog = { version = "2.4", features = ["max_level_debug", "release_max_level_warn"] }
diff --git a/src/main.rs b/src/main.rs
index 2a30589d0..109267757 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@ mod utils;
 
 mod api;
 mod log;
+mod media;
 
 fn main() {
     let logger = log::new_dual_logger(std::io::stdout(), std::io::stderr());
diff --git a/src/media/mod.rs b/src/media/mod.rs
new file mode 100644
index 000000000..00875fe22
--- /dev/null
+++ b/src/media/mod.rs
@@ -0,0 +1,3 @@
+pub mod peer;
+
+pub use self::peer::*;
diff --git a/src/media/peer.rs b/src/media/peer.rs
new file mode 100644
index 000000000..67c90a41a
--- /dev/null
+++ b/src/media/peer.rs
@@ -0,0 +1,69 @@
+use crate::{api::control::member, log::prelude::*};
+
+#[derive(Debug, PartialEq)]
+pub enum PeerMachine {
+    New(Peer),
+    WaitLocalSDP(Peer),
+    WaitLocalHaveRemote(Peer),
+    WaitRemoteSDP(Peer),
+    Stable(Peer),
+    Finished(Peer),
+    Failure,
+}
+
+pub enum Command {
+    MakeSdpOffer,
+    MakeSdpAnswer
+}
+
+/// ID of [`Peer`].
+pub type Id = u64;
+
+#[derive(Debug, PartialEq)]
+struct Peer {
+    id: Id,
+    member_id: member::Id,
+}
+
+impl PeerMachine {
+    pub fn new(id: Id, member_id: member::Id) -> Self {
+        PeerMachine::New(Peer{id, member_id})
+    }
+
+    pub fn approve(self, c: Option<Command>) -> Self {
+        match (self, c) {
+            (PeerMachine::New(peer), None) => {
+                PeerMachine::WaitLocalSDP(peer)
+            },
+            (PeerMachine::New(peer), Some(Command::MakeSdpOffer)) => {
+                PeerMachine::WaitLocalHaveRemote(peer)
+            },
+            (PeerMachine::WaitLocalSDP(peer), Some(Command::MakeSdpOffer)) => {
+                PeerMachine::WaitRemoteSDP(peer)
+            },
+            (PeerMachine::WaitLocalHaveRemote(peer), Some(Command::MakeSdpOffer)) => {
+                PeerMachine::WaitRemoteSDP(peer)
+            },
+            _ => PeerMachine::Failure,
+        }
+    }
+
+    pub fn pool(&self) {
+        println!("{:?}", self)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use assert_matches::*;
+
+    #[test]
+    fn create_peer() {
+        let peer = PeerMachine::new(1, 1);
+        let peer = peer.approve(None);
+        peer.pool();
+
+        assert_matches!(peer, PeerMachine::WaitLocalSDP(Peer{id: 1, member_id: 1}));
+    }
+}

From 3e37b5b2221d58173ae08200dafe02700050a60c Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Wed, 13 Feb 2019 17:45:48 +0200
Subject: [PATCH 035/179] Remove redudant serde_derive dependency

---
 Cargo.lock                | 4 +++-
 Cargo.toml                | 3 +--
 src/api/client/session.rs | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2423474af..399918bca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -680,7 +680,6 @@ dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1144,6 +1143,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "serde"
 version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "serde_derive"
diff --git a/Cargo.toml b/Cargo.toml
index f35e5f56f..2de71e500 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,7 @@ chrono = "0.4"
 dotenv = "0.13"
 futures = "0.1"
 hashbrown = "0.1"
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 slog = "2.4"
 slog-envlogger = "2.1"
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 411fbb377..44af0d372 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -7,7 +7,7 @@ use actix::prelude::*;
 use actix_web::ws;
 use actix_web::ws::CloseReason;
 use hashbrown::HashMap;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 
 use crate::{
     api::control::member::{Id, MemberRepository},

From 3183780844e94c7c7ebcdc2de021e6a5c7371a0a Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Wed, 13 Feb 2019 19:22:49 +0200
Subject: [PATCH 036/179] Refactor

---
 src/api/client/mod.rs     |   2 +
 src/api/client/server.rs  |  31 +++---
 src/api/client/session.rs | 204 ++++++++++++++++++++------------------
 src/api/control/member.rs |   6 +-
 4 files changed, 130 insertions(+), 113 deletions(-)

diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 72e5481c4..4022bf7ee 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,3 +1,5 @@
+//! Implementation of Client API.
+
 pub mod server;
 pub mod session;
 
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index bee8f9afb..7ab9fd788 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -1,4 +1,4 @@
-//! Implementation HTTP server for handle websocket connections.
+//! HTTP server for handling WebSocket connections of Client API.
 
 use actix_web::{
     http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, Path,
@@ -6,42 +6,45 @@ use actix_web::{
 };
 
 use crate::{
-    api::client::session::{WsSessionRepository, WsSessionState, WsSessions},
-    api::control::member::MemberRepository,
+    api::{
+        client::session::{WsSession, WsSessionContext, WsSessionRepository},
+        control::member::MemberRepository,
+    },
     log::prelude::*,
 };
 
-/// Do websocket handshake and start `WsSessions` actor
+/// Handles all HTTP requests, performs WebSocket handshake (upgrade) and starts
+/// new [`WsSessions`] actor for WebSocket connection.
 fn ws_index(
     (r, creds, state): (
-        HttpRequest<WsSessionState>,
+        HttpRequest<WsSessionContext>,
         Path<String>,
-        State<WsSessionState>,
+        State<WsSessionContext>,
     ),
 ) -> Result<HttpResponse, Error> {
-    match state.members_repo.get_by_credentials(creds.as_str()) {
-        Some(member) => ws::start(&r, WsSessions::new(member.id)),
+    match state.members.get_by_credentials(creds.as_str()) {
+        Some(member) => ws::start(&r, WsSession::new(member.id)),
         None => Ok(HttpResponse::NotFound().finish()),
     }
 }
 
-/// Starts HTTP server for handle websocket upgrade request.
+/// Starts HTTP server for handling WebSocket connections.
 pub fn run(members_repo: MemberRepository) {
     let session_repo = WsSessionRepository::default();
 
     server::new(move || {
-        App::with_state(WsSessionState {
-            members_repo: members_repo.clone(),
-            session_repo: session_repo.clone(),
+        App::with_state(WsSessionContext {
+            members: members_repo.clone(),
+            sessions: session_repo.clone(),
         })
         .middleware(middleware::Logger::default())
         .resource("/ws/{credentials}", |r| {
             r.method(http::Method::GET).with(ws_index)
         })
     })
-    .bind("127.0.0.1:8080")
+    .bind("0.0.0.0:8080")
     .unwrap()
     .start();
 
-    info!("Started http server: 127.0.0.1:8080");
+    info!("Started HTTP server on 0.0.0.0:8080");
 }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 44af0d372..d65b2bb92 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,127 +1,143 @@
-//! Member websocket session definitions and implementations.
+//! WebSocket session.
 
-use std::sync::{Arc, Mutex};
-use std::time::Duration;
+use std::{
+    sync::{Arc, Mutex},
+    time::Duration,
+};
 
 use actix::prelude::*;
-use actix_web::ws;
-use actix_web::ws::CloseReason;
+use actix_web::ws::{self, CloseReason};
 use hashbrown::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::control::member::{Id, MemberRepository},
+    api::control::member::{self, MemberRepository},
     log::prelude::*,
 };
 
-/// How long before lack of client message causes a timeout.
-const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
-
-/// Message for close old member session when reconnect [`Web Client`].
-#[derive(Message)]
-struct Close(Option<CloseReason>);
+/// Timeout of receiving any WebSocket messages from client.
+const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10); // TODO: via conf
 
-/// Messages to keep [`Web Client`] alive.
-#[derive(Debug, Message, Deserialize, Serialize)]
-pub enum Heartbeat {
-    #[serde(rename = "ping")]
-    Ping(usize),
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
-
-/// State with repositories addresses
-pub struct WsSessionState {
-    pub members_repo: MemberRepository,
-    pub session_repo: WsSessionRepository,
+/// Context for [`WsSession`] which holds all the necessary dependencies.
+pub struct WsSessionContext {
+    /// Repository of all currently existing [`Member`]s in application.
+    pub members: MemberRepository,
+    /// Repository of all currently existing [`WsSession`]s in application.
+    pub sessions: WsSessionRepository,
 }
 
-/// Websocket connection is long running connection, it easier
-/// to handle with an actor.
+/// Long-running WebSocket connection of Client API.
 #[derive(Debug)]
-pub struct WsSessions {
-    member_id: Id,
-    /// Client must send any text message at least once per 10 seconds
-    /// (CLIENT_IDLE_TIMEOUT), otherwise we drop connection.
-    idle_timeout_handler: Option<SpawnHandle>,
+pub struct WsSession {
+    /// ID of [`Member`] that WebSocket connection is associated with.
+    member_id: member::Id,
+
+    /// Handle for watchdog which checks whether WebSocket client became
+    /// idle (no `ping` messages received during [`CLIENT_IDLE_TIMEOUT`]).
+    ///
+    /// This one should be renewed on any received WebSocket message
+    /// from client.
+    idle_handler: Option<SpawnHandle>,
 }
 
-impl WsSessions {
-    /// Creates new [`Member`] session with passed-in [`Member`] ID.
-    pub fn new(member_id: Id) -> Self {
+impl WsSession {
+    /// Creates new WebSocket session for specified [`Member`].
+    pub fn new(id: member::Id) -> Self {
         Self {
-            member_id,
-            idle_timeout_handler: None,
+            member_id: id,
+            idle_handler: None,
         }
     }
 
-    /// Helper method that set idle timeout handler after every message
-    /// from [`Web Client`].
-    fn set_idle_timeout(&mut self, ctx: &mut <Self as Actor>::Context) {
-        if let Some(handler) = self.idle_timeout_handler {
+    /// Resets idle handler watchdog.
+    fn reset_idle_timeout(&mut self, ctx: &mut <Self as Actor>::Context) {
+        if let Some(handler) = self.idle_handler {
             ctx.cancel_future(handler);
         }
-        self.idle_timeout_handler =
+        self.idle_handler =
             Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |_, ctx| {
-                debug!("Client timeout");
+                debug!("Client timeouted");
                 ctx.notify(Close(Some(ws::CloseCode::Away.into())));
             }));
     }
 }
 
-impl Actor for WsSessions {
-    type Context = ws::WebsocketContext<Self, WsSessionState>;
+/// [`Actor`] implementation that provides an ergonomic way to deal with
+/// WebSocket connection lifecycle for [`WsSession`].
+impl Actor for WsSession {
+    type Context = ws::WebsocketContext<Self, WsSessionContext>;
 
-    /// Start the heartbeat process and store session in repository
-    /// on start [`Member`] session.
+    /// Starts [`Heartbeat`] mechanism and stores [`WsSession`]
+    /// in [`WsSessionRepository`] of application.
+    ///
+    /// If some [`WsSession`] already exists in [`WsSessionRepository`] for
+    /// associated [`Member`], then it will be replaced and closed.
     fn started(&mut self, ctx: &mut Self::Context) {
-        self.set_idle_timeout(ctx);
-        let mut session_repo = ctx.state().session_repo.clone();
-        if let Some(old) =
-            session_repo.add_session(self.member_id, ctx.address())
-        {
+        self.reset_idle_timeout(ctx);
+
+        let mut repo = ctx.state().sessions.clone();
+        if let Some(old) = repo.replace_session(self.member_id, ctx.address()) {
             old.do_send(Close(None));
         }
     }
 
-    /// Remove [`Member`] session repository after stopped session.
+    /// Removes [`WsSession`] from [`WsSessionRepository`] of application.
     fn stopped(&mut self, ctx: &mut Self::Context) {
-        let mut session_repo = ctx.state().session_repo.clone();
-        session_repo.remove_session(self.member_id);
+        let mut repo = ctx.state().sessions.clone();
+        repo.remove_session(self.member_id);
     }
 }
 
-/// Handler for `Close`.
-impl Handler<Close> for WsSessions {
+/// Message for closing obsolete [`WsSession`] on client reconnection.
+#[derive(Message)]
+struct Close(Option<CloseReason>);
+
+impl Handler<Close> for WsSession {
     type Result = ();
 
+    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
     fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
         ctx.close(close.0);
         ctx.stop();
     }
 }
 
-/// Handler for `Heartbeat`.
-impl Handler<Heartbeat> for WsSessions {
+/// Message for keeping client WebSocket connection alive.
+#[derive(Debug, Message, Deserialize, Serialize)]
+pub enum Heartbeat {
+    /// `ping` message that WebSocket client is expected to send to the server
+    /// periodically.
+    #[serde(rename = "ping")]
+    Ping(usize),
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
+
+impl Handler<Heartbeat> for WsSession {
     type Result = ();
 
+    /// Answers with `Heartbeat::Pong` message to WebSocket client in response
+    /// to the received `Heartbeat::Ping` message.
     fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
         if let Heartbeat::Ping(n) = msg {
-            debug!("Received ping: {}", n);
+            trace!("Received ping: {}", n);
             ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
         }
     }
 }
 
-/// Handler for `ws::Message`
-impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
+impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
+    /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
+        debug!("Received WS message: {:?}", msg);
         match msg {
             ws::Message::Text(text) => {
                 if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
                     ctx.notify(msg);
-                };
-                self.set_idle_timeout(ctx);
+                }
+                self.reset_idle_timeout(ctx);
             }
             ws::Message::Close(reason) => ctx.notify(Close(reason)),
             _ => (),
@@ -129,25 +145,27 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSessions {
     }
 }
 
-/// Address of [`Member`] session for communicate with it.
-type Client = Addr<WsSessions>;
-
-/// Repository that stores [`Member`] sessions.
+/// Repository that stores [`WsSession`]s of [`Member`]s.
 #[derive(Clone, Default, Debug)]
 pub struct WsSessionRepository {
-    sessions: Arc<Mutex<HashMap<Id, Client>>>,
+    sessions: Arc<Mutex<HashMap<member::Id, Addr<WsSession>>>>,
 }
 
 impl WsSessionRepository {
-    /// Stores address of [`Member`] session in repository.
-    pub fn add_session(&mut self, id: Id, client: Client) -> Option<Client> {
+    /// Stores [`WsSession`]'s address in repository for given [`Member`]
+    /// and returns previous one if any.
+    pub fn replace_session(
+        &mut self,
+        id: member::Id,
+        session: Addr<WsSession>,
+    ) -> Option<Addr<WsSession>> {
         debug!("add session for member: {}", id);
         let mut sessions = self.sessions.lock().unwrap();
-        sessions.insert(id, client)
+        sessions.insert(id, session)
     }
 
-    /// Removes address of [`Member`] session in repository.
-    pub fn remove_session(&mut self, id: Id) {
+    /// Removes address of [`WsSession`] from repository.
+    pub fn remove_session(&mut self, id: member::Id) {
         debug!("remove session for member: {}", id);
         let mut sessions = self.sessions.lock().unwrap();
         sessions.remove(&id);
@@ -155,27 +173,24 @@ impl WsSessionRepository {
 }
 
 #[cfg(test)]
-mod tests {
-    use std::thread;
+mod test {
+    use std::{ops::Add, thread};
 
     use actix_web::{error, http, test, App};
-    use futures::stream::Stream;
+    use futures::Stream;
 
     use super::*;
 
     #[test]
-    fn connect_by_credentials() {
-        let members_repo = MemberRepository::default();
-        let session_repo = WsSessionRepository::default();
-
+    fn responses_with_pong() {
         let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(WsSessionState {
-                members_repo: members_repo.clone(),
-                session_repo: session_repo.clone(),
+            App::with_state(WsSessionContext {
+                members: MemberRepository::default(),
+                sessions: WsSessionRepository::default(),
             })
             .resource("/ws/", |r| {
                 r.method(http::Method::GET)
-                    .with(|r| ws::start(&r, WsSessions::new(1)))
+                    .with(|r| ws::start(&r, WsSession::new(1)))
             })
         });
         let (reader, mut writer) = srv.ws_at("/ws/").unwrap();
@@ -186,23 +201,20 @@ mod tests {
     }
 
     #[test]
-    fn disconnect_by_timeout() {
-        let members_repo = MemberRepository::default();
-        let session_repo = WsSessionRepository::default();
-
+    fn disconnects_on_idle() {
         let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(WsSessionState {
-                members_repo: members_repo.clone(),
-                session_repo: session_repo.clone(),
+            App::with_state(WsSessionContext {
+                members: MemberRepository::default(),
+                sessions: WsSessionRepository::default(),
             })
-            .resource("/ws/{credentials}", |r| {
+            .resource("/ws/", |r| {
                 r.method(http::Method::GET)
-                    .with(|r| ws::start(&r, WsSessions::new(1)))
+                    .with(|r| ws::start(&r, WsSession::new(1)))
             })
         });
-        let (reader, mut writer) = srv.ws_at("/ws/caller_credentials").unwrap();
+        let (reader, mut writer) = srv.ws_at("/ws/").unwrap();
 
-        thread::sleep(CLIENT_IDLE_TIMEOUT);
+        thread::sleep(CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
 
         writer.text(r#"{"ping":33}"#);
         assert!(match srv.execute(reader.into_future()) {
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index d1087b931..a5aebcad5 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -36,7 +36,7 @@ impl MemberRepository {
     pub fn get(&self, id: Id) -> Option<Member> {
         debug!("retrieve member by id: {}", id);
         let members = self.members.lock().unwrap();
-        members.get(&id).map(|member| member.clone())
+        members.get(&id).map(|m| m.clone())
     }
 
     /// Returns [`Member`] by its credentials.
@@ -45,8 +45,8 @@ impl MemberRepository {
         let members = self.members.lock().unwrap();
         members
             .values()
-            .find(|member| member.credentials.eq(credentials))
-            .map(|member| member.clone())
+            .find(|m| m.credentials.eq(credentials))
+            .map(|m| m.clone())
     }
 }
 

From 7a5117deb41684f012fb24bb04ddd223e809b809 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 21 Feb 2019 15:18:21 +0200
Subject: [PATCH 037/179] Impl room and repository of rooms

---
 src/api/client/mod.rs     |   3 +-
 src/api/client/room.rs    | 114 ++++++++++++++++++++++++++++
 src/api/client/server.rs  | 126 ++++++++++++++++++++++++++-----
 src/api/client/session.rs | 152 +++++++-------------------------------
 src/api/control/member.rs |  80 +-------------------
 src/api/control/mod.rs    |   2 +-
 src/main.rs               |  19 +++--
 7 files changed, 268 insertions(+), 228 deletions(-)
 create mode 100644 src/api/client/room.rs

diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 4022bf7ee..0f3537eab 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,6 +1,7 @@
 //! Implementation of Client API.
 
+pub mod room;
 pub mod server;
 pub mod session;
 
-pub use self::{server::*, session::*};
+pub use self::{room::*, server::*, session::*};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
new file mode 100644
index 000000000..b695d2887
--- /dev/null
+++ b/src/api/client/room.rs
@@ -0,0 +1,114 @@
+//! Room definitions and implementations.
+use std::sync::{Arc, Mutex};
+
+use actix::prelude::*;
+use actix_web::ws::CloseReason;
+use futures::future::Future;
+use hashbrown::HashMap;
+
+use crate::{
+    api::client::{Close, WsSession},
+    api::control::{Id as MemberID, Member},
+    log::prelude::*,
+};
+
+/// ID of [`Room`].
+pub type Id = u64;
+
+/// Media server room with its members.
+#[derive(Clone, Debug)]
+pub struct Room {
+    /// ID of [`Room`].
+    pub id: Id,
+
+    /// [`Member`]'s this room.
+    pub members: HashMap<MemberID, Member>,
+
+    /// [`WsSession`]s of [`Member`]'s this room.
+    pub sessions: HashMap<MemberID, Addr<WsSession>>,
+}
+
+/// Message for to get information about [`Member`] by its credentials.
+#[derive(Message)]
+#[rtype(result = "Option<Member>")]
+pub struct GetMember(pub String);
+
+impl Handler<GetMember> for Room {
+    type Result = Option<Member>;
+
+    /// Returns [`Member`] by its credentials if it present in [`Room`].
+    fn handle(
+        &mut self,
+        credentials: GetMember,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        debug!("retrieve member by credentials: {}", credentials.0);
+        self.members
+            .values()
+            .find(|m| m.credentials.eq(credentials.0.as_str()))
+            .map(|m| m.clone())
+    }
+}
+
+/// Message from [`WsSession`] signaling what [`Member`] connected.
+#[derive(Message)]
+pub struct JoinMember(pub MemberID, pub Addr<WsSession>);
+
+impl Handler<JoinMember> for Room {
+    type Result = ();
+
+    /// Stores [`WsSession`] of [`Member`] into [`Room`].
+    ///
+    /// If [`Member`] is reconnected, close and stop old [`WsSession`]
+    /// before store current [`WsSession`] in [`Room`].
+    fn handle(&mut self, msg: JoinMember, _ctx: &mut Self::Context) {
+        debug!("join member: {}", msg.0);
+        if let Some(old_session) = self.sessions.remove(&msg.0) {
+            let _ = old_session.send(Close(None)).wait();
+        }
+        self.sessions.insert(msg.0, msg.1);
+    }
+}
+
+/// Message from [`WsSession`] signaling what [`Member`] closed connection
+/// or become idle.
+#[derive(Message)]
+pub struct LeaveMember(pub MemberID, pub Option<CloseReason>);
+
+impl Handler<LeaveMember> for Room {
+    type Result = ();
+
+    /// Remove and close [`WsSession`] from [`Room`].
+    fn handle(&mut self, msg: LeaveMember, _ctx: &mut Self::Context) {
+        debug!("leave member: {}", msg.0);
+        if let Some(session) = self.sessions.remove(&msg.0) {
+            session.do_send(Close(msg.1))
+        }
+    }
+}
+
+impl Actor for Room {
+    type Context = Context<Self>;
+}
+
+/// Repository that stores [`Room`]s.
+#[derive(Clone, Default)]
+pub struct RoomsRepository {
+    rooms: Arc<Mutex<HashMap<Id, Addr<Room>>>>,
+}
+
+impl RoomsRepository {
+    /// Creates new [`Room`]s repository with passed-in [`Room`]s.
+    pub fn new(rooms: HashMap<Id, Addr<Room>>) -> Self {
+        RoomsRepository {
+            rooms: Arc::new(Mutex::new(rooms)),
+        }
+    }
+
+    /// Returns [`Room`] by its ID.
+    pub fn get(&self, id: Id) -> Option<Addr<Room>> {
+        debug!("retrieve room by id: {}", id);
+        let rooms = self.rooms.lock().unwrap();
+        rooms.get(&id).map(|r| r.clone())
+    }
+}
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 7ab9fd788..5ece0f892 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -4,41 +4,61 @@ use actix_web::{
     http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, Path,
     State,
 };
+use futures::future::Future;
+use serde::Deserialize;
 
 use crate::{
-    api::{
-        client::session::{WsSession, WsSessionContext, WsSessionRepository},
-        control::member::MemberRepository,
-    },
+    api::client::{GetMember, Id as RoomID, RoomsRepository, WsSession},
     log::prelude::*,
 };
 
+/// Contains [`Room`] ID and [`Member`] credentials obtained from request path.
+#[derive(Debug, Deserialize)]
+struct RequestInfo {
+    room_id: RoomID,
+    credentials: String,
+}
+
 /// Handles all HTTP requests, performs WebSocket handshake (upgrade) and starts
 /// new [`WsSessions`] actor for WebSocket connection.
 fn ws_index(
-    (r, creds, state): (
-        HttpRequest<WsSessionContext>,
-        Path<String>,
-        State<WsSessionContext>,
+    (r, info, state): (
+        HttpRequest<AppContext>,
+        Path<RequestInfo>,
+        State<AppContext>,
     ),
 ) -> Result<HttpResponse, Error> {
-    match state.members.get_by_credentials(creds.as_str()) {
-        Some(member) => ws::start(&r, WsSession::new(member.id)),
+    debug!("{:?}", info);
+    match state.rooms.get(info.room_id) {
+        Some(room_addr) => room_addr
+            .send(GetMember(info.credentials.clone()))
+            .from_err()
+            .and_then(|res| match res {
+                Some(member) => ws::start(
+                    &r.drop_state(),
+                    WsSession::new(member.id, room_addr),
+                ),
+                None => Ok(HttpResponse::NotFound().finish()),
+            })
+            .wait(),
         None => Ok(HttpResponse::NotFound().finish()),
     }
 }
 
-/// Starts HTTP server for handling WebSocket connections.
-pub fn run(members_repo: MemberRepository) {
-    let session_repo = WsSessionRepository::default();
+/// Context for [`App`] which holds all the necessary dependencies.
+pub struct AppContext {
+    /// Repository of all currently existing [`Room`]s in application.
+    pub rooms: RoomsRepository,
+}
 
+/// Starts HTTP server for handling WebSocket connections.
+pub fn run(rooms: RoomsRepository) {
     server::new(move || {
-        App::with_state(WsSessionContext {
-            members: members_repo.clone(),
-            sessions: session_repo.clone(),
+        App::with_state(AppContext {
+            rooms: rooms.clone(),
         })
         .middleware(middleware::Logger::default())
-        .resource("/ws/{credentials}", |r| {
+        .resource("/ws/{room_id}/{credentials}", |r| {
             r.method(http::Method::GET).with(ws_index)
         })
     })
@@ -48,3 +68,75 @@ pub fn run(members_repo: MemberRepository) {
 
     info!("Started HTTP server on 0.0.0.0:8080");
 }
+
+#[cfg(test)]
+mod test {
+    use std::{ops::Add, thread, time::Duration};
+
+    use actix::prelude::*;
+    use actix_web::{error, http, test, App};
+    use futures::Stream;
+    use hashbrown::HashMap;
+
+    use crate::api::{
+        client::{session, Room},
+        control::Member,
+    };
+
+    use super::*;
+
+    fn start_room() -> RoomsRepository {
+        let members = hashmap! {
+            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+        };
+        let room = Arbiter::start(move |_| Room {
+            id: 1,
+            members,
+            sessions: HashMap::new(),
+        });
+        let rooms = hashmap! {1 => room};
+        RoomsRepository::new(rooms)
+    }
+
+    #[test]
+    fn responses_with_pong() {
+        let mut srv = test::TestServer::with_factory(move || {
+            let repo = start_room();
+            App::with_state(AppContext { rooms: repo })
+                .resource("/ws/{room_id}/{credentials}", |r| {
+                    r.method(http::Method::GET).with(ws_index)
+                })
+        });
+        let (reader, mut writer) =
+            srv.ws_at("/ws/1/caller_credentials").unwrap();
+
+        writer.text(r#"{"ping":33}"#);
+        let (item, _reader) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
+    }
+
+    #[test]
+    fn disconnects_on_idle() {
+        let mut srv = test::TestServer::with_factory(move || {
+            let repo = start_room();
+            App::with_state(AppContext { rooms: repo })
+                .resource("/ws/{room_id}/{credentials}", |r| {
+                    r.method(http::Method::GET).with(ws_index)
+                })
+        });
+        let (reader, mut writer) =
+            srv.ws_at("/ws/1/caller_credentials").unwrap();
+
+        thread::sleep(session::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
+
+        writer.text(r#"{"ping":33}"#);
+        assert!(match srv.execute(reader.into_future()) {
+            Err((
+                ws::ProtocolError::Payload(error::PayloadError::Io(_)),
+                _,
+            )) => true,
+            _ => false,
+        });
+    }
+}
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index d65b2bb92..6bf795b2d 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,36 +1,29 @@
 //! WebSocket session.
 
-use std::{
-    sync::{Arc, Mutex},
-    time::Duration,
-};
+use std::time::Duration;
 
 use actix::prelude::*;
 use actix_web::ws::{self, CloseReason};
-use hashbrown::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::control::member::{self, MemberRepository},
+    api::client::room::{JoinMember, LeaveMember, Room},
+    api::control::member::Id as MemberID,
     log::prelude::*,
 };
 
+// TODO: via conf
 /// Timeout of receiving any WebSocket messages from client.
-const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10); // TODO: via conf
-
-/// Context for [`WsSession`] which holds all the necessary dependencies.
-pub struct WsSessionContext {
-    /// Repository of all currently existing [`Member`]s in application.
-    pub members: MemberRepository,
-    /// Repository of all currently existing [`WsSession`]s in application.
-    pub sessions: WsSessionRepository,
-}
+pub const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
 
 /// Long-running WebSocket connection of Client API.
 #[derive(Debug)]
 pub struct WsSession {
     /// ID of [`Member`] that WebSocket connection is associated with.
-    member_id: member::Id,
+    member_id: MemberID,
+
+    /// [`Room`] that [`Member`] is associated with.
+    room: Addr<Room>,
 
     /// Handle for watchdog which checks whether WebSocket client became
     /// idle (no `ping` messages received during [`CLIENT_IDLE_TIMEOUT`]).
@@ -42,9 +35,10 @@ pub struct WsSession {
 
 impl WsSession {
     /// Creates new WebSocket session for specified [`Member`].
-    pub fn new(id: member::Id) -> Self {
+    pub fn new(member_id: MemberID, room: Addr<Room>) -> Self {
         Self {
-            member_id: id,
+            member_id,
+            room,
             idle_handler: None,
         }
     }
@@ -55,9 +49,12 @@ impl WsSession {
             ctx.cancel_future(handler);
         }
         self.idle_handler =
-            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |_, ctx| {
-                debug!("Client timeouted");
-                ctx.notify(Close(Some(ws::CloseCode::Away.into())));
+            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |session, _ctx| {
+                debug!("Client timeout");
+                session.room.do_send(LeaveMember(
+                    session.member_id,
+                    Some(ws::CloseCode::Away.into()),
+                ));
             }));
     }
 }
@@ -65,32 +62,19 @@ impl WsSession {
 /// [`Actor`] implementation that provides an ergonomic way to deal with
 /// WebSocket connection lifecycle for [`WsSession`].
 impl Actor for WsSession {
-    type Context = ws::WebsocketContext<Self, WsSessionContext>;
+    type Context = ws::WebsocketContext<Self>;
 
-    /// Starts [`Heartbeat`] mechanism and stores [`WsSession`]
-    /// in [`WsSessionRepository`] of application.
-    ///
-    /// If some [`WsSession`] already exists in [`WsSessionRepository`] for
-    /// associated [`Member`], then it will be replaced and closed.
+    /// Starts [`Heartbeat`] mechanism and sends message to [`Room`].
     fn started(&mut self, ctx: &mut Self::Context) {
+        debug!("Session of member {} started", self.member_id);
         self.reset_idle_timeout(ctx);
-
-        let mut repo = ctx.state().sessions.clone();
-        if let Some(old) = repo.replace_session(self.member_id, ctx.address()) {
-            old.do_send(Close(None));
-        }
-    }
-
-    /// Removes [`WsSession`] from [`WsSessionRepository`] of application.
-    fn stopped(&mut self, ctx: &mut Self::Context) {
-        let mut repo = ctx.state().sessions.clone();
-        repo.remove_session(self.member_id);
+        self.room.do_send(JoinMember(self.member_id, ctx.address()));
     }
 }
 
-/// Message for closing obsolete [`WsSession`] on client reconnection.
+/// Message sending from [`Room`] for closing [`WsSession`].
 #[derive(Message)]
-struct Close(Option<CloseReason>);
+pub struct Close(pub Option<CloseReason>);
 
 impl Handler<Close> for WsSession {
     type Result = ();
@@ -139,90 +123,10 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                 }
                 self.reset_idle_timeout(ctx);
             }
-            ws::Message::Close(reason) => ctx.notify(Close(reason)),
-            _ => (),
+            ws::Message::Close(reason) => {
+                self.room.do_send(LeaveMember(self.member_id, reason))
+            }
+            _ => error!("Unsupported message"),
         }
     }
 }
-
-/// Repository that stores [`WsSession`]s of [`Member`]s.
-#[derive(Clone, Default, Debug)]
-pub struct WsSessionRepository {
-    sessions: Arc<Mutex<HashMap<member::Id, Addr<WsSession>>>>,
-}
-
-impl WsSessionRepository {
-    /// Stores [`WsSession`]'s address in repository for given [`Member`]
-    /// and returns previous one if any.
-    pub fn replace_session(
-        &mut self,
-        id: member::Id,
-        session: Addr<WsSession>,
-    ) -> Option<Addr<WsSession>> {
-        debug!("add session for member: {}", id);
-        let mut sessions = self.sessions.lock().unwrap();
-        sessions.insert(id, session)
-    }
-
-    /// Removes address of [`WsSession`] from repository.
-    pub fn remove_session(&mut self, id: member::Id) {
-        debug!("remove session for member: {}", id);
-        let mut sessions = self.sessions.lock().unwrap();
-        sessions.remove(&id);
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::{ops::Add, thread};
-
-    use actix_web::{error, http, test, App};
-    use futures::Stream;
-
-    use super::*;
-
-    #[test]
-    fn responses_with_pong() {
-        let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(WsSessionContext {
-                members: MemberRepository::default(),
-                sessions: WsSessionRepository::default(),
-            })
-            .resource("/ws/", |r| {
-                r.method(http::Method::GET)
-                    .with(|r| ws::start(&r, WsSession::new(1)))
-            })
-        });
-        let (reader, mut writer) = srv.ws_at("/ws/").unwrap();
-
-        writer.text(r#"{"ping":33}"#);
-        let (item, _reader) = srv.execute(reader.into_future()).unwrap();
-        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
-    }
-
-    #[test]
-    fn disconnects_on_idle() {
-        let mut srv = test::TestServer::with_factory(move || {
-            App::with_state(WsSessionContext {
-                members: MemberRepository::default(),
-                sessions: WsSessionRepository::default(),
-            })
-            .resource("/ws/", |r| {
-                r.method(http::Method::GET)
-                    .with(|r| ws::start(&r, WsSession::new(1)))
-            })
-        });
-        let (reader, mut writer) = srv.ws_at("/ws/").unwrap();
-
-        thread::sleep(CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
-
-        writer.text(r#"{"ping":33}"#);
-        assert!(match srv.execute(reader.into_future()) {
-            Err((
-                ws::ProtocolError::Payload(error::PayloadError::Io(_)),
-                _,
-            )) => true,
-            _ => false,
-        });
-    }
-}
diff --git a/src/api/control/member.rs b/src/api/control/member.rs
index a5aebcad5..880e666aa 100644
--- a/src/api/control/member.rs
+++ b/src/api/control/member.rs
@@ -1,9 +1,4 @@
 //! Member definitions and implementations.
-use std::sync::{Arc, Mutex};
-
-use hashbrown::HashMap;
-
-use crate::log::prelude::*;
 
 /// ID of [`Member`].
 pub type Id = u64;
@@ -13,80 +8,7 @@ pub type Id = u64;
 pub struct Member {
     /// ID of [`Member`].
     pub id: Id,
+
     /// Credentials to authorize [`Member`] with.
     pub credentials: String,
 }
-
-/// Repository that stores [`Member`]s.
-#[derive(Clone, Default)]
-pub struct MemberRepository {
-    members: Arc<Mutex<HashMap<Id, Member>>>,
-}
-
-impl MemberRepository {
-    /// Creates new [`Member`]s repository with passed-in [`Member`]s.
-    pub fn new(members: HashMap<Id, Member>) -> Self {
-        MemberRepository {
-            members: Arc::new(Mutex::new(members)),
-        }
-    }
-
-    /// Returns [`Member`] by its ID.
-    #[allow(dead_code)]
-    pub fn get(&self, id: Id) -> Option<Member> {
-        debug!("retrieve member by id: {}", id);
-        let members = self.members.lock().unwrap();
-        members.get(&id).map(|m| m.clone())
-    }
-
-    /// Returns [`Member`] by its credentials.
-    pub fn get_by_credentials(&self, credentials: &str) -> Option<Member> {
-        debug!("retrieve member by credentials: {}", credentials);
-        let members = self.members.lock().unwrap();
-        members
-            .values()
-            .find(|m| m.credentials.eq(credentials))
-            .map(|m| m.clone())
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn test_members() -> HashMap<Id, Member> {
-        hashmap! {
-            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
-            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
-        }
-    }
-
-    #[test]
-    fn returns_member_by_id() {
-        let repo = MemberRepository::new(test_members());
-
-        let res = repo.get(1);
-        assert!(res.is_some());
-        let member = res.unwrap();
-        assert_eq!(member.id, 1);
-    }
-
-    #[test]
-    fn returns_member_by_credentials() {
-        let repo = MemberRepository::new(test_members());
-
-        let res = repo.get_by_credentials("responder_credentials");
-        assert!(res.is_some());
-        let member = res.unwrap();
-        assert_eq!(member.id, 2);
-        assert_eq!(member.credentials, "responder_credentials");
-    }
-
-    #[test]
-    fn returns_error_not_found() {
-        let repo = MemberRepository::new(test_members());
-
-        let res = repo.get(999);
-        assert!(res.is_none());
-    }
-}
diff --git a/src/api/control/mod.rs b/src/api/control/mod.rs
index edcb52719..b29bf968d 100644
--- a/src/api/control/mod.rs
+++ b/src/api/control/mod.rs
@@ -2,4 +2,4 @@
 
 pub mod member;
 
-pub use self::member::{Id, Member, MemberRepository};
+pub use self::member::*;
diff --git a/src/main.rs b/src/main.rs
index c88302764..d6778a34a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,10 @@
 //! Medea media server application.
 use actix::prelude::*;
 use dotenv::dotenv;
+use hashbrown::HashMap;
 
-use crate::api::client::*;
-use crate::api::control::*;
+use crate::api::client::{server, Room, RoomsRepository};
+use crate::api::control::Member;
 
 #[macro_use]
 mod utils;
@@ -17,14 +18,20 @@ fn main() {
     let _scope_guard = slog_scope::set_global_logger(logger);
     let _guard = slog_stdlog::init().unwrap();
 
+    let sys = System::new("medea");
+
     let members = hashmap! {
         1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
+    let room = Arbiter::start(move |_| Room {
+        id: 1,
+        members,
+        sessions: HashMap::new(),
+    });
+    let rooms = hashmap! {1 => room};
+    let rooms_repo = RoomsRepository::new(rooms);
 
-    let members_repo = MemberRepository::new(members);
-
-    let sys = System::new("medea");
-    server::run(members_repo);
+    server::run(rooms_repo);
     let _ = sys.run();
 }

From 53ea3120558535a393dbc8471a889ace025ed5dd Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 22 Feb 2019 13:40:51 -0600
Subject: [PATCH 038/179] fix disconnects_on_idle test, use FutureResponse
 instead of HttpResponse

---
 src/api/client/server.rs | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 5ece0f892..d65b3b62c 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -1,10 +1,10 @@
 //! HTTP server for handling WebSocket connections of Client API.
 
 use actix_web::{
-    http, middleware, server, ws, App, Error, HttpRequest, HttpResponse, Path,
-    State,
+    http, middleware, server, ws, App, AsyncResponder, FutureResponse,
+    HttpRequest, HttpResponse, Path, State,
 };
-use futures::future::Future;
+use futures::{future, Future};
 use serde::Deserialize;
 
 use crate::{
@@ -27,21 +27,25 @@ fn ws_index(
         Path<RequestInfo>,
         State<AppContext>,
     ),
-) -> Result<HttpResponse, Error> {
+) -> FutureResponse<HttpResponse> {
     debug!("{:?}", info);
+
     match state.rooms.get(info.room_id) {
         Some(room_addr) => room_addr
             .send(GetMember(info.credentials.clone()))
             .from_err()
-            .and_then(|res| match res {
-                Some(member) => ws::start(
-                    &r.drop_state(),
-                    WsSession::new(member.id, room_addr),
-                ),
-                None => Ok(HttpResponse::NotFound().finish()),
+            .and_then(move |res| match res {
+                Some(member) => {
+                    ws::start(
+                        &r.drop_state(),
+                        WsSession::new(member.id, room_addr),
+                    )
+                }
+                None => Ok(HttpResponse::NotFound().into()),
             })
-            .wait(),
-        None => Ok(HttpResponse::NotFound().finish()),
+            .responder(),
+        None => future::lazy(move || Ok(HttpResponse::NotFound().into()))
+            .responder(),
     }
 }
 
@@ -74,7 +78,9 @@ mod test {
     use std::{ops::Add, thread, time::Duration};
 
     use actix::prelude::*;
-    use actix_web::{error, http, test, App};
+    use actix_web::{
+        http, test, ws::CloseReason, ws::Message::Close, App,
+    };
     use futures::Stream;
     use hashbrown::HashMap;
 
@@ -84,6 +90,7 @@ mod test {
     };
 
     use super::*;
+    use actix_web::ws::CloseCode;
 
     fn start_room() -> RoomsRepository {
         let members = hashmap! {
@@ -132,10 +139,7 @@ mod test {
 
         writer.text(r#"{"ping":33}"#);
         assert!(match srv.execute(reader.into_future()) {
-            Err((
-                ws::ProtocolError::Payload(error::PayloadError::Io(_)),
-                _,
-            )) => true,
+            Ok((Some(Close(Some(CloseReason { code: CloseCode::Away, description: None }))),_)) => true,
             _ => false,
         });
     }

From 0c650d0e763fc2088a10e2afb35a675444699c28 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 25 Feb 2019 00:02:51 -0600
Subject: [PATCH 039/179] abstract on transport

---
 Cargo.lock                |   1 +
 Cargo.toml                |   1 +
 src/api/client/room.rs    | 106 +++++++++++++++++++++++---------------
 src/api/client/server.rs  |  28 +++++-----
 src/api/client/session.rs |  95 +++++++++++++++++++++++++---------
 src/main.rs               |   2 +-
 6 files changed, 156 insertions(+), 77 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 399918bca..70971501e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -677,6 +677,7 @@ dependencies = [
  "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 2de71e500..920fe3541 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,3 +24,4 @@ slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
+failure = "0.1.5"
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index b695d2887..817457e31 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -2,21 +2,19 @@
 use std::sync::{Arc, Mutex};
 
 use actix::prelude::*;
-use actix_web::ws::CloseReason;
-use futures::future::Future;
 use hashbrown::HashMap;
 
 use crate::{
-    api::client::{Close, WsSession},
     api::control::{Id as MemberID, Member},
     log::prelude::*,
 };
+use std::fmt::Debug;
 
 /// ID of [`Room`].
 pub type Id = u64;
 
 /// Media server room with its members.
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct Room {
     /// ID of [`Room`].
     pub id: Id,
@@ -25,13 +23,42 @@ pub struct Room {
     pub members: HashMap<MemberID, Member>,
 
     /// [`WsSession`]s of [`Member`]'s this room.
-    pub sessions: HashMap<MemberID, Addr<WsSession>>,
+    pub connections: HashMap<MemberID, Box<dyn RpcConnection>>,
+}
+
+impl Actor for Room {
+    type Context = Context<Self>;
+}
+
+pub trait RpcConnection: Debug + Send {
+    fn get_member_id(&self) -> Result<MemberID, Box<dyn std::error::Error>>;
+
+    fn close(&self);
+}
+
+#[derive(Message, Debug)]
+pub struct RpcConnectionEstablished {
+    pub connection: Box<dyn RpcConnection>,
 }
 
 /// Message for to get information about [`Member`] by its credentials.
-#[derive(Message)]
+#[derive(Message, Debug)]
 #[rtype(result = "Option<Member>")]
-pub struct GetMember(pub String);
+pub struct GetMember {
+    pub credentials: String,
+}
+
+#[derive(Message, Debug)]
+pub struct RpcConnectionClosed {
+    pub member_id: MemberID,
+    pub reason: RpcConnectionClosedReason,
+}
+
+#[derive(Debug)]
+pub enum RpcConnectionClosedReason {
+    Disconnect,
+    Idle,
+}
 
 impl Handler<GetMember> for Room {
     type Result = Option<Member>;
@@ -39,58 +66,56 @@ impl Handler<GetMember> for Room {
     /// Returns [`Member`] by its credentials if it present in [`Room`].
     fn handle(
         &mut self,
-        credentials: GetMember,
+        msg: GetMember,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        debug!("retrieve member by credentials: {}", credentials.0);
         self.members
             .values()
-            .find(|m| m.credentials.eq(credentials.0.as_str()))
+            .find(|m| m.credentials.eq(msg.credentials.as_str()))
             .map(|m| m.clone())
     }
 }
 
-/// Message from [`WsSession`] signaling what [`Member`] connected.
-#[derive(Message)]
-pub struct JoinMember(pub MemberID, pub Addr<WsSession>);
-
-impl Handler<JoinMember> for Room {
+impl Handler<RpcConnectionEstablished> for Room {
     type Result = ();
 
-    /// Stores [`WsSession`] of [`Member`] into [`Room`].
-    ///
-    /// If [`Member`] is reconnected, close and stop old [`WsSession`]
-    /// before store current [`WsSession`] in [`Room`].
-    fn handle(&mut self, msg: JoinMember, _ctx: &mut Self::Context) {
-        debug!("join member: {}", msg.0);
-        if let Some(old_session) = self.sessions.remove(&msg.0) {
-            let _ = old_session.send(Close(None)).wait();
+    fn handle(
+        &mut self,
+        msg: RpcConnectionEstablished,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        let member_id = msg.connection.get_member_id();
+
+        info!("RpcConnectionEstablished with member {:?}", &member_id);
+
+        match member_id {
+            Ok(member_id) => {
+                if let Some(old_session) = self.connections.remove(&member_id) {
+                    old_session.close();
+                }
+                self.connections.insert(member_id, msg.connection);
+            }
+            Err(e) => {
+                error!("{:?}", e);
+                msg.connection.close();
+            },
         }
-        self.sessions.insert(msg.0, msg.1);
     }
 }
 
-/// Message from [`WsSession`] signaling what [`Member`] closed connection
-/// or become idle.
-#[derive(Message)]
-pub struct LeaveMember(pub MemberID, pub Option<CloseReason>);
-
-impl Handler<LeaveMember> for Room {
+impl Handler<RpcConnectionClosed> for Room {
     type Result = ();
 
-    /// Remove and close [`WsSession`] from [`Room`].
-    fn handle(&mut self, msg: LeaveMember, _ctx: &mut Self::Context) {
-        debug!("leave member: {}", msg.0);
-        if let Some(session) = self.sessions.remove(&msg.0) {
-            session.do_send(Close(msg.1))
-        }
+    fn handle(
+        &mut self,
+        msg: RpcConnectionClosed,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        info!("RpcConnectionClosed with member {}, reason {:?}", &msg.member_id, msg.reason);
+        self.connections.remove(&msg.member_id);
     }
 }
 
-impl Actor for Room {
-    type Context = Context<Self>;
-}
-
 /// Repository that stores [`Room`]s.
 #[derive(Clone, Default)]
 pub struct RoomsRepository {
@@ -107,7 +132,6 @@ impl RoomsRepository {
 
     /// Returns [`Room`] by its ID.
     pub fn get(&self, id: Id) -> Option<Addr<Room>> {
-        debug!("retrieve room by id: {}", id);
         let rooms = self.rooms.lock().unwrap();
         rooms.get(&id).map(|r| r.clone())
     }
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index d65b3b62c..b66c5954e 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -32,15 +32,15 @@ fn ws_index(
 
     match state.rooms.get(info.room_id) {
         Some(room_addr) => room_addr
-            .send(GetMember(info.credentials.clone()))
+            .send(GetMember {
+                credentials: info.credentials.clone(),
+            })
             .from_err()
             .and_then(move |res| match res {
-                Some(member) => {
-                    ws::start(
-                        &r.drop_state(),
-                        WsSession::new(member.id, room_addr),
-                    )
-                }
+                Some(member) => ws::start(
+                    &r.drop_state(),
+                    WsSession::new(member.id, room_addr),
+                ),
                 None => Ok(HttpResponse::NotFound().into()),
             })
             .responder(),
@@ -78,9 +78,7 @@ mod test {
     use std::{ops::Add, thread, time::Duration};
 
     use actix::prelude::*;
-    use actix_web::{
-        http, test, ws::CloseReason, ws::Message::Close, App,
-    };
+    use actix_web::{http, test, ws::CloseReason, ws::Message::Close, App};
     use futures::Stream;
     use hashbrown::HashMap;
 
@@ -100,7 +98,7 @@ mod test {
         let room = Arbiter::start(move |_| Room {
             id: 1,
             members,
-            sessions: HashMap::new(),
+            connections: HashMap::new(),
         });
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
@@ -139,7 +137,13 @@ mod test {
 
         writer.text(r#"{"ping":33}"#);
         assert!(match srv.execute(reader.into_future()) {
-            Ok((Some(Close(Some(CloseReason { code: CloseCode::Away, description: None }))),_)) => true,
+            Ok((
+                Some(Close(Some(CloseReason {
+                    code: CloseCode::Away,
+                    description: None,
+                }))),
+                _,
+            )) => true,
             _ => false,
         });
     }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 6bf795b2d..df41a5e52 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -4,13 +4,19 @@ use std::time::Duration;
 
 use actix::prelude::*;
 use actix_web::ws::{self, CloseReason};
+use failure::Fail;
+use futures::future::Future;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::client::room::{JoinMember, LeaveMember, Room},
+    api::client::room::{
+        Room, RpcConnection, RpcConnectionClosed, RpcConnectionEstablished,
+        RpcConnectionClosedReason
+    },
     api::control::member::Id as MemberID,
     log::prelude::*,
 };
+use actix_web::ws::CloseCode;
 
 // TODO: via conf
 /// Timeout of receiving any WebSocket messages from client.
@@ -48,13 +54,16 @@ impl WsSession {
         if let Some(handler) = self.idle_handler {
             ctx.cancel_future(handler);
         }
+
+        let member_id = self.member_id;
         self.idle_handler =
-            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |session, _ctx| {
-                debug!("Client timeout");
-                session.room.do_send(LeaveMember(
-                    session.member_id,
-                    Some(ws::CloseCode::Away.into()),
-                ));
+            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, move |session, ctx| {
+                info!("WsConnection with member {} is idle", member_id);
+                session.room.do_send(RpcConnectionClosed {
+                    member_id: session.member_id,
+                    reason: RpcConnectionClosedReason::Idle
+                });
+                ctx.address().close();
             }));
     }
 }
@@ -66,24 +75,37 @@ impl Actor for WsSession {
 
     /// Starts [`Heartbeat`] mechanism and sends message to [`Room`].
     fn started(&mut self, ctx: &mut Self::Context) {
-        debug!("Session of member {} started", self.member_id);
+        debug!("Started WsSession for member {}", self.member_id);
         self.reset_idle_timeout(ctx);
-        self.room.do_send(JoinMember(self.member_id, ctx.address()));
+        self.room.do_send(RpcConnectionEstablished {
+            connection: Box::new(ctx.address()),
+        });
+    }
+}
+
+impl RpcConnection for Addr<WsSession> {
+    fn get_member_id(&self) -> Result<MemberID, Box<dyn std::error::Error>> {
+        self.send(GetMemberId {})
+            .wait()
+            .map_err(|err: MailboxError| err.compat().into())
+    }
+
+    fn close(&self) {
+        self.do_send(Close {
+            close_frame: CloseReason::from(CloseCode::Normal),
+        })
     }
 }
 
 /// Message sending from [`Room`] for closing [`WsSession`].
 #[derive(Message)]
-pub struct Close(pub Option<CloseReason>);
+#[rtype(result = "MemberID")]
+pub struct GetMemberId();
 
-impl Handler<Close> for WsSession {
-    type Result = ();
-
-    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
-    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
-        ctx.close(close.0);
-        ctx.stop();
-    }
+/// Message sending from [`Room`] for closing [`WsSession`].
+#[derive(Message)]
+pub struct Close {
+    close_frame: CloseReason,
 }
 
 /// Message for keeping client WebSocket connection alive.
@@ -99,6 +121,29 @@ pub enum Heartbeat {
     Pong(usize),
 }
 
+impl Handler<GetMemberId> for WsSession {
+    type Result = MemberID;
+
+    fn handle(
+        &mut self,
+        _msg: GetMemberId,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        self.member_id
+    }
+}
+
+impl Handler<Close> for WsSession {
+    type Result = ();
+
+    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
+    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
+        debug!("Closing WsSession for member {}", self.member_id);
+        ctx.close(Some(close.close_frame));
+        ctx.stop();
+    }
+}
+
 impl Handler<Heartbeat> for WsSession {
     type Result = ();
 
@@ -115,18 +160,22 @@ impl Handler<Heartbeat> for WsSession {
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
     /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
-        debug!("Received WS message: {:?}", msg);
+        debug!("Received WS message: {:?} from member {}", msg, self.member_id);
         match msg {
             ws::Message::Text(text) => {
+                self.reset_idle_timeout(ctx);
                 if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
                     ctx.notify(msg);
                 }
-                self.reset_idle_timeout(ctx);
             }
-            ws::Message::Close(reason) => {
-                self.room.do_send(LeaveMember(self.member_id, reason))
+            ws::Message::Close(_reason) => {
+                self.room.do_send(RpcConnectionClosed {
+                    member_id: self.member_id,
+                    reason: RpcConnectionClosedReason::Disconnect
+                });
+                ctx.stop();
             }
-            _ => error!("Unsupported message"),
+            _ => error!("Unsupported message from member {}", self.member_id),
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index d6778a34a..cd8bfa9c5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,7 +27,7 @@ fn main() {
     let room = Arbiter::start(move |_| Room {
         id: 1,
         members,
-        sessions: HashMap::new(),
+        connections: HashMap::new(),
     });
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);

From 96d68450c1d2647c508ddbaf83e377e8a88b2553 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 25 Feb 2019 11:37:54 +0200
Subject: [PATCH 040/179] Impl peers

---
 Cargo.lock                |   1 +
 Cargo.toml                |   1 +
 src/api/client/room.rs    | 119 +++++++++++++++++++++++++++++++++++--
 src/api/client/server.rs  |   6 +-
 src/api/client/session.rs |  11 +++-
 src/main.rs               |   6 +-
 src/media/mod.rs          |   2 +-
 src/media/peer.rs         | 120 ++++++++++++++++++++++++--------------
 8 files changed, 205 insertions(+), 61 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 399918bca..70971501e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -677,6 +677,7 @@ dependencies = [
  "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 2de71e500..f56fc61f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ actix = "0.7"
 actix-web = "0.7"
 chrono = "0.4"
 dotenv = "0.13"
+failure = "0.1"
 futures = "0.1"
 hashbrown = "0.1"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index b695d2887..79268d8bd 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -5,13 +5,40 @@ use actix::prelude::*;
 use actix_web::ws::CloseReason;
 use futures::future::Future;
 use hashbrown::HashMap;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     api::client::{Close, WsSession},
     api::control::{Id as MemberID, Member},
     log::prelude::*,
+    media::{Id as PeerID, Peer, PeerMachine},
 };
 
+use failure::Fail;
+
+#[derive(Fail, Debug)]
+pub enum RoomError {
+    #[fail(display = "Unknown peer {}", _0)]
+    UnknownPeer(PeerID),
+    #[fail(display = "Unmatched state of peer {}", _0)]
+    UnmatchedState(PeerID),
+}
+
+#[derive(Debug, Deserialize, Serialize, Message)]
+#[rtype(result = "Result<(), RoomError>")]
+pub enum Command {
+    MakeSdpOffer { peer_id: PeerID, sdp_offer: String },
+    MakeSdpAnswer,
+}
+
+#[derive(Debug, Deserialize, Serialize, Message)]
+pub enum Event {
+    PeerCreated {
+        peer: PeerID,
+        sdp_offer: Option<String>,
+    },
+}
+
 /// ID of [`Room`].
 pub type Id = u64;
 
@@ -19,13 +46,49 @@ pub type Id = u64;
 #[derive(Clone, Debug)]
 pub struct Room {
     /// ID of [`Room`].
-    pub id: Id,
+    id: Id,
 
     /// [`Member`]'s this room.
-    pub members: HashMap<MemberID, Member>,
+    members: HashMap<MemberID, Member>,
 
     /// [`WsSession`]s of [`Member`]'s this room.
-    pub sessions: HashMap<MemberID, Addr<WsSession>>,
+    sessions: HashMap<MemberID, Addr<WsSession>>,
+
+    /// [`Peer`]s of [`Member`]'s this room.
+    peers: HashMap<PeerID, PeerMachine>,
+}
+
+impl Room {
+    pub fn new(id: Id, members: HashMap<MemberID, Member>) -> Self {
+        Room {
+            id,
+            members,
+            sessions: HashMap::new(),
+            peers: HashMap::new(),
+        }
+    }
+
+    fn start_pipeline(&mut self, members: (MemberID, MemberID)) {
+        let peer_responder_id = 2;
+        let peer_responder =
+            PeerMachine::New(Peer::new(peer_responder_id, members.1));
+        let peer_caller_id = 1;
+        let peer_caller = PeerMachine::WaitLocalSDP(
+            Peer::new(peer_caller_id, members.0).start(peer_responder_id),
+        );
+        let event = Event::PeerCreated {
+            peer: peer_caller_id,
+            sdp_offer: None,
+        };
+        let caller_session = self.sessions.get(&members.0).unwrap();
+        caller_session.do_send(event);
+        self.peers.insert(peer_caller_id, peer_caller);
+        self.peers.insert(peer_responder_id, peer_responder);
+    }
+}
+
+impl Actor for Room {
+    type Context = Context<Self>;
 }
 
 /// Message for to get information about [`Member`] by its credentials.
@@ -63,10 +126,15 @@ impl Handler<JoinMember> for Room {
     /// before store current [`WsSession`] in [`Room`].
     fn handle(&mut self, msg: JoinMember, _ctx: &mut Self::Context) {
         debug!("join member: {}", msg.0);
+        let mut reconnected = false;
         if let Some(old_session) = self.sessions.remove(&msg.0) {
+            reconnected = true;
             let _ = old_session.send(Close(None)).wait();
         }
         self.sessions.insert(msg.0, msg.1);
+        if !reconnected && self.sessions.len() > 1 {
+            self.start_pipeline((1, 2));
+        }
     }
 }
 
@@ -87,8 +155,49 @@ impl Handler<LeaveMember> for Room {
     }
 }
 
-impl Actor for Room {
-    type Context = Context<Self>;
+impl Handler<Command> for Room {
+    type Result = Result<(), RoomError>;
+
+    fn handle(
+        &mut self,
+        command: Command,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        debug!("receive command: {:?}", command);
+        match command {
+            Command::MakeSdpOffer { peer_id, sdp_offer } => {
+                let peer_caller = self
+                    .peers
+                    .remove(&peer_id)
+                    .ok_or(RoomError::UnknownPeer(peer_id))?;
+                let (new_peer_caller, opponent_peer_id) = match peer_caller {
+                    PeerMachine::WaitLocalSDP(peer) => Ok((
+                        PeerMachine::WaitRemoteSDP(
+                            peer.set_local_sdp(sdp_offer),
+                        ),
+                        peer.context.opponent_peer_id.unwrap(),
+                    )),
+                    _ => Err(RoomError::UnmatchedState(peer_id)),
+                }?;
+                self.peers.insert(peer_id, new_peer_caller);
+                let peer_responder = self
+                    .peers
+                    .remove(&opponent_peer_id)
+                    .ok_or(RoomError::UnknownPeer(opponent_peer_id))?;
+                let new_peer_responder = match peer_responder {
+                    PeerMachine::New(peer) => {
+                        Ok(PeerMachine::WaitLocalHaveRemote(
+                            peer.set_remote_sdp(sdp_offer),
+                        ))
+                    }
+                    _ => Err(RoomError::UnmatchedState(opponent_peer_id)),
+                }?;
+                self.peers.insert(opponent_peer_id, new_peer_responder);
+                Ok(())
+            }
+            _ => unimplemented!(),
+        }
+    }
 }
 
 /// Repository that stores [`Room`]s.
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 5ece0f892..51745ebfa 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -90,11 +90,7 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
             2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
         };
-        let room = Arbiter::start(move |_| Room {
-            id: 1,
-            members,
-            sessions: HashMap::new(),
-        });
+        let room = Arbiter::start(move |_| Room::new(1, members));
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
     }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 6bf795b2d..cf7f4c2c8 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -7,7 +7,7 @@ use actix_web::ws::{self, CloseReason};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::client::room::{JoinMember, LeaveMember, Room},
+    api::client::room::{Event, JoinMember, LeaveMember, Room},
     api::control::member::Id as MemberID,
     log::prelude::*,
 };
@@ -112,6 +112,15 @@ impl Handler<Heartbeat> for WsSession {
     }
 }
 
+impl Handler<Event> for WsSession {
+    type Result = ();
+
+    fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
+        trace!("Send event: {:?}", event);
+        ctx.text(serde_json::to_string(&event).unwrap())
+    }
+}
+
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
     /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
diff --git a/src/main.rs b/src/main.rs
index ffcae5b10..2cbdff18d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,11 +25,7 @@ fn main() {
         1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
-    let room = Arbiter::start(move |_| Room {
-        id: 1,
-        members,
-        sessions: HashMap::new(),
-    });
+    let room = Arbiter::start(move |_| Room::new(1, members));
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);
 
diff --git a/src/media/mod.rs b/src/media/mod.rs
index 00875fe22..af54a64bf 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -1,3 +1,3 @@
 pub mod peer;
 
-pub use self::peer::*;
+pub use self::peer::{Id, Peer, PeerMachine};
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 67c90a41a..b6173d796 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,69 +1,101 @@
-use crate::{api::control::member, log::prelude::*};
+use crate::{api::control::member::Id as MemberID, log::prelude::*};
 
-#[derive(Debug, PartialEq)]
-pub enum PeerMachine {
-    New(Peer),
-    WaitLocalSDP(Peer),
-    WaitLocalHaveRemote(Peer),
-    WaitRemoteSDP(Peer),
-    Stable(Peer),
-    Finished(Peer),
-    Failure,
-}
-
-pub enum Command {
-    MakeSdpOffer,
-    MakeSdpAnswer
-}
+#[derive(Debug, Clone)]
+pub struct New {}
+#[derive(Debug, Clone)]
+pub struct WaitLocalSDP {}
+#[derive(Debug, Clone)]
+pub struct WaitLocalHaveRemote {}
+#[derive(Debug, Clone)]
+pub struct WaitRemoteSDP {}
+#[derive(Debug, Clone)]
+pub struct Stable {}
+#[derive(Debug, Clone)]
+pub struct Finished {}
+#[derive(Debug, Clone)]
+pub struct Failure {}
 
 /// ID of [`Peer`].
 pub type Id = u64;
 
-#[derive(Debug, PartialEq)]
-struct Peer {
+#[derive(Debug, Clone)]
+pub struct PeerContext {
     id: Id,
-    member_id: member::Id,
+    member_id: MemberID,
+    pub opponent_peer_id: Option<Id>,
+    offer: Option<String>,
 }
 
-impl PeerMachine {
-    pub fn new(id: Id, member_id: member::Id) -> Self {
-        PeerMachine::New(Peer{id, member_id})
+#[derive(Debug, Clone)]
+pub struct Peer<S> {
+    pub context: PeerContext,
+    state: S,
+}
+
+#[derive(Debug, Clone)]
+pub enum PeerMachine {
+    New(Peer<New>),
+    WaitLocalSDP(Peer<WaitLocalSDP>),
+    WaitLocalHaveRemote(Peer<WaitLocalHaveRemote>),
+    WaitRemoteSDP(Peer<WaitRemoteSDP>),
+    Stable(Peer<Stable>),
+    Finished(Peer<Finished>),
+    Failure(Peer<Failure>),
+}
+
+impl Peer<New> {
+    pub fn new(id: Id, member_id: MemberID) -> Self {
+        let context = PeerContext {
+            id,
+            member_id,
+            opponent_peer_id: None,
+            offer: None,
+        };
+        Peer {
+            context,
+            state: New {},
+        }
     }
 
-    pub fn approve(self, c: Option<Command>) -> Self {
-        match (self, c) {
-            (PeerMachine::New(peer), None) => {
-                PeerMachine::WaitLocalSDP(peer)
-            },
-            (PeerMachine::New(peer), Some(Command::MakeSdpOffer)) => {
-                PeerMachine::WaitLocalHaveRemote(peer)
-            },
-            (PeerMachine::WaitLocalSDP(peer), Some(Command::MakeSdpOffer)) => {
-                PeerMachine::WaitRemoteSDP(peer)
-            },
-            (PeerMachine::WaitLocalHaveRemote(peer), Some(Command::MakeSdpOffer)) => {
-                PeerMachine::WaitRemoteSDP(peer)
-            },
-            _ => PeerMachine::Failure,
+    pub fn start(self, opponent_peer_id: Id) -> Peer<WaitLocalSDP> {
+        let mut context = self.context;
+        context.opponent_peer_id = Some(opponent_peer_id);
+        Peer {
+            context,
+            state: WaitLocalSDP {},
         }
     }
 
-    pub fn pool(&self) {
-        println!("{:?}", self)
+    pub fn set_remote_sdp(self, offer: String) -> Peer<WaitLocalHaveRemote> {
+        let mut context = self.context;
+        context.offer = Some(offer);
+        Peer {
+            context,
+            state: WaitLocalHaveRemote {},
+        }
+    }
+}
+
+impl Peer<WaitLocalSDP> {
+    pub fn set_local_sdp(self, offer: String) -> Peer<WaitRemoteSDP> {
+        let mut context = self.context;
+        context.offer = Some(offer);
+        Peer {
+            context,
+            state: WaitRemoteSDP {},
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use assert_matches::*;
 
     #[test]
     fn create_peer() {
-        let peer = PeerMachine::new(1, 1);
-        let peer = peer.approve(None);
-        peer.pool();
+        let peer = Peer::new(1, 1);
+        let peer = peer.start(2);
 
-        assert_matches!(peer, PeerMachine::WaitLocalSDP(Peer{id: 1, member_id: 1}));
+        assert_eq!(peer.context.opponent_peer_id, Some(2));
     }
 }

From a71d5f382ed681b1ac1ff7cd8e5f7320e7b71421 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 25 Feb 2019 16:49:29 +0200
Subject: [PATCH 041/179] Simplify RpcConnection trait

- fix close himself by external interface
- add docs
---
 src/api/client/room.rs    | 49 ++++++++++++++++----------------
 src/api/client/server.rs  | 51 ++++++++++++++++++++++++++-------
 src/api/client/session.rs | 59 ++++++++++++++-------------------------
 3 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 817457e31..50018bea0 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -26,18 +26,22 @@ pub struct Room {
     pub connections: HashMap<MemberID, Box<dyn RpcConnection>>,
 }
 
+/// [`Actor`] implementation that provides an ergonomic way for members
+/// to interact in [` Room`].
 impl Actor for Room {
     type Context = Context<Self>;
 }
 
+/// Connection of [`Member`].
 pub trait RpcConnection: Debug + Send {
-    fn get_member_id(&self) -> Result<MemberID, Box<dyn std::error::Error>>;
-
+    /// Close connection.
     fn close(&self);
 }
 
+/// Message that [`Member`] has connected to [`Room`].
 #[derive(Message, Debug)]
 pub struct RpcConnectionEstablished {
+    pub member_id: MemberID,
     pub connection: Box<dyn RpcConnection>,
 }
 
@@ -48,15 +52,19 @@ pub struct GetMember {
     pub credentials: String,
 }
 
+/// Message that [`Member`] closed or lost connection.
 #[derive(Message, Debug)]
 pub struct RpcConnectionClosed {
     pub member_id: MemberID,
     pub reason: RpcConnectionClosedReason,
 }
 
+/// Reason closing connection of [`Member`].
 #[derive(Debug)]
 pub enum RpcConnectionClosedReason {
+    /// [`Member`] closed connection himself.
     Disconnect,
+    /// [`Member`] has lost connection.
     Idle,
 }
 
@@ -79,39 +87,32 @@ impl Handler<GetMember> for Room {
 impl Handler<RpcConnectionEstablished> for Room {
     type Result = ();
 
+    /// Store connection of [`Member`] into [`Room`].
+    ///
+    /// If the [`Member`] already has connection, it will be closed.
     fn handle(
         &mut self,
         msg: RpcConnectionEstablished,
         _ctx: &mut Self::Context,
-    ) -> Self::Result {
-        let member_id = msg.connection.get_member_id();
-
-        info!("RpcConnectionEstablished with member {:?}", &member_id);
-
-        match member_id {
-            Ok(member_id) => {
-                if let Some(old_session) = self.connections.remove(&member_id) {
-                    old_session.close();
-                }
-                self.connections.insert(member_id, msg.connection);
-            }
-            Err(e) => {
-                error!("{:?}", e);
-                msg.connection.close();
-            },
+    ) {
+        info!("RpcConnectionEstablished with member {:?}", &msg.member_id);
+        if let Some(old_connection) = self.connections.remove(&msg.member_id) {
+            debug!("Reconnect WsSession for member {}", msg.member_id);
+            old_connection.close();
         }
+        self.connections.insert(msg.member_id, msg.connection);
     }
 }
 
 impl Handler<RpcConnectionClosed> for Room {
     type Result = ();
 
-    fn handle(
-        &mut self,
-        msg: RpcConnectionClosed,
-        _ctx: &mut Self::Context,
-    ) -> Self::Result {
-        info!("RpcConnectionClosed with member {}, reason {:?}", &msg.member_id, msg.reason);
+    /// Remove connection of [`Member`] from [`Room`].
+    fn handle(&mut self, msg: RpcConnectionClosed, _ctx: &mut Self::Context) {
+        info!(
+            "RpcConnectionClosed with member {}, reason {:?}",
+            &msg.member_id, msg.reason
+        );
         self.connections.remove(&msg.member_id);
     }
 }
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index b66c5954e..511b95b73 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -133,18 +133,49 @@ mod test {
         let (reader, mut writer) =
             srv.ws_at("/ws/1/caller_credentials").unwrap();
 
+        writer.text(r#"{"ping":33}"#);
+        let (item, reader) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
+
         thread::sleep(session::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
 
-        writer.text(r#"{"ping":33}"#);
-        assert!(match srv.execute(reader.into_future()) {
-            Ok((
-                Some(Close(Some(CloseReason {
-                    code: CloseCode::Away,
-                    description: None,
-                }))),
-                _,
-            )) => true,
-            _ => false,
+        let (item, _) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(
+            item,
+            Some(ws::Message::Close(Some(ws::CloseCode::Normal.into())))
+        );
+    }
+
+    #[test]
+    fn disconnects_on_reconnect() {
+        let mut srv = test::TestServer::with_factory(move || {
+            let repo = start_room();
+            App::with_state(AppContext { rooms: repo })
+                .resource("/ws/{room_id}/{credentials}", |r| {
+                    r.method(http::Method::GET).with(ws_index)
+                })
         });
+
+        let (reader, mut writer) =
+            srv.ws_at("/ws/1/caller_credentials").unwrap();
+        writer.text(r#"{"ping":33}"#);
+        let (item, reader) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
+
+        thread::sleep(Duration::from_secs(1));
+
+        let (reader2, mut writer2) =
+            srv.ws_at("/ws/1/caller_credentials").unwrap();
+        writer2.text(r#"{"ping":33}"#);
+        let (item, _) = srv.execute(reader2.into_future()).unwrap();
+        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
+
+        thread::sleep(Duration::from_secs(1));
+
+        let (item, reader) = srv.execute(reader.into_future()).unwrap();
+        assert_eq!(
+            item,
+            Some(ws::Message::Close(Some(ws::CloseCode::Restart.into())))
+        );
     }
 }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index df41a5e52..761be9527 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -4,14 +4,12 @@ use std::time::Duration;
 
 use actix::prelude::*;
 use actix_web::ws::{self, CloseReason};
-use failure::Fail;
-use futures::future::Future;
 use serde::{Deserialize, Serialize};
 
 use crate::{
     api::client::room::{
-        Room, RpcConnection, RpcConnectionClosed, RpcConnectionEstablished,
-        RpcConnectionClosedReason
+        Room, RpcConnection, RpcConnectionClosed, RpcConnectionClosedReason,
+        RpcConnectionEstablished,
     },
     api::control::member::Id as MemberID,
     log::prelude::*,
@@ -61,9 +59,11 @@ impl WsSession {
                 info!("WsConnection with member {} is idle", member_id);
                 session.room.do_send(RpcConnectionClosed {
                     member_id: session.member_id,
-                    reason: RpcConnectionClosedReason::Idle
+                    reason: RpcConnectionClosedReason::Idle,
+                });
+                ctx.notify(Close {
+                    reason: Some(CloseCode::Normal.into()),
                 });
-                ctx.address().close();
             }));
     }
 }
@@ -78,34 +78,26 @@ impl Actor for WsSession {
         debug!("Started WsSession for member {}", self.member_id);
         self.reset_idle_timeout(ctx);
         self.room.do_send(RpcConnectionEstablished {
+            member_id: self.member_id,
             connection: Box::new(ctx.address()),
         });
     }
 }
 
 impl RpcConnection for Addr<WsSession> {
-    fn get_member_id(&self) -> Result<MemberID, Box<dyn std::error::Error>> {
-        self.send(GetMemberId {})
-            .wait()
-            .map_err(|err: MailboxError| err.compat().into())
-    }
-
+    /// Close [`WsSession`] by send himself close message.
     fn close(&self) {
+        debug!("Reconnect WsSession");
         self.do_send(Close {
-            close_frame: CloseReason::from(CloseCode::Normal),
-        })
+            reason: Some(CloseCode::Normal.into()),
+        });
     }
 }
 
-/// Message sending from [`Room`] for closing [`WsSession`].
-#[derive(Message)]
-#[rtype(result = "MemberID")]
-pub struct GetMemberId();
-
-/// Message sending from [`Room`] for closing [`WsSession`].
+/// Message for closing [`WsSession`].
 #[derive(Message)]
 pub struct Close {
-    close_frame: CloseReason,
+    reason: Option<CloseReason>,
 }
 
 /// Message for keeping client WebSocket connection alive.
@@ -121,25 +113,13 @@ pub enum Heartbeat {
     Pong(usize),
 }
 
-impl Handler<GetMemberId> for WsSession {
-    type Result = MemberID;
-
-    fn handle(
-        &mut self,
-        _msg: GetMemberId,
-        _ctx: &mut Self::Context,
-    ) -> Self::Result {
-        self.member_id
-    }
-}
-
 impl Handler<Close> for WsSession {
     type Result = ();
 
     /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
     fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
         debug!("Closing WsSession for member {}", self.member_id);
-        ctx.close(Some(close.close_frame));
+        ctx.close(close.reason);
         ctx.stop();
     }
 }
@@ -160,7 +140,10 @@ impl Handler<Heartbeat> for WsSession {
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
     /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
-        debug!("Received WS message: {:?} from member {}", msg, self.member_id);
+        debug!(
+            "Received WS message: {:?} from member {}",
+            msg, self.member_id
+        );
         match msg {
             ws::Message::Text(text) => {
                 self.reset_idle_timeout(ctx);
@@ -168,12 +151,12 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     ctx.notify(msg);
                 }
             }
-            ws::Message::Close(_reason) => {
+            ws::Message::Close(reason) => {
                 self.room.do_send(RpcConnectionClosed {
                     member_id: self.member_id,
-                    reason: RpcConnectionClosedReason::Disconnect
+                    reason: RpcConnectionClosedReason::Disconnect,
                 });
-                ctx.stop();
+                ctx.notify(Close { reason });
             }
             _ => error!("Unsupported message from member {}", self.member_id),
         }

From 261ed38de1d00a7bb3635b1df78a2bc73e55c26e Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 26 Feb 2019 16:38:30 +0200
Subject: [PATCH 042/179] Impl correct close WsSession

---
 src/api/client/server.rs  |  3 +--
 src/api/client/session.rs | 40 ++++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 511b95b73..dc4fcf128 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -78,7 +78,7 @@ mod test {
     use std::{ops::Add, thread, time::Duration};
 
     use actix::prelude::*;
-    use actix_web::{http, test, ws::CloseReason, ws::Message::Close, App};
+    use actix_web::{http, test, App};
     use futures::Stream;
     use hashbrown::HashMap;
 
@@ -88,7 +88,6 @@ mod test {
     };
 
     use super::*;
-    use actix_web::ws::CloseCode;
 
     fn start_room() -> RoomsRepository {
         let members = hashmap! {
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 761be9527..7e1c4b8ec 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -35,6 +35,8 @@ pub struct WsSession {
     /// This one should be renewed on any received WebSocket message
     /// from client.
     idle_handler: Option<SpawnHandle>,
+
+    closed_by_server: bool,
 }
 
 impl WsSession {
@@ -44,6 +46,7 @@ impl WsSession {
             member_id,
             room,
             idle_handler: None,
+            closed_by_server: false,
         }
     }
 
@@ -57,13 +60,13 @@ impl WsSession {
         self.idle_handler =
             Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, move |session, ctx| {
                 info!("WsConnection with member {} is idle", member_id);
+                ctx.notify(Close {
+                    reason: Some(CloseCode::Normal.into()),
+                });
                 session.room.do_send(RpcConnectionClosed {
                     member_id: session.member_id,
                     reason: RpcConnectionClosedReason::Idle,
                 });
-                ctx.notify(Close {
-                    reason: Some(CloseCode::Normal.into()),
-                });
             }));
     }
 }
@@ -82,6 +85,10 @@ impl Actor for WsSession {
             connection: Box::new(ctx.address()),
         });
     }
+
+    fn stopped(&mut self, _ctx: &mut Self::Context) {
+        debug!("Stopped WsSession for member {}", self.member_id);
+    }
 }
 
 impl RpcConnection for Addr<WsSession> {
@@ -100,6 +107,17 @@ pub struct Close {
     reason: Option<CloseReason>,
 }
 
+impl Handler<Close> for WsSession {
+    type Result = ();
+
+    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
+    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
+        debug!("Closing WsSession for member {}", self.member_id);
+        self.closed_by_server = true;
+        ctx.close(close.reason);
+    }
+}
+
 /// Message for keeping client WebSocket connection alive.
 #[derive(Debug, Message, Deserialize, Serialize)]
 pub enum Heartbeat {
@@ -113,17 +131,6 @@ pub enum Heartbeat {
     Pong(usize),
 }
 
-impl Handler<Close> for WsSession {
-    type Result = ();
-
-    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
-    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
-        debug!("Closing WsSession for member {}", self.member_id);
-        ctx.close(close.reason);
-        ctx.stop();
-    }
-}
-
 impl Handler<Heartbeat> for WsSession {
     type Result = ();
 
@@ -152,11 +159,14 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                 }
             }
             ws::Message::Close(reason) => {
+                if !self.closed_by_server {
+                    debug!("Send close frame with reason {:?}", reason);
+                    ctx.close(reason);
+                }
                 self.room.do_send(RpcConnectionClosed {
                     member_id: self.member_id,
                     reason: RpcConnectionClosedReason::Disconnect,
                 });
-                ctx.notify(Close { reason });
             }
             _ => error!("Unsupported message from member {}", self.member_id),
         }

From 0470201099ac55ecc9d0507bdc78c82d73cd897b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 27 Feb 2019 13:56:15 +0200
Subject: [PATCH 043/179] Fix send close message to Room

---
 src/api/client/room.rs    |  6 +++---
 src/api/client/server.rs  | 33 ---------------------------------
 src/api/client/session.rs | 10 ++++++----
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 50018bea0..3ad7ffb85 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -59,12 +59,12 @@ pub struct RpcConnectionClosed {
     pub reason: RpcConnectionClosedReason,
 }
 
-/// Reason closing connection of [`Member`].
+/// [`RpcConnection`] close reasons.
 #[derive(Debug)]
 pub enum RpcConnectionClosedReason {
-    /// [`Member`] closed connection himself.
+    /// [`RpcConnection`] gracefully disconnected from server.
     Disconnect,
-    /// [`Member`] has lost connection.
+    /// [`RpcConnection`] was considered idle.
     Idle,
 }
 
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index dc4fcf128..c89153753 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -144,37 +144,4 @@ mod test {
             Some(ws::Message::Close(Some(ws::CloseCode::Normal.into())))
         );
     }
-
-    #[test]
-    fn disconnects_on_reconnect() {
-        let mut srv = test::TestServer::with_factory(move || {
-            let repo = start_room();
-            App::with_state(AppContext { rooms: repo })
-                .resource("/ws/{room_id}/{credentials}", |r| {
-                    r.method(http::Method::GET).with(ws_index)
-                })
-        });
-
-        let (reader, mut writer) =
-            srv.ws_at("/ws/1/caller_credentials").unwrap();
-        writer.text(r#"{"ping":33}"#);
-        let (item, reader) = srv.execute(reader.into_future()).unwrap();
-        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
-
-        thread::sleep(Duration::from_secs(1));
-
-        let (reader2, mut writer2) =
-            srv.ws_at("/ws/1/caller_credentials").unwrap();
-        writer2.text(r#"{"ping":33}"#);
-        let (item, _) = srv.execute(reader2.into_future()).unwrap();
-        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.to_owned())));
-
-        thread::sleep(Duration::from_secs(1));
-
-        let (item, reader) = srv.execute(reader.into_future()).unwrap();
-        assert_eq!(
-            item,
-            Some(ws::Message::Close(Some(ws::CloseCode::Restart.into())))
-        );
-    }
 }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 7e1c4b8ec..d2628fa10 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -115,6 +115,7 @@ impl Handler<Close> for WsSession {
         debug!("Closing WsSession for member {}", self.member_id);
         self.closed_by_server = true;
         ctx.close(close.reason);
+        ctx.stop();
     }
 }
 
@@ -160,13 +161,14 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
             }
             ws::Message::Close(reason) => {
                 if !self.closed_by_server {
+                    self.room.do_send(RpcConnectionClosed {
+                        member_id: self.member_id,
+                        reason: RpcConnectionClosedReason::Disconnect,
+                    });
                     debug!("Send close frame with reason {:?}", reason);
                     ctx.close(reason);
+                    ctx.stop();
                 }
-                self.room.do_send(RpcConnectionClosed {
-                    member_id: self.member_id,
-                    reason: RpcConnectionClosedReason::Disconnect,
-                });
             }
             _ => error!("Unsupported message from member {}", self.member_id),
         }

From 55b9c3e7d9068a8aaff6ad8f01ed70ddd36b25f6 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 1 Mar 2019 13:55:11 +0200
Subject: [PATCH 044/179] Impl crate offers for caller and responder

---
 Cargo.toml                |   1 -
 README.md                 |   2 +
 src/api/client/room.rs    | 145 ++++++++++++++++++++++++++++----------
 src/api/client/server.rs  |   1 -
 src/api/client/session.rs |  33 +++++++--
 src/main.rs               |   1 -
 src/media/peer.rs         |  10 +--
 7 files changed, 143 insertions(+), 50 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b6e2c4984..f56fc61f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,4 +25,3 @@ slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
-failure = "0.1.5"
diff --git a/README.md b/README.md
index e376bfacf..95216614a 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,5 @@ Medea
 Medea media server
 
 __DEVELOPMENT IN PROGRESS__
+
+{"MakeSdpOffer":{"peer":0,"sdp_offer":"caller_offer"}}
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 94ea5eab2..b0478ef92 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -14,8 +14,15 @@ use std::fmt::Debug;
 
 use failure::Fail;
 
+const PEER_CALLER_ID: PeerID = 1;
+const PEER_RESPONDER_ID: PeerID = 2;
+
 #[derive(Fail, Debug)]
 pub enum RoomError {
+    #[fail(display = "Member without peer {}", _0)]
+    MemberWithoutPeer(MemberID),
+    #[fail(display = "Invalid connection of member {}", _0)]
+    InvalidConnection(MemberID),
     #[fail(display = "Unknown peer {}", _0)]
     UnknownPeer(PeerID),
     #[fail(display = "Unmatched state of peer {}", _0)]
@@ -23,7 +30,7 @@ pub enum RoomError {
 }
 
 #[derive(Debug, Deserialize, Serialize, Message)]
-#[rtype(result = "Result<(), RoomError>")]
+#[rtype(result = "Result<bool, RoomError>")]
 pub enum Command {
     MakeSdpOffer { peer_id: PeerID, sdp_offer: String },
     MakeSdpAnswer,
@@ -32,7 +39,7 @@ pub enum Command {
 #[derive(Debug, Deserialize, Serialize, Message)]
 pub enum Event {
     PeerCreated {
-        peer: PeerID,
+        peer_id: PeerID,
         sdp_offer: Option<String>,
     },
 }
@@ -52,8 +59,12 @@ pub struct Room {
     /// Connections of [`Member`]'s this room.
     connections: HashMap<MemberID, Box<dyn RpcConnection>>,
 
+    member_peers: HashMap<MemberID, PeerID>,
+
     /// [`Peer`]s of [`Member`]'s this room.
     peers: HashMap<PeerID, PeerMachine>,
+
+    peer_index: u64,
 }
 
 /// [`Actor`] implementation that provides an ergonomic way for members
@@ -66,10 +77,14 @@ impl Actor for Room {
 pub trait RpcConnection: Debug + Send {
     /// Close connection.
     fn close(&self);
+
+    /// Send event.
+    fn send_event(&self, event: Event);
 }
 
 /// Message that [`Member`] has connected to [`Room`].
 #[derive(Message, Debug)]
+#[rtype(result = "Result<(), RoomError>")]
 pub struct RpcConnectionEstablished {
     pub member_id: MemberID,
     pub connection: Box<dyn RpcConnection>,
@@ -81,26 +96,52 @@ impl Room {
             id,
             members,
             connections: HashMap::new(),
+            member_peers: HashMap::new(),
             peers: HashMap::new(),
+            peer_index: 0,
         }
     }
 
-    fn start_pipeline(&mut self, members: (MemberID, MemberID)) {
-        let peer_responder_id = 2;
-        let peer_responder =
-            PeerMachine::New(Peer::new(peer_responder_id, members.1));
-        let peer_caller_id = 1;
-        let peer_caller = PeerMachine::WaitLocalSDP(
-            Peer::new(peer_caller_id, members.0).start(peer_responder_id),
-        );
+    fn next_peer_id(&mut self) -> PeerID {
+        let id = self.peer_index;
+        self.peer_index += 1;
+        id
+    }
+
+    fn start_pipeline(
+        &mut self,
+        caller: MemberID,
+        responder: MemberID,
+    ) -> Result<(), RoomError> {
+        let peer_caller_id = self
+            .member_peers
+            .get(&caller)
+            .ok_or(RoomError::MemberWithoutPeer(caller))?;
+        let peer_responder_id = self
+            .member_peers
+            .get(&responder)
+            .ok_or(RoomError::MemberWithoutPeer(responder))?;
+        let peer_caller = self
+            .peers
+            .remove(peer_caller_id)
+            .ok_or(RoomError::UnknownPeer(*peer_caller_id))?;
+        let new_peer_caller = match peer_caller {
+            PeerMachine::New(peer) => {
+                Ok(PeerMachine::WaitLocalSDP(peer.start(*peer_responder_id)))
+            }
+            _ => Err(RoomError::UnmatchedState(*peer_caller_id)),
+        }?;
         let event = Event::PeerCreated {
-            peer: peer_caller_id,
+            peer_id: *peer_caller_id,
             sdp_offer: None,
         };
-        let caller_session = self.sessions.get(&members.0).unwrap();
-        caller_session.do_send(event);
-        self.peers.insert(peer_caller_id, peer_caller);
-        self.peers.insert(peer_responder_id, peer_responder);
+        let caller_connection = self
+            .connections
+            .get(&caller)
+            .ok_or(RoomError::InvalidConnection(caller))?;
+        caller_connection.send_event(event);
+        self.peers.insert(*peer_caller_id, new_peer_caller);
+        Ok(())
     }
 }
 
@@ -144,7 +185,7 @@ impl Handler<GetMember> for Room {
 }
 
 impl Handler<RpcConnectionEstablished> for Room {
-    type Result = ();
+    type Result = Result<(), RoomError>;
 
     /// Store connection of [`Member`] into [`Room`].
     ///
@@ -153,17 +194,26 @@ impl Handler<RpcConnectionEstablished> for Room {
         &mut self,
         msg: RpcConnectionEstablished,
         _ctx: &mut Self::Context,
-    ) {
+    ) -> Self::Result {
         info!("RpcConnectionEstablished with member {:?}", &msg.member_id);
+        let mut reconnected = false;
         if let Some(old_connection) = self.connections.remove(&msg.member_id) {
             reconnected = true;
             debug!("Reconnect WsSession for member {}", msg.member_id);
             old_connection.close();
         }
         self.connections.insert(msg.member_id, msg.connection);
-        if !reconnected && self.connections.len() > 1 {
-            self.start_pipeline((1, 2));
+        if !reconnected {
+            let peer_id = self.next_peer_id();
+            let peer = PeerMachine::New(Peer::new(peer_id, msg.member_id));
+            self.peers.insert(peer_id, peer);
+            self.member_peers.insert(msg.member_id, peer_id);
+
+            if self.connections.len() > 1 {
+                self.start_pipeline(1, 2)?;
+            }
         }
+        Ok(())
     }
 }
 
@@ -181,7 +231,7 @@ impl Handler<RpcConnectionClosed> for Room {
 }
 
 impl Handler<Command> for Room {
-    type Result = Result<(), RoomError>;
+    type Result = Result<bool, RoomError>;
 
     fn handle(
         &mut self,
@@ -195,30 +245,53 @@ impl Handler<Command> for Room {
                     .peers
                     .remove(&peer_id)
                     .ok_or(RoomError::UnknownPeer(peer_id))?;
-                let (new_peer_caller, opponent_peer_id) = match peer_caller {
-                    PeerMachine::WaitLocalSDP(peer) => Ok((
-                        PeerMachine::WaitRemoteSDP(
-                            peer.set_local_sdp(sdp_offer),
-                        ),
-                        peer.context.opponent_peer_id.unwrap(),
-                    )),
-                    _ => Err(RoomError::UnmatchedState(peer_id)),
+                let (new_peer_caller, responder_peer_id) = match peer_caller {
+                    PeerMachine::WaitLocalSDP(peer) => {
+                        let opponent_peer_id =
+                            peer.context.opponent_peer_id.unwrap();
+                        Ok((
+                            PeerMachine::WaitRemoteSDP(
+                                peer.set_local_sdp(&sdp_offer),
+                            ),
+                            opponent_peer_id,
+                        ))
+                    }
+                    _ => {
+                        error!("Unmatched state caller peer");
+                        Err(RoomError::UnmatchedState(peer_id))
+                    }
                 }?;
                 self.peers.insert(peer_id, new_peer_caller);
                 let peer_responder = self
                     .peers
-                    .remove(&opponent_peer_id)
-                    .ok_or(RoomError::UnknownPeer(opponent_peer_id))?;
-                let new_peer_responder = match peer_responder {
+                    .remove(&responder_peer_id)
+                    .ok_or(RoomError::UnknownPeer(responder_peer_id))?;
+                let (new_peer_responder, responder_id) = match peer_responder {
                     PeerMachine::New(peer) => {
-                        Ok(PeerMachine::WaitLocalHaveRemote(
-                            peer.set_remote_sdp(sdp_offer),
+                        let member_id = peer.context.member_id;
+                        Ok((
+                            PeerMachine::WaitLocalHaveRemote(
+                                peer.set_remote_sdp(&sdp_offer),
+                            ),
+                            member_id,
                         ))
                     }
-                    _ => Err(RoomError::UnmatchedState(opponent_peer_id)),
+                    _ => {
+                        error!("Unmatched state responder peer");
+                        Err(RoomError::UnmatchedState(responder_peer_id))
+                    }
                 }?;
-                self.peers.insert(opponent_peer_id, new_peer_responder);
-                Ok(())
+                self.peers.insert(responder_peer_id, new_peer_responder);
+                let event = Event::PeerCreated {
+                    peer_id: responder_peer_id,
+                    sdp_offer: Some(sdp_offer),
+                };
+                let responder_connection = self
+                    .connections
+                    .get(&responder_id)
+                    .ok_or(RoomError::InvalidConnection(responder_id))?;
+                responder_connection.send_event(event);
+                Ok(true)
             }
             _ => unimplemented!(),
         }
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index dfaf9a313..4990e0274 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -80,7 +80,6 @@ mod test {
     use actix::prelude::*;
     use actix_web::{http, test, App};
     use futures::Stream;
-    use hashbrown::HashMap;
 
     use crate::api::{
         client::{session, Room},
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 87711f7e8..87c2154b1 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -8,8 +8,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     api::client::room::{
-        Event, Room, RpcConnection, RpcConnectionClosed, RpcConnectionClosedReason,
-        RpcConnectionEstablished,
+        Command, Event, Room, RpcConnection, RpcConnectionClosed,
+        RpcConnectionClosedReason, RpcConnectionEstablished,
     },
     api::control::member::Id as MemberID,
     log::prelude::*,
@@ -80,10 +80,17 @@ impl Actor for WsSession {
     fn started(&mut self, ctx: &mut Self::Context) {
         debug!("Started WsSession for member {}", self.member_id);
         self.reset_idle_timeout(ctx);
-        self.room.do_send(RpcConnectionEstablished {
-            member_id: self.member_id,
-            connection: Box::new(ctx.address()),
-        });
+        self.room
+            .send(RpcConnectionEstablished {
+                member_id: self.member_id,
+                connection: Box::new(ctx.address()),
+            })
+            .into_actor(self)
+            .then(|r, a, c| {
+                debug!("{:?}", r);
+                fut::ok::<(), (), Self>(())
+            })
+            .wait(ctx);
     }
 
     fn stopped(&mut self, _ctx: &mut Self::Context) {
@@ -99,6 +106,10 @@ impl RpcConnection for Addr<WsSession> {
             reason: Some(CloseCode::Normal.into()),
         });
     }
+
+    fn send_event(&self, event: Event) {
+        self.do_send(event);
+    }
 }
 
 /// Message for closing [`WsSession`].
@@ -167,6 +178,16 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                 if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
                     ctx.notify(msg);
                 }
+                if let Ok(command) = serde_json::from_str::<Command>(&text) {
+                    self.room
+                        .send(command)
+                        .into_actor(self)
+                        .then(|r, a, c| {
+                            debug!("{:?}", r);
+                            fut::ok::<(), (), Self>(())
+                        })
+                        .wait(ctx);
+                }
             }
             ws::Message::Close(reason) => {
                 if !self.closed_by_server {
diff --git a/src/main.rs b/src/main.rs
index 2cbdff18d..e638e9a09 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 //! Medea media server application.
 use actix::prelude::*;
 use dotenv::dotenv;
-use hashbrown::HashMap;
 
 use crate::api::client::{server, Room, RoomsRepository};
 use crate::api::control::Member;
diff --git a/src/media/peer.rs b/src/media/peer.rs
index b6173d796..452abb817 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -21,7 +21,7 @@ pub type Id = u64;
 #[derive(Debug, Clone)]
 pub struct PeerContext {
     id: Id,
-    member_id: MemberID,
+    pub member_id: MemberID,
     pub opponent_peer_id: Option<Id>,
     offer: Option<String>,
 }
@@ -66,9 +66,9 @@ impl Peer<New> {
         }
     }
 
-    pub fn set_remote_sdp(self, offer: String) -> Peer<WaitLocalHaveRemote> {
+    pub fn set_remote_sdp(self, offer: &str) -> Peer<WaitLocalHaveRemote> {
         let mut context = self.context;
-        context.offer = Some(offer);
+        context.offer = Some(offer.into());
         Peer {
             context,
             state: WaitLocalHaveRemote {},
@@ -77,9 +77,9 @@ impl Peer<New> {
 }
 
 impl Peer<WaitLocalSDP> {
-    pub fn set_local_sdp(self, offer: String) -> Peer<WaitRemoteSDP> {
+    pub fn set_local_sdp(self, offer: &str) -> Peer<WaitRemoteSDP> {
         let mut context = self.context;
-        context.offer = Some(offer);
+        context.offer = Some(offer.into());
         Peer {
             context,
             state: WaitRemoteSDP {},

From 4703bd3cc257c7a944d6efe56eb4d8b375a4ecea Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 4 Mar 2019 16:47:22 +0200
Subject: [PATCH 045/179] Impl receive sdp_answer and send it to caller

---
 Cargo.lock                |   1 +
 Cargo.toml                |   3 +
 src/api/client/room.rs    | 240 ++++++++++++++++++++++++++++++--------
 src/api/client/session.rs |   4 +-
 src/media/peer.rs         |  78 ++++++++++---
 5 files changed, 260 insertions(+), 66 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 70971501e..005af8791 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -688,6 +688,7 @@ dependencies = [
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index f56fc61f2..e1e8404c8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,3 +25,6 @@ slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
+
+[dev-dependencies]
+tokio = "0.1"
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index b0478ef92..fc29f4a9a 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -14,9 +14,6 @@ use std::fmt::Debug;
 
 use failure::Fail;
 
-const PEER_CALLER_ID: PeerID = 1;
-const PEER_RESPONDER_ID: PeerID = 2;
-
 #[derive(Fail, Debug)]
 pub enum RoomError {
     #[fail(display = "Member without peer {}", _0)]
@@ -25,6 +22,8 @@ pub enum RoomError {
     InvalidConnection(MemberID),
     #[fail(display = "Unknown peer {}", _0)]
     UnknownPeer(PeerID),
+    #[fail(display = "Peer dont have opponent {}", _0)]
+    NoOpponentPeer(PeerID),
     #[fail(display = "Unmatched state of peer {}", _0)]
     UnmatchedState(PeerID),
 }
@@ -33,7 +32,7 @@ pub enum RoomError {
 #[rtype(result = "Result<bool, RoomError>")]
 pub enum Command {
     MakeSdpOffer { peer_id: PeerID, sdp_offer: String },
-    MakeSdpAnswer,
+    MakeSdpAnswer { peer_id: PeerID, sdp_answer: String },
 }
 
 #[derive(Debug, Deserialize, Serialize, Message)]
@@ -42,6 +41,10 @@ pub enum Event {
         peer_id: PeerID,
         sdp_offer: Option<String>,
     },
+    SdpAnswerMade {
+        peer_id: PeerID,
+        sdp_answer: String,
+    },
 }
 
 /// ID of [`Room`].
@@ -61,6 +64,8 @@ pub struct Room {
 
     member_peers: HashMap<MemberID, PeerID>,
 
+    peer_to_peer: HashMap<PeerID, PeerID>,
+
     /// [`Peer`]s of [`Member`]'s this room.
     peers: HashMap<PeerID, PeerMachine>,
 
@@ -98,6 +103,7 @@ impl Room {
             connections: HashMap::new(),
             member_peers: HashMap::new(),
             peers: HashMap::new(),
+            peer_to_peer: HashMap::new(),
             peer_index: 0,
         }
     }
@@ -116,31 +122,33 @@ impl Room {
         let peer_caller_id = self
             .member_peers
             .get(&caller)
+            .map(|id| *id)
             .ok_or(RoomError::MemberWithoutPeer(caller))?;
         let peer_responder_id = self
             .member_peers
             .get(&responder)
+            .map(|id| *id)
             .ok_or(RoomError::MemberWithoutPeer(responder))?;
+        self.peer_to_peer.insert(peer_caller_id, peer_responder_id);
+        self.peer_to_peer.insert(peer_responder_id, peer_caller_id);
         let peer_caller = self
             .peers
-            .remove(peer_caller_id)
-            .ok_or(RoomError::UnknownPeer(*peer_caller_id))?;
+            .remove(&peer_caller_id)
+            .ok_or(RoomError::UnknownPeer(peer_caller_id))?;
         let new_peer_caller = match peer_caller {
             PeerMachine::New(peer) => {
-                Ok(PeerMachine::WaitLocalSDP(peer.start(*peer_responder_id)))
+                Ok(PeerMachine::WaitLocalSDP(peer.start(|member_id| {
+                    let connection = self.connections.get(&member_id).unwrap();
+                    let event = Event::PeerCreated {
+                        peer_id: peer_caller_id,
+                        sdp_offer: None,
+                    };
+                    connection.send_event(event);
+                })))
             }
-            _ => Err(RoomError::UnmatchedState(*peer_caller_id)),
+            _ => Err(RoomError::UnmatchedState(peer_caller_id)),
         }?;
-        let event = Event::PeerCreated {
-            peer_id: *peer_caller_id,
-            sdp_offer: None,
-        };
-        let caller_connection = self
-            .connections
-            .get(&caller)
-            .ok_or(RoomError::InvalidConnection(caller))?;
-        caller_connection.send_event(event);
-        self.peers.insert(*peer_caller_id, new_peer_caller);
+        self.peers.insert(peer_caller_id, new_peer_caller);
         Ok(())
     }
 }
@@ -245,15 +253,10 @@ impl Handler<Command> for Room {
                     .peers
                     .remove(&peer_id)
                     .ok_or(RoomError::UnknownPeer(peer_id))?;
-                let (new_peer_caller, responder_peer_id) = match peer_caller {
+                let new_peer_caller = match peer_caller {
                     PeerMachine::WaitLocalSDP(peer) => {
-                        let opponent_peer_id =
-                            peer.context.opponent_peer_id.unwrap();
-                        Ok((
-                            PeerMachine::WaitRemoteSDP(
-                                peer.set_local_sdp(&sdp_offer),
-                            ),
-                            opponent_peer_id,
+                        Ok(PeerMachine::WaitRemoteSDP(
+                            peer.set_local_sdp(sdp_offer.clone()),
                         ))
                     }
                     _ => {
@@ -262,38 +265,90 @@ impl Handler<Command> for Room {
                     }
                 }?;
                 self.peers.insert(peer_id, new_peer_caller);
+
+                let responder_peer_id = self
+                    .peer_to_peer
+                    .get(&peer_id)
+                    .map(|&id| id)
+                    .ok_or(RoomError::NoOpponentPeer(peer_id))?;
                 let peer_responder = self
                     .peers
                     .remove(&responder_peer_id)
                     .ok_or(RoomError::UnknownPeer(responder_peer_id))?;
-                let (new_peer_responder, responder_id) = match peer_responder {
-                    PeerMachine::New(peer) => {
-                        let member_id = peer.context.member_id;
-                        Ok((
-                            PeerMachine::WaitLocalHaveRemote(
-                                peer.set_remote_sdp(&sdp_offer),
-                            ),
-                            member_id,
-                        ))
-                    }
+                let new_peer_responder = match peer_responder {
+                    PeerMachine::New(peer) => Ok(
+                        PeerMachine::WaitLocalHaveRemote(peer.set_remote_sdp(
+                            sdp_offer,
+                            |peer_id, member_id, sdp_offer| {
+                                let connection =
+                                    self.connections.get(&member_id).unwrap();
+                                let event = Event::PeerCreated {
+                                    peer_id,
+                                    sdp_offer: Some(sdp_offer),
+                                };
+                                connection.send_event(event);
+                            },
+                        )),
+                    ),
                     _ => {
                         error!("Unmatched state responder peer");
                         Err(RoomError::UnmatchedState(responder_peer_id))
                     }
                 }?;
                 self.peers.insert(responder_peer_id, new_peer_responder);
-                let event = Event::PeerCreated {
-                    peer_id: responder_peer_id,
-                    sdp_offer: Some(sdp_offer),
-                };
-                let responder_connection = self
-                    .connections
-                    .get(&responder_id)
-                    .ok_or(RoomError::InvalidConnection(responder_id))?;
-                responder_connection.send_event(event);
                 Ok(true)
             }
-            _ => unimplemented!(),
+            Command::MakeSdpAnswer {
+                peer_id,
+                sdp_answer,
+            } => {
+                let peer_responder = self
+                    .peers
+                    .remove(&peer_id)
+                    .ok_or(RoomError::UnknownPeer(peer_id))?;
+                let new_peer_responder = match peer_responder {
+                    PeerMachine::WaitLocalHaveRemote(peer) => {
+                        Ok(PeerMachine::Stable(
+                            peer.set_local_sdp(sdp_answer.clone()),
+                        ))
+                    }
+                    _ => {
+                        error!("Unmatched state caller peer");
+                        Err(RoomError::UnmatchedState(peer_id))
+                    }
+                }?;
+                self.peers.insert(peer_id, new_peer_responder);
+
+                let caller_peer_id = self
+                    .peer_to_peer
+                    .get(&peer_id)
+                    .map(|&id| id)
+                    .ok_or(RoomError::NoOpponentPeer(peer_id))?;
+                let peer_caller = self
+                    .peers
+                    .remove(&caller_peer_id)
+                    .ok_or(RoomError::UnknownPeer(caller_peer_id))?;
+                let new_peer_caller = match peer_caller {
+                    PeerMachine::WaitRemoteSDP(peer) => {
+                        Ok(PeerMachine::Stable(peer.set_remote_sdp(
+                            sdp_answer,
+                            |peer_id, member_id, sdp_answer| {
+                                let connection =
+                                    self.connections.get(&member_id).unwrap();
+                                let event = Event::SdpAnswerMade {
+                                    peer_id,
+                                    sdp_answer,
+                                };
+                                connection.send_event(event);
+                            },
+                        )))
+                    }
+                    _ => Err(RoomError::UnmatchedState(caller_peer_id)),
+                }?;
+                self.peers.insert(caller_peer_id, new_peer_caller);
+
+                Ok(true)
+            }
         }
     }
 }
@@ -318,3 +373,96 @@ impl RoomsRepository {
         rooms.get(&id).map(|r| r.clone())
     }
 }
+
+#[cfg(test)]
+mod test {
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::time::{Duration, Instant};
+
+    use futures::future::{result, Future};
+    use tokio::timer::Delay;
+
+    use super::*;
+
+    #[derive(Debug, Clone)]
+    struct TestConnection {
+        pub room: Addr<Room>,
+        pub count_events: Arc<AtomicUsize>,
+    }
+
+    impl RpcConnection for TestConnection {
+        fn close(&self) {}
+
+        fn send_event(&self, event: Event) {
+            self.count_events.store(
+                self.count_events.load(Ordering::Relaxed) + 1,
+                Ordering::Relaxed,
+            );
+            match event {
+                Event::PeerCreated { peer_id, sdp_offer } => match sdp_offer {
+                    Some(_) => self.room.do_send(Command::MakeSdpAnswer {
+                        peer_id,
+                        sdp_answer: "responder_answer".into(),
+                    }),
+                    None => self.room.do_send(Command::MakeSdpOffer {
+                        peer_id,
+                        sdp_offer: "caller_offer".into(),
+                    }),
+                },
+                Event::SdpAnswerMade {
+                    peer_id: _,
+                    sdp_answer: _,
+                } => {}
+            }
+        }
+    }
+
+    fn start_room() -> Addr<Room> {
+        let members = hashmap! {
+            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+        };
+        Arbiter::start(move |_| Room::new(1, members))
+    }
+
+    #[test]
+    fn start_signaling() {
+        let caller_event = Arc::new(AtomicUsize::new(0));
+        let caller_event_clone = Arc::clone(&caller_event);
+        let responder_event = Arc::new(AtomicUsize::new(0));
+        let responder_event_clone = Arc::clone(&responder_event);
+
+        System::run(move || {
+            let room = start_room();
+            let caller = TestConnection {
+                room: room.clone(),
+                count_events: caller_event_clone,
+            };
+            let responder = TestConnection {
+                room: room.clone(),
+                count_events: responder_event_clone,
+            };
+            let caller_message = RpcConnectionEstablished {
+                member_id: 1,
+                connection: Box::new(caller),
+            };
+            let responder_message = RpcConnectionEstablished {
+                member_id: 2,
+                connection: Box::new(responder),
+            };
+            room.do_send(caller_message);
+
+            tokio::spawn(room.send(responder_message).then(move |_| {
+                Delay::new(Instant::now() + Duration::new(0, 1_000_000)).then(
+                    move |_| {
+                        System::current().stop();
+                        result(Ok(()))
+                    },
+                )
+            }));
+        });
+
+        assert_eq!(caller_event.load(Ordering::Relaxed), 2);
+        assert_eq!(responder_event.load(Ordering::Relaxed), 1);
+    }
+}
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 87c2154b1..966448c4b 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -86,7 +86,7 @@ impl Actor for WsSession {
                 connection: Box::new(ctx.address()),
             })
             .into_actor(self)
-            .then(|r, a, c| {
+            .then(|r, _a, _c| {
                 debug!("{:?}", r);
                 fut::ok::<(), (), Self>(())
             })
@@ -182,7 +182,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     self.room
                         .send(command)
                         .into_actor(self)
-                        .then(|r, a, c| {
+                        .then(|r, _a, _c| {
                             debug!("{:?}", r);
                             fut::ok::<(), (), Self>(())
                         })
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 452abb817..5024eb547 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,4 +1,4 @@
-use crate::{api::control::member::Id as MemberID, log::prelude::*};
+use crate::api::control::member::Id as MemberID;
 
 #[derive(Debug, Clone)]
 pub struct New {}
@@ -18,17 +18,17 @@ pub struct Failure {}
 /// ID of [`Peer`].
 pub type Id = u64;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct PeerContext {
     id: Id,
-    pub member_id: MemberID,
-    pub opponent_peer_id: Option<Id>,
-    offer: Option<String>,
+    member_id: MemberID,
+    sdp_offer: Option<String>,
+    sdp_answer: Option<String>,
 }
 
 #[derive(Debug, Clone)]
 pub struct Peer<S> {
-    pub context: PeerContext,
+    context: PeerContext,
     state: S,
 }
 
@@ -48,8 +48,8 @@ impl Peer<New> {
         let context = PeerContext {
             id,
             member_id,
-            opponent_peer_id: None,
-            offer: None,
+            sdp_offer: None,
+            sdp_answer: None,
         };
         Peer {
             context,
@@ -57,18 +57,25 @@ impl Peer<New> {
         }
     }
 
-    pub fn start(self, opponent_peer_id: Id) -> Peer<WaitLocalSDP> {
-        let mut context = self.context;
-        context.opponent_peer_id = Some(opponent_peer_id);
+    pub fn start(
+        self,
+        success: impl FnOnce(MemberID) -> (),
+    ) -> Peer<WaitLocalSDP> {
+        success(self.context.member_id);
         Peer {
-            context,
+            context: self.context,
             state: WaitLocalSDP {},
         }
     }
 
-    pub fn set_remote_sdp(self, offer: &str) -> Peer<WaitLocalHaveRemote> {
+    pub fn set_remote_sdp(
+        self,
+        sdp_offer: String,
+        success: impl Fn(Id, MemberID, String) -> (),
+    ) -> Peer<WaitLocalHaveRemote> {
         let mut context = self.context;
-        context.offer = Some(offer.into());
+        context.sdp_offer = Some(sdp_offer.clone());
+        success(context.id, context.member_id, sdp_offer);
         Peer {
             context,
             state: WaitLocalHaveRemote {},
@@ -77,9 +84,9 @@ impl Peer<New> {
 }
 
 impl Peer<WaitLocalSDP> {
-    pub fn set_local_sdp(self, offer: &str) -> Peer<WaitRemoteSDP> {
+    pub fn set_local_sdp(self, sdp_offer: String) -> Peer<WaitRemoteSDP> {
         let mut context = self.context;
-        context.offer = Some(offer.into());
+        context.sdp_offer = Some(sdp_offer);
         Peer {
             context,
             state: WaitRemoteSDP {},
@@ -87,6 +94,33 @@ impl Peer<WaitLocalSDP> {
     }
 }
 
+impl Peer<WaitRemoteSDP> {
+    pub fn set_remote_sdp(
+        self,
+        sdp_answer: String,
+        success: impl Fn(Id, MemberID, String) -> (),
+    ) -> Peer<Stable> {
+        let mut context = self.context;
+        context.sdp_answer = Some(sdp_answer.clone());
+        success(context.id, context.member_id, sdp_answer);
+        Peer {
+            context,
+            state: Stable {},
+        }
+    }
+}
+
+impl Peer<WaitLocalHaveRemote> {
+    pub fn set_local_sdp(self, sdp_answer: String) -> Peer<Stable> {
+        let mut context = self.context;
+        context.sdp_answer = Some(sdp_answer);
+        Peer {
+            context,
+            state: Stable {},
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -94,8 +128,16 @@ mod tests {
     #[test]
     fn create_peer() {
         let peer = Peer::new(1, 1);
-        let peer = peer.start(2);
+        let peer = peer.start(|_| {});
 
-        assert_eq!(peer.context.opponent_peer_id, Some(2));
+        assert_eq!(
+            peer.context,
+            PeerContext {
+                id: 1,
+                member_id: 1,
+                sdp_offer: None,
+                sdp_answer: None
+            }
+        );
     }
 }

From 6687b87b207168ecaa955c0a4aec83da50dd6902 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 7 Mar 2019 14:35:11 +0200
Subject: [PATCH 046/179] Impl create tracks and store link into peers

---
 src/api/client/room.rs | 146 +++++++++++++++++++++++++++--------------
 src/media/errors.rs    |   7 ++
 src/media/mod.rs       |   8 ++-
 src/media/peer.rs      | 102 ++++++++++++++++------------
 src/media/track.rs     |  27 ++++++++
 5 files changed, 198 insertions(+), 92 deletions(-)
 create mode 100644 src/media/errors.rs
 create mode 100644 src/media/track.rs

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index fc29f4a9a..12af5d261 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -8,7 +8,12 @@ use serde::{Deserialize, Serialize};
 use crate::{
     api::control::{Id as MemberID, Member},
     log::prelude::*,
-    media::{Id as PeerID, Peer, PeerMachine},
+    media::{
+        peer::{Id as PeerID, Peer, PeerMachine},
+        track::{
+            AudioSettings, Id as TrackID, Track, TrackMediaType, VideoSettings,
+        },
+    },
 };
 use std::fmt::Debug;
 
@@ -28,23 +33,28 @@ pub enum RoomError {
     UnmatchedState(PeerID),
 }
 
+/// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Serialize, Message)]
 #[rtype(result = "Result<bool, RoomError>")]
 pub enum Command {
+    /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: PeerID, sdp_offer: String },
+    /// Web Client sends SDP Answer.
     MakeSdpAnswer { peer_id: PeerID, sdp_answer: String },
 }
 
+/// WebSocket message from Media Server to Web Client.
 #[derive(Debug, Deserialize, Serialize, Message)]
 pub enum Event {
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// creation.
     PeerCreated {
         peer_id: PeerID,
         sdp_offer: Option<String>,
     },
-    SdpAnswerMade {
-        peer_id: PeerID,
-        sdp_answer: String,
-    },
+    /// Media Server notifies Web Client about necessity to apply specified SDP
+    /// Answer to Web Client's RTCPeerConnection.
+    SdpAnswerMade { peer_id: PeerID, sdp_answer: String },
 }
 
 /// ID of [`Room`].
@@ -62,8 +72,10 @@ pub struct Room {
     /// Connections of [`Member`]'s this room.
     connections: HashMap<MemberID, Box<dyn RpcConnection>>,
 
+    /// Peers of [`Member`]'s this room.
     member_peers: HashMap<MemberID, PeerID>,
 
+    /// Relations peer to peer.
     peer_to_peer: HashMap<PeerID, PeerID>,
 
     /// [`Peer`]s of [`Member`]'s this room.
@@ -96,6 +108,7 @@ pub struct RpcConnectionEstablished {
 }
 
 impl Room {
+    /// Create new instance of [`Room`].
     pub fn new(id: Id, members: HashMap<MemberID, Member>) -> Self {
         Room {
             id,
@@ -108,12 +121,17 @@ impl Room {
         }
     }
 
+    /// Generate next ID of [`Peer`].
     fn next_peer_id(&mut self) -> PeerID {
         let id = self.peer_index;
         self.peer_index += 1;
         id
     }
 
+    /// Begins the negotiation process between peers.
+    ///
+    /// Creates audio and video tracks and stores links to them in
+    /// interconnected peers.
     fn start_pipeline(
         &mut self,
         caller: MemberID,
@@ -131,16 +149,25 @@ impl Room {
             .ok_or(RoomError::MemberWithoutPeer(responder))?;
         self.peer_to_peer.insert(peer_caller_id, peer_responder_id);
         self.peer_to_peer.insert(peer_responder_id, peer_caller_id);
+
+        let track_audio =
+            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
+        let track_video =
+            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
+
         let peer_caller = self
             .peers
             .remove(&peer_caller_id)
             .ok_or(RoomError::UnknownPeer(peer_caller_id))?;
+
         let new_peer_caller = match peer_caller {
-            PeerMachine::New(peer) => {
-                Ok(PeerMachine::WaitLocalSDP(peer.start(|member_id| {
+            PeerMachine::New(mut peer) => {
+                peer.add_sender(track_audio.clone());
+                peer.add_sender(track_video.clone());
+                Ok(PeerMachine::WaitLocalSDP(peer.start(|id, member_id| {
                     let connection = self.connections.get(&member_id).unwrap();
                     let event = Event::PeerCreated {
-                        peer_id: peer_caller_id,
+                        peer_id: id,
                         sdp_offer: None,
                     };
                     connection.send_event(event);
@@ -149,6 +176,21 @@ impl Room {
             _ => Err(RoomError::UnmatchedState(peer_caller_id)),
         }?;
         self.peers.insert(peer_caller_id, new_peer_caller);
+
+        let peer_responder = self
+            .peers
+            .remove(&peer_responder_id)
+            .ok_or(RoomError::UnknownPeer(peer_responder_id))?;
+
+        let new_peer_responder = match peer_responder {
+            PeerMachine::New(mut peer) => {
+                peer.add_receiver(track_audio);
+                peer.add_receiver(track_video);
+                Ok(PeerMachine::New(peer))
+            }
+            _ => Err(RoomError::UnmatchedState(peer_responder_id)),
+        }?;
+        self.peers.insert(peer_responder_id, new_peer_responder);
         Ok(())
     }
 }
@@ -241,6 +283,8 @@ impl Handler<RpcConnectionClosed> for Room {
 impl Handler<Command> for Room {
     type Result = Result<bool, RoomError>;
 
+    /// Receives [`Command`] from Web client and changes state of interconnected
+    /// [`Peer`]s.
     fn handle(
         &mut self,
         command: Command,
@@ -376,7 +420,6 @@ impl RoomsRepository {
 
 #[cfg(test)]
 mod test {
-    use std::sync::atomic::{AtomicUsize, Ordering};
     use std::time::{Duration, Instant};
 
     use futures::future::{result, Future};
@@ -386,18 +429,29 @@ mod test {
 
     #[derive(Debug, Clone)]
     struct TestConnection {
+        pub member_id: MemberID,
         pub room: Addr<Room>,
-        pub count_events: Arc<AtomicUsize>,
+        pub events: Arc<Mutex<Vec<String>>>,
     }
 
-    impl RpcConnection for TestConnection {
-        fn close(&self) {}
+    impl Actor for TestConnection {
+        type Context = Context<Self>;
 
-        fn send_event(&self, event: Event) {
-            self.count_events.store(
-                self.count_events.load(Ordering::Relaxed) + 1,
-                Ordering::Relaxed,
-            );
+        fn started(&mut self, ctx: &mut Self::Context) {
+            let caller_message = RpcConnectionEstablished {
+                member_id: self.member_id,
+                connection: Box::new(ctx.address()),
+            };
+            self.room.do_send(caller_message);
+        }
+    }
+
+    impl Handler<Event> for TestConnection {
+        type Result = ();
+
+        fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
+            let mut events = self.events.lock().unwrap();
+            events.push(serde_json::to_string(&event).unwrap());
             match event {
                 Event::PeerCreated { peer_id, sdp_offer } => match sdp_offer {
                     Some(_) => self.room.do_send(Command::MakeSdpAnswer {
@@ -412,11 +466,21 @@ mod test {
                 Event::SdpAnswerMade {
                     peer_id: _,
                     sdp_answer: _,
-                } => {}
+                } => {
+                    System::current().stop();
+                }
             }
         }
     }
 
+    impl RpcConnection for Addr<TestConnection> {
+        fn close(&self) {}
+
+        fn send_event(&self, event: Event) {
+            self.do_send(event);
+        }
+    }
+
     fn start_room() -> Addr<Room> {
         let members = hashmap! {
             1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
@@ -427,42 +491,28 @@ mod test {
 
     #[test]
     fn start_signaling() {
-        let caller_event = Arc::new(AtomicUsize::new(0));
-        let caller_event_clone = Arc::clone(&caller_event);
-        let responder_event = Arc::new(AtomicUsize::new(0));
-        let responder_event_clone = Arc::clone(&responder_event);
+        let caller_events = Arc::new(Mutex::new(vec![]));
+        let caller_events_clone = Arc::clone(&caller_events);
+        let responder_events = Arc::new(Mutex::new(vec![]));
+        let responder_events_clone = Arc::clone(&responder_events);
 
         System::run(move || {
             let room = start_room();
-            let caller = TestConnection {
-                room: room.clone(),
-                count_events: caller_event_clone,
-            };
-            let responder = TestConnection {
-                room: room.clone(),
-                count_events: responder_event_clone,
-            };
-            let caller_message = RpcConnectionEstablished {
+            let room_clone = room.clone();
+            Arbiter::start(move |_| TestConnection {
                 member_id: 1,
-                connection: Box::new(caller),
-            };
-            let responder_message = RpcConnectionEstablished {
+                room: room_clone,
+                events: caller_events_clone,
+            });
+            let room_clone = room.clone();
+            Arbiter::start(move |_| TestConnection {
                 member_id: 2,
-                connection: Box::new(responder),
-            };
-            room.do_send(caller_message);
-
-            tokio::spawn(room.send(responder_message).then(move |_| {
-                Delay::new(Instant::now() + Duration::new(0, 1_000_000)).then(
-                    move |_| {
-                        System::current().stop();
-                        result(Ok(()))
-                    },
-                )
-            }));
+                room: room_clone,
+                events: responder_events_clone,
+            });
         });
 
-        assert_eq!(caller_event.load(Ordering::Relaxed), 2);
-        assert_eq!(responder_event.load(Ordering::Relaxed), 1);
+        assert_eq!(caller_events.lock().unwrap().len(), 2);
+        assert_eq!(responder_events.lock().unwrap().len(), 1);
     }
 }
diff --git a/src/media/errors.rs b/src/media/errors.rs
new file mode 100644
index 000000000..700d54abd
--- /dev/null
+++ b/src/media/errors.rs
@@ -0,0 +1,7 @@
+use failure::Fail;
+
+#[derive(Fail, Debug)]
+pub enum MediaError {
+    #[fail(display = "Unmatched state of track")]
+    UnmatchedTrackState,
+}
diff --git a/src/media/mod.rs b/src/media/mod.rs
index af54a64bf..eb489d405 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -1,3 +1,9 @@
+pub mod errors;
 pub mod peer;
+pub mod track;
 
-pub use self::peer::{Id, Peer, PeerMachine};
+pub use self::{
+    errors::MediaError,
+    peer::{Id as PeerID, Peer, PeerMachine},
+    track::{AudioSettings, Id, Track, TrackMediaType, VideoSettings},
+};
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 5024eb547..b7c8b259e 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,55 +1,72 @@
-use crate::api::control::member::Id as MemberID;
+use std::sync::Arc;
 
-#[derive(Debug, Clone)]
+use hashbrown::HashMap;
+
+use crate::{
+    api::control::member::Id as MemberID,
+    media::{
+        errors::MediaError,
+        track::{Id as TrackID, Track},
+    },
+};
+
+#[derive(Debug, Clone, PartialEq)]
 pub struct New {}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct WaitLocalSDP {}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct WaitLocalHaveRemote {}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct WaitRemoteSDP {}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Stable {}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Finished {}
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq)]
 pub struct Failure {}
 
+/// Implementation state machine for [`Peer`].
+#[derive(Debug, Clone)]
+pub enum PeerMachine {
+    New(Peer<New>),
+    WaitLocalSDP(Peer<WaitLocalSDP>),
+    WaitLocalHaveRemote(Peer<WaitLocalHaveRemote>),
+    WaitRemoteSDP(Peer<WaitRemoteSDP>),
+    Stable(Peer<Stable>),
+    Finished(Peer<Finished>),
+    Failure(Peer<Failure>),
+}
+
 /// ID of [`Peer`].
 pub type Id = u64;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Clone)]
 pub struct PeerContext {
     id: Id,
     member_id: MemberID,
     sdp_offer: Option<String>,
     sdp_answer: Option<String>,
+    receivers: HashMap<TrackID, Arc<Track>>,
+    senders: HashMap<TrackID, Arc<Track>>,
 }
 
+/// [`RTCPeerConnection`] representation.
 #[derive(Debug, Clone)]
 pub struct Peer<S> {
     context: PeerContext,
     state: S,
 }
 
-#[derive(Debug, Clone)]
-pub enum PeerMachine {
-    New(Peer<New>),
-    WaitLocalSDP(Peer<WaitLocalSDP>),
-    WaitLocalHaveRemote(Peer<WaitLocalHaveRemote>),
-    WaitRemoteSDP(Peer<WaitRemoteSDP>),
-    Stable(Peer<Stable>),
-    Finished(Peer<Finished>),
-    Failure(Peer<Failure>),
-}
-
 impl Peer<New> {
+    /// Creates new [`Peer`] for [`Member`].
     pub fn new(id: Id, member_id: MemberID) -> Self {
         let context = PeerContext {
             id,
             member_id,
             sdp_offer: None,
             sdp_answer: None,
+            receivers: HashMap::new(),
+            senders: HashMap::new(),
         };
         Peer {
             context,
@@ -57,17 +74,21 @@ impl Peer<New> {
         }
     }
 
+    /// Sends PeerCreated event to Web Client and puts [`Peer`] into state
+    /// of waiting for local offer.
     pub fn start(
         self,
-        success: impl FnOnce(MemberID) -> (),
+        success: impl FnOnce(Id, MemberID) -> (),
     ) -> Peer<WaitLocalSDP> {
-        success(self.context.member_id);
+        success(self.context.id, self.context.member_id);
         Peer {
             context: self.context,
             state: WaitLocalSDP {},
         }
     }
 
+    /// Sends PeerCreated event with local offer to Web Client and puts [`Peer`]
+    /// into state of waiting for remote offer.
     pub fn set_remote_sdp(
         self,
         sdp_offer: String,
@@ -81,6 +102,22 @@ impl Peer<New> {
             state: WaitLocalHaveRemote {},
         }
     }
+
+    pub fn add_sender(&mut self, track: Arc<Track>) {
+        self.context.senders.insert(track.id, track);
+    }
+
+    pub fn add_receiver(&mut self, track: Arc<Track>) {
+        self.context.receivers.insert(track.id, track);
+    }
+}
+
+#[test]
+fn create_peer() {
+    let peer = Peer::new(1, 1);
+    let peer = peer.start(|_, _| {});
+
+    assert_eq!(peer.state, WaitLocalSDP {});
 }
 
 impl Peer<WaitLocalSDP> {
@@ -120,24 +157,3 @@ impl Peer<WaitLocalHaveRemote> {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn create_peer() {
-        let peer = Peer::new(1, 1);
-        let peer = peer.start(|_| {});
-
-        assert_eq!(
-            peer.context,
-            PeerContext {
-                id: 1,
-                member_id: 1,
-                sdp_offer: None,
-                sdp_answer: None
-            }
-        );
-    }
-}
diff --git a/src/media/track.rs b/src/media/track.rs
new file mode 100644
index 000000000..ce1307f94
--- /dev/null
+++ b/src/media/track.rs
@@ -0,0 +1,27 @@
+/// ID of [`Track`].
+pub type Id = u64;
+
+/// [`MediaStreamTrack`] representation.
+#[derive(Debug)]
+pub struct Track {
+    pub id: Id,
+    media_type: TrackMediaType,
+}
+
+impl Track {
+    pub fn new(id: Id, media_type: TrackMediaType) -> Track {
+        Track { id, media_type }
+    }
+}
+
+#[derive(Debug)]
+pub enum TrackMediaType {
+    Audio(AudioSettings),
+    Video(VideoSettings),
+}
+
+#[derive(Debug)]
+pub struct AudioSettings {}
+
+#[derive(Debug)]
+pub struct VideoSettings {}

From d82e299a96769a621304bddeb6c9df31a299b2f2 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 8 Mar 2019 16:30:27 +0200
Subject: [PATCH 047/179] Move room to media module

---
 src/api/client/mod.rs             |  3 +-
 src/api/client/server.rs          |  9 ++--
 src/api/client/session.rs         |  6 +--
 src/main.rs                       |  6 ++-
 src/media/mod.rs                  | 10 ++++-
 src/media/peer.rs                 | 75 ++++++++++++++++++++++++++++---
 src/{api/client => media}/room.rs | 66 ++++++++++++++-------------
 src/media/track.rs                | 29 ++++++++++--
 8 files changed, 148 insertions(+), 56 deletions(-)
 rename src/{api/client => media}/room.rs (91%)

diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 0f3537eab..4022bf7ee 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,7 +1,6 @@
 //! Implementation of Client API.
 
-pub mod room;
 pub mod server;
 pub mod session;
 
-pub use self::{room::*, server::*, session::*};
+pub use self::{server::*, session::*};
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 4990e0274..355a22d65 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -8,8 +8,9 @@ use futures::{future, Future};
 use serde::Deserialize;
 
 use crate::{
-    api::client::{GetMember, Id as RoomID, RoomsRepository, WsSession},
+    api::client::WsSession,
     log::prelude::*,
+    media::room::{GetMember, Id as RoomID, RoomsRepository},
 };
 
 /// Contains [`Room`] ID and [`Member`] credentials obtained from request path.
@@ -81,9 +82,9 @@ mod test {
     use actix_web::{http, test, App};
     use futures::Stream;
 
-    use crate::api::{
-        client::{session, Room},
-        control::Member,
+    use crate::{
+        api::{client::session, control::Member},
+        media::Room,
     };
 
     use super::*;
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 966448c4b..bdf715b54 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -7,12 +7,12 @@ use actix_web::ws::{self, CloseReason};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::client::room::{
+    api::control::member::Id as MemberID,
+    log::prelude::*,
+    media::{
         Command, Event, Room, RpcConnection, RpcConnectionClosed,
         RpcConnectionClosedReason, RpcConnectionEstablished,
     },
-    api::control::member::Id as MemberID,
-    log::prelude::*,
 };
 use actix_web::ws::CloseCode;
 
diff --git a/src/main.rs b/src/main.rs
index e638e9a09..69d245b33 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,8 +2,10 @@
 use actix::prelude::*;
 use dotenv::dotenv;
 
-use crate::api::client::{server, Room, RoomsRepository};
-use crate::api::control::Member;
+use crate::{
+    api::{client::server, control::Member},
+    media::{Room, RoomsRepository},
+};
 
 #[macro_use]
 mod utils;
diff --git a/src/media/mod.rs b/src/media/mod.rs
index eb489d405..974bef37b 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -1,9 +1,15 @@
 pub mod errors;
 pub mod peer;
+pub mod room;
 pub mod track;
 
 pub use self::{
     errors::MediaError,
-    peer::{Id as PeerID, Peer, PeerMachine},
-    track::{AudioSettings, Id, Track, TrackMediaType, VideoSettings},
+    peer::{Event, Id as PeerID, Peer, PeerMachine},
+    room::{
+        Command, Id as RoomID, Room, RoomsRepository, RpcConnection,
+        RpcConnectionClosed, RpcConnectionClosedReason,
+        RpcConnectionEstablished,
+    },
+    track::Id as TrackID,
 };
diff --git a/src/media/peer.rs b/src/media/peer.rs
index b7c8b259e..a4fc1f8bb 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,15 +1,33 @@
 use std::sync::Arc;
 
+use actix::prelude::*;
 use hashbrown::HashMap;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     api::control::member::Id as MemberID,
+    log::prelude::*,
     media::{
         errors::MediaError,
-        track::{Id as TrackID, Track},
+        track::{DirectionalTrack, Id as TrackID, Track, TrackDirection},
     },
 };
 
+/// WebSocket message from Media Server to Web Client.
+#[derive(Debug, Deserialize, Serialize, Message)]
+pub enum Event {
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// creation.
+    PeerCreated {
+        peer_id: Id,
+        sdp_offer: Option<String>,
+        tracks: Vec<DirectionalTrack>,
+    },
+    /// Media Server notifies Web Client about necessity to apply specified SDP
+    /// Answer to Web Client's RTCPeerConnection.
+    SdpAnswerMade { peer_id: Id, sdp_answer: String },
+}
+
 #[derive(Debug, Clone, PartialEq)]
 pub struct New {}
 #[derive(Debug, Clone, PartialEq)]
@@ -74,13 +92,49 @@ impl Peer<New> {
         }
     }
 
+    pub fn get_tracks(&self, opponent_id: Id) -> Vec<DirectionalTrack> {
+        let tracks = self.context.senders.iter().fold(
+            vec![],
+            |mut tracks, (id, track)| {
+                tracks.push(DirectionalTrack {
+                    id: track.id,
+                    media_type: track.media_type.clone(),
+                    direction: TrackDirection::Send {
+                        receivers: vec![opponent_id],
+                    },
+                });
+                tracks
+            },
+        );
+        self.context
+            .receivers
+            .iter()
+            .fold(tracks, |mut tracks, (id, track)| {
+                tracks.push(DirectionalTrack {
+                    id: track.id,
+                    media_type: track.media_type.clone(),
+                    direction: TrackDirection::Recv {
+                        sender: opponent_id,
+                    },
+                });
+                tracks
+            })
+    }
+
     /// Sends PeerCreated event to Web Client and puts [`Peer`] into state
     /// of waiting for local offer.
     pub fn start(
         self,
-        success: impl FnOnce(Id, MemberID) -> (),
+        opponent_id: Id,
+        success: impl FnOnce(MemberID, Event) -> (),
     ) -> Peer<WaitLocalSDP> {
-        success(self.context.id, self.context.member_id);
+        let tracks = self.get_tracks(opponent_id);
+        let event = Event::PeerCreated {
+            peer_id: self.context.id,
+            sdp_offer: None,
+            tracks,
+        };
+        success(self.context.member_id, event);
         Peer {
             context: self.context,
             state: WaitLocalSDP {},
@@ -91,12 +145,19 @@ impl Peer<New> {
     /// into state of waiting for remote offer.
     pub fn set_remote_sdp(
         self,
+        opponent_id: Id,
         sdp_offer: String,
-        success: impl Fn(Id, MemberID, String) -> (),
+        success: impl Fn(MemberID, Event) -> (),
     ) -> Peer<WaitLocalHaveRemote> {
+        let tracks = self.get_tracks(opponent_id);
         let mut context = self.context;
-        context.sdp_offer = Some(sdp_offer.clone());
-        success(context.id, context.member_id, sdp_offer);
+        context.sdp_offer = Some(sdp_offer);
+        let event = Event::PeerCreated {
+            peer_id: context.id,
+            sdp_offer: context.sdp_offer.clone(),
+            tracks,
+        };
+        success(context.member_id, event);
         Peer {
             context,
             state: WaitLocalHaveRemote {},
@@ -115,7 +176,7 @@ impl Peer<New> {
 #[test]
 fn create_peer() {
     let peer = Peer::new(1, 1);
-    let peer = peer.start(|_, _| {});
+    let peer = peer.start(2, |_, _| {});
 
     assert_eq!(peer.state, WaitLocalSDP {});
 }
diff --git a/src/api/client/room.rs b/src/media/room.rs
similarity index 91%
rename from src/api/client/room.rs
rename to src/media/room.rs
index 12af5d261..86d5c23e9 100644
--- a/src/api/client/room.rs
+++ b/src/media/room.rs
@@ -9,9 +9,10 @@ use crate::{
     api::control::{Id as MemberID, Member},
     log::prelude::*,
     media::{
-        peer::{Id as PeerID, Peer, PeerMachine},
+        peer::{Event, Id as PeerID, Peer, PeerMachine},
         track::{
-            AudioSettings, Id as TrackID, Track, TrackMediaType, VideoSettings,
+            AudioSettings, DirectionalTrack, Track, TrackMediaType,
+            VideoSettings,
         },
     },
 };
@@ -43,20 +44,6 @@ pub enum Command {
     MakeSdpAnswer { peer_id: PeerID, sdp_answer: String },
 }
 
-/// WebSocket message from Media Server to Web Client.
-#[derive(Debug, Deserialize, Serialize, Message)]
-pub enum Event {
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// creation.
-    PeerCreated {
-        peer_id: PeerID,
-        sdp_offer: Option<String>,
-    },
-    /// Media Server notifies Web Client about necessity to apply specified SDP
-    /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade { peer_id: PeerID, sdp_answer: String },
-}
-
 /// ID of [`Room`].
 pub type Id = u64;
 
@@ -164,14 +151,14 @@ impl Room {
             PeerMachine::New(mut peer) => {
                 peer.add_sender(track_audio.clone());
                 peer.add_sender(track_video.clone());
-                Ok(PeerMachine::WaitLocalSDP(peer.start(|id, member_id| {
-                    let connection = self.connections.get(&member_id).unwrap();
-                    let event = Event::PeerCreated {
-                        peer_id: id,
-                        sdp_offer: None,
-                    };
-                    connection.send_event(event);
-                })))
+                Ok(PeerMachine::WaitLocalSDP(peer.start(
+                    peer_responder_id,
+                    |member_id, event| {
+                        let connection =
+                            self.connections.get(&member_id).unwrap();
+                        connection.send_event(event);
+                    },
+                )))
             }
             _ => Err(RoomError::UnmatchedState(peer_caller_id)),
         }?;
@@ -322,14 +309,11 @@ impl Handler<Command> for Room {
                 let new_peer_responder = match peer_responder {
                     PeerMachine::New(peer) => Ok(
                         PeerMachine::WaitLocalHaveRemote(peer.set_remote_sdp(
+                            peer_id,
                             sdp_offer,
-                            |peer_id, member_id, sdp_offer| {
+                            |member_id, event| {
                                 let connection =
                                     self.connections.get(&member_id).unwrap();
-                                let event = Event::PeerCreated {
-                                    peer_id,
-                                    sdp_offer: Some(sdp_offer),
-                                };
                                 connection.send_event(event);
                             },
                         )),
@@ -453,7 +437,11 @@ mod test {
             let mut events = self.events.lock().unwrap();
             events.push(serde_json::to_string(&event).unwrap());
             match event {
-                Event::PeerCreated { peer_id, sdp_offer } => match sdp_offer {
+                Event::PeerCreated {
+                    peer_id,
+                    sdp_offer,
+                    tracks,
+                } => match sdp_offer {
                     Some(_) => self.room.do_send(Command::MakeSdpAnswer {
                         peer_id,
                         sdp_answer: "responder_answer".into(),
@@ -512,7 +500,21 @@ mod test {
             });
         });
 
-        assert_eq!(caller_events.lock().unwrap().len(), 2);
-        assert_eq!(responder_events.lock().unwrap().len(), 1);
+        let mut caller_events = caller_events.lock().unwrap();
+        let responder_events = responder_events.lock().unwrap();
+        assert_eq!(caller_events.len(), 2);
+        assert_eq!(
+            caller_events.to_vec(),
+            vec![
+                "{\"PeerCreated\":{\"peer_id\":0,\"sdp_offer\":null,\
+                 \"tracks\":[{\"id\":1,\"media_type\":{\"Audio\":{}},\
+                 \"direction\":{\"Send\":{\"receivers\":[1]}}},{\"id\":2,\
+                 \"media_type\":{\"Video\":{}},\"direction\":{\"Send\":\
+                 {\"receivers\":[1]}}}]}}",
+                "{\"SdpAnswerMade\":{\"peer_id\":0,\"sdp_answer\":\
+                 \"responder_answer\"}}",
+            ]
+        );
+        assert_eq!(responder_events.len(), 1);
     }
 }
diff --git a/src/media/track.rs b/src/media/track.rs
index ce1307f94..44a371ed8 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -1,3 +1,7 @@
+use serde::{Deserialize, Serialize};
+
+use crate::media::peer::Id as PeerID;
+
 /// ID of [`Track`].
 pub type Id = u64;
 
@@ -5,23 +9,40 @@ pub type Id = u64;
 #[derive(Debug)]
 pub struct Track {
     pub id: Id,
-    media_type: TrackMediaType,
+    pub media_type: TrackMediaType,
 }
 
 impl Track {
+    /// Creates new [`Track`] of the specified type.
     pub fn new(id: Id, media_type: TrackMediaType) -> Track {
         Track { id, media_type }
     }
 }
 
-#[derive(Debug)]
+/// [`Track] with specified direction.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct DirectionalTrack {
+    pub id: Id,
+    pub media_type: TrackMediaType,
+    pub direction: TrackDirection,
+}
+
+/// Direction of [`Track`].
+#[derive(Debug, Deserialize, Serialize)]
+pub enum TrackDirection {
+    Send { receivers: Vec<PeerID> },
+    Recv { sender: PeerID },
+}
+
+/// Type of [`Track`].
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum TrackMediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Debug)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct AudioSettings {}
 
-#[derive(Debug)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct VideoSettings {}

From 0decf2811e8f662662b424e66ddeabd83e73559c Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Sun, 10 Mar 2019 23:39:34 -0600
Subject: [PATCH 048/179] impl ice candidates relay, impl test client, refactor

---
 signling_test.html | 163 ++++++++++++++++++++++++++
 src/media/peer.rs  |  32 +++++-
 src/media/room.rs  | 281 ++++++++++++++++++++++++++++++---------------
 3 files changed, 381 insertions(+), 95 deletions(-)
 create mode 100644 signling_test.html

diff --git a/signling_test.html b/signling_test.html
new file mode 100644
index 000000000..8c4109d80
--- /dev/null
+++ b/signling_test.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Chat</title>
+    <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
+
+    <script type="text/javascript">
+
+        var socket;
+        var pcs = {};
+
+        function connectSocket(caller) {
+            let role = caller ? "caller_credentials" : "responder_credentials";
+            socket = new WebSocket("ws://localhost:8080/ws/1/" + role);
+            socket.onmessage = handleSocketMessage;
+
+            window.setInterval(function () {
+                socket.send("{\"ping\":1}");
+            }, 8000);
+        };
+
+        function handleSocketMessage(message) {
+
+            var msg = JSON.parse(message.data);
+
+            if (msg.pong == undefined) {
+                console.log(JSON.stringify(message.data));
+                if (msg.PeerCreated != undefined) {
+                    handlePeerCreated(msg.PeerCreated);
+                }
+
+                if (msg.SdpAnswerMade != undefined) {
+                    handleSdpAnswerMade(msg.SdpAnswerMade);
+                }
+
+                if (msg.IceCandidateDiscovered != undefined) {
+                    handleIceCandidateDiscovered(msg.IceCandidateDiscovered);
+                }
+            }
+        }
+
+        async function handlePeerCreated(msg) {
+            var sendAudio = false;
+            var sendVideo = false;
+            var recvAudio = false;
+            var recvVideo = false;
+
+            msg.tracks.forEach((track) => {
+
+                if (track.media_type.Audio != undefined) {
+                    if (track.direction.Send != undefined) {
+                        sendAudio = true;
+                    }
+
+                    if (track.direction.Recv != undefined) {
+                        recvAudio = true;
+                    }
+
+                }
+                if (track.media_type.Video != undefined) {
+                    if (track.direction.Send != undefined) {
+                        sendVideo = true;
+                    }
+
+                    if (track.direction.Recv != undefined) {
+                        recvVideo = true;
+                    }
+                }
+            });
+
+            pcs[msg.peer_id] = new RTCPeerConnection();
+
+            var pc = pcs[msg.peer_id];
+
+            if (sendVideo || sendAudio) {
+                let stream = await navigator.mediaDevices.getUserMedia({
+                    audio: sendAudio,
+                    video: sendVideo
+                });
+
+                yourvid.srcObject = stream;
+
+                stream.getTracks().forEach((track) => {
+                    pc.addTrack(track);
+                });
+            }
+
+
+            var mediaConstraints = {
+                'mandatory': {
+                    'OfferToReceiveAudio': recvAudio,
+                    'OfferToReceiveVideo': recvVideo
+                }
+            };
+
+            if (msg.sdp_offer != undefined && msg.sdp_offer != null) {
+                pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_offer)));
+                var answer = await pc.createAnswer(mediaConstraints);
+                pc.setLocalDescription(answer);
+
+                socket.send(JSON.stringify({
+                    MakeSdpAnswer: {
+                        peer_id: msg.peer_id,
+                        sdp_answer: JSON.stringify(answer)
+                    }
+                }));
+            } else {
+                var offer = await pc.createOffer(mediaConstraints);
+                pc.setLocalDescription(offer);
+                socket.send(JSON.stringify({
+                    MakeSdpOffer: {
+                        peer_id: msg.peer_id,
+                        sdp_offer: JSON.stringify(offer)
+                    }
+                }));
+            }
+
+
+            pc.onicecandidate = function (e) {
+
+                if (e.candidate) {
+                    socket.send(JSON.stringify({
+                        SetIceCandidate: {
+                            peer_id: msg.peer_id,
+                            candidate: JSON.stringify(e.candidate)
+                        }
+                    }))
+                }
+
+            };
+
+            pc.ontrack = function (e) {
+                partnervid.srcObject = e.streams[0];
+            };
+
+
+        }
+
+        async function handleSdpAnswerMade(msg) {
+            var pc = pcs[msg.peer_id];
+            pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_answer)))
+        }
+
+        async function handleIceCandidateDiscovered(msg) {
+            var pc = pcs[msg.peer_id];
+            pc.addIceCandidate(JSON.parse(msg.candidate));
+        }
+
+    </script>
+</head>
+<body>
+<div>
+    <div>
+        <div>
+            <video id="yourvid" muted autoplay width="100%" height="100%"></video>
+        </div>
+        <div>
+            <video id="partnervid" autoplay width="100%" height="100%"></video>
+        </div>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/media/peer.rs b/src/media/peer.rs
index a4fc1f8bb..15fa53e9a 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,4 +1,4 @@
-use std::sync::Arc;
+use std::{sync::Arc, any::Any};
 
 use actix::prelude::*;
 use hashbrown::HashMap;
@@ -25,7 +25,15 @@ pub enum Event {
     },
     /// Media Server notifies Web Client about necessity to apply specified SDP
     /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade { peer_id: Id, sdp_answer: String },
+    SdpAnswerMade {
+        peer_id: Id,
+        sdp_answer: String,
+    },
+
+    IceCandidateDiscovered {
+        peer_id: Id,
+        candidate: String,
+    },
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -55,6 +63,20 @@ pub enum PeerMachine {
     Failure(Peer<Failure>),
 }
 
+impl PeerMachine {
+    pub fn get_member_id(&self) -> MemberID {
+        match self {
+            PeerMachine::New(peer) => peer.get_member_id(),
+            PeerMachine::WaitLocalSDP(peer) => peer.get_member_id(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.get_member_id(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.get_member_id(),
+            PeerMachine::Stable(peer) => peer.get_member_id(),
+            PeerMachine::Finished(peer) => peer.get_member_id(),
+            PeerMachine::Failure(peer) => peer.get_member_id(),
+        }
+    }
+}
+
 /// ID of [`Peer`].
 pub type Id = u64;
 
@@ -75,6 +97,12 @@ pub struct Peer<S> {
     state: S,
 }
 
+impl<T: Any> Peer<T> {
+    pub fn get_member_id(&self) -> MemberID {
+        self.context.member_id
+    }
+}
+
 impl Peer<New> {
     /// Creates new [`Peer`] for [`Member`].
     pub fn new(id: Id, member_id: MemberID) -> Self {
diff --git a/src/media/room.rs b/src/media/room.rs
index 86d5c23e9..3e6dda3d1 100644
--- a/src/media/room.rs
+++ b/src/media/room.rs
@@ -39,9 +39,20 @@ pub enum RoomError {
 #[rtype(result = "Result<bool, RoomError>")]
 pub enum Command {
     /// Web Client sends SDP Offer.
-    MakeSdpOffer { peer_id: PeerID, sdp_offer: String },
+    MakeSdpOffer {
+        peer_id: PeerID,
+        sdp_offer: String,
+    },
     /// Web Client sends SDP Answer.
-    MakeSdpAnswer { peer_id: PeerID, sdp_answer: String },
+    MakeSdpAnswer {
+        peer_id: PeerID,
+        sdp_answer: String,
+    },
+
+    SetIceCandidate {
+        peer_id: PeerID,
+        candidate: String,
+    },
 }
 
 /// ID of [`Room`].
@@ -115,6 +126,24 @@ impl Room {
         id
     }
 
+    fn remove_peer_by_id(
+        &mut self,
+        peer_id: &PeerID,
+    ) -> Result<PeerMachine, RoomError> {
+        self.peers
+            .remove(peer_id)
+            .ok_or(RoomError::UnknownPeer(*peer_id))
+    }
+
+    fn get_peer_by_id(
+        &self,
+        peer_id: &PeerID,
+    ) -> Result<&PeerMachine, RoomError> {
+        self.peers
+            .get(peer_id)
+            .ok_or(RoomError::UnknownPeer(*peer_id))
+    }
+
     /// Begins the negotiation process between peers.
     ///
     /// Creates audio and video tracks and stores links to them in
@@ -180,6 +209,155 @@ impl Room {
         self.peers.insert(peer_responder_id, new_peer_responder);
         Ok(())
     }
+
+    fn handle_make_sdp_offer(
+        &mut self,
+        from_peer_id: PeerID,
+        from_peer: PeerMachine,
+        sdp_offer: String,
+    ) -> Result<bool, RoomError> {
+        let from_peer = match from_peer {
+            PeerMachine::WaitLocalSDP(peer) => Ok(PeerMachine::WaitRemoteSDP(
+                peer.set_local_sdp(sdp_offer.clone()),
+            )),
+            _ => {
+                error!("Unmatched state caller peer");
+                Err(RoomError::UnmatchedState(from_peer_id))
+            }
+        }?;
+
+        self.peers.insert(from_peer_id, from_peer);
+
+        let responder_peer_id = self
+            .peer_to_peer
+            .get(&from_peer_id)
+            .map(|&id| id)
+            .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
+        let peer_responder = self
+            .peers
+            .remove(&responder_peer_id)
+            .ok_or(RoomError::UnknownPeer(responder_peer_id))?;
+        let new_peer_responder = match peer_responder {
+            PeerMachine::New(peer) => {
+                Ok(PeerMachine::WaitLocalHaveRemote(peer.set_remote_sdp(
+                    from_peer_id,
+                    sdp_offer,
+                    |member_id, event| {
+                        let connection =
+                            self.connections.get(&member_id).unwrap();
+                        connection.send_event(event);
+                    },
+                )))
+            }
+            _ => {
+                error!("Unmatched state responder peer");
+                Err(RoomError::UnmatchedState(responder_peer_id))
+            }
+        }?;
+        self.peers.insert(responder_peer_id, new_peer_responder);
+        Ok(true)
+    }
+
+    fn handle_make_sdp_answer(
+        &mut self,
+        from_peer_id: PeerID,
+        from_peer: PeerMachine,
+        sdp_answer: String,
+    ) -> Result<bool, RoomError> {
+        let from_peer = match from_peer {
+            PeerMachine::WaitLocalHaveRemote(peer) => {
+                Ok(PeerMachine::Stable(peer.set_local_sdp(sdp_answer.clone())))
+            }
+            _ => {
+                error!("Unmatched state caller peer");
+                Err(RoomError::UnmatchedState(from_peer_id))
+            }
+        }?;
+        self.peers.insert(from_peer_id, from_peer);
+
+        let caller_peer_id = self
+            .peer_to_peer
+            .get(&from_peer_id)
+            .map(|&id| id)
+            .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
+        let peer_caller = self
+            .peers
+            .remove(&caller_peer_id)
+            .ok_or(RoomError::UnknownPeer(caller_peer_id))?;
+        let new_peer_caller = match peer_caller {
+            PeerMachine::WaitRemoteSDP(peer) => {
+                Ok(PeerMachine::Stable(peer.set_remote_sdp(
+                    sdp_answer,
+                    |peer_id, member_id, sdp_answer| {
+                        let connection =
+                            self.connections.get(&member_id).unwrap();
+                        let event = Event::SdpAnswerMade {
+                            peer_id,
+                            sdp_answer,
+                        };
+                        connection.send_event(event);
+                    },
+                )))
+            }
+            _ => Err(RoomError::UnmatchedState(caller_peer_id)),
+        }?;
+        self.peers.insert(caller_peer_id, new_peer_caller);
+
+        Ok(true)
+    }
+
+    fn handle_set_ice_candidate(
+        &self,
+        from_peer_id: PeerID,
+        from_peer: &PeerMachine,
+        candidate: String,
+    ) -> Result<bool, RoomError> {
+
+        fn send_candidate_to_remote(
+            room: &Room,
+            from_peer_id: PeerID,
+            candidate: String,
+        ) -> Result<bool, RoomError> {
+            let remote_peer_id = room
+                .peer_to_peer
+                .get(&from_peer_id)
+                .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
+
+            let remote = room
+                .peers
+                .get(remote_peer_id)
+                .ok_or(RoomError::UnknownPeer(*remote_peer_id))?;
+
+            let remote_member_id = remote.get_member_id();
+            let remote = room
+                .connections
+                .get(&remote_member_id)
+                .ok_or(RoomError::InvalidConnection(remote_member_id))?;
+
+            remote.send_event(Event::IceCandidateDiscovered {
+                peer_id: *remote_peer_id,
+                candidate,
+            });
+
+            Ok(true)
+        };
+
+        match from_peer {
+            PeerMachine::WaitLocalSDP(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            PeerMachine::WaitLocalHaveRemote(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            PeerMachine::WaitRemoteSDP(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            PeerMachine::Stable(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            _ => Err(RoomError::UnmatchedState(from_peer_id)),
+        }
+    }
 }
 
 /// Message for to get information about [`Member`] by its credentials.
@@ -280,102 +458,19 @@ impl Handler<Command> for Room {
         debug!("receive command: {:?}", command);
         match command {
             Command::MakeSdpOffer { peer_id, sdp_offer } => {
-                let peer_caller = self
-                    .peers
-                    .remove(&peer_id)
-                    .ok_or(RoomError::UnknownPeer(peer_id))?;
-                let new_peer_caller = match peer_caller {
-                    PeerMachine::WaitLocalSDP(peer) => {
-                        Ok(PeerMachine::WaitRemoteSDP(
-                            peer.set_local_sdp(sdp_offer.clone()),
-                        ))
-                    }
-                    _ => {
-                        error!("Unmatched state caller peer");
-                        Err(RoomError::UnmatchedState(peer_id))
-                    }
-                }?;
-                self.peers.insert(peer_id, new_peer_caller);
-
-                let responder_peer_id = self
-                    .peer_to_peer
-                    .get(&peer_id)
-                    .map(|&id| id)
-                    .ok_or(RoomError::NoOpponentPeer(peer_id))?;
-                let peer_responder = self
-                    .peers
-                    .remove(&responder_peer_id)
-                    .ok_or(RoomError::UnknownPeer(responder_peer_id))?;
-                let new_peer_responder = match peer_responder {
-                    PeerMachine::New(peer) => Ok(
-                        PeerMachine::WaitLocalHaveRemote(peer.set_remote_sdp(
-                            peer_id,
-                            sdp_offer,
-                            |member_id, event| {
-                                let connection =
-                                    self.connections.get(&member_id).unwrap();
-                                connection.send_event(event);
-                            },
-                        )),
-                    ),
-                    _ => {
-                        error!("Unmatched state responder peer");
-                        Err(RoomError::UnmatchedState(responder_peer_id))
-                    }
-                }?;
-                self.peers.insert(responder_peer_id, new_peer_responder);
-                Ok(true)
+                let from_peer = self.remove_peer_by_id(&peer_id)?;
+                self.handle_make_sdp_offer(peer_id, from_peer, sdp_offer)
             }
             Command::MakeSdpAnswer {
                 peer_id,
                 sdp_answer,
             } => {
-                let peer_responder = self
-                    .peers
-                    .remove(&peer_id)
-                    .ok_or(RoomError::UnknownPeer(peer_id))?;
-                let new_peer_responder = match peer_responder {
-                    PeerMachine::WaitLocalHaveRemote(peer) => {
-                        Ok(PeerMachine::Stable(
-                            peer.set_local_sdp(sdp_answer.clone()),
-                        ))
-                    }
-                    _ => {
-                        error!("Unmatched state caller peer");
-                        Err(RoomError::UnmatchedState(peer_id))
-                    }
-                }?;
-                self.peers.insert(peer_id, new_peer_responder);
-
-                let caller_peer_id = self
-                    .peer_to_peer
-                    .get(&peer_id)
-                    .map(|&id| id)
-                    .ok_or(RoomError::NoOpponentPeer(peer_id))?;
-                let peer_caller = self
-                    .peers
-                    .remove(&caller_peer_id)
-                    .ok_or(RoomError::UnknownPeer(caller_peer_id))?;
-                let new_peer_caller = match peer_caller {
-                    PeerMachine::WaitRemoteSDP(peer) => {
-                        Ok(PeerMachine::Stable(peer.set_remote_sdp(
-                            sdp_answer,
-                            |peer_id, member_id, sdp_answer| {
-                                let connection =
-                                    self.connections.get(&member_id).unwrap();
-                                let event = Event::SdpAnswerMade {
-                                    peer_id,
-                                    sdp_answer,
-                                };
-                                connection.send_event(event);
-                            },
-                        )))
-                    }
-                    _ => Err(RoomError::UnmatchedState(caller_peer_id)),
-                }?;
-                self.peers.insert(caller_peer_id, new_peer_caller);
-
-                Ok(true)
+                let from_peer = self.remove_peer_by_id(&peer_id)?;
+                self.handle_make_sdp_answer(peer_id, from_peer, sdp_answer)
+            }
+            Command::SetIceCandidate { peer_id, candidate } => {
+                let from_peer = self.get_peer_by_id(&peer_id)?;
+                self.handle_set_ice_candidate(peer_id, from_peer, candidate)
             }
         }
     }

From c65228769fd13de6f537439a076a65bcdfc74fab Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 12 Mar 2019 17:03:27 +0200
Subject: [PATCH 049/179] Move command and event to client module

- fix remove connection when client connection away
---
 Cargo.lock                                |   1 +
 Cargo.toml                                |   1 -
 signling_test.html => signaling_test.html |   4 +-
 src/api/client/commands.rs                |  25 +
 src/api/client/events.rs                  |  27 +
 src/api/client/mod.rs                     |   7 +-
 src/api/client/room.rs                    | 461 +++++++++++++++-
 src/api/client/server.rs                  |   6 +-
 src/api/client/session.rs                 |  36 +-
 src/main.rs                               |   9 +-
 src/media/mod.rs                          |  10 +-
 src/media/peer.rs                         |  28 +-
 src/media/room.rs                         | 615 ----------------------
 13 files changed, 550 insertions(+), 680 deletions(-)
 rename signling_test.html => signaling_test.html (98%)
 create mode 100644 src/api/client/commands.rs
 create mode 100644 src/api/client/events.rs
 delete mode 100644 src/media/room.rs

diff --git a/Cargo.lock b/Cargo.lock
index a41f54a68..bc205e561 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -688,6 +688,7 @@ dependencies = [
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 2b5e66723..fec2634c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,6 @@ slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
-failure = "0.1"
 
 [dev-dependencies]
 tokio = "0.1"
diff --git a/signling_test.html b/signaling_test.html
similarity index 98%
rename from signling_test.html
rename to signaling_test.html
index 8c4109d80..305e58ded 100644
--- a/signling_test.html
+++ b/signaling_test.html
@@ -10,7 +10,7 @@
         var pcs = {};
 
         function connectSocket(caller) {
-            let role = caller ? "caller_credentials" : "responder_credentials";
+            let role = caller ? "1/caller_credentials" : "2/responder_credentials";
             socket = new WebSocket("ws://localhost:8080/ws/1/" + role);
             socket.onmessage = handleSocketMessage;
 
@@ -160,4 +160,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
new file mode 100644
index 000000000..36e5ad777
--- /dev/null
+++ b/src/api/client/commands.rs
@@ -0,0 +1,25 @@
+use actix::Message;
+use serde::{Deserialize, Serialize};
+
+use crate::{api::client::RoomError, media::peer::Id as PeerId};
+
+/// WebSocket message from Web Client to Media Server.
+#[derive(Debug, Deserialize, Message, Serialize)]
+#[rtype(result = "Result<(), RoomError>")]
+pub enum Command {
+    /// Web Client sends SDP Offer.
+    MakeSdpOffer {
+        peer_id: PeerId,
+        sdp_offer: String,
+    },
+    /// Web Client sends SDP Answer.
+    MakeSdpAnswer {
+        peer_id: PeerId,
+        sdp_answer: String,
+    },
+
+    SetIceCandidate {
+        peer_id: PeerId,
+        candidate: String,
+    },
+}
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
new file mode 100644
index 000000000..377fcc7c8
--- /dev/null
+++ b/src/api/client/events.rs
@@ -0,0 +1,27 @@
+use actix::Message;
+use serde::{Deserialize, Serialize};
+
+use crate::media::{peer::Id as PeerId, track::DirectionalTrack};
+
+/// WebSocket message from Media Server to Web Client.
+#[derive(Debug, Deserialize, Message, Serialize)]
+pub enum Event {
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// creation.
+    PeerCreated {
+        peer_id: PeerId,
+        sdp_offer: Option<String>,
+        tracks: Vec<DirectionalTrack>,
+    },
+    /// Media Server notifies Web Client about necessity to apply specified SDP
+    /// Answer to Web Client's RTCPeerConnection.
+    SdpAnswerMade {
+        peer_id: PeerId,
+        sdp_answer: String,
+    },
+
+    IceCandidateDiscovered {
+        peer_id: PeerId,
+        candidate: String,
+    },
+}
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 4022bf7ee..4a6bbe0ba 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,6 +1,11 @@
 //! Implementation of Client API.
 
+pub mod commands;
+pub mod events;
+pub mod room;
 pub mod server;
 pub mod session;
 
-pub use self::{server::*, session::*};
+pub use self::{
+    commands::Command, events::Event, room::*, server::*, session::*,
+};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 0023db16d..4ae701857 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -8,6 +8,7 @@ use std::{
 use actix::{
     fut::wrap_future, Actor, ActorFuture, Addr, Context, Handler, Message,
 };
+use failure::Fail;
 use futures::{
     future::{self, Either},
     Future,
@@ -15,8 +16,13 @@ use futures::{
 use hashbrown::HashMap;
 
 use crate::{
+    api::client::{Command, Event},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
+    media::{
+        AudioSettings, Peer, PeerId, PeerMachine, Track, TrackMediaType,
+        VideoSettings,
+    },
 };
 
 /// ID of [`Room`].
@@ -31,8 +37,272 @@ pub struct Room {
     pub members: HashMap<MemberId, Member>,
     /// Established [`WsSession`]s of [`Member`]s in this [`Room`].
     pub connections: HashMap<MemberId, Box<dyn RpcConnection>>,
-    /* TODO: Replace Box<dyn RpcConnection>> with enum,
-     *       as the set of all possible RpcConnection types is not closed. */
+    // TODO: Replace Box<dyn RpcConnection>> with enum,
+    //       as the set of all possible RpcConnection types is not closed.
+    /// Peers of [`Member`]'s this room.
+    member_peers: HashMap<MemberId, PeerId>,
+
+    /// Relations peer to peer.
+    peer_to_peer: HashMap<PeerId, PeerId>,
+
+    /// [`Peer`]s of [`Member`]'s this room.
+    peers: HashMap<PeerId, PeerMachine>,
+
+    peer_index: u64,
+}
+
+impl Room {
+    /// Create new instance of [`Room`].
+    pub fn new(id: Id, members: HashMap<MemberId, Member>) -> Self {
+        Room {
+            id,
+            members,
+            connections: HashMap::new(),
+            member_peers: HashMap::new(),
+            peers: HashMap::new(),
+            peer_to_peer: HashMap::new(),
+            peer_index: 0,
+        }
+    }
+
+    /// Generate next ID of [`Peer`].
+    fn next_peer_id(&mut self) -> PeerId {
+        let id = self.peer_index;
+        self.peer_index += 1;
+        id
+    }
+
+    fn remove_peer_by_id(
+        &mut self,
+        peer_id: &PeerId,
+    ) -> Result<PeerMachine, RoomError> {
+        self.peers
+            .remove(peer_id)
+            .ok_or(RoomError::UnknownPeer(*peer_id))
+    }
+
+    fn get_peer_by_id(
+        &self,
+        peer_id: &PeerId,
+    ) -> Result<&PeerMachine, RoomError> {
+        self.peers
+            .get(peer_id)
+            .ok_or(RoomError::UnknownPeer(*peer_id))
+    }
+
+    /// Begins the negotiation process between peers.
+    ///
+    /// Creates audio and video tracks and stores links to them in
+    /// interconnected peers.
+    fn start_pipeline(
+        &mut self,
+        caller: MemberId,
+        responder: MemberId,
+    ) -> Result<(), RoomError> {
+        let peer_caller_id = self
+            .member_peers
+            .get(&caller)
+            .map(|id| *id)
+            .ok_or(RoomError::MemberWithoutPeer(caller))?;
+        let peer_responder_id = self
+            .member_peers
+            .get(&responder)
+            .map(|id| *id)
+            .ok_or(RoomError::MemberWithoutPeer(responder))?;
+        self.peer_to_peer.insert(peer_caller_id, peer_responder_id);
+        self.peer_to_peer.insert(peer_responder_id, peer_caller_id);
+
+        let track_audio =
+            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
+        let track_video =
+            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
+
+        let peer_caller = self
+            .peers
+            .remove(&peer_caller_id)
+            .ok_or(RoomError::UnknownPeer(peer_caller_id))?;
+
+        let new_peer_caller = match peer_caller {
+            PeerMachine::New(mut peer) => {
+                peer.add_sender(track_audio.clone());
+                peer.add_sender(track_video.clone());
+                Ok(PeerMachine::WaitLocalSDP(peer.start(
+                    peer_responder_id,
+                    |member_id, event| {
+                        let connection =
+                            self.connections.get(&member_id).unwrap();
+                        connection.send_event(event);
+                    },
+                )))
+            }
+            _ => Err(RoomError::UnmatchedState(peer_caller_id)),
+        }?;
+        self.peers.insert(peer_caller_id, new_peer_caller);
+
+        let peer_responder = self
+            .peers
+            .remove(&peer_responder_id)
+            .ok_or(RoomError::UnknownPeer(peer_responder_id))?;
+
+        let new_peer_responder = match peer_responder {
+            PeerMachine::New(mut peer) => {
+                peer.add_receiver(track_audio);
+                peer.add_receiver(track_video);
+                Ok(PeerMachine::New(peer))
+            }
+            _ => Err(RoomError::UnmatchedState(peer_responder_id)),
+        }?;
+        self.peers.insert(peer_responder_id, new_peer_responder);
+        Ok(())
+    }
+
+    fn handle_make_sdp_offer(
+        &mut self,
+        from_peer_id: PeerId,
+        sdp_offer: String,
+    ) -> Result<(), RoomError> {
+        let from_peer = self.remove_peer_by_id(&from_peer_id)?;
+        let from_peer = match from_peer {
+            PeerMachine::WaitLocalSDP(peer) => Ok(PeerMachine::WaitRemoteSDP(
+                peer.set_local_sdp(sdp_offer.clone()),
+            )),
+            _ => {
+                error!("Unmatched state caller peer");
+                Err(RoomError::UnmatchedState(from_peer_id))
+            }
+        }?;
+
+        self.peers.insert(from_peer_id, from_peer);
+
+        let responder_peer_id = self
+            .peer_to_peer
+            .get(&from_peer_id)
+            .map(|&id| id)
+            .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
+        let peer_responder = self
+            .peers
+            .remove(&responder_peer_id)
+            .ok_or(RoomError::UnknownPeer(responder_peer_id))?;
+        let new_peer_responder = match peer_responder {
+            PeerMachine::New(peer) => {
+                Ok(PeerMachine::WaitLocalHaveRemote(peer.set_remote_sdp(
+                    from_peer_id,
+                    sdp_offer,
+                    |member_id, event| {
+                        let connection =
+                            self.connections.get(&member_id).unwrap();
+                        connection.send_event(event);
+                    },
+                )))
+            }
+            _ => {
+                error!("Unmatched state responder peer");
+                Err(RoomError::UnmatchedState(responder_peer_id))
+            }
+        }?;
+        self.peers.insert(responder_peer_id, new_peer_responder);
+        Ok(())
+    }
+
+    fn handle_make_sdp_answer(
+        &mut self,
+        from_peer_id: PeerId,
+        sdp_answer: String,
+    ) -> Result<(), RoomError> {
+        let from_peer = self.remove_peer_by_id(&from_peer_id)?;
+        let from_peer = match from_peer {
+            PeerMachine::WaitLocalHaveRemote(peer) => {
+                Ok(PeerMachine::Stable(peer.set_local_sdp(sdp_answer.clone())))
+            }
+            _ => {
+                error!("Unmatched state caller peer");
+                Err(RoomError::UnmatchedState(from_peer_id))
+            }
+        }?;
+        self.peers.insert(from_peer_id, from_peer);
+
+        let caller_peer_id = self
+            .peer_to_peer
+            .get(&from_peer_id)
+            .map(|&id| id)
+            .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
+        let peer_caller = self
+            .peers
+            .remove(&caller_peer_id)
+            .ok_or(RoomError::UnknownPeer(caller_peer_id))?;
+        let new_peer_caller = match peer_caller {
+            PeerMachine::WaitRemoteSDP(peer) => {
+                Ok(PeerMachine::Stable(peer.set_remote_sdp(
+                    sdp_answer,
+                    |peer_id, member_id, sdp_answer| {
+                        let connection =
+                            self.connections.get(&member_id).unwrap();
+                        let event = Event::SdpAnswerMade {
+                            peer_id,
+                            sdp_answer,
+                        };
+                        connection.send_event(event);
+                    },
+                )))
+            }
+            _ => Err(RoomError::UnmatchedState(caller_peer_id)),
+        }?;
+        self.peers.insert(caller_peer_id, new_peer_caller);
+
+        Ok(())
+    }
+
+    fn handle_set_ice_candidate(
+        &mut self,
+        from_peer_id: PeerId,
+        candidate: String,
+    ) -> Result<(), RoomError> {
+        fn send_candidate_to_remote(
+            room: &Room,
+            from_peer_id: PeerId,
+            candidate: String,
+        ) -> Result<(), RoomError> {
+            let remote_peer_id = room
+                .peer_to_peer
+                .get(&from_peer_id)
+                .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
+
+            let remote = room
+                .peers
+                .get(remote_peer_id)
+                .ok_or(RoomError::UnknownPeer(*remote_peer_id))?;
+
+            let remote_member_id = remote.get_member_id();
+            let remote = room
+                .connections
+                .get(&remote_member_id)
+                .ok_or(RoomError::InvalidConnection(remote_member_id))?;
+
+            remote.send_event(Event::IceCandidateDiscovered {
+                peer_id: *remote_peer_id,
+                candidate,
+            });
+
+            Ok(())
+        };
+
+        let from_peer = self.remove_peer_by_id(&from_peer_id)?;
+        match from_peer {
+            PeerMachine::WaitLocalSDP(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            PeerMachine::WaitLocalHaveRemote(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            PeerMachine::WaitRemoteSDP(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            PeerMachine::Stable(_) => {
+                send_candidate_to_remote(self, from_peer_id, candidate)
+            }
+            _ => Err(RoomError::UnmatchedState(from_peer_id)),
+        }
+    }
 }
 
 /// [`Actor`] implementation that provides an ergonomic way
@@ -46,6 +316,8 @@ pub trait RpcConnection: fmt::Debug + Send {
     /// Closes [`RpcConnection`].
     /// No [`RpcConnectionClosed`] signals should be emitted.
     fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
+
+    fn send_event(&self, event: Event);
 }
 
 /// Signal for authorizing new [`RpcConnection`] before establishing.
@@ -67,6 +339,20 @@ pub enum RpcConnectionAuthorizationError {
     InvalidCredentials,
 }
 
+#[derive(Fail, Debug)]
+pub enum RoomError {
+    #[fail(display = "Member without peer {}", _0)]
+    MemberWithoutPeer(MemberId),
+    #[fail(display = "Invalid connection of member {}", _0)]
+    InvalidConnection(MemberId),
+    #[fail(display = "Unknown peer {}", _0)]
+    UnknownPeer(PeerId),
+    #[fail(display = "Peer dont have opponent {}", _0)]
+    NoOpponentPeer(PeerId),
+    #[fail(display = "Unmatched state of peer {}", _0)]
+    UnmatchedState(PeerId),
+}
+
 impl Handler<AuthorizeRpcConnection> for Room {
     type Result = Result<(), RpcConnectionAuthorizationError>;
 
@@ -98,7 +384,8 @@ pub struct RpcConnectionEstablished {
 }
 
 /// Ergonomic type alias for using [`ActorFuture`] for [`Room`].
-type ActFuture<I, E> = Box<dyn ActorFuture<Actor = Room, Item = I, Error = E>>;
+type ActFuture<I, E> =
+    Box<dyn ActorFuture<Actor = Room, Item = I, Error = E> + 'static>;
 
 impl Handler<RpcConnectionEstablished> for Room {
     type Result = ActFuture<(), ()>;
@@ -115,14 +402,31 @@ impl Handler<RpcConnectionEstablished> for Room {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
         let mut fut = Either::A(future::ok(()));
+        let mut reconnected = false;
 
         if let Some(mut old_conn) = self.connections.remove(&msg.member_id) {
             debug!("Closing old RpcConnection for member {}", msg.member_id);
             fut = Either::B(old_conn.close());
+            reconnected = true;
         }
 
         self.connections.insert(msg.member_id, msg.connection);
 
+        if !reconnected {
+            let peer_id = self.next_peer_id();
+            let peer = PeerMachine::New(Peer::new(peer_id, msg.member_id));
+            self.peers.insert(peer_id, peer);
+            self.member_peers.insert(msg.member_id, peer_id);
+
+            info!("count connections: {}", self.connections.len());
+            if self.connections.len() > 1 {
+                info!("Pipeline started.");
+                self.start_pipeline(1, 2).map_err(|err| {
+                    error!("Failed start pipeline, because: {}", err)
+                });
+            }
+        }
+
         Box::new(wrap_future(fut))
     }
 }
@@ -158,6 +462,33 @@ impl Handler<RpcConnectionClosed> for Room {
     }
 }
 
+impl Handler<Command> for Room {
+    type Result = ActFuture<(), RoomError>;
+
+    /// Receives [`Command`] from Web client and changes state of interconnected
+    /// [`Peer`]s.
+    fn handle(
+        &mut self,
+        command: Command,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        debug!("receive command: {:?}", command);
+        let fut = match command {
+            Command::MakeSdpOffer { peer_id, sdp_offer } => {
+                future::done(self.handle_make_sdp_offer(peer_id, sdp_offer))
+            }
+            Command::MakeSdpAnswer {
+                peer_id,
+                sdp_answer,
+            } => future::done(self.handle_make_sdp_answer(peer_id, sdp_answer)),
+            Command::SetIceCandidate { peer_id, candidate } => {
+                future::done(self.handle_set_ice_candidate(peer_id, candidate))
+            }
+        };
+        Box::new(wrap_future(fut))
+    }
+}
+
 /// Repository that stores [`Room`]s.
 #[derive(Clone, Default)]
 pub struct RoomsRepository {
@@ -178,3 +509,127 @@ impl RoomsRepository {
         rooms.get(&id).cloned()
     }
 }
+
+#[cfg(test)]
+mod test {
+    use std::time::{Duration, Instant};
+
+    use actix::{Arbiter, AsyncContext, System};
+    use futures::future::{result, Future};
+    use tokio::timer::Delay;
+
+    use super::*;
+
+    #[derive(Debug, Clone)]
+    struct TestConnection {
+        pub member_id: MemberId,
+        pub room: Addr<Room>,
+        pub events: Arc<Mutex<Vec<String>>>,
+    }
+
+    impl Actor for TestConnection {
+        type Context = Context<Self>;
+
+        fn started(&mut self, ctx: &mut Self::Context) {
+            let caller_message = RpcConnectionEstablished {
+                member_id: self.member_id,
+                connection: Box::new(ctx.address()),
+            };
+            self.room.do_send(caller_message);
+        }
+    }
+
+    impl Handler<Event> for TestConnection {
+        type Result = ();
+
+        fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
+            let mut events = self.events.lock().unwrap();
+            events.push(serde_json::to_string(&event).unwrap());
+            match event {
+                Event::PeerCreated {
+                    peer_id,
+                    sdp_offer,
+                    tracks,
+                } => match sdp_offer {
+                    Some(_) => self.room.do_send(Command::MakeSdpAnswer {
+                        peer_id,
+                        sdp_answer: "responder_answer".into(),
+                    }),
+                    None => self.room.do_send(Command::MakeSdpOffer {
+                        peer_id,
+                        sdp_offer: "caller_offer".into(),
+                    }),
+                },
+                Event::SdpAnswerMade {
+                    peer_id: _,
+                    sdp_answer: _,
+                } => {
+                    System::current().stop();
+                }
+                Event::IceCandidateDiscovered {
+                    peer_id: _,
+                    candidate: _,
+                } => {}
+            }
+        }
+    }
+
+    impl RpcConnection for Addr<TestConnection> {
+        fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>> {
+            Box::new(future::ok(()))
+        }
+
+        fn send_event(&self, event: Event) {
+            self.do_send(event);
+        }
+    }
+
+    fn start_room() -> Addr<Room> {
+        let members = hashmap! {
+            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+        };
+        Arbiter::start(move |_| Room::new(1, members))
+    }
+
+    #[test]
+    fn start_signaling() {
+        let caller_events = Arc::new(Mutex::new(vec![]));
+        let caller_events_clone = Arc::clone(&caller_events);
+        let responder_events = Arc::new(Mutex::new(vec![]));
+        let responder_events_clone = Arc::clone(&responder_events);
+
+        System::run(move || {
+            let room = start_room();
+            let room_clone = room.clone();
+            Arbiter::start(move |_| TestConnection {
+                member_id: 1,
+                room: room_clone,
+                events: caller_events_clone,
+            });
+            let room_clone = room.clone();
+            Arbiter::start(move |_| TestConnection {
+                member_id: 2,
+                room: room_clone,
+                events: responder_events_clone,
+            });
+        });
+
+        let mut caller_events = caller_events.lock().unwrap();
+        let responder_events = responder_events.lock().unwrap();
+        assert_eq!(caller_events.len(), 2);
+        assert_eq!(
+            caller_events.to_vec(),
+            vec![
+                "{\"PeerCreated\":{\"peer_id\":0,\"sdp_offer\":null,\
+                 \"tracks\":[{\"id\":1,\"media_type\":{\"Audio\":{}},\
+                 \"direction\":{\"Send\":{\"receivers\":[1]}}},{\"id\":2,\
+                 \"media_type\":{\"Video\":{}},\"direction\":{\"Send\":\
+                 {\"receivers\":[1]}}}]}}",
+                "{\"SdpAnswerMade\":{\"peer_id\":0,\"sdp_answer\":\
+                 \"responder_answer\"}}",
+            ]
+        );
+        assert_eq!(responder_events.len(), 1);
+    }
+}
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index d3a96d334..0d4cc001f 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -108,11 +108,7 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".into()},
             2 => Member{id: 2, credentials: "responder_credentials".into()},
         };
-        let room = Arbiter::start(move |_| Room {
-            id: 1,
-            members,
-            connections: HashMap::new(),
-        });
+        let room = Arbiter::start(move |_| Room::new(1, members));
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
     }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index aef2b2297..cfa986f2e 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -7,15 +7,15 @@ use actix::{
     Message, SpawnHandle, StreamHandler,
 };
 use actix_web::ws::{self, CloseReason};
-use futures::Future;
+use futures::{future, Future};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::control::member::Id as MemberId,
-    media::{
+    api::client::{
         Command, Event, Room, RpcConnection, RpcConnectionClosed,
         RpcConnectionClosedReason, RpcConnectionEstablished,
     },
+    api::control::member::Id as MemberId,
     log::prelude::*,
 };
 
@@ -110,8 +110,8 @@ impl Actor for WsSession {
                 .map(|_| ())
                 .map_err(move |err| {
                     error!(
-                        "WsSession of member {} failed to join Room, \
-                         because: {:?}",
+                        "WsSession of member {} failed to join Room, because: \
+                         {:?}",
                         member_id, err,
                     )
                 }),
@@ -206,14 +206,23 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     ctx.notify(msg);
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
-                    self.room
-                        .send(command)
-                        .into_actor(self)
-                        .then(|r, _a, _c| {
-                            debug!("{:?}", r);
-                            fut::ok::<(), (), Self>(())
-                        })
-                        .wait(ctx);
+                    let member_id = self.member_id;
+                    ctx.wait(wrap_future(
+                        self.room
+                            .send(command)
+                            .and_then(move |res| match res {
+                                Ok(_) => future::ok(()),
+                                Err(err) => {
+                                    error!(
+                                        "Command from member {} handle \
+                                         failed, because: {:?}",
+                                        member_id, err,
+                                    );
+                                    future::ok(())
+                                }
+                            })
+                            .map_err(|_| ()),
+                    ));
                 }
             }
             ws::Message::Close(reason) => {
@@ -238,7 +247,6 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                             }),
                     ));
                     ctx.close(reason);
-                    ctx.stop();
                 }
             }
             _ => error!(
diff --git a/src/main.rs b/src/main.rs
index 3a37bbf92..5bf89cd62 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,12 +3,9 @@
 use actix::prelude::*;
 use dotenv::dotenv;
 
-use crate::{
-    api::{
-        client::server,
-        control::Member,
-    },
-    media::{Room, RoomsRepository},
+use crate::api::{
+    client::{server, Room, RoomsRepository},
+    control::Member,
 };
 
 #[macro_use]
diff --git a/src/media/mod.rs b/src/media/mod.rs
index 974bef37b..1d45380b0 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -1,15 +1,11 @@
 pub mod errors;
 pub mod peer;
-pub mod room;
 pub mod track;
 
 pub use self::{
     errors::MediaError,
-    peer::{Event, Id as PeerID, Peer, PeerMachine},
-    room::{
-        Command, Id as RoomID, Room, RoomsRepository, RpcConnection,
-        RpcConnectionClosed, RpcConnectionClosedReason,
-        RpcConnectionEstablished,
+    peer::{Id as PeerId, Peer, PeerMachine},
+    track::{
+        AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
     },
-    track::Id as TrackID,
 };
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 15fa53e9a..44d075bfa 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,10 +1,9 @@
-use std::{sync::Arc, any::Any};
+use std::{any::Any, sync::Arc};
 
-use actix::prelude::*;
 use hashbrown::HashMap;
-use serde::{Deserialize, Serialize};
 
 use crate::{
+    api::client::Event,
     api::control::member::Id as MemberID,
     log::prelude::*,
     media::{
@@ -13,29 +12,6 @@ use crate::{
     },
 };
 
-/// WebSocket message from Media Server to Web Client.
-#[derive(Debug, Deserialize, Serialize, Message)]
-pub enum Event {
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// creation.
-    PeerCreated {
-        peer_id: Id,
-        sdp_offer: Option<String>,
-        tracks: Vec<DirectionalTrack>,
-    },
-    /// Media Server notifies Web Client about necessity to apply specified SDP
-    /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade {
-        peer_id: Id,
-        sdp_answer: String,
-    },
-
-    IceCandidateDiscovered {
-        peer_id: Id,
-        candidate: String,
-    },
-}
-
 #[derive(Debug, Clone, PartialEq)]
 pub struct New {}
 #[derive(Debug, Clone, PartialEq)]
diff --git a/src/media/room.rs b/src/media/room.rs
deleted file mode 100644
index 3e6dda3d1..000000000
--- a/src/media/room.rs
+++ /dev/null
@@ -1,615 +0,0 @@
-//! Room definitions and implementations.
-use std::sync::{Arc, Mutex};
-
-use actix::prelude::*;
-use hashbrown::HashMap;
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    api::control::{Id as MemberID, Member},
-    log::prelude::*,
-    media::{
-        peer::{Event, Id as PeerID, Peer, PeerMachine},
-        track::{
-            AudioSettings, DirectionalTrack, Track, TrackMediaType,
-            VideoSettings,
-        },
-    },
-};
-use std::fmt::Debug;
-
-use failure::Fail;
-
-#[derive(Fail, Debug)]
-pub enum RoomError {
-    #[fail(display = "Member without peer {}", _0)]
-    MemberWithoutPeer(MemberID),
-    #[fail(display = "Invalid connection of member {}", _0)]
-    InvalidConnection(MemberID),
-    #[fail(display = "Unknown peer {}", _0)]
-    UnknownPeer(PeerID),
-    #[fail(display = "Peer dont have opponent {}", _0)]
-    NoOpponentPeer(PeerID),
-    #[fail(display = "Unmatched state of peer {}", _0)]
-    UnmatchedState(PeerID),
-}
-
-/// WebSocket message from Web Client to Media Server.
-#[derive(Debug, Deserialize, Serialize, Message)]
-#[rtype(result = "Result<bool, RoomError>")]
-pub enum Command {
-    /// Web Client sends SDP Offer.
-    MakeSdpOffer {
-        peer_id: PeerID,
-        sdp_offer: String,
-    },
-    /// Web Client sends SDP Answer.
-    MakeSdpAnswer {
-        peer_id: PeerID,
-        sdp_answer: String,
-    },
-
-    SetIceCandidate {
-        peer_id: PeerID,
-        candidate: String,
-    },
-}
-
-/// ID of [`Room`].
-pub type Id = u64;
-
-/// Media server room with its members.
-#[derive(Debug)]
-pub struct Room {
-    /// ID of [`Room`].
-    id: Id,
-
-    /// [`Member`]'s this room.
-    members: HashMap<MemberID, Member>,
-
-    /// Connections of [`Member`]'s this room.
-    connections: HashMap<MemberID, Box<dyn RpcConnection>>,
-
-    /// Peers of [`Member`]'s this room.
-    member_peers: HashMap<MemberID, PeerID>,
-
-    /// Relations peer to peer.
-    peer_to_peer: HashMap<PeerID, PeerID>,
-
-    /// [`Peer`]s of [`Member`]'s this room.
-    peers: HashMap<PeerID, PeerMachine>,
-
-    peer_index: u64,
-}
-
-/// [`Actor`] implementation that provides an ergonomic way for members
-/// to interact in [` Room`].
-impl Actor for Room {
-    type Context = Context<Self>;
-}
-
-/// Connection of [`Member`].
-pub trait RpcConnection: Debug + Send {
-    /// Close connection.
-    fn close(&self);
-
-    /// Send event.
-    fn send_event(&self, event: Event);
-}
-
-/// Message that [`Member`] has connected to [`Room`].
-#[derive(Message, Debug)]
-#[rtype(result = "Result<(), RoomError>")]
-pub struct RpcConnectionEstablished {
-    pub member_id: MemberID,
-    pub connection: Box<dyn RpcConnection>,
-}
-
-impl Room {
-    /// Create new instance of [`Room`].
-    pub fn new(id: Id, members: HashMap<MemberID, Member>) -> Self {
-        Room {
-            id,
-            members,
-            connections: HashMap::new(),
-            member_peers: HashMap::new(),
-            peers: HashMap::new(),
-            peer_to_peer: HashMap::new(),
-            peer_index: 0,
-        }
-    }
-
-    /// Generate next ID of [`Peer`].
-    fn next_peer_id(&mut self) -> PeerID {
-        let id = self.peer_index;
-        self.peer_index += 1;
-        id
-    }
-
-    fn remove_peer_by_id(
-        &mut self,
-        peer_id: &PeerID,
-    ) -> Result<PeerMachine, RoomError> {
-        self.peers
-            .remove(peer_id)
-            .ok_or(RoomError::UnknownPeer(*peer_id))
-    }
-
-    fn get_peer_by_id(
-        &self,
-        peer_id: &PeerID,
-    ) -> Result<&PeerMachine, RoomError> {
-        self.peers
-            .get(peer_id)
-            .ok_or(RoomError::UnknownPeer(*peer_id))
-    }
-
-    /// Begins the negotiation process between peers.
-    ///
-    /// Creates audio and video tracks and stores links to them in
-    /// interconnected peers.
-    fn start_pipeline(
-        &mut self,
-        caller: MemberID,
-        responder: MemberID,
-    ) -> Result<(), RoomError> {
-        let peer_caller_id = self
-            .member_peers
-            .get(&caller)
-            .map(|id| *id)
-            .ok_or(RoomError::MemberWithoutPeer(caller))?;
-        let peer_responder_id = self
-            .member_peers
-            .get(&responder)
-            .map(|id| *id)
-            .ok_or(RoomError::MemberWithoutPeer(responder))?;
-        self.peer_to_peer.insert(peer_caller_id, peer_responder_id);
-        self.peer_to_peer.insert(peer_responder_id, peer_caller_id);
-
-        let track_audio =
-            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
-        let track_video =
-            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
-
-        let peer_caller = self
-            .peers
-            .remove(&peer_caller_id)
-            .ok_or(RoomError::UnknownPeer(peer_caller_id))?;
-
-        let new_peer_caller = match peer_caller {
-            PeerMachine::New(mut peer) => {
-                peer.add_sender(track_audio.clone());
-                peer.add_sender(track_video.clone());
-                Ok(PeerMachine::WaitLocalSDP(peer.start(
-                    peer_responder_id,
-                    |member_id, event| {
-                        let connection =
-                            self.connections.get(&member_id).unwrap();
-                        connection.send_event(event);
-                    },
-                )))
-            }
-            _ => Err(RoomError::UnmatchedState(peer_caller_id)),
-        }?;
-        self.peers.insert(peer_caller_id, new_peer_caller);
-
-        let peer_responder = self
-            .peers
-            .remove(&peer_responder_id)
-            .ok_or(RoomError::UnknownPeer(peer_responder_id))?;
-
-        let new_peer_responder = match peer_responder {
-            PeerMachine::New(mut peer) => {
-                peer.add_receiver(track_audio);
-                peer.add_receiver(track_video);
-                Ok(PeerMachine::New(peer))
-            }
-            _ => Err(RoomError::UnmatchedState(peer_responder_id)),
-        }?;
-        self.peers.insert(peer_responder_id, new_peer_responder);
-        Ok(())
-    }
-
-    fn handle_make_sdp_offer(
-        &mut self,
-        from_peer_id: PeerID,
-        from_peer: PeerMachine,
-        sdp_offer: String,
-    ) -> Result<bool, RoomError> {
-        let from_peer = match from_peer {
-            PeerMachine::WaitLocalSDP(peer) => Ok(PeerMachine::WaitRemoteSDP(
-                peer.set_local_sdp(sdp_offer.clone()),
-            )),
-            _ => {
-                error!("Unmatched state caller peer");
-                Err(RoomError::UnmatchedState(from_peer_id))
-            }
-        }?;
-
-        self.peers.insert(from_peer_id, from_peer);
-
-        let responder_peer_id = self
-            .peer_to_peer
-            .get(&from_peer_id)
-            .map(|&id| id)
-            .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
-        let peer_responder = self
-            .peers
-            .remove(&responder_peer_id)
-            .ok_or(RoomError::UnknownPeer(responder_peer_id))?;
-        let new_peer_responder = match peer_responder {
-            PeerMachine::New(peer) => {
-                Ok(PeerMachine::WaitLocalHaveRemote(peer.set_remote_sdp(
-                    from_peer_id,
-                    sdp_offer,
-                    |member_id, event| {
-                        let connection =
-                            self.connections.get(&member_id).unwrap();
-                        connection.send_event(event);
-                    },
-                )))
-            }
-            _ => {
-                error!("Unmatched state responder peer");
-                Err(RoomError::UnmatchedState(responder_peer_id))
-            }
-        }?;
-        self.peers.insert(responder_peer_id, new_peer_responder);
-        Ok(true)
-    }
-
-    fn handle_make_sdp_answer(
-        &mut self,
-        from_peer_id: PeerID,
-        from_peer: PeerMachine,
-        sdp_answer: String,
-    ) -> Result<bool, RoomError> {
-        let from_peer = match from_peer {
-            PeerMachine::WaitLocalHaveRemote(peer) => {
-                Ok(PeerMachine::Stable(peer.set_local_sdp(sdp_answer.clone())))
-            }
-            _ => {
-                error!("Unmatched state caller peer");
-                Err(RoomError::UnmatchedState(from_peer_id))
-            }
-        }?;
-        self.peers.insert(from_peer_id, from_peer);
-
-        let caller_peer_id = self
-            .peer_to_peer
-            .get(&from_peer_id)
-            .map(|&id| id)
-            .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
-        let peer_caller = self
-            .peers
-            .remove(&caller_peer_id)
-            .ok_or(RoomError::UnknownPeer(caller_peer_id))?;
-        let new_peer_caller = match peer_caller {
-            PeerMachine::WaitRemoteSDP(peer) => {
-                Ok(PeerMachine::Stable(peer.set_remote_sdp(
-                    sdp_answer,
-                    |peer_id, member_id, sdp_answer| {
-                        let connection =
-                            self.connections.get(&member_id).unwrap();
-                        let event = Event::SdpAnswerMade {
-                            peer_id,
-                            sdp_answer,
-                        };
-                        connection.send_event(event);
-                    },
-                )))
-            }
-            _ => Err(RoomError::UnmatchedState(caller_peer_id)),
-        }?;
-        self.peers.insert(caller_peer_id, new_peer_caller);
-
-        Ok(true)
-    }
-
-    fn handle_set_ice_candidate(
-        &self,
-        from_peer_id: PeerID,
-        from_peer: &PeerMachine,
-        candidate: String,
-    ) -> Result<bool, RoomError> {
-
-        fn send_candidate_to_remote(
-            room: &Room,
-            from_peer_id: PeerID,
-            candidate: String,
-        ) -> Result<bool, RoomError> {
-            let remote_peer_id = room
-                .peer_to_peer
-                .get(&from_peer_id)
-                .ok_or(RoomError::NoOpponentPeer(from_peer_id))?;
-
-            let remote = room
-                .peers
-                .get(remote_peer_id)
-                .ok_or(RoomError::UnknownPeer(*remote_peer_id))?;
-
-            let remote_member_id = remote.get_member_id();
-            let remote = room
-                .connections
-                .get(&remote_member_id)
-                .ok_or(RoomError::InvalidConnection(remote_member_id))?;
-
-            remote.send_event(Event::IceCandidateDiscovered {
-                peer_id: *remote_peer_id,
-                candidate,
-            });
-
-            Ok(true)
-        };
-
-        match from_peer {
-            PeerMachine::WaitLocalSDP(_) => {
-                send_candidate_to_remote(self, from_peer_id, candidate)
-            }
-            PeerMachine::WaitLocalHaveRemote(_) => {
-                send_candidate_to_remote(self, from_peer_id, candidate)
-            }
-            PeerMachine::WaitRemoteSDP(_) => {
-                send_candidate_to_remote(self, from_peer_id, candidate)
-            }
-            PeerMachine::Stable(_) => {
-                send_candidate_to_remote(self, from_peer_id, candidate)
-            }
-            _ => Err(RoomError::UnmatchedState(from_peer_id)),
-        }
-    }
-}
-
-/// Message for to get information about [`Member`] by its credentials.
-#[derive(Message, Debug)]
-#[rtype(result = "Option<Member>")]
-pub struct GetMember {
-    pub credentials: String,
-}
-
-/// Message that [`Member`] closed or lost connection.
-#[derive(Message, Debug)]
-pub struct RpcConnectionClosed {
-    pub member_id: MemberID,
-    pub reason: RpcConnectionClosedReason,
-}
-
-/// [`RpcConnection`] close reasons.
-#[derive(Debug)]
-pub enum RpcConnectionClosedReason {
-    /// [`RpcConnection`] gracefully disconnected from server.
-    Disconnect,
-    /// [`RpcConnection`] was considered idle.
-    Idle,
-}
-
-impl Handler<GetMember> for Room {
-    type Result = Option<Member>;
-
-    /// Returns [`Member`] by its credentials if it present in [`Room`].
-    fn handle(
-        &mut self,
-        msg: GetMember,
-        _ctx: &mut Self::Context,
-    ) -> Self::Result {
-        self.members
-            .values()
-            .find(|m| m.credentials.eq(msg.credentials.as_str()))
-            .map(|m| m.clone())
-    }
-}
-
-impl Handler<RpcConnectionEstablished> for Room {
-    type Result = Result<(), RoomError>;
-
-    /// Store connection of [`Member`] into [`Room`].
-    ///
-    /// If the [`Member`] already has connection, it will be closed.
-    fn handle(
-        &mut self,
-        msg: RpcConnectionEstablished,
-        _ctx: &mut Self::Context,
-    ) -> Self::Result {
-        info!("RpcConnectionEstablished with member {:?}", &msg.member_id);
-        let mut reconnected = false;
-        if let Some(old_connection) = self.connections.remove(&msg.member_id) {
-            reconnected = true;
-            debug!("Reconnect WsSession for member {}", msg.member_id);
-            old_connection.close();
-        }
-        self.connections.insert(msg.member_id, msg.connection);
-        if !reconnected {
-            let peer_id = self.next_peer_id();
-            let peer = PeerMachine::New(Peer::new(peer_id, msg.member_id));
-            self.peers.insert(peer_id, peer);
-            self.member_peers.insert(msg.member_id, peer_id);
-
-            if self.connections.len() > 1 {
-                self.start_pipeline(1, 2)?;
-            }
-        }
-        Ok(())
-    }
-}
-
-impl Handler<RpcConnectionClosed> for Room {
-    type Result = ();
-
-    /// Remove connection of [`Member`] from [`Room`].
-    fn handle(&mut self, msg: RpcConnectionClosed, _ctx: &mut Self::Context) {
-        info!(
-            "RpcConnectionClosed with member {}, reason {:?}",
-            &msg.member_id, msg.reason
-        );
-        self.connections.remove(&msg.member_id);
-    }
-}
-
-impl Handler<Command> for Room {
-    type Result = Result<bool, RoomError>;
-
-    /// Receives [`Command`] from Web client and changes state of interconnected
-    /// [`Peer`]s.
-    fn handle(
-        &mut self,
-        command: Command,
-        _ctx: &mut Self::Context,
-    ) -> Self::Result {
-        debug!("receive command: {:?}", command);
-        match command {
-            Command::MakeSdpOffer { peer_id, sdp_offer } => {
-                let from_peer = self.remove_peer_by_id(&peer_id)?;
-                self.handle_make_sdp_offer(peer_id, from_peer, sdp_offer)
-            }
-            Command::MakeSdpAnswer {
-                peer_id,
-                sdp_answer,
-            } => {
-                let from_peer = self.remove_peer_by_id(&peer_id)?;
-                self.handle_make_sdp_answer(peer_id, from_peer, sdp_answer)
-            }
-            Command::SetIceCandidate { peer_id, candidate } => {
-                let from_peer = self.get_peer_by_id(&peer_id)?;
-                self.handle_set_ice_candidate(peer_id, from_peer, candidate)
-            }
-        }
-    }
-}
-
-/// Repository that stores [`Room`]s.
-#[derive(Clone, Default)]
-pub struct RoomsRepository {
-    rooms: Arc<Mutex<HashMap<Id, Addr<Room>>>>,
-}
-
-impl RoomsRepository {
-    /// Creates new [`Room`]s repository with passed-in [`Room`]s.
-    pub fn new(rooms: HashMap<Id, Addr<Room>>) -> Self {
-        RoomsRepository {
-            rooms: Arc::new(Mutex::new(rooms)),
-        }
-    }
-
-    /// Returns [`Room`] by its ID.
-    pub fn get(&self, id: Id) -> Option<Addr<Room>> {
-        let rooms = self.rooms.lock().unwrap();
-        rooms.get(&id).map(|r| r.clone())
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use std::time::{Duration, Instant};
-
-    use futures::future::{result, Future};
-    use tokio::timer::Delay;
-
-    use super::*;
-
-    #[derive(Debug, Clone)]
-    struct TestConnection {
-        pub member_id: MemberID,
-        pub room: Addr<Room>,
-        pub events: Arc<Mutex<Vec<String>>>,
-    }
-
-    impl Actor for TestConnection {
-        type Context = Context<Self>;
-
-        fn started(&mut self, ctx: &mut Self::Context) {
-            let caller_message = RpcConnectionEstablished {
-                member_id: self.member_id,
-                connection: Box::new(ctx.address()),
-            };
-            self.room.do_send(caller_message);
-        }
-    }
-
-    impl Handler<Event> for TestConnection {
-        type Result = ();
-
-        fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
-            let mut events = self.events.lock().unwrap();
-            events.push(serde_json::to_string(&event).unwrap());
-            match event {
-                Event::PeerCreated {
-                    peer_id,
-                    sdp_offer,
-                    tracks,
-                } => match sdp_offer {
-                    Some(_) => self.room.do_send(Command::MakeSdpAnswer {
-                        peer_id,
-                        sdp_answer: "responder_answer".into(),
-                    }),
-                    None => self.room.do_send(Command::MakeSdpOffer {
-                        peer_id,
-                        sdp_offer: "caller_offer".into(),
-                    }),
-                },
-                Event::SdpAnswerMade {
-                    peer_id: _,
-                    sdp_answer: _,
-                } => {
-                    System::current().stop();
-                }
-            }
-        }
-    }
-
-    impl RpcConnection for Addr<TestConnection> {
-        fn close(&self) {}
-
-        fn send_event(&self, event: Event) {
-            self.do_send(event);
-        }
-    }
-
-    fn start_room() -> Addr<Room> {
-        let members = hashmap! {
-            1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
-            2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
-        };
-        Arbiter::start(move |_| Room::new(1, members))
-    }
-
-    #[test]
-    fn start_signaling() {
-        let caller_events = Arc::new(Mutex::new(vec![]));
-        let caller_events_clone = Arc::clone(&caller_events);
-        let responder_events = Arc::new(Mutex::new(vec![]));
-        let responder_events_clone = Arc::clone(&responder_events);
-
-        System::run(move || {
-            let room = start_room();
-            let room_clone = room.clone();
-            Arbiter::start(move |_| TestConnection {
-                member_id: 1,
-                room: room_clone,
-                events: caller_events_clone,
-            });
-            let room_clone = room.clone();
-            Arbiter::start(move |_| TestConnection {
-                member_id: 2,
-                room: room_clone,
-                events: responder_events_clone,
-            });
-        });
-
-        let mut caller_events = caller_events.lock().unwrap();
-        let responder_events = responder_events.lock().unwrap();
-        assert_eq!(caller_events.len(), 2);
-        assert_eq!(
-            caller_events.to_vec(),
-            vec![
-                "{\"PeerCreated\":{\"peer_id\":0,\"sdp_offer\":null,\
-                 \"tracks\":[{\"id\":1,\"media_type\":{\"Audio\":{}},\
-                 \"direction\":{\"Send\":{\"receivers\":[1]}}},{\"id\":2,\
-                 \"media_type\":{\"Video\":{}},\"direction\":{\"Send\":\
-                 {\"receivers\":[1]}}}]}}",
-                "{\"SdpAnswerMade\":{\"peer_id\":0,\"sdp_answer\":\
-                 \"responder_answer\"}}",
-            ]
-        );
-        assert_eq!(responder_events.len(), 1);
-    }
-}

From ffeb144742cebe981b948de3732a35f1fdca4eb6 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 19 Mar 2019 16:39:22 +0200
Subject: [PATCH 050/179] Impl send event by Room

---
 Cargo.lock                   |  27 ++--
 Cargo.toml                   |   3 +-
 src/api/client/connection.rs | 246 +++++++++++++++++++++++++++++++++++
 src/api/client/events.rs     |  27 ++++
 src/api/client/mod.rs        |   4 +-
 src/api/client/room.rs       | 162 +++++++++++++++++++++--
 src/api/client/server.rs     |  16 +--
 src/api/client/session.rs    | 245 +++++-----------------------------
 src/main.rs                  |  15 +--
 src/media/mod.rs             |   9 ++
 src/media/peer.rs            | 230 ++++++++++++++++++++++++++++++++
 src/media/track.rs           |  48 +++++++
 12 files changed, 776 insertions(+), 256 deletions(-)
 create mode 100644 src/api/client/connection.rs
 create mode 100644 src/api/client/events.rs
 create mode 100644 src/media/mod.rs
 create mode 100644 src/media/peer.rs
 create mode 100644 src/media/track.rs

diff --git a/Cargo.lock b/Cargo.lock
index a41f54a68..89b3535e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,7 +75,7 @@ dependencies = [
  "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -305,7 +305,7 @@ dependencies = [
  "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -338,7 +338,7 @@ dependencies = [
  "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -357,7 +357,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -613,7 +613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -680,6 +680,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1094,7 +1095,7 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1249,7 +1250,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1362,7 +1363,7 @@ name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1452,7 +1453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1565,7 +1566,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1588,7 +1589,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1611,7 +1612,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1865,7 +1866,7 @@ dependencies = [
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 "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 lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
 "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
diff --git a/Cargo.toml b/Cargo.toml
index 8c5c0f600..6fba0956c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,8 +14,10 @@ actix = "0.7"
 actix-web = "0.7"
 chrono = "0.4"
 dotenv = "0.13"
+failure = "0.1"
 futures = "0.1"
 hashbrown = "0.1"
+lazy_static = "1.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 slog = "2.4"
@@ -24,4 +26,3 @@ slog-stdlog = "3.0"
 slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
-failure = "0.1"
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
new file mode 100644
index 000000000..068c1be5a
--- /dev/null
+++ b/src/api/client/connection.rs
@@ -0,0 +1,246 @@
+//! WebSocket session.
+
+use std::time::Duration;
+
+use actix::{
+    fut::wrap_future, Actor, ActorContext, Addr, AsyncContext, Handler,
+    Message, SpawnHandle, StreamHandler,
+};
+use actix_web::ws::{self, CloseReason};
+use futures::Future;
+use serde::{Deserialize, Serialize};
+
+use crate::{
+    api::client::{
+        Event, Room, RpcConnection, RpcConnectionClosed,
+        RpcConnectionClosedReason, RpcConnectionEstablished,
+    },
+    api::control::member::Id as MemberId,
+    log::prelude::*,
+};
+
+// TODO: via conf
+/// Timeout of receiving any WebSocket messages from client.
+pub const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
+
+/// Long-running WebSocket connection of Client API.
+#[derive(Debug)]
+#[allow(clippy::module_name_repetitions)]
+pub struct WsConnection {
+    /// ID of [`Member`] that WebSocket connection is associated with.
+    member_id: MemberId,
+    /// [`Room`] that [`Member`] is associated with.
+    room: Addr<Room>,
+
+    /// Handle for watchdog which checks whether WebSocket client became
+    /// idle (no `ping` messages received during [`CLIENT_IDLE_TIMEOUT`]).
+    ///
+    /// This one should be renewed on any received WebSocket message
+    /// from client.
+    idle_handler: Option<SpawnHandle>,
+
+    /// Indicates whether WebSocket connection is closed by server ot by
+    /// client.
+    closed_by_server: bool,
+}
+
+impl WsConnection {
+    /// Creates new [`WsSession`] for specified [`Member`].
+    pub fn new(member_id: MemberId, room: Addr<Room>) -> Self {
+        Self {
+            member_id,
+            room,
+            idle_handler: None,
+            closed_by_server: false,
+        }
+    }
+
+    /// Resets idle handler watchdog.
+    fn reset_idle_timeout(&mut self, ctx: &mut <Self as Actor>::Context) {
+        if let Some(handler) = self.idle_handler {
+            ctx.cancel_future(handler);
+        }
+
+        self.idle_handler =
+            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |sess, ctx| {
+                info!("WsConnection with member {} is idle", sess.member_id);
+
+                let member_id = sess.member_id;
+                ctx.wait(wrap_future(
+                    sess.room
+                        .send(RpcConnectionClosed {
+                            member_id,
+                            reason: RpcConnectionClosedReason::Idle,
+                        })
+                        .map_err(move |err| {
+                            error!(
+                                "WsSession of member {} failed to remove from \
+                                 Room, because: {:?}",
+                                member_id, err,
+                            )
+                        }),
+                ));
+
+                ctx.notify(Close {
+                    reason: Some(ws::CloseCode::Normal.into()),
+                });
+            }));
+    }
+}
+
+/// [`Actor`] implementation that provides an ergonomic way to deal with
+/// WebSocket connection lifecycle for [`WsSession`].
+impl Actor for WsConnection {
+    type Context = ws::WebsocketContext<Self>;
+
+    /// Starts [`Heartbeat`] mechanism and sends [`RpcConnectionEstablished`]
+    /// signal to the [`Room`].
+    fn started(&mut self, ctx: &mut Self::Context) {
+        debug!("Started WsSession for member {}", self.member_id);
+
+        self.reset_idle_timeout(ctx);
+
+        let member_id = self.member_id;
+        ctx.wait(wrap_future(
+            self.room
+                .send(RpcConnectionEstablished {
+                    member_id: self.member_id,
+                    connection: Box::new(ctx.address()),
+                })
+                .map(|_| ())
+                .map_err(move |err| {
+                    error!(
+                        "WsConnection of member {} failed to join Room, \
+                         because: {:?}",
+                        member_id, err,
+                    )
+                }),
+        ));
+    }
+
+    fn stopped(&mut self, _ctx: &mut Self::Context) {
+        debug!("Stopped WsSession for member {}", self.member_id);
+    }
+}
+
+impl RpcConnection for Addr<WsConnection> {
+    /// Closes [`WsSession`] by sending itself "normal closure" close message.
+    fn close(&self) -> Box<dyn Future<Item = (), Error = ()>> {
+        let fut = self
+            .send(Close {
+                reason: Some(ws::CloseCode::Normal.into()),
+            })
+            .map_err(|_| ());
+        Box::new(fut)
+    }
+
+    fn send_event(
+        &self,
+        event: Event,
+    ) -> Box<dyn Future<Item = (), Error = ()>> {
+        let fut = self
+            .send(event)
+            .map_err(|err| error!("Failed send event {:?} ", err));
+        Box::new(fut)
+    }
+}
+
+/// Message for closing [`WsSession`].
+#[derive(Message)]
+pub struct Close {
+    reason: Option<CloseReason>,
+}
+
+impl Handler<Close> for WsConnection {
+    type Result = ();
+
+    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
+    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
+        debug!("Closing WsSession for member {}", self.member_id);
+        self.closed_by_server = true;
+        ctx.close(close.reason);
+        ctx.stop();
+    }
+}
+
+impl Handler<Event> for WsConnection {
+    type Result = ();
+
+    fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
+        debug!("Event {:?} for member {}", event, self.member_id);
+        ctx.text(serde_json::to_string(&event).unwrap())
+    }
+}
+
+/// Message for keeping client WebSocket connection alive.
+#[derive(Debug, Deserialize, Message, Serialize)]
+pub enum Heartbeat {
+    /// `ping` message that WebSocket client is expected to send to the server
+    /// periodically.
+    #[serde(rename = "ping")]
+    Ping(usize),
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
+
+impl Handler<Heartbeat> for WsConnection {
+    type Result = ();
+
+    /// Answers with `Heartbeat::Pong` message to WebSocket client in response
+    /// to the received `Heartbeat::Ping` message.
+    fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
+        if let Heartbeat::Ping(n) = msg {
+            trace!("Received ping: {}", n);
+            ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
+        }
+    }
+}
+
+impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
+    /// Handles arbitrary [`ws::Message`] received from WebSocket client.
+    fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
+        debug!(
+            "Received WS message: {:?} from member {}",
+            msg, self.member_id
+        );
+        match msg {
+            ws::Message::Text(text) => {
+                self.reset_idle_timeout(ctx);
+                if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
+                    ctx.notify(msg);
+                }
+            }
+            ws::Message::Close(reason) => {
+                if !self.closed_by_server {
+                    debug!(
+                        "Send close frame with reason {:?} for member {}",
+                        reason, self.member_id
+                    );
+                    let member_id = self.member_id;
+                    ctx.wait(wrap_future(
+                        self.room
+                            .send(RpcConnectionClosed {
+                                member_id: self.member_id,
+                                reason: RpcConnectionClosedReason::Disconnected,
+                            })
+                            .map_err(move |err| {
+                                error!(
+                                    "WsSession of member {} failed to remove \
+                                     from Room, because: {:?}",
+                                    member_id, err,
+                                )
+                            }),
+                    ));
+                    ctx.close(reason);
+                    ctx.stop();
+                }
+            }
+            _ => error!(
+                "Unsupported client message from member {}",
+                self.member_id
+            ),
+        }
+    }
+}
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
new file mode 100644
index 000000000..377fcc7c8
--- /dev/null
+++ b/src/api/client/events.rs
@@ -0,0 +1,27 @@
+use actix::Message;
+use serde::{Deserialize, Serialize};
+
+use crate::media::{peer::Id as PeerId, track::DirectionalTrack};
+
+/// WebSocket message from Media Server to Web Client.
+#[derive(Debug, Deserialize, Message, Serialize)]
+pub enum Event {
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// creation.
+    PeerCreated {
+        peer_id: PeerId,
+        sdp_offer: Option<String>,
+        tracks: Vec<DirectionalTrack>,
+    },
+    /// Media Server notifies Web Client about necessity to apply specified SDP
+    /// Answer to Web Client's RTCPeerConnection.
+    SdpAnswerMade {
+        peer_id: PeerId,
+        sdp_answer: String,
+    },
+
+    IceCandidateDiscovered {
+        peer_id: PeerId,
+        candidate: String,
+    },
+}
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 0f3537eab..63b44794b 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,7 +1,9 @@
 //! Implementation of Client API.
 
+pub mod connection;
+pub mod events;
 pub mod room;
 pub mod server;
 pub mod session;
 
-pub use self::{room::*, server::*, session::*};
+pub use self::{connection::*, events::*, room::*, server::*, session::*};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 0023db16d..d1b1db5f7 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -6,19 +6,38 @@ use std::{
 };
 
 use actix::{
-    fut::wrap_future, Actor, ActorFuture, Addr, Context, Handler, Message,
+    fut::wrap_future, Actor, ActorFuture, Addr, AsyncContext, Context, Handler,
+    Message,
 };
 use futures::{
-    future::{self, Either},
+    future::{self, join_all, Either},
     Future,
 };
 use hashbrown::HashMap;
 
 use crate::{
+    api::client::{Event, Session},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
+    media::{
+        peer::{Id as PeerId, Peer, PeerMachine},
+        track::{
+            AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
+        },
+    },
 };
 
+lazy_static! {
+    static ref PEER_INDEX: Mutex<u64> = Mutex::new(0);
+}
+
+/// Generate next ID of [`Peer`].
+fn next_peer_id() -> PeerId {
+    let mut index = PEER_INDEX.lock().unwrap();
+    *index += 1;
+    *index
+}
+
 /// ID of [`Room`].
 pub type Id = u64;
 
@@ -29,12 +48,49 @@ pub struct Room {
     pub id: Id,
     /// [`Member`]s which currently are present in this [`Room`].
     pub members: HashMap<MemberId, Member>,
-    /// Established [`WsSession`]s of [`Member`]s in this [`Room`].
-    pub connections: HashMap<MemberId, Box<dyn RpcConnection>>,
+    /// [`Session`]s of [`Member`]s in this [`Room`].
+    pub sessions: HashMap<MemberId, Session>,
     /* TODO: Replace Box<dyn RpcConnection>> with enum,
      *       as the set of all possible RpcConnection types is not closed. */
 }
 
+impl Room {
+    /// Create new instance of [`Room`].
+    pub fn new(id: Id, members: HashMap<MemberId, Member>) -> Self {
+        Room {
+            id,
+            members,
+            sessions: HashMap::new(),
+        }
+    }
+
+    pub fn session_by_peer(
+        &mut self,
+        peer_id: PeerId,
+    ) -> Option<(&u64, &mut Session)> {
+        self.sessions
+            .iter_mut()
+            .find(|(_, s)| s.peers.contains_key(&peer_id))
+    }
+
+    pub fn remove_session(&mut self, member_id: MemberId) {
+        if let Some(session) = self.sessions.remove(&member_id) {
+            for peer in session.peers.values() {
+                let opponent_peer_id = peer.opponent_id();
+                if let Some((_, opp_session)) =
+                    self.session_by_peer(opponent_peer_id)
+                {
+                    info!(
+                        "Remove peer {:?} of member {:?}",
+                        opponent_peer_id, opp_session.member_id
+                    );
+                    opp_session.remove_peer(opponent_peer_id);
+                }
+            }
+        }
+    }
+}
+
 /// [`Actor`] implementation that provides an ergonomic way
 /// to interact with [`Room`].
 impl Actor for Room {
@@ -45,7 +101,12 @@ impl Actor for Room {
 pub trait RpcConnection: fmt::Debug + Send {
     /// Closes [`RpcConnection`].
     /// No [`RpcConnectionClosed`] signals should be emitted.
-    fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
+    fn close(&self) -> Box<dyn Future<Item = (), Error = ()>>;
+
+    fn send_event(
+        &self,
+        event: Event,
+    ) -> Box<dyn Future<Item = (), Error = ()>>;
 }
 
 /// Signal for authorizing new [`RpcConnection`] before establishing.
@@ -110,23 +171,79 @@ impl Handler<RpcConnectionEstablished> for Room {
     fn handle(
         &mut self,
         msg: RpcConnectionEstablished,
-        _: &mut Self::Context,
+        ctx: &mut Self::Context,
     ) -> Self::Result {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
         let mut fut = Either::A(future::ok(()));
+        if let Some(session) = self.sessions.get_mut(&msg.member_id) {
+            debug!(
+                "Replaced RpcConnection for member {} session",
+                msg.member_id
+            );
+            fut = Either::B(session.set_connection(msg.connection));
+        } else {
+            let member_id = msg.member_id;
+            let mut session = Session::new(msg.member_id, msg.connection);
 
-        if let Some(mut old_conn) = self.connections.remove(&msg.member_id) {
-            debug!("Closing old RpcConnection for member {}", msg.member_id);
-            fut = Either::B(old_conn.close());
+            info!("Members in room: {:?}", self.sessions.len());
+            let events = self
+                .sessions
+                .iter_mut()
+                .filter(|&(&m_id, _)| m_id != member_id)
+                .fold(vec![], |mut events, (_, callee)| {
+                    events.push(start_pipeline(&mut session, callee));
+                    events
+                });
+            self.sessions.insert(member_id, session);
+            events.into_iter().for_each(|e| {
+                ctx.notify(MemberEvent {
+                    member_id,
+                    event: e,
+                })
+            })
         }
 
-        self.connections.insert(msg.member_id, msg.connection);
-
         Box::new(wrap_future(fut))
     }
 }
 
+fn start_pipeline(caller: &mut Session, callee: &mut Session) -> Event {
+    info!(
+        "Member {} call member {}",
+        caller.member_id, callee.member_id
+    );
+    let caller_peer_id = next_peer_id();
+    let callee_peer_id = next_peer_id();
+    let mut caller_peer =
+        Peer::new(caller_peer_id, caller.member_id, callee_peer_id);
+    let mut callee_peer =
+        Peer::new(callee_peer_id, callee.member_id, caller_peer_id);
+
+    let track_audio =
+        Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
+    let track_video =
+        Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
+    caller_peer.add_sender(track_audio.clone());
+    caller_peer.add_sender(track_video.clone());
+    callee_peer.add_receiver(track_audio);
+    callee_peer.add_receiver(track_video);
+
+    let event = Event::PeerCreated {
+        peer_id: caller_peer.id(),
+        sdp_offer: None,
+        tracks: caller_peer.tracks(),
+    };
+    let caller_peer = PeerMachine::WaitLocalSDP(caller_peer.start());
+    caller.add_peer(caller_peer);
+
+    let callee_peer = PeerMachine::New(callee_peer);
+    callee.add_peer(callee_peer);
+
+    info!("Send event: {:?}", event);
+    event
+}
+
 /// Signal of existing [`RpcConnection`] of specified [`Member`] being closed.
 #[derive(Debug, Message)]
 pub struct RpcConnectionClosed {
@@ -148,13 +265,32 @@ pub enum RpcConnectionClosedReason {
 impl Handler<RpcConnectionClosed> for Room {
     type Result = ();
 
-    /// Removes [`RpcConnection`] of specified [`Member`] from the [`Room`].
+    /// Removes [`Session`] of specified [`Member`] from the [`Room`].
     fn handle(&mut self, msg: RpcConnectionClosed, _: &mut Self::Context) {
         info!(
             "RpcConnectionClosed for member {}, reason {:?}",
             msg.member_id, msg.reason
         );
-        self.connections.remove(&msg.member_id);
+        self.remove_session(msg.member_id);
+    }
+}
+
+#[derive(Debug, Message)]
+struct MemberEvent {
+    member_id: MemberId,
+    event: Event,
+}
+
+impl Handler<MemberEvent> for Room {
+    type Result = ();
+
+    /// Send [`Event`] to specified [`Member`] from the [`Room`].
+    fn handle(&mut self, msg: MemberEvent, ctx: &mut Self::Context) {
+        let member_id = msg.member_id;
+        info!("Send event {:?} for member {}", msg.event, msg.member_id);
+        if let Some(session) = self.sessions.get(&member_id) {
+            ctx.wait(wrap_future(session.send_event(msg.event)))
+        }
     }
 }
 
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index d3a96d334..7a8cec7a5 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -11,7 +11,7 @@ use crate::{
     api::{
         client::{
             AuthorizeRpcConnection, Id as RoomId, RoomsRepository,
-            RpcConnectionAuthorizationError, WsSession,
+            RpcConnectionAuthorizationError, WsConnection,
         },
         control::Id as MemberId,
     },
@@ -52,7 +52,7 @@ fn ws_index(
             .and_then(move |res| match res {
                 Ok(_) => ws::start(
                     &r.drop_state(),
-                    WsSession::new(info.member_id, room),
+                    WsConnection::new(info.member_id, room),
                 ),
                 Err(MemberNotExists) => Ok(HttpResponse::NotFound().into()),
                 Err(InvalidCredentials) => Ok(HttpResponse::Forbidden().into()),
@@ -96,7 +96,7 @@ mod test {
     use hashbrown::HashMap;
 
     use crate::api::{
-        client::{session, Room},
+        client::{connection, Room},
         control::Member,
     };
 
@@ -108,11 +108,7 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".into()},
             2 => Member{id: 2, credentials: "responder_credentials".into()},
         };
-        let room = Arbiter::start(move |_| Room {
-            id: 1,
-            members,
-            connections: HashMap::new(),
-        });
+        let room = Arbiter::start(move |_| Room::new(1, members));
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
     }
@@ -148,7 +144,9 @@ mod test {
         let (item, read) = server.execute(read.into_future()).unwrap();
         assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.into())));
 
-        thread::sleep(session::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
+        thread::sleep(
+            connection::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)),
+        );
 
         let (item, _) = server.execute(read.into_future()).unwrap();
         assert_eq!(
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 3e0c5cd7a..54f5bd40d 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,227 +1,50 @@
-//! WebSocket session.
-
-use std::time::Duration;
-
-use actix::{
-    fut::wrap_future, Actor, ActorContext, Addr, AsyncContext, Handler,
-    Message, SpawnHandle, StreamHandler,
-};
-use actix_web::ws::{self, CloseReason};
 use futures::Future;
-use serde::{Deserialize, Serialize};
-
-use crate::{
-    api::client::room::{
-        Room, RpcConnection, RpcConnectionClosed, RpcConnectionClosedReason,
-        RpcConnectionEstablished,
-    },
-    api::control::member::Id as MemberId,
-    log::prelude::*,
-};
+use hashbrown::HashMap;
 
-// TODO: via conf
-/// Timeout of receiving any WebSocket messages from client.
-pub const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
+use crate::api::client::{Event, RpcConnection};
+use crate::api::control::member::Id as MemberId;
+use crate::media::peer::{Id as PeerId, PeerMachine};
 
-/// Long-running WebSocket connection of Client API.
 #[derive(Debug)]
-#[allow(clippy::module_name_repetitions)]
-pub struct WsSession {
-    /// ID of [`Member`] that WebSocket connection is associated with.
-    member_id: MemberId,
-    /// [`Room`] that [`Member`] is associated with.
-    room: Addr<Room>,
-
-    /// Handle for watchdog which checks whether WebSocket client became
-    /// idle (no `ping` messages received during [`CLIENT_IDLE_TIMEOUT`]).
-    ///
-    /// This one should be renewed on any received WebSocket message
-    /// from client.
-    idle_handler: Option<SpawnHandle>,
-
-    /// Indicates whether WebSocket connection is closed by server ot by
-    /// client.
-    closed_by_server: bool,
-}
-
-impl WsSession {
-    /// Creates new [`WsSession`] for specified [`Member`].
-    pub fn new(member_id: MemberId, room: Addr<Room>) -> Self {
-        Self {
+pub struct Session {
+    pub member_id: MemberId,
+    pub connection: Box<dyn RpcConnection>,
+    pub peers: HashMap<PeerId, PeerMachine>,
+}
+
+impl Session {
+    pub fn new(
+        member_id: MemberId,
+        connection: Box<dyn RpcConnection>,
+    ) -> Self {
+        Session {
             member_id,
-            room,
-            idle_handler: None,
-            closed_by_server: false,
+            connection,
+            peers: HashMap::new(),
         }
     }
 
-    /// Resets idle handler watchdog.
-    fn reset_idle_timeout(&mut self, ctx: &mut <Self as Actor>::Context) {
-        if let Some(handler) = self.idle_handler {
-            ctx.cancel_future(handler);
-        }
-
-        self.idle_handler =
-            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |sess, ctx| {
-                info!("WsConnection with member {} is idle", sess.member_id);
-
-                let member_id = sess.member_id;
-                ctx.wait(wrap_future(
-                    sess.room
-                        .send(RpcConnectionClosed {
-                            member_id,
-                            reason: RpcConnectionClosedReason::Idle,
-                        })
-                        .map_err(move |err| {
-                            error!(
-                                "WsSession of member {} failed to remove from \
-                                 Room, because: {:?}",
-                                member_id, err,
-                            )
-                        }),
-                ));
-
-                ctx.notify(Close {
-                    reason: Some(ws::CloseCode::Normal.into()),
-                });
-            }));
+    pub fn add_peer(&mut self, peer: PeerMachine) {
+        self.peers.insert(peer.id(), peer);
     }
-}
-
-/// [`Actor`] implementation that provides an ergonomic way to deal with
-/// WebSocket connection lifecycle for [`WsSession`].
-impl Actor for WsSession {
-    type Context = ws::WebsocketContext<Self>;
 
-    /// Starts [`Heartbeat`] mechanism and sends [`RpcConnectionEstablished`]
-    /// signal to the [`Room`].
-    fn started(&mut self, ctx: &mut Self::Context) {
-        debug!("Started WsSession for member {}", self.member_id);
-
-        self.reset_idle_timeout(ctx);
-
-        let member_id = self.member_id;
-        ctx.wait(wrap_future(
-            self.room
-                .send(RpcConnectionEstablished {
-                    member_id: self.member_id,
-                    connection: Box::new(ctx.address()),
-                })
-                .map(|_| ())
-                .map_err(move |err| {
-                    error!(
-                        "WsSession of member {} failed to join Room, \
-                         because: {:?}",
-                        member_id, err,
-                    )
-                }),
-        ));
+    pub fn remove_peer(&mut self, peer_id: PeerId) -> Option<PeerMachine> {
+        self.peers.remove(&peer_id)
     }
 
-    fn stopped(&mut self, _ctx: &mut Self::Context) {
-        debug!("Stopped WsSession for member {}", self.member_id);
+    pub fn send_event(
+        &self,
+        event: Event,
+    ) -> Box<dyn Future<Item = (), Error = ()>> {
+        self.connection.send_event(event)
     }
-}
 
-impl RpcConnection for Addr<WsSession> {
-    /// Closes [`WsSession`] by sending itself "normal closure" close message.
-    fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>> {
-        let fut = self
-            .send(Close {
-                reason: Some(ws::CloseCode::Normal.into()),
-            })
-            .map_err(|_| ());
-        Box::new(fut)
-    }
-}
-
-/// Message for closing [`WsSession`].
-#[derive(Message)]
-pub struct Close {
-    reason: Option<CloseReason>,
-}
-
-impl Handler<Close> for WsSession {
-    type Result = ();
-
-    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
-    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
-        debug!("Closing WsSession for member {}", self.member_id);
-        self.closed_by_server = true;
-        ctx.close(close.reason);
-        ctx.stop();
-    }
-}
-
-/// Message for keeping client WebSocket connection alive.
-#[derive(Debug, Deserialize, Message, Serialize)]
-pub enum Heartbeat {
-    /// `ping` message that WebSocket client is expected to send to the server
-    /// periodically.
-    #[serde(rename = "ping")]
-    Ping(usize),
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
-
-impl Handler<Heartbeat> for WsSession {
-    type Result = ();
-
-    /// Answers with `Heartbeat::Pong` message to WebSocket client in response
-    /// to the received `Heartbeat::Ping` message.
-    fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
-        if let Heartbeat::Ping(n) = msg {
-            trace!("Received ping: {}", n);
-            ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
-        }
-    }
-}
-
-impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
-    /// Handles arbitrary [`ws::Message`] received from WebSocket client.
-    fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
-        debug!(
-            "Received WS message: {:?} from member {}",
-            msg, self.member_id
-        );
-        match msg {
-            ws::Message::Text(text) => {
-                self.reset_idle_timeout(ctx);
-                if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
-                    ctx.notify(msg);
-                }
-            }
-            ws::Message::Close(reason) => {
-                if !self.closed_by_server {
-                    debug!(
-                        "Send close frame with reason {:?} for member {}",
-                        reason, self.member_id
-                    );
-                    let member_id = self.member_id;
-                    ctx.wait(wrap_future(
-                        self.room
-                            .send(RpcConnectionClosed {
-                                member_id: self.member_id,
-                                reason: RpcConnectionClosedReason::Disconnected,
-                            })
-                            .map_err(move |err| {
-                                error!(
-                                    "WsSession of member {} failed to remove \
-                                     from Room, because: {:?}",
-                                    member_id, err,
-                                )
-                            }),
-                    ));
-                    ctx.close(reason);
-                    ctx.stop();
-                }
-            }
-            _ => error!(
-                "Unsupported client message from member {}",
-                self.member_id
-            ),
-        }
+    pub fn set_connection(
+        &mut self,
+        connection: Box<dyn RpcConnection>,
+    ) -> Box<dyn Future<Item = (), Error = ()>> {
+        let fut = self.connection.close();
+        self.connection = connection;
+        fut
     }
 }
diff --git a/src/main.rs b/src/main.rs
index bf356a525..6b25126a2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,10 @@
 //! Medea media server application.
 
+#[macro_use]
+extern crate lazy_static;
+
 use actix::prelude::*;
 use dotenv::dotenv;
-use hashbrown::HashMap;
 
 use crate::api::{
     client::{server, Room, RoomsRepository},
@@ -14,6 +16,7 @@ mod utils;
 
 mod api;
 mod log;
+mod media;
 
 fn main() {
     dotenv().ok();
@@ -24,14 +27,10 @@ fn main() {
     let sys = System::new("medea");
 
     let members = hashmap! {
-        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
-        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
+        1 => Member{id: 1, credentials: "responder_credentials".to_owned()},
+        2 => Member{id: 2, credentials: "caller_credentials".to_owned()},
     };
-    let room = Arbiter::start(move |_| Room {
-        id: 1,
-        members,
-        connections: HashMap::new(),
-    });
+    let room = Arbiter::start(move |_| Room::new(1, members));
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);
 
diff --git a/src/media/mod.rs b/src/media/mod.rs
new file mode 100644
index 000000000..0ca57580e
--- /dev/null
+++ b/src/media/mod.rs
@@ -0,0 +1,9 @@
+pub mod peer;
+pub mod track;
+
+pub use self::{
+    peer::{Id as PeerId, Peer, PeerMachine},
+    track::{
+        AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
+    },
+};
diff --git a/src/media/peer.rs b/src/media/peer.rs
new file mode 100644
index 000000000..309b5cc84
--- /dev/null
+++ b/src/media/peer.rs
@@ -0,0 +1,230 @@
+use std::{any::Any, sync::Arc};
+
+use hashbrown::HashMap;
+
+use crate::{
+    api::client::Event,
+    api::control::member::Id as MemberId,
+    log::prelude::*,
+    media::track::{DirectionalTrack, Id as TrackId, Track, TrackDirection},
+};
+
+#[derive(Debug, Clone, PartialEq)]
+pub struct New {}
+#[derive(Debug, Clone, PartialEq)]
+pub struct WaitLocalSDP {}
+#[derive(Debug, Clone, PartialEq)]
+pub struct WaitLocalHaveRemote {}
+#[derive(Debug, Clone, PartialEq)]
+pub struct WaitRemoteSDP {}
+#[derive(Debug, Clone, PartialEq)]
+pub struct Stable {}
+#[derive(Debug, Clone, PartialEq)]
+pub struct Finished {}
+#[derive(Debug, Clone, PartialEq)]
+pub struct Failure {}
+
+/// Implementation state machine for [`Peer`].
+#[derive(Debug, Clone)]
+pub enum PeerMachine {
+    New(Peer<New>),
+    WaitLocalSDP(Peer<WaitLocalSDP>),
+    WaitLocalHaveRemote(Peer<WaitLocalHaveRemote>),
+    WaitRemoteSDP(Peer<WaitRemoteSDP>),
+    Stable(Peer<Stable>),
+    Finished(Peer<Finished>),
+    Failure(Peer<Failure>),
+}
+
+impl PeerMachine {
+    pub fn member_id(&self) -> MemberId {
+        match self {
+            PeerMachine::New(peer) => peer.member_id(),
+            PeerMachine::WaitLocalSDP(peer) => peer.member_id(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.member_id(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.member_id(),
+            PeerMachine::Stable(peer) => peer.member_id(),
+            PeerMachine::Finished(peer) => peer.member_id(),
+            PeerMachine::Failure(peer) => peer.member_id(),
+        }
+    }
+
+    pub fn id(&self) -> Id {
+        match self {
+            PeerMachine::New(peer) => peer.id(),
+            PeerMachine::WaitLocalSDP(peer) => peer.id(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.id(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.id(),
+            PeerMachine::Stable(peer) => peer.id(),
+            PeerMachine::Finished(peer) => peer.id(),
+            PeerMachine::Failure(peer) => peer.id(),
+        }
+    }
+
+    pub fn opponent_id(&self) -> Id {
+        match self {
+            PeerMachine::New(peer) => peer.opponent_id(),
+            PeerMachine::WaitLocalSDP(peer) => peer.opponent_id(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.opponent_id(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.opponent_id(),
+            PeerMachine::Stable(peer) => peer.opponent_id(),
+            PeerMachine::Finished(peer) => peer.opponent_id(),
+            PeerMachine::Failure(peer) => peer.opponent_id(),
+        }
+    }
+}
+
+/// ID of [`Peer`].
+pub type Id = u64;
+
+#[derive(Debug, Clone)]
+pub struct PeerContext {
+    id: Id,
+    opponent_id: Id,
+    member_id: MemberId,
+    sdp_offer: Option<String>,
+    sdp_answer: Option<String>,
+    receivers: HashMap<TrackId, Arc<Track>>,
+    senders: HashMap<TrackId, Arc<Track>>,
+}
+
+/// [`RTCPeerConnection`] representation.
+#[derive(Debug, Clone)]
+pub struct Peer<S> {
+    context: PeerContext,
+    state: S,
+}
+
+impl<T: Any> Peer<T> {
+    pub fn member_id(&self) -> MemberId {
+        self.context.member_id
+    }
+
+    pub fn id(&self) -> Id {
+        self.context.id
+    }
+
+    pub fn opponent_id(&self) -> Id {
+        self.context.opponent_id
+    }
+
+    pub fn tracks(&self) -> Vec<DirectionalTrack> {
+        let tracks = self.context.senders.iter().fold(
+            vec![],
+            |mut tracks, (id, track)| {
+                tracks.push(DirectionalTrack {
+                    id: track.id,
+                    media_type: track.media_type.clone(),
+                    direction: TrackDirection::Send {
+                        receivers: vec![self.context.opponent_id],
+                    },
+                });
+                tracks
+            },
+        );
+        self.context
+            .receivers
+            .iter()
+            .fold(tracks, |mut tracks, (_, track)| {
+                tracks.push(DirectionalTrack {
+                    id: track.id,
+                    media_type: track.media_type.clone(),
+                    direction: TrackDirection::Recv {
+                        sender: self.context.opponent_id,
+                    },
+                });
+                tracks
+            })
+    }
+}
+
+impl Peer<New> {
+    /// Creates new [`Peer`] for [`Member`].
+    pub fn new(id: Id, member_id: MemberId, opponent_id: Id) -> Self {
+        let context = PeerContext {
+            id,
+            opponent_id,
+            member_id,
+            sdp_offer: None,
+            sdp_answer: None,
+            receivers: HashMap::new(),
+            senders: HashMap::new(),
+        };
+        Peer {
+            context,
+            state: New {},
+        }
+    }
+
+    /// Sends PeerCreated event to Web Client and puts [`Peer`] into state
+    /// of waiting for local offer.
+    pub fn start(self) -> Peer<WaitLocalSDP> {
+        Peer {
+            context: self.context,
+            state: WaitLocalSDP {},
+        }
+    }
+
+    /// Sends PeerCreated event with local offer to Web Client and puts [`Peer`]
+    /// into state of waiting for remote offer.
+    pub fn set_remote_sdp(
+        self,
+        sdp_offer: String,
+    ) -> Peer<WaitLocalHaveRemote> {
+        let mut context = self.context;
+        context.sdp_offer = Some(sdp_offer);
+        Peer {
+            context,
+            state: WaitLocalHaveRemote {},
+        }
+    }
+
+    pub fn add_sender(&mut self, track: Arc<Track>) {
+        self.context.senders.insert(track.id, track);
+    }
+
+    pub fn add_receiver(&mut self, track: Arc<Track>) {
+        self.context.receivers.insert(track.id, track);
+    }
+}
+
+#[test]
+fn create_peer() {
+    let peer = Peer::new(1, 1, 2);
+    let peer = peer.start();
+
+    assert_eq!(peer.state, WaitLocalSDP {});
+}
+
+impl Peer<WaitLocalSDP> {
+    pub fn set_local_sdp(self, sdp_offer: String) -> Peer<WaitRemoteSDP> {
+        let mut context = self.context;
+        context.sdp_offer = Some(sdp_offer);
+        Peer {
+            context,
+            state: WaitRemoteSDP {},
+        }
+    }
+}
+
+impl Peer<WaitRemoteSDP> {
+    pub fn set_remote_sdp(self, sdp_answer: String) -> Peer<Stable> {
+        let mut context = self.context;
+        context.sdp_answer = Some(sdp_answer.clone());
+        Peer {
+            context,
+            state: Stable {},
+        }
+    }
+}
+
+impl Peer<WaitLocalHaveRemote> {
+    pub fn set_local_sdp(self, sdp_answer: String) -> Peer<Stable> {
+        let mut context = self.context;
+        context.sdp_answer = Some(sdp_answer);
+        Peer {
+            context,
+            state: Stable {},
+        }
+    }
+}
diff --git a/src/media/track.rs b/src/media/track.rs
new file mode 100644
index 000000000..44a371ed8
--- /dev/null
+++ b/src/media/track.rs
@@ -0,0 +1,48 @@
+use serde::{Deserialize, Serialize};
+
+use crate::media::peer::Id as PeerID;
+
+/// ID of [`Track`].
+pub type Id = u64;
+
+/// [`MediaStreamTrack`] representation.
+#[derive(Debug)]
+pub struct Track {
+    pub id: Id,
+    pub media_type: TrackMediaType,
+}
+
+impl Track {
+    /// Creates new [`Track`] of the specified type.
+    pub fn new(id: Id, media_type: TrackMediaType) -> Track {
+        Track { id, media_type }
+    }
+}
+
+/// [`Track] with specified direction.
+#[derive(Debug, Deserialize, Serialize)]
+pub struct DirectionalTrack {
+    pub id: Id,
+    pub media_type: TrackMediaType,
+    pub direction: TrackDirection,
+}
+
+/// Direction of [`Track`].
+#[derive(Debug, Deserialize, Serialize)]
+pub enum TrackDirection {
+    Send { receivers: Vec<PeerID> },
+    Recv { sender: PeerID },
+}
+
+/// Type of [`Track`].
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum TrackMediaType {
+    Audio(AudioSettings),
+    Video(VideoSettings),
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct AudioSettings {}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct VideoSettings {}

From 756f293794ef1566cc5562dcb1e74331bc3f5f2b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 20 Mar 2019 15:53:34 +0200
Subject: [PATCH 051/179] Impl handle Command::MakeSdpOffer

---
 src/api/client/commands.rs   |  25 ++++++
 src/api/client/connection.rs |  30 ++++++-
 src/api/client/mod.rs        |   5 +-
 src/api/client/room.rs       | 162 ++++++++++++++++++++++++++++++-----
 src/media/mod.rs             |   2 +-
 src/media/peer.rs            |  73 ++++++++++------
 6 files changed, 242 insertions(+), 55 deletions(-)
 create mode 100644 src/api/client/commands.rs

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
new file mode 100644
index 000000000..36e5ad777
--- /dev/null
+++ b/src/api/client/commands.rs
@@ -0,0 +1,25 @@
+use actix::Message;
+use serde::{Deserialize, Serialize};
+
+use crate::{api::client::RoomError, media::peer::Id as PeerId};
+
+/// WebSocket message from Web Client to Media Server.
+#[derive(Debug, Deserialize, Message, Serialize)]
+#[rtype(result = "Result<(), RoomError>")]
+pub enum Command {
+    /// Web Client sends SDP Offer.
+    MakeSdpOffer {
+        peer_id: PeerId,
+        sdp_offer: String,
+    },
+    /// Web Client sends SDP Answer.
+    MakeSdpAnswer {
+        peer_id: PeerId,
+        sdp_answer: String,
+    },
+
+    SetIceCandidate {
+        peer_id: PeerId,
+        candidate: String,
+    },
+}
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index 068c1be5a..f48d1fac3 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -7,13 +7,14 @@ use actix::{
     Message, SpawnHandle, StreamHandler,
 };
 use actix_web::ws::{self, CloseReason};
-use futures::Future;
+use futures::future::{self, Future};
 use serde::{Deserialize, Serialize};
 
 use crate::{
     api::client::{
-        Event, Room, RpcConnection, RpcConnectionClosed,
-        RpcConnectionClosedReason, RpcConnectionEstablished,
+        Command, Event, MemberCommand, Room, RpcConnection,
+        RpcConnectionClosed, RpcConnectionClosedReason,
+        RpcConnectionEstablished,
     },
     api::control::member::Id as MemberId,
     log::prelude::*,
@@ -211,6 +212,29 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                 if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
                     ctx.notify(msg);
                 }
+                if let Ok(command) = serde_json::from_str::<Command>(&text) {
+                    let member_id = self.member_id;
+                    let command = MemberCommand {
+                        member_id: self.member_id,
+                        command,
+                    };
+                    ctx.wait(wrap_future(
+                        self.room
+                            .send(command)
+                            .and_then(move |res| match res {
+                                Ok(_) => future::ok(()),
+                                Err(err) => {
+                                    error!(
+                                        "Command from member {} handle \
+                                         failed, because: {:?}",
+                                        member_id, err,
+                                    );
+                                    future::ok(())
+                                }
+                            })
+                            .map_err(|_| ()),
+                    ));
+                }
             }
             ws::Message::Close(reason) => {
                 if !self.closed_by_server {
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 63b44794b..0512f3191 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,9 +1,12 @@
 //! Implementation of Client API.
 
+pub mod commands;
 pub mod connection;
 pub mod events;
 pub mod room;
 pub mod server;
 pub mod session;
 
-pub use self::{connection::*, events::*, room::*, server::*, session::*};
+pub use self::{
+    commands::*, connection::*, events::*, room::*, server::*, session::*,
+};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index d1b1db5f7..bebfc4288 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -9,18 +9,19 @@ use actix::{
     fut::wrap_future, Actor, ActorFuture, Addr, AsyncContext, Context, Handler,
     Message,
 };
+use failure::Fail;
 use futures::{
-    future::{self, join_all, Either},
+    future::{self, Either},
     Future,
 };
 use hashbrown::HashMap;
 
 use crate::{
-    api::client::{Event, Session},
+    api::client::{Command, Event, Session},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
     media::{
-        peer::{Id as PeerId, Peer, PeerMachine},
+        peer::{Id as PeerId, Peer, PeerMachine, Transceiver},
         track::{
             AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
         },
@@ -38,6 +39,20 @@ fn next_peer_id() -> PeerId {
     *index
 }
 
+#[derive(Fail, Debug)]
+pub enum RoomError {
+    #[fail(display = "Member without peer {}", _0)]
+    MemberWithoutPeer(MemberId),
+    #[fail(display = "Invalid connection of member {}", _0)]
+    InvalidConnection(MemberId),
+    #[fail(display = "Unknown peer {}", _0)]
+    UnknownPeer(PeerId),
+    #[fail(display = "Peer dont have opponent {}", _0)]
+    NoOpponentPeer(PeerId),
+    #[fail(display = "Unmatched state of peer {}", _0)]
+    UnmatchedState(PeerId),
+}
+
 /// ID of [`Room`].
 pub type Id = u64;
 
@@ -64,31 +79,83 @@ impl Room {
         }
     }
 
-    pub fn session_by_peer(
-        &mut self,
-        peer_id: PeerId,
-    ) -> Option<(&u64, &mut Session)> {
-        self.sessions
-            .iter_mut()
-            .find(|(_, s)| s.peers.contains_key(&peer_id))
-    }
-
     pub fn remove_session(&mut self, member_id: MemberId) {
         if let Some(session) = self.sessions.remove(&member_id) {
             for peer in session.peers.values() {
-                let opponent_peer_id = peer.opponent_id();
-                if let Some((_, opp_session)) =
-                    self.session_by_peer(opponent_peer_id)
+                if let Some(transceiver_session) =
+                    self.sessions.get_mut(&peer.transceiver().member_id)
                 {
                     info!(
                         "Remove peer {:?} of member {:?}",
-                        opponent_peer_id, opp_session.member_id
+                        peer.transceiver().peer_id,
+                        peer.transceiver().member_id
                     );
-                    opp_session.remove_peer(opponent_peer_id);
+                    transceiver_session.remove_peer(peer.transceiver().peer_id);
                 }
             }
         }
     }
+
+    fn handle_make_sdp_offer(
+        &mut self,
+        from_member_id: MemberId,
+        from_peer_id: PeerId,
+        sdp_offer: String,
+    ) -> Result<MemberEvent, RoomError> {
+        let from_session = self
+            .sessions
+            .get_mut(&from_member_id)
+            .ok_or(RoomError::UnknownPeer(from_member_id))?;
+        let from_peer = from_session
+            .remove_peer(from_peer_id)
+            .ok_or(RoomError::UnknownPeer(from_member_id))?;
+        let transceiver = match from_peer {
+            PeerMachine::WaitLocalSDP(peer) => {
+                let from_peer = peer.set_local_sdp(sdp_offer.clone());
+                let trans = from_peer.transceiver();
+                from_session.add_peer(PeerMachine::WaitRemoteSDP(from_peer));
+                Ok(trans)
+            }
+            _ => {
+                let peer_id = from_peer.id();
+                error!("Unmatched state caller peer {}", peer_id);
+                from_session.add_peer(from_peer);
+                Err(RoomError::UnmatchedState(peer_id))
+            }
+        }?;
+
+        let to_session = self
+            .sessions
+            .get_mut(&transceiver.member_id)
+            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+        let to_peer = to_session
+            .remove_peer(transceiver.peer_id)
+            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+
+        let event = match to_peer {
+            PeerMachine::New(peer) => {
+                let to_peer = peer.set_remote_sdp(sdp_offer.clone());
+                let event = MemberEvent {
+                    member_id: transceiver.member_id,
+                    event: Event::PeerCreated {
+                        peer_id: to_peer.id(),
+                        sdp_offer: Some(sdp_offer),
+                        tracks: to_peer.tracks(),
+                    },
+                };
+                to_session.add_peer(PeerMachine::WaitLocalHaveRemote(to_peer));
+                Ok(event)
+            }
+            _ => {
+                let peer_id = to_peer.id();
+                error!("Unmatched state responder peer {}", peer_id);
+                to_session.add_peer(to_peer);
+                Err(RoomError::UnmatchedState(peer_id))
+            }
+        }?;
+
+        Ok(event)
+    }
 }
 
 /// [`Actor`] implementation that provides an ergonomic way
@@ -215,10 +282,22 @@ fn start_pipeline(caller: &mut Session, callee: &mut Session) -> Event {
     );
     let caller_peer_id = next_peer_id();
     let callee_peer_id = next_peer_id();
-    let mut caller_peer =
-        Peer::new(caller_peer_id, caller.member_id, callee_peer_id);
-    let mut callee_peer =
-        Peer::new(callee_peer_id, callee.member_id, caller_peer_id);
+    let mut caller_peer = Peer::new(
+        caller_peer_id,
+        caller.member_id,
+        Transceiver {
+            member_id: callee.member_id,
+            peer_id: callee_peer_id,
+        },
+    );
+    let mut callee_peer = Peer::new(
+        callee_peer_id,
+        callee.member_id,
+        Transceiver {
+            member_id: caller.member_id,
+            peer_id: caller_peer_id,
+        },
+    );
 
     let track_audio =
         Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
@@ -240,10 +319,49 @@ fn start_pipeline(caller: &mut Session, callee: &mut Session) -> Event {
     let callee_peer = PeerMachine::New(callee_peer);
     callee.add_peer(callee_peer);
 
-    info!("Send event: {:?}", event);
     event
 }
 
+#[derive(Debug, Message)]
+#[rtype(result = "Result<(), RoomError>")]
+pub struct MemberCommand {
+    pub member_id: MemberId,
+    pub command: Command,
+}
+
+impl Handler<MemberCommand> for Room {
+    type Result = ActFuture<(), RoomError>;
+
+    /// Receives [`Command`] from Web client and changes state of interconnected
+    /// [`Peer`]s.
+    fn handle(
+        &mut self,
+        msg: MemberCommand,
+        ctx: &mut Self::Context,
+    ) -> Self::Result {
+        debug!("receive command: {:?}", msg);
+        let fut = match msg.command {
+            Command::MakeSdpOffer { peer_id, sdp_offer } => future::done(
+                self.handle_make_sdp_offer(msg.member_id, peer_id, sdp_offer)
+                    .map(|event| ctx.notify(event)),
+            ),
+            _ => future::ok(()), /* Command::MakeSdpAnswer {
+                                  * peer_id,
+                                  * sdp_answer,
+                                  * } => future::done(self.
+                                  * handle_make_sdp_answer(peer_id,
+                                  * sdp_answer)),
+                                  * Command::SetIceCandidate { peer_id,
+                                  * candidate } => {
+                                  * future::done(self.
+                                  * handle_set_ice_candidate(peer_id,
+                                  * candidate))
+                                  * } */
+        };
+        Box::new(wrap_future(fut))
+    }
+}
+
 /// Signal of existing [`RpcConnection`] of specified [`Member`] being closed.
 #[derive(Debug, Message)]
 pub struct RpcConnectionClosed {
diff --git a/src/media/mod.rs b/src/media/mod.rs
index 0ca57580e..ef2a48515 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -2,7 +2,7 @@ pub mod peer;
 pub mod track;
 
 pub use self::{
-    peer::{Id as PeerId, Peer, PeerMachine},
+    peer::{Id as PeerId, Peer, PeerMachine, Transceiver},
     track::{
         AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
     },
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 309b5cc84..b582b9a91 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -3,29 +3,28 @@ use std::{any::Any, sync::Arc};
 use hashbrown::HashMap;
 
 use crate::{
-    api::client::Event,
     api::control::member::Id as MemberId,
     log::prelude::*,
     media::track::{DirectionalTrack, Id as TrackId, Track, TrackDirection},
 };
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct New {}
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct WaitLocalSDP {}
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct WaitLocalHaveRemote {}
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct WaitRemoteSDP {}
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct Stable {}
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct Finished {}
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, PartialEq)]
 pub struct Failure {}
 
 /// Implementation state machine for [`Peer`].
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub enum PeerMachine {
     New(Peer<New>),
     WaitLocalSDP(Peer<WaitLocalSDP>),
@@ -61,26 +60,44 @@ impl PeerMachine {
         }
     }
 
-    pub fn opponent_id(&self) -> Id {
+    pub fn transceiver(&self) -> Transceiver {
+        match self {
+            PeerMachine::New(peer) => peer.transceiver(),
+            PeerMachine::WaitLocalSDP(peer) => peer.transceiver(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.transceiver(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.transceiver(),
+            PeerMachine::Stable(peer) => peer.transceiver(),
+            PeerMachine::Finished(peer) => peer.transceiver(),
+            PeerMachine::Failure(peer) => peer.transceiver(),
+        }
+    }
+
+    pub fn tracks(&self) -> Vec<DirectionalTrack> {
         match self {
-            PeerMachine::New(peer) => peer.opponent_id(),
-            PeerMachine::WaitLocalSDP(peer) => peer.opponent_id(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.opponent_id(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.opponent_id(),
-            PeerMachine::Stable(peer) => peer.opponent_id(),
-            PeerMachine::Finished(peer) => peer.opponent_id(),
-            PeerMachine::Failure(peer) => peer.opponent_id(),
+            PeerMachine::New(peer) => peer.tracks(),
+            PeerMachine::WaitLocalSDP(peer) => peer.tracks(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.tracks(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.tracks(),
+            PeerMachine::Stable(peer) => peer.tracks(),
+            PeerMachine::Finished(peer) => peer.tracks(),
+            PeerMachine::Failure(peer) => peer.tracks(),
         }
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct Transceiver {
+    pub member_id: MemberId,
+    pub peer_id: Id,
+}
+
 /// ID of [`Peer`].
 pub type Id = u64;
 
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct PeerContext {
     id: Id,
-    opponent_id: Id,
+    transceiver: Transceiver,
     member_id: MemberId,
     sdp_offer: Option<String>,
     sdp_answer: Option<String>,
@@ -89,7 +106,7 @@ pub struct PeerContext {
 }
 
 /// [`RTCPeerConnection`] representation.
-#[derive(Debug, Clone)]
+#[derive(Debug)]
 pub struct Peer<S> {
     context: PeerContext,
     state: S,
@@ -104,19 +121,19 @@ impl<T: Any> Peer<T> {
         self.context.id
     }
 
-    pub fn opponent_id(&self) -> Id {
-        self.context.opponent_id
+    pub fn transceiver(&self) -> Transceiver {
+        self.context.transceiver.clone()
     }
 
     pub fn tracks(&self) -> Vec<DirectionalTrack> {
         let tracks = self.context.senders.iter().fold(
             vec![],
-            |mut tracks, (id, track)| {
+            |mut tracks, (_, track)| {
                 tracks.push(DirectionalTrack {
                     id: track.id,
                     media_type: track.media_type.clone(),
                     direction: TrackDirection::Send {
-                        receivers: vec![self.context.opponent_id],
+                        receivers: vec![self.context.transceiver.peer_id],
                     },
                 });
                 tracks
@@ -130,7 +147,7 @@ impl<T: Any> Peer<T> {
                     id: track.id,
                     media_type: track.media_type.clone(),
                     direction: TrackDirection::Recv {
-                        sender: self.context.opponent_id,
+                        sender: self.context.transceiver.peer_id,
                     },
                 });
                 tracks
@@ -140,10 +157,10 @@ impl<T: Any> Peer<T> {
 
 impl Peer<New> {
     /// Creates new [`Peer`] for [`Member`].
-    pub fn new(id: Id, member_id: MemberId, opponent_id: Id) -> Self {
+    pub fn new(id: Id, member_id: MemberId, transceiver: Transceiver) -> Self {
         let context = PeerContext {
             id,
-            opponent_id,
+            transceiver,
             member_id,
             sdp_offer: None,
             sdp_answer: None,
@@ -190,7 +207,7 @@ impl Peer<New> {
 
 #[test]
 fn create_peer() {
-    let peer = Peer::new(1, 1, 2);
+    let peer = Peer::new(1, 1, Transceiver(2, 2));
     let peer = peer.start();
 
     assert_eq!(peer.state, WaitLocalSDP {});

From 90201da7505a83a49877233ceda241fefa6efc93 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 21 Mar 2019 17:24:35 +0200
Subject: [PATCH 052/179] Impl return future by handler Command

---
 signaling_test.html          | 163 ++++++++++++++++++++++
 src/api/client/commands.rs   |   8 +-
 src/api/client/connection.rs |  11 +-
 src/api/client/events.rs     |   5 +-
 src/api/client/room.rs       | 258 ++++++++++++++++++++++++-----------
 src/api/client/session.rs    |   6 +-
 src/main.rs                  |   4 +-
 7 files changed, 363 insertions(+), 92 deletions(-)
 create mode 100644 signaling_test.html

diff --git a/signaling_test.html b/signaling_test.html
new file mode 100644
index 000000000..53d3a2cb1
--- /dev/null
+++ b/signaling_test.html
@@ -0,0 +1,163 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Chat</title>
+    <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
+
+    <script type="text/javascript">
+
+        var socket;
+        var pcs = {};
+
+        function connectSocket(caller) {
+            let role = caller ? "1/caller_credentials" : "2/responder_credentials";
+            socket = new WebSocket("ws://localhost:8080/ws/1/" + role);
+            socket.onmessage = handleSocketMessage;
+
+            window.setInterval(function () {
+                socket.send("{\"ping\":1}");
+            }, 8000);
+        };
+
+        function handleSocketMessage(message) {
+
+            var msg = JSON.parse(message.data);
+
+            if (msg.pong == undefined) {
+                console.log(JSON.stringify(message.data));
+                if (msg.PeerCreated != undefined) {
+                    handlePeerCreated(msg.PeerCreated);
+                }
+
+                if (msg.SdpAnswerMade != undefined) {
+                    handleSdpAnswerMade(msg.SdpAnswerMade);
+                }
+
+                if (msg.IceCandidateDiscovered != undefined) {
+                    handleIceCandidateDiscovered(msg.IceCandidateDiscovered);
+                }
+            }
+        }
+
+        async function handlePeerCreated(msg) {
+            var sendAudio = false;
+            var sendVideo = false;
+            var recvAudio = false;
+            var recvVideo = false;
+
+            msg.tracks.forEach((track) => {
+
+                if (track.media_type.Audio != undefined) {
+                if (track.direction.Send != undefined) {
+                    sendAudio = true;
+                }
+
+                if (track.direction.Recv != undefined) {
+                    recvAudio = true;
+                }
+
+            }
+            if (track.media_type.Video != undefined) {
+                if (track.direction.Send != undefined) {
+                    sendVideo = true;
+                }
+
+                if (track.direction.Recv != undefined) {
+                    recvVideo = true;
+                }
+            }
+        });
+
+            pcs[msg.peer_id] = new RTCPeerConnection();
+
+            var pc = pcs[msg.peer_id];
+
+            if (sendVideo || sendAudio) {
+                let stream = await navigator.mediaDevices.getUserMedia({
+                    audio: sendAudio,
+                    video: sendVideo
+                });
+
+                yourvid.srcObject = stream;
+
+                stream.getTracks().forEach((track) => {
+                    pc.addTrack(track);
+            });
+            }
+
+
+            var mediaConstraints = {
+                'mandatory': {
+                    'OfferToReceiveAudio': recvAudio,
+                    'OfferToReceiveVideo': recvVideo
+                }
+            };
+
+            if (msg.sdp_offer != undefined && msg.sdp_offer != null) {
+                pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_offer)));
+                var answer = await pc.createAnswer(mediaConstraints);
+                pc.setLocalDescription(answer);
+
+                socket.send(JSON.stringify({
+                    MakeSdpAnswer: {
+                        peer_id: msg.peer_id,
+                        sdp_answer: JSON.stringify(answer)
+                    }
+                }));
+            } else {
+                var offer = await pc.createOffer(mediaConstraints);
+                pc.setLocalDescription(offer);
+                socket.send(JSON.stringify({
+                    MakeSdpOffer: {
+                        peer_id: msg.peer_id,
+                        sdp_offer: JSON.stringify(offer)
+                    }
+                }));
+            }
+
+
+            pc.onicecandidate = function (e) {
+
+                if (e.candidate) {
+                    socket.send(JSON.stringify({
+                        SetIceCandidate: {
+                            peer_id: msg.peer_id,
+                            candidate: JSON.stringify(e.candidate)
+                        }
+                    }))
+                }
+
+            };
+
+            pc.ontrack = function (e) {
+                partnervid.srcObject = e.streams[0];
+            };
+
+
+        }
+
+        async function handleSdpAnswerMade(msg) {
+            var pc = pcs[msg.peer_id];
+            pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_answer)))
+        }
+
+        async function handleIceCandidateDiscovered(msg) {
+            var pc = pcs[msg.peer_id];
+            pc.addIceCandidate(JSON.parse(msg.candidate));
+        }
+
+    </script>
+</head>
+<body>
+<div>
+    <div>
+        <div>
+            <video id="yourvid" muted autoplay width="100%" height="100%"></video>
+        </div>
+        <div>
+            <video id="partnervid" autoplay width="100%" height="100%"></video>
+        </div>
+    </div>
+</div>
+</body>
+</html>
diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index 36e5ad777..504f77a58 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -1,7 +1,10 @@
 use actix::Message;
 use serde::{Deserialize, Serialize};
 
-use crate::{api::client::RoomError, media::peer::Id as PeerId};
+use crate::{
+    api::client::RoomError, api::control::Id as MemberId,
+    media::peer::Id as PeerId,
+};
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Message, Serialize)]
@@ -9,16 +12,19 @@ use crate::{api::client::RoomError, media::peer::Id as PeerId};
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer {
+        member_id: MemberId,
         peer_id: PeerId,
         sdp_offer: String,
     },
     /// Web Client sends SDP Answer.
     MakeSdpAnswer {
+        member_id: MemberId,
         peer_id: PeerId,
         sdp_answer: String,
     },
 
     SetIceCandidate {
+        member_id: MemberId,
         peer_id: PeerId,
         candidate: String,
     },
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index f48d1fac3..81c232fa4 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -12,9 +12,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     api::client::{
-        Command, Event, MemberCommand, Room, RpcConnection,
-        RpcConnectionClosed, RpcConnectionClosedReason,
-        RpcConnectionEstablished,
+        Command, Event, Room, RpcConnection, RpcConnectionClosed,
+        RpcConnectionClosedReason, RpcConnectionEstablished,
     },
     api::control::member::Id as MemberId,
     log::prelude::*,
@@ -214,10 +213,6 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
                     let member_id = self.member_id;
-                    let command = MemberCommand {
-                        member_id: self.member_id,
-                        command,
-                    };
                     ctx.wait(wrap_future(
                         self.room
                             .send(command)
@@ -258,7 +253,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                             }),
                     ));
                     ctx.close(reason);
-                    ctx.stop();
+                    // ctx.stop();
                 }
             }
             _ => error!(
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
index 377fcc7c8..11228f450 100644
--- a/src/api/client/events.rs
+++ b/src/api/client/events.rs
@@ -1,7 +1,10 @@
 use actix::Message;
 use serde::{Deserialize, Serialize};
 
-use crate::media::{peer::Id as PeerId, track::DirectionalTrack};
+use crate::{
+    api::control::member::Id as MemberId,
+    media::{peer::Id as PeerId, track::DirectionalTrack},
+};
 
 /// WebSocket message from Media Server to Web Client.
 #[derive(Debug, Deserialize, Message, Serialize)]
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index bebfc4288..99fde54af 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -11,7 +11,7 @@ use actix::{
 };
 use failure::Fail;
 use futures::{
-    future::{self, Either},
+    future::{self, join_all, Either},
     Future,
 };
 use hashbrown::HashMap;
@@ -27,6 +27,7 @@ use crate::{
         },
     },
 };
+use slog::Error;
 
 lazy_static! {
     static ref PEER_INDEX: Mutex<u64> = Mutex::new(0);
@@ -51,6 +52,8 @@ pub enum RoomError {
     NoOpponentPeer(PeerId),
     #[fail(display = "Unmatched state of peer {}", _0)]
     UnmatchedState(PeerId),
+    #[fail(display = "Cannot send event to member {}", _0)]
+    FailedSendEvent(MemberId),
 }
 
 /// ID of [`Room`].
@@ -90,7 +93,8 @@ impl Room {
                         peer.transceiver().peer_id,
                         peer.transceiver().member_id
                     );
-                    transceiver_session.remove_peer(peer.transceiver().peer_id);
+                    transceiver_session
+                        .remove_peer(&peer.transceiver().peer_id);
                 }
             }
         }
@@ -101,14 +105,14 @@ impl Room {
         from_member_id: MemberId,
         from_peer_id: PeerId,
         sdp_offer: String,
-    ) -> Result<MemberEvent, RoomError> {
+    ) -> Result<(MemberId, Event), RoomError> {
         let from_session = self
             .sessions
             .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownPeer(from_member_id))?;
+            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
         let from_peer = from_session
-            .remove_peer(from_peer_id)
-            .ok_or(RoomError::UnknownPeer(from_member_id))?;
+            .remove_peer(&from_peer_id)
+            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
         let transceiver = match from_peer {
             PeerMachine::WaitLocalSDP(peer) => {
                 let from_peer = peer.set_local_sdp(sdp_offer.clone());
@@ -129,19 +133,16 @@ impl Room {
             .get_mut(&transceiver.member_id)
             .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
         let to_peer = to_session
-            .remove_peer(transceiver.peer_id)
+            .remove_peer(&transceiver.peer_id)
             .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
 
         let event = match to_peer {
             PeerMachine::New(peer) => {
                 let to_peer = peer.set_remote_sdp(sdp_offer.clone());
-                let event = MemberEvent {
-                    member_id: transceiver.member_id,
-                    event: Event::PeerCreated {
-                        peer_id: to_peer.id(),
-                        sdp_offer: Some(sdp_offer),
-                        tracks: to_peer.tracks(),
-                    },
+                let event = Event::PeerCreated {
+                    peer_id: to_peer.id(),
+                    sdp_offer: Some(sdp_offer),
+                    tracks: to_peer.tracks(),
                 };
                 to_session.add_peer(PeerMachine::WaitLocalHaveRemote(to_peer));
                 Ok(event)
@@ -154,7 +155,120 @@ impl Room {
             }
         }?;
 
-        Ok(event)
+        Ok((to_session.member_id, event))
+    }
+
+    fn handle_make_sdp_answer(
+        &mut self,
+        from_member_id: MemberId,
+        from_peer_id: PeerId,
+        sdp_answer: String,
+    ) -> Result<(MemberId, Event), RoomError> {
+        let from_session = self
+            .sessions
+            .get_mut(&from_member_id)
+            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+        let from_peer = from_session
+            .remove_peer(&from_peer_id)
+            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+        let transceiver = match from_peer {
+            PeerMachine::WaitLocalHaveRemote(peer) => {
+                let from_peer = peer.set_local_sdp(sdp_answer.clone());
+                let trans = from_peer.transceiver();
+                from_session.add_peer(PeerMachine::Stable(from_peer));
+                Ok(trans)
+            }
+            _ => {
+                let peer_id = from_peer.id();
+                error!("Unmatched state caller peer {}", peer_id);
+                from_session.add_peer(from_peer);
+                Err(RoomError::UnmatchedState(peer_id))
+            }
+        }?;
+
+        let to_session = self
+            .sessions
+            .get_mut(&transceiver.member_id)
+            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+        let to_peer = to_session
+            .remove_peer(&transceiver.peer_id)
+            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+
+        let event = match to_peer {
+            PeerMachine::WaitRemoteSDP(peer) => {
+                let to_peer = peer.set_remote_sdp(sdp_answer.clone());
+                let event = Event::PeerCreated {
+                    peer_id: to_peer.id(),
+                    sdp_offer: Some(sdp_answer),
+                    tracks: to_peer.tracks(),
+                };
+                to_session.add_peer(PeerMachine::Stable(to_peer));
+                Ok(event)
+            }
+            _ => {
+                let peer_id = to_peer.id();
+                error!("Unmatched state responder peer {}", peer_id);
+                to_session.add_peer(to_peer);
+                Err(RoomError::UnmatchedState(peer_id))
+            }
+        }?;
+
+        Ok((to_session.member_id, event))
+    }
+
+    fn handle_set_ice_candidate(
+        &mut self,
+        from_member_id: MemberId,
+        from_peer_id: PeerId,
+        candidate: String,
+    ) -> Result<(MemberId, Event), RoomError> {
+        let from_session = self
+            .sessions
+            .get_mut(&from_member_id)
+            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+        let from_peer = from_session
+            .remove_peer(&from_peer_id)
+            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+        let transceiver = match from_peer {
+            PeerMachine::WaitLocalSDP(_)
+            | PeerMachine::WaitLocalHaveRemote(_)
+            | PeerMachine::WaitRemoteSDP(_)
+            | PeerMachine::Stable(_) => Ok(from_peer.transceiver()),
+            _ => Err(RoomError::UnmatchedState(from_peer_id)),
+        }?;
+        let to_session = self
+            .sessions
+            .get_mut(&transceiver.member_id)
+            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+        let to_peer = to_session
+            .remove_peer(&transceiver.peer_id)
+            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+
+        let event = Event::IceCandidateDiscovered {
+            peer_id: to_peer.id(),
+            candidate,
+        };
+
+        Ok((to_session.member_id, event))
+    }
+
+    fn send_event(
+        &self,
+        member_id: MemberId,
+        event: Event,
+    ) -> Box<dyn Future<Item = (), Error = RoomError>> {
+        info!("Send event {:?} to member {}", event, member_id);
+        let fut = match self.sessions.get(&member_id) {
+            Some(session) => Either::A(
+                session
+                    .send_event(event)
+                    .map_err(move |_| RoomError::FailedSendEvent(member_id)),
+            ),
+            None => {
+                Either::B(future::err(RoomError::FailedSendEvent(member_id)))
+            }
+        };
+        Box::new(fut)
     }
 }
 
@@ -242,33 +356,28 @@ impl Handler<RpcConnectionEstablished> for Room {
     ) -> Self::Result {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
-        let mut fut = Either::A(future::ok(()));
+        let mut fut;
         if let Some(session) = self.sessions.get_mut(&msg.member_id) {
             debug!(
                 "Replaced RpcConnection for member {} session",
                 msg.member_id
             );
-            fut = Either::B(session.set_connection(msg.connection));
+            fut = Either::A(session.set_connection(msg.connection));
         } else {
             let member_id = msg.member_id;
             let mut session = Session::new(msg.member_id, msg.connection);
 
             info!("Members in room: {:?}", self.sessions.len());
-            let events = self
-                .sessions
-                .iter_mut()
-                .filter(|&(&m_id, _)| m_id != member_id)
-                .fold(vec![], |mut events, (_, callee)| {
-                    events.push(start_pipeline(&mut session, callee));
-                    events
-                });
+            let futures = self.sessions.iter_mut().fold(
+                vec![],
+                |mut futures, (_, caller)| {
+                    let event = start_pipeline(caller, &mut session);
+                    futures.push(caller.send_event(event));
+                    futures
+                },
+            );
             self.sessions.insert(member_id, session);
-            events.into_iter().for_each(|e| {
-                ctx.notify(MemberEvent {
-                    member_id,
-                    event: e,
-                })
-            })
+            fut = Either::B(join_all(futures).map(|_| ()));
         }
 
         Box::new(wrap_future(fut))
@@ -322,41 +431,55 @@ fn start_pipeline(caller: &mut Session, callee: &mut Session) -> Event {
     event
 }
 
-#[derive(Debug, Message)]
-#[rtype(result = "Result<(), RoomError>")]
-pub struct MemberCommand {
-    pub member_id: MemberId,
-    pub command: Command,
-}
-
-impl Handler<MemberCommand> for Room {
+impl Handler<Command> for Room {
     type Result = ActFuture<(), RoomError>;
 
     /// Receives [`Command`] from Web client and changes state of interconnected
     /// [`Peer`]s.
     fn handle(
         &mut self,
-        msg: MemberCommand,
+        command: Command,
         ctx: &mut Self::Context,
     ) -> Self::Result {
-        debug!("receive command: {:?}", msg);
-        let fut = match msg.command {
-            Command::MakeSdpOffer { peer_id, sdp_offer } => future::done(
-                self.handle_make_sdp_offer(msg.member_id, peer_id, sdp_offer)
-                    .map(|event| ctx.notify(event)),
-            ),
-            _ => future::ok(()), /* Command::MakeSdpAnswer {
-                                  * peer_id,
-                                  * sdp_answer,
-                                  * } => future::done(self.
-                                  * handle_make_sdp_answer(peer_id,
-                                  * sdp_answer)),
-                                  * Command::SetIceCandidate { peer_id,
-                                  * candidate } => {
-                                  * future::done(self.
-                                  * handle_set_ice_candidate(peer_id,
-                                  * candidate))
-                                  * } */
+        debug!("receive command: {:?}", command);
+        let fut = match command {
+            Command::MakeSdpOffer {
+                member_id,
+                peer_id,
+                sdp_offer,
+            } => {
+                match self.handle_make_sdp_offer(member_id, peer_id, sdp_offer)
+                {
+                    Ok((member_id, event)) => {
+                        Either::A(self.send_event(member_id, event))
+                    }
+                    Err(e) => Either::B(future::err(e)),
+                }
+            }
+            Command::MakeSdpAnswer {
+                member_id,
+                peer_id,
+                sdp_answer,
+            } => match self
+                .handle_make_sdp_answer(member_id, peer_id, sdp_answer)
+            {
+                Ok((member_id, event)) => {
+                    Either::A(self.send_event(member_id, event))
+                }
+                Err(e) => Either::B(future::err(e)),
+            },
+            Command::SetIceCandidate {
+                member_id,
+                peer_id,
+                candidate,
+            } => match self
+                .handle_set_ice_candidate(member_id, peer_id, candidate)
+            {
+                Ok((member_id, event)) => {
+                    Either::A(self.send_event(member_id, event))
+                }
+                Err(e) => Either::B(future::err(e)),
+            },
         };
         Box::new(wrap_future(fut))
     }
@@ -393,25 +516,6 @@ impl Handler<RpcConnectionClosed> for Room {
     }
 }
 
-#[derive(Debug, Message)]
-struct MemberEvent {
-    member_id: MemberId,
-    event: Event,
-}
-
-impl Handler<MemberEvent> for Room {
-    type Result = ();
-
-    /// Send [`Event`] to specified [`Member`] from the [`Room`].
-    fn handle(&mut self, msg: MemberEvent, ctx: &mut Self::Context) {
-        let member_id = msg.member_id;
-        info!("Send event {:?} for member {}", msg.event, msg.member_id);
-        if let Some(session) = self.sessions.get(&member_id) {
-            ctx.wait(wrap_future(session.send_event(msg.event)))
-        }
-    }
-}
-
 /// Repository that stores [`Room`]s.
 #[derive(Clone, Default)]
 pub struct RoomsRepository {
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 54f5bd40d..bcbe76a36 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -8,7 +8,7 @@ use crate::media::peer::{Id as PeerId, PeerMachine};
 #[derive(Debug)]
 pub struct Session {
     pub member_id: MemberId,
-    pub connection: Box<dyn RpcConnection>,
+    connection: Box<dyn RpcConnection>,
     pub peers: HashMap<PeerId, PeerMachine>,
 }
 
@@ -28,8 +28,8 @@ impl Session {
         self.peers.insert(peer.id(), peer);
     }
 
-    pub fn remove_peer(&mut self, peer_id: PeerId) -> Option<PeerMachine> {
-        self.peers.remove(&peer_id)
+    pub fn remove_peer(&mut self, peer_id: &PeerId) -> Option<PeerMachine> {
+        self.peers.remove(peer_id)
     }
 
     pub fn send_event(
diff --git a/src/main.rs b/src/main.rs
index 6b25126a2..3721dc175 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,8 +27,8 @@ fn main() {
     let sys = System::new("medea");
 
     let members = hashmap! {
-        1 => Member{id: 1, credentials: "responder_credentials".to_owned()},
-        2 => Member{id: 2, credentials: "caller_credentials".to_owned()},
+        1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
+        2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
     let room = Arbiter::start(move |_| Room::new(1, members));
     let rooms = hashmap! {1 => room};

From bda5ba2b5b8b02e3d807549885c4768d31bf8247 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 22 Mar 2019 14:46:06 +0200
Subject: [PATCH 053/179] Fix errors

---
 signaling_test.html          | 40 +++++++++++++++++++++---------------
 src/api/client/connection.rs | 22 ++++++++++----------
 src/api/client/room.rs       | 38 ++++++++++++++--------------------
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/signaling_test.html b/signaling_test.html
index 53d3a2cb1..18a0e2660 100644
--- a/signaling_test.html
+++ b/signaling_test.html
@@ -6,12 +6,14 @@
 
     <script type="text/javascript">
 
+        var member_id;
         var socket;
         var pcs = {};
 
         function connectSocket(caller) {
-            let role = caller ? "1/caller_credentials" : "2/responder_credentials";
-            socket = new WebSocket("ws://localhost:8080/ws/1/" + role);
+            let role = caller ? "/caller_credentials" : "/responder_credentials";
+            member_id = caller ? 1 : 2;
+            socket = new WebSocket("ws://localhost:8080/ws/1/" + member_id + role);
             socket.onmessage = handleSocketMessage;
 
             window.setInterval(function () {
@@ -36,6 +38,8 @@
                 if (msg.IceCandidateDiscovered != undefined) {
                     handleIceCandidateDiscovered(msg.IceCandidateDiscovered);
                 }
+            } else {
+                console.log(JSON.stringify(message.data));
             }
         }
 
@@ -48,25 +52,25 @@
             msg.tracks.forEach((track) => {
 
                 if (track.media_type.Audio != undefined) {
-                if (track.direction.Send != undefined) {
-                    sendAudio = true;
-                }
+                    if (track.direction.Send != undefined) {
+                        sendAudio = true;
+                    }
 
-                if (track.direction.Recv != undefined) {
-                    recvAudio = true;
-                }
+                    if (track.direction.Recv != undefined) {
+                        recvAudio = true;
+                    }
 
-            }
-            if (track.media_type.Video != undefined) {
-                if (track.direction.Send != undefined) {
-                    sendVideo = true;
                 }
+                if (track.media_type.Video != undefined) {
+                    if (track.direction.Send != undefined) {
+                        sendVideo = true;
+                    }
 
-                if (track.direction.Recv != undefined) {
-                    recvVideo = true;
+                    if (track.direction.Recv != undefined) {
+                        recvVideo = true;
+                    }
                 }
-            }
-        });
+            });
 
             pcs[msg.peer_id] = new RTCPeerConnection();
 
@@ -97,9 +101,11 @@
                 pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_offer)));
                 var answer = await pc.createAnswer(mediaConstraints);
                 pc.setLocalDescription(answer);
+                console.log(JSON.stringify(answer))
 
                 socket.send(JSON.stringify({
                     MakeSdpAnswer: {
+                        member_id: member_id,
                         peer_id: msg.peer_id,
                         sdp_answer: JSON.stringify(answer)
                     }
@@ -109,6 +115,7 @@
                 pc.setLocalDescription(offer);
                 socket.send(JSON.stringify({
                     MakeSdpOffer: {
+                        member_id: member_id,
                         peer_id: msg.peer_id,
                         sdp_offer: JSON.stringify(offer)
                     }
@@ -121,6 +128,7 @@
                 if (e.candidate) {
                     socket.send(JSON.stringify({
                         SetIceCandidate: {
+                            member_id: member_id,
                             peer_id: msg.peer_id,
                             candidate: JSON.stringify(e.candidate)
                         }
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index 81c232fa4..3fee02327 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -192,7 +192,7 @@ impl Handler<Heartbeat> for WsConnection {
     /// to the received `Heartbeat::Ping` message.
     fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
         if let Heartbeat::Ping(n) = msg {
-            trace!("Received ping: {}", n);
+            debug!("Received ping: {}", n);
             ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
         }
     }
@@ -207,25 +207,25 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
         );
         match msg {
             ws::Message::Text(text) => {
-                self.reset_idle_timeout(ctx);
-                if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
-                    ctx.notify(msg);
+                if let Ok(ping) = serde_json::from_str::<Heartbeat>(&text) {
+                    self.reset_idle_timeout(ctx);
+                    debug!("{:?}", ping);
+                    ctx.notify(ping);
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
                     let member_id = self.member_id;
                     ctx.wait(wrap_future(
                         self.room
                             .send(command)
-                            .and_then(move |res| match res {
-                                Ok(_) => future::ok(()),
-                                Err(err) => {
-                                    error!(
+                            .map(move |res| {
+                                match res {
+                                    Ok(_) => info!("Command send successful"),
+                                    Err(err) => error!(
                                         "Command from member {} handle \
                                          failed, because: {:?}",
                                         member_id, err,
-                                    );
-                                    future::ok(())
-                                }
+                                    ),
+                                };
                             })
                             .map_err(|_| ()),
                     ));
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 99fde54af..a5fa20b0b 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -44,8 +44,8 @@ fn next_peer_id() -> PeerId {
 pub enum RoomError {
     #[fail(display = "Member without peer {}", _0)]
     MemberWithoutPeer(MemberId),
-    #[fail(display = "Invalid connection of member {}", _0)]
-    InvalidConnection(MemberId),
+    #[fail(display = "Unknown member {}", _0)]
+    UnknownMember(MemberId),
     #[fail(display = "Unknown peer {}", _0)]
     UnknownPeer(PeerId),
     #[fail(display = "Peer dont have opponent {}", _0)]
@@ -109,7 +109,7 @@ impl Room {
         let from_session = self
             .sessions
             .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+            .ok_or(RoomError::UnknownMember(from_member_id))?;
         let from_peer = from_session
             .remove_peer(&from_peer_id)
             .ok_or(RoomError::UnknownPeer(from_peer_id))?;
@@ -122,7 +122,6 @@ impl Room {
             }
             _ => {
                 let peer_id = from_peer.id();
-                error!("Unmatched state caller peer {}", peer_id);
                 from_session.add_peer(from_peer);
                 Err(RoomError::UnmatchedState(peer_id))
             }
@@ -131,7 +130,7 @@ impl Room {
         let to_session = self
             .sessions
             .get_mut(&transceiver.member_id)
-            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+            .ok_or(RoomError::UnknownMember(transceiver.member_id))?;
         let to_peer = to_session
             .remove_peer(&transceiver.peer_id)
             .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
@@ -149,12 +148,10 @@ impl Room {
             }
             _ => {
                 let peer_id = to_peer.id();
-                error!("Unmatched state responder peer {}", peer_id);
                 to_session.add_peer(to_peer);
                 Err(RoomError::UnmatchedState(peer_id))
             }
         }?;
-
         Ok((to_session.member_id, event))
     }
 
@@ -167,7 +164,7 @@ impl Room {
         let from_session = self
             .sessions
             .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+            .ok_or(RoomError::UnknownMember(from_member_id))?;
         let from_peer = from_session
             .remove_peer(&from_peer_id)
             .ok_or(RoomError::UnknownPeer(from_peer_id))?;
@@ -180,7 +177,6 @@ impl Room {
             }
             _ => {
                 let peer_id = from_peer.id();
-                error!("Unmatched state caller peer {}", peer_id);
                 from_session.add_peer(from_peer);
                 Err(RoomError::UnmatchedState(peer_id))
             }
@@ -189,7 +185,7 @@ impl Room {
         let to_session = self
             .sessions
             .get_mut(&transceiver.member_id)
-            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+            .ok_or(RoomError::UnknownMember(transceiver.member_id))?;
         let to_peer = to_session
             .remove_peer(&transceiver.peer_id)
             .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
@@ -197,22 +193,19 @@ impl Room {
         let event = match to_peer {
             PeerMachine::WaitRemoteSDP(peer) => {
                 let to_peer = peer.set_remote_sdp(sdp_answer.clone());
-                let event = Event::PeerCreated {
+                let event = Event::SdpAnswerMade {
                     peer_id: to_peer.id(),
-                    sdp_offer: Some(sdp_answer),
-                    tracks: to_peer.tracks(),
+                    sdp_answer,
                 };
                 to_session.add_peer(PeerMachine::Stable(to_peer));
                 Ok(event)
             }
             _ => {
                 let peer_id = to_peer.id();
-                error!("Unmatched state responder peer {}", peer_id);
                 to_session.add_peer(to_peer);
                 Err(RoomError::UnmatchedState(peer_id))
             }
         }?;
-
         Ok((to_session.member_id, event))
     }
 
@@ -225,9 +218,10 @@ impl Room {
         let from_session = self
             .sessions
             .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
+            .ok_or(RoomError::UnknownMember(from_member_id))?;
         let from_peer = from_session
-            .remove_peer(&from_peer_id)
+            .peers
+            .get(&from_peer_id)
             .ok_or(RoomError::UnknownPeer(from_peer_id))?;
         let transceiver = match from_peer {
             PeerMachine::WaitLocalSDP(_)
@@ -239,16 +233,16 @@ impl Room {
         let to_session = self
             .sessions
             .get_mut(&transceiver.member_id)
-            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
+            .ok_or(RoomError::UnknownMember(transceiver.member_id))?;
         let to_peer = to_session
-            .remove_peer(&transceiver.peer_id)
+            .peers
+            .get(&transceiver.peer_id)
             .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
 
         let event = Event::IceCandidateDiscovered {
             peer_id: to_peer.id(),
             candidate,
         };
-
         Ok((to_session.member_id, event))
     }
 
@@ -265,7 +259,7 @@ impl Room {
                     .map_err(move |_| RoomError::FailedSendEvent(member_id)),
             ),
             None => {
-                Either::B(future::err(RoomError::FailedSendEvent(member_id)))
+                Either::B(future::err(RoomError::UnknownMember(member_id)))
             }
         };
         Box::new(fut)
@@ -367,7 +361,6 @@ impl Handler<RpcConnectionEstablished> for Room {
             let member_id = msg.member_id;
             let mut session = Session::new(msg.member_id, msg.connection);
 
-            info!("Members in room: {:?}", self.sessions.len());
             let futures = self.sessions.iter_mut().fold(
                 vec![],
                 |mut futures, (_, caller)| {
@@ -441,7 +434,6 @@ impl Handler<Command> for Room {
         command: Command,
         ctx: &mut Self::Context,
     ) -> Self::Result {
-        debug!("receive command: {:?}", command);
         let fut = match command {
             Command::MakeSdpOffer {
                 member_id,

From 0b454ca1fb31c848d0238335bc0bf50611dad289 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 22 Mar 2019 16:41:55 +0200
Subject: [PATCH 054/179] Add docs

---
 Cargo.lock                | 98 +++++++++++++++++++++++++++++++++++++++
 Cargo.toml                |  2 +
 src/api/client/server.rs  | 33 +++++++++----
 src/api/client/session.rs | 27 ++++++-----
 src/main.rs               | 15 +++---
 src/settings/mod.rs       |  6 ++-
 src/settings/server.rs    | 10 ++--
 7 files changed, 155 insertions(+), 36 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a41f54a68..a2901580a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -263,6 +263,21 @@ dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "config"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cookie"
 version = "0.11.0"
@@ -611,6 +626,11 @@ name = "language-tags"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lazy_static"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "lazy_static"
 version = "1.2.0"
@@ -626,6 +646,15 @@ name = "libc"
 version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "linked-hash-map"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.4.2"
@@ -676,11 +705,15 @@ dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -688,6 +721,7 @@ dependencies = [
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -829,6 +863,14 @@ dependencies = [
  "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "num-traits"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.6"
@@ -1099,6 +1141,11 @@ dependencies = [
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rust-ini"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.13"
@@ -1140,6 +1187,11 @@ name = "semver-parser"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "serde"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "serde"
 version = "1.0.84"
@@ -1148,6 +1200,18 @@ dependencies = [
  "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde-hjson"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.87"
@@ -1168,6 +1232,14 @@ dependencies = [
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_test"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.5.4"
@@ -1548,6 +1620,14 @@ dependencies = [
  "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "toml"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.1.0"
@@ -1800,6 +1880,14 @@ dependencies = [
  "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "yaml-rust"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
@@ -1825,6 +1913,7 @@ dependencies = [
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
 "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
 "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
 "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
@@ -1865,9 +1954,11 @@ dependencies = [
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
 "checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
@@ -1889,6 +1980,7 @@ dependencies = [
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
@@ -1920,6 +2012,7 @@ dependencies = [
 "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
+"checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
@@ -1927,9 +2020,12 @@ dependencies = [
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
 "checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
@@ -1967,6 +2063,7 @@ dependencies = [
 "checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
+"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 "checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
@@ -1997,3 +2094,4 @@ dependencies = [
 "checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
 "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
+"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
diff --git a/Cargo.toml b/Cargo.toml
index 71721c67b..10e6c6e94 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,9 @@ failure = "0.1"
 futures = "0.1"
 hashbrown = "0.1"
 lazy_static = "1.2"
+regex = "1.1"
 serde = { version = "1.0", features = ["derive"] }
+serde_derive = "1.0"
 serde_json = "1.0"
 slog = "2.4"
 slog-envlogger = "2.1"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index d3a96d334..1de4aad95 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -16,6 +16,7 @@ use crate::{
         control::Id as MemberId,
     },
     log::prelude::*,
+    settings::server::Server,
 };
 
 /// Parameters of new WebSocket connection creation HTTP request.
@@ -52,7 +53,11 @@ fn ws_index(
             .and_then(move |res| match res {
                 Ok(_) => ws::start(
                     &r.drop_state(),
-                    WsSession::new(info.member_id, room),
+                    WsSession::new(
+                        info.member_id,
+                        room,
+                        state.config.client_idle_timeout,
+                    ),
                 ),
                 Err(MemberNotExists) => Ok(HttpResponse::NotFound().into()),
                 Err(InvalidCredentials) => Ok(HttpResponse::Forbidden().into()),
@@ -66,13 +71,17 @@ fn ws_index(
 pub struct Context {
     /// Repository of all currently existing [`Room`]s in application.
     pub rooms: RoomsRepository,
+
+    /// Settings of application.
+    pub config: Server,
 }
 
 /// Starts HTTP server for handling WebSocket connections of Client API.
-pub fn run(rooms: RoomsRepository) {
+pub fn run(rooms: RoomsRepository, config: Server) {
     server::new(move || {
         App::with_state(Context {
             rooms: rooms.clone(),
+            config: config.clone(),
         })
         .middleware(middleware::Logger::default())
         .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
@@ -95,9 +104,12 @@ mod test {
     use futures::Stream;
     use hashbrown::HashMap;
 
-    use crate::api::{
-        client::{session, Room},
-        control::Member,
+    use crate::{
+        api::{
+            client::{session, Room},
+            control::Member,
+        },
+        settings::Settings,
     };
 
     use super::*;
@@ -120,10 +132,13 @@ mod test {
     /// Creates test WebSocket server of Client API which can handle requests.
     fn ws_server() -> test::TestServer {
         test::TestServer::with_factory(move || {
-            App::with_state(Context { rooms: room() })
-                .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
-                    r.method(http::Method::GET).with(ws_index)
-                })
+            App::with_state(Context {
+                rooms: room(),
+                config: Settings::new().unwrap().server,
+            })
+            .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
+                r.method(http::Method::GET).with(ws_index)
+            })
         })
     }
 
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 3e0c5cd7a..a25a4aa0a 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -19,10 +19,6 @@ use crate::{
     log::prelude::*,
 };
 
-// TODO: via conf
-/// Timeout of receiving any WebSocket messages from client.
-pub const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
-
 /// Long-running WebSocket connection of Client API.
 #[derive(Debug)]
 #[allow(clippy::module_name_repetitions)]
@@ -33,12 +29,15 @@ pub struct WsSession {
     room: Addr<Room>,
 
     /// Handle for watchdog which checks whether WebSocket client became
-    /// idle (no `ping` messages received during [`CLIENT_IDLE_TIMEOUT`]).
+    /// idle (no `ping` messages received during [`idle_timeout`]).
     ///
-    /// This one should be renewed on any received WebSocket message
+    /// This one should be renewed on received ping WebSocket message
     /// from client.
     idle_handler: Option<SpawnHandle>,
 
+    /// Timeout of receiving ping messages from client.
+    idle_timeout: Duration,
+
     /// Indicates whether WebSocket connection is closed by server ot by
     /// client.
     closed_by_server: bool,
@@ -46,11 +45,16 @@ pub struct WsSession {
 
 impl WsSession {
     /// Creates new [`WsSession`] for specified [`Member`].
-    pub fn new(member_id: MemberId, room: Addr<Room>) -> Self {
+    pub fn new(
+        member_id: MemberId,
+        room: Addr<Room>,
+        idle_timeout: Duration,
+    ) -> Self {
         Self {
             member_id,
             room,
             idle_handler: None,
+            idle_timeout,
             closed_by_server: false,
         }
     }
@@ -62,7 +66,7 @@ impl WsSession {
         }
 
         self.idle_handler =
-            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |sess, ctx| {
+            Some(ctx.run_later(self.idle_timeout, |sess, ctx| {
                 info!("WsConnection with member {} is idle", sess.member_id);
 
                 let member_id = sess.member_id;
@@ -110,8 +114,8 @@ impl Actor for WsSession {
                 .map(|_| ())
                 .map_err(move |err| {
                     error!(
-                        "WsSession of member {} failed to join Room, \
-                         because: {:?}",
+                        "WsSession of member {} failed to join Room, because: \
+                         {:?}",
                         member_id, err,
                     )
                 }),
@@ -188,8 +192,8 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
         );
         match msg {
             ws::Message::Text(text) => {
-                self.reset_idle_timeout(ctx);
                 if let Ok(msg) = serde_json::from_str::<Heartbeat>(&text) {
+                    self.reset_idle_timeout(ctx);
                     ctx.notify(msg);
                 }
             }
@@ -215,7 +219,6 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                             }),
                     ));
                     ctx.close(reason);
-                    ctx.stop();
                 }
             }
             _ => error!(
diff --git a/src/main.rs b/src/main.rs
index ca7a459dd..ce0d9c907 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,9 +4,11 @@ use actix::prelude::*;
 use dotenv::dotenv;
 use hashbrown::HashMap;
 
-use crate::api::{
-    client::{server, Room, RoomsRepository},
-    control::Member,
+use crate::{
+    api::{
+        client::{server, Room, RoomsRepository},
+        control::Member,
+    },
     settings::Settings,
 };
 
@@ -37,11 +39,8 @@ fn main() {
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);
 
-    match Settings::new() {
-        Ok(settings) => info!("{:?}", settings),
-        Err(e) => error!("settings error: {}", e),
-    }
+    let config = Settings::new().unwrap();
 
-    server::run(rooms_repo);
+    server::run(rooms_repo, config.server);
     let _ = sys.run();
 }
diff --git a/src/settings/mod.rs b/src/settings/mod.rs
index b8f77d051..3da49b14d 100644
--- a/src/settings/mod.rs
+++ b/src/settings/mod.rs
@@ -7,11 +7,13 @@ use serde_derive::{Deserialize, Serialize};
 use toml::to_string;
 
 mod duration;
-mod server;
+pub mod server;
 
+/// Settings represents all configuration setting of application.
 #[derive(Debug, Default, Deserialize, Serialize)]
 pub struct Settings {
-    server: server::Server,
+    /// Represents [`Server`] configuration section.
+    pub server: server::Server,
 }
 
 impl Settings {
diff --git a/src/settings/server.rs b/src/settings/server.rs
index 87dfbafac..919ddd7be 100644
--- a/src/settings/server.rs
+++ b/src/settings/server.rs
@@ -4,16 +4,16 @@ use serde_derive::{Deserialize, Serialize};
 
 use crate::settings::duration;
 
-/// Server represents [server] configuration section.
-#[derive(Debug, Deserialize, Serialize)]
+/// Server represents [`Server`] configuration section.
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Server {
-    /// Timeout for websocket session to wait message from [`Web Client`].
+    /// Timeout for [`WsSession`] to wait ping message from [`Web Client`].
     #[serde(serialize_with = "duration::serialize")]
     #[serde(deserialize_with = "duration::deserialize")]
-    client_idle_timeout: Duration,
+    pub client_idle_timeout: Duration,
 }
 
-/// Default returns default configuration parameters of [server] section.
+/// Default returns default configuration parameters of [`Server`] section.
 impl Default for Server {
     fn default() -> Server {
         Server {

From 754ab2538feb0220749fad130b9a98ddfee2dfff Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 25 Mar 2019 22:50:05 +0200
Subject: [PATCH 055/179] refactor, pass conf file path in args/env, serde
 duration via humantime, add basic makefile, add config tests, add duration
 serde tests

---
 Cargo.lock                       |  20 +++++
 Cargo.toml                       |   6 +-
 Makefile                         |  99 +++++++++++++++++++++
 src/api/client/server.rs         |  22 ++---
 src/conf/duration.rs             | 126 ++++++++++++++++++++++++++
 src/conf/mod.rs                  | 146 +++++++++++++++++++++++++++++++
 src/{settings => conf}/server.rs |   6 +-
 src/main.rs                      |   9 +-
 src/settings/duration.rs         |  54 ------------
 src/settings/mod.rs              |  30 -------
 10 files changed, 416 insertions(+), 102 deletions(-)
 create mode 100644 Makefile
 create mode 100644 src/conf/duration.rs
 create mode 100644 src/conf/mod.rs
 rename src/{settings => conf}/server.rs (88%)
 delete mode 100644 src/settings/duration.rs
 delete mode 100644 src/settings/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index a2901580a..d78b8f597 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -560,6 +560,14 @@ name = "httparse"
 version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "humantime"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -710,11 +718,13 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_test 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1240,6 +1250,14 @@ dependencies = [
  "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serde_test"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.5.4"
@@ -1946,6 +1964,7 @@ dependencies = [
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
 "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
+"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
@@ -2026,6 +2045,7 @@ dependencies = [
 "checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
+"checksum serde_test 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "70807e147558b5253cb70f55d343db1d07204d773087c96d0f35fced295dba82"
 "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
diff --git a/Cargo.toml b/Cargo.toml
index 10e6c6e94..b43f33505 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,9 +15,10 @@ actix-web = "0.7"
 config = "0.9"
 chrono = "0.4"
 dotenv = "0.13"
-failure = "0.1"
+failure = "0.1.5"
 futures = "0.1"
 hashbrown = "0.1"
+humantime = "1.2.0"
 lazy_static = "1.2"
 regex = "1.1"
 serde = { version = "1.0", features = ["derive"] }
@@ -30,3 +31,6 @@ slog-async = "2.3"
 slog-json = "2.3"
 slog-scope = "4.1"
 toml = "0.4"
+
+[dev-dependencies]
+serde_test = "1.0.89"
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..a80805c51
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,99 @@
+######################
+# Project parameters #
+######################
+
+CARGO_HOME ?= $(strip $(shell dirname $$(dirname $$(which cargo))))
+RUST_VER ?= "1.33"
+
+
+
+
+###########
+# Aliases #
+###########
+
+lint: cargo.lint
+
+
+fmt: cargo.fmt
+
+
+# Run all project tests.
+#
+# Usage:
+#	make test
+
+test: test.unit
+
+
+
+
+# Lint Rust sources with clippy.
+#
+# Usage:
+#	make cargo.lint [dockerized=(no|yes)]
+
+cargo.lint:
+ifeq ($(dockerized),yes)
+	docker run --rm --network=host -v "$(PWD)":/app -w /app \
+	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+		rust:$(RUST_VER) \
+			make cargo.lint dockerized=no pre-install=yes
+else
+ifeq ($(pre-install),yes)
+	rustup component add clippy
+endif
+	cargo clippy -- -D clippy::pedantic -D warnings
+endif
+
+
+
+
+# Run Rust unit tests of project.
+#
+# Usage:
+#	make test.unit [dockerized=(no|yes)]
+
+test.unit:
+ifeq ($(dockerized),yes)
+	docker run --rm --network=host -v "$(PWD)":/app -w /app \
+	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+		rust:$(RUST_VER) \
+			make test.unit dockerized=no
+else
+	cargo test --all
+endif
+
+
+
+
+# Format Rust sources with rustfmt.
+#
+# Usage:
+#	make cargo.fmt [check=(no|yes)]
+#	               [dockerized=(no|yes)]
+
+cargo.fmt:
+ifeq ($(dockerized),yes)
+	docker pull rustlang/rust:nightly
+	docker run --rm --network=host -v "$(PWD)":/app -w /app \
+	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+		rustlang/rust:nightly \
+			make cargo.fmt check='$(check)' dockerized=no pre-install=yes
+else
+ifeq ($(pre-install),yes)
+	rustup component add rustfmt
+endif
+	cargo +nightly fmt --all $(if $(call eq,$(check),yes),-- --check,)
+endif
+
+
+
+
+
+##################
+# .PHONY section #
+##################
+
+.PHONY: cargo cargo.fmt cargo.lint \
+        test test.e2e test.unit
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 1de4aad95..ad45ee2d2 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -15,8 +15,8 @@ use crate::{
         },
         control::Id as MemberId,
     },
+    conf::server::Server,
     log::prelude::*,
-    settings::server::Server,
 };
 
 /// Parameters of new WebSocket connection creation HTTP request.
@@ -105,11 +105,8 @@ mod test {
     use hashbrown::HashMap;
 
     use crate::{
-        api::{
-            client::{session, Room},
-            control::Member,
-        },
-        settings::Settings,
+        api::{client::Room, control::Member},
+        conf::Conf,
     };
 
     use super::*;
@@ -130,11 +127,11 @@ mod test {
     }
 
     /// Creates test WebSocket server of Client API which can handle requests.
-    fn ws_server() -> test::TestServer {
+    fn ws_server(conf: Conf) -> test::TestServer {
         test::TestServer::with_factory(move || {
             App::with_state(Context {
                 rooms: room(),
-                config: Settings::new().unwrap().server,
+                config: conf.server.clone(),
             })
             .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
                 r.method(http::Method::GET).with(ws_index)
@@ -144,7 +141,7 @@ mod test {
 
     #[test]
     fn responses_with_pong() {
-        let mut server = ws_server();
+        let mut server = ws_server(Conf::new().unwrap());
         let (read, mut write) =
             server.ws_at("/ws/1/1/caller_credentials").unwrap();
 
@@ -155,7 +152,8 @@ mod test {
 
     #[test]
     fn disconnects_on_idle() {
-        let mut server = ws_server();
+        let conf = Conf::new().unwrap();
+        let mut server = ws_server(conf.clone());
         let (read, mut write) =
             server.ws_at("/ws/1/1/caller_credentials").unwrap();
 
@@ -163,7 +161,9 @@ mod test {
         let (item, read) = server.execute(read.into_future()).unwrap();
         assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.into())));
 
-        thread::sleep(session::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
+        thread::sleep(
+            conf.server.client_idle_timeout.add(Duration::from_secs(1)),
+        );
 
         let (item, _) = server.execute(read.into_future()).unwrap();
         assert_eq!(
diff --git a/src/conf/duration.rs b/src/conf/duration.rs
new file mode 100644
index 000000000..1a54f40e5
--- /dev/null
+++ b/src/conf/duration.rs
@@ -0,0 +1,126 @@
+/// Provides deserialize [`time::Duration`] from string.
+use std::fmt;
+use std::time::Duration;
+
+use serde::de::{self, Unexpected};
+use serde::Serializer;
+
+struct DurationFromStringVisitor;
+
+pub fn deserialize<'de, D>(d: D) -> Result<Duration, D::Error>
+where
+    D: de::Deserializer<'de>,
+{
+    Ok(d.deserialize_str(DurationFromStringVisitor)?)
+}
+
+impl<'de> de::Visitor<'de> for DurationFromStringVisitor {
+    type Value = Duration;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "a string representation of duration")
+    }
+
+    fn visit_str<E>(self, value: &str) -> Result<Duration, E>
+    where
+        E: de::Error,
+    {
+        let dur = humantime::parse_duration(value).map_err(|_| {
+            de::Error::invalid_value(Unexpected::Str(value), &self)
+        })?;
+        Ok(dur)
+    }
+}
+
+pub fn serialize<S>(d: &Duration, s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    s.serialize_str(&format!("{}", humantime::format_duration(*d)))
+}
+
+#[cfg(test)]
+mod test {
+    use serde_derive::{Deserialize, Serialize};
+    use serde_test::{assert_de_tokens, assert_ser_tokens, Token};
+    use std::time::Duration;
+
+    #[derive(Serialize, Deserialize, Debug, PartialEq)]
+    struct S {
+        #[serde(serialize_with = "super::serialize")]
+        #[serde(deserialize_with = "super::deserialize")]
+        dur: Duration,
+    }
+
+    #[test]
+    fn test_de() {
+        let valid = vec![
+            ("17nsec", Duration::new(0, 17)),
+            ("17nanos", Duration::new(0, 17)),
+            ("33ns", Duration::new(0, 33)),
+            ("3usec", Duration::new(0, 3000)),
+            ("78us", Duration::new(0, 78000)),
+            ("31msec", Duration::new(0, 31000000)),
+            ("31millis", Duration::new(0, 31000000)),
+            ("6ms", Duration::new(0, 6000000)),
+            ("3000s", Duration::new(3000, 0)),
+            ("300sec", Duration::new(300, 0)),
+            ("300secs", Duration::new(300, 0)),
+            ("50seconds", Duration::new(50, 0)),
+            ("1second", Duration::new(1, 0)),
+            ("100m", Duration::new(6000, 0)),
+            ("12min", Duration::new(720, 0)),
+            ("12mins", Duration::new(720, 0)),
+            ("1minute", Duration::new(60, 0)),
+            ("7minutes", Duration::new(420, 0)),
+            ("2h", Duration::new(7200, 0)),
+            ("7hr", Duration::new(25200, 0)),
+            ("7hrs", Duration::new(25200, 0)),
+            ("1hour", Duration::new(3600, 0)),
+            ("24hours", Duration::new(86400, 0)),
+            ("1day", Duration::new(86400, 0)),
+            ("2days", Duration::new(172800, 0)),
+            ("365d", Duration::new(31536000, 0)),
+            ("1week", Duration::new(604800, 0)),
+            ("7weeks", Duration::new(4233600, 0)),
+            ("52w", Duration::new(31449600, 0)),
+            ("1month", Duration::new(2630016, 0)),
+            ("3months", Duration::new(3 * 2630016, 0)),
+            ("12M", Duration::new(31560192, 0)),
+            ("1year", Duration::new(31557600, 0)),
+            ("7years", Duration::new(7 * 31557600, 0)),
+            ("17y", Duration::new(536479200, 0)),
+        ];
+
+        valid.into_iter().for_each(|(formatted, dur)| {
+            let s = S { dur };
+
+            assert_de_tokens(
+                &s,
+                &[
+                    Token::Struct { name: "S", len: 1 },
+                    Token::Str("dur"),
+                    Token::Str(formatted),
+                    Token::StructEnd,
+                ],
+            );
+        });
+    }
+
+    #[test]
+    fn test_ser() {
+        let s = S {
+            dur: Duration::new(236179457, 45500),
+        };
+
+        assert_ser_tokens(
+            &s,
+            &[
+                Token::Struct { name: "S", len: 1 },
+                Token::Str("dur"),
+                Token::Str("7years 5months 24days 14h 36m 17s 45us 500ns"),
+                Token::StructEnd,
+            ],
+        );
+    }
+}
diff --git a/src/conf/mod.rs b/src/conf/mod.rs
new file mode 100644
index 000000000..b86b75d81
--- /dev/null
+++ b/src/conf/mod.rs
@@ -0,0 +1,146 @@
+/// Provides application configuration options.
+///
+/// Configuration options can be parsed from config files in TOML format.
+use config::{
+    Config, ConfigError, Environment, File, FileFormat, Source, Value,
+};
+use failure::Error;
+use serde_derive::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+mod duration;
+pub mod server;
+
+static APP_CONF_PATH_CMD_ARG_NAME: &str = "--conf";
+static APP_CONF_PATH_ENV_VAR_NAME: &str = "MEDEA_CONF";
+
+/// Settings represents all configuration setting of application.
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Conf {
+    /// Represents [`Server`] configuration section.
+    pub server: server::Server,
+}
+
+impl Source for Conf {
+    fn clone_into_box(&self) -> Box<Source + Send + Sync> {
+        Box::new((*self).clone())
+    }
+
+    fn collect(&self) -> Result<HashMap<String, Value>, ConfigError> {
+        let serialized = toml::to_string(self).unwrap();
+        File::from_str(serialized.as_str(), FileFormat::Toml).collect()
+    }
+}
+
+impl Conf {
+    pub fn new() -> Result<Self, Error> {
+        use std::env;
+
+        let mut cfg = Config::new();
+
+        cfg.merge(Self::default())?;
+
+        if let Some(path) = get_conf_file_name(
+            env::var(APP_CONF_PATH_ENV_VAR_NAME),
+            env::args(),
+        ) {
+            cfg.merge(File::with_name(&path))?;
+        }
+
+        cfg.merge(Environment::with_prefix("MEDEA").separator("__"))?;
+
+        let s: Self = cfg.try_into()?;
+        Ok(s)
+    }
+}
+
+fn get_conf_file_name<T>(
+    env_var: Result<String, std::env::VarError>,
+    cmd_args: T,
+) -> Option<String>
+where
+    T: Iterator<Item = String> + std::fmt::Debug,
+{
+    if let Ok(path) = env_var {
+        Some(path)
+    } else {
+        let mut args = cmd_args.skip_while(|x| x != APP_CONF_PATH_CMD_ARG_NAME);
+        if args.next().is_some() {
+            args.next()
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::get_conf_file_name;
+    use crate::conf::{
+        Conf, APP_CONF_PATH_CMD_ARG_NAME, APP_CONF_PATH_ENV_VAR_NAME,
+    };
+    use std::time::Duration;
+
+    #[test]
+    fn get_conf_file_name_none() {
+        let file = get_conf_file_name(
+            Err(std::env::VarError::NotPresent),
+            Vec::new().into_iter(),
+        );
+        assert_eq!(file, None);
+    }
+
+    #[test]
+    fn get_conf_file_name_env() {
+        let file = get_conf_file_name(
+            Ok("env_path".to_owned()),
+            Vec::new().into_iter(),
+        );
+        assert_eq!(file, Some("env_path".to_owned()));
+    }
+
+    #[test]
+    fn get_conf_file_name_arg() {
+        let file = get_conf_file_name(
+            Err(std::env::VarError::NotPresent),
+            vec![APP_CONF_PATH_CMD_ARG_NAME.to_owned(), "arg_path".to_owned()]
+                .into_iter(),
+        );
+        assert_eq!(file, Some("arg_path".to_owned()));
+    }
+
+    #[test]
+    fn get_conf_file_name_both_env_overrides() {
+        let file = get_conf_file_name(
+            Ok("env_path".to_owned()),
+            vec![APP_CONF_PATH_CMD_ARG_NAME.to_owned(), "arg_path".to_owned()]
+                .into_iter(),
+        );
+        assert_eq!(file, Some("env_path".to_owned()));
+    }
+
+    #[test]
+    fn ensure_file_overrides_defaults() {
+        let defaults = Conf::new().unwrap();
+        let test_config_file_path =
+            "ensure_file_overrides_defaults_test_config.toml";
+
+        let data = format!("[server]\nclient_idle_timeout = \"55s\"");
+        std::fs::write(test_config_file_path, data).unwrap();
+        std::env::set_var(APP_CONF_PATH_ENV_VAR_NAME, test_config_file_path);
+
+        let new_config = Conf::new().unwrap();
+
+        std::env::remove_var(APP_CONF_PATH_ENV_VAR_NAME);
+        std::fs::remove_file(test_config_file_path).unwrap();
+
+        assert_eq!(
+            new_config.server.client_idle_timeout,
+            Duration::from_secs(55)
+        );
+        assert_ne!(
+            new_config.server.client_idle_timeout,
+            defaults.server.client_idle_timeout
+        );
+    }
+}
diff --git a/src/settings/server.rs b/src/conf/server.rs
similarity index 88%
rename from src/settings/server.rs
rename to src/conf/server.rs
index 919ddd7be..18810520f 100644
--- a/src/settings/server.rs
+++ b/src/conf/server.rs
@@ -2,7 +2,7 @@ use std::time::Duration;
 
 use serde_derive::{Deserialize, Serialize};
 
-use crate::settings::duration;
+use crate::conf::duration;
 
 /// Server represents [`Server`] configuration section.
 #[derive(Clone, Debug, Deserialize, Serialize)]
@@ -15,8 +15,8 @@ pub struct Server {
 
 /// Default returns default configuration parameters of [`Server`] section.
 impl Default for Server {
-    fn default() -> Server {
-        Server {
+    fn default() -> Self {
+        Self {
             client_idle_timeout: Duration::from_secs(10),
         }
     }
diff --git a/src/main.rs b/src/main.rs
index ce0d9c907..cdd0b3ec5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,21 +3,22 @@
 use actix::prelude::*;
 use dotenv::dotenv;
 use hashbrown::HashMap;
+use log::prelude::*;
 
 use crate::{
     api::{
         client::{server, Room, RoomsRepository},
         control::Member,
     },
-    settings::Settings,
+    conf::Conf,
 };
 
 #[macro_use]
 mod utils;
 
 mod api;
+mod conf;
 mod log;
-mod settings;
 
 fn main() {
     dotenv().ok();
@@ -39,7 +40,9 @@ fn main() {
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);
 
-    let config = Settings::new().unwrap();
+    let config = Conf::new().unwrap();
+
+    info!("{:?}", config);
 
     server::run(rooms_repo, config.server);
     let _ = sys.run();
diff --git a/src/settings/duration.rs b/src/settings/duration.rs
deleted file mode 100644
index 695666f6c..000000000
--- a/src/settings/duration.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-/// Provides deserialize [`time::Duration`] from string.
-use std::fmt;
-use std::time::Duration;
-
-use lazy_static::*;
-use regex::Regex;
-use serde::de::{self, Unexpected};
-use serde::Serializer;
-
-lazy_static! {
-    static ref REGEX_DURATION: Regex =
-        Regex::new(r"^(?P<minutes>\d+)m|(?P<seconds>\d+)s$").unwrap();
-}
-
-struct DurationFromStringVisitor;
-
-pub fn deserialize<'de, D>(d: D) -> Result<Duration, D::Error>
-where
-    D: de::Deserializer<'de>,
-{
-    Ok(d.deserialize_str(DurationFromStringVisitor)?)
-}
-
-impl<'de> de::Visitor<'de> for DurationFromStringVisitor {
-    type Value = Duration;
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        write!(formatter, "a string representation of duration")
-    }
-
-    fn visit_str<E>(self, value: &str) -> Result<Duration, E>
-    where
-        E: de::Error,
-    {
-        let caps = REGEX_DURATION
-            .captures(value)
-            .ok_or(de::Error::invalid_value(Unexpected::Str(value), &self))?;
-        let m = caps
-            .name("minutes")
-            .map_or(0, |s| s.as_str().parse::<u64>().unwrap());
-        let s = caps
-            .name("seconds")
-            .map_or(0, |s| s.as_str().parse::<u64>().unwrap());
-
-        Ok(Duration::from_secs(m * 60 + s))
-    }
-}
-
-pub fn serialize<S>(d: &Duration, s: S) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-{
-    s.serialize_str(format!("{}s", d.as_secs()).as_str())
-}
diff --git a/src/settings/mod.rs b/src/settings/mod.rs
deleted file mode 100644
index 3da49b14d..000000000
--- a/src/settings/mod.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-/// Provides application configuration options.
-///
-/// Configuration options can be parsed from config files in TOML format.
-use config::{Config, Environment, File, FileFormat};
-use failure::Error;
-use serde_derive::{Deserialize, Serialize};
-use toml::to_string;
-
-mod duration;
-pub mod server;
-
-/// Settings represents all configuration setting of application.
-#[derive(Debug, Default, Deserialize, Serialize)]
-pub struct Settings {
-    /// Represents [`Server`] configuration section.
-    pub server: server::Server,
-}
-
-impl Settings {
-    pub fn new() -> Result<Self, Error> {
-        let mut cfg = Config::new();
-        let defaults = to_string(&Settings::default())?;
-        cfg.merge(File::from_str(defaults.as_str(), FileFormat::Toml))?;
-        cfg.merge(File::with_name("config"))?;
-        cfg.merge(Environment::with_prefix("conf").separator("__"))?;
-
-        let s: Settings = cfg.try_into()?;
-        Ok(s)
-    }
-}

From 29461bac77a9bc4038b3e5c11cb83b7167cdee8d Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 26 Mar 2019 11:16:43 +0200
Subject: [PATCH 056/179] Add docs

---
 src/conf/mod.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/conf/mod.rs b/src/conf/mod.rs
index b86b75d81..650e1e20a 100644
--- a/src/conf/mod.rs
+++ b/src/conf/mod.rs
@@ -33,6 +33,12 @@ impl Source for Conf {
 }
 
 impl Conf {
+    /// Creates new [`Conf`] and applies values from such sources
+    /// and in that order:
+    /// - default values;
+    /// - configuration file, the name of which is given as a command line
+    /// parameter or environment variable;
+    /// - environment variables;
     pub fn new() -> Result<Self, Error> {
         use std::env;
 
@@ -54,6 +60,7 @@ impl Conf {
     }
 }
 
+/// Returns the name of the configuration file, if defined.
 fn get_conf_file_name<T>(
     env_var: Result<String, std::env::VarError>,
     cmd_args: T,

From 41b33eeb2f93427ceaefb88d2686799ffc0cf812 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 26 Mar 2019 17:45:55 +0200
Subject: [PATCH 057/179] refactor, extend tests

---
 Cargo.lock               | 23 +++++++++++++--
 Cargo.toml               |  4 +--
 src/api/client/server.rs | 31 ++++++++++++--------
 src/conf/mod.rs          | 61 +++++++++++++++++++++++++++++++---------
 src/conf/rpc.rs          | 23 +++++++++++++++
 src/conf/server.rs       | 57 ++++++++++++++++++++++++++++++-------
 src/main.rs              |  2 +-
 7 files changed, 160 insertions(+), 41 deletions(-)
 create mode 100644 src/conf/rpc.rs

diff --git a/Cargo.lock b/Cargo.lock
index d78b8f597..fbedce62e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -719,12 +719,12 @@ dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_test 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1269,6 +1269,23 @@ dependencies = [
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "serial_test"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sha1"
 version = "0.6.0"
@@ -2047,6 +2064,8 @@ dependencies = [
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum serde_test 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "70807e147558b5253cb70f55d343db1d07204d773087c96d0f35fced295dba82"
 "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
+"checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
+"checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 "checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
diff --git a/Cargo.toml b/Cargo.toml
index b43f33505..832cc2343 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,8 +19,6 @@ failure = "0.1.5"
 futures = "0.1"
 hashbrown = "0.1"
 humantime = "1.2.0"
-lazy_static = "1.2"
-regex = "1.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"
@@ -34,3 +32,5 @@ toml = "0.4"
 
 [dev-dependencies]
 serde_test = "1.0.89"
+serial_test = "0.2.0"
+serial_test_derive = "0.2.0"
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index ad45ee2d2..caf7a3842 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -15,7 +15,7 @@ use crate::{
         },
         control::Id as MemberId,
     },
-    conf::server::Server,
+    conf::{rpc::Rpc, Conf},
     log::prelude::*,
 };
 
@@ -56,7 +56,7 @@ fn ws_index(
                     WsSession::new(
                         info.member_id,
                         room,
-                        state.config.client_idle_timeout,
+                        state.config.idle_timeout,
                     ),
                 ),
                 Err(MemberNotExists) => Ok(HttpResponse::NotFound().into()),
@@ -73,22 +73,24 @@ pub struct Context {
     pub rooms: RoomsRepository,
 
     /// Settings of application.
-    pub config: Server,
+    pub config: Rpc,
 }
 
 /// Starts HTTP server for handling WebSocket connections of Client API.
-pub fn run(rooms: RoomsRepository, config: Server) {
+pub fn run(rooms: RoomsRepository, config: Conf) {
+    let server_addr = config.server.get_bind_addr();
+
     server::new(move || {
         App::with_state(Context {
             rooms: rooms.clone(),
-            config: config.clone(),
+            config: config.rpc.clone(),
         })
         .middleware(middleware::Logger::default())
         .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
             r.method(http::Method::GET).with(ws_index)
         })
     })
-    .bind("0.0.0.0:8080")
+    .bind(server_addr)
     .unwrap()
     .start();
 
@@ -110,6 +112,7 @@ mod test {
     };
 
     use super::*;
+    use crate::conf::server::Server;
 
     /// Creates [`RoomsRepository`] for tests filled with a single [`Room`].
     fn room() -> RoomsRepository {
@@ -131,7 +134,7 @@ mod test {
         test::TestServer::with_factory(move || {
             App::with_state(Context {
                 rooms: room(),
-                config: conf.server.clone(),
+                config: conf.rpc.clone(),
             })
             .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
                 r.method(http::Method::GET).with(ws_index)
@@ -141,7 +144,7 @@ mod test {
 
     #[test]
     fn responses_with_pong() {
-        let mut server = ws_server(Conf::new().unwrap());
+        let mut server = ws_server(Conf::default());
         let (read, mut write) =
             server.ws_at("/ws/1/1/caller_credentials").unwrap();
 
@@ -152,7 +155,13 @@ mod test {
 
     #[test]
     fn disconnects_on_idle() {
-        let conf = Conf::new().unwrap();
+        let conf = Conf {
+            rpc: Rpc {
+                idle_timeout: Duration::new(1, 0),
+            },
+            server: Server::default(),
+        };
+
         let mut server = ws_server(conf.clone());
         let (read, mut write) =
             server.ws_at("/ws/1/1/caller_credentials").unwrap();
@@ -161,9 +170,7 @@ mod test {
         let (item, read) = server.execute(read.into_future()).unwrap();
         assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.into())));
 
-        thread::sleep(
-            conf.server.client_idle_timeout.add(Duration::from_secs(1)),
-        );
+        thread::sleep(conf.rpc.idle_timeout.add(Duration::from_secs(1)));
 
         let (item, _) = server.execute(read.into_future()).unwrap();
         assert_eq!(
diff --git a/src/conf/mod.rs b/src/conf/mod.rs
index 650e1e20a..630c5ce7a 100644
--- a/src/conf/mod.rs
+++ b/src/conf/mod.rs
@@ -9,6 +9,7 @@ use serde_derive::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 mod duration;
+pub mod rpc;
 pub mod server;
 
 static APP_CONF_PATH_CMD_ARG_NAME: &str = "--conf";
@@ -18,6 +19,7 @@ static APP_CONF_PATH_ENV_VAR_NAME: &str = "MEDEA_CONF";
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Conf {
     /// Represents [`Server`] configuration section.
+    pub rpc: rpc::Rpc,
     pub server: server::Server,
 }
 
@@ -53,7 +55,7 @@ impl Conf {
             cfg.merge(File::with_name(&path))?;
         }
 
-        cfg.merge(Environment::with_prefix("MEDEA").separator("__"))?;
+        cfg.merge(Environment::with_prefix("MEDEA").separator("."))?;
 
         let s: Self = cfg.try_into()?;
         Ok(s)
@@ -86,6 +88,7 @@ mod test {
     use crate::conf::{
         Conf, APP_CONF_PATH_CMD_ARG_NAME, APP_CONF_PATH_ENV_VAR_NAME,
     };
+    use serial_test_derive::serial;
     use std::time::Duration;
 
     #[test]
@@ -127,12 +130,12 @@ mod test {
     }
 
     #[test]
-    fn ensure_file_overrides_defaults() {
-        let defaults = Conf::new().unwrap();
-        let test_config_file_path =
-            "ensure_file_overrides_defaults_test_config.toml";
+    #[serial]
+    fn file_overrides_defaults() {
+        let defaults = Conf::default();
+        let test_config_file_path = "test_config.toml";
 
-        let data = format!("[server]\nclient_idle_timeout = \"55s\"");
+        let data = format!("[rpc]\nidle_timeout = \"45s\"");
         std::fs::write(test_config_file_path, data).unwrap();
         std::env::set_var(APP_CONF_PATH_ENV_VAR_NAME, test_config_file_path);
 
@@ -141,13 +144,43 @@ mod test {
         std::env::remove_var(APP_CONF_PATH_ENV_VAR_NAME);
         std::fs::remove_file(test_config_file_path).unwrap();
 
-        assert_eq!(
-            new_config.server.client_idle_timeout,
-            Duration::from_secs(55)
-        );
-        assert_ne!(
-            new_config.server.client_idle_timeout,
-            defaults.server.client_idle_timeout
-        );
+        assert_eq!(new_config.rpc.idle_timeout, Duration::from_secs(45));
+        assert_ne!(new_config.rpc.idle_timeout, defaults.rpc.idle_timeout);
+    }
+
+    #[test]
+    #[serial]
+    fn env_overrides_defaults() {
+        let defaults = Conf::default();
+
+        std::env::set_var("MEDEA_RPC.IDLE_TIMEOUT", "46s");
+        let new_config = Conf::new().unwrap();
+        std::env::remove_var("MEDEA_RPC.IDLE_TIMEOUT");
+
+        assert_eq!(new_config.rpc.idle_timeout, Duration::from_secs(46));
+        assert_ne!(new_config.rpc.idle_timeout, defaults.rpc.idle_timeout);
+    }
+
+    #[test]
+    #[serial]
+    fn env_overrides_file() {
+        let test_config_file_path = "test_config.toml";
+
+        let data = format!("[rpc]\nidle_timeout = \"47s\"");
+        std::fs::write(test_config_file_path, data).unwrap();
+        std::env::set_var(APP_CONF_PATH_ENV_VAR_NAME, test_config_file_path);
+
+        let file_config = Conf::new().unwrap();
+
+        std::env::set_var("MEDEA_RPC.IDLE_TIMEOUT", "48s");
+        let file_env_config = Conf::new().unwrap();
+
+        std::env::remove_var(APP_CONF_PATH_ENV_VAR_NAME);
+        std::fs::remove_file(test_config_file_path).unwrap();
+        std::env::remove_var("MEDEA_RPC.IDLE_TIMEOUT");
+
+        assert_eq!(file_config.rpc.idle_timeout, Duration::from_secs(47));
+
+        assert_eq!(file_env_config.rpc.idle_timeout, Duration::from_secs(48));
     }
 }
diff --git a/src/conf/rpc.rs b/src/conf/rpc.rs
new file mode 100644
index 000000000..7c02006e9
--- /dev/null
+++ b/src/conf/rpc.rs
@@ -0,0 +1,23 @@
+use std::time::Duration;
+
+use serde_derive::{Deserialize, Serialize};
+
+use crate::conf::duration;
+
+/// Server represents [`Server`] configuration section.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Rpc {
+    /// Timeout for [`WsSession`] to wait ping message from [`Web Client`].
+    #[serde(serialize_with = "duration::serialize")]
+    #[serde(deserialize_with = "duration::deserialize")]
+    pub idle_timeout: Duration,
+}
+
+/// Default returns default configuration parameters of [`Server`] section.
+impl Default for Rpc {
+    fn default() -> Self {
+        Self {
+            idle_timeout: Duration::from_secs(10),
+        }
+    }
+}
diff --git a/src/conf/server.rs b/src/conf/server.rs
index 18810520f..6ff9a47c7 100644
--- a/src/conf/server.rs
+++ b/src/conf/server.rs
@@ -1,23 +1,60 @@
-use std::time::Duration;
-
 use serde_derive::{Deserialize, Serialize};
-
-use crate::conf::duration;
+use std::net::{IpAddr, Ipv4Addr};
 
 /// Server represents [`Server`] configuration section.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Server {
-    /// Timeout for [`WsSession`] to wait ping message from [`Web Client`].
-    #[serde(serialize_with = "duration::serialize")]
-    #[serde(deserialize_with = "duration::deserialize")]
-    pub client_idle_timeout: Duration,
+    pub bind_ip: IpAddr,
+    pub bind_port: u16,
 }
 
-/// Default returns default configuration parameters of [`Server`] section.
 impl Default for Server {
     fn default() -> Self {
         Self {
-            client_idle_timeout: Duration::from_secs(10),
+            bind_ip: IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)),
+            bind_port: 8080,
         }
     }
 }
+
+impl Server {
+    pub fn get_bind_addr(&self) -> impl std::net::ToSocketAddrs {
+        (self.bind_ip, self.bind_port)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::conf::Conf;
+
+    use serial_test_derive::serial;
+    use std::net::{Ipv4Addr, SocketAddr, ToSocketAddrs as _};
+
+    #[test]
+    #[serial]
+    fn override_defaults_and_get_bind_addr() {
+        let default_conf = Conf::default();
+
+        std::env::set_var("MEDEA_SERVER.BIND_IP", "5.5.5.5");
+        std::env::set_var("MEDEA_SERVER.BIND_PORT", "1234");
+
+        let env_conf = Conf::new().unwrap();
+
+        assert_ne!(default_conf.server.bind_ip, env_conf.server.bind_ip);
+        assert_ne!(default_conf.server.bind_port, env_conf.server.bind_port);
+
+        assert_eq!(env_conf.server.bind_ip, Ipv4Addr::new(5, 5, 5, 5));
+        assert_eq!(env_conf.server.bind_port, 1234);
+
+        let addr: SocketAddr = env_conf
+            .server
+            .get_bind_addr()
+            .to_socket_addrs()
+            .unwrap()
+            .into_iter()
+            .next()
+            .unwrap();
+
+        assert_eq!(addr, "5.5.5.5:1234".parse().unwrap());
+    }
+}
diff --git a/src/main.rs b/src/main.rs
index cdd0b3ec5..ba48cf02e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,6 +44,6 @@ fn main() {
 
     info!("{:?}", config);
 
-    server::run(rooms_repo, config.server);
+    server::run(rooms_repo, config);
     let _ = sys.run();
 }

From e56f7833d40ce0e24ebbf8cc5fee336ed6c3ad6e Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 26 Mar 2019 22:55:59 +0200
Subject: [PATCH 058/179] add dummy medea-client crate, dummy e2e client

---
 client/e2e/.gitignore            |    7 +
 client/e2e/README.md             |    5 +
 client/e2e/index.html            |   10 +
 client/e2e/js/index.js           |    3 +
 client/e2e/package-lock.json     | 5976 ++++++++++++++++++++++++++++++
 client/e2e/package.json          |   21 +
 client/e2e/webpack.config.js     |   27 +
 client/medea-client/.gitignore   |    6 +
 client/medea-client/Cargo.toml   |   35 +
 client/medea-client/README.md    |   17 +
 client/medea-client/src/lib.rs   |   23 +
 client/medea-client/src/utils.rs |   16 +
 client/medea-client/tests/web.rs |   13 +
 13 files changed, 6159 insertions(+)
 create mode 100644 client/e2e/.gitignore
 create mode 100644 client/e2e/README.md
 create mode 100644 client/e2e/index.html
 create mode 100644 client/e2e/js/index.js
 create mode 100644 client/e2e/package-lock.json
 create mode 100644 client/e2e/package.json
 create mode 100644 client/e2e/webpack.config.js
 create mode 100644 client/medea-client/.gitignore
 create mode 100644 client/medea-client/Cargo.toml
 create mode 100644 client/medea-client/README.md
 create mode 100644 client/medea-client/src/lib.rs
 create mode 100644 client/medea-client/src/utils.rs
 create mode 100644 client/medea-client/tests/web.rs

diff --git a/client/e2e/.gitignore b/client/e2e/.gitignore
new file mode 100644
index 000000000..fb2b75740
--- /dev/null
+++ b/client/e2e/.gitignore
@@ -0,0 +1,7 @@
+dist
+node_modules
+crate/bin
+crate/pkg
+crate/target
+crate/wasm-pack.log
+crate/Cargo.lock
diff --git a/client/e2e/README.md b/client/e2e/README.md
new file mode 100644
index 000000000..cde12c519
--- /dev/null
+++ b/client/e2e/README.md
@@ -0,0 +1,5 @@
+* `npm run start` -- Serve the project locally for development at
+  `http://localhost:8080`.
+
+* `npm run build` -- Bundle the project (in production mode).
+np
\ No newline at end of file
diff --git a/client/e2e/index.html b/client/e2e/index.html
new file mode 100644
index 000000000..2420b8454
--- /dev/null
+++ b/client/e2e/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>My awesome Rust, WebAssembly, and Webpack application</title>
+  </head>
+  <body>
+  </body>
+</html>
+
diff --git a/client/e2e/js/index.js b/client/e2e/js/index.js
new file mode 100644
index 000000000..d7c80969b
--- /dev/null
+++ b/client/e2e/js/index.js
@@ -0,0 +1,3 @@
+import("../../medea-client/pkg").then(medea => {
+  medea.greet();
+});
diff --git a/client/e2e/package-lock.json b/client/e2e/package-lock.json
new file mode 100644
index 000000000..7a4e6f1e9
--- /dev/null
+++ b/client/e2e/package-lock.json
@@ -0,0 +1,5976 @@
+{
+  "name": "create-rust-webpack",
+  "version": "0.1.5",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@wasm-tool/wasm-pack-plugin": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@wasm-tool/wasm-pack-plugin/-/wasm-pack-plugin-0.2.7.tgz",
+      "integrity": "sha512-B6YgQIBUMY2E/Xye8y1O3uTOSttP/i3oi+f/2LlwLzAnxJL1qJnzsV+eUne1mjPVFSppONt8ZMVQWXIB3Y4MHA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "command-exists": "^1.2.7",
+        "watchpack": "^1.6.0"
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-code-frame": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/helper-fsm": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-module-context": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "mamacro": "^0.0.3"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "dev": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "dev": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "dev": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "dev": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/helper-wasm-section": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-opt": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/wast-printer": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-buffer": "1.8.5",
+        "@webassemblyjs/wasm-gen": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+        "@webassemblyjs/ieee754": "1.8.5",
+        "@webassemblyjs/leb128": "1.8.5",
+        "@webassemblyjs/utf8": "1.8.5"
+      }
+    },
+    "@webassemblyjs/wast-parser": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+        "@webassemblyjs/helper-api-error": "1.8.5",
+        "@webassemblyjs/helper-code-frame": "1.8.5",
+        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/wast-parser": "1.8.5",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "dev": true,
+      "requires": {
+        "mime-types": "~2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
+      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
+      "dev": true
+    },
+    "acorn-dynamic-import": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
+      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
+      "dev": true
+    },
+    "ajv": {
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
+      "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^2.0.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "ajv-errors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz",
+      "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=",
+      "dev": true
+    },
+    "ajv-keywords": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+      "dev": true
+    },
+    "ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "requires": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "aproba": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "dev": true
+    },
+    "arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
+    },
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+      "dev": true
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "atob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
+      "dev": true
+    },
+    "binary-extensions": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
+      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
+      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+      "dev": true
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
+      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "~1.6.3",
+        "iconv-lite": "0.4.23",
+        "on-finished": "~2.3.0",
+        "qs": "6.5.2",
+        "raw-body": "2.3.3",
+        "type-is": "~1.6.16"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "dev": true,
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+      "dev": true
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "dev": true,
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "dev": true,
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "dev": true
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+      "dev": true
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "cacache": {
+      "version": "11.3.2",
+      "resolved": "http://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
+      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.3",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.1.15",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.2",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
+          "dev": true
+        }
+      }
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      }
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+      "dev": true
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      }
+    },
+    "chokidar": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
+      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "dev": true,
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
+      }
+    },
+    "chownr": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+      "dev": true
+    },
+    "chrome-trace-event": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
+      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "clean-css": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
+      "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.x"
+      }
+    },
+    "cliui": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^2.1.1",
+        "strip-ansi": "^4.0.0",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
+      "dev": true,
+      "requires": {
+        "color-name": "1.1.1"
+      }
+    },
+    "color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
+      "dev": true
+    },
+    "command-exists": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz",
+      "integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.17.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz",
+      "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
+      "dev": true,
+      "requires": {
+        "mime-db": ">= 1.38.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
+      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.14",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.1",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "dev": true
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "fs-write-stream-atomic": "^1.0.8",
+        "iferr": "^0.1.5",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.0"
+      }
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "dev": true,
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "requires": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "css-what": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
+      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+      "dev": true
+    },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.1.1"
+      },
+      "dependencies": {
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "decamelize": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+      "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+      "dev": true,
+      "requires": {
+        "xregexp": "4.0.0"
+      }
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
+    },
+    "deep-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
+      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
+      "dev": true
+    },
+    "default-gateway": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.1.2.tgz",
+      "integrity": "sha512-xhJUAp3u02JsBGovj0V6B6uYhKCUOmiNc8xGmReUwGu77NmvcpxPVB0pCielxMFumO7CmXBG02XjM8HB97k8Hw==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      },
+      "dependencies": {
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
+      }
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "^2.0.5",
+        "object-keys": "^1.0.8"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "del": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "dev": true,
+      "requires": {
+        "globby": "^6.1.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "p-map": "^1.1.1",
+        "pify": "^3.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+      "dev": true
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "dev": true
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "dev": true,
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "dev": true,
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "dom-converter": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
+      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
+      "dev": true,
+      "requires": {
+        "utila": "~0.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "~1.1.1",
+        "entities": "~1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
+      "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "duplexify": {
+      "version": "3.7.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "elliptic": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "tapable": "^1.0.0"
+      }
+    },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "^1.1.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.1",
+        "is-callable": "^1.1.3",
+        "is-regex": "^1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "^1.1.1",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "eslint-scope": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
+      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
+      "dev": true,
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "dev": true,
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "eventemitter3": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "dev": true
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+      "dev": true,
+      "requires": {
+        "original": "^1.0.0"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "dev": true,
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "execa": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+      "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "requires": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "express": {
+      "version": "4.16.4",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
+      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.5",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.3",
+        "content-disposition": "0.5.2",
+        "content-type": "~1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.1.1",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.4",
+        "qs": "6.5.2",
+        "range-parser": "~1.2.0",
+        "safe-buffer": "5.1.2",
+        "send": "0.16.2",
+        "serve-static": "1.13.2",
+        "setprototypeof": "1.1.0",
+        "statuses": "~1.4.0",
+        "type-is": "~1.6.16",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "requires": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "fast-deep-equal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "figgy-pudding": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
+      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.2",
+        "statuses": "~1.4.0",
+        "unpipe": "~1.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "find-cache-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
+      "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
+      "dev": true,
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^3.0.0"
+      }
+    },
+    "find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "requires": {
+        "locate-path": "^3.0.0"
+      }
+    },
+    "findup-sync": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
+      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+      "dev": true,
+      "requires": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^3.1.0",
+        "micromatch": "^3.0.4",
+        "resolve-dir": "^1.0.1"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "flush-write-stream": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
+      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0"
+      }
+    },
+    "fs-write-stream-atomic": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "iferr": "^0.1.5",
+        "imurmurhash": "^0.1.4",
+        "readable-stream": "1 || 2"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "^2.9.2",
+        "node-pre-gyp": "^0.10.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "^2.1.0"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^2.1.2",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.0",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.1.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.5.1",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.0.5"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.0.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.2.4",
+            "minizlib": "^1.1.0",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
+      "dev": true
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
+      "requires": {
+        "is-glob": "^3.1.0",
+        "path-dirname": "^1.0.0"
+      },
+      "dependencies": {
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.0"
+          }
+        }
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "dev": true,
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+      "dev": true,
+      "requires": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "handle-thing": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "dev": true,
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "dev": true
+    },
+    "html-minifier": {
+      "version": "3.5.19",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz",
+      "integrity": "sha512-Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.1.x",
+        "commander": "2.16.x",
+        "he": "1.1.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "uglify-js": {
+          "version": "3.4.7",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz",
+          "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==",
+          "dev": true,
+          "requires": {
+            "commander": "~2.16.0",
+            "source-map": "~0.6.1"
+          }
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
+      "dev": true,
+      "requires": {
+        "html-minifier": "^3.2.3",
+        "loader-utils": "^0.2.16",
+        "lodash": "^4.17.3",
+        "pretty-error": "^2.0.2",
+        "tapable": "^1.0.0",
+        "toposort": "^1.0.0",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.3.0",
+      "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+      "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1",
+        "domhandler": "2.1",
+        "domutils": "1.1",
+        "readable-stream": "1.0"
+      },
+      "dependencies": {
+        "domutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
+          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "0.0.1",
+            "string_decoder": "~0.10.x"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
+      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "^3.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
+      "dev": true
+    },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
+    "import-local": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+      "dev": true,
+      "requires": {
+        "pkg-dir": "^3.0.0",
+        "resolve-cwd": "^2.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "dev": true
+        },
+        "pkg-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+          "dev": true,
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        }
+      }
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "internal-ip": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.2.0.tgz",
+      "integrity": "sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==",
+      "dev": true,
+      "requires": {
+        "default-gateway": "^4.0.1",
+        "ipaddr.js": "^1.9.0"
+      },
+      "dependencies": {
+        "ipaddr.js": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+          "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+          "dev": true
+        }
+      }
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+      "dev": true
+    },
+    "invert-kv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "dev": true
+    },
+    "ipaddr.js": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
+      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
+      "dev": true
+    },
+    "is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+      "dev": true
+    },
+    "is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
+      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+      "dev": true
+    },
+    "killable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
+    },
+    "lcid": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+      "dev": true,
+      "requires": {
+        "invert-kv": "^2.0.0"
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+      "dev": true,
+      "requires": {
+        "big.js": "^3.1.3",
+        "emojis-list": "^2.0.0",
+        "json5": "^0.5.0"
+      }
+    },
+    "locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.11",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "loglevel": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
+      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "dev": true
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "requires": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "dev": true,
+      "requires": {
+        "pify": "^3.0.0"
+      }
+    },
+    "mamacro": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+      "dev": true
+    },
+    "map-age-cleaner": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz",
+      "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==",
+      "dev": true,
+      "requires": {
+        "p-defer": "^1.0.0"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "mem": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz",
+      "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
+      "dev": true,
+      "requires": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^1.0.0",
+        "p-is-promise": "^1.1.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
+      "dev": true,
+      "requires": {
+        "mime-db": "~1.38.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "dev": true
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+      "dev": true
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mississippi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
+      }
+    },
+    "mixin-deep": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
+      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "dev": true,
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1",
+        "copy-concurrently": "^1.0.0",
+        "fs-write-stream-atomic": "^1.0.8",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.5.4",
+        "run-queue": "^1.0.3"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "dev": true,
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
+      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
+      "dev": true,
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      }
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "neo-async": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
+      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
+      "dev": true
+    },
+    "nice-try": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
+      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-forge": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
+      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
+      "dev": true
+    },
+    "node-libs-browser": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
+      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
+      "dev": true,
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
+        }
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "object-keys": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+      "dev": true
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.0"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+      "dev": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "opn": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
+      "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
+      "dev": true,
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "dev": true,
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz",
+      "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
+      "dev": true,
+      "requires": {
+        "execa": "^0.10.0",
+        "lcid": "^2.0.0",
+        "mem": "^4.0.0"
+      }
+    },
+    "p-defer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+      "dev": true
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true
+    },
+    "p-is-promise": {
+      "version": "1.1.0",
+      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+      "dev": true
+    },
+    "p-limit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
+      "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "requires": {
+        "p-limit": "^2.0.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
+    "p-try": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
+      "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+      "dev": true
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "dev": true
+    },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "~0.2.2",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
+      }
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
+      "dev": true,
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+      "dev": true
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "dev": true,
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+      "dev": true
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
+    "portfinder": {
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
+      "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
+      "dev": true,
+      "requires": {
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
+    "proxy-addr": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
+      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
+      "dev": true,
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.8.0"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "pumpify": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+      "dev": true,
+      "requires": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      },
+      "dependencies": {
+        "pump": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        }
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+      "dev": true
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+      "dev": true
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "dev": true,
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
+        "unpipe": "1.0.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "minimatch": "^3.0.2",
+        "readable-stream": "^2.0.2",
+        "set-immediate-shim": "^1.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "renderkid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
+      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
+      "dev": true,
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "~0.1",
+        "htmlparser2": "~3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "~0.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "dev": true
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve-cwd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^3.0.0"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "dev": true,
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.0.5"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "dev": true,
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.1.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "schema-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-errors": "^1.0.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "dev": true
+    },
+    "selfsigned": {
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
+      "dev": true,
+      "requires": {
+        "node-forge": "0.7.5"
+      }
+    },
+    "semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "dev": true
+    },
+    "send": {
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
+      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.0",
+        "statuses": "~1.4.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "serialize-javascript": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
+      "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==",
+      "dev": true
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.2",
+        "send": "0.16.2"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "set-value": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
+      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^1.0.0"
+          }
+        },
+        "is-accessor-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-data-descriptor": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
+          "requires": {
+            "kind-of": "^6.0.0"
+          }
+        },
+        "is-descriptor": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.2.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^3.0.1"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
+      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+      "dev": true,
+      "requires": {
+        "debug": "^3.2.5",
+        "eventsource": "^1.0.7",
+        "faye-websocket": "~0.11.1",
+        "inherits": "^2.0.3",
+        "json3": "^3.3.2",
+        "url-parse": "^1.4.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
+    },
+    "spdy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
+      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      }
+    },
+    "spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
+          "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "ssri": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "dev": true,
+      "requires": {
+        "figgy-pudding": "^3.5.1"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "0.2.5",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
+      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
+      "dev": true
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "dev": true,
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-each": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "stream-shift": "^1.0.0"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "dev": true,
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "tapable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
+      "dev": true
+    },
+    "terser": {
+      "version": "3.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
+      "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
+      "dev": true,
+      "requires": {
+        "commander": "~2.17.1",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.9"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
+      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "dev": true,
+      "requires": {
+        "cacache": "^11.0.2",
+        "find-cache-dir": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.4.0",
+        "source-map": "^0.6.1",
+        "terser": "^3.16.1",
+        "webpack-sources": "^1.1.0",
+        "worker-farm": "^1.5.2"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "through2": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
+      }
+    },
+    "thunky": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
+      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "requires": {
+        "kind-of": "^3.0.2"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      }
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
+      "dev": true
+    },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.18"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "union-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
+      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "dev": true,
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^0.4.3"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
+          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.1",
+            "to-object-path": "^0.3.0"
+          }
+        }
+      }
+    },
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        }
+      }
+    },
+    "upath": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
+      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
+      "dev": true
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+          "dev": true
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
+      "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "object.getownpropertydescriptors": "^2.0.3"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+      "dev": true
+    },
+    "v8-compile-cache": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
+      "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "dev": true,
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "webpack": {
+      "version": "4.29.6",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
+      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+      "dev": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.8.5",
+        "@webassemblyjs/helper-module-context": "1.8.5",
+        "@webassemblyjs/wasm-edit": "1.8.5",
+        "@webassemblyjs/wasm-parser": "1.8.5",
+        "acorn": "^6.0.5",
+        "acorn-dynamic-import": "^4.0.0",
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0",
+        "chrome-trace-event": "^1.0.0",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.0",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "micromatch": "^3.1.8",
+        "mkdirp": "~0.5.0",
+        "neo-async": "^2.5.0",
+        "node-libs-browser": "^2.0.0",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.0",
+        "terser-webpack-plugin": "^1.1.0",
+        "watchpack": "^1.5.0",
+        "webpack-sources": "^1.3.0"
+      },
+      "dependencies": {
+        "tapable": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
+          "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-cli": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.0.tgz",
+      "integrity": "sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "cross-spawn": "^6.0.5",
+        "enhanced-resolve": "^4.1.0",
+        "findup-sync": "^2.0.0",
+        "global-modules": "^1.0.0",
+        "import-local": "^2.0.0",
+        "interpret": "^1.1.0",
+        "loader-utils": "^1.1.0",
+        "supports-color": "^5.5.0",
+        "v8-compile-cache": "^2.0.2",
+        "yargs": "^12.0.5"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
+          "integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+          "dev": true
+        },
+        "decamelize": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "yargs": {
+          "version": "12.0.5",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "dev": true,
+          "requires": {
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz",
+      "integrity": "sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==",
+      "dev": true,
+      "requires": {
+        "memory-fs": "^0.4.1",
+        "mime": "^2.3.1",
+        "range-parser": "^1.0.3",
+        "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "dev": true
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
+      "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.0.0",
+        "compression": "^1.5.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "debug": "^4.1.1",
+        "del": "^3.0.0",
+        "express": "^4.16.2",
+        "html-entities": "^1.2.0",
+        "http-proxy-middleware": "^0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.2.0",
+        "ip": "^1.1.5",
+        "killable": "^1.0.0",
+        "loglevel": "^1.4.1",
+        "opn": "^5.1.0",
+        "portfinder": "^1.0.9",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.9.1",
+        "semver": "^5.6.0",
+        "serve-index": "^1.7.2",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.3.0",
+        "spdy": "^4.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.5.1",
+        "webpack-log": "^2.0.0",
+        "yargs": "12.0.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "webpack-log": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^3.0.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "webpack-sources": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
+      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
+      "dev": true,
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": ">=0.4.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "dev": true
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "worker-farm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "dev": true,
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "xregexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "y18n": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
+      "dev": true
+    },
+    "yargs": {
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
+      "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
+      "dev": true,
+      "requires": {
+        "cliui": "^4.0.0",
+        "decamelize": "^2.0.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^3.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1 || ^4.0.0",
+        "yargs-parser": "^10.1.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+      "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^4.1.0"
+      }
+    }
+  }
+}
diff --git a/client/e2e/package.json b/client/e2e/package.json
new file mode 100644
index 000000000..dea45a2ef
--- /dev/null
+++ b/client/e2e/package.json
@@ -0,0 +1,21 @@
+{
+  "author": "Nick Fitzgerald <nfitzgerald@mozilla.com>",
+  "name": "create-rust-webpack",
+  "version": "0.1.5",
+  "repository": "https://github.com/rustwasm/rust-webpack-template",
+  "license": "(MIT OR Apache-2.0)",
+  "scripts": {
+    "start": "webpack-dev-server -d",
+    "build": "webpack"
+  },
+  "bin": {
+    "create-rust-webpack": ".bin/create-rust-webpack.js"
+  },
+  "devDependencies": {
+    "@wasm-tool/wasm-pack-plugin": "0.2.7",
+    "html-webpack-plugin": "^3.2.0",
+    "webpack": "^4.29.6",
+    "webpack-cli": "^3.3.0",
+    "webpack-dev-server": "^3.2.1"
+  }
+}
diff --git a/client/e2e/webpack.config.js b/client/e2e/webpack.config.js
new file mode 100644
index 000000000..cd9f5da88
--- /dev/null
+++ b/client/e2e/webpack.config.js
@@ -0,0 +1,27 @@
+const path = require("path");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+
+const dist = path.resolve(__dirname, "dist");
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
+
+module.exports = {
+  entry: "./js/index.js",
+  output: {
+    path: dist,
+    filename: "bundle.js"
+  },
+  devServer: {
+    contentBase: dist,
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: 'index.html'
+    }),
+
+    new WasmPackPlugin({
+      crateDirectory: path.resolve(__dirname, "../medea-client"),
+      // WasmPackPlugin defaults to compiling in "dev" profile. To change that, use forceMode: 'release':
+      // forceMode: 'release'
+    }),
+  ]
+};
diff --git a/client/medea-client/.gitignore b/client/medea-client/.gitignore
new file mode 100644
index 000000000..4e301317e
--- /dev/null
+++ b/client/medea-client/.gitignore
@@ -0,0 +1,6 @@
+/target
+**/*.rs.bk
+Cargo.lock
+bin/
+pkg/
+wasm-pack.log
diff --git a/client/medea-client/Cargo.toml b/client/medea-client/Cargo.toml
new file mode 100644
index 000000000..89ef837a8
--- /dev/null
+++ b/client/medea-client/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "medea-client"
+version = "0.1.0"
+authors = ["alexlapa <lapa.alex@ex.ua>"]
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[features]
+default = ["console_error_panic_hook"]
+
+[dependencies]
+cfg-if = "0.1.2"
+wasm-bindgen = "0.2"
+
+# The `console_error_panic_hook` crate provides better debugging of panics by
+# logging them with `console.error`. This is great for development, but requires
+# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
+# code size when deploying.
+console_error_panic_hook = { version = "0.1.1", optional = true }
+
+# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
+# compared to the default allocator's ~10K. It is slower than the default
+# allocator, however.
+#
+# Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
+wee_alloc = { version = "0.4.2", optional = true }
+
+[dev-dependencies]
+wasm-bindgen-test = "0.2"
+
+[profile.release]
+# Tell `rustc` to optimize for small code size.
+opt-level = "s"
diff --git a/client/medea-client/README.md b/client/medea-client/README.md
new file mode 100644
index 000000000..c30f5cfea
--- /dev/null
+++ b/client/medea-client/README.md
@@ -0,0 +1,17 @@
+### 🛠️ Build with `wasm-pack build`
+
+```
+wasm-pack build
+```
+
+### 🔬 Test in Headless Browsers with `wasm-pack test`
+
+```
+wasm-pack test --headless --firefox
+```
+
+### 🎁 Publish to NPM with `wasm-pack publish`
+
+```
+wasm-pack publish
+```
\ No newline at end of file
diff --git a/client/medea-client/src/lib.rs b/client/medea-client/src/lib.rs
new file mode 100644
index 000000000..2aeaa207e
--- /dev/null
+++ b/client/medea-client/src/lib.rs
@@ -0,0 +1,23 @@
+mod utils;
+
+use cfg_if::cfg_if;
+use wasm_bindgen::prelude::*;
+
+cfg_if::cfg_if! {
+    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
+    // allocator.
+    if #[cfg(feature = "wee_alloc")] {
+        #[global_allocator]
+        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+    }
+}
+
+#[wasm_bindgen]
+extern {
+    fn alert(s: &str);
+}
+
+#[wasm_bindgen]
+pub fn greet() {
+    alert("Hello, medea-client!");
+}
diff --git a/client/medea-client/src/utils.rs b/client/medea-client/src/utils.rs
new file mode 100644
index 000000000..ef5dcb7a8
--- /dev/null
+++ b/client/medea-client/src/utils.rs
@@ -0,0 +1,16 @@
+use cfg_if::cfg_if;
+
+cfg_if! {
+    // When the `console_error_panic_hook` feature is enabled, we can call the
+    // `set_panic_hook` function at least once during initialization, and then
+    // we will get better error messages if our code ever panics.
+    //
+    // For more details see
+    // https://github.com/rustwasm/console_error_panic_hook#readme
+    if #[cfg(feature = "console_error_panic_hook")] {
+        pub use console_error_panic_hook::set_once as set_panic_hook;
+    } else {
+        #[inline]
+        pub fn set_panic_hook() {}
+    }
+}
diff --git a/client/medea-client/tests/web.rs b/client/medea-client/tests/web.rs
new file mode 100644
index 000000000..de5c1dafe
--- /dev/null
+++ b/client/medea-client/tests/web.rs
@@ -0,0 +1,13 @@
+//! Test suite for the Web and headless browsers.
+
+#![cfg(target_arch = "wasm32")]
+
+extern crate wasm_bindgen_test;
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+#[wasm_bindgen_test]
+fn pass() {
+    assert_eq!(1 + 1, 2);
+}

From 573917705eb33e0d9dc023ecfd13adbb26fc8352 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 27 Mar 2019 19:32:57 +0200
Subject: [PATCH 059/179] add dummy test, update Cargo.toml

---
 client/medea-client/Cargo.toml   | 18 +++++++++++-------
 client/medea-client/src/lib.rs   | 17 +++++++++++++----
 client/medea-client/tests/web.rs |  9 ++++-----
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/client/medea-client/Cargo.toml b/client/medea-client/Cargo.toml
index 89ef837a8..0b8d48a36 100644
--- a/client/medea-client/Cargo.toml
+++ b/client/medea-client/Cargo.toml
@@ -1,8 +1,12 @@
 [package]
 name = "medea-client"
-version = "0.1.0"
-authors = ["alexlapa <lapa.alex@ex.ua>"]
+version = "0.1.0-dev"
 edition = "2018"
+description = "Medea web-client"
+authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
+homepage = "https://github.com/instrumentisto/medea"
+readme = "README.md"
+repository = "https://github.com/instrumentisto/medea"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -11,24 +15,24 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
-cfg-if = "0.1.2"
-wasm-bindgen = "0.2"
+cfg-if = "0.1.7"
+wasm-bindgen = "0.2.40"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
 # code size when deploying.
-console_error_panic_hook = { version = "0.1.1", optional = true }
+console_error_panic_hook = { version = "0.1.6", optional = true }
 
 # `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
 # compared to the default allocator's ~10K. It is slower than the default
 # allocator, however.
 #
 # Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
-wee_alloc = { version = "0.4.2", optional = true }
+wee_alloc = { version = "0.4.3", optional = true }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.2"
+wasm-bindgen-test = "0.2.40"
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.
diff --git a/client/medea-client/src/lib.rs b/client/medea-client/src/lib.rs
index 2aeaa207e..6c68a10c7 100644
--- a/client/medea-client/src/lib.rs
+++ b/client/medea-client/src/lib.rs
@@ -13,11 +13,20 @@ cfg_if::cfg_if! {
 }
 
 #[wasm_bindgen]
-extern {
-    fn alert(s: &str);
+pub struct Medea {
+    token: String,
 }
 
 #[wasm_bindgen]
-pub fn greet() {
-    alert("Hello, medea-client!");
+impl Medea {
+    #[wasm_bindgen(constructor)]
+    pub fn new(token: String) -> Self {
+        Self { token }
+    }
+
+    pub fn get_token(&self) -> String {
+        self.token.clone()
+    }
+
+    pub fn drop(self) {}
 }
diff --git a/client/medea-client/tests/web.rs b/client/medea-client/tests/web.rs
index de5c1dafe..8e3b0d763 100644
--- a/client/medea-client/tests/web.rs
+++ b/client/medea-client/tests/web.rs
@@ -1,13 +1,12 @@
-//! Test suite for the Web and headless browsers.
-
 #![cfg(target_arch = "wasm32")]
 
-extern crate wasm_bindgen_test;
+use medea_client::Medea;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
 
 #[wasm_bindgen_test]
-fn pass() {
-    assert_eq!(1 + 1, 2);
+fn some_dummy_test() {
+    let m = Medea::new("asd".to_string());
+    assert_eq!("asd".to_string(), m.get_token());
 }

From 70c13339519f86208e0bc24e99bbf6bb6e641073 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 28 Mar 2019 01:28:38 +0200
Subject: [PATCH 060/179] run medea-client unit tests in docker

---
 Makefile | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 78 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index a80805c51..d40a4ff94 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,16 @@
+###############################
+# Common defaults/definitions #
+###############################
+
+comma := ,
+
+# Checks two given strings for equality.
+eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\
+                                $(findstring $(2),$(1))),1)
+
+
+
+
 ######################
 # Project parameters #
 ######################
@@ -12,6 +25,13 @@ RUST_VER ?= "1.33"
 # Aliases #
 ###########
 
+# Resolve all project dependencies.
+#
+# Usage:
+#	make deps
+
+#deps: cargo yarn
+
 lint: cargo.lint
 
 
@@ -27,6 +47,39 @@ test: test.unit
 
 
 
+##################
+# Cargo commands #
+##################
+
+# Resolve Cargo project dependencies.
+#
+# Usage:
+#	make cargo [cmd=(fetch|<cargo-cmd>)]
+#	           [background=(no|yes)]
+#	           [dockerized=(no|yes)]
+#
+#cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
+#
+#cargo:
+#ifeq ($(dockerized),yes)
+#ifeq ($(background),yes)
+#	-@docker stop cargo-cmd
+#	-@docker rm cargo-cmd
+#endif
+#	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+#	           --name=cargo-cmd $(if $(call eq,$(background),yes),-d,) \
+#	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+#		rust:$(RUST_VER) \
+#			make cargo cmd='$(cargo-cmd)' dockerized=no background=no
+#else
+#	cargo $(cargo-cmd) $(if $(call eq,$(background),yes),&,)
+#ifeq ($(cargo-cmd),fetch)
+#	cargo run --bin export_graphql_schema
+#endif
+#endif
+
+
+
 
 # Lint Rust sources with clippy.
 #
@@ -35,7 +88,7 @@ test: test.unit
 
 cargo.lint:
 ifeq ($(dockerized),yes)
-	docker run --rm --network=host -v "$(PWD)":/app -w /app \
+	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
 	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
 		rust:$(RUST_VER) \
 			make cargo.lint dockerized=no pre-install=yes
@@ -52,17 +105,34 @@ endif
 # Run Rust unit tests of project.
 #
 # Usage:
-#	make test.unit [dockerized=(no|yes)]
+#	make test.unit [dockerized=(no|yes)] [app=(server|client)]
 
 test.unit:
 ifeq ($(dockerized),yes)
-	docker run --rm --network=host -v "$(PWD)":/app -w /app \
-	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-		rust:$(RUST_VER) \
-			make test.unit dockerized=no
+ifeq ($(app),server)
+		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+    	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+    		rust:$(RUST_VER) \
+    			make test.unit dockerized=no app=server
+endif
+ifeq ($(app),client)
+		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+    	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+    		alexlapa/wasm-pack:stable-$(RUST_VER)-ff-66.0 \
+    			make test.unit dockerized=no app=client
+endif
 else
+ifeq ($(app),)
+	make test.unit dockerized=$(dockerized) app=server
+	make test.unit dockerized=$(dockerized) app=client
+endif
+ifeq ($(app),server)
 	cargo test --all
 endif
+ifeq ($(app),client)
+	wasm-pack test --headless --firefox client/medea-client
+endif
+endif
 
 
 
@@ -76,7 +146,7 @@ endif
 cargo.fmt:
 ifeq ($(dockerized),yes)
 	docker pull rustlang/rust:nightly
-	docker run --rm --network=host -v "$(PWD)":/app -w /app \
+	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
 	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
 		rustlang/rust:nightly \
 			make cargo.fmt check='$(check)' dockerized=no pre-install=yes
@@ -96,4 +166,4 @@ endif
 ##################
 
 .PHONY: cargo cargo.fmt cargo.lint \
-        test test.e2e test.unit
+        test test.unit

From 30550cd33ed79dd1f70576f556f1198fefef9f9b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 28 Mar 2019 14:26:08 +0200
Subject: [PATCH 061/179] Impl remove peers of member on close RPC connection.

---
 Cargo.lock                   |   1 -
 Cargo.toml                   |   1 -
 signaling_test.html          |   9 +-
 src/api/client/commands.rs   |  25 +-
 src/api/client/connection.rs |   9 +-
 src/api/client/events.rs     |  13 +-
 src/api/client/room.rs       | 516 ++++++++++++++++-------------------
 src/api/client/session.rs    |  24 +-
 src/main.rs                  |   3 -
 src/media/peer.rs            |  45 ++-
 src/media/track.rs           |   4 +-
 11 files changed, 278 insertions(+), 372 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 89b3535e0..4c123d082 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -680,7 +680,6 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 6fba0956c..cc61a7de8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,6 @@ dotenv = "0.13"
 failure = "0.1"
 futures = "0.1"
 hashbrown = "0.1"
-lazy_static = "1.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 slog = "2.4"
diff --git a/signaling_test.html b/signaling_test.html
index 18a0e2660..fe2832c36 100644
--- a/signaling_test.html
+++ b/signaling_test.html
@@ -6,14 +6,12 @@
 
     <script type="text/javascript">
 
-        var member_id;
         var socket;
         var pcs = {};
 
         function connectSocket(caller) {
-            let role = caller ? "/caller_credentials" : "/responder_credentials";
-            member_id = caller ? 1 : 2;
-            socket = new WebSocket("ws://localhost:8080/ws/1/" + member_id + role);
+            let role = caller ? "1/caller_credentials" : "2/responder_credentials";
+            socket = new WebSocket("ws://localhost:8080/ws/1/" + role);
             socket.onmessage = handleSocketMessage;
 
             window.setInterval(function () {
@@ -105,7 +103,6 @@
 
                 socket.send(JSON.stringify({
                     MakeSdpAnswer: {
-                        member_id: member_id,
                         peer_id: msg.peer_id,
                         sdp_answer: JSON.stringify(answer)
                     }
@@ -115,7 +112,6 @@
                 pc.setLocalDescription(offer);
                 socket.send(JSON.stringify({
                     MakeSdpOffer: {
-                        member_id: member_id,
                         peer_id: msg.peer_id,
                         sdp_offer: JSON.stringify(offer)
                     }
@@ -128,7 +124,6 @@
                 if (e.candidate) {
                     socket.send(JSON.stringify({
                         SetIceCandidate: {
-                            member_id: member_id,
                             peer_id: msg.peer_id,
                             candidate: JSON.stringify(e.candidate)
                         }
diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index 504f77a58..2acd6f0b6 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -1,31 +1,16 @@
 use actix::Message;
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    api::client::RoomError, api::control::Id as MemberId,
-    media::peer::Id as PeerId,
-};
+use crate::{api::client::RoomError, media::peer::Id as PeerId};
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Message, Serialize)]
 #[rtype(result = "Result<(), RoomError>")]
 pub enum Command {
     /// Web Client sends SDP Offer.
-    MakeSdpOffer {
-        member_id: MemberId,
-        peer_id: PeerId,
-        sdp_offer: String,
-    },
+    MakeSdpOffer { peer_id: PeerId, sdp_offer: String },
     /// Web Client sends SDP Answer.
-    MakeSdpAnswer {
-        member_id: MemberId,
-        peer_id: PeerId,
-        sdp_answer: String,
-    },
-
-    SetIceCandidate {
-        member_id: MemberId,
-        peer_id: PeerId,
-        candidate: String,
-    },
+    MakeSdpAnswer { peer_id: PeerId, sdp_answer: String },
+    /// Web Client sends Ice Candidate.
+    SetIceCandidate { peer_id: PeerId, candidate: String },
 }
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index 3fee02327..263176645 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -7,7 +7,7 @@ use actix::{
     Message, SpawnHandle, StreamHandler,
 };
 use actix_web::ws::{self, CloseReason};
-use futures::future::{self, Future};
+use futures::future::Future;
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -124,7 +124,8 @@ impl Actor for WsConnection {
 }
 
 impl RpcConnection for Addr<WsConnection> {
-    /// Closes [`WsSession`] by sending itself "normal closure" close message.
+    /// Closes [`WsConnection`] by sending itself "normal closure" close
+    /// message.
     fn close(&self) -> Box<dyn Future<Item = (), Error = ()>> {
         let fut = self
             .send(Close {
@@ -134,6 +135,7 @@ impl RpcConnection for Addr<WsConnection> {
         Box::new(fut)
     }
 
+    /// Sends [`Event`] to Web Client.
     fn send_event(
         &self,
         event: Event,
@@ -166,6 +168,7 @@ impl Handler<Close> for WsConnection {
 impl Handler<Event> for WsConnection {
     type Result = ();
 
+    /// Sends [`Event`] to Web Client.
     fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
         debug!("Event {:?} for member {}", event, self.member_id);
         ctx.text(serde_json::to_string(&event).unwrap())
@@ -192,7 +195,6 @@ impl Handler<Heartbeat> for WsConnection {
     /// to the received `Heartbeat::Ping` message.
     fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
         if let Heartbeat::Ping(n) = msg {
-            debug!("Received ping: {}", n);
             ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
         }
     }
@@ -209,7 +211,6 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
             ws::Message::Text(text) => {
                 if let Ok(ping) = serde_json::from_str::<Heartbeat>(&text) {
                     self.reset_idle_timeout(ctx);
-                    debug!("{:?}", ping);
                     ctx.notify(ping);
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
index 11228f450..a5a8b9625 100644
--- a/src/api/client/events.rs
+++ b/src/api/client/events.rs
@@ -1,13 +1,10 @@
 use actix::Message;
 use serde::{Deserialize, Serialize};
 
-use crate::{
-    api::control::member::Id as MemberId,
-    media::{peer::Id as PeerId, track::DirectionalTrack},
-};
+use crate::media::{peer::Id as PeerId, track::DirectionalTrack};
 
 /// WebSocket message from Media Server to Web Client.
-#[derive(Debug, Deserialize, Message, Serialize)]
+#[derive(Clone, Debug, Deserialize, Message, Serialize)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
@@ -27,4 +24,10 @@ pub enum Event {
         peer_id: PeerId,
         candidate: String,
     },
+
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// close.
+    PeerFinished {
+        peer_id: PeerId,
+    },
 }
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index a5fa20b0b..19b4a6fa2 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -11,7 +11,7 @@ use actix::{
 };
 use failure::Fail;
 use futures::{
-    future::{self, join_all, Either},
+    future::{self, Either},
     Future,
 };
 use hashbrown::HashMap;
@@ -21,39 +21,17 @@ use crate::{
     api::control::{Id as MemberId, Member},
     log::prelude::*,
     media::{
-        peer::{Id as PeerId, Peer, PeerMachine, Transceiver},
-        track::{
-            AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
-        },
+        peer::{Id as PeerId, Peer, PeerMachine},
+        track::{AudioSettings, Track, TrackMediaType, VideoSettings},
     },
 };
-use slog::Error;
-
-lazy_static! {
-    static ref PEER_INDEX: Mutex<u64> = Mutex::new(0);
-}
-
-/// Generate next ID of [`Peer`].
-fn next_peer_id() -> PeerId {
-    let mut index = PEER_INDEX.lock().unwrap();
-    *index += 1;
-    *index
-}
 
 #[derive(Fail, Debug)]
 pub enum RoomError {
-    #[fail(display = "Member without peer {}", _0)]
-    MemberWithoutPeer(MemberId),
-    #[fail(display = "Unknown member {}", _0)]
-    UnknownMember(MemberId),
     #[fail(display = "Unknown peer {}", _0)]
     UnknownPeer(PeerId),
-    #[fail(display = "Peer dont have opponent {}", _0)]
-    NoOpponentPeer(PeerId),
-    #[fail(display = "Unmatched state of peer {}", _0)]
-    UnmatchedState(PeerId),
-    #[fail(display = "Cannot send event to member {}", _0)]
-    FailedSendEvent(MemberId),
+    #[fail(display = "Unmatched states between peers {} and {}", _0, _1)]
+    UnmatchedState(PeerId, PeerId),
 }
 
 /// ID of [`Room`].
@@ -64,12 +42,18 @@ pub type Id = u64;
 pub struct Room {
     /// ID of this [`Room`].
     pub id: Id,
+
     /// [`Member`]s which currently are present in this [`Room`].
     pub members: HashMap<MemberId, Member>,
+
+    /// [`Peer`]s of [`Member`]s in this [`Room`].
+    pub peers: HashMap<PeerId, PeerMachine>,
+
     /// [`Session`]s of [`Member`]s in this [`Room`].
     pub sessions: HashMap<MemberId, Session>,
-    /* TODO: Replace Box<dyn RpcConnection>> with enum,
-     *       as the set of all possible RpcConnection types is not closed. */
+
+    /// Index for generate unique ID for [`Peer`] in this [`Room`].
+    peer_index: PeerId,
 }
 
 impl Room {
@@ -78,191 +62,197 @@ impl Room {
         Room {
             id,
             members,
+            peers: HashMap::new(),
             sessions: HashMap::new(),
+            peer_index: 0,
         }
     }
 
-    pub fn remove_session(&mut self, member_id: MemberId) {
-        if let Some(session) = self.sessions.remove(&member_id) {
-            for peer in session.peers.values() {
-                if let Some(transceiver_session) =
-                    self.sessions.get_mut(&peer.transceiver().member_id)
-                {
-                    info!(
-                        "Remove peer {:?} of member {:?}",
-                        peer.transceiver().peer_id,
-                        peer.transceiver().member_id
-                    );
-                    transceiver_session
-                        .remove_peer(&peer.transceiver().peer_id);
-                }
-            }
-        }
+    /// Store [`Peer`] in [`Room`].
+    fn add_peer(&mut self, id: PeerId, peer: PeerMachine) {
+        self.peers.insert(id, peer);
+    }
+
+    /// Returns borrowed [`Peer`] by its ID.
+    fn get_peer(&self, peer_id: &PeerId) -> Result<&PeerMachine, RoomError> {
+        self.peers
+            .get(peer_id)
+            .ok_or(RoomError::UnknownPeer(*peer_id))
+    }
+
+    /// Returns ID's all [`Peer`] of specified [`Member`].
+    fn member_peers(&mut self, member_id: &MemberId) -> Vec<PeerId> {
+        self.peers
+            .iter()
+            .filter(|(_, peer)| peer.member_id() == *member_id)
+            .map(|(&id, _)| id)
+            .collect::<Vec<_>>()
+    }
+
+    /// Generate next ID of [`Peer`].
+    fn next_peer_id(&mut self) -> PeerId {
+        self.peer_index += 1;
+        self.peer_index
+    }
+
+    /// Returns [`Peer`] by its ID.
+    fn take_peer(
+        &mut self,
+        peer_id: &PeerId,
+    ) -> Result<PeerMachine, RoomError> {
+        self.peers
+            .remove(peer_id)
+            .ok_or(RoomError::UnknownPeer(*peer_id))
     }
 
+    /// Creates two connected [`Peer`]s and returns [`Event`] to caller
+    /// that [`Peer`] is created.
+    fn start_pipeline(
+        &mut self,
+        caller: MemberId,
+        callee: MemberId,
+    ) -> OnEvent {
+        info!("Member {} call member {}", caller, callee);
+        let caller_peer_id = self.next_peer_id();
+        let callee_peer_id = self.next_peer_id();
+        let mut caller_peer = Peer::new(caller_peer_id, caller, callee_peer_id);
+        let mut callee_peer = Peer::new(callee_peer_id, callee, caller_peer_id);
+
+        let track_audio =
+            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
+        let track_video =
+            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
+        caller_peer.add_sender(track_audio.clone());
+        caller_peer.add_sender(track_video.clone());
+        callee_peer.add_receiver(track_audio);
+        callee_peer.add_receiver(track_video);
+
+        let event = OnEvent {
+            member_id: caller,
+            event: Event::PeerCreated {
+                peer_id: caller_peer_id,
+                sdp_offer: None,
+                tracks: caller_peer.tracks(),
+            },
+        };
+        self.add_peer(
+            caller_peer_id,
+            PeerMachine::WaitLocalSDP(caller_peer.start()),
+        );
+        self.add_peer(callee_peer_id, PeerMachine::New(callee_peer));
+
+        event
+    }
+
+    /// Applies an offer to the specified and associated [`Peer`].
+    /// Returns [`Event`] to callee that [`Peer`] is created.
     fn handle_make_sdp_offer(
         &mut self,
-        from_member_id: MemberId,
         from_peer_id: PeerId,
         sdp_offer: String,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_session = self
-            .sessions
-            .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownMember(from_member_id))?;
-        let from_peer = from_session
-            .remove_peer(&from_peer_id)
-            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
-        let transceiver = match from_peer {
-            PeerMachine::WaitLocalSDP(peer) => {
-                let from_peer = peer.set_local_sdp(sdp_offer.clone());
-                let trans = from_peer.transceiver();
-                from_session.add_peer(PeerMachine::WaitRemoteSDP(from_peer));
-                Ok(trans)
-            }
-            _ => {
-                let peer_id = from_peer.id();
-                from_session.add_peer(from_peer);
-                Err(RoomError::UnmatchedState(peer_id))
+    ) -> Result<OnEvent, RoomError> {
+        let from_peer = self.take_peer(&from_peer_id)?;
+        let to_peer_id = from_peer.to_peer();
+        let to_peer = self.take_peer(&to_peer_id)?;
+
+        let (from_peer, to_peer) = match (from_peer, to_peer) {
+            (
+                PeerMachine::WaitLocalSDP(peer_from),
+                PeerMachine::New(peer_to),
+            ) => Ok((peer_from, peer_to)),
+            (from_peer, to_peer) => {
+                self.add_peer(from_peer_id, from_peer);
+                self.add_peer(to_peer_id, to_peer);
+                Err(RoomError::UnmatchedState(from_peer_id, to_peer_id))
             }
         }?;
 
-        let to_session = self
-            .sessions
-            .get_mut(&transceiver.member_id)
-            .ok_or(RoomError::UnknownMember(transceiver.member_id))?;
-        let to_peer = to_session
-            .remove_peer(&transceiver.peer_id)
-            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
-
-        let event = match to_peer {
-            PeerMachine::New(peer) => {
-                let to_peer = peer.set_remote_sdp(sdp_offer.clone());
-                let event = Event::PeerCreated {
-                    peer_id: to_peer.id(),
-                    sdp_offer: Some(sdp_offer),
-                    tracks: to_peer.tracks(),
-                };
-                to_session.add_peer(PeerMachine::WaitLocalHaveRemote(to_peer));
-                Ok(event)
-            }
-            _ => {
-                let peer_id = to_peer.id();
-                to_session.add_peer(to_peer);
-                Err(RoomError::UnmatchedState(peer_id))
-            }
-        }?;
-        Ok((to_session.member_id, event))
+        let from_peer = from_peer.set_local_sdp(sdp_offer.clone());
+        let to_peer = to_peer.set_remote_sdp(sdp_offer.clone());
+
+        let event = OnEvent {
+            member_id: to_peer.member_id(),
+            event: Event::PeerCreated {
+                peer_id: to_peer_id,
+                sdp_offer: Some(sdp_offer),
+                tracks: to_peer.tracks(),
+            },
+        };
+
+        self.add_peer(from_peer_id, PeerMachine::WaitRemoteSDP(from_peer));
+        self.add_peer(to_peer_id, PeerMachine::WaitLocalHaveRemote(to_peer));
+        Ok(event)
     }
 
+    /// Applies an answer to the specified and associated [`Peer`].
+    /// Returns [`Event`] to caller that callee has confirmed offer.
     fn handle_make_sdp_answer(
         &mut self,
-        from_member_id: MemberId,
         from_peer_id: PeerId,
         sdp_answer: String,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_session = self
-            .sessions
-            .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownMember(from_member_id))?;
-        let from_peer = from_session
-            .remove_peer(&from_peer_id)
-            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
-        let transceiver = match from_peer {
-            PeerMachine::WaitLocalHaveRemote(peer) => {
-                let from_peer = peer.set_local_sdp(sdp_answer.clone());
-                let trans = from_peer.transceiver();
-                from_session.add_peer(PeerMachine::Stable(from_peer));
-                Ok(trans)
-            }
-            _ => {
-                let peer_id = from_peer.id();
-                from_session.add_peer(from_peer);
-                Err(RoomError::UnmatchedState(peer_id))
+    ) -> Result<OnEvent, RoomError> {
+        let from_peer = self.take_peer(&from_peer_id)?;
+        let to_peer_id = from_peer.to_peer();
+        let to_peer = self.take_peer(&to_peer_id)?;
+
+        let (from_peer, to_peer) = match (from_peer, to_peer) {
+            (
+                PeerMachine::WaitLocalHaveRemote(peer_from),
+                PeerMachine::WaitRemoteSDP(peer_to),
+            ) => Ok((peer_from, peer_to)),
+            (from_peer, to_peer) => {
+                self.add_peer(from_peer_id, from_peer);
+                self.add_peer(to_peer_id, to_peer);
+                Err(RoomError::UnmatchedState(from_peer_id, to_peer_id))
             }
         }?;
 
-        let to_session = self
-            .sessions
-            .get_mut(&transceiver.member_id)
-            .ok_or(RoomError::UnknownMember(transceiver.member_id))?;
-        let to_peer = to_session
-            .remove_peer(&transceiver.peer_id)
-            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
-
-        let event = match to_peer {
-            PeerMachine::WaitRemoteSDP(peer) => {
-                let to_peer = peer.set_remote_sdp(sdp_answer.clone());
-                let event = Event::SdpAnswerMade {
-                    peer_id: to_peer.id(),
-                    sdp_answer,
-                };
-                to_session.add_peer(PeerMachine::Stable(to_peer));
-                Ok(event)
-            }
-            _ => {
-                let peer_id = to_peer.id();
-                to_session.add_peer(to_peer);
-                Err(RoomError::UnmatchedState(peer_id))
-            }
-        }?;
-        Ok((to_session.member_id, event))
+        let from_peer = from_peer.set_local_sdp(sdp_answer.clone());
+        let to_peer = to_peer.set_remote_sdp(sdp_answer.clone());
+
+        let event = OnEvent {
+            member_id: to_peer.member_id(),
+            event: Event::SdpAnswerMade {
+                peer_id: to_peer_id,
+                sdp_answer,
+            },
+        };
+
+        self.add_peer(from_peer_id, PeerMachine::Stable(from_peer));
+        self.add_peer(to_peer_id, PeerMachine::Stable(to_peer));
+        Ok(event)
     }
 
+    /// Sends Ice Candidate from the specified to the associated [`Peer`].
     fn handle_set_ice_candidate(
         &mut self,
-        from_member_id: MemberId,
         from_peer_id: PeerId,
         candidate: String,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_session = self
-            .sessions
-            .get_mut(&from_member_id)
-            .ok_or(RoomError::UnknownMember(from_member_id))?;
-        let from_peer = from_session
-            .peers
-            .get(&from_peer_id)
-            .ok_or(RoomError::UnknownPeer(from_peer_id))?;
-        let transceiver = match from_peer {
-            PeerMachine::WaitLocalSDP(_)
-            | PeerMachine::WaitLocalHaveRemote(_)
-            | PeerMachine::WaitRemoteSDP(_)
-            | PeerMachine::Stable(_) => Ok(from_peer.transceiver()),
-            _ => Err(RoomError::UnmatchedState(from_peer_id)),
+    ) -> Result<OnEvent, RoomError> {
+        let from_peer = self.get_peer(&from_peer_id)?;
+        let to_peer_id = from_peer.to_peer();
+        let to_peer = self.get_peer(&to_peer_id)?;
+
+        match (from_peer, to_peer) {
+            (
+                PeerMachine::WaitRemoteSDP(_),
+                PeerMachine::WaitLocalHaveRemote(_),
+            )
+            | (
+                PeerMachine::WaitLocalHaveRemote(_),
+                PeerMachine::WaitRemoteSDP(_),
+            )
+            | (PeerMachine::Stable(_), PeerMachine::Stable(_)) => Ok(()),
+            _ => Err(RoomError::UnmatchedState(from_peer_id, to_peer_id)),
         }?;
-        let to_session = self
-            .sessions
-            .get_mut(&transceiver.member_id)
-            .ok_or(RoomError::UnknownMember(transceiver.member_id))?;
-        let to_peer = to_session
-            .peers
-            .get(&transceiver.peer_id)
-            .ok_or(RoomError::UnknownPeer(transceiver.peer_id))?;
-
-        let event = Event::IceCandidateDiscovered {
-            peer_id: to_peer.id(),
-            candidate,
-        };
-        Ok((to_session.member_id, event))
-    }
 
-    fn send_event(
-        &self,
-        member_id: MemberId,
-        event: Event,
-    ) -> Box<dyn Future<Item = (), Error = RoomError>> {
-        info!("Send event {:?} to member {}", event, member_id);
-        let fut = match self.sessions.get(&member_id) {
-            Some(session) => Either::A(
-                session
-                    .send_event(event)
-                    .map_err(move |_| RoomError::FailedSendEvent(member_id)),
-            ),
-            None => {
-                Either::B(future::err(RoomError::UnknownMember(member_id)))
-            }
-        };
-        Box::new(fut)
+        Ok(OnEvent {
+            member_id: to_peer.member_id(),
+            event: Event::IceCandidateDiscovered {
+                peer_id: to_peer_id,
+                candidate,
+            },
+        })
     }
 }
 
@@ -278,6 +268,7 @@ pub trait RpcConnection: fmt::Debug + Send {
     /// No [`RpcConnectionClosed`] signals should be emitted.
     fn close(&self) -> Box<dyn Future<Item = (), Error = ()>>;
 
+    /// Sends [`Event`] to remote [`Member`].
     fn send_event(
         &self,
         event: Event,
@@ -350,80 +341,30 @@ impl Handler<RpcConnectionEstablished> for Room {
     ) -> Self::Result {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
-        let mut fut;
+        let mut fut = Either::A(future::ok(()));
         if let Some(session) = self.sessions.get_mut(&msg.member_id) {
             debug!(
                 "Replaced RpcConnection for member {} session",
                 msg.member_id
             );
-            fut = Either::A(session.set_connection(msg.connection));
+            fut = Either::B(session.set_connection(msg.connection));
         } else {
-            let member_id = msg.member_id;
-            let mut session = Session::new(msg.member_id, msg.connection);
-
-            let futures = self.sessions.iter_mut().fold(
-                vec![],
-                |mut futures, (_, caller)| {
-                    let event = start_pipeline(caller, &mut session);
-                    futures.push(caller.send_event(event));
-                    futures
-                },
-            );
-            self.sessions.insert(member_id, session);
-            fut = Either::B(join_all(futures).map(|_| ()));
+            let caller = msg.member_id;
+            let active_members = self
+                .sessions
+                .keys()
+                .map(|&member_id| member_id)
+                .collect::<Vec<_>>();
+            self.sessions
+                .insert(caller, Session::new(caller, msg.connection));
+            active_members.iter().for_each(|&callee| {
+                ctx.notify(self.start_pipeline(caller, callee));
+            });
         }
-
         Box::new(wrap_future(fut))
     }
 }
 
-fn start_pipeline(caller: &mut Session, callee: &mut Session) -> Event {
-    info!(
-        "Member {} call member {}",
-        caller.member_id, callee.member_id
-    );
-    let caller_peer_id = next_peer_id();
-    let callee_peer_id = next_peer_id();
-    let mut caller_peer = Peer::new(
-        caller_peer_id,
-        caller.member_id,
-        Transceiver {
-            member_id: callee.member_id,
-            peer_id: callee_peer_id,
-        },
-    );
-    let mut callee_peer = Peer::new(
-        callee_peer_id,
-        callee.member_id,
-        Transceiver {
-            member_id: caller.member_id,
-            peer_id: caller_peer_id,
-        },
-    );
-
-    let track_audio =
-        Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
-    let track_video =
-        Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
-    caller_peer.add_sender(track_audio.clone());
-    caller_peer.add_sender(track_video.clone());
-    callee_peer.add_receiver(track_audio);
-    callee_peer.add_receiver(track_video);
-
-    let event = Event::PeerCreated {
-        peer_id: caller_peer.id(),
-        sdp_offer: None,
-        tracks: caller_peer.tracks(),
-    };
-    let caller_peer = PeerMachine::WaitLocalSDP(caller_peer.start());
-    caller.add_peer(caller_peer);
-
-    let callee_peer = PeerMachine::New(callee_peer);
-    callee.add_peer(callee_peer);
-
-    event
-}
-
 impl Handler<Command> for Room {
     type Result = ActFuture<(), RoomError>;
 
@@ -434,46 +375,21 @@ impl Handler<Command> for Room {
         command: Command,
         ctx: &mut Self::Context,
     ) -> Self::Result {
-        let fut = match command {
-            Command::MakeSdpOffer {
-                member_id,
-                peer_id,
-                sdp_offer,
-            } => {
-                match self.handle_make_sdp_offer(member_id, peer_id, sdp_offer)
-                {
-                    Ok((member_id, event)) => {
-                        Either::A(self.send_event(member_id, event))
-                    }
-                    Err(e) => Either::B(future::err(e)),
-                }
+        let res = match command {
+            Command::MakeSdpOffer { peer_id, sdp_offer } => {
+                self.handle_make_sdp_offer(peer_id, sdp_offer)
             }
             Command::MakeSdpAnswer {
-                member_id,
                 peer_id,
                 sdp_answer,
-            } => match self
-                .handle_make_sdp_answer(member_id, peer_id, sdp_answer)
-            {
-                Ok((member_id, event)) => {
-                    Either::A(self.send_event(member_id, event))
-                }
-                Err(e) => Either::B(future::err(e)),
-            },
-            Command::SetIceCandidate {
-                member_id,
-                peer_id,
-                candidate,
-            } => match self
-                .handle_set_ice_candidate(member_id, peer_id, candidate)
-            {
-                Ok((member_id, event)) => {
-                    Either::A(self.send_event(member_id, event))
-                }
-                Err(e) => Either::B(future::err(e)),
-            },
+            } => self.handle_make_sdp_answer(peer_id, sdp_answer),
+            Command::SetIceCandidate { peer_id, candidate } => {
+                self.handle_set_ice_candidate(peer_id, candidate)
+            }
         };
-        Box::new(wrap_future(fut))
+        Box::new(wrap_future(future::done(
+            res.map(|event| ctx.notify(event)),
+        )))
     }
 }
 
@@ -499,12 +415,44 @@ impl Handler<RpcConnectionClosed> for Room {
     type Result = ();
 
     /// Removes [`Session`] of specified [`Member`] from the [`Room`].
-    fn handle(&mut self, msg: RpcConnectionClosed, _: &mut Self::Context) {
+    fn handle(&mut self, msg: RpcConnectionClosed, ctx: &mut Self::Context) {
         info!(
             "RpcConnectionClosed for member {}, reason {:?}",
             msg.member_id, msg.reason
         );
-        self.remove_session(msg.member_id);
+        self.sessions.remove(&msg.member_id);
+        self.member_peers(&msg.member_id)
+            .iter()
+            .for_each(|peer_id| {
+                self.peers
+                    .remove(peer_id)
+                    .and_then(|peer| self.peers.remove(&peer.to_peer()))
+                    .map(|to_peer| {
+                        ctx.notify(OnEvent {
+                            member_id: to_peer.member_id(),
+                            event: Event::PeerFinished {
+                                peer_id: to_peer.id(),
+                            },
+                        })
+                    });
+            })
+    }
+}
+
+#[derive(Debug, Message)]
+pub struct OnEvent {
+    member_id: MemberId,
+    event: Event,
+}
+
+impl Handler<OnEvent> for Room {
+    type Result = ();
+
+    /// Sends [`Event`] to specified [`Member`] of [`Room`].
+    fn handle(&mut self, msg: OnEvent, ctx: &mut Self::Context) {
+        if let Some(session) = self.sessions.get(&msg.member_id) {
+            ctx.wait(wrap_future(session.send_event(msg.event)));
+        }
     }
 }
 
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index bcbe76a36..3f24f6acb 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,15 +1,16 @@
 use futures::Future;
-use hashbrown::HashMap;
 
-use crate::api::client::{Event, RpcConnection};
-use crate::api::control::member::Id as MemberId;
-use crate::media::peer::{Id as PeerId, PeerMachine};
+use crate::api::{
+    client::{Event, RpcConnection},
+    control::member::Id as MemberId,
+};
 
 #[derive(Debug)]
 pub struct Session {
     pub member_id: MemberId,
+    // TODO: Replace Box<dyn RpcConnection>> with enum,
+    //       as the set of all possible RpcConnection types is not closed.
     connection: Box<dyn RpcConnection>,
-    pub peers: HashMap<PeerId, PeerMachine>,
 }
 
 impl Session {
@@ -20,29 +21,20 @@ impl Session {
         Session {
             member_id,
             connection,
-            peers: HashMap::new(),
         }
     }
 
-    pub fn add_peer(&mut self, peer: PeerMachine) {
-        self.peers.insert(peer.id(), peer);
-    }
-
-    pub fn remove_peer(&mut self, peer_id: &PeerId) -> Option<PeerMachine> {
-        self.peers.remove(peer_id)
-    }
-
     pub fn send_event(
         &self,
         event: Event,
-    ) -> Box<dyn Future<Item = (), Error = ()>> {
+    ) -> impl Future<Item = (), Error = ()> {
         self.connection.send_event(event)
     }
 
     pub fn set_connection(
         &mut self,
         connection: Box<dyn RpcConnection>,
-    ) -> Box<dyn Future<Item = (), Error = ()>> {
+    ) -> impl Future<Item = (), Error = ()> {
         let fut = self.connection.close();
         self.connection = connection;
         fut
diff --git a/src/main.rs b/src/main.rs
index 3721dc175..5bf89cd62 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,8 +1,5 @@
 //! Medea media server application.
 
-#[macro_use]
-extern crate lazy_static;
-
 use actix::prelude::*;
 use dotenv::dotenv;
 
diff --git a/src/media/peer.rs b/src/media/peer.rs
index b582b9a91..486374cf7 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -4,7 +4,6 @@ use hashbrown::HashMap;
 
 use crate::{
     api::control::member::Id as MemberId,
-    log::prelude::*,
     media::track::{DirectionalTrack, Id as TrackId, Track, TrackDirection},
 };
 
@@ -60,27 +59,15 @@ impl PeerMachine {
         }
     }
 
-    pub fn transceiver(&self) -> Transceiver {
+    pub fn to_peer(&self) -> Id {
         match self {
-            PeerMachine::New(peer) => peer.transceiver(),
-            PeerMachine::WaitLocalSDP(peer) => peer.transceiver(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.transceiver(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.transceiver(),
-            PeerMachine::Stable(peer) => peer.transceiver(),
-            PeerMachine::Finished(peer) => peer.transceiver(),
-            PeerMachine::Failure(peer) => peer.transceiver(),
-        }
-    }
-
-    pub fn tracks(&self) -> Vec<DirectionalTrack> {
-        match self {
-            PeerMachine::New(peer) => peer.tracks(),
-            PeerMachine::WaitLocalSDP(peer) => peer.tracks(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.tracks(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.tracks(),
-            PeerMachine::Stable(peer) => peer.tracks(),
-            PeerMachine::Finished(peer) => peer.tracks(),
-            PeerMachine::Failure(peer) => peer.tracks(),
+            PeerMachine::New(peer) => peer.to_peer(),
+            PeerMachine::WaitLocalSDP(peer) => peer.to_peer(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.to_peer(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.to_peer(),
+            PeerMachine::Stable(peer) => peer.to_peer(),
+            PeerMachine::Finished(peer) => peer.to_peer(),
+            PeerMachine::Failure(peer) => peer.to_peer(),
         }
     }
 }
@@ -97,7 +84,7 @@ pub type Id = u64;
 #[derive(Debug)]
 pub struct PeerContext {
     id: Id,
-    transceiver: Transceiver,
+    to_peer: Id,
     member_id: MemberId,
     sdp_offer: Option<String>,
     sdp_answer: Option<String>,
@@ -121,8 +108,8 @@ impl<T: Any> Peer<T> {
         self.context.id
     }
 
-    pub fn transceiver(&self) -> Transceiver {
-        self.context.transceiver.clone()
+    pub fn to_peer(&self) -> Id {
+        self.context.to_peer
     }
 
     pub fn tracks(&self) -> Vec<DirectionalTrack> {
@@ -133,7 +120,7 @@ impl<T: Any> Peer<T> {
                     id: track.id,
                     media_type: track.media_type.clone(),
                     direction: TrackDirection::Send {
-                        receivers: vec![self.context.transceiver.peer_id],
+                        receivers: vec![self.context.to_peer],
                     },
                 });
                 tracks
@@ -147,7 +134,7 @@ impl<T: Any> Peer<T> {
                     id: track.id,
                     media_type: track.media_type.clone(),
                     direction: TrackDirection::Recv {
-                        sender: self.context.transceiver.peer_id,
+                        sender: self.context.to_peer,
                     },
                 });
                 tracks
@@ -157,11 +144,11 @@ impl<T: Any> Peer<T> {
 
 impl Peer<New> {
     /// Creates new [`Peer`] for [`Member`].
-    pub fn new(id: Id, member_id: MemberId, transceiver: Transceiver) -> Self {
+    pub fn new(id: Id, member_id: MemberId, to_peer: Id) -> Self {
         let context = PeerContext {
             id,
-            transceiver,
             member_id,
+            to_peer,
             sdp_offer: None,
             sdp_answer: None,
             receivers: HashMap::new(),
@@ -207,7 +194,7 @@ impl Peer<New> {
 
 #[test]
 fn create_peer() {
-    let peer = Peer::new(1, 1, Transceiver(2, 2));
+    let peer = Peer::new(1, 1, 2);
     let peer = peer.start();
 
     assert_eq!(peer.state, WaitLocalSDP {});
diff --git a/src/media/track.rs b/src/media/track.rs
index 44a371ed8..b671913db 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -20,7 +20,7 @@ impl Track {
 }
 
 /// [`Track] with specified direction.
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct DirectionalTrack {
     pub id: Id,
     pub media_type: TrackMediaType,
@@ -28,7 +28,7 @@ pub struct DirectionalTrack {
 }
 
 /// Direction of [`Track`].
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum TrackDirection {
     Send { receivers: Vec<PeerID> },
     Recv { sender: PeerID },

From 8749709503bcc04b191ba92acddf80d144068040 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 28 Mar 2019 16:34:17 +0200
Subject: [PATCH 062/179] fix make test.unit

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d40a4ff94..1064b925e 100644
--- a/Makefile
+++ b/Makefile
@@ -108,6 +108,10 @@ endif
 #	make test.unit [dockerized=(no|yes)] [app=(server|client)]
 
 test.unit:
+ifeq ($(app),)
+	make test.unit dockerized=$(dockerized) app=server
+	make test.unit dockerized=$(dockerized) app=client
+endif
 ifeq ($(dockerized),yes)
 ifeq ($(app),server)
 		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
@@ -122,10 +126,6 @@ ifeq ($(app),client)
     			make test.unit dockerized=no app=client
 endif
 else
-ifeq ($(app),)
-	make test.unit dockerized=$(dockerized) app=server
-	make test.unit dockerized=$(dockerized) app=client
-endif
 ifeq ($(app),server)
 	cargo test --all
 endif

From 55169da4793f96987da9a716fc76f1025d98469b Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 28 Mar 2019 17:08:33 +0200
Subject: [PATCH 063/179] Some fix

---
 src/api/client/room.rs   | 30 ++++++++++++++++--------------
 src/api/client/server.rs |  1 -
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index e8d79e95e..f41abf384 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -349,15 +349,15 @@ impl Handler<RpcConnectionEstablished> for Room {
             );
             fut = Either::B(session.set_connection(msg.connection));
         } else {
-            let caller = msg.member_id;
+            let callee = msg.member_id;
             let active_members = self
                 .sessions
                 .keys()
                 .map(|&member_id| member_id)
                 .collect::<Vec<_>>();
             self.sessions
-                .insert(caller, Session::new(caller, msg.connection));
-            active_members.iter().for_each(|&callee| {
+                .insert(callee, Session::new(callee, msg.connection));
+            active_members.iter().for_each(|&caller| {
                 ctx.notify(self.start_pipeline(caller, callee));
             });
         }
@@ -479,11 +479,8 @@ impl RoomsRepository {
 
 #[cfg(test)]
 mod test {
-    use std::time::{Duration, Instant};
-
     use actix::{Arbiter, AsyncContext, System};
-    use futures::future::{result, Future};
-    use tokio::timer::Delay;
+    use futures::future::Future;
 
     use super::*;
 
@@ -537,17 +534,22 @@ mod test {
                     peer_id: _,
                     candidate: _,
                 } => {}
+                Event::PeerFinished { peer_id: _ } => {}
             }
         }
     }
 
     impl RpcConnection for Addr<TestConnection> {
-        fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>> {
+        fn close(&self) -> Box<dyn Future<Item = (), Error = ()>> {
             Box::new(future::ok(()))
         }
 
-        fn send_event(&self, event: Event) {
-            self.do_send(event);
+        fn send_event(
+            &self,
+            event: Event,
+        ) -> Box<dyn Future<Item = (), Error = ()>> {
+            let fut = self.send(event).map_err(|_| ());
+            Box::new(fut)
         }
     }
 
@@ -588,12 +590,12 @@ mod test {
         assert_eq!(
             caller_events.to_vec(),
             vec![
-                "{\"PeerCreated\":{\"peer_id\":0,\"sdp_offer\":null,\
+                "{\"PeerCreated\":{\"peer_id\":1,\"sdp_offer\":null,\
                  \"tracks\":[{\"id\":1,\"media_type\":{\"Audio\":{}},\
-                 \"direction\":{\"Send\":{\"receivers\":[1]}}},{\"id\":2,\
+                 \"direction\":{\"Send\":{\"receivers\":[2]}}},{\"id\":2,\
                  \"media_type\":{\"Video\":{}},\"direction\":{\"Send\":\
-                 {\"receivers\":[1]}}}]}}",
-                "{\"SdpAnswerMade\":{\"peer_id\":0,\"sdp_answer\":\
+                 {\"receivers\":[2]}}}]}}",
+                "{\"SdpAnswerMade\":{\"peer_id\":1,\"sdp_answer\":\
                  \"responder_answer\"}}",
             ]
         );
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 7a8cec7a5..81bba467a 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -93,7 +93,6 @@ mod test {
     use actix::Arbiter;
     use actix_web::{http, test, App};
     use futures::Stream;
-    use hashbrown::HashMap;
 
     use crate::api::{
         client::{connection, Room},

From e5d37eadbf86a5c69a0187ae70739638a56867d7 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 28 Mar 2019 17:19:06 +0200
Subject: [PATCH 064/179] add make deps

---
 Makefile                     |   73 +-
 client/e2e/package-lock.json | 5976 ----------------------------------
 client/e2e/yarn.lock         | 4112 +++++++++++++++++++++++
 3 files changed, 4162 insertions(+), 5999 deletions(-)
 delete mode 100644 client/e2e/package-lock.json
 create mode 100644 client/e2e/yarn.lock

diff --git a/Makefile b/Makefile
index 1064b925e..07616f321 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\
 
 CARGO_HOME ?= $(strip $(shell dirname $$(dirname $$(which cargo))))
 RUST_VER ?= "1.33"
+NODE_VER ?= "11.10"
 
 
 
@@ -30,7 +31,7 @@ RUST_VER ?= "1.33"
 # Usage:
 #	make deps
 
-#deps: cargo yarn
+deps: cargo yarn
 
 lint: cargo.lint
 
@@ -47,36 +48,62 @@ test: test.unit
 
 
 
-##################
-# Cargo commands #
-##################
-
 # Resolve Cargo project dependencies.
 #
 # Usage:
 #	make cargo [cmd=(fetch|<cargo-cmd>)]
 #	           [background=(no|yes)]
 #	           [dockerized=(no|yes)]
+
+cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
+
+cargo:
+ifeq ($(dockerized),yes)
+ifeq ($(background),yes)
+	-@docker stop cargo-cmd
+	-@docker rm cargo-cmd
+endif
+	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+	           --name=cargo-cmd $(if $(call eq,$(background),yes),-d,) \
+	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+		rust:$(RUST_VER) \
+			make cargo cmd='$(cargo-cmd)' dockerized=no background=no
+else
+	cargo $(cargo-cmd) $(if $(call eq,$(background),yes),&,)
+ifeq ($(cargo-cmd),fetch)
+	cargo fetch --manifest-path client/medea-client/Cargo.toml
+endif
+endif
+
+
+
+#################
+# Yarn commands #
+#################
+
+# Resolve NPM project dependencies with Yarn.
 #
-#cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
+# Optional 'cmd' parameter may be used for handy usage of docker-wrapped Yarn,
+# for example: make yarn cmd='upgrade'
 #
-#cargo:
-#ifeq ($(dockerized),yes)
-#ifeq ($(background),yes)
-#	-@docker stop cargo-cmd
-#	-@docker rm cargo-cmd
-#endif
-#	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-#	           --name=cargo-cmd $(if $(call eq,$(background),yes),-d,) \
-#	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-#		rust:$(RUST_VER) \
-#			make cargo cmd='$(cargo-cmd)' dockerized=no background=no
-#else
-#	cargo $(cargo-cmd) $(if $(call eq,$(background),yes),&,)
-#ifeq ($(cargo-cmd),fetch)
-#	cargo run --bin export_graphql_schema
-#endif
-#endif
+# Usage:
+#	make yarn [cmd=('fetch'|<yarn-cmd>)]
+#	          [dockerized=(yes|no)]
+
+yarn-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
+
+yarn:
+ifneq ($(dockerized),no)
+	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+		node:$(NODE_VER) \
+			make yarn cmd='$(yarn-cmd)' dockerized=no
+else
+ifeq ($(yarn-cmd),fetch)
+	yarn install --pure-lockfile --cwd client/e2e
+else
+	yarn $(yarn-cmd)
+endif
+endif
 
 
 
diff --git a/client/e2e/package-lock.json b/client/e2e/package-lock.json
deleted file mode 100644
index 7a4e6f1e9..000000000
--- a/client/e2e/package-lock.json
+++ /dev/null
@@ -1,5976 +0,0 @@
-{
-  "name": "create-rust-webpack",
-  "version": "0.1.5",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@wasm-tool/wasm-pack-plugin": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@wasm-tool/wasm-pack-plugin/-/wasm-pack-plugin-0.2.7.tgz",
-      "integrity": "sha512-B6YgQIBUMY2E/Xye8y1O3uTOSttP/i3oi+f/2LlwLzAnxJL1qJnzsV+eUne1mjPVFSppONt8ZMVQWXIB3Y4MHA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "command-exists": "^1.2.7",
-        "watchpack": "^1.6.0"
-      }
-    },
-    "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
-      }
-    },
-    "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
-      }
-    },
-    "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
-      "dev": true,
-      "requires": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
-      "dev": true,
-      "requires": {
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
-      "dev": true
-    },
-    "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
-        "@xtuc/long": "4.2.2"
-      }
-    },
-    "@xtuc/ieee754": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "dev": true
-    },
-    "@xtuc/long": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.18",
-        "negotiator": "0.6.1"
-      }
-    },
-    "acorn": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz",
-      "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==",
-      "dev": true
-    },
-    "acorn-dynamic-import": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz",
-      "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz",
-      "integrity": "sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ajv-errors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz",
-      "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=",
-      "dev": true
-    },
-    "ajv-keywords": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
-      "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
-      "dev": true
-    },
-    "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true
-    },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-flatten": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-      "dev": true
-    },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true,
-      "requires": {
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "async": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-      "dev": true
-    },
-    "async-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
-      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
-      "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "base64-js": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
-    },
-    "batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
-      "dev": true
-    },
-    "big.js": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true
-    },
-    "binary-extensions": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
-      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-      "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.18.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
-      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
-      "dev": true,
-      "requires": {
-        "bytes": "3.0.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "~1.6.3",
-        "iconv-lite": "0.4.23",
-        "on-finished": "~2.3.0",
-        "qs": "6.5.2",
-        "raw-body": "2.3.3",
-        "type-is": "~1.6.16"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "bonjour": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
-      "dev": true,
-      "requires": {
-        "array-flatten": "^2.1.0",
-        "deep-equal": "^1.0.1",
-        "dns-equal": "^1.0.0",
-        "dns-txt": "^2.0.2",
-        "multicast-dns": "^6.0.1",
-        "multicast-dns-service-types": "^1.1.0"
-      }
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
-    "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "buffer-indexof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
-      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
-      "dev": true
-    },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "dev": true
-    },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-      "dev": true
-    },
-    "cacache": {
-      "version": "11.3.2",
-      "resolved": "http://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz",
-      "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.3",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.2",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.15",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-          "dev": true
-        }
-      }
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
-      }
-    },
-    "camelcase": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-      "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chokidar": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
-      "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.0",
-        "braces": "^2.3.0",
-        "fsevents": "^1.2.2",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.1",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "lodash.debounce": "^4.0.8",
-        "normalize-path": "^2.1.1",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.0.0",
-        "upath": "^1.0.5"
-      }
-    },
-    "chownr": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
-      "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
-      "dev": true
-    },
-    "chrome-trace-event": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
-      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "clean-css": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
-      "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
-      "dev": true,
-      "requires": {
-        "source-map": "0.5.x"
-      }
-    },
-    "cliui": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-      "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-      "dev": true,
-      "requires": {
-        "string-width": "^2.1.1",
-        "strip-ansi": "^4.0.0",
-        "wrap-ansi": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.2",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
-      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.1"
-      }
-    },
-    "color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
-      "dev": true
-    },
-    "command-exists": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz",
-      "integrity": "sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==",
-      "dev": true
-    },
-    "commander": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-      "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-      "dev": true
-    },
-    "compressible": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz",
-      "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
-      "dev": true,
-      "requires": {
-        "mime-db": ">= 1.38.0 < 2"
-      }
-    },
-    "compression": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.14",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.1",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      }
-    },
-    "connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
-      "dev": true
-    },
-    "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "^0.1.4"
-      }
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
-      "dev": true
-    },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
-      "dev": true
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
-      "dev": true
-    },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
-    "css-select": {
-      "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0",
-        "css-what": "2.1",
-        "domutils": "1.5.1",
-        "nth-check": "~1.0.1"
-      }
-    },
-    "css-what": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
-      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
-      "dev": true
-    },
-    "cyclist": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
-      "dev": true
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.1.1"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
-      }
-    },
-    "decamelize": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-      "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
-      "dev": true,
-      "requires": {
-        "xregexp": "4.0.0"
-      }
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=",
-      "dev": true
-    },
-    "default-gateway": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.1.2.tgz",
-      "integrity": "sha512-xhJUAp3u02JsBGovj0V6B6uYhKCUOmiNc8xGmReUwGu77NmvcpxPVB0pCielxMFumO7CmXBG02XjM8HB97k8Hw==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "dev": true,
-      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
-      "dev": true,
-      "requires": {
-        "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
-      }
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
-    "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
-      "dev": true
-    },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      }
-    },
-    "dns-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
-      "dev": true
-    },
-    "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
-      "dev": true,
-      "requires": {
-        "ip": "^1.1.0",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "dns-txt": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
-      "dev": true,
-      "requires": {
-        "buffer-indexof": "^1.0.0"
-      }
-    },
-    "dom-converter": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
-      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
-      "dev": true,
-      "requires": {
-        "utila": "~0.3"
-      },
-      "dependencies": {
-        "utila": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
-          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
-          "dev": true
-        }
-      }
-    },
-    "dom-serializer": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
-      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "~1.1.1",
-        "entities": "~1.1.1"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
-          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
-          "dev": true
-        }
-      }
-    },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
-    "domelementtype": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
-      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
-      "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "elliptic": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
-      "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
-      }
-    },
-    "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
-        "tapable": "^1.0.0"
-      }
-    },
-    "entities": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
-      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
-      "dev": true
-    },
-    "errno": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
-      "requires": {
-        "prr": "~1.0.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "eslint-scope": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
-      "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
-      "dev": true
-    },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
-      "dev": true
-    },
-    "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
-      "dev": true
-    },
-    "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-      "dev": true,
-      "requires": {
-        "original": "^1.0.0"
-      }
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "execa": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
-      "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^3.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "express": {
-      "version": "4.16.4",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz",
-      "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.5",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.18.3",
-        "content-disposition": "0.5.2",
-        "content-type": "~1.0.4",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.1.1",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.4",
-        "qs": "6.5.2",
-        "range-parser": "~1.2.0",
-        "safe-buffer": "5.1.2",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "~1.4.0",
-        "type-is": "~1.6.16",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "array-flatten": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
-          "dev": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
-    },
-    "faye-websocket": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
-      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
-      "dev": true,
-      "requires": {
-        "websocket-driver": ">=0.5.1"
-      }
-    },
-    "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
-      "dev": true
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.4.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "find-cache-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.0.0.tgz",
-      "integrity": "sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^1.0.0",
-        "pkg-dir": "^3.0.0"
-      }
-    },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^3.0.0"
-      }
-    },
-    "findup-sync": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-      "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-      "dev": true,
-      "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^3.1.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      }
-    },
-    "follow-redirects": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz",
-      "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.6"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-      "dev": true
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
-      "dev": true
-    },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      }
-    },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
-      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "^2.9.2",
-        "node-pre-gyp": "^0.10.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "2.6.9",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "deep-extend": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.21",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": "^2.1.0"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.1",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^2.1.2",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.10.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.0",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.1.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.1.10",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.5.1",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.5.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.0.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.2.4",
-            "minizlib": "^1.1.0",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.1",
-            "yallist": "^3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "glob": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
-    },
-    "globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
-      }
-    },
-    "graceful-fs": {
-      "version": "4.1.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
-    },
-    "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
-      "dev": true
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
-    },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
-      "dev": true
-    },
-    "html-minifier": {
-      "version": "3.5.19",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.19.tgz",
-      "integrity": "sha512-Qr2JC9nsjK8oCrEmuB430ZIA8YWbF3D5LSjywD75FTuXmeqacwHgIM8wp3vHYzzPbklSjp53RdmDuzR4ub2HzA==",
-      "dev": true,
-      "requires": {
-        "camel-case": "3.0.x",
-        "clean-css": "4.1.x",
-        "commander": "2.16.x",
-        "he": "1.1.x",
-        "param-case": "2.1.x",
-        "relateurl": "0.2.x",
-        "uglify-js": "3.4.x"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.16.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
-          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "3.4.7",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.7.tgz",
-          "integrity": "sha512-J0M2i1mQA+ze3EdN9SBi751DNdAXmeFLfJrd/MDIkRc3G3Gbb9OPVSx7GIQvVwfWxQARcYV2DTxIkMyDAk3o9Q==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.16.0",
-            "source-map": "~0.6.1"
-          }
-        }
-      }
-    },
-    "html-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
-      "dev": true,
-      "requires": {
-        "html-minifier": "^3.2.3",
-        "loader-utils": "^0.2.16",
-        "lodash": "^4.17.3",
-        "pretty-error": "^2.0.2",
-        "tapable": "^1.0.0",
-        "toposort": "^1.0.0",
-        "util.promisify": "1.0.0"
-      },
-      "dependencies": {
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "dev": true,
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
-        }
-      }
-    },
-    "htmlparser2": {
-      "version": "3.3.0",
-      "resolved": "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
-      "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1",
-        "domhandler": "2.1",
-        "domutils": "1.1",
-        "readable-stream": "1.0"
-      },
-      "dependencies": {
-        "domutils": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
-          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
-          "dev": true,
-          "requires": {
-            "domelementtype": "1"
-          }
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        }
-      }
-    },
-    "http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
-      "dev": true
-    },
-    "http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      }
-    },
-    "http-parser-js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz",
-      "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==",
-      "dev": true
-    },
-    "http-proxy": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
-      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^3.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
-      "dev": true,
-      "requires": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
-      }
-    },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
-      "dev": true
-    },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
-          "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
-    "internal-ip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.2.0.tgz",
-      "integrity": "sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==",
-      "dev": true,
-      "requires": {
-        "default-gateway": "^4.0.1",
-        "ipaddr.js": "^1.9.0"
-      },
-      "dependencies": {
-        "ipaddr.js": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-          "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
-          "dev": true
-        }
-      }
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "dev": true
-    },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "dev": true
-    },
-    "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
-      "dev": true
-    },
-    "ipaddr.js": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz",
-      "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=",
-      "dev": true
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
-      "dev": true
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz",
-      "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
-      "dev": true
-    },
-    "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^1.0.0"
-      }
-    },
-    "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.1"
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
-      "dev": true
-    },
-    "json5": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-      "dev": true
-    },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-      "dev": true
-    },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-      "dev": true
-    },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
-    "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
-      "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-      "dev": true,
-      "requires": {
-        "big.js": "^3.1.3",
-        "emojis-list": "^2.0.0",
-        "json5": "^0.5.0"
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-      "dev": true
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
-      "dev": true
-    },
-    "loglevel": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
-      "dev": true
-    },
-    "lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
-      "dev": true
-    },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "make-dir": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
-    "map-age-cleaner": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz",
-      "integrity": "sha512-UN1dNocxQq44IhJyMI4TU8phc2m9BddacHRPRjKGLYaF0jqd3xLz0jS0skpAU9WgYyoR4gHtUpzytNBS385FWQ==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "mem": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz",
-      "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^1.0.0",
-        "p-is-promise": "^1.1.0"
-      }
-    },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
-      "dev": true,
-      "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
-      "dev": true
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
-      }
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-      "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.22",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
-      "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
-      "dev": true,
-      "requires": {
-        "mime-db": "~1.38.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "dev": true
-    },
-    "minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-      "dev": true
-    },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
-    },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
-    "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      }
-    },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      }
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
-    },
-    "multicast-dns": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
-      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
-      "dev": true,
-      "requires": {
-        "dns-packet": "^1.3.1",
-        "thunky": "^1.0.2"
-      }
-    },
-    "multicast-dns-service-types": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
-      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
-      "dev": true,
-      "optional": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
-      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz",
-      "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==",
-      "dev": true
-    },
-    "no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
-      "dev": true,
-      "requires": {
-        "lower-case": "^1.1.1"
-      }
-    },
-    "node-forge": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz",
-      "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==",
-      "dev": true
-    },
-    "node-libs-browser": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz",
-      "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "nth-check": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
-      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
-      "dev": true
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
-      "dev": true
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "opn": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
-      "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^1.1.0"
-      }
-    },
-    "original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "requires": {
-        "url-parse": "^1.4.3"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "dev": true
-    },
-    "os-locale": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.0.1.tgz",
-      "integrity": "sha512-7g5e7dmXPtzcP4bgsZ8ixDVqA7oWYuEz4lOSujeWyliPai4gfVDiFIcwBg3aGCPnmSGfzOKTK3ccPn0CKv3DBw==",
-      "dev": true,
-      "requires": {
-        "execa": "^0.10.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-is-promise": {
-      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
-      "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
-      "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
-      "dev": true
-    },
-    "p-try": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-      "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
-      "dev": true
-    },
-    "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
-      "dev": true
-    },
-    "parallel-transform": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
-      "dev": true,
-      "requires": {
-        "cyclist": "~0.2.2",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      }
-    },
-    "param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
-      "dev": true,
-      "requires": {
-        "no-case": "^2.2.0"
-      }
-    },
-    "parse-asn1": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
-      "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^4.0.0",
-        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
-    "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
-      "dev": true
-    },
-    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0"
-      }
-    },
-    "portfinder": {
-      "version": "1.0.20",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
-      "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==",
-      "dev": true,
-      "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "pretty-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
-      "dev": true,
-      "requires": {
-        "renderkid": "^2.0.1",
-        "utila": "~0.4"
-      }
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
-    },
-    "promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
-      "dev": true
-    },
-    "proxy-addr": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz",
-      "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==",
-      "dev": true,
-      "requires": {
-        "forwarded": "~0.1.2",
-        "ipaddr.js": "1.8.0"
-      }
-    },
-    "prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
-    },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "querystringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
-      "dev": true
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
-      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.3",
-        "iconv-lite": "0.4.23",
-        "unpipe": "1.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "minimatch": "^3.0.2",
-        "readable-stream": "^2.0.2",
-        "set-immediate-shim": "^1.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
-      "dev": true
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "renderkid": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
-      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
-      "dev": true,
-      "requires": {
-        "css-select": "^1.1.0",
-        "dom-converter": "~0.1",
-        "htmlparser2": "~3.3.0",
-        "strip-ansi": "^3.0.0",
-        "utila": "~0.3"
-      },
-      "dependencies": {
-        "utila": {
-          "version": "0.3.3",
-          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
-          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
-          "dev": true
-        }
-      }
-    },
-    "repeat-element": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
-      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.0.5"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
-      }
-    },
-    "select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
-      "dev": true
-    },
-    "selfsigned": {
-      "version": "1.10.4",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
-      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.7.5"
-      }
-    },
-    "semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-      "dev": true
-    },
-    "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "~1.6.2",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "~2.3.0",
-        "range-parser": "~1.2.0",
-        "statuses": "~1.4.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "serialize-javascript": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.6.1.tgz",
-      "integrity": "sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==",
-      "dev": true
-    },
-    "serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-      "dev": true,
-      "requires": {
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "parseurl": "~1.3.2",
-        "send": "0.16.2"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-immediate-shim": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
-    "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
-      "dev": true
-    },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "sockjs": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
-      "dev": true,
-      "requires": {
-        "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
-      }
-    },
-    "sockjs-client": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.5",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "~0.11.1",
-        "inherits": "^2.0.3",
-        "json3": "^3.3.2",
-        "url-parse": "^1.4.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "faye-websocket": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
-          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
-          "dev": true,
-          "requires": {
-            "websocket-driver": ">=0.5.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-          "dev": true
-        }
-      }
-    },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "spdy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz",
-      "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      }
-    },
-    "spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
-          "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-      }
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==",
-      "dev": true
-    },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "tapable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
-      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
-      "dev": true
-    },
-    "terser": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
-      "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
-      "dev": true,
-      "requires": {
-        "commander": "~2.17.1",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.9"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "terser-webpack-plugin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
-      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
-      "dev": true,
-      "requires": {
-        "cacache": "^11.0.2",
-        "find-cache-dir": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
-        "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      }
-    },
-    "thunky": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
-      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "toposort": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
-      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
-      "dev": true
-    },
-    "tslib": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
-      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==",
-      "dev": true
-    },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
-    "type-is": {
-      "version": "1.6.16",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.18"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
-      }
-    },
-    "unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "dev": true,
-      "requires": {
-        "unique-slug": "^2.0.0"
-      }
-    },
-    "unique-slug": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
-      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4"
-      }
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
-      "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
-      "dev": true
-    },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-parse": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-      "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
-      "dev": true,
-      "requires": {
-        "querystringify": "^2.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-      "dev": true
-    },
-    "v8-compile-cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
-      "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==",
-      "dev": true
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
-      "dev": true
-    },
-    "vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true,
-      "requires": {
-        "indexof": "0.0.1"
-      }
-    },
-    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^2.0.2",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "webpack": {
-      "version": "4.29.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
-      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.0.5",
-        "acorn-dynamic-import": "^4.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
-        "chrome-trace-event": "^1.0.0",
-        "enhanced-resolve": "^4.1.0",
-        "eslint-scope": "^4.0.0",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.3.0",
-        "loader-utils": "^1.1.0",
-        "memory-fs": "~0.4.1",
-        "micromatch": "^3.1.8",
-        "mkdirp": "~0.5.0",
-        "neo-async": "^2.5.0",
-        "node-libs-browser": "^2.0.0",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.0",
-        "terser-webpack-plugin": "^1.1.0",
-        "watchpack": "^1.5.0",
-        "webpack-sources": "^1.3.0"
-      },
-      "dependencies": {
-        "tapable": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
-          "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-cli": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.0.tgz",
-      "integrity": "sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "cross-spawn": "^6.0.5",
-        "enhanced-resolve": "^4.1.0",
-        "findup-sync": "^2.0.0",
-        "global-modules": "^1.0.0",
-        "import-local": "^2.0.0",
-        "interpret": "^1.1.0",
-        "loader-utils": "^1.1.0",
-        "supports-color": "^5.5.0",
-        "v8-compile-cache": "^2.0.2",
-        "yargs": "^12.0.5"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
-          "integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
-          "dev": true
-        },
-        "decamelize": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-          "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        },
-        "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz",
-      "integrity": "sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
-      "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
-        "debug": "^4.1.1",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
-        "http-proxy-middleware": "^0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.2.0",
-        "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
-        "sockjs": "0.3.19",
-        "sockjs-client": "1.3.0",
-        "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.5.1",
-        "webpack-log": "^2.0.0",
-        "yargs": "12.0.2"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "webpack-sources": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz",
-      "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.0",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "websocket-driver": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
-      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
-      "dev": true,
-      "requires": {
-        "http-parser-js": ">=0.4.0",
-        "websocket-extensions": ">=0.1.1"
-      }
-    },
-    "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "worker-farm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "xregexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-      "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
-    },
-    "yallist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-      "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-      "dev": true,
-      "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^2.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.0.0",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^3.2.1 || ^4.0.0",
-        "yargs-parser": "^10.1.0"
-      }
-    },
-    "yargs-parser": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-      "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^4.1.0"
-      }
-    }
-  }
-}
diff --git a/client/e2e/yarn.lock b/client/e2e/yarn.lock
new file mode 100644
index 000000000..8c2e3cf62
--- /dev/null
+++ b/client/e2e/yarn.lock
@@ -0,0 +1,4112 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@wasm-tool/wasm-pack-plugin@0.2.7":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@wasm-tool/wasm-pack-plugin/-/wasm-pack-plugin-0.2.7.tgz#116189b57b952de06b8080b0541b860c8eb8824f"
+  integrity sha512-B6YgQIBUMY2E/Xye8y1O3uTOSttP/i3oi+f/2LlwLzAnxJL1qJnzsV+eUne1mjPVFSppONt8ZMVQWXIB3Y4MHA==
+  dependencies:
+    chalk "^2.4.1"
+    command-exists "^1.2.7"
+    watchpack "^1.6.0"
+
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    mamacro "^0.0.3"
+
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
+
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+accepts@~1.3.4, accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
+
+acorn@^6.0.5:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
+ajv-errors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
+
+ajv-keywords@^3.1.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
+  integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
+
+ajv@^6.1.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-colors@^3.0.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
+
+ansi-html@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  dependencies:
+    micromatch "^3.1.4"
+    normalize-path "^2.1.1"
+
+aproba@^1.0.3, aproba@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+
+arr-flatten@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+
+array-flatten@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+asn1.js@^4.0.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
+  dependencies:
+    bn.js "^4.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
+  dependencies:
+    util "0.10.3"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+
+async-each@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
+  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
+
+async@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+base64-js@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
+batch@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+binary-extensions@^1.0.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+
+bluebird@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
+
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
+
+body-parser@1.18.3:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
+  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
+  dependencies:
+    bytes "3.0.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "~1.6.3"
+    iconv-lite "0.4.23"
+    on-finished "~2.3.0"
+    qs "6.5.2"
+    raw-body "2.3.3"
+    type-is "~1.6.16"
+
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
+boolbase@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^2.3.1, braces@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+  dependencies:
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
+    repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
+
+brorand@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
+
+browserify-aes@^1.0.0, browserify-aes@^1.0.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
+  dependencies:
+    buffer-xor "^1.0.3"
+    cipher-base "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.3"
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+browserify-cipher@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
+  dependencies:
+    browserify-aes "^1.0.4"
+    browserify-des "^1.0.0"
+    evp_bytestokey "^1.0.0"
+
+browserify-des@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
+  dependencies:
+    cipher-base "^1.0.1"
+    des.js "^1.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+browserify-rsa@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
+  dependencies:
+    bn.js "^4.1.0"
+    randombytes "^2.0.1"
+
+browserify-sign@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
+  dependencies:
+    bn.js "^4.1.1"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.2"
+    elliptic "^6.0.0"
+    inherits "^2.0.1"
+    parse-asn1 "^5.0.0"
+
+browserify-zlib@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
+  dependencies:
+    pako "~1.0.5"
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+buffer-indexof@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
+
+buffer-xor@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
+
+buffer@^4.3.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
+cacache@^11.0.2:
+  version "11.3.2"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
+  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
+  dependencies:
+    bluebird "^3.5.3"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.3"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.2"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+camel-case@3.0.x:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
+
+camelcase@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+
+camelcase@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
+  integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==
+
+chalk@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chokidar@^2.0.0, chokidar@^2.0.2:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
+chownr@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
+  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
+
+chrome-trace-event@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
+  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
+  dependencies:
+    tslib "^1.9.0"
+
+cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
+
+clean-css@4.2.x:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
+  dependencies:
+    source-map "~0.6.0"
+
+cliui@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+command-exists@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
+  integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
+
+commander@2.17.x:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
+
+commander@^2.19.0, commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
+component-emitter@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+
+compressible@~2.0.16:
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
+  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
+  dependencies:
+    mime-db ">= 1.38.0 < 2"
+
+compression@^1.5.2:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  dependencies:
+    accepts "~1.3.5"
+    bytes "3.0.0"
+    compressible "~2.0.16"
+    debug "2.6.9"
+    on-headers "~1.0.2"
+    safe-buffer "5.1.2"
+    vary "~1.1.2"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+concat-stream@^1.5.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+connect-history-api-fallback@^1.3.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
+
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
+  dependencies:
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
+
+content-disposition@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
+
+content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+
+copy-concurrently@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
+  dependencies:
+    aproba "^1.1.1"
+    fs-write-stream-atomic "^1.0.8"
+    iferr "^0.1.5"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.0"
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+create-ecdh@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
+  dependencies:
+    bn.js "^4.1.0"
+    elliptic "^6.0.0"
+
+create-hash@^1.1.0, create-hash@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
+  dependencies:
+    cipher-base "^1.0.1"
+    inherits "^2.0.1"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
+    sha.js "^2.4.0"
+
+create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
+  dependencies:
+    cipher-base "^1.0.3"
+    create-hash "^1.1.0"
+    inherits "^2.0.1"
+    ripemd160 "^2.0.0"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
+crypto-browserify@^3.11.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
+  dependencies:
+    browserify-cipher "^1.0.0"
+    browserify-sign "^4.0.0"
+    create-ecdh "^4.0.0"
+    create-hash "^1.1.0"
+    create-hmac "^1.1.0"
+    diffie-hellman "^5.0.0"
+    inherits "^2.0.1"
+    pbkdf2 "^3.0.3"
+    public-encrypt "^4.0.0"
+    randombytes "^2.0.0"
+    randomfill "^1.0.3"
+
+css-select@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
+  dependencies:
+    boolbase "~1.0.0"
+    css-what "2.1"
+    domutils "1.5.1"
+    nth-check "~1.0.1"
+
+css-what@2.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
+
+cyclist@~0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
+
+debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.2.5, debug@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
+debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
+decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
+  dependencies:
+    xregexp "4.0.0"
+
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+
+deep-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
+
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
+default-gateway@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
+  dependencies:
+    execa "^1.0.0"
+    ip-regex "^2.1.0"
+
+define-properties@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+  dependencies:
+    object-keys "^1.0.12"
+
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
+
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+
+des.js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
+  dependencies:
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+
+destroy@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-node@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+
+diffie-hellman@^5.0.0:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
+  dependencies:
+    bn.js "^4.1.0"
+    miller-rabin "^4.0.0"
+    randombytes "^2.0.0"
+
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+
+dns-packet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
+  dependencies:
+    buffer-indexof "^1.0.0"
+
+dom-converter@^0.2:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
+  dependencies:
+    utila "~0.4"
+
+dom-serializer@0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
+  dependencies:
+    domelementtype "^1.3.0"
+    entities "^1.1.1"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
+
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domutils@1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+duplexify@^3.4.2, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+  dependencies:
+    end-of-stream "^1.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+    stream-shift "^1.0.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+
+elliptic@^6.0.0:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
+  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
+  dependencies:
+    bn.js "^4.4.0"
+    brorand "^1.0.1"
+    hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
+    inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  dependencies:
+    once "^1.4.0"
+
+enhanced-resolve@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.4.0"
+    tapable "^1.0.0"
+
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+errno@^0.1.3, errno@~0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
+  dependencies:
+    prr "~1.0.1"
+
+es-abstract@^1.5.1:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
+es-to-primitive@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+eslint-scope@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.1.0, estraverse@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+
+eventemitter3@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
+  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
+
+eventsource@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
+  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+  dependencies:
+    original "^1.0.0"
+
+evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
+  dependencies:
+    md5.js "^1.3.4"
+    safe-buffer "^5.1.1"
+
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
+express@^4.16.2:
+  version "4.16.4"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
+  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.3"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.4"
+    qs "6.5.2"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.2"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  dependencies:
+    is-extendable "^0.1.0"
+
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+fast-deep-equal@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+
+faye-websocket@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+faye-websocket@~0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
+  dependencies:
+    websocket-driver ">=0.5.1"
+
+figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
+find-cache-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
+flush-write-stream@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.3.6"
+
+follow-redirects@^1.0.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
+  integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
+  dependencies:
+    debug "^3.2.6"
+
+for-in@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+
+forwarded@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+
+from2@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
+fs-minipass@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
+  dependencies:
+    minipass "^2.2.1"
+
+fs-write-stream-atomic@^1.0.8:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+  dependencies:
+    graceful-fs "^4.1.2"
+    iferr "^0.1.5"
+    imurmurhash "^0.1.4"
+    readable-stream "1 || 2"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+fsevents@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
+glob-parent@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
+  dependencies:
+    is-glob "^3.1.0"
+    path-dirname "^1.0.0"
+
+glob@^7.0.3, glob@^7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
+
+handle-thing@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
+  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.1, has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hash-base@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+hash.js@^1.0.0, hash.js@^1.0.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
+  dependencies:
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.1"
+
+he@1.2.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+hmac-drbg@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
+homedir-polyfill@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
+  dependencies:
+    parse-passwd "^1.0.0"
+
+hpack.js@^2.1.6:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  dependencies:
+    inherits "^2.0.1"
+    obuf "^1.0.0"
+    readable-stream "^2.0.1"
+    wbuf "^1.1.0"
+
+html-entities@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+
+html-minifier@^3.2.3:
+  version "3.5.21"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
+  dependencies:
+    camel-case "3.0.x"
+    clean-css "4.2.x"
+    commander "2.17.x"
+    he "1.2.x"
+    param-case "2.1.x"
+    relateurl "0.2.x"
+    uglify-js "3.4.x"
+
+html-webpack-plugin@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
+  dependencies:
+    html-minifier "^3.2.3"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
+    pretty-error "^2.0.2"
+    tapable "^1.0.0"
+    toposort "^1.0.0"
+    util.promisify "1.0.0"
+
+htmlparser2@^3.3.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+http-deceiver@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
+
+http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
+http-parser-js@>=0.4.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
+  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
+
+http-proxy-middleware@^0.19.1:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+  dependencies:
+    http-proxy "^1.17.0"
+    is-glob "^4.0.0"
+    lodash "^4.17.11"
+    micromatch "^3.1.10"
+
+http-proxy@^1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
+  dependencies:
+    eventemitter3 "^3.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+https-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+
+iconv-lite@0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
+  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.4.4:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+iferr@^0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
+
+ignore-walk@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
+  dependencies:
+    minimatch "^3.0.4"
+
+import-local@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+  dependencies:
+    pkg-dir "^3.0.0"
+    resolve-cwd "^2.0.0"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
+
+ini@^1.3.4, ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+
+internal-ip@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
+  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
+  dependencies:
+    default-gateway "^4.0.1"
+    ipaddr.js "^1.9.0"
+
+interpret@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ip-regex@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+
+ip@^1.1.0, ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
+ipaddr.js@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
+  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+
+ipaddr.js@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+
+is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-extendable@^0.1.0, is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+
+is-extendable@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  dependencies:
+    is-plain-object "^2.0.4"
+
+is-extglob@^2.1.0, is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+
+is-glob@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  dependencies:
+    is-extglob "^2.1.0"
+
+is-glob@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  dependencies:
+    has "^1.0.1"
+
+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  dependencies:
+    has-symbols "^1.0.0"
+
+is-windows@^1.0.1, is-windows@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
+is-wsl@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  dependencies:
+    isarray "1.0.0"
+
+isobject@^3.0.0, isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+
+json-parse-better-errors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+json3@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
+
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+killable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
+  dependencies:
+    invert-kv "^2.0.0"
+
+loader-runner@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@^0.2.16:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+loader-utils@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
+lodash@^4.17.11, lodash@^4.17.3:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
+loglevel@^1.4.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
+
+lower-case@^1.1.1:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+mamacro@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
+map-age-cleaner@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
+md5.js@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+    safe-buffer "^5.1.2"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+
+mem@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.2.0.tgz#5ee057680ed9cb8dad8a78d820f9a8897a102025"
+  integrity sha512-5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA==
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^2.0.0"
+    p-is-promise "^2.0.0"
+
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
+  dependencies:
+    bn.js "^4.0.0"
+    brorand "^1.0.1"
+
+"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
+  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
+
+mime-types@~2.1.17, mime-types@~2.1.18:
+  version "2.1.22"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
+  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
+  dependencies:
+    mime-db "~1.38.0"
+
+mime@1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+
+mime@^2.3.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
+  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+
+mimic-fn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.0.0.tgz#0913ff0b121db44ef5848242c38bbb35d44cabde"
+  integrity sha512-jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA==
+
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
+
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+minipass@^2.2.1, minipass@^2.3.4:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
+  dependencies:
+    minipass "^2.2.1"
+
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
+mixin-deep@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
+  dependencies:
+    minimist "0.0.8"
+
+move-concurrently@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
+  dependencies:
+    aproba "^1.1.1"
+    copy-concurrently "^1.0.0"
+    fs-write-stream-atomic "^1.0.8"
+    mkdirp "^0.5.1"
+    rimraf "^2.5.4"
+    run-queue "^1.0.3"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
+
+multicast-dns@^6.0.1:
+  version "6.2.3"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
+  dependencies:
+    dns-packet "^1.3.1"
+    thunky "^1.0.2"
+
+nan@^2.9.2:
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
+  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
+
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+needle@^2.2.1:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
+  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
+  dependencies:
+    debug "^2.1.2"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+
+neo-async@^2.5.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
+
+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
+no-case@^2.2.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+  dependencies:
+    lower-case "^1.1.1"
+
+node-forge@0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
+
+node-libs-browser@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
+  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.0"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
+  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+npm-bundled@^1.0.1:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
+
+npm-packlist@^1.1.6:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
+  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  dependencies:
+    path-key "^2.0.0"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+nth-check@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+  dependencies:
+    boolbase "~1.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
+object-keys@^1.0.12:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
+  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
+
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
+object.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
+object.pick@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  dependencies:
+    isobject "^3.0.1"
+
+obuf@^1.0.0, obuf@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  dependencies:
+    ee-first "1.1.1"
+
+on-headers@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+opn@^5.1.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
+  dependencies:
+    is-wsl "^1.1.0"
+
+original@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
+  dependencies:
+    url-parse "^1.4.3"
+
+os-browserify@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-locale@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
+  dependencies:
+    execa "^1.0.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-is-promise@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
+  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
+
+p-limit@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
+p-try@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.1.0.tgz#c1a0f1030e97de018bb2c718929d2af59463e505"
+  integrity sha512-H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA==
+
+pako@~1.0.5:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
+
+parallel-transform@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
+  dependencies:
+    cyclist "~0.2.2"
+    inherits "^2.0.3"
+    readable-stream "^2.1.5"
+
+param-case@2.1.x:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
+  dependencies:
+    no-case "^2.2.0"
+
+parse-asn1@^5.0.0:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
+  dependencies:
+    asn1.js "^4.0.0"
+    browserify-aes "^1.0.0"
+    create-hash "^1.1.0"
+    evp_bytestokey "^1.0.0"
+    pbkdf2 "^3.0.3"
+    safe-buffer "^5.1.1"
+
+parse-passwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+
+parseurl@~1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
+
+path-dirname@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
+
+path-exists@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+
+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+
+pbkdf2@^3.0.3:
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
+  dependencies:
+    create-hash "^1.1.2"
+    create-hmac "^1.1.4"
+    ripemd160 "^2.0.1"
+    safe-buffer "^5.0.1"
+    sha.js "^2.4.8"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
+  dependencies:
+    find-up "^3.0.0"
+
+portfinder@^1.0.9:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
+posix-character-classes@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+
+pretty-error@^2.0.2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+  integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
+  dependencies:
+    renderkid "^2.0.1"
+    utila "~0.4"
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+process@^0.11.10:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+
+proxy-addr@~2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
+  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.8.0"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+
+public-encrypt@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
+  dependencies:
+    bn.js "^4.1.0"
+    browserify-rsa "^4.0.0"
+    create-hash "^1.1.0"
+    parse-asn1 "^5.0.0"
+    randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
+
+pump@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
+pumpify@^1.3.3:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
+  dependencies:
+    duplexify "^3.6.0"
+    inherits "^2.0.3"
+    pump "^2.0.0"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
+punycode@^1.2.4:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+qs@6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
+querystringify@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+randomfill@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
+range-parser@^1.0.3, range-parser@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
+
+raw-body@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
+  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
+  dependencies:
+    bytes "3.0.0"
+    http-errors "1.6.3"
+    iconv-lite "0.4.23"
+    unpipe "1.0.0"
+
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+readable-stream@^3.0.6, readable-stream@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
+  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readdirp@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+    micromatch "^3.1.10"
+    readable-stream "^2.0.2"
+
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  dependencies:
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
+
+relateurl@0.2.x:
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+
+renderkid@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
+  integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
+  dependencies:
+    css-select "^1.1.0"
+    dom-converter "^0.2"
+    htmlparser2 "^3.3.0"
+    strip-ansi "^3.0.0"
+    utila "^0.4.0"
+
+repeat-element@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+
+repeat-string@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+
+resolve-cwd@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
+  dependencies:
+    resolve-from "^3.0.0"
+
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  dependencies:
+    glob "^7.1.3"
+
+ripemd160@^2.0.0, ripemd160@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
+  dependencies:
+    hash-base "^3.0.0"
+    inherits "^2.0.1"
+
+run-queue@^1.0.0, run-queue@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
+  dependencies:
+    aproba "^1.1.1"
+
+safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
+schema-utils@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
+  dependencies:
+    ajv "^6.1.0"
+    ajv-errors "^1.0.0"
+    ajv-keywords "^3.1.0"
+
+select-hose@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+
+selfsigned@^1.9.1:
+  version "1.10.4"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
+  dependencies:
+    node-forge "0.7.5"
+
+semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
+send@0.16.2:
+  version "0.16.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "~1.6.2"
+    mime "1.4.1"
+    ms "2.0.0"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.4.0"
+
+serialize-javascript@^1.4.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
+
+serve-index@^1.7.2:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  dependencies:
+    accepts "~1.3.4"
+    batch "0.6.1"
+    debug "2.6.9"
+    escape-html "~1.0.3"
+    http-errors "~1.6.2"
+    mime-types "~2.1.17"
+    parseurl "~1.3.2"
+
+serve-static@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.2"
+    send "0.16.2"
+
+set-blocking@^2.0.0, set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+
+set-value@^0.4.3:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
+  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.1"
+    to-object-path "^0.3.0"
+
+set-value@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
+
+setimmediate@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
+
+setprototypeof@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
+sha.js@^2.4.0, sha.js@^2.4.8:
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  dependencies:
+    inherits "^2.0.1"
+    safe-buffer "^5.0.1"
+
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
+sockjs-client@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
+  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
+  dependencies:
+    debug "^3.2.5"
+    eventsource "^1.0.7"
+    faye-websocket "~0.11.1"
+    inherits "^2.0.3"
+    json3 "^3.3.2"
+    url-parse "^1.4.3"
+
+sockjs@0.3.19:
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
+  dependencies:
+    faye-websocket "^0.10.0"
+    uuid "^3.0.1"
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
+source-map-support@~0.5.10:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
+source-map@^0.5.6:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+spdy-transport@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
+  dependencies:
+    debug "^4.1.0"
+    detect-node "^2.0.4"
+    hpack.js "^2.1.6"
+    obuf "^1.1.2"
+    readable-stream "^3.0.6"
+    wbuf "^1.7.3"
+
+spdy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
+  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
+  dependencies:
+    debug "^4.1.0"
+    handle-thing "^2.0.0"
+    http-deceiver "^1.2.7"
+    select-hose "^2.0.0"
+    spdy-transport "^3.0.0"
+
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
+ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
+
+"statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+
+statuses@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+
+stream-browserify@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-each@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
+  dependencies:
+    end-of-stream "^1.1.0"
+    stream-shift "^1.0.0"
+
+stream-http@^2.7.2:
+  version "2.8.3"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+stream-shift@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+
+supports-color@^5.3.0, supports-color@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+tapable@^1.0.0, tapable@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
+  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
+
+tar@^4:
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.2"
+
+terser-webpack-plugin@^1.1.0:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
+  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.16.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser@^3.16.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
+through2@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+thunky@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
+
+timers-browserify@^2.0.4:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
+  dependencies:
+    setimmediate "^1.0.4"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
+
+to-object-path@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  dependencies:
+    kind-of "^3.0.2"
+
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toposort@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
+
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+
+uglify-js@3.4.x:
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
+  dependencies:
+    commander "~2.19.0"
+    source-map "~0.6.1"
+
+union-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^0.4.3"
+
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
+unique-slug@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
+  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
+
+upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
+
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
+
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
+url-parse@^1.4.3:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
+  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
+  dependencies:
+    querystringify "^2.0.0"
+    requires-port "^1.0.0"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+util.promisify@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
+
+util@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
+  dependencies:
+    inherits "2.0.1"
+
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
+utila@^0.4.0, utila@~0.4:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+
+uuid@^3.0.1, uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
+v8-compile-cache@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
+  integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
+
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
+  dependencies:
+    indexof "0.0.1"
+
+watchpack@^1.5.0, watchpack@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
+  dependencies:
+    chokidar "^2.0.2"
+    graceful-fs "^4.1.2"
+    neo-async "^2.5.0"
+
+wbuf@^1.1.0, wbuf@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
+  dependencies:
+    minimalistic-assert "^1.0.0"
+
+webpack-cli@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.0.tgz#55c8a74cae1e88117f9dda3a801c7272e93ca318"
+  integrity sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==
+  dependencies:
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    enhanced-resolve "^4.1.0"
+    findup-sync "^2.0.0"
+    global-modules "^1.0.0"
+    import-local "^2.0.0"
+    interpret "^1.1.0"
+    loader-utils "^1.1.0"
+    supports-color "^5.5.0"
+    v8-compile-cache "^2.0.2"
+    yargs "^12.0.5"
+
+webpack-dev-middleware@^3.5.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
+  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
+  dependencies:
+    memory-fs "^0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
+webpack-dev-server@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
+  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
+  dependencies:
+    ansi-html "0.0.7"
+    bonjour "^3.5.0"
+    chokidar "^2.0.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
+    debug "^4.1.1"
+    del "^3.0.0"
+    express "^4.16.2"
+    html-entities "^1.2.0"
+    http-proxy-middleware "^0.19.1"
+    import-local "^2.0.0"
+    internal-ip "^4.2.0"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    semver "^5.6.0"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^6.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "^3.5.1"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
+webpack-log@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
+  dependencies:
+    ansi-colors "^3.0.0"
+    uuid "^3.3.2"
+
+webpack-sources@^1.1.0, webpack-sources@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack@^4.29.6:
+  version "4.29.6"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
+  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.0.5"
+    acorn-dynamic-import "^4.0.0"
+    ajv "^6.1.0"
+    ajv-keywords "^3.1.0"
+    chrome-trace-event "^1.0.0"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.0"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    micromatch "^3.1.8"
+    mkdirp "~0.5.0"
+    neo-async "^2.5.0"
+    node-libs-browser "^2.0.0"
+    schema-utils "^1.0.0"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
+    watchpack "^1.5.0"
+    webpack-sources "^1.3.0"
+
+websocket-driver@>=0.5.1:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
+  dependencies:
+    http-parser-js ">=0.4.0"
+    websocket-extensions ">=0.1.1"
+
+websocket-extensions@>=0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+
+which-module@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+
+which@^1.2.14, which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
+worker-farm@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
+  dependencies:
+    errno "~0.1.7"
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
+
+xtend@^4.0.0, xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
+yallist@^3.0.0, yallist@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs-parser@^11.1.1:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
+yargs@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
+
+yargs@^12.0.5:
+  version "12.0.5"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^11.1.1"

From dbe153bc6847ab8cd0cb72add6b60b9ebf722a8c Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 28 Mar 2019 22:34:12 +0200
Subject: [PATCH 065/179] add make up.dev

---
 Makefile               | 55 +++++++++++++++++++++++++++++-------------
 client/e2e/js/index.js |  5 ++--
 2 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 07616f321..80beefd94 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ comma := ,
 
 # Checks two given strings for equality.
 eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\
-                                $(findstring $(2),$(1))),1)
+								$(findstring $(2),$(1))),1)
 
 
 
@@ -33,10 +33,14 @@ NODE_VER ?= "11.10"
 
 deps: cargo yarn
 
+
+fmt: cargo.fmt
+
+
 lint: cargo.lint
 
 
-fmt: cargo.fmt
+up: up.dev
 
 
 # Run all project tests.
@@ -52,8 +56,8 @@ test: test.unit
 #
 # Usage:
 #	make cargo [cmd=(fetch|<cargo-cmd>)]
-#	           [background=(no|yes)]
-#	           [dockerized=(no|yes)]
+#			   [background=(no|yes)]
+#			   [dockerized=(no|yes)]
 
 cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
 
@@ -64,8 +68,8 @@ ifeq ($(background),yes)
 	-@docker rm cargo-cmd
 endif
 	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-	           --name=cargo-cmd $(if $(call eq,$(background),yes),-d,) \
-	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+				--name=cargo-cmd $(if $(call eq,$(background),yes),-d,) \
+				-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
 		rust:$(RUST_VER) \
 			make cargo cmd='$(cargo-cmd)' dockerized=no background=no
 else
@@ -88,7 +92,7 @@ endif
 #
 # Usage:
 #	make yarn [cmd=('fetch'|<yarn-cmd>)]
-#	          [dockerized=(yes|no)]
+#			  [dockerized=(yes|no)]
 
 yarn-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
 
@@ -116,7 +120,7 @@ endif
 cargo.lint:
 ifeq ($(dockerized),yes)
 	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+				-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
 		rust:$(RUST_VER) \
 			make cargo.lint dockerized=no pre-install=yes
 else
@@ -142,15 +146,15 @@ endif
 ifeq ($(dockerized),yes)
 ifeq ($(app),server)
 		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-    	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-    		rust:$(RUST_VER) \
-    			make test.unit dockerized=no app=server
+					-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+			rust:$(RUST_VER) \
+				make test.unit dockerized=no app=server
 endif
 ifeq ($(app),client)
 		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-    	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-    		alexlapa/wasm-pack:stable-$(RUST_VER)-ff-66.0 \
-    			make test.unit dockerized=no app=client
+					-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+			alexlapa/wasm-pack:stable-$(RUST_VER)-ff-66.0 \
+				make test.unit dockerized=no app=client
 endif
 else
 ifeq ($(app),server)
@@ -168,13 +172,13 @@ endif
 #
 # Usage:
 #	make cargo.fmt [check=(no|yes)]
-#	               [dockerized=(no|yes)]
+#				   [dockerized=(no|yes)]
 
 cargo.fmt:
 ifeq ($(dockerized),yes)
 	docker pull rustlang/rust:nightly
 	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-	           -v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+				-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
 		rustlang/rust:nightly \
 			make cargo.fmt check='$(check)' dockerized=no pre-install=yes
 else
@@ -187,10 +191,27 @@ endif
 
 
 
+# Run projects Medea and e2e app locally with dev settings.
+#
+# Usage:
+#	make up.dev
+
+up.dev:
+	$(MAKE) -j2 up.dev.server up.dev.e2e
+
+up.dev.server:
+	cargo run
+
+up.dev.e2e:
+	npm run start --prefix client/e2e
+
+
+
 
 ##################
 # .PHONY section #
 ##################
 
 .PHONY: cargo cargo.fmt cargo.lint \
-        test test.unit
+		deps fmt lint test test.unit \
+		up up.dev up.dev.server up.dev.e2e yarn
diff --git a/client/e2e/js/index.js b/client/e2e/js/index.js
index d7c80969b..2e4b57edc 100644
--- a/client/e2e/js/index.js
+++ b/client/e2e/js/index.js
@@ -1,3 +1,4 @@
-import("../../medea-client/pkg").then(medea => {
-  medea.greet();
+import("../../medea-client/pkg").then(rust => {
+  let medea = new rust.Medea("some_token");
+  console.log(medea.get_token());
 });

From 39e074739c6c80452015a2dca296d88ce478fe83 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 29 Mar 2019 12:39:22 +0200
Subject: [PATCH 066/179] Refactoring watchdog for RPC connection

---
 src/api/client/connection.rs | 41 ++++++++++++++++++------------------
 src/api/client/session.rs    | 13 ++++++++++--
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index 263176645..6cba8b6d8 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -1,10 +1,10 @@
 //! WebSocket session.
 
-use std::time::Duration;
+use std::time::{Duration, Instant};
 
 use actix::{
     fut::wrap_future, Actor, ActorContext, Addr, AsyncContext, Handler,
-    Message, SpawnHandle, StreamHandler,
+    Message, StreamHandler,
 };
 use actix_web::ws::{self, CloseReason};
 use futures::future::Future;
@@ -32,12 +32,12 @@ pub struct WsConnection {
     /// [`Room`] that [`Member`] is associated with.
     room: Addr<Room>,
 
-    /// Handle for watchdog which checks whether WebSocket client became
-    /// idle (no `ping` messages received during [`CLIENT_IDLE_TIMEOUT`]).
+    /// Timestamp for watchdog which checks whether WebSocket client became
+    /// idle (no messages received during [`CLIENT_IDLE_TIMEOUT`]).
     ///
     /// This one should be renewed on any received WebSocket message
     /// from client.
-    idle_handler: Option<SpawnHandle>,
+    last_activity: Instant,
 
     /// Indicates whether WebSocket connection is closed by server ot by
     /// client.
@@ -50,24 +50,22 @@ impl WsConnection {
         Self {
             member_id,
             room,
-            idle_handler: None,
+            last_activity: Instant::now(),
             closed_by_server: false,
         }
     }
 
-    /// Resets idle handler watchdog.
-    fn reset_idle_timeout(&mut self, ctx: &mut <Self as Actor>::Context) {
-        if let Some(handler) = self.idle_handler {
-            ctx.cancel_future(handler);
-        }
-
-        self.idle_handler =
-            Some(ctx.run_later(CLIENT_IDLE_TIMEOUT, |sess, ctx| {
-                info!("WsConnection with member {} is idle", sess.member_id);
+    /// Start idle watchdog.
+    fn start_watchdog(&mut self, ctx: &mut <Self as Actor>::Context) {
+        ctx.run_interval(Duration::new(1, 0), |conn, ctx| {
+            if Instant::now().duration_since(conn.last_activity)
+                > CLIENT_IDLE_TIMEOUT
+            {
+                info!("WsConnection with member {} is idle", conn.member_id);
 
-                let member_id = sess.member_id;
+                let member_id = conn.member_id;
                 ctx.wait(wrap_future(
-                    sess.room
+                    conn.room
                         .send(RpcConnectionClosed {
                             member_id,
                             reason: RpcConnectionClosedReason::Idle,
@@ -84,7 +82,8 @@ impl WsConnection {
                 ctx.notify(Close {
                     reason: Some(ws::CloseCode::Normal.into()),
                 });
-            }));
+            }
+        });
     }
 }
 
@@ -98,7 +97,7 @@ impl Actor for WsConnection {
     fn started(&mut self, ctx: &mut Self::Context) {
         debug!("Started WsSession for member {}", self.member_id);
 
-        self.reset_idle_timeout(ctx);
+        self.start_watchdog(ctx);
 
         let member_id = self.member_id;
         ctx.wait(wrap_future(
@@ -209,8 +208,8 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
         );
         match msg {
             ws::Message::Text(text) => {
+                self.last_activity = Instant::now();
                 if let Ok(ping) = serde_json::from_str::<Heartbeat>(&text) {
-                    self.reset_idle_timeout(ctx);
                     ctx.notify(ping);
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
@@ -220,7 +219,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                             .send(command)
                             .map(move |res| {
                                 match res {
-                                    Ok(_) => info!("Command send successful"),
+                                    Ok(_) => (),
                                     Err(err) => error!(
                                         "Command from member {} handle \
                                          failed, because: {:?}",
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 3f24f6acb..b8bd1010e 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -5,15 +5,20 @@ use crate::api::{
     control::member::Id as MemberId,
 };
 
+/// Session authorized [`Member`].
 #[derive(Debug)]
 pub struct Session {
+    /// ID of [`Member`].
     pub member_id: MemberId,
-    // TODO: Replace Box<dyn RpcConnection>> with enum,
-    //       as the set of all possible RpcConnection types is not closed.
+
+    /// Established [`RpcConnection`]s of [`Member`]s.
     connection: Box<dyn RpcConnection>,
+    /* TODO: Replace Box<dyn RpcConnection>> with enum,
+     *       as the set of all possible RpcConnection types is not closed. */
 }
 
 impl Session {
+    /// Returns new [`Session`] of [`Member`].
     pub fn new(
         member_id: MemberId,
         connection: Box<dyn RpcConnection>,
@@ -24,6 +29,7 @@ impl Session {
         }
     }
 
+    /// Sends [`Event`] to remote [`Member`].
     pub fn send_event(
         &self,
         event: Event,
@@ -31,6 +37,9 @@ impl Session {
         self.connection.send_event(event)
     }
 
+    /// Replace [`RpcConnection`] of [`Member`].
+    ///
+    /// Old [`RpcConnection`] will be close.
     pub fn set_connection(
         &mut self,
         connection: Box<dyn RpcConnection>,

From 3aff7307d717985133b9e8d5aa7b1a62d74c1b93 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 29 Mar 2019 15:04:39 +0200
Subject: [PATCH 067/179] Update test for room

---
 src/api/client/room.rs | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index f41abf384..11ce2d737 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -479,7 +479,7 @@ impl RoomsRepository {
 
 #[cfg(test)]
 mod test {
-    use actix::{Arbiter, AsyncContext, System};
+    use actix::{ActorContext, Arbiter, AsyncContext, System};
     use futures::future::Future;
 
     use super::*;
@@ -525,16 +525,25 @@ mod test {
                     }),
                 },
                 Event::SdpAnswerMade {
-                    peer_id: _,
+                    peer_id,
                     sdp_answer: _,
-                } => {
-                    System::current().stop();
-                }
+                } => self.room.do_send(Command::SetIceCandidate {
+                    peer_id,
+                    candidate: "ice_candidate".into(),
+                }),
                 Event::IceCandidateDiscovered {
                     peer_id: _,
                     candidate: _,
-                } => {}
-                Event::PeerFinished { peer_id: _ } => {}
+                } => {
+                    self.room.do_send(RpcConnectionClosed {
+                        member_id: self.member_id,
+                        reason: RpcConnectionClosedReason::Disconnected,
+                    });
+                    ctx.stop();
+                }
+                Event::PeerFinished { peer_id: _ } => {
+                    System::current().stop();
+                }
             }
         }
     }
@@ -586,7 +595,7 @@ mod test {
 
         let mut caller_events = caller_events.lock().unwrap();
         let responder_events = responder_events.lock().unwrap();
-        assert_eq!(caller_events.len(), 2);
+        assert_eq!(caller_events.len(), 3);
         assert_eq!(
             caller_events.to_vec(),
             vec![
@@ -597,8 +606,21 @@ mod test {
                  {\"receivers\":[2]}}}]}}",
                 "{\"SdpAnswerMade\":{\"peer_id\":1,\"sdp_answer\":\
                  \"responder_answer\"}}",
+                "{\"PeerFinished\":{\"peer_id\":1}}"
+            ]
+        );
+        assert_eq!(responder_events.len(), 2);
+        assert_eq!(
+            responder_events.to_vec(),
+            vec![
+                "{\"PeerCreated\":{\"peer_id\":2,\"sdp_offer\":\
+                 \"caller_offer\",\"tracks\":[{\"id\":1,\"media_type\":\
+                 {\"Audio\":{}},\"direction\":{\"Recv\":{\"sender\":1}}},\
+                 {\"id\":2,\"media_type\":{\"Video\":{}},\"direction\":\
+                 {\"Recv\":{\"sender\":1}}}]}}",
+                "{\"IceCandidateDiscovered\":{\"peer_id\":2,\"candidate\":\
+                 \"ice_candidate\"}}",
             ]
         );
-        assert_eq!(responder_events.len(), 1);
     }
 }

From da108a850e19eabc6db4fc8fa3661b78d8efea47 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 1 Apr 2019 21:15:49 +0300
Subject: [PATCH 068/179] change layout

---
 Makefile                                      |   8 +-
 .../medea-client => medea-client}/.gitignore  |   1 -
 medea-client/Cargo.lock                       | 256 ++++++++++++++++++
 .../medea-client => medea-client}/Cargo.toml  |   0
 .../medea-client => medea-client}/README.md   |   0
 {client => medea-client}/e2e/.gitignore       |   0
 {client => medea-client}/e2e/README.md        |   0
 {client => medea-client}/e2e/index.html       |   0
 {client => medea-client}/e2e/js/index.js      |   2 +-
 {client => medea-client}/e2e/package.json     |   0
 .../e2e/webpack.config.js                     |   2 +-
 {client => medea-client}/e2e/yarn.lock        |   0
 .../medea-client => medea-client}/src/lib.rs  |   0
 .../src/utils.rs                              |   0
 .../tests/web.rs                              |   0
 15 files changed, 262 insertions(+), 7 deletions(-)
 rename {client/medea-client => medea-client}/.gitignore (79%)
 create mode 100644 medea-client/Cargo.lock
 rename {client/medea-client => medea-client}/Cargo.toml (100%)
 rename {client/medea-client => medea-client}/README.md (100%)
 rename {client => medea-client}/e2e/.gitignore (100%)
 rename {client => medea-client}/e2e/README.md (100%)
 rename {client => medea-client}/e2e/index.html (100%)
 rename {client => medea-client}/e2e/js/index.js (63%)
 rename {client => medea-client}/e2e/package.json (100%)
 rename {client => medea-client}/e2e/webpack.config.js (90%)
 rename {client => medea-client}/e2e/yarn.lock (100%)
 rename {client/medea-client => medea-client}/src/lib.rs (100%)
 rename {client/medea-client => medea-client}/src/utils.rs (100%)
 rename {client/medea-client => medea-client}/tests/web.rs (100%)

diff --git a/Makefile b/Makefile
index 80beefd94..2a12bba2d 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ endif
 else
 	cargo $(cargo-cmd) $(if $(call eq,$(background),yes),&,)
 ifeq ($(cargo-cmd),fetch)
-	cargo fetch --manifest-path client/medea-client/Cargo.toml
+	cargo fetch --manifest-path medea-client/Cargo.toml
 endif
 endif
 
@@ -103,7 +103,7 @@ ifneq ($(dockerized),no)
 			make yarn cmd='$(yarn-cmd)' dockerized=no
 else
 ifeq ($(yarn-cmd),fetch)
-	yarn install --pure-lockfile --cwd client/e2e
+	yarn install --pure-lockfile --cwd medea-client/e2e
 else
 	yarn $(yarn-cmd)
 endif
@@ -161,7 +161,7 @@ ifeq ($(app),server)
 	cargo test --all
 endif
 ifeq ($(app),client)
-	wasm-pack test --headless --firefox client/medea-client
+	wasm-pack test --headless --firefox medea-client
 endif
 endif
 
@@ -203,7 +203,7 @@ up.dev.server:
 	cargo run
 
 up.dev.e2e:
-	npm run start --prefix client/e2e
+	npm run start --prefix medea-client/e2e
 
 
 
diff --git a/client/medea-client/.gitignore b/medea-client/.gitignore
similarity index 79%
rename from client/medea-client/.gitignore
rename to medea-client/.gitignore
index 4e301317e..1711838e1 100644
--- a/client/medea-client/.gitignore
+++ b/medea-client/.gitignore
@@ -1,6 +1,5 @@
 /target
 **/*.rs.bk
-Cargo.lock
 bin/
 pkg/
 wasm-pack.log
diff --git a/medea-client/Cargo.lock b/medea-client/Cargo.lock
new file mode 100644
index 000000000..c50491cf4
--- /dev/null
+++ b/medea-client/Cargo.lock
@@ -0,0 +1,256 @@
+[[package]]
+name = "bumpalo"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "futures"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "js-sys"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "log"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "medea-client"
+version = "0.1.0-dev"
+dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memory_units"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "syn"
+version = "0.15.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unreachable"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "void"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasm-bindgen-test"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-test-macro"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wee_alloc"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
+"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+"checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+"checksum libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "aab692d7759f5cd8c859e169db98ae5b52c924add2af5fbbca11d12fefb567c1"
+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
+"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+"checksum syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1825685f977249735d510a242a6727b46efe914bb67e38d30c071b1b72b1d5c2"
+"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
+"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
+"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
+"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"
+"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"
+"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
+"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
+"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
+"checksum wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e841fed992c6c70cf2af5dbcffb0d988b1a7ffc5177ae4fb714ed14944b39d0a"
+"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/client/medea-client/Cargo.toml b/medea-client/Cargo.toml
similarity index 100%
rename from client/medea-client/Cargo.toml
rename to medea-client/Cargo.toml
diff --git a/client/medea-client/README.md b/medea-client/README.md
similarity index 100%
rename from client/medea-client/README.md
rename to medea-client/README.md
diff --git a/client/e2e/.gitignore b/medea-client/e2e/.gitignore
similarity index 100%
rename from client/e2e/.gitignore
rename to medea-client/e2e/.gitignore
diff --git a/client/e2e/README.md b/medea-client/e2e/README.md
similarity index 100%
rename from client/e2e/README.md
rename to medea-client/e2e/README.md
diff --git a/client/e2e/index.html b/medea-client/e2e/index.html
similarity index 100%
rename from client/e2e/index.html
rename to medea-client/e2e/index.html
diff --git a/client/e2e/js/index.js b/medea-client/e2e/js/index.js
similarity index 63%
rename from client/e2e/js/index.js
rename to medea-client/e2e/js/index.js
index 2e4b57edc..9bc40f69f 100644
--- a/client/e2e/js/index.js
+++ b/medea-client/e2e/js/index.js
@@ -1,4 +1,4 @@
-import("../../medea-client/pkg").then(rust => {
+import("../../pkg").then(rust => {
   let medea = new rust.Medea("some_token");
   console.log(medea.get_token());
 });
diff --git a/client/e2e/package.json b/medea-client/e2e/package.json
similarity index 100%
rename from client/e2e/package.json
rename to medea-client/e2e/package.json
diff --git a/client/e2e/webpack.config.js b/medea-client/e2e/webpack.config.js
similarity index 90%
rename from client/e2e/webpack.config.js
rename to medea-client/e2e/webpack.config.js
index cd9f5da88..faf5773ea 100644
--- a/client/e2e/webpack.config.js
+++ b/medea-client/e2e/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = {
     }),
 
     new WasmPackPlugin({
-      crateDirectory: path.resolve(__dirname, "../medea-client"),
+      crateDirectory: path.resolve(__dirname, "../"),
       // WasmPackPlugin defaults to compiling in "dev" profile. To change that, use forceMode: 'release':
       // forceMode: 'release'
     }),
diff --git a/client/e2e/yarn.lock b/medea-client/e2e/yarn.lock
similarity index 100%
rename from client/e2e/yarn.lock
rename to medea-client/e2e/yarn.lock
diff --git a/client/medea-client/src/lib.rs b/medea-client/src/lib.rs
similarity index 100%
rename from client/medea-client/src/lib.rs
rename to medea-client/src/lib.rs
diff --git a/client/medea-client/src/utils.rs b/medea-client/src/utils.rs
similarity index 100%
rename from client/medea-client/src/utils.rs
rename to medea-client/src/utils.rs
diff --git a/client/medea-client/tests/web.rs b/medea-client/tests/web.rs
similarity index 100%
rename from client/medea-client/tests/web.rs
rename to medea-client/tests/web.rs

From 76ea032d2c2005d1d9e5fb5ee955b01cc1527bb1 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 1 Apr 2019 21:24:24 +0300
Subject: [PATCH 069/179] remove dockerized from makefile

---
 Makefile | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

diff --git a/Makefile b/Makefile
index 2a12bba2d..b65602c87 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ NODE_VER ?= "11.10"
 # Usage:
 #	make deps
 
-deps: cargo yarn
+deps: cargo.deps yarn
 
 
 fmt: cargo.fmt
@@ -56,28 +56,11 @@ test: test.unit
 #
 # Usage:
 #	make cargo [cmd=(fetch|<cargo-cmd>)]
-#			   [background=(no|yes)]
-#			   [dockerized=(no|yes)]
 
 cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
 
-cargo:
-ifeq ($(dockerized),yes)
-ifeq ($(background),yes)
-	-@docker stop cargo-cmd
-	-@docker rm cargo-cmd
-endif
-	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-				--name=cargo-cmd $(if $(call eq,$(background),yes),-d,) \
-				-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-		rust:$(RUST_VER) \
-			make cargo cmd='$(cargo-cmd)' dockerized=no background=no
-else
-	cargo $(cargo-cmd) $(if $(call eq,$(background),yes),&,)
-ifeq ($(cargo-cmd),fetch)
+cargo.deps:
 	cargo fetch --manifest-path medea-client/Cargo.toml
-endif
-endif
 
 
 
@@ -115,20 +98,13 @@ endif
 # Lint Rust sources with clippy.
 #
 # Usage:
-#	make cargo.lint [dockerized=(no|yes)]
+#	make cargo.lint
 
 cargo.lint:
-ifeq ($(dockerized),yes)
-	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-				-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-		rust:$(RUST_VER) \
-			make cargo.lint dockerized=no pre-install=yes
-else
 ifeq ($(pre-install),yes)
 	rustup component add clippy
 endif
 	cargo clippy -- -D clippy::pedantic -D warnings
-endif
 
 
 
@@ -172,21 +148,12 @@ endif
 #
 # Usage:
 #	make cargo.fmt [check=(no|yes)]
-#				   [dockerized=(no|yes)]
 
 cargo.fmt:
-ifeq ($(dockerized),yes)
-	docker pull rustlang/rust:nightly
-	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
-				-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
-		rustlang/rust:nightly \
-			make cargo.fmt check='$(check)' dockerized=no pre-install=yes
-else
 ifeq ($(pre-install),yes)
 	rustup component add rustfmt
 endif
 	cargo +nightly fmt --all $(if $(call eq,$(check),yes),-- --check,)
-endif
 
 
 
@@ -212,6 +179,6 @@ up.dev.e2e:
 # .PHONY section #
 ##################
 
-.PHONY: cargo cargo.fmt cargo.lint \
-		deps fmt lint test test.unit \
+.PHONY: cargo.deps cargo.fmt cargo.lint \
+		fmt lint test test.unit \
 		up up.dev up.dev.server up.dev.e2e yarn

From 75339618046466705e08b8279fd3ec6703ea8176 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 1 Apr 2019 21:33:57 +0300
Subject: [PATCH 070/179] readme's

---
 medea-client/README.md     | 19 ++++---------------
 medea-client/e2e/README.md |  9 +++++----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/medea-client/README.md b/medea-client/README.md
index c30f5cfea..4a189a7ca 100644
--- a/medea-client/README.md
+++ b/medea-client/README.md
@@ -1,17 +1,6 @@
-### 🛠️ Build with `wasm-pack build`
+Medea-client
+=====
 
-```
-wasm-pack build
-```
+Medea media server client side application. 
 
-### 🔬 Test in Headless Browsers with `wasm-pack test`
-
-```
-wasm-pack test --headless --firefox
-```
-
-### 🎁 Publish to NPM with `wasm-pack publish`
-
-```
-wasm-pack publish
-```
\ No newline at end of file
+__DEVELOPMENT IN PROGRESS__
diff --git a/medea-client/e2e/README.md b/medea-client/e2e/README.md
index cde12c519..d57d3354a 100644
--- a/medea-client/e2e/README.md
+++ b/medea-client/e2e/README.md
@@ -1,5 +1,6 @@
-* `npm run start` -- Serve the project locally for development at
-  `http://localhost:8080`.
+e2e application
+=====
 
-* `npm run build` -- Bundle the project (in production mode).
-np
\ No newline at end of file
+Supposed to be used as demo and for manual testing.
+
+__DEVELOPMENT IN PROGRESS__

From db419cd556af9eab6f6ce6e11442f9f19b7a084f Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 1 Apr 2019 22:07:51 +0300
Subject: [PATCH 071/179] remove cfg_if

---
 medea-client/Cargo.toml   |  1 -
 medea-client/src/lib.rs   | 26 +++++++++++++++-----------
 medea-client/src/utils.rs | 16 ----------------
 3 files changed, 15 insertions(+), 28 deletions(-)
 delete mode 100644 medea-client/src/utils.rs

diff --git a/medea-client/Cargo.toml b/medea-client/Cargo.toml
index 0b8d48a36..86080c32f 100644
--- a/medea-client/Cargo.toml
+++ b/medea-client/Cargo.toml
@@ -15,7 +15,6 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
-cfg-if = "0.1.7"
 wasm-bindgen = "0.2.40"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
diff --git a/medea-client/src/lib.rs b/medea-client/src/lib.rs
index 6c68a10c7..d8ea325e5 100644
--- a/medea-client/src/lib.rs
+++ b/medea-client/src/lib.rs
@@ -1,16 +1,19 @@
-mod utils;
-
-use cfg_if::cfg_if;
 use wasm_bindgen::prelude::*;
 
-cfg_if::cfg_if! {
-    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-    // allocator.
-    if #[cfg(feature = "wee_alloc")] {
-        #[global_allocator]
-        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-    }
-}
+// When the `console_error_panic_hook` feature is enabled, we can call the
+// `set_panic_hook` function at least once during initialization, and then
+// we will get better error messages if our code ever panics.
+//
+// For more details see
+// https://github.com/rustwasm/console_error_panic_hook#readme
+#[cfg(feature = "console_error_panic_hook")]
+pub use console_error_panic_hook::set_once as set_panic_hook;
+
+// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
+// allocator.
+#[cfg(feature = "wee_alloc")]
+#[global_allocator]
+static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
 pub struct Medea {
@@ -21,6 +24,7 @@ pub struct Medea {
 impl Medea {
     #[wasm_bindgen(constructor)]
     pub fn new(token: String) -> Self {
+        set_panic_hook();
         Self { token }
     }
 
diff --git a/medea-client/src/utils.rs b/medea-client/src/utils.rs
deleted file mode 100644
index ef5dcb7a8..000000000
--- a/medea-client/src/utils.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use cfg_if::cfg_if;
-
-cfg_if! {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    if #[cfg(feature = "console_error_panic_hook")] {
-        pub use console_error_panic_hook::set_once as set_panic_hook;
-    } else {
-        #[inline]
-        pub fn set_panic_hook() {}
-    }
-}

From 335d14029a4399d11a770010612755963c5b147a Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 1 Apr 2019 22:41:39 +0300
Subject: [PATCH 072/179] add dummy ws

---
 medea-client/Cargo.lock       | 311 +++++++++++++++++++++++++++++++---
 medea-client/Cargo.toml       |  24 ++-
 medea-client/e2e/js/index.js  |   2 +-
 medea-client/e2e/package.json |   5 +-
 medea-client/src/lib.rs       |   5 +
 5 files changed, 308 insertions(+), 39 deletions(-)

diff --git a/medea-client/Cargo.lock b/medea-client/Cargo.lock
index c50491cf4..e9145c160 100644
--- a/medea-client/Cargo.lock
+++ b/medea-client/Cargo.lock
@@ -1,8 +1,58 @@
+[[package]]
+name = "aho-corasick"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "autocfg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "backtrace"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "backtrace-sys"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bumpalo"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "cc"
+version = "1.0.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cfg-if"
 version = "0.1.7"
@@ -17,11 +67,59 @@ dependencies = [
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "env_logger"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "failure_derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "futures"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "humantime"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.17"
@@ -52,18 +150,27 @@ dependencies = [
 name = "medea-client"
 version = "0.1.0-dev"
 dependencies = [
- "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "memory_units"
-version = "0.4.0"
+name = "memchr"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "nom"
+version = "4.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.0 (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 = "proc-macro2"
 version = "0.4.27"
@@ -72,6 +179,11 @@ dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "quick-error"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "quote"
 version = "0.6.11"
@@ -80,11 +192,54 @@ dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.1.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "sourcefile"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "syn"
 version = "0.15.29"
@@ -96,23 +251,67 @@ dependencies = [
 ]
 
 [[package]]
-name = "unicode-xid"
-version = "0.1.0"
+name = "synstructure"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "unreachable"
-version = "1.0.0"
+name = "termion"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "void"
+name = "thread_local"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ucd-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "utf8-ranges"
 version = "1.0.2"
 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 = "wasm-bindgen"
 version = "0.2.40"
@@ -195,15 +394,39 @@ dependencies = [
 ]
 
 [[package]]
-name = "wee_alloc"
-version = "0.4.3"
+name = "wasm-bindgen-webidl"
+version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (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.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "weedle"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -220,28 +443,70 @@ name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wincolor"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
+"checksum backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "cd5a90e2b463010cd0e0ce9a11d4a9d5d58d9f41d4a6ba3dcaf9e68b466e88b4"
+"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
+"checksum cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ad0daef304fa0b4238f5f7ed7178774b43b06f6a9b6509f6642bef4ff1f7b9b2"
 "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
 "checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "aab692d7759f5cd8c859e169db98ae5b52c924add2af5fbbca11d12fefb567c1"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-"checksum memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
+"checksum redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)" = "d32b3053e5ced86e4bc0411fec997389532bf56b000e66cb4884eeeb41413d69"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
+"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1825685f977249735d510a242a6727b46efe914bb67e38d30c071b1b72b1d5c2"
+"checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
 "checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
 "checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
@@ -250,7 +515,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
 "checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
 "checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
-"checksum wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e841fed992c6c70cf2af5dbcffb0d988b1a7ffc5177ae4fb714ed14944b39d0a"
+"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
+"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
+"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
diff --git a/medea-client/Cargo.toml b/medea-client/Cargo.toml
index 86080c32f..49cf498fa 100644
--- a/medea-client/Cargo.toml
+++ b/medea-client/Cargo.toml
@@ -15,23 +15,21 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
-wasm-bindgen = "0.2.40"
 
-# The `console_error_panic_hook` crate provides better debugging of panics by
-# logging them with `console.error`. This is great for development, but requires
-# all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
-# code size when deploying.
-console_error_panic_hook = { version = "0.1.6", optional = true }
+console_error_panic_hook = { version = "0.1", optional = true }
+js-sys = "0.3"
+wasm-bindgen = "0.2"
 
-# `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
-# compared to the default allocator's ~10K. It is slower than the default
-# allocator, however.
-#
-# Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
-wee_alloc = { version = "0.4.3", optional = true }
+[dependencies.web-sys]
+version = "0.3.4"
+features = [
+    'WebSocket'
+]
+
+wee_alloc = { version = "0.4", optional = true }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.2.40"
+wasm-bindgen-test = "0.2"
 
 [profile.release]
 # Tell `rustc` to optimize for small code size.
diff --git a/medea-client/e2e/js/index.js b/medea-client/e2e/js/index.js
index 9bc40f69f..a77d20f1b 100644
--- a/medea-client/e2e/js/index.js
+++ b/medea-client/e2e/js/index.js
@@ -1,4 +1,4 @@
 import("../../pkg").then(rust => {
-  let medea = new rust.Medea("some_token");
+  let medea = new rust.Medea("ws://localhost");
   console.log(medea.get_token());
 });
diff --git a/medea-client/e2e/package.json b/medea-client/e2e/package.json
index dea45a2ef..400d8dfee 100644
--- a/medea-client/e2e/package.json
+++ b/medea-client/e2e/package.json
@@ -5,12 +5,9 @@
   "repository": "https://github.com/rustwasm/rust-webpack-template",
   "license": "(MIT OR Apache-2.0)",
   "scripts": {
-    "start": "webpack-dev-server -d",
+    "start": "webpack-dev-server -d --open --port 8081",
     "build": "webpack"
   },
-  "bin": {
-    "create-rust-webpack": ".bin/create-rust-webpack.js"
-  },
   "devDependencies": {
     "@wasm-tool/wasm-pack-plugin": "0.2.7",
     "html-webpack-plugin": "^3.2.0",
diff --git a/medea-client/src/lib.rs b/medea-client/src/lib.rs
index d8ea325e5..5feb56bc6 100644
--- a/medea-client/src/lib.rs
+++ b/medea-client/src/lib.rs
@@ -1,4 +1,5 @@
 use wasm_bindgen::prelude::*;
+use web_sys::{WebSocket};
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -34,3 +35,7 @@ impl Medea {
 
     pub fn drop(self) {}
 }
+
+fn get_websocket(url: &str) -> WebSocket {
+    WebSocket::new(url).unwrap()
+}
\ No newline at end of file

From dbfab9af5cced3947d502fd5fd1f5bfbce576e27 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 1 Apr 2019 22:49:48 +0300
Subject: [PATCH 073/179] add dummy ws

---
 medea-client/e2e/js/index.js | 2 +-
 medea-client/src/lib.rs      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/medea-client/e2e/js/index.js b/medea-client/e2e/js/index.js
index a77d20f1b..ee3c11760 100644
--- a/medea-client/e2e/js/index.js
+++ b/medea-client/e2e/js/index.js
@@ -1,4 +1,4 @@
 import("../../pkg").then(rust => {
-  let medea = new rust.Medea("ws://localhost");
+  let medea = new rust.Medea("ws://localhost:8080/ws/1/1/caller_credentials");
   console.log(medea.get_token());
 });
diff --git a/medea-client/src/lib.rs b/medea-client/src/lib.rs
index 5feb56bc6..e4bedf823 100644
--- a/medea-client/src/lib.rs
+++ b/medea-client/src/lib.rs
@@ -26,6 +26,9 @@ impl Medea {
     #[wasm_bindgen(constructor)]
     pub fn new(token: String) -> Self {
         set_panic_hook();
+
+        get_websocket(&token);
+
         Self { token }
     }
 
@@ -38,4 +41,4 @@ impl Medea {
 
 fn get_websocket(url: &str) -> WebSocket {
     WebSocket::new(url).unwrap()
-}
\ No newline at end of file
+}

From 6e7633f2f9a22fb3c4be4a134d6d6ac9ddc657a2 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 3 Apr 2019 14:28:20 +0300
Subject: [PATCH 074/179] Refactoring of handler established RPC connection

---
 signaling_test.html          |   8 +-
 src/api/client/commands.rs   |   2 +-
 src/api/client/connection.rs |  22 ++-
 src/api/client/events.rs     |   4 +-
 src/api/client/room.rs       | 293 +++++++++++++++++++----------------
 src/api/client/session.rs    |   6 +-
 src/main.rs                  |  39 ++++-
 src/media/peer.rs            |  28 ++++
 8 files changed, 247 insertions(+), 155 deletions(-)

diff --git a/signaling_test.html b/signaling_test.html
index 305e58ded..944b0d7a0 100644
--- a/signaling_test.html
+++ b/signaling_test.html
@@ -73,7 +73,7 @@
             var pc = pcs[msg.peer_id];
 
             if (sendVideo || sendAudio) {
-                let stream = await navigator.mediaDevices.getUserMedia({
+                const stream = await navigator.mediaDevices.getUserMedia({
                     audio: sendAudio,
                     video: sendVideo
                 });
@@ -81,7 +81,7 @@
                 yourvid.srcObject = stream;
 
                 stream.getTracks().forEach((track) => {
-                    pc.addTrack(track);
+                    pc.addTrack(track, stream);
                 });
             }
 
@@ -99,9 +99,9 @@
                 pc.setLocalDescription(answer);
 
                 socket.send(JSON.stringify({
-                    MakeSdpAnswer: {
+                    MakeSdpOffer: {
                         peer_id: msg.peer_id,
-                        sdp_answer: JSON.stringify(answer)
+                        sdp_offer: JSON.stringify(answer)
                     }
                 }));
             } else {
diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index 2acd6f0b6..5ff698d93 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -5,7 +5,7 @@ use crate::{api::client::RoomError, media::peer::Id as PeerId};
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Message, Serialize)]
-#[rtype(result = "Result<(), RoomError>")]
+#[rtype(result = "Result<(), ()>")]
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: PeerId, sdp_offer: String },
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index 6cba8b6d8..c25eda9ab 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -220,14 +220,20 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                             .map(move |res| {
                                 match res {
                                     Ok(_) => (),
-                                    Err(err) => error!(
-                                        "Command from member {} handle \
-                                         failed, because: {:?}",
-                                        member_id, err,
+                                    Err(_) => error!(
+                                        "Command {} from member {} handle \
+                                         failed",
+                                        text, member_id,
                                     ),
                                 };
                             })
-                            .map_err(|_| ()),
+                            .map_err(move |err| {
+                                error!(
+                                    "Cannot send Command from member {}, \
+                                     because {}",
+                                    member_id, err
+                                )
+                            }),
                     ));
                 }
             }
@@ -246,9 +252,9 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                             })
                             .map_err(move |err| {
                                 error!(
-                                    "WsSession of member {} failed to remove \
-                                     from Room, because: {:?}",
-                                    member_id, err,
+                                    "Cannot send Close from member {}, \
+                                     because {}",
+                                    member_id, err
                                 )
                             }),
                     ));
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
index a5a8b9625..02df2e50c 100644
--- a/src/api/client/events.rs
+++ b/src/api/client/events.rs
@@ -27,7 +27,7 @@ pub enum Event {
 
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// close.
-    PeerFinished {
-        peer_id: PeerId,
+    PeersRemoved {
+        peer_ids: Vec<PeerId>,
     },
 }
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 11ce2d737..b250114ad 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -3,15 +3,16 @@
 use std::{
     fmt,
     sync::{Arc, Mutex},
+    time::Duration,
 };
 
 use actix::{
-    fut::wrap_future, Actor, ActorFuture, Addr, AsyncContext, Context, Handler,
-    Message,
+    fut::wrap_future, Actor, ActorContext, ActorFuture, Addr, AsyncContext,
+    Context, Handler, Message, SpawnHandle,
 };
 use failure::Fail;
 use futures::{
-    future::{self, Either},
+    future::{self, join_all, Either},
     Future,
 };
 use hashbrown::HashMap;
@@ -25,6 +26,13 @@ use crate::{
         track::{AudioSettings, Track, TrackMediaType, VideoSettings},
     },
 };
+use slog::Drain;
+use std::error::Error;
+use std::time::Instant;
+
+/// Timeout for close [`Session`] after receive `RpcConnectionClosed` message.
+pub const SESSION_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
+// TODO: via conf
 
 #[derive(Fail, Debug)]
 pub enum RoomError {
@@ -32,6 +40,10 @@ pub enum RoomError {
     UnknownPeer(PeerId),
     #[fail(display = "Unmatched states between peers {} and {}", _0, _1)]
     UnmatchedState(PeerId, PeerId),
+    #[fail(display = "Member {} not connected at moment", _0)]
+    SessionNotExists(MemberId),
+    #[fail(display = "Unable send event to member {}", _0)]
+    UnableSendEvent(MemberId),
 }
 
 /// ID of [`Room`].
@@ -41,33 +53,55 @@ pub type Id = u64;
 #[derive(Debug)]
 pub struct Room {
     /// ID of this [`Room`].
-    pub id: Id,
+    id: Id,
+
+    idle_timeouts: HashMap<MemberId, SpawnHandle>,
 
     /// [`Member`]s which currently are present in this [`Room`].
-    pub members: HashMap<MemberId, Member>,
+    members: HashMap<MemberId, Member>,
 
     /// [`Peer`]s of [`Member`]s in this [`Room`].
-    pub peers: HashMap<PeerId, PeerMachine>,
+    peers: HashMap<PeerId, PeerMachine>,
 
     /// [`Session`]s of [`Member`]s with established [`WsConnection`]s.
-    pub sessions: HashMap<MemberId, Session>,
-
-    /// Index for generate unique ID for [`Peer`] in this [`Room`].
-    peer_index: PeerId,
+    sessions: HashMap<MemberId, Session>,
 }
 
 impl Room {
     /// Create new instance of [`Room`].
-    pub fn new(id: Id, members: HashMap<MemberId, Member>) -> Self {
+    pub fn new(
+        id: Id,
+        members: HashMap<MemberId, Member>,
+        peers: HashMap<PeerId, PeerMachine>,
+    ) -> Self {
         Room {
             id,
+            idle_timeouts: HashMap::new(),
             members,
-            peers: HashMap::new(),
+            peers,
             sessions: HashMap::new(),
-            peer_index: 0,
         }
     }
 
+    fn close(
+        &mut self,
+        closed_at: Instant,
+    ) -> impl Future<Item = (), Error = ()> {
+        let fut = self.sessions.drain().fold(
+            vec![],
+            |mut futures, (member_id, session)| {
+                info!(
+                    "Removed session of member {}, because room is close at \
+                     {:?}",
+                    member_id, closed_at
+                );
+                futures.push(session.close());
+                futures
+            },
+        );
+        join_all(fut).map(|_| ())
+    }
+
     /// Store [`Peer`] in [`Room`].
     fn add_peer(&mut self, id: PeerId, peer: PeerMachine) {
         self.peers.insert(id, peer);
@@ -80,22 +114,18 @@ impl Room {
             .ok_or(RoomError::UnknownPeer(*peer_id))
     }
 
-    /// Returns ID's all [`Peer`] of specified [`Member`].
-    fn member_peers(&mut self, member_id: &MemberId) -> Vec<PeerId> {
+    /// Returns [`Peer`] of specified [`Member`].
+    ///
+    /// Panic if [`Peer`] not exists.
+    fn member_peer(&self, member_id: &MemberId) -> &PeerMachine {
         self.peers
             .iter()
-            .filter(|(_, peer)| peer.member_id() == *member_id)
-            .map(|(&id, _)| id)
-            .collect::<Vec<_>>()
-    }
-
-    /// Generate next ID of [`Peer`].
-    fn next_peer_id(&mut self) -> PeerId {
-        self.peer_index += 1;
-        self.peer_index
+            .find(|(_, peer)| peer.member_id() == *member_id)
+            .map(|(_, peer)| peer)
+            .unwrap()
     }
 
-    /// Returns [`Peer`] by its ID.
+    /// Returns owned [`Peer`] by its ID.
     fn take_peer(
         &mut self,
         peer_id: &PeerId,
@@ -105,43 +135,67 @@ impl Room {
             .ok_or(RoomError::UnknownPeer(*peer_id))
     }
 
-    /// Creates two connected [`Peer`]s and returns [`Event`] to caller
-    /// that [`Peer`] is created.
-    fn start_pipeline(
+    fn send_event(
         &mut self,
-        caller: MemberId,
-        callee: MemberId,
-    ) -> OnEvent {
-        info!("Member {} call member {}", caller, callee);
-        let caller_peer_id = self.next_peer_id();
-        let callee_peer_id = self.next_peer_id();
-        let mut caller_peer = Peer::new(caller_peer_id, caller, callee_peer_id);
-        let mut callee_peer = Peer::new(callee_peer_id, callee, caller_peer_id);
-
-        let track_audio =
-            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
-        let track_video =
-            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
-        caller_peer.add_sender(track_audio.clone());
-        caller_peer.add_sender(track_video.clone());
-        callee_peer.add_receiver(track_audio);
-        callee_peer.add_receiver(track_video);
-
-        let event = OnEvent {
-            member_id: caller,
-            event: Event::PeerCreated {
-                peer_id: caller_peer_id,
-                sdp_offer: None,
-                tracks: caller_peer.tracks(),
-            },
+        member_id: MemberId,
+        event: Event,
+    ) -> impl Future<Item = (), Error = ()> {
+        match self.sessions.get(&member_id) {
+            Some(session) => Either::A(session.send_event(event)),
+            None => Either::B(self.close(Instant::now())),
+        }
+    }
+
+    fn handle_member_connected(
+        &mut self,
+        member_id: &MemberId,
+    ) -> impl Future<Item = (), Error = ()> {
+        let peer = self.member_peer(member_id);
+        match peer.sender() {
+            Some(_) => {
+                let fut = match self.handle_peer_created(peer.id()) {
+                    Ok((caller, event)) => {
+                        Either::A(self.send_event(caller, event))
+                    }
+                    Err(e) => Either::B(self.close(Instant::now())),
+                };
+                Either::B(fut)
+            }
+            None => Either::A(future::ok(())),
+        }
+    }
+
+    fn handle_peer_created(
+        &mut self,
+        from_peer_id: PeerId,
+    ) -> Result<(MemberId, Event), RoomError> {
+        let from_peer = self.take_peer(&from_peer_id)?;
+        let to_peer_id = from_peer.to_peer();
+        let to_peer = self.take_peer(&to_peer_id)?;
+
+        let (from_peer, to_peer) = match (from_peer, to_peer) {
+            (PeerMachine::New(peer_from), PeerMachine::New(peer_to)) => {
+                Ok((peer_from, peer_to))
+            }
+            (from_peer, to_peer) => {
+                self.add_peer(from_peer_id, from_peer);
+                self.add_peer(to_peer_id, to_peer);
+                Err(RoomError::UnmatchedState(from_peer_id, to_peer_id))
+            }
+        }?;
+
+        let to_peer = to_peer.start();
+        let to_member_id = to_peer.member_id();
+
+        let event = Event::PeerCreated {
+            peer_id: to_peer_id,
+            sdp_offer: None,
+            tracks: to_peer.tracks(),
         };
-        self.add_peer(
-            caller_peer_id,
-            PeerMachine::WaitLocalSDP(caller_peer.start()),
-        );
-        self.add_peer(callee_peer_id, PeerMachine::New(callee_peer));
 
-        event
+        self.add_peer(from_peer_id, PeerMachine::New(from_peer));
+        self.add_peer(to_peer_id, PeerMachine::WaitLocalSDP(to_peer));
+        Ok((to_member_id, event))
     }
 
     /// Applies an offer to the specified and associated [`Peer`].
@@ -150,7 +204,7 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         sdp_offer: String,
-    ) -> Result<OnEvent, RoomError> {
+    ) -> Result<(MemberId, Event), RoomError> {
         let from_peer = self.take_peer(&from_peer_id)?;
         let to_peer_id = from_peer.to_peer();
         let to_peer = self.take_peer(&to_peer_id)?;
@@ -170,18 +224,16 @@ impl Room {
         let from_peer = from_peer.set_local_sdp(sdp_offer.clone());
         let to_peer = to_peer.set_remote_sdp(sdp_offer.clone());
 
-        let event = OnEvent {
-            member_id: to_peer.member_id(),
-            event: Event::PeerCreated {
-                peer_id: to_peer_id,
-                sdp_offer: Some(sdp_offer),
-                tracks: to_peer.tracks(),
-            },
+        let to_member_id = to_peer.member_id();
+        let event = Event::PeerCreated {
+            peer_id: to_peer_id,
+            sdp_offer: Some(sdp_offer),
+            tracks: to_peer.tracks(),
         };
 
         self.add_peer(from_peer_id, PeerMachine::WaitRemoteSDP(from_peer));
         self.add_peer(to_peer_id, PeerMachine::WaitLocalHaveRemote(to_peer));
-        Ok(event)
+        Ok((to_member_id, event))
     }
 
     /// Applies an answer to the specified and associated [`Peer`].
@@ -190,7 +242,7 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         sdp_answer: String,
-    ) -> Result<OnEvent, RoomError> {
+    ) -> Result<(MemberId, Event), RoomError> {
         let from_peer = self.take_peer(&from_peer_id)?;
         let to_peer_id = from_peer.to_peer();
         let to_peer = self.take_peer(&to_peer_id)?;
@@ -210,17 +262,15 @@ impl Room {
         let from_peer = from_peer.set_local_sdp(sdp_answer.clone());
         let to_peer = to_peer.set_remote_sdp(sdp_answer.clone());
 
-        let event = OnEvent {
-            member_id: to_peer.member_id(),
-            event: Event::SdpAnswerMade {
-                peer_id: to_peer_id,
-                sdp_answer,
-            },
+        let to_member_id = to_peer.member_id();
+        let event = Event::SdpAnswerMade {
+            peer_id: to_peer_id,
+            sdp_answer,
         };
 
         self.add_peer(from_peer_id, PeerMachine::Stable(from_peer));
         self.add_peer(to_peer_id, PeerMachine::Stable(to_peer));
-        Ok(event)
+        Ok((to_member_id, event))
     }
 
     /// Sends Ice Candidate from the specified to the associated [`Peer`].
@@ -228,7 +278,7 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         candidate: String,
-    ) -> Result<OnEvent, RoomError> {
+    ) -> Result<(MemberId, Event), RoomError> {
         let from_peer = self.get_peer(&from_peer_id)?;
         let to_peer_id = from_peer.to_peer();
         let to_peer = self.get_peer(&to_peer_id)?;
@@ -246,13 +296,12 @@ impl Room {
             _ => Err(RoomError::UnmatchedState(from_peer_id, to_peer_id)),
         }?;
 
-        Ok(OnEvent {
-            member_id: to_peer.member_id(),
-            event: Event::IceCandidateDiscovered {
-                peer_id: to_peer_id,
-                candidate,
-            },
-        })
+        let to_member_id = to_peer.member_id();
+        let event = Event::IceCandidateDiscovered {
+            peer_id: to_peer_id,
+            candidate,
+        };
+        Ok((to_member_id, event))
     }
 }
 
@@ -341,32 +390,28 @@ impl Handler<RpcConnectionEstablished> for Room {
     ) -> Self::Result {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
-        let mut fut = Either::A(future::ok(()));
+        let mut fut;
         if let Some(session) = self.sessions.get_mut(&msg.member_id) {
             debug!(
                 "Replaced RpcConnection for member {} session",
                 msg.member_id
             );
-            fut = Either::B(session.set_connection(msg.connection));
+            if let Some(handler) = self.idle_timeouts.remove(&msg.member_id) {
+                ctx.cancel_future(handler);
+            }
+            fut = Either::A(session.set_connection(msg.connection));
         } else {
-            let callee = msg.member_id;
-            let active_members = self
-                .sessions
-                .keys()
-                .map(|&member_id| member_id)
-                .collect::<Vec<_>>();
+            let member_id = msg.member_id;
             self.sessions
-                .insert(callee, Session::new(callee, msg.connection));
-            active_members.iter().for_each(|&caller| {
-                ctx.notify(self.start_pipeline(caller, callee));
-            });
+                .insert(member_id, Session::new(msg.member_id, msg.connection));
+            fut = Either::B(self.handle_member_connected(&member_id))
         }
         Box::new(wrap_future(fut))
     }
 }
 
 impl Handler<Command> for Room {
-    type Result = ActFuture<(), RoomError>;
+    type Result = ActFuture<(), ()>;
 
     /// Receives [`Command`] from Web client and changes state of interconnected
     /// [`Peer`]s.
@@ -387,9 +432,13 @@ impl Handler<Command> for Room {
                 self.handle_set_ice_candidate(peer_id, candidate)
             }
         };
-        Box::new(wrap_future(future::done(
-            res.map(|event| ctx.notify(event)),
-        )))
+        let fut = match res {
+            Ok((member_id, event)) => {
+                Either::A(self.send_event(member_id, event))
+            }
+            Err(e) => Either::B(self.close(Instant::now())),
+        };
+        Box::new(wrap_future(fut))
     }
 }
 
@@ -420,39 +469,13 @@ impl Handler<RpcConnectionClosed> for Room {
             "RpcConnectionClosed for member {}, reason {:?}",
             msg.member_id, msg.reason
         );
-        self.sessions.remove(&msg.member_id);
-        self.member_peers(&msg.member_id)
-            .iter()
-            .for_each(|peer_id| {
-                self.peers
-                    .remove(peer_id)
-                    .and_then(|peer| self.peers.remove(&peer.to_peer()))
-                    .map(|to_peer| {
-                        ctx.notify(OnEvent {
-                            member_id: to_peer.member_id(),
-                            event: Event::PeerFinished {
-                                peer_id: to_peer.id(),
-                            },
-                        })
-                    });
-            })
-    }
-}
-
-#[derive(Debug, Message)]
-pub struct OnEvent {
-    member_id: MemberId,
-    event: Event,
-}
-
-impl Handler<OnEvent> for Room {
-    type Result = ();
-
-    /// Sends [`Event`] to specified [`Member`] of [`Room`].
-    fn handle(&mut self, msg: OnEvent, ctx: &mut Self::Context) {
-        if let Some(session) = self.sessions.get(&msg.member_id) {
-            ctx.wait(wrap_future(session.send_event(msg.event)));
-        }
+        let closed_at = Instant::now();
+        self.idle_timeouts.insert(
+            msg.member_id,
+            ctx.run_later(SESSION_IDLE_TIMEOUT, move |room, ctx| {
+                ctx.wait(wrap_future(room.close(closed_at)));
+            }),
+        );
     }
 }
 
@@ -541,7 +564,7 @@ mod test {
                     });
                     ctx.stop();
                 }
-                Event::PeerFinished { peer_id: _ } => {
+                Event::PeersRemoved { peer_id: _ } => {
                     System::current().stop();
                 }
             }
@@ -567,7 +590,7 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
             2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
         };
-        Arbiter::start(move |_| Room::new(1, members))
+        Arbiter::start(move |_| Room::new(1, members, hashmap!()))
     }
 
     #[test]
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index b8bd1010e..c0b8e7d34 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -29,6 +29,10 @@ impl Session {
         }
     }
 
+    pub fn close(&self) -> impl Future<Item = (), Error = ()> {
+        self.connection.close()
+    }
+
     /// Sends [`Event`] to remote [`Member`].
     pub fn send_event(
         &self,
@@ -46,6 +50,6 @@ impl Session {
     ) -> impl Future<Item = (), Error = ()> {
         let fut = self.connection.close();
         self.connection = connection;
-        fut
+        Box::new(fut)
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 5bf89cd62..9a06055d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,11 +2,17 @@
 
 use actix::prelude::*;
 use dotenv::dotenv;
+use hashbrown::HashMap;
 
-use crate::api::{
-    client::{server, Room, RoomsRepository},
-    control::Member,
+use crate::media::{AudioSettings, Track, TrackMediaType, VideoSettings};
+use crate::{
+    api::{
+        client::{server, Room, RoomsRepository},
+        control::{Id as MemberId, Member},
+    },
+    media::peer::{Id as PeerId, Peer, PeerMachine},
 };
+use std::sync::Arc;
 
 #[macro_use]
 mod utils;
@@ -27,10 +33,35 @@ fn main() {
         1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
-    let room = Arbiter::start(move |_| Room::new(1, members));
+    let peers = create_peers(1, 2);
+    let room = Arbiter::start(move |_| Room::new(1, members, peers));
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);
 
     server::run(rooms_repo);
     let _ = sys.run();
 }
+
+fn create_peers(
+    caller: MemberId,
+    callee: MemberId,
+) -> HashMap<MemberId, PeerMachine> {
+    let caller_peer_id = 1;
+    let callee_peer_id = 2;
+    let mut caller_peer = Peer::new(caller_peer_id, caller, callee_peer_id);
+    let mut callee_peer = Peer::new(callee_peer_id, callee, caller_peer_id);
+
+    let track_audio =
+        Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
+    let track_video =
+        Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
+    caller_peer.add_sender(track_audio.clone());
+    caller_peer.add_sender(track_video.clone());
+    callee_peer.add_receiver(track_audio);
+    callee_peer.add_receiver(track_video);
+
+    hashmap!(
+        caller_peer_id => PeerMachine::New(caller_peer),
+        callee_peer_id => PeerMachine::New(callee_peer),
+    )
+}
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 486374cf7..dd7c8d467 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -59,6 +59,18 @@ impl PeerMachine {
         }
     }
 
+    pub fn sender(&self) -> Option<Id> {
+        match self {
+            PeerMachine::New(peer) => peer.sender(),
+            PeerMachine::WaitLocalSDP(peer) => peer.sender(),
+            PeerMachine::WaitLocalHaveRemote(peer) => peer.sender(),
+            PeerMachine::WaitRemoteSDP(peer) => peer.sender(),
+            PeerMachine::Stable(peer) => peer.sender(),
+            PeerMachine::Finished(peer) => peer.sender(),
+            PeerMachine::Failure(peer) => peer.sender(),
+        }
+    }
+
     pub fn to_peer(&self) -> Id {
         match self {
             PeerMachine::New(peer) => peer.to_peer(),
@@ -112,6 +124,22 @@ impl<T: Any> Peer<T> {
         self.context.to_peer
     }
 
+    pub fn sender(&self) -> Option<Id> {
+        if self.context.receivers.is_empty() {
+            None
+        } else {
+            Some(self.context.to_peer)
+        }
+    }
+
+    pub fn receivers(&self) -> Option<Id> {
+        if self.context.senders.is_empty() {
+            None
+        } else {
+            Some(self.context.to_peer)
+        }
+    }
+
     pub fn tracks(&self) -> Vec<DirectionalTrack> {
         let tracks = self.context.senders.iter().fold(
             vec![],

From ea0d3d849addf774792ce69989e7875cebaa584e Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 3 Apr 2019 16:03:50 +0300
Subject: [PATCH 075/179] rename medea-client to jason

---
 Makefile                                      |  8 +-
 {medea-client => jason}/.gitignore            |  0
 {medea-client => jason}/Cargo.lock            | 74 +++++++++----------
 {medea-client => jason}/Cargo.toml            |  4 +-
 {medea-client => jason}/README.md             |  2 +-
 {medea-client => jason}/e2e/.gitignore        |  0
 {medea-client => jason}/e2e/README.md         |  0
 {medea-client => jason}/e2e/index.html        |  0
 jason/e2e/js/index.js                         |  4 +
 {medea-client => jason}/e2e/package.json      |  0
 {medea-client => jason}/e2e/webpack.config.js |  0
 {medea-client => jason}/e2e/yarn.lock         |  0
 {medea-client => jason}/src/lib.rs            | 12 +--
 {medea-client => jason}/tests/web.rs          |  4 +-
 medea-client/e2e/js/index.js                  |  4 -
 15 files changed, 57 insertions(+), 55 deletions(-)
 rename {medea-client => jason}/.gitignore (100%)
 rename {medea-client => jason}/Cargo.lock (92%)
 rename {medea-client => jason}/Cargo.toml (91%)
 rename {medea-client => jason}/README.md (86%)
 rename {medea-client => jason}/e2e/.gitignore (100%)
 rename {medea-client => jason}/e2e/README.md (100%)
 rename {medea-client => jason}/e2e/index.html (100%)
 create mode 100644 jason/e2e/js/index.js
 rename {medea-client => jason}/e2e/package.json (100%)
 rename {medea-client => jason}/e2e/webpack.config.js (100%)
 rename {medea-client => jason}/e2e/yarn.lock (100%)
 rename {medea-client => jason}/src/lib.rs (88%)
 rename {medea-client => jason}/tests/web.rs (74%)
 delete mode 100644 medea-client/e2e/js/index.js

diff --git a/Makefile b/Makefile
index b65602c87..eeb8a6358 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ test: test.unit
 cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
 
 cargo.deps:
-	cargo fetch --manifest-path medea-client/Cargo.toml
+	cargo fetch --manifest-path jason/Cargo.toml
 
 
 
@@ -86,7 +86,7 @@ ifneq ($(dockerized),no)
 			make yarn cmd='$(yarn-cmd)' dockerized=no
 else
 ifeq ($(yarn-cmd),fetch)
-	yarn install --pure-lockfile --cwd medea-client/e2e
+	yarn install --pure-lockfile --cwd jason/e2e
 else
 	yarn $(yarn-cmd)
 endif
@@ -137,7 +137,7 @@ ifeq ($(app),server)
 	cargo test --all
 endif
 ifeq ($(app),client)
-	wasm-pack test --headless --firefox medea-client
+	wasm-pack test --headless --firefox jason
 endif
 endif
 
@@ -170,7 +170,7 @@ up.dev.server:
 	cargo run
 
 up.dev.e2e:
-	npm run start --prefix medea-client/e2e
+	npm run start --prefix jason/e2e
 
 
 
diff --git a/medea-client/.gitignore b/jason/.gitignore
similarity index 100%
rename from medea-client/.gitignore
rename to jason/.gitignore
diff --git a/medea-client/Cargo.lock b/jason/Cargo.lock
similarity index 92%
rename from medea-client/Cargo.lock
rename to jason/Cargo.lock
index e9145c160..8d3f46d5d 100644
--- a/medea-client/Cargo.lock
+++ b/jason/Cargo.lock
@@ -11,9 +11,9 @@ name = "atty"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -29,9 +29,9 @@ dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -39,8 +39,8 @@ name = "backtrace-sys"
 version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -50,7 +50,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cc"
-version = "1.0.32"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -95,13 +95,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "futures"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -120,6 +120,17 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "jason"
+version = "0.1.0-dev"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "js-sys"
 version = "0.3.17"
@@ -135,7 +146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.50"
+version = "0.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -146,17 +157,6 @@ dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "medea-client"
-version = "0.1.0-dev"
-dependencies = [
- "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "memchr"
 version = "2.2.0"
@@ -242,7 +242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.15.29"
+version = "0.15.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -257,7 +257,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -274,7 +274,7 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.52 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -330,7 +330,7 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -339,7 +339,7 @@ name = "wasm-bindgen-futures"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -360,7 +360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -376,7 +376,7 @@ version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -403,7 +403,7 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -431,7 +431,7 @@ dependencies = [
 
 [[package]]
 name = "winapi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -448,7 +448,7 @@ name = "winapi-util"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -461,7 +461,7 @@ name = "wincolor"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -472,18 +472,18 @@ dependencies = [
 "checksum backtrace 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "cd5a90e2b463010cd0e0ce9a11d4a9d5d58d9f41d4a6ba3dcaf9e68b466e88b4"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
-"checksum cc 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)" = "ad0daef304fa0b4238f5f7ed7178774b43b06f6a9b6509f6642bef4ff1f7b9b2"
+"checksum cc 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "30f813bf45048a18eda9190fd3c6b78644146056740c43172a5a3699118588fd"
 "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
 "checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 "checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
-"checksum futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
-"checksum libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)" = "aab692d7759f5cd8c859e169db98ae5b52c924add2af5fbbca11d12fefb567c1"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
@@ -497,7 +497,7 @@ dependencies = [
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
-"checksum syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1825685f977249735d510a242a6727b46efe914bb67e38d30c071b1b72b1d5c2"
+"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
@@ -518,7 +518,7 @@ dependencies = [
 "checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
 "checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
 "checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
-"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/medea-client/Cargo.toml b/jason/Cargo.toml
similarity index 91%
rename from medea-client/Cargo.toml
rename to jason/Cargo.toml
index 49cf498fa..3f4adca35 100644
--- a/medea-client/Cargo.toml
+++ b/jason/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "medea-client"
+name = "jason"
 version = "0.1.0-dev"
 edition = "2018"
-description = "Medea web-client"
+description = "Medea media server client application"
 authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
 homepage = "https://github.com/instrumentisto/medea"
 readme = "README.md"
diff --git a/medea-client/README.md b/jason/README.md
similarity index 86%
rename from medea-client/README.md
rename to jason/README.md
index 4a189a7ca..2dd63e0ed 100644
--- a/medea-client/README.md
+++ b/jason/README.md
@@ -1,4 +1,4 @@
-Medea-client
+Jason
 =====
 
 Medea media server client side application. 
diff --git a/medea-client/e2e/.gitignore b/jason/e2e/.gitignore
similarity index 100%
rename from medea-client/e2e/.gitignore
rename to jason/e2e/.gitignore
diff --git a/medea-client/e2e/README.md b/jason/e2e/README.md
similarity index 100%
rename from medea-client/e2e/README.md
rename to jason/e2e/README.md
diff --git a/medea-client/e2e/index.html b/jason/e2e/index.html
similarity index 100%
rename from medea-client/e2e/index.html
rename to jason/e2e/index.html
diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
new file mode 100644
index 000000000..d99fec791
--- /dev/null
+++ b/jason/e2e/js/index.js
@@ -0,0 +1,4 @@
+import("../../pkg").then(rust => {
+  let jason = new rust.Jason("ws://localhost:8080/ws/1/1/caller_credentials");
+  console.log(jason.get_token());
+});
diff --git a/medea-client/e2e/package.json b/jason/e2e/package.json
similarity index 100%
rename from medea-client/e2e/package.json
rename to jason/e2e/package.json
diff --git a/medea-client/e2e/webpack.config.js b/jason/e2e/webpack.config.js
similarity index 100%
rename from medea-client/e2e/webpack.config.js
rename to jason/e2e/webpack.config.js
diff --git a/medea-client/e2e/yarn.lock b/jason/e2e/yarn.lock
similarity index 100%
rename from medea-client/e2e/yarn.lock
rename to jason/e2e/yarn.lock
diff --git a/medea-client/src/lib.rs b/jason/src/lib.rs
similarity index 88%
rename from medea-client/src/lib.rs
rename to jason/src/lib.rs
index e4bedf823..7d21b3052 100644
--- a/medea-client/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,5 +1,5 @@
 use wasm_bindgen::prelude::*;
-use web_sys::{WebSocket};
+use web_sys::WebSocket;
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -17,18 +17,16 @@ pub use console_error_panic_hook::set_once as set_panic_hook;
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
-pub struct Medea {
+pub struct Jason {
     token: String,
 }
 
 #[wasm_bindgen]
-impl Medea {
+impl Jason {
     #[wasm_bindgen(constructor)]
     pub fn new(token: String) -> Self {
         set_panic_hook();
 
-        get_websocket(&token);
-
         Self { token }
     }
 
@@ -37,6 +35,10 @@ impl Medea {
     }
 
     pub fn drop(self) {}
+
+    pub fn init_socket(&self) {
+        get_websocket(&self.token);
+    }
 }
 
 fn get_websocket(url: &str) -> WebSocket {
diff --git a/medea-client/tests/web.rs b/jason/tests/web.rs
similarity index 74%
rename from medea-client/tests/web.rs
rename to jason/tests/web.rs
index 8e3b0d763..66392b592 100644
--- a/medea-client/tests/web.rs
+++ b/jason/tests/web.rs
@@ -1,12 +1,12 @@
 #![cfg(target_arch = "wasm32")]
 
-use medea_client::Medea;
+use jason::Jason;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
 
 #[wasm_bindgen_test]
 fn some_dummy_test() {
-    let m = Medea::new("asd".to_string());
+    let m = Jason::new("asd".to_string());
     assert_eq!("asd".to_string(), m.get_token());
 }
diff --git a/medea-client/e2e/js/index.js b/medea-client/e2e/js/index.js
deleted file mode 100644
index ee3c11760..000000000
--- a/medea-client/e2e/js/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("../../pkg").then(rust => {
-  let medea = new rust.Medea("ws://localhost:8080/ws/1/1/caller_credentials");
-  console.log(medea.get_token());
-});

From dad84cb76e733a5db1aa65df806f3d64597af66c Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 3 Apr 2019 16:05:50 +0300
Subject: [PATCH 076/179] connect to socket in e2e app

---
 jason/e2e/js/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
index d99fec791..a3910a5c2 100644
--- a/jason/e2e/js/index.js
+++ b/jason/e2e/js/index.js
@@ -1,4 +1,5 @@
 import("../../pkg").then(rust => {
   let jason = new rust.Jason("ws://localhost:8080/ws/1/1/caller_credentials");
   console.log(jason.get_token());
+  jason.init_socket();
 });

From 2c094d885b40d745beabe62358e45b620351cbfe Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 3 Apr 2019 16:41:36 +0300
Subject: [PATCH 077/179] add jason to workspace

---
 Cargo.lock | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |   5 +
 2 files changed, 268 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index fbedce62e..4aad7d395 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,6 +149,16 @@ dependencies = [
  "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.2"
@@ -221,6 +231,11 @@ name = "build_const"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bumpalo"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.2.7"
@@ -278,6 +293,15 @@ dependencies = [
  "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cookie"
 version = "0.11.0"
@@ -438,6 +462,18 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "env_logger"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "error-chain"
 version = "0.8.1"
@@ -536,6 +572,14 @@ dependencies = [
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hostname"
 version = "0.1.5"
@@ -620,6 +664,25 @@ name = "itoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "jason"
+version = "0.1.0-dev"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1094,6 +1157,14 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "regex"
 version = "0.1.80"
@@ -1179,6 +1250,11 @@ name = "safemem"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -1402,6 +1478,11 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sourcefile"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
@@ -1447,6 +1528,24 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termion"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread-id"
 version = "2.0.0"
@@ -1769,6 +1868,11 @@ name = "unicode-normalization"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -1856,6 +1960,123 @@ name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasm-bindgen-test"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-test-macro"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-webidl"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (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.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "weedle"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "widestring"
 version = "0.2.2"
@@ -1885,11 +2106,28 @@ name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wincolor"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winreg"
 version = "0.5.1"
@@ -1933,6 +2171,7 @@ dependencies = [
 "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
@@ -1942,6 +2181,7 @@ dependencies = [
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
+"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
@@ -1949,6 +2189,7 @@ dependencies = [
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
+"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
 "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
 "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
@@ -1967,6 +2208,7 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
@@ -1978,6 +2220,7 @@ dependencies = [
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
 "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
@@ -1988,6 +2231,7 @@ dependencies = [
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
@@ -2042,6 +2286,7 @@ dependencies = [
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
 "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
@@ -2053,6 +2298,7 @@ dependencies = [
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
+"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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"
@@ -2079,12 +2325,15 @@ dependencies = [
 "checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
 "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
@@ -2112,6 +2361,7 @@ dependencies = [
 "checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
@@ -2124,12 +2374,25 @@ dependencies = [
 "checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
+"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
+"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
+"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"
+"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"
+"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
+"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
+"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
+"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
+"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
+"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
 "checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
 "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/Cargo.toml b/Cargo.toml
index 832cc2343..c243aabd3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,11 @@ homepage = "https://github.com/instrumentisto/medea"
 readme = "README.md"
 repository = "https://github.com/instrumentisto/medea"
 
+[workspace]
+members = [
+    "jason",
+]
+
 [dependencies]
 actix = "0.7"
 actix-web = "0.7"

From 1d7cc52112df5bb9973ba7dd055ed510cb042325 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 3 Apr 2019 16:56:46 +0300
Subject: [PATCH 078/179] fix makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index eeb8a6358..afd3793da 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ test: test.unit
 cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
 
 cargo.deps:
-	cargo fetch --manifest-path jason/Cargo.toml
+	cargo fetch
 
 
 

From 06774bb9899fb345361971a6dd1b7a00de00d939 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 4 Apr 2019 10:42:30 +0300
Subject: [PATCH 079/179] Handler error send event

---
 src/api/client/commands.rs |  2 +-
 src/api/client/room.rs     | 66 ++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index 5ff698d93..c268a39f1 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -1,7 +1,7 @@
 use actix::Message;
 use serde::{Deserialize, Serialize};
 
-use crate::{api::client::RoomError, media::peer::Id as PeerId};
+use crate::media::peer::Id as PeerId;
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Message, Serialize)]
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index b250114ad..c6619c8ee 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -3,12 +3,12 @@
 use std::{
     fmt,
     sync::{Arc, Mutex},
-    time::Duration,
+    time::{Duration, Instant},
 };
 
 use actix::{
-    fut::wrap_future, Actor, ActorContext, ActorFuture, Addr, AsyncContext,
-    Context, Handler, Message, SpawnHandle,
+    fut::wrap_future, Actor, ActorFuture, Addr, AsyncContext, Context, Handler,
+    Message, SpawnHandle,
 };
 use failure::Fail;
 use futures::{
@@ -21,14 +21,8 @@ use crate::{
     api::client::{Command, Event, Session},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
-    media::{
-        peer::{Id as PeerId, Peer, PeerMachine},
-        track::{AudioSettings, Track, TrackMediaType, VideoSettings},
-    },
+    media::peer::{Id as PeerId, PeerMachine},
 };
-use slog::Drain;
-use std::error::Error;
-use std::time::Instant;
 
 /// Timeout for close [`Session`] after receive `RpcConnectionClosed` message.
 pub const SESSION_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
@@ -139,29 +133,16 @@ impl Room {
         &mut self,
         member_id: MemberId,
         event: Event,
-    ) -> impl Future<Item = (), Error = ()> {
+    ) -> impl Future<Item = (), Error = RoomError> {
         match self.sessions.get(&member_id) {
-            Some(session) => Either::A(session.send_event(event)),
-            None => Either::B(self.close(Instant::now())),
-        }
-    }
-
-    fn handle_member_connected(
-        &mut self,
-        member_id: &MemberId,
-    ) -> impl Future<Item = (), Error = ()> {
-        let peer = self.member_peer(member_id);
-        match peer.sender() {
-            Some(_) => {
-                let fut = match self.handle_peer_created(peer.id()) {
-                    Ok((caller, event)) => {
-                        Either::A(self.send_event(caller, event))
-                    }
-                    Err(e) => Either::B(self.close(Instant::now())),
-                };
-                Either::B(fut)
+            Some(connection) => Either::A(
+                connection
+                    .send_event(event)
+                    .map_err(move |_| RoomError::UnableSendEvent(member_id)),
+            ),
+            None => {
+                Either::B(future::err(RoomError::SessionNotExists(member_id)))
             }
-            None => Either::A(future::ok(())),
         }
     }
 
@@ -404,7 +385,21 @@ impl Handler<RpcConnectionEstablished> for Room {
             let member_id = msg.member_id;
             self.sessions
                 .insert(member_id, Session::new(msg.member_id, msg.connection));
-            fut = Either::B(self.handle_member_connected(&member_id))
+            let peer = self.member_peer(&member_id);
+            fut = match peer.sender() {
+                Some(_) => match self.handle_peer_created(peer.id()) {
+                    Ok((caller, event)) => {
+                        match self.send_event(caller, event).wait() {
+                            Ok(_) => Either::B(Either::A(future::ok(()))),
+                            Err(_) => {
+                                Either::B(Either::B(self.close(Instant::now())))
+                            }
+                        }
+                    }
+                    Err(e) => Either::B(Either::B(self.close(Instant::now()))),
+                },
+                None => Either::B(Either::A(future::ok(()))),
+            };
         }
         Box::new(wrap_future(fut))
     }
@@ -418,7 +413,7 @@ impl Handler<Command> for Room {
     fn handle(
         &mut self,
         command: Command,
-        ctx: &mut Self::Context,
+        _: &mut Self::Context,
     ) -> Self::Result {
         let res = match command {
             Command::MakeSdpOffer { peer_id, sdp_offer } => {
@@ -434,7 +429,10 @@ impl Handler<Command> for Room {
         };
         let fut = match res {
             Ok((member_id, event)) => {
-                Either::A(self.send_event(member_id, event))
+                match self.send_event(member_id, event).wait() {
+                    Ok(_) => Either::A(future::ok(())),
+                    Err(_) => Either::B(self.close(Instant::now())),
+                }
             }
             Err(e) => Either::B(self.close(Instant::now())),
         };

From f60196464456e5070581da8deb9b4d007a4ea7de Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 4 Apr 2019 20:40:22 +0300
Subject: [PATCH 080/179] draft

---
 Cargo.lock            |  66 +++++++++------
 jason/Cargo.toml      |  17 +++-
 jason/e2e/js/index.js |  16 ++--
 jason/src/lib.rs      | 188 ++++++++++++++++++++++++++++++++++++++----
 4 files changed, 240 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4aad7d395..ce4d38757 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,7 +75,7 @@ dependencies = [
  "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -87,7 +87,7 @@ dependencies = [
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -283,10 +283,10 @@ name = "config"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -344,7 +344,7 @@ dependencies = [
  "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -377,7 +377,7 @@ dependencies = [
  "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -390,13 +390,18 @@ dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "dotenv"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -669,8 +674,14 @@ name = "jason"
 version = "0.1.0-dev"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -704,7 +715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -782,7 +793,7 @@ dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_test 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1217,7 +1228,7 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1280,7 +1291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.84"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1315,7 +1326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1331,7 +1342,7 @@ name = "serde_test"
 version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1341,7 +1352,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1350,7 +1361,7 @@ name = "serial_test"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1421,7 +1432,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1432,7 +1443,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1568,7 +1579,7 @@ name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1658,7 +1669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1759,7 +1770,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1779,7 +1790,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1802,7 +1813,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1825,7 +1836,7 @@ dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1965,6 +1976,8 @@ name = "wasm-bindgen"
 version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1974,7 +1987,7 @@ version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2199,6 +2212,7 @@ dependencies = [
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
 "checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 "checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
 "checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
@@ -2235,7 +2249,7 @@ dependencies = [
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
@@ -2303,7 +2317,7 @@ dependencies = [
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4"
 "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
 "checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
 "checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 3f4adca35..0ebcc889a 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -17,13 +17,26 @@ default = ["console_error_panic_hook"]
 [dependencies]
 
 console_error_panic_hook = { version = "0.1", optional = true }
+discard = "1.0"
+futures = "0.1"
 js-sys = "0.3"
-wasm-bindgen = "0.2"
+lazy_static = "1.3"
+
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+
+wasm-bindgen = { version = "0.2", features = ['serde-serialize'] }
+wasm-bindgen-futures = "0.3"
 
 [dependencies.web-sys]
 version = "0.3.4"
 features = [
-    'WebSocket'
+    'console',
+    'Event',
+    'EventTarget',
+    'MessageEvent',
+    'WebSocket',
+    'Window',
 ]
 
 wee_alloc = { version = "0.4", optional = true }
diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
index a3910a5c2..5ad0b7799 100644
--- a/jason/e2e/js/index.js
+++ b/jason/e2e/js/index.js
@@ -1,5 +1,11 @@
-import("../../pkg").then(rust => {
-  let jason = new rust.Jason("ws://localhost:8080/ws/1/1/caller_credentials");
-  console.log(jason.get_token());
-  jason.init_socket();
-});
+async function f() {
+    const rust = await import("../../pkg");
+
+    let jason = new rust.Jason();
+
+    let session = jason.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+
+    alert("hi");
+}
+
+f();
\ No newline at end of file
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 7d21b3052..d18211baf 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,5 +1,10 @@
+use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
+use js_sys::JSON;
+use serde::{Deserialize, Serialize};
+use std::{cell::RefCell, rc::Rc};
 use wasm_bindgen::prelude::*;
-use web_sys::WebSocket;
+use wasm_bindgen::JsCast;
+use web_sys::{console, MessageEvent, WebSocket, Window};
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -9,6 +14,7 @@ use web_sys::WebSocket;
 // https://github.com/rustwasm/console_error_panic_hook#readme
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
+use core::borrow::Borrow;
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
@@ -16,31 +22,185 @@ pub use console_error_panic_hook::set_once as set_panic_hook;
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
+fn window() -> Window {
+    // cannot use lazy_static since window is !Sync
+    // safe to unwrap
+    web_sys::window().unwrap()
+}
+
+struct Transport {
+    sock: Option<Rc<WebSocket>>,
+    token: String,
+    pinger: Rc<RefCell<Pinger>>,
+    subs: Vec<UnboundedSender<Command>>,
+}
+
+struct Pinger {
+    num: usize,
+    socket: Option<Rc<WebSocket>>,
+    hearbeat_handler: Option<HearbeatHandler>
+}
+
+struct HearbeatHandler {
+    closure: Closure<Box<dyn FnMut>>,
+    interva_id: u32,
+}
+
+impl Transport {
+    fn new(token: String) -> Self {
+        Transport {
+            sock: None,
+            token,
+            subs: vec![],
+            pinger: Rc::new(RefCell::new(Pinger::new())),
+        }
+    }
+
+    fn init(&mut self) {
+        let socket = WebSocket::new(&self.token).unwrap();
+        let socket = Rc::new(socket);
+
+        let socket_rc = Rc::clone(&socket);
+        let pinger_rc = Rc::clone(&self.pinger);
+        let on_open = move || {
+            console::log(&js_sys::Array::from(&JsValue::from_str(
+                "socket opened",
+            )));
+            pinger_rc.try_borrow_mut().unwrap().start(socket_rc);
+        };
+        let on_open: Closure<FnMut() -> ()> = Closure::once(on_open);
+
+        let on_message = Closure::wrap(Box::new(move |event: MessageEvent| {
+            let payload = event.data();
+            console::log(&js_sys::Array::from(&payload));
+        }) as Box<dyn FnMut(_)>);
+
+        socket
+            .add_event_listener_with_callback(
+                "open",
+                on_open.as_ref().unchecked_ref(),
+            )
+            .unwrap();
+        on_open.forget();
+
+        socket
+            .add_event_listener_with_callback(
+                "message",
+                on_message.as_ref().unchecked_ref(),
+            )
+            .unwrap();
+        on_message.forget();
+
+        self.sock = Some(socket)
+    }
+
+    fn add_sub(&mut self, sub: UnboundedSender<Command>) {
+        self.subs.push(sub);
+    }
+}
+
+impl Pinger {
+    fn new() -> Self {
+        Pinger {
+            num: 0,
+            socket: None,
+            hearbeat_handler: None
+        }
+    }
+
+    fn start(&mut self, socket: Rc<WebSocket>) {
+        self.socket = Some(socket);
+        self.send_now();
+
+        console::log(&js_sys::Array::from(&JsValue::from_str(
+            "pinger started",
+        )));
+
+        let closure = Closure::wrap(Box::new(|| {
+            console::log(&js_sys::Array::from(&JsValue::from_str("ping")));
+            //            self.send_now();
+        }) as Box<dyn FnMut()>);
+
+        let interva_id = window()
+            .set_interval_with_callback_and_timeout_and_arguments_0(
+                ping.as_ref().unchecked_ref(),
+                3000,
+            )
+            .unwrap();
+        self.hearbeat_handler = Some(HearbeatHandler {
+            closure,
+            interva_id
+        });
+    }
+
+    fn send_now(&mut self) {
+        match self.socket.as_ref() {
+            None => {}
+            Some(socket) => {
+                let a: &Rc<WebSocket> = socket;
+                self.num += 1;
+
+                let msg =
+                    serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
+
+                socket.send_with_str(&msg).unwrap();
+            }
+        };
+    }
+}
+
+struct Command {}
+
+#[derive(Deserialize, Serialize)]
+pub enum Heartbeat {
+    /// `ping` message that WebSocket client is expected to send to the server
+    /// periodically.
+    #[serde(rename = "ping")]
+    Ping(usize),
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
+
 #[wasm_bindgen]
 pub struct Jason {
-    token: String,
+    transport: Option<Transport>,
+}
+
+#[wasm_bindgen]
+pub struct SessionHandler {
+    tx: UnboundedSender<Command>,
+    rx: UnboundedReceiver<Command>,
+}
+
+impl SessionHandler {
+    fn new() -> SessionHandler {
+        let (tx, rx) = unbounded();
+
+        SessionHandler { tx, rx }
+    }
 }
 
 #[wasm_bindgen]
 impl Jason {
     #[wasm_bindgen(constructor)]
-    pub fn new(token: String) -> Self {
+    pub fn new() -> Self {
         set_panic_hook();
 
-        Self { token }
+        Self { transport: None }
     }
 
-    pub fn get_token(&self) -> String {
-        self.token.clone()
-    }
+    pub fn init_session(&mut self, token: String) -> SessionHandler {
+        let mut transport = Transport::new(token);
+        transport.init();
 
-    pub fn drop(self) {}
+        let handler = SessionHandler::new();
 
-    pub fn init_socket(&self) {
-        get_websocket(&self.token);
-    }
-}
+        transport.add_sub(handler.tx.clone());
+
+        self.transport = Some(transport);
 
-fn get_websocket(url: &str) -> WebSocket {
-    WebSocket::new(url).unwrap()
+        handler
+    }
 }

From 0d472b86b120a37e5e79eb71c43a25672922ba29 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 5 Apr 2019 16:52:06 +0300
Subject: [PATCH 081/179] Impl transition into failure state for peer

---
 signaling_test.html          |   4 +-
 src/api/client/connection.rs |  20 +--
 src/api/client/mod.rs        |   5 +-
 src/api/client/room.rs       | 307 +++++++++++++++++++++++------------
 src/api/client/server.rs     |   2 +-
 src/api/client/session.rs    |  55 -------
 src/main.rs                  |   2 +-
 src/media/mod.rs             |   2 +-
 src/media/peer.rs            |  72 +++++---
 src/media/track.rs           |   2 +-
 10 files changed, 272 insertions(+), 199 deletions(-)
 delete mode 100644 src/api/client/session.rs

diff --git a/signaling_test.html b/signaling_test.html
index 944b0d7a0..5b437a16c 100644
--- a/signaling_test.html
+++ b/signaling_test.html
@@ -99,9 +99,9 @@
                 pc.setLocalDescription(answer);
 
                 socket.send(JSON.stringify({
-                    MakeSdpOffer: {
+                    MakeSdpAnswer: {
                         peer_id: msg.peer_id,
-                        sdp_offer: JSON.stringify(answer)
+                        sdp_answer: JSON.stringify(answer)
                     }
                 }));
             } else {
diff --git a/src/api/client/connection.rs b/src/api/client/connection.rs
index c25eda9ab..5ea4a0b40 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/connection.rs
@@ -112,7 +112,7 @@ impl Actor for WsConnection {
                         "WsConnection of member {} failed to join Room, \
                          because: {:?}",
                         member_id, err,
-                    )
+                    );
                 }),
         ));
     }
@@ -215,25 +215,15 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
                     let member_id = self.member_id;
                     ctx.wait(wrap_future(
-                        self.room
-                            .send(command)
-                            .map(move |res| {
-                                match res {
-                                    Ok(_) => (),
-                                    Err(_) => error!(
-                                        "Command {} from member {} handle \
-                                         failed",
-                                        text, member_id,
-                                    ),
-                                };
-                            })
-                            .map_err(move |err| {
+                        self.room.send(command).map(|_| ()).map_err(
+                            move |err| {
                                 error!(
                                     "Cannot send Command from member {}, \
                                      because {}",
                                     member_id, err
                                 )
-                            }),
+                            },
+                        ),
                     ));
                 }
             }
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 0512f3191..0b549fc76 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -5,8 +5,5 @@ pub mod connection;
 pub mod events;
 pub mod room;
 pub mod server;
-pub mod session;
 
-pub use self::{
-    commands::*, connection::*, events::*, room::*, server::*, session::*,
-};
+pub use self::{commands::*, connection::*, events::*, room::*, server::*};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index c6619c8ee..642fff463 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -7,8 +7,9 @@ use std::{
 };
 
 use actix::{
-    fut::wrap_future, Actor, ActorFuture, Addr, AsyncContext, Context, Handler,
-    Message, SpawnHandle,
+    fut::{err, ok, wrap_future},
+    Actor, ActorContext, ActorFuture, Addr, AsyncContext, Context,
+    ContextFutureSpawner, Handler, Message, Running, SpawnHandle, WrapFuture,
 };
 use failure::Fail;
 use futures::{
@@ -18,7 +19,7 @@ use futures::{
 use hashbrown::HashMap;
 
 use crate::{
-    api::client::{Command, Event, Session},
+    api::client::{Command, Event},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
     media::peer::{Id as PeerId, PeerMachine},
@@ -35,7 +36,7 @@ pub enum RoomError {
     #[fail(display = "Unmatched states between peers {} and {}", _0, _1)]
     UnmatchedState(PeerId, PeerId),
     #[fail(display = "Member {} not connected at moment", _0)]
-    SessionNotExists(MemberId),
+    ConnectionNotExists(MemberId),
     #[fail(display = "Unable send event to member {}", _0)]
     UnableSendEvent(MemberId),
 }
@@ -49,6 +50,10 @@ pub struct Room {
     /// ID of this [`Room`].
     id: Id,
 
+    /// Established [`WsConnection`]s of [`Member`]s in this [`Room`].
+    pub connections: HashMap<MemberId, Box<dyn RpcConnection>>,
+    // TODO: Replace Box<dyn RpcConnection>> with enum,
+    //       as the set of all possible RpcConnection types is not closed.
     idle_timeouts: HashMap<MemberId, SpawnHandle>,
 
     /// [`Member`]s which currently are present in this [`Room`].
@@ -56,9 +61,6 @@ pub struct Room {
 
     /// [`Peer`]s of [`Member`]s in this [`Room`].
     peers: HashMap<PeerId, PeerMachine>,
-
-    /// [`Session`]s of [`Member`]s with established [`WsConnection`]s.
-    sessions: HashMap<MemberId, Session>,
 }
 
 impl Room {
@@ -70,32 +72,13 @@ impl Room {
     ) -> Self {
         Room {
             id,
+            connections: HashMap::new(),
             idle_timeouts: HashMap::new(),
             members,
             peers,
-            sessions: HashMap::new(),
         }
     }
 
-    fn close(
-        &mut self,
-        closed_at: Instant,
-    ) -> impl Future<Item = (), Error = ()> {
-        let fut = self.sessions.drain().fold(
-            vec![],
-            |mut futures, (member_id, session)| {
-                info!(
-                    "Removed session of member {}, because room is close at \
-                     {:?}",
-                    member_id, closed_at
-                );
-                futures.push(session.close());
-                futures
-            },
-        );
-        join_all(fut).map(|_| ())
-    }
-
     /// Store [`Peer`] in [`Room`].
     fn add_peer(&mut self, id: PeerId, peer: PeerMachine) {
         self.peers.insert(id, peer);
@@ -133,17 +116,15 @@ impl Room {
         &mut self,
         member_id: MemberId,
         event: Event,
-    ) -> impl Future<Item = (), Error = RoomError> {
-        match self.sessions.get(&member_id) {
-            Some(connection) => Either::A(
-                connection
-                    .send_event(event)
-                    .map_err(move |_| RoomError::UnableSendEvent(member_id)),
-            ),
-            None => {
-                Either::B(future::err(RoomError::SessionNotExists(member_id)))
-            }
-        }
+    ) -> Result<(), RoomError> {
+        self.connections
+            .get(&member_id)
+            .ok_or(RoomError::ConnectionNotExists(member_id))
+            .and_then(move |conn| {
+                conn.send_event(event)
+                    .wait()
+                    .map_err(|_| RoomError::UnableSendEvent(member_id))
+            })
     }
 
     fn handle_peer_created(
@@ -290,6 +271,38 @@ impl Room {
 /// to interact with [`Room`].
 impl Actor for Room {
     type Context = Context<Self>;
+
+    /// Closes all active [`PrcConnection`].
+    fn stopping(&mut self, ctx: &mut Self::Context) -> Running {
+        use std::mem;
+        let connections = mem::replace(&mut self.connections, hashmap!());
+        let fut = connections.iter().fold(
+            vec![],
+            |mut futures, (member_id, connection)| {
+                info!(
+                    "Close connection of member {}, because room is stopped",
+                    member_id,
+                );
+                futures.push(
+                    connection.send_event(Event::PeersRemoved {
+                        peer_ids: self
+                            .peers
+                            .iter()
+                            .filter(move |(_, peer)| {
+                                peer.member_id() == *member_id
+                            })
+                            .map(|(&id, _)| id)
+                            .collect(),
+                    }),
+                );
+                futures.push(connection.close());
+                futures
+            },
+        );
+        // ToDo ignore error
+        ctx.wait(wrap_future(join_all(fut).map(|_| ())));
+        Running::Continue
+    }
 }
 
 /// Established RPC connection with some remote [`Member`].
@@ -333,7 +346,9 @@ impl Handler<AuthorizeRpcConnection> for Room {
         msg: AuthorizeRpcConnection,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        use RpcConnectionAuthorizationError::*;
+        use RpcConnectionAuthorizationError::{
+            InvalidCredentials, MemberNotExists,
+        };
         if let Some(ref member) = self.members.get(&msg.member_id) {
             if member.credentials.eq(&msg.credentials) {
                 return Ok(());
@@ -371,35 +386,35 @@ impl Handler<RpcConnectionEstablished> for Room {
     ) -> Self::Result {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
-        let mut fut;
-        if let Some(session) = self.sessions.get_mut(&msg.member_id) {
-            debug!(
-                "Replaced RpcConnection for member {} session",
-                msg.member_id
-            );
+        let mut fut = Either::A(future::ok(()));
+        if let Some(connection) = self.connections.remove(&msg.member_id) {
+            debug!("Closing old RpcConnection for member {}", msg.member_id);
             if let Some(handler) = self.idle_timeouts.remove(&msg.member_id) {
                 ctx.cancel_future(handler);
             }
-            fut = Either::A(session.set_connection(msg.connection));
+            fut = Either::B(connection.close());
         } else {
             let member_id = msg.member_id;
-            self.sessions
-                .insert(member_id, Session::new(msg.member_id, msg.connection));
+            self.connections.insert(msg.member_id, msg.connection);
+
             let peer = self.member_peer(&member_id);
-            fut = match peer.sender() {
-                Some(_) => match self.handle_peer_created(peer.id()) {
-                    Ok((caller, event)) => {
-                        match self.send_event(caller, event).wait() {
-                            Ok(_) => Either::B(Either::A(future::ok(()))),
-                            Err(_) => {
-                                Either::B(Either::B(self.close(Instant::now())))
-                            }
-                        }
-                    }
-                    Err(e) => Either::B(Either::B(self.close(Instant::now()))),
-                },
-                None => Either::B(Either::A(future::ok(()))),
-            };
+            if peer.sender().is_some() {
+                // ToDo try into_future(self) for handle error
+                fut = Either::A(future::done(
+                    self.handle_peer_created(peer.id())
+                        .and_then(|(caller, event)| {
+                            self.send_event(caller, event)
+                        })
+                        .map_err(move |err| {
+                            error!(
+                                "Member {} cannot join room, because {}. Room \
+                                 will be stop.",
+                                member_id, err
+                            );
+                            ctx.stop()
+                        }),
+                ));
+            }
         }
         Box::new(wrap_future(fut))
     }
@@ -413,7 +428,7 @@ impl Handler<Command> for Room {
     fn handle(
         &mut self,
         command: Command,
-        _: &mut Self::Context,
+        ctx: &mut Self::Context,
     ) -> Self::Result {
         let res = match command {
             Command::MakeSdpOffer { peer_id, sdp_offer } => {
@@ -427,15 +442,16 @@ impl Handler<Command> for Room {
                 self.handle_set_ice_candidate(peer_id, candidate)
             }
         };
-        let fut = match res {
-            Ok((member_id, event)) => {
-                match self.send_event(member_id, event).wait() {
-                    Ok(_) => Either::A(future::ok(())),
-                    Err(_) => Either::B(self.close(Instant::now())),
-                }
-            }
-            Err(e) => Either::B(self.close(Instant::now())),
-        };
+        let fut = future::done(
+            res.and_then(|(caller, event)| self.send_event(caller, event))
+                .map_err(move |err| {
+                    error!(
+                        "Failed handle command, because {}. Room will be stop.",
+                        err
+                    );
+                    ctx.stop()
+                }),
+        );
         Box::new(wrap_future(fut))
     }
 }
@@ -463,17 +479,29 @@ impl Handler<RpcConnectionClosed> for Room {
 
     /// Removes [`Session`] of specified [`Member`] from the [`Room`].
     fn handle(&mut self, msg: RpcConnectionClosed, ctx: &mut Self::Context) {
+        use RpcConnectionClosedReason::{Disconnected, Idle};
         info!(
             "RpcConnectionClosed for member {}, reason {:?}",
             msg.member_id, msg.reason
         );
         let closed_at = Instant::now();
-        self.idle_timeouts.insert(
-            msg.member_id,
-            ctx.run_later(SESSION_IDLE_TIMEOUT, move |room, ctx| {
-                ctx.wait(wrap_future(room.close(closed_at)));
-            }),
-        );
+        let member_id = msg.member_id;
+        match msg.reason {
+            Disconnected => ctx.stop(),
+            Idle => {
+                self.idle_timeouts.insert(
+                    msg.member_id,
+                    ctx.run_later(SESSION_IDLE_TIMEOUT, move |_room, ctx| {
+                        info!(
+                            "Member {} connection lost at {:?}. Room will be \
+                             stop.",
+                            member_id, closed_at
+                        );
+                        ctx.stop()
+                    }),
+                );
+            }
+        }
     }
 }
 
@@ -504,6 +532,10 @@ mod test {
     use futures::future::Future;
 
     use super::*;
+    use crate::media::track::{DirectionalTrack, TrackDirection};
+    use crate::media::{
+        AudioSettings, Peer, Track, TrackMediaType, VideoSettings,
+    };
 
     #[derive(Debug, Clone)]
     struct TestConnection {
@@ -516,11 +548,21 @@ mod test {
         type Context = Context<Self>;
 
         fn started(&mut self, ctx: &mut Self::Context) {
-            let caller_message = RpcConnectionEstablished {
-                member_id: self.member_id,
-                connection: Box::new(ctx.address()),
-            };
-            self.room.do_send(caller_message);
+            let member_id = self.member_id;
+            self.room
+                .send(RpcConnectionEstablished {
+                    member_id: self.member_id,
+                    connection: Box::new(ctx.address()),
+                })
+                .into_actor(self)
+                .then(|res, _, ctx| {
+                    match res {
+                        Err(_) => System::current().stop(),
+                        _ => {}
+                    }
+                    ok(())
+                })
+                .wait(ctx);
         }
     }
 
@@ -562,7 +604,7 @@ mod test {
                     });
                     ctx.stop();
                 }
-                Event::PeersRemoved { peer_id: _ } => {
+                Event::PeersRemoved { peer_ids: _ } => {
                     System::current().stop();
                 }
             }
@@ -588,7 +630,31 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
             2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
         };
-        Arbiter::start(move |_| Room::new(1, members, hashmap!()))
+        Arbiter::start(move |_| Room::new(1, members, create_peers(1, 2)))
+    }
+
+    fn create_peers(
+        caller: MemberId,
+        callee: MemberId,
+    ) -> HashMap<MemberId, PeerMachine> {
+        let caller_peer_id = 1;
+        let callee_peer_id = 2;
+        let mut caller_peer = Peer::new(caller_peer_id, caller, callee_peer_id);
+        let mut callee_peer = Peer::new(callee_peer_id, callee, caller_peer_id);
+
+        let track_audio =
+            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
+        let track_video =
+            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
+        caller_peer.add_sender(track_audio.clone());
+        caller_peer.add_sender(track_video.clone());
+        callee_peer.add_receiver(track_audio);
+        callee_peer.add_receiver(track_video);
+
+        hashmap!(
+            caller_peer_id => PeerMachine::New(caller_peer),
+            callee_peer_id => PeerMachine::New(callee_peer),
+        )
     }
 
     #[test]
@@ -620,27 +686,68 @@ mod test {
         assert_eq!(
             caller_events.to_vec(),
             vec![
-                "{\"PeerCreated\":{\"peer_id\":1,\"sdp_offer\":null,\
-                 \"tracks\":[{\"id\":1,\"media_type\":{\"Audio\":{}},\
-                 \"direction\":{\"Send\":{\"receivers\":[2]}}},{\"id\":2,\
-                 \"media_type\":{\"Video\":{}},\"direction\":{\"Send\":\
-                 {\"receivers\":[2]}}}]}}",
-                "{\"SdpAnswerMade\":{\"peer_id\":1,\"sdp_answer\":\
-                 \"responder_answer\"}}",
-                "{\"PeerFinished\":{\"peer_id\":1}}"
+                serde_json::to_string(&Event::PeerCreated {
+                    peer_id: 1,
+                    sdp_offer: None,
+                    tracks: vec![
+                        DirectionalTrack {
+                            id: 1,
+                            direction: TrackDirection::Send {
+                                receivers: vec![2]
+                            },
+                            media_type: TrackMediaType::Audio(AudioSettings {}),
+                        },
+                        DirectionalTrack {
+                            id: 2,
+                            direction: TrackDirection::Send {
+                                receivers: vec![2]
+                            },
+                            media_type: TrackMediaType::Video(VideoSettings {}),
+                        },
+                    ],
+                })
+                .unwrap(),
+                serde_json::to_string(&Event::SdpAnswerMade {
+                    peer_id: 1,
+                    sdp_answer: "responder_answer".into(),
+                })
+                .unwrap(),
+                serde_json::to_string(&Event::PeersRemoved {
+                    peer_ids: vec![1],
+                })
+                .unwrap(),
             ]
         );
         assert_eq!(responder_events.len(), 2);
         assert_eq!(
             responder_events.to_vec(),
             vec![
-                "{\"PeerCreated\":{\"peer_id\":2,\"sdp_offer\":\
-                 \"caller_offer\",\"tracks\":[{\"id\":1,\"media_type\":\
-                 {\"Audio\":{}},\"direction\":{\"Recv\":{\"sender\":1}}},\
-                 {\"id\":2,\"media_type\":{\"Video\":{}},\"direction\":\
-                 {\"Recv\":{\"sender\":1}}}]}}",
-                "{\"IceCandidateDiscovered\":{\"peer_id\":2,\"candidate\":\
-                 \"ice_candidate\"}}",
+                serde_json::to_string(&Event::PeerCreated {
+                    peer_id: 2,
+                    sdp_offer: Some("caller_offer".into()),
+                    tracks: vec![
+                        DirectionalTrack {
+                            id: 1,
+                            direction: TrackDirection::Recv { sender: 1 },
+                            media_type: TrackMediaType::Audio(AudioSettings {}),
+                        },
+                        DirectionalTrack {
+                            id: 2,
+                            direction: TrackDirection::Recv { sender: 1 },
+                            media_type: TrackMediaType::Video(VideoSettings {}),
+                        },
+                    ],
+                })
+                .unwrap(),
+                serde_json::to_string(&Event::IceCandidateDiscovered {
+                    peer_id: 2,
+                    candidate: "ice_candidate".into(),
+                })
+                .unwrap(),
+                serde_json::to_string(&Event::PeersRemoved {
+                    peer_ids: vec![1],
+                })
+                .unwrap(),
             ]
         );
     }
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 81bba467a..8df0fafc5 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -107,7 +107,7 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".into()},
             2 => Member{id: 2, credentials: "responder_credentials".into()},
         };
-        let room = Arbiter::start(move |_| Room::new(1, members));
+        let room = Arbiter::start(move |_| Room::new(1, members, hashmap!()));
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
     }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
deleted file mode 100644
index c0b8e7d34..000000000
--- a/src/api/client/session.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use futures::Future;
-
-use crate::api::{
-    client::{Event, RpcConnection},
-    control::member::Id as MemberId,
-};
-
-/// Session authorized [`Member`].
-#[derive(Debug)]
-pub struct Session {
-    /// ID of [`Member`].
-    pub member_id: MemberId,
-
-    /// Established [`RpcConnection`]s of [`Member`]s.
-    connection: Box<dyn RpcConnection>,
-    /* TODO: Replace Box<dyn RpcConnection>> with enum,
-     *       as the set of all possible RpcConnection types is not closed. */
-}
-
-impl Session {
-    /// Returns new [`Session`] of [`Member`].
-    pub fn new(
-        member_id: MemberId,
-        connection: Box<dyn RpcConnection>,
-    ) -> Self {
-        Session {
-            member_id,
-            connection,
-        }
-    }
-
-    pub fn close(&self) -> impl Future<Item = (), Error = ()> {
-        self.connection.close()
-    }
-
-    /// Sends [`Event`] to remote [`Member`].
-    pub fn send_event(
-        &self,
-        event: Event,
-    ) -> impl Future<Item = (), Error = ()> {
-        self.connection.send_event(event)
-    }
-
-    /// Replace [`RpcConnection`] of [`Member`].
-    ///
-    /// Old [`RpcConnection`] will be close.
-    pub fn set_connection(
-        &mut self,
-        connection: Box<dyn RpcConnection>,
-    ) -> impl Future<Item = (), Error = ()> {
-        let fut = self.connection.close();
-        self.connection = connection;
-        Box::new(fut)
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index 9a06055d1..22ecc63db 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,7 +10,7 @@ use crate::{
         client::{server, Room, RoomsRepository},
         control::{Id as MemberId, Member},
     },
-    media::peer::{Id as PeerId, Peer, PeerMachine},
+    media::peer::{Peer, PeerMachine},
 };
 use std::sync::Arc;
 
diff --git a/src/media/mod.rs b/src/media/mod.rs
index ef2a48515..0ca57580e 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -2,7 +2,7 @@ pub mod peer;
 pub mod track;
 
 pub use self::{
-    peer::{Id as PeerId, Peer, PeerMachine, Transceiver},
+    peer::{Id as PeerId, Peer, PeerMachine},
     track::{
         AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
     },
diff --git a/src/media/peer.rs b/src/media/peer.rs
index dd7c8d467..8b97bad32 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -35,6 +35,7 @@ pub enum PeerMachine {
 }
 
 impl PeerMachine {
+    /// Returns ID of [`Member`] associated with this [`Peer`].
     pub fn member_id(&self) -> MemberId {
         match self {
             PeerMachine::New(peer) => peer.member_id(),
@@ -47,6 +48,7 @@ impl PeerMachine {
         }
     }
 
+    /// Returns ID of [`Peer`].
     pub fn id(&self) -> Id {
         match self {
             PeerMachine::New(peer) => peer.id(),
@@ -59,6 +61,26 @@ impl PeerMachine {
         }
     }
 
+    /// Returns ID of [`Peer`].
+    pub fn failed(self) -> Self {
+        match self {
+            PeerMachine::New(peer) => PeerMachine::Failure(peer.failed()),
+            PeerMachine::WaitLocalSDP(peer) => {
+                PeerMachine::Failure(peer.failed())
+            }
+            PeerMachine::WaitLocalHaveRemote(peer) => {
+                PeerMachine::Failure(peer.failed())
+            }
+            PeerMachine::WaitRemoteSDP(peer) => {
+                PeerMachine::Failure(peer.failed())
+            }
+            PeerMachine::Stable(peer) => PeerMachine::Failure(peer.failed()),
+            PeerMachine::Finished(peer) => PeerMachine::Failure(peer.failed()),
+            PeerMachine::Failure(peer) => PeerMachine::Failure(peer.failed()),
+        }
+    }
+
+    /// Returns sender for this [`Peer`] if exists.
     pub fn sender(&self) -> Option<Id> {
         match self {
             PeerMachine::New(peer) => peer.sender(),
@@ -71,6 +93,7 @@ impl PeerMachine {
         }
     }
 
+    /// Returns ID of interconnected [`Peer`].
     pub fn to_peer(&self) -> Id {
         match self {
             PeerMachine::New(peer) => peer.to_peer(),
@@ -84,12 +107,6 @@ impl PeerMachine {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct Transceiver {
-    pub member_id: MemberId,
-    pub peer_id: Id,
-}
-
 /// ID of [`Peer`].
 pub type Id = u64;
 
@@ -112,18 +129,29 @@ pub struct Peer<S> {
 }
 
 impl<T: Any> Peer<T> {
+    /// Returns ID of [`Member`] associated with this [`Peer`].
     pub fn member_id(&self) -> MemberId {
         self.context.member_id
     }
 
+    /// Returns ID of [`Peer`].
     pub fn id(&self) -> Id {
         self.context.id
     }
 
+    pub fn failed(self) -> Peer<Failure> {
+        Peer {
+            context: self.context,
+            state: Failure {},
+        }
+    }
+
+    /// Returns ID of interconnected [`Peer`].
     pub fn to_peer(&self) -> Id {
         self.context.to_peer
     }
 
+    /// Returns sender for this [`Peer`] if exists.
     pub fn sender(&self) -> Option<Id> {
         if self.context.receivers.is_empty() {
             None
@@ -132,7 +160,8 @@ impl<T: Any> Peer<T> {
         }
     }
 
-    pub fn receivers(&self) -> Option<Id> {
+    /// Returns receiver for this [`Peer`] if exists.
+    pub fn receiver(&self) -> Option<Id> {
         if self.context.senders.is_empty() {
             None
         } else {
@@ -140,6 +169,7 @@ impl<T: Any> Peer<T> {
         }
     }
 
+    /// Returns [`Track`]'s of [`Peer`].
     pub fn tracks(&self) -> Vec<DirectionalTrack> {
         let tracks = self.context.senders.iter().fold(
             vec![],
@@ -188,8 +218,7 @@ impl Peer<New> {
         }
     }
 
-    /// Sends PeerCreated event to Web Client and puts [`Peer`] into state
-    /// of waiting for local offer.
+    /// Transition new [`Peer`] into state of waiting for local description.
     pub fn start(self) -> Peer<WaitLocalSDP> {
         Peer {
             context: self.context,
@@ -197,8 +226,7 @@ impl Peer<New> {
         }
     }
 
-    /// Sends PeerCreated event with local offer to Web Client and puts [`Peer`]
-    /// into state of waiting for remote offer.
+    /// Transition new [`Peer`] into state of waiting for remote description.
     pub fn set_remote_sdp(
         self,
         sdp_offer: String,
@@ -211,24 +239,20 @@ impl Peer<New> {
         }
     }
 
+    /// Add [`Track`] to [`Peer`] for send.
     pub fn add_sender(&mut self, track: Arc<Track>) {
         self.context.senders.insert(track.id, track);
     }
 
+    /// Add [`Track`] to [`Peer`] for receive.
     pub fn add_receiver(&mut self, track: Arc<Track>) {
         self.context.receivers.insert(track.id, track);
     }
 }
 
-#[test]
-fn create_peer() {
-    let peer = Peer::new(1, 1, 2);
-    let peer = peer.start();
-
-    assert_eq!(peer.state, WaitLocalSDP {});
-}
-
 impl Peer<WaitLocalSDP> {
+    /// Set local description and transition [`Peer`]
+    /// to [`WaitRemoteSDP`] state.
     pub fn set_local_sdp(self, sdp_offer: String) -> Peer<WaitRemoteSDP> {
         let mut context = self.context;
         context.sdp_offer = Some(sdp_offer);
@@ -240,6 +264,7 @@ impl Peer<WaitLocalSDP> {
 }
 
 impl Peer<WaitRemoteSDP> {
+    /// Set remote description and transition [`Peer`] to [`Stable`] state.
     pub fn set_remote_sdp(self, sdp_answer: String) -> Peer<Stable> {
         let mut context = self.context;
         context.sdp_answer = Some(sdp_answer.clone());
@@ -251,6 +276,7 @@ impl Peer<WaitRemoteSDP> {
 }
 
 impl Peer<WaitLocalHaveRemote> {
+    /// Set local description and transition [`Peer`] to [`Stable`] state.
     pub fn set_local_sdp(self, sdp_answer: String) -> Peer<Stable> {
         let mut context = self.context;
         context.sdp_answer = Some(sdp_answer);
@@ -260,3 +286,11 @@ impl Peer<WaitLocalHaveRemote> {
         }
     }
 }
+
+#[test]
+fn create_peer() {
+    let peer = Peer::new(1, 1, 2);
+    let peer = peer.start();
+
+    assert_eq!(peer.state, WaitLocalSDP {});
+}
diff --git a/src/media/track.rs b/src/media/track.rs
index b671913db..530d21e6f 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -23,8 +23,8 @@ impl Track {
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct DirectionalTrack {
     pub id: Id,
-    pub media_type: TrackMediaType,
     pub direction: TrackDirection,
+    pub media_type: TrackMediaType,
 }
 
 /// Direction of [`Track`].

From 83f139de1b47fec8c69d744f01f285e53d367e69 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 5 Apr 2019 22:17:06 +0300
Subject: [PATCH 082/179] implementing transport

---
 jason/Cargo.toml       |   1 +
 jason/src/lib.rs       | 157 ++++++++++++++++++++++-------------------
 jason/src/utils/mod.rs |  23 ++++++
 3 files changed, 108 insertions(+), 73 deletions(-)
 create mode 100644 jason/src/utils/mod.rs

diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 0ebcc889a..5ec04bead 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -37,6 +37,7 @@ features = [
     'MessageEvent',
     'WebSocket',
     'Window',
+    'CloseEvent'
 ]
 
 wee_alloc = { version = "0.4", optional = true }
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index d18211baf..906bd9412 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,10 +1,14 @@
 use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
-use js_sys::JSON;
+use js_sys::{Date};
 use serde::{Deserialize, Serialize};
 use std::{cell::RefCell, rc::Rc};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
-use web_sys::{console, MessageEvent, WebSocket, Window};
+use web_sys::{console, MessageEvent, WebSocket, Window, Event, CloseEvent};
+
+mod utils;
+
+use utils::*;
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -14,7 +18,7 @@ use web_sys::{console, MessageEvent, WebSocket, Window};
 // https://github.com/rustwasm/console_error_panic_hook#readme
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
-use core::borrow::Borrow;
+
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
@@ -29,30 +33,25 @@ fn window() -> Window {
 }
 
 struct Transport {
-    sock: Option<Rc<WebSocket>>,
+    sock: Rc<Option<WebSocket>>,
     token: String,
     pinger: Rc<RefCell<Pinger>>,
     subs: Vec<UnboundedSender<Command>>,
-}
-
-struct Pinger {
-    num: usize,
-    socket: Option<Rc<WebSocket>>,
-    hearbeat_handler: Option<HearbeatHandler>
-}
-
-struct HearbeatHandler {
-    closure: Closure<Box<dyn FnMut>>,
-    interva_id: u32,
+    on_open: Option<Closure<dyn FnMut(Event)>>,
+    on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
+    on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
 }
 
 impl Transport {
     fn new(token: String) -> Self {
         Transport {
-            sock: None,
+            sock: Rc::new(None),
             token,
             subs: vec![],
             pinger: Rc::new(RefCell::new(Pinger::new())),
+            on_open: None,
+            on_message: None,
+            on_close: None
         }
     }
 
@@ -62,36 +61,30 @@ impl Transport {
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc = Rc::clone(&self.pinger);
-        let on_open = move || {
-            console::log(&js_sys::Array::from(&JsValue::from_str(
-                "socket opened",
-            )));
-            pinger_rc.try_borrow_mut().unwrap().start(socket_rc);
-        };
-        let on_open: Closure<FnMut() -> ()> = Closure::once(on_open);
+        let on_open = bind_handler_fn_once("open", &socket, move |_:Event| {
+            pinger_rc.borrow().start(socket_rc);
+        }).unwrap();
 
-        let on_message = Closure::wrap(Box::new(move |event: MessageEvent| {
+        let pinger_rc = Rc::clone(&self.pinger);
+        let on_message = bind_handler_fn_mut("message", &socket, move |event: MessageEvent| {
             let payload = event.data();
-            console::log(&js_sys::Array::from(&payload));
-        }) as Box<dyn FnMut(_)>);
 
-        socket
-            .add_event_listener_with_callback(
-                "open",
-                on_open.as_ref().unchecked_ref(),
-            )
-            .unwrap();
-        on_open.forget();
+            if let Ok(pinger) = pinger_rc.try_borrow_mut() {
+                pinger.set_pong_at(Date::now());
+            }
 
-        socket
-            .add_event_listener_with_callback(
-                "message",
-                on_message.as_ref().unchecked_ref(),
-            )
-            .unwrap();
-        on_message.forget();
+            console::log(&js_sys::Array::from(&payload));
+        }).unwrap();
 
-        self.sock = Some(socket)
+        let on_close = bind_handler_fn_once("close", &socket, move |close:CloseEvent| {
+//            pinger_rc.borrow().start(socket_rc);
+//            self.sock.take();
+        }).unwrap();
+
+        self.on_open = Some(on_open);
+        self.on_message = Some(on_message);
+        self.on_close = Some(on_close);
+        self.sock = Rc::new(Some(socket))
     }
 
     fn add_sub(&mut self, sub: UnboundedSender<Command>) {
@@ -99,53 +92,71 @@ impl Transport {
     }
 }
 
+struct Pinger(Rc<RefCell<InnerPinger>>);
+
+struct InnerPinger {
+    num: usize,
+    pong_at: Option<f64>,
+    socket: Option<Rc<WebSocket>>,
+    hearbeat_handler: Option<PingTaskHandler>,
+}
+
+impl InnerPinger {
+    fn send_now(&mut self) {
+        match self.socket.as_ref() {
+            None => {}
+            Some(socket) => {
+                self.num+=1;
+
+                let msg =
+                    serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
+
+                socket.send_with_str(&msg).unwrap();
+            }
+        };
+    }
+}
+
+struct PingTaskHandler {
+    ping_closure: Closure<dyn FnMut()>,
+    interval_id: i32,
+}
+
 impl Pinger {
     fn new() -> Self {
-        Pinger {
+        Self(Rc::new(RefCell::new(InnerPinger {
             num: 0,
+            pong_at: None,
             socket: None,
-            hearbeat_handler: None
-        }
+            hearbeat_handler: None,
+        })))
     }
 
-    fn start(&mut self, socket: Rc<WebSocket>) {
-        self.socket = Some(socket);
-        self.send_now();
+    fn set_pong_at(&self, at: f64) {
+        self.0.borrow_mut().pong_at = Some(at);
+    }
 
-        console::log(&js_sys::Array::from(&JsValue::from_str(
-            "pinger started",
-        )));
+    fn start(&self, socket: Rc<WebSocket>) {
+        let mut inner = self.0.borrow_mut();
+        inner.socket = Some(socket);
+        inner.send_now();
 
-        let closure = Closure::wrap(Box::new(|| {
-            console::log(&js_sys::Array::from(&JsValue::from_str("ping")));
-            //            self.send_now();
+        let inner_rc = Rc::clone(&self.0);
+        let do_ping = Closure::wrap(Box::new(move || {
+            inner_rc.borrow_mut().send_now();
         }) as Box<dyn FnMut()>);
 
-        let interva_id = window()
+        let interval_id = window()
             .set_interval_with_callback_and_timeout_and_arguments_0(
-                ping.as_ref().unchecked_ref(),
+                do_ping.as_ref().unchecked_ref(),
                 3000,
             )
             .unwrap();
-        self.hearbeat_handler = Some(HearbeatHandler {
-            closure,
-            interva_id
-        });
-    }
-
-    fn send_now(&mut self) {
-        match self.socket.as_ref() {
-            None => {}
-            Some(socket) => {
-                let a: &Rc<WebSocket> = socket;
-                self.num += 1;
 
-                let msg =
-                    serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
-
-                socket.send_with_str(&msg).unwrap();
-            }
-        };
+        inner.hearbeat_handler = Some(PingTaskHandler {
+            ping_closure: do_ping,
+            interval_id,
+        });
     }
 }
 
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
new file mode 100644
index 000000000..4f3390f23
--- /dev/null
+++ b/jason/src/utils/mod.rs
@@ -0,0 +1,23 @@
+use wasm_bindgen::closure::Closure;
+use wasm_bindgen::prelude::*;
+use wasm_bindgen::convert::{FromWasmAbi, ReturnWasmAbi};
+use wasm_bindgen::JsCast;
+use web_sys::{EventTarget};
+
+pub fn bind_handler_fn_mut<F, A, R>(event: &str, target: &EventTarget, f: F) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
+    where F: (FnMut(A) -> R) + 'static,
+          A: FromWasmAbi + 'static,
+          R: ReturnWasmAbi + 'static {
+    let closure = Closure::wrap(Box::new(f) as Box<dyn FnMut(A) -> R>);
+    target.add_event_listener_with_callback(event, closure.as_ref().unchecked_ref())?;
+    Ok(closure)
+}
+
+pub fn bind_handler_fn_once<F, A, R>(event: &str, target: &EventTarget, f: F) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
+    where F: (FnOnce(A) -> R) + 'static,
+          A: FromWasmAbi + 'static,
+          R: ReturnWasmAbi + 'static {
+    let closure: Closure<FnMut(A) -> (R)> = Closure::once(f);
+    target.add_event_listener_with_callback(event, closure.as_ref().unchecked_ref())?;
+    Ok(closure)
+}
\ No newline at end of file

From d3cd4a8cca58d6e6fecbdf260823843836da167a Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 8 Apr 2019 10:35:17 +0300
Subject: [PATCH 083/179] Revert rename ws session

---
 src/api/client/mod.rs                        |  4 ++--
 src/api/client/server.rs                     | 10 ++++------
 src/api/client/{connection.rs => session.rs} | 16 ++++++++--------
 3 files changed, 14 insertions(+), 16 deletions(-)
 rename src/api/client/{connection.rs => session.rs} (96%)

diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 0b549fc76..c23a5f549 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,9 +1,9 @@
 //! Implementation of Client API.
 
 pub mod commands;
-pub mod connection;
 pub mod events;
 pub mod room;
 pub mod server;
+pub mod session;
 
-pub use self::{commands::*, connection::*, events::*, room::*, server::*};
+pub use self::{commands::*, events::*, room::*, server::*, session::*};
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 8df0fafc5..a87bb5357 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -11,7 +11,7 @@ use crate::{
     api::{
         client::{
             AuthorizeRpcConnection, Id as RoomId, RoomsRepository,
-            RpcConnectionAuthorizationError, WsConnection,
+            RpcConnectionAuthorizationError, WsSession,
         },
         control::Id as MemberId,
     },
@@ -52,7 +52,7 @@ fn ws_index(
             .and_then(move |res| match res {
                 Ok(_) => ws::start(
                     &r.drop_state(),
-                    WsConnection::new(info.member_id, room),
+                    WsSession::new(info.member_id, room),
                 ),
                 Err(MemberNotExists) => Ok(HttpResponse::NotFound().into()),
                 Err(InvalidCredentials) => Ok(HttpResponse::Forbidden().into()),
@@ -95,7 +95,7 @@ mod test {
     use futures::Stream;
 
     use crate::api::{
-        client::{connection, Room},
+        client::{session, Room},
         control::Member,
     };
 
@@ -143,9 +143,7 @@ mod test {
         let (item, read) = server.execute(read.into_future()).unwrap();
         assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.into())));
 
-        thread::sleep(
-            connection::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)),
-        );
+        thread::sleep(session::CLIENT_IDLE_TIMEOUT.add(Duration::from_secs(1)));
 
         let (item, _) = server.execute(read.into_future()).unwrap();
         assert_eq!(
diff --git a/src/api/client/connection.rs b/src/api/client/session.rs
similarity index 96%
rename from src/api/client/connection.rs
rename to src/api/client/session.rs
index 5ea4a0b40..d50a0b64a 100644
--- a/src/api/client/connection.rs
+++ b/src/api/client/session.rs
@@ -26,7 +26,7 @@ pub const CLIENT_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
 /// Long-running WebSocket connection of Client API.
 #[derive(Debug)]
 #[allow(clippy::module_name_repetitions)]
-pub struct WsConnection {
+pub struct WsSession {
     /// ID of [`Member`] that WebSocket connection is associated with.
     member_id: MemberId,
     /// [`Room`] that [`Member`] is associated with.
@@ -44,7 +44,7 @@ pub struct WsConnection {
     closed_by_server: bool,
 }
 
-impl WsConnection {
+impl WsSession {
     /// Creates new [`WsSession`] for specified [`Member`].
     pub fn new(member_id: MemberId, room: Addr<Room>) -> Self {
         Self {
@@ -89,7 +89,7 @@ impl WsConnection {
 
 /// [`Actor`] implementation that provides an ergonomic way to deal with
 /// WebSocket connection lifecycle for [`WsSession`].
-impl Actor for WsConnection {
+impl Actor for WsSession {
     type Context = ws::WebsocketContext<Self>;
 
     /// Starts [`Heartbeat`] mechanism and sends [`RpcConnectionEstablished`]
@@ -122,7 +122,7 @@ impl Actor for WsConnection {
     }
 }
 
-impl RpcConnection for Addr<WsConnection> {
+impl RpcConnection for Addr<WsSession> {
     /// Closes [`WsConnection`] by sending itself "normal closure" close
     /// message.
     fn close(&self) -> Box<dyn Future<Item = (), Error = ()>> {
@@ -152,7 +152,7 @@ pub struct Close {
     reason: Option<CloseReason>,
 }
 
-impl Handler<Close> for WsConnection {
+impl Handler<Close> for WsSession {
     type Result = ();
 
     /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
@@ -164,7 +164,7 @@ impl Handler<Close> for WsConnection {
     }
 }
 
-impl Handler<Event> for WsConnection {
+impl Handler<Event> for WsSession {
     type Result = ();
 
     /// Sends [`Event`] to Web Client.
@@ -187,7 +187,7 @@ pub enum Heartbeat {
     Pong(usize),
 }
 
-impl Handler<Heartbeat> for WsConnection {
+impl Handler<Heartbeat> for WsSession {
     type Result = ();
 
     /// Answers with `Heartbeat::Pong` message to WebSocket client in response
@@ -199,7 +199,7 @@ impl Handler<Heartbeat> for WsConnection {
     }
 }
 
-impl StreamHandler<ws::Message, ws::ProtocolError> for WsConnection {
+impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
     /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
         debug!(

From 7eb28370a05636a2f0b5a2685c4ebb2ff7ad72c6 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 8 Apr 2019 14:31:12 +0300
Subject: [PATCH 084/179] Ignore connection errors when closing Room

---
 Cargo.lock             |  1 +
 src/api/client/room.rs | 57 +++++++++++++++++++++---------------------
 src/main.rs            |  3 ++-
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c816c0f8..5c94c3d3b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -731,6 +731,7 @@ dependencies = [
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 642fff463..983e74605 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -274,33 +274,33 @@ impl Actor for Room {
 
     /// Closes all active [`PrcConnection`].
     fn stopping(&mut self, ctx: &mut Self::Context) -> Running {
+        use futures::stream::{self, Stream};
         use std::mem;
+
+        debug!("Room stopped");
         let connections = mem::replace(&mut self.connections, hashmap!());
-        let fut = connections.iter().fold(
-            vec![],
-            |mut futures, (member_id, connection)| {
-                info!(
-                    "Close connection of member {}, because room is stopped",
-                    member_id,
-                );
-                futures.push(
-                    connection.send_event(Event::PeersRemoved {
-                        peer_ids: self
-                            .peers
-                            .iter()
-                            .filter(move |(_, peer)| {
-                                peer.member_id() == *member_id
-                            })
-                            .map(|(&id, _)| id)
-                            .collect(),
-                    }),
-                );
-                futures.push(connection.close());
-                futures
+        let conn_with_event = connections
+            .into_iter()
+            .map(|(member_id, conn)| {
+                let event = Event::PeersRemoved {
+                    peer_ids: self
+                        .peers
+                        .iter()
+                        .filter(move |(_, peer)| peer.member_id() == member_id)
+                        .map(|(&id, _)| id)
+                        .collect(),
+                };
+                (conn, event)
+            })
+            .collect::<Vec<_>>();
+
+        ctx.wait(wrap_future(stream::iter_ok(conn_with_event).for_each(
+            |(mut conn, event)| {
+                conn.send_event(event)
+                    .and_then(move |_| conn.close())
+                    .map_err(|_| ())
             },
-        );
-        // ToDo ignore error
-        ctx.wait(wrap_future(join_all(fut).map(|_| ())));
+        )));
         Running::Continue
     }
 }
@@ -309,7 +309,7 @@ impl Actor for Room {
 pub trait RpcConnection: fmt::Debug + Send {
     /// Closes [`RpcConnection`].
     /// No [`RpcConnectionClosed`] signals should be emitted.
-    fn close(&self) -> Box<dyn Future<Item = (), Error = ()>>;
+    fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
 
     /// Sends [`Event`] to remote [`Member`].
     fn send_event(
@@ -387,7 +387,7 @@ impl Handler<RpcConnectionEstablished> for Room {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
 
         let mut fut = Either::A(future::ok(()));
-        if let Some(connection) = self.connections.remove(&msg.member_id) {
+        if let Some(mut connection) = self.connections.remove(&msg.member_id) {
             debug!("Closing old RpcConnection for member {}", msg.member_id);
             if let Some(handler) = self.idle_timeouts.remove(&msg.member_id) {
                 ctx.cancel_future(handler);
@@ -479,7 +479,6 @@ impl Handler<RpcConnectionClosed> for Room {
 
     /// Removes [`Session`] of specified [`Member`] from the [`Room`].
     fn handle(&mut self, msg: RpcConnectionClosed, ctx: &mut Self::Context) {
-        use RpcConnectionClosedReason::{Disconnected, Idle};
         info!(
             "RpcConnectionClosed for member {}, reason {:?}",
             msg.member_id, msg.reason
@@ -487,8 +486,8 @@ impl Handler<RpcConnectionClosed> for Room {
         let closed_at = Instant::now();
         let member_id = msg.member_id;
         match msg.reason {
-            Disconnected => ctx.stop(),
-            Idle => {
+            RpcConnectionClosedReason::Disconnected => ctx.stop(),
+            RpcConnectionClosedReason::Idle => {
                 self.idle_timeouts.insert(
                     msg.member_id,
                     ctx.run_later(SESSION_IDLE_TIMEOUT, move |_room, ctx| {
diff --git a/src/main.rs b/src/main.rs
index 1edeaf2a3..46297f205 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,6 +6,7 @@ mod utils;
 pub mod api;
 pub mod conf;
 pub mod log;
+pub mod media;
 
 use std::sync::Arc;
 
@@ -17,7 +18,7 @@ use log::prelude::*;
 use crate::{
     api::{
         client::{server, Room, RoomsRepository},
-        control::Member,
+        control::{Id as MemberId, Member},
     },
     conf::Conf,
     media::{

From 135abd317ac6cca614ae4c32168b427644fe73f3 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 18:25:48 +0300
Subject: [PATCH 085/179] handle on close: stop pinger, remove socket

---
 jason/src/lib.rs       | 83 ++++++++++++++++++++++--------------------
 jason/src/utils/mod.rs | 15 ++++++++
 2 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 906bd9412..916d72991 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -4,11 +4,11 @@ use serde::{Deserialize, Serialize};
 use std::{cell::RefCell, rc::Rc};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
-use web_sys::{console, MessageEvent, WebSocket, Window, Event, CloseEvent};
+use web_sys::{console, MessageEvent, WebSocket, Event, CloseEvent};
 
 mod utils;
 
-use utils::*;
+use utils::{window, bind_handler_fn_mut, bind_handler_fn_once, IntervalHandle};
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -19,23 +19,19 @@ use utils::*;
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
 
-
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
 #[cfg(feature = "wee_alloc")]
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
-fn window() -> Window {
-    // cannot use lazy_static since window is !Sync
-    // safe to unwrap
-    web_sys::window().unwrap()
-}
-
+//TODO:
+//1. Reconnect.
+//2. Disconnect if no pongs.
 struct Transport {
-    sock: Rc<Option<WebSocket>>,
+    sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,
-    pinger: Rc<RefCell<Pinger>>,
+    pinger: Rc<Pinger>,
     subs: Vec<UnboundedSender<Command>>,
     on_open: Option<Closure<dyn FnMut(Event)>>,
     on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
@@ -45,10 +41,10 @@ struct Transport {
 impl Transport {
     fn new(token: String) -> Self {
         Transport {
-            sock: Rc::new(None),
+            sock: Rc::new(RefCell::new(None)),
             token,
             subs: vec![],
-            pinger: Rc::new(RefCell::new(Pinger::new())),
+            pinger: Rc::new(Pinger::new()),
             on_open: None,
             on_message: None,
             on_close: None
@@ -57,34 +53,39 @@ impl Transport {
 
     fn init(&mut self) {
         let socket = WebSocket::new(&self.token).unwrap();
-        let socket = Rc::new(socket);
+        let socket = Rc::new(RefCell::new(Some(socket)));
+        let socket_borrow = socket.borrow();
+        let socket_ref = socket_borrow.as_ref().unwrap();
 
         let socket_rc = Rc::clone(&socket);
-        let pinger_rc = Rc::clone(&self.pinger);
-        let on_open = bind_handler_fn_once("open", &socket, move |_:Event| {
-            pinger_rc.borrow().start(socket_rc);
+        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
+        let on_open = bind_handler_fn_once("open", socket_ref, move |_: Event| {
+            pinger_rc.start(socket_rc);
         }).unwrap();
 
         let pinger_rc = Rc::clone(&self.pinger);
-        let on_message = bind_handler_fn_mut("message", &socket, move |event: MessageEvent| {
+        let on_message = bind_handler_fn_mut("message", socket_ref, move |event: MessageEvent| {
             let payload = event.data();
 
-            if let Ok(pinger) = pinger_rc.try_borrow_mut() {
-                pinger.set_pong_at(Date::now());
-            }
+            pinger_rc.set_pong_at(Date::now());
 
             console::log(&js_sys::Array::from(&payload));
         }).unwrap();
 
-        let on_close = bind_handler_fn_once("close", &socket, move |close:CloseEvent| {
-//            pinger_rc.borrow().start(socket_rc);
-//            self.sock.take();
+        let socket_rc = Rc::clone(&socket);
+        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
+        let on_close = bind_handler_fn_once("close", socket_ref, move |close: CloseEvent| {
+            console::log(&js_sys::Array::from(&JsValue::from_str(&format!("Close [code: {}, reason: {}]", close.code(), close.reason()))));
+            socket_rc.borrow_mut().take();
+            pinger_rc.stop();
+
         }).unwrap();
 
         self.on_open = Some(on_open);
         self.on_message = Some(on_message);
         self.on_close = Some(on_close);
-        self.sock = Rc::new(Some(socket))
+        drop(socket_borrow);
+        self.sock = socket
     }
 
     fn add_sub(&mut self, sub: UnboundedSender<Command>) {
@@ -97,29 +98,29 @@ struct Pinger(Rc<RefCell<InnerPinger>>);
 struct InnerPinger {
     num: usize,
     pong_at: Option<f64>,
-    socket: Option<Rc<WebSocket>>,
-    hearbeat_handler: Option<PingTaskHandler>,
+    socket: Rc<RefCell<Option<WebSocket>>>,
+    ping_task: Option<PingTaskHandler>,
 }
 
 impl InnerPinger {
+
     fn send_now(&mut self) {
-        match self.socket.as_ref() {
-            None => {}
-            Some(socket) => {
-                self.num+=1;
+        if let Ok(socket) = self.socket.try_borrow() {
+            if let Some(socket) = socket.as_ref() {
+                self.num += 1;
 
                 let msg =
                     serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
 
                 socket.send_with_str(&msg).unwrap();
             }
-        };
+        }
     }
 }
 
 struct PingTaskHandler {
     ping_closure: Closure<dyn FnMut()>,
-    interval_id: i32,
+    interval_handler: IntervalHandle,
 }
 
 impl Pinger {
@@ -127,8 +128,8 @@ impl Pinger {
         Self(Rc::new(RefCell::new(InnerPinger {
             num: 0,
             pong_at: None,
-            socket: None,
-            hearbeat_handler: None,
+            socket: Rc::new(RefCell::new(None)),
+            ping_task: None,
         })))
     }
 
@@ -136,9 +137,9 @@ impl Pinger {
         self.0.borrow_mut().pong_at = Some(at);
     }
 
-    fn start(&self, socket: Rc<WebSocket>) {
+    fn start(&self, socket: Rc<RefCell<Option<WebSocket>>>) {
         let mut inner = self.0.borrow_mut();
-        inner.socket = Some(socket);
+        inner.socket = socket;
         inner.send_now();
 
         let inner_rc = Rc::clone(&self.0);
@@ -153,11 +154,15 @@ impl Pinger {
             )
             .unwrap();
 
-        inner.hearbeat_handler = Some(PingTaskHandler {
+        inner.ping_task = Some(PingTaskHandler {
             ping_closure: do_ping,
-            interval_id,
+            interval_handler: IntervalHandle(interval_id),
         });
     }
+
+    fn stop(&self) {
+        self.0.borrow_mut().ping_task.take();
+    }
 }
 
 struct Command {}
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 4f3390f23..f5cc8be00 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -3,6 +3,7 @@ use wasm_bindgen::prelude::*;
 use wasm_bindgen::convert::{FromWasmAbi, ReturnWasmAbi};
 use wasm_bindgen::JsCast;
 use web_sys::{EventTarget};
+use web_sys::Window;
 
 pub fn bind_handler_fn_mut<F, A, R>(event: &str, target: &EventTarget, f: F) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
     where F: (FnMut(A) -> R) + 'static,
@@ -20,4 +21,18 @@ pub fn bind_handler_fn_once<F, A, R>(event: &str, target: &EventTarget, f: F) ->
     let closure: Closure<FnMut(A) -> (R)> = Closure::once(f);
     target.add_event_listener_with_callback(event, closure.as_ref().unchecked_ref())?;
     Ok(closure)
+}
+
+pub struct IntervalHandle(pub i32);
+
+pub fn window() -> Window {
+    // cannot use lazy_static since window is !Sync
+    // safe to unwrap
+    web_sys::window().unwrap()
+}
+
+impl Drop for IntervalHandle {
+    fn drop(&mut self) {
+        window().clear_interval_with_handle(self.0);
+    }
 }
\ No newline at end of file

From 7b48542e35f78729de3d8a9961d881d7870f6b87 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 18:56:56 +0300
Subject: [PATCH 086/179] move transport to package

---
 jason/src/lib.rs                | 168 +-------------------------------
 jason/src/transport/mod.rs      | 150 ++++++++++++++++++++++++++++
 jason/src/transport/protocol.rs |  15 +++
 3 files changed, 170 insertions(+), 163 deletions(-)
 create mode 100644 jason/src/transport/mod.rs
 create mode 100644 jason/src/transport/protocol.rs

diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 916d72991..485498160 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,14 +1,10 @@
 use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
-use js_sys::{Date};
-use serde::{Deserialize, Serialize};
-use std::{cell::RefCell, rc::Rc};
 use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
-use web_sys::{console, MessageEvent, WebSocket, Event, CloseEvent};
 
 mod utils;
+mod transport;
 
-use utils::{window, bind_handler_fn_mut, bind_handler_fn_once, IntervalHandle};
+use transport::{Transport, protocol::*};
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -25,160 +21,6 @@ pub use console_error_panic_hook::set_once as set_panic_hook;
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
-//TODO:
-//1. Reconnect.
-//2. Disconnect if no pongs.
-struct Transport {
-    sock: Rc<RefCell<Option<WebSocket>>>,
-    token: String,
-    pinger: Rc<Pinger>,
-    subs: Vec<UnboundedSender<Command>>,
-    on_open: Option<Closure<dyn FnMut(Event)>>,
-    on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
-    on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
-}
-
-impl Transport {
-    fn new(token: String) -> Self {
-        Transport {
-            sock: Rc::new(RefCell::new(None)),
-            token,
-            subs: vec![],
-            pinger: Rc::new(Pinger::new()),
-            on_open: None,
-            on_message: None,
-            on_close: None
-        }
-    }
-
-    fn init(&mut self) {
-        let socket = WebSocket::new(&self.token).unwrap();
-        let socket = Rc::new(RefCell::new(Some(socket)));
-        let socket_borrow = socket.borrow();
-        let socket_ref = socket_borrow.as_ref().unwrap();
-
-        let socket_rc = Rc::clone(&socket);
-        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-        let on_open = bind_handler_fn_once("open", socket_ref, move |_: Event| {
-            pinger_rc.start(socket_rc);
-        }).unwrap();
-
-        let pinger_rc = Rc::clone(&self.pinger);
-        let on_message = bind_handler_fn_mut("message", socket_ref, move |event: MessageEvent| {
-            let payload = event.data();
-
-            pinger_rc.set_pong_at(Date::now());
-
-            console::log(&js_sys::Array::from(&payload));
-        }).unwrap();
-
-        let socket_rc = Rc::clone(&socket);
-        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-        let on_close = bind_handler_fn_once("close", socket_ref, move |close: CloseEvent| {
-            console::log(&js_sys::Array::from(&JsValue::from_str(&format!("Close [code: {}, reason: {}]", close.code(), close.reason()))));
-            socket_rc.borrow_mut().take();
-            pinger_rc.stop();
-
-        }).unwrap();
-
-        self.on_open = Some(on_open);
-        self.on_message = Some(on_message);
-        self.on_close = Some(on_close);
-        drop(socket_borrow);
-        self.sock = socket
-    }
-
-    fn add_sub(&mut self, sub: UnboundedSender<Command>) {
-        self.subs.push(sub);
-    }
-}
-
-struct Pinger(Rc<RefCell<InnerPinger>>);
-
-struct InnerPinger {
-    num: usize,
-    pong_at: Option<f64>,
-    socket: Rc<RefCell<Option<WebSocket>>>,
-    ping_task: Option<PingTaskHandler>,
-}
-
-impl InnerPinger {
-
-    fn send_now(&mut self) {
-        if let Ok(socket) = self.socket.try_borrow() {
-            if let Some(socket) = socket.as_ref() {
-                self.num += 1;
-
-                let msg =
-                    serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
-
-                socket.send_with_str(&msg).unwrap();
-            }
-        }
-    }
-}
-
-struct PingTaskHandler {
-    ping_closure: Closure<dyn FnMut()>,
-    interval_handler: IntervalHandle,
-}
-
-impl Pinger {
-    fn new() -> Self {
-        Self(Rc::new(RefCell::new(InnerPinger {
-            num: 0,
-            pong_at: None,
-            socket: Rc::new(RefCell::new(None)),
-            ping_task: None,
-        })))
-    }
-
-    fn set_pong_at(&self, at: f64) {
-        self.0.borrow_mut().pong_at = Some(at);
-    }
-
-    fn start(&self, socket: Rc<RefCell<Option<WebSocket>>>) {
-        let mut inner = self.0.borrow_mut();
-        inner.socket = socket;
-        inner.send_now();
-
-        let inner_rc = Rc::clone(&self.0);
-        let do_ping = Closure::wrap(Box::new(move || {
-            inner_rc.borrow_mut().send_now();
-        }) as Box<dyn FnMut()>);
-
-        let interval_id = window()
-            .set_interval_with_callback_and_timeout_and_arguments_0(
-                do_ping.as_ref().unchecked_ref(),
-                3000,
-            )
-            .unwrap();
-
-        inner.ping_task = Some(PingTaskHandler {
-            ping_closure: do_ping,
-            interval_handler: IntervalHandle(interval_id),
-        });
-    }
-
-    fn stop(&self) {
-        self.0.borrow_mut().ping_task.take();
-    }
-}
-
-struct Command {}
-
-#[derive(Deserialize, Serialize)]
-pub enum Heartbeat {
-    /// `ping` message that WebSocket client is expected to send to the server
-    /// periodically.
-    #[serde(rename = "ping")]
-    Ping(usize),
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
-
 #[wasm_bindgen]
 pub struct Jason {
     transport: Option<Transport>,
@@ -187,14 +29,14 @@ pub struct Jason {
 #[wasm_bindgen]
 pub struct SessionHandler {
     tx: UnboundedSender<Command>,
-    rx: UnboundedReceiver<Command>,
+    _rx: UnboundedReceiver<Command>,
 }
 
 impl SessionHandler {
     fn new() -> SessionHandler {
         let (tx, rx) = unbounded();
 
-        SessionHandler { tx, rx }
+        SessionHandler { tx, _rx: rx }
     }
 }
 
@@ -203,7 +45,7 @@ impl Jason {
     #[wasm_bindgen(constructor)]
     pub fn new() -> Self {
         set_panic_hook();
-
+        println!("asd");
         Self { transport: None }
     }
 
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
new file mode 100644
index 000000000..c9f1eb4d5
--- /dev/null
+++ b/jason/src/transport/mod.rs
@@ -0,0 +1,150 @@
+pub mod protocol;
+use self::protocol::*;
+use wasm_bindgen::prelude::*;
+use js_sys::{Date};
+use wasm_bindgen::JsCast;
+use std::{cell::RefCell, rc::Rc};
+use futures::sync::mpsc::{UnboundedSender};
+use web_sys::{console, MessageEvent, WebSocket, Event, CloseEvent};
+
+use crate::utils::{IntervalHandle, window, bind_handler_fn_mut,bind_handler_fn_once};
+
+//TODO:
+//1. Reconnect.
+//2. Disconnect if no pongs.
+pub struct Transport {
+    sock: Rc<RefCell<Option<WebSocket>>>,
+    token: String,
+    pinger: Rc<Pinger>,
+    subs: Vec<UnboundedSender<Command>>,
+    on_open: Option<Closure<dyn FnMut(Event)>>,
+    on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
+    on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
+}
+
+impl Transport {
+    pub fn new(token: String) -> Self {
+        Transport {
+            sock: Rc::new(RefCell::new(None)),
+            token,
+            subs: vec![],
+            pinger: Rc::new(Pinger::new()),
+            on_open: None,
+            on_message: None,
+            on_close: None
+        }
+    }
+
+    pub fn init(&mut self) {
+        let socket = WebSocket::new(&self.token).unwrap();
+        let socket = Rc::new(RefCell::new(Some(socket)));
+        let socket_borrow = socket.borrow();
+        let socket_ref = socket_borrow.as_ref().unwrap();
+
+        let socket_rc = Rc::clone(&socket);
+        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
+        let on_open = bind_handler_fn_once("open", socket_ref, move |_: Event| {
+            pinger_rc.start(socket_rc);
+        }).unwrap();
+
+        let pinger_rc = Rc::clone(&self.pinger);
+        let on_message = bind_handler_fn_mut("message", socket_ref, move |event: MessageEvent| {
+            let payload = event.data();
+
+            pinger_rc.set_pong_at(Date::now());
+
+            console::log(&js_sys::Array::from(&payload));
+        }).unwrap();
+
+        let socket_rc = Rc::clone(&socket);
+        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
+        let on_close = bind_handler_fn_once("close", socket_ref, move |close: CloseEvent| {
+            console::log(&js_sys::Array::from(&JsValue::from_str(&format!("Close [code: {}, reason: {}]", close.code(), close.reason()))));
+            socket_rc.borrow_mut().take();
+            pinger_rc.stop();
+
+        }).unwrap();
+
+        self.on_open = Some(on_open);
+        self.on_message = Some(on_message);
+        self.on_close = Some(on_close);
+        drop(socket_borrow);
+        self.sock = socket
+    }
+
+    pub fn add_sub(&mut self, sub: UnboundedSender<Command>) {
+        self.subs.push(sub);
+    }
+}
+
+struct Pinger(Rc<RefCell<InnerPinger>>);
+
+struct InnerPinger {
+    num: usize,
+    pong_at: Option<f64>,
+    socket: Rc<RefCell<Option<WebSocket>>>,
+    ping_task: Option<PingTaskHandler>,
+}
+
+impl InnerPinger {
+
+    fn send_now(&mut self) {
+        if let Ok(socket) = self.socket.try_borrow() {
+            if let Some(socket) = socket.as_ref() {
+                self.num += 1;
+
+                let msg =
+                    serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
+
+                socket.send_with_str(&msg).unwrap();
+            }
+        }
+    }
+}
+
+struct PingTaskHandler {
+    _ping_closure: Closure<dyn FnMut()>,
+    _interval_handler: IntervalHandle,
+}
+
+impl Pinger {
+    fn new() -> Self {
+        Self(Rc::new(RefCell::new(InnerPinger {
+            num: 0,
+            pong_at: None,
+            socket: Rc::new(RefCell::new(None)),
+            ping_task: None,
+        })))
+    }
+
+    fn set_pong_at(&self, at: f64) {
+        self.0.borrow_mut().pong_at = Some(at);
+    }
+
+    fn start(&self, socket: Rc<RefCell<Option<WebSocket>>>) {
+        let mut inner = self.0.borrow_mut();
+        inner.socket = socket;
+        inner.send_now();
+
+        let inner_rc = Rc::clone(&self.0);
+        let do_ping = Closure::wrap(Box::new(move || {
+            inner_rc.borrow_mut().send_now();
+        }) as Box<dyn FnMut()>);
+
+        let interval_id = window()
+            .set_interval_with_callback_and_timeout_and_arguments_0(
+                do_ping.as_ref().unchecked_ref(),
+                3000,
+            )
+            .unwrap();
+
+        inner.ping_task = Some(PingTaskHandler {
+            _ping_closure: do_ping,
+            _interval_handler: IntervalHandle(interval_id),
+        });
+    }
+
+    fn stop(&self) {
+        self.0.borrow_mut().ping_task.take();
+    }
+}
\ No newline at end of file
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
new file mode 100644
index 000000000..6d9e62046
--- /dev/null
+++ b/jason/src/transport/protocol.rs
@@ -0,0 +1,15 @@
+use serde::{Deserialize, Serialize};
+
+pub struct Command {}
+
+#[derive(Deserialize, Serialize)]
+pub enum Heartbeat {
+    /// `ping` message that WebSocket client is expected to send to the server
+    /// periodically.
+    #[serde(rename = "ping")]
+    Ping(usize),
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
\ No newline at end of file

From c2e6a6cce929941373ab361e4547cbb32e16588f Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 19:04:30 +0300
Subject: [PATCH 087/179] ping_interval, fmt

---
 jason/src/lib.rs                |  7 ++-
 jason/src/transport/mod.rs      | 78 +++++++++++++++++++++------------
 jason/src/transport/protocol.rs |  2 +-
 jason/src/utils/mod.rs          | 44 +++++++++++++------
 4 files changed, 84 insertions(+), 47 deletions(-)

diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 485498160..6329962cf 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,10 +1,10 @@
 use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
 use wasm_bindgen::prelude::*;
 
-mod utils;
 mod transport;
+mod utils;
 
-use transport::{Transport, protocol::*};
+use transport::{protocol::*, Transport};
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -45,12 +45,11 @@ impl Jason {
     #[wasm_bindgen(constructor)]
     pub fn new() -> Self {
         set_panic_hook();
-        println!("asd");
         Self { transport: None }
     }
 
     pub fn init_session(&mut self, token: String) -> SessionHandler {
-        let mut transport = Transport::new(token);
+        let mut transport = Transport::new(token, 3000);
         transport.init();
 
         let handler = SessionHandler::new();
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index c9f1eb4d5..966136d64 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,17 +1,19 @@
 pub mod protocol;
 use self::protocol::*;
+use futures::sync::mpsc::UnboundedSender;
+use js_sys::Date;
+use std::{cell::RefCell, rc::Rc};
 use wasm_bindgen::prelude::*;
-use js_sys::{Date};
 use wasm_bindgen::JsCast;
-use std::{cell::RefCell, rc::Rc};
-use futures::sync::mpsc::{UnboundedSender};
-use web_sys::{console, MessageEvent, WebSocket, Event, CloseEvent};
+use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
-use crate::utils::{IntervalHandle, window, bind_handler_fn_mut,bind_handler_fn_once};
+use crate::utils::{
+    bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle,
+};
 
-//TODO:
-//1. Reconnect.
-//2. Disconnect if no pongs.
+// TODO:
+// 1. Reconnect.
+// 2. Disconnect if no pongs.
 pub struct Transport {
     sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,
@@ -23,15 +25,15 @@ pub struct Transport {
 }
 
 impl Transport {
-    pub fn new(token: String) -> Self {
+    pub fn new(token: String, ping_interval: i32) -> Self {
         Transport {
             sock: Rc::new(RefCell::new(None)),
             token,
             subs: vec![],
-            pinger: Rc::new(Pinger::new()),
+            pinger: Rc::new(Pinger::new(ping_interval)),
             on_open: None,
             on_message: None,
-            on_close: None
+            on_close: None,
         }
     }
 
@@ -43,27 +45,44 @@ impl Transport {
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-        let on_open = bind_handler_fn_once("open", socket_ref, move |_: Event| {
-            pinger_rc.start(socket_rc);
-        }).unwrap();
+        let on_open =
+            bind_handler_fn_once("open", socket_ref, move |_: Event| {
+                pinger_rc.start(socket_rc);
+            })
+            .unwrap();
 
         let pinger_rc = Rc::clone(&self.pinger);
-        let on_message = bind_handler_fn_mut("message", socket_ref, move |event: MessageEvent| {
-            let payload = event.data();
+        let on_message = bind_handler_fn_mut(
+            "message",
+            socket_ref,
+            move |event: MessageEvent| {
+                let payload = event.data();
 
-            pinger_rc.set_pong_at(Date::now());
+                pinger_rc.set_pong_at(Date::now());
 
-            console::log(&js_sys::Array::from(&payload));
-        }).unwrap();
+                console::log(&js_sys::Array::from(&payload));
+            },
+        )
+        .unwrap();
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-        let on_close = bind_handler_fn_once("close", socket_ref, move |close: CloseEvent| {
-            console::log(&js_sys::Array::from(&JsValue::from_str(&format!("Close [code: {}, reason: {}]", close.code(), close.reason()))));
-            socket_rc.borrow_mut().take();
-            pinger_rc.stop();
-
-        }).unwrap();
+        let on_close = bind_handler_fn_once(
+            "close",
+            socket_ref,
+            move |close: CloseEvent| {
+                console::log(&js_sys::Array::from(&JsValue::from_str(
+                    &format!(
+                        "Close [code: {}, reason: {}]",
+                        close.code(),
+                        close.reason()
+                    ),
+                )));
+                socket_rc.borrow_mut().take();
+                pinger_rc.stop();
+            },
+        )
+        .unwrap();
 
         self.on_open = Some(on_open);
         self.on_message = Some(on_message);
@@ -80,6 +99,7 @@ impl Transport {
 struct Pinger(Rc<RefCell<InnerPinger>>);
 
 struct InnerPinger {
+    ping_interval: i32,
     num: usize,
     pong_at: Option<f64>,
     socket: Rc<RefCell<Option<WebSocket>>>,
@@ -87,7 +107,6 @@ struct InnerPinger {
 }
 
 impl InnerPinger {
-
     fn send_now(&mut self) {
         if let Ok(socket) = self.socket.try_borrow() {
             if let Some(socket) = socket.as_ref() {
@@ -108,8 +127,9 @@ struct PingTaskHandler {
 }
 
 impl Pinger {
-    fn new() -> Self {
+    fn new(ping_interval: i32) -> Self {
         Self(Rc::new(RefCell::new(InnerPinger {
+            ping_interval,
             num: 0,
             pong_at: None,
             socket: Rc::new(RefCell::new(None)),
@@ -134,7 +154,7 @@ impl Pinger {
         let interval_id = window()
             .set_interval_with_callback_and_timeout_and_arguments_0(
                 do_ping.as_ref().unchecked_ref(),
-                3000,
+                inner.ping_interval,
             )
             .unwrap();
 
@@ -147,4 +167,4 @@ impl Pinger {
     fn stop(&self) {
         self.0.borrow_mut().ping_task.take();
     }
-}
\ No newline at end of file
+}
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 6d9e62046..a0bcf6d68 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -12,4 +12,4 @@ pub enum Heartbeat {
     /// to received `ping` message.
     #[serde(rename = "pong")]
     Pong(usize),
-}
\ No newline at end of file
+}
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index f5cc8be00..43ba9f08a 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -1,25 +1,43 @@
 use wasm_bindgen::closure::Closure;
-use wasm_bindgen::prelude::*;
 use wasm_bindgen::convert::{FromWasmAbi, ReturnWasmAbi};
+use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
-use web_sys::{EventTarget};
+use web_sys::EventTarget;
 use web_sys::Window;
 
-pub fn bind_handler_fn_mut<F, A, R>(event: &str, target: &EventTarget, f: F) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
-    where F: (FnMut(A) -> R) + 'static,
-          A: FromWasmAbi + 'static,
-          R: ReturnWasmAbi + 'static {
+pub fn bind_handler_fn_mut<F, A, R>(
+    event: &str,
+    target: &EventTarget,
+    f: F,
+) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
+where
+    F: (FnMut(A) -> R) + 'static,
+    A: FromWasmAbi + 'static,
+    R: ReturnWasmAbi + 'static,
+{
     let closure = Closure::wrap(Box::new(f) as Box<dyn FnMut(A) -> R>);
-    target.add_event_listener_with_callback(event, closure.as_ref().unchecked_ref())?;
+    target.add_event_listener_with_callback(
+        event,
+        closure.as_ref().unchecked_ref(),
+    )?;
     Ok(closure)
 }
 
-pub fn bind_handler_fn_once<F, A, R>(event: &str, target: &EventTarget, f: F) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
-    where F: (FnOnce(A) -> R) + 'static,
-          A: FromWasmAbi + 'static,
-          R: ReturnWasmAbi + 'static {
+pub fn bind_handler_fn_once<F, A, R>(
+    event: &str,
+    target: &EventTarget,
+    f: F,
+) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
+where
+    F: (FnOnce(A) -> R) + 'static,
+    A: FromWasmAbi + 'static,
+    R: ReturnWasmAbi + 'static,
+{
     let closure: Closure<FnMut(A) -> (R)> = Closure::once(f);
-    target.add_event_listener_with_callback(event, closure.as_ref().unchecked_ref())?;
+    target.add_event_listener_with_callback(
+        event,
+        closure.as_ref().unchecked_ref(),
+    )?;
     Ok(closure)
 }
 
@@ -35,4 +53,4 @@ impl Drop for IntervalHandle {
     fn drop(&mut self) {
         window().clear_interval_with_handle(self.0);
     }
-}
\ No newline at end of file
+}

From ce6d1f5ea6a9b96a157e7cbbc5e9192c07a88037 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 19:27:05 +0300
Subject: [PATCH 088/179] update lock

---
 Cargo.lock | 966 +++++++++++++++++++++++++++++------------------------
 1 file changed, 530 insertions(+), 436 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c816c0f8..fcc5c437a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,3 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
 [[package]]
 name = "actix"
 version = "0.7.9"
@@ -7,26 +5,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-signal 0.2.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-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -35,73 +33,73 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (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-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "actix-web"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (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-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -110,9 +108,9 @@ name = "actix_derive"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -130,16 +128,25 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.6.9"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "arc-swap"
-version = "0.3.7"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "argon2rs"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "arrayvec"
@@ -156,15 +163,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "backtrace"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -172,8 +179,8 @@ name = "backtrace-sys"
 version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -181,16 +188,16 @@ name = "base64"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "base64"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -198,13 +205,22 @@ name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "blake2-rfc"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -213,7 +229,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -223,26 +239,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "byteorder"
-version = "1.2.7"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bytes"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.28"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -268,16 +284,21 @@ name = "config"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cookie"
 version = "0.11.0"
@@ -299,10 +320,10 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.1.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -315,25 +336,23 @@ name = "crossbeam"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -341,29 +360,57 @@ name = "crossbeam-deque"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.3"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dirs"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -372,8 +419,8 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -443,7 +490,7 @@ name = "error-chain"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -451,7 +498,7 @@ name = "failure"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -460,21 +507,21 @@ name = "failure_derive"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -482,6 +529,11 @@ name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -498,7 +550,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -506,25 +558,25 @@ name = "futures-cpupool"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "h2"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -532,7 +584,7 @@ name = "hashbrown"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -541,16 +593,16 @@ name = "hostname"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "http"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -575,7 +627,7 @@ 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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -588,7 +640,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -600,7 +652,7 @@ dependencies = [
  "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -609,10 +661,10 @@ name = "isatty"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -641,7 +693,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -651,7 +703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.47"
+version = "0.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -665,7 +717,7 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.4.2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -690,15 +742,15 @@ name = "log"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "lru-cache"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -711,17 +763,17 @@ name = "medea"
 version = "0.1.0-dev"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -739,17 +791,13 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "memoffset"
@@ -761,7 +809,7 @@ name = "mime"
 version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -780,13 +828,13 @@ name = "miniz-sys"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -794,13 +842,13 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide_c_api"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -813,7 +861,7 @@ dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (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)",
@@ -827,7 +875,7 @@ version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -847,9 +895,9 @@ name = "net2"
 version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -859,10 +907,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "nom"
-version = "4.1.1"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -888,10 +937,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "num_cpus"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -916,11 +965,11 @@ name = "parking_lot_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -951,7 +1000,7 @@ version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -965,7 +1014,7 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.25"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -978,39 +1027,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "quote"
-version = "0.6.10"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.5.5"
+version = "0.5.6"
 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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (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.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (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.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (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_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_jitter 0.1.3 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1019,20 +1069,20 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1040,7 +1090,7 @@ name = "rand_hc"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1048,29 +1098,39 @@ name = "rand_isaac"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_os"
-version = "0.1.1"
+version = "0.1.3"
 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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.0 (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.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_pcg"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1078,7 +1138,7 @@ name = "rand_xorshift"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1086,14 +1146,25 @@ name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.50"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "redox_users"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.53 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "regex"
 version = "0.1.80"
@@ -1108,12 +1179,12 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.1.0"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1125,7 +1196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1145,9 +1216,9 @@ name = "ring"
 version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1179,6 +1250,11 @@ name = "safemem"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "scoped_threadpool"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -1204,10 +1280,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.84"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1218,7 +1294,7 @@ dependencies = [
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1228,27 +1304,27 @@ version = "0.1.1"
 source = "git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper#36b86d5ca09db3caf2edb06e0d46b505d0915792"
 dependencies = [
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.87"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.36"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1266,7 +1342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1275,7 +1351,7 @@ name = "serial_test"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1283,8 +1359,8 @@ name = "serial_test_derive"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1294,11 +1370,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "signal-hook"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arc-swap 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1346,8 +1422,8 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1357,7 +1433,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1380,26 +1456,23 @@ dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "smallvec"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "smart-default"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1407,10 +1480,10 @@ name = "socket2"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1425,11 +1498,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.15.26"
+version = "0.15.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1438,9 +1511,9 @@ name = "synstructure"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1451,11 +1524,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "term"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1464,7 +1538,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1480,7 +1554,7 @@ name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1488,29 +1562,31 @@ name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.1.14"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.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-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (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.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.4 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1520,64 +1596,65 @@ name = "tokio-codec"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-current-thread"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-executor"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-fs"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (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.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-io"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-reactor"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1585,15 +1662,24 @@ name = "tokio-signal"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-sync"
+version = "0.1.4"
+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.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1601,38 +1687,47 @@ name = "tokio-tcp"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.10"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-timer"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-trace-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1640,13 +1735,13 @@ name = "tokio-udp"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1654,16 +1749,16 @@ name = "tokio-uds"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1671,7 +1766,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1679,7 +1774,7 @@ name = "tower-service"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1687,63 +1782,63 @@ name = "trust-dns-proto"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "trust-dns-proto"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1761,7 +1856,7 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.2.0"
+version = "2.3.0"
 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)",
@@ -1777,22 +1872,17 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "unreachable"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.6.2"
@@ -1821,40 +1911,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "uuid"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "v_escape"
-version = "0.3.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape_derive 0.5.3 (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 = "v_escape_derive"
-version = "0.2.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "v_htmlescape"
-version = "0.3.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1862,11 +1951,6 @@ name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "widestring"
 version = "0.2.2"
@@ -1879,7 +1963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "winapi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1906,7 +1990,7 @@ name = "winreg"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1914,7 +1998,7 @@ name = "winutil"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1931,44 +2015,50 @@ name = "yaml-rust"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
-"checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
+"checksum actix-web 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b0ac60f86c65a50b140139f499f4f7c6e49e4b5d88fbfba08e4e3975991f7bf4"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
 "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
-"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
+"checksum arc-swap 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcee9b73d8a058eebb0b567fd3687f6761fb232049f92c23bdd2c82b6fe0c0cc"
+"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
-"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
-"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
+"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 bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
-"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
-"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
-"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
-"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
+"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
+"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
 "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
 "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
-"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
-"checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
+"checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
-"checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
-"checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
+"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
 "checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
@@ -1981,16 +2071,17 @@ dependencies = [
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
-"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4"
+"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
-"checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
+"checksum h2 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "910a5e7be6283a9c91b3982fa5188368c8719cce2a3cf3b86048673bf9d9c36b"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
-"checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
+"checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
 "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
 "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
@@ -2002,34 +2093,34 @@ dependencies = [
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
-"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
+"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
+"checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
 "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
 "checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
 "checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
-"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
-"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"
+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e"
+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab"
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
-"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
-"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
+"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
@@ -2038,25 +2129,27 @@ dependencies = [
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
-"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
-"checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
+"checksum quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cdd8e04bd9c52e0342b406469d494fcb033be4bdbe5c606016defbb1681411e1"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
-"checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca"
-"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
+"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
+"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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum redox_syscall 0.1.53 (registry+https://github.com/rust-lang/crates.io-index)" = "53848511b7ee6eb9d5c3db48481aaa5779b38fc0131bc133c98cb4f2b2411928"
+"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
@@ -2064,21 +2157,22 @@ dependencies = [
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4"
 "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
 "checksum serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)" = "<none>"
-"checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
-"checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79"
+"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
 "checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
 "checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "97a47ae722318beceb0294e6f3d601205a1e6abaa4437d9d33e3a212233e3021"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
@@ -2088,57 +2182,57 @@ dependencies = [
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
 "checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
-"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
+"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
 "checksum smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fae090012788f95156fc33f43631242480f311cca6bf7f600943eba14ae032ed"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
-"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
-"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
+"checksum tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "65641e515a437b308ab131a82ce3042ff9795bef5d6c5a9be4eb24195c417fd9"
 "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
-"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
-"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
-"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
-"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
-"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
+"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
+"checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
+"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.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
 "checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
+"checksum tokio-sync 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fda385df506bf7546e70872767f71e81640f1f251bdf2fd8eb81a0eaec5fe022"
 "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
-"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
+"checksum tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ec5759cf26cf9659555f36c431b515e3d05f66831741c85b4b5d5dfb9cf1323c"
+"checksum tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6"
+"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
 "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 "checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
-"checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
-"checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
+"checksum trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09144f0992b0870fa8d2972cc069cbf1e3c0fda64d1f3d45c4d68d0e0b52ad4e"
+"checksum trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a9f877f7a1ad821ab350505e1f1b146a4960402991787191d6d8cab2ce2de2c"
 "checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
+"checksum unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
 "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
-"checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
-"checksum v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b50688edb86f4c092a1a9fe8bda004b0faa3197100897653809e97e09a2814"
-"checksum v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd994c63b487fef7aad31e5394ec04b9e24de7b32ea5251c9fb499cd2cbf44c"
-"checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
+"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+"checksum v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8865501b78eef9193c1b45486acf18ba889e5662eba98854d6fc59d8ecf3542d"
+"checksum v_escape_derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "306896ff4b75998501263a1dc000456de442e21d68fe8c8bdf75c66a33a58e23"
+"checksum v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7fbbe0fa88dd36f9c8cf61a218d4b953ba669de4d0785832f33cc72bd081e1be"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

From a568ba81494f541983dc77e1f16ea67388dd0824 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 19:56:56 +0300
Subject: [PATCH 089/179] fix merge

---
 Cargo.lock | 263 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile   |  17 ++++
 2 files changed, 280 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 6c816c0f8..8d7b08c9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,6 +149,16 @@ dependencies = [
  "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "atty"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "autocfg"
 version = "0.1.2"
@@ -221,6 +231,11 @@ name = "build_const"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bumpalo"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
 version = "1.2.7"
@@ -278,6 +293,15 @@ dependencies = [
  "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "console_error_panic_hook"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cookie"
 version = "0.11.0"
@@ -438,6 +462,18 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "env_logger"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "error-chain"
 version = "0.8.1"
@@ -536,6 +572,14 @@ dependencies = [
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "heck"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "hostname"
 version = "0.1.5"
@@ -620,6 +664,25 @@ name = "itoa"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "jason"
+version = "0.1.0-dev"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "kernel32-sys"
 version = "0.2.2"
@@ -1094,6 +1157,14 @@ name = "redox_syscall"
 version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "redox_termios"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "regex"
 version = "0.1.80"
@@ -1179,6 +1250,11 @@ name = "safemem"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "scoped-tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -1413,6 +1489,11 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "sourcefile"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
@@ -1458,6 +1539,24 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "termion"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "thread-id"
 version = "2.0.0"
@@ -1780,6 +1879,11 @@ name = "unicode-normalization"
 version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-xid"
 version = "0.1.0"
@@ -1867,6 +1971,123 @@ name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasm-bindgen-test"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-test-macro"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-webidl"
+version = "0.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "failure 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.17 (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.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "weedle"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "widestring"
 version = "0.2.2"
@@ -1896,11 +2117,28 @@ name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "wincolor"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "winreg"
 version = "0.5.1"
@@ -1944,6 +2182,7 @@ dependencies = [
 "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
 "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
@@ -1953,6 +2192,7 @@ dependencies = [
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
+"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
 "checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
 "checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
 "checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
@@ -1960,6 +2200,7 @@ dependencies = [
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
+"checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
 "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
 "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
@@ -1978,6 +2219,7 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
@@ -1989,6 +2231,7 @@ dependencies = [
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
 "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
@@ -1999,6 +2242,7 @@ dependencies = [
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
 "checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
+"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
@@ -2053,6 +2297,7 @@ dependencies = [
 "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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
 "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
@@ -2064,6 +2309,7 @@ dependencies = [
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
+"checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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"
@@ -2091,12 +2337,15 @@ dependencies = [
 "checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
 "checksum smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fae090012788f95156fc33f43631242480f311cca6bf7f600943eba14ae032ed"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
 "checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
+"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
@@ -2124,6 +2373,7 @@ dependencies = [
 "checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
 "checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
@@ -2136,12 +2386,25 @@ dependencies = [
 "checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
+"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
+"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
+"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"
+"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"
+"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
+"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
+"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
+"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
+"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
+"checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
 "checksum winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a27a759395c1195c4cc5cda607ef6f8f6498f64e78f7900f5de0a127a424704a"
 "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
diff --git a/Makefile b/Makefile
index b75aa46fc..20641df21 100644
--- a/Makefile
+++ b/Makefile
@@ -181,6 +181,23 @@ endif
 
 
 
+# Run projects Medea and e2e app locally with dev settings.
+#
+# Usage:
+#	make up.dev
+
+up.dev:
+	$(MAKE) -j2 up.dev.server up.dev.e2e
+
+up.dev.server:
+	cargo run
+
+up.dev.e2e:
+	npm run start --prefix jason/e2e
+
+
+
+
 ##################
 # .PHONY section #
 ##################

From f423025a83286c554ad345f2b1ae40ee20ef0122 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 20:06:35 +0300
Subject: [PATCH 090/179] fix merge

---
 Makefile         | 110 +++++++++++++++++++++++++++++++++++++++++++++--
 jason/Cargo.lock |  57 ++++++++++++++++++++++++
 2 files changed, 164 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 83895d5a1..0b25e5feb 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\
 
 CARGO_HOME ?= $(strip $(shell dirname $$(dirname $$(which cargo))))
 RUST_VER ?= 1.33
+NODE_VER ?= 11.10
 
 
 
@@ -25,6 +26,14 @@ RUST_VER ?= 1.33
 # Aliases #
 ###########
 
+# Resolve all project dependencies.
+#
+# Usage:
+#	make deps
+
+deps: cargo.deps yarn
+
+
 docs: docs.rust
 
 
@@ -34,6 +43,14 @@ lint: cargo.lint
 fmt: cargo.fmt
 
 
+up: up.dev
+
+
+# Run all project tests.
+#
+# Usage:
+#	make test
+
 test: test.unit
 
 
@@ -63,6 +80,50 @@ cargo.lint:
 
 
 
+# Resolve Cargo project dependencies.
+#
+# Usage:
+#	make cargo [cmd=(fetch|<cargo-cmd>)]
+
+cargo-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
+
+cargo.deps:
+	cargo fetch
+
+
+
+
+#################
+# Yarn commands #
+#################
+
+# Resolve NPM project dependencies with Yarn.
+#
+# Optional 'cmd' parameter may be used for handy usage of docker-wrapped Yarn,
+# for example: make yarn cmd='upgrade'
+#
+# Usage:
+#	make yarn [cmd=('fetch'|<yarn-cmd>)]
+#			  [dockerized=(yes|no)]
+
+yarn-cmd = $(if $(call eq,$(cmd),),fetch,$(cmd))
+
+yarn:
+ifneq ($(dockerized),no)
+	docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+		node:$(NODE_VER) \
+			make yarn cmd='$(yarn-cmd)' dockerized=no
+else
+ifeq ($(yarn-cmd),fetch)
+	yarn install --pure-lockfile --cwd jason/e2e
+else
+	yarn $(yarn-cmd)
+endif
+endif
+
+
+
+
 ##########################
 # Documentation commands #
 ##########################
@@ -88,10 +149,51 @@ endif
 # Run Rust unit tests of project.
 #
 # Usage:
-#	make test.unit
+#	make test.unit [dockerized=(no|yes)] [app=(server|client)]
 
 test.unit:
+ifeq ($(app),)
+	make test.unit dockerized=$(dockerized) app=server
+	make test.unit dockerized=$(dockerized) app=client
+endif
+ifeq ($(dockerized),yes)
+ifeq ($(app),server)
+		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+					-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+			rust:$(RUST_VER) \
+				make test.unit dockerized=no app=server
+endif
+ifeq ($(app),client)
+		docker run --rm --user $(shell id -u) --network=host -v "$(PWD)":/app -w /app \
+					-v "$(abspath $(CARGO_HOME))/registry":/usr/local/cargo/registry\
+			alexlapa/wasm-pack:stable-$(RUST_VER)-ff-66.0 \
+				make test.unit dockerized=no app=client
+endif
+else
+ifeq ($(app),server)
 	cargo test --all
+endif
+ifeq ($(app),client)
+	wasm-pack test --headless --firefox jason
+endif
+endif
+
+
+
+
+# Run projects Medea and e2e app locally with dev settings.
+#
+# Usage:
+#	make up.dev
+
+up.dev:
+	$(MAKE) -j2 up.dev.server up.dev.e2e
+
+up.dev.server:
+	cargo run
+
+up.dev.e2e:
+	npm run start --prefix jason/e2e
 
 
 
@@ -100,6 +202,8 @@ test.unit:
 # .PHONY section #
 ##################
 
-.PHONY: cargo cargo.fmt cargo.lint \
+.PHONY: cargo cargo.deps cargo.fmt cargo.lint \
         docs docs.rust \
-        test test.unit
+        test test.unit \
+        up up.dev up.dev.server up.dev.e2e \
+        yarn
diff --git a/jason/Cargo.lock b/jason/Cargo.lock
index 8d3f46d5d..cffc142a0 100644
--- a/jason/Cargo.lock
+++ b/jason/Cargo.lock
@@ -67,6 +67,11 @@ dependencies = [
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "env_logger"
 version = "0.6.1"
@@ -120,13 +125,24 @@ dependencies = [
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "itoa"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "jason"
 version = "0.1.0-dev"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -230,11 +246,44 @@ name = "rustc-demangle"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ryu"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "serde"
+version = "1.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "sourcefile"
 version = "0.1.4"
@@ -317,6 +366,8 @@ name = "wasm-bindgen"
 version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -475,12 +526,14 @@ dependencies = [
 "checksum cc 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "30f813bf45048a18eda9190fd3c6b78644146056740c43172a5a3699118588fd"
 "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
 "checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+"checksum discard 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 "checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 "checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
@@ -495,7 +548,11 @@ dependencies = [
 "checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
 "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
 "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
+"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4"
+"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79"
+"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"

From 0d26545034f955275629f74e6ba143eb43a27c12 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 20:33:35 +0300
Subject: [PATCH 091/179] copy protocol messages

---
 jason/e2e/js/index.js           |  9 +++--
 jason/src/transport/protocol.rs | 70 ++++++++++++++++++++++++++++++++-
 2 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
index 5ad0b7799..f4e14d1a2 100644
--- a/jason/e2e/js/index.js
+++ b/jason/e2e/js/index.js
@@ -1,11 +1,14 @@
 async function f() {
     const rust = await import("../../pkg");
 
-    let jason = new rust.Jason();
+    let caller = new rust.Jason();
 
-    let session = jason.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+    let caller_session = caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+
+    let responder = new rust.Jason();
+
+    let responder_session = responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
 
-    alert("hi");
 }
 
 f();
\ No newline at end of file
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index a0bcf6d68..fb74836de 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,7 +1,5 @@
 use serde::{Deserialize, Serialize};
 
-pub struct Command {}
-
 #[derive(Deserialize, Serialize)]
 pub enum Heartbeat {
     /// `ping` message that WebSocket client is expected to send to the server
@@ -13,3 +11,71 @@ pub enum Heartbeat {
     #[serde(rename = "pong")]
     Pong(usize),
 }
+
+/// WebSocket message from Web Client to Media Server.
+#[derive(Debug, Serialize)]
+pub enum Command {
+    /// Web Client sends SDP Offer.
+    MakeSdpOffer { peer_id: u64, sdp_offer: String },
+    /// Web Client sends SDP Answer.
+    MakeSdpAnswer { peer_id: u64, sdp_answer: String },
+    /// Web Client sends Ice Candidate.
+    SetIceCandidate { peer_id: u64, candidate: String },
+}
+
+/// WebSocket message from Media Server to Web Client.
+#[derive(Debug, Deserialize)]
+pub enum Event {
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// creation.
+    PeerCreated {
+        peer_id: u64,
+        sdp_offer: Option<String>,
+        tracks: Vec<DirectionalTrack>,
+    },
+    /// Media Server notifies Web Client about necessity to apply specified SDP
+    /// Answer to Web Client's RTCPeerConnection.
+    SdpAnswerMade {
+        peer_id: u64,
+        sdp_answer: String,
+    },
+
+    IceCandidateDiscovered {
+        peer_id: u64,
+        candidate: String,
+    },
+
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// close.
+    PeersRemoved {
+        peer_ids: Vec<u64>,
+    },
+}
+
+/// [`Track] with specified direction.
+#[derive(Debug, Deserialize)]
+pub struct DirectionalTrack {
+    pub id: u64,
+    pub direction: TrackDirection,
+    pub media_type: TrackMediaType,
+}
+
+/// Direction of [`Track`].
+#[derive(Debug, Deserialize)]
+pub enum TrackDirection {
+    Send { receivers: Vec<u64> },
+    Recv { sender: u64 },
+}
+
+/// Type of [`Track`].
+#[derive(Debug, Deserialize)]
+pub enum TrackMediaType {
+    Audio(AudioSettings),
+    Video(VideoSettings),
+}
+
+#[derive(Debug, Deserialize)]
+pub struct AudioSettings {}
+
+#[derive(Debug, Deserialize)]
+pub struct VideoSettings {}
\ No newline at end of file

From 22d3724d13b88064d1c48d6d89207fd47d36c6a7 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 8 Apr 2019 21:05:16 +0300
Subject: [PATCH 092/179] parse command

---
 Cargo.lock                      |  2 +-
 jason/src/transport/mod.rs      | 18 +++++++++++++-----
 jason/src/transport/protocol.rs |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0b1dd39fd..74b77d61b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -783,7 +783,7 @@ dependencies = [
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 966136d64..467d641f6 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -56,11 +56,19 @@ impl Transport {
             "message",
             socket_ref,
             move |event: MessageEvent| {
-                let payload = event.data();
-
-                pinger_rc.set_pong_at(Date::now());
-
-                console::log(&js_sys::Array::from(&payload));
+                let mut payload = event.data();
+
+                if payload.is_string() {
+                    let payload = payload.as_string().unwrap();
+
+                    if let Ok(Heartbeat::Pong(pong)) = serde_json::from_str::<Heartbeat>(&payload) {
+                        pinger_rc.set_pong_at(Date::now());
+                        console::log(&js_sys::Array::from(&JsValue::from_str("pong received")));
+                    } else {
+                        let command = serde_json::from_str::<Command>(&payload).unwrap();
+                        console::log(&js_sys::Array::from(&JsValue::from_str("command received")));
+                    }
+                }
             },
         )
         .unwrap();
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index fb74836de..91d5f8aba 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -13,7 +13,7 @@ pub enum Heartbeat {
 }
 
 /// WebSocket message from Web Client to Media Server.
-#[derive(Debug, Serialize)]
+#[derive(Debug, Deserialize)]
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: u64, sdp_offer: String },

From 436e3b6fb7cc82f34d3df1453925f72a03e676c6 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 9 Apr 2019 15:28:26 +0300
Subject: [PATCH 093/179] impl drop for transport, send events to subs

---
 jason/src/lib.rs                |  6 ++---
 jason/src/transport/mod.rs      | 40 +++++++++++++++++++++++----------
 jason/src/transport/protocol.rs | 16 ++++++-------
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 6329962cf..33c3156bf 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -4,7 +4,7 @@ use wasm_bindgen::prelude::*;
 mod transport;
 mod utils;
 
-use transport::{protocol::*, Transport};
+use transport::{protocol::Event as MedeaEvent, Transport};
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -28,8 +28,8 @@ pub struct Jason {
 
 #[wasm_bindgen]
 pub struct SessionHandler {
-    tx: UnboundedSender<Command>,
-    _rx: UnboundedReceiver<Command>,
+    tx: UnboundedSender<MedeaEvent>,
+    _rx: UnboundedReceiver<MedeaEvent>,
 }
 
 impl SessionHandler {
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 467d641f6..79a2416a4 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,12 +1,13 @@
 pub mod protocol;
-use self::protocol::*;
+use self::protocol::{Heartbeat, Event as MedeaEvent};
 use futures::sync::mpsc::UnboundedSender;
 use js_sys::Date;
-use std::{cell::RefCell, rc::Rc};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
+use std::{cell::RefCell, rc::Rc, vec};
+
 use crate::utils::{
     bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle,
 };
@@ -18,7 +19,7 @@ pub struct Transport {
     sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,
     pinger: Rc<Pinger>,
-    subs: Vec<UnboundedSender<Command>>,
+    subs: Rc<RefCell<Vec<UnboundedSender<MedeaEvent>>>>,
     on_open: Option<Closure<dyn FnMut(Event)>>,
     on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
     on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
@@ -29,7 +30,7 @@ impl Transport {
         Transport {
             sock: Rc::new(RefCell::new(None)),
             token,
-            subs: vec![],
+            subs: Rc::new(RefCell::new(vec![])),
             pinger: Rc::new(Pinger::new(ping_interval)),
             on_open: None,
             on_message: None,
@@ -52,22 +53,28 @@ impl Transport {
             .unwrap();
 
         let pinger_rc = Rc::clone(&self.pinger);
+        let subs_rc = Rc::clone(&self.subs);
         let on_message = bind_handler_fn_mut(
             "message",
             socket_ref,
-            move |event: MessageEvent| {
-                let mut payload = event.data();
+            move |message: MessageEvent| {
+                let payload = message.data();
 
                 if payload.is_string() {
-                    let payload = payload.as_string().unwrap();
+                    let payload: String = payload.as_string().unwrap();
 
-                    if let Ok(Heartbeat::Pong(pong)) = serde_json::from_str::<Heartbeat>(&payload) {
+                    if let Ok(Heartbeat::Pong(_pong)) = serde_json::from_str::<Heartbeat>(&payload) {
                         pinger_rc.set_pong_at(Date::now());
                         console::log(&js_sys::Array::from(&JsValue::from_str("pong received")));
                     } else {
-                        let command = serde_json::from_str::<Command>(&payload).unwrap();
-                        console::log(&js_sys::Array::from(&JsValue::from_str("command received")));
+                        let event = serde_json::from_str::<MedeaEvent>(&payload).unwrap();
+
+                        //TODO: many subs, filter messages by session
+                        if let Some(sub) = subs_rc.borrow().iter().next() {
+                            sub.unbounded_send(event).unwrap();
+                        }
                     }
+
                 }
             },
         )
@@ -99,8 +106,17 @@ impl Transport {
         self.sock = socket
     }
 
-    pub fn add_sub(&mut self, sub: UnboundedSender<Command>) {
-        self.subs.push(sub);
+    pub fn add_sub(&mut self, sub: UnboundedSender<MedeaEvent>) {
+        self.subs.borrow_mut().push(sub);
+    }
+}
+
+impl Drop for Transport {
+    fn drop(&mut self) {
+        let socket_borrow = self.sock.borrow();
+        if let Some(socket) = socket_borrow.as_ref() {
+            socket.close_with_code_and_reason(1001, "Dropped suddenly").is_ok();
+        }
     }
 }
 
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 91d5f8aba..50f5deb49 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -13,7 +13,7 @@ pub enum Heartbeat {
 }
 
 /// WebSocket message from Web Client to Media Server.
-#[derive(Debug, Deserialize)]
+#[derive(Serialize)]
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: u64, sdp_offer: String },
@@ -23,8 +23,8 @@ pub enum Command {
     SetIceCandidate { peer_id: u64, candidate: String },
 }
 
-/// WebSocket message from Media Server to Web Client.
-#[derive(Debug, Deserialize)]
+/// WebSocket message from Medea to Jason.
+#[derive(Deserialize)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
@@ -53,7 +53,7 @@ pub enum Event {
 }
 
 /// [`Track] with specified direction.
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 pub struct DirectionalTrack {
     pub id: u64,
     pub direction: TrackDirection,
@@ -61,21 +61,21 @@ pub struct DirectionalTrack {
 }
 
 /// Direction of [`Track`].
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 pub enum TrackDirection {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
 }
 
 /// Type of [`Track`].
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 pub enum TrackMediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 pub struct AudioSettings {}
 
-#[derive(Debug, Deserialize)]
+#[derive(Deserialize)]
 pub struct VideoSettings {}
\ No newline at end of file

From cf6ea506854a5338484d26a55313375579c6db03 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 9 Apr 2019 17:02:06 +0300
Subject: [PATCH 094/179] transport.send_command()

---
 jason/src/transport/mod.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 79a2416a4..8ecce3be2 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,5 +1,5 @@
 pub mod protocol;
-use self::protocol::{Heartbeat, Event as MedeaEvent};
+use self::protocol::{Command, Heartbeat, Event as MedeaEvent};
 use futures::sync::mpsc::UnboundedSender;
 use js_sys::Date;
 use wasm_bindgen::prelude::*;
@@ -109,6 +109,18 @@ impl Transport {
     pub fn add_sub(&mut self, sub: UnboundedSender<MedeaEvent>) {
         self.subs.borrow_mut().push(sub);
     }
+
+    pub fn send_command(&self, command: &Command) {
+        let socket_borrow = self.sock.borrow();
+
+        //TODO: no socket?
+        if let Some(socket) = socket_borrow.as_ref() {
+            let msg =
+                serde_json::to_string(&command).unwrap();
+
+            socket.send_with_str(&msg).unwrap();
+        }
+    }
 }
 
 impl Drop for Transport {

From d852df2e5fdf16d3b6aab69072617acbea6f0d86 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 9 Apr 2019 17:20:34 +0300
Subject: [PATCH 095/179] Refactoring send message from WsSession to Room use
 try_send

---
 src/api/client/commands.rs |   1 -
 src/api/client/room.rs     | 152 ++++++++++++++++++++-----------------
 src/api/client/session.rs  |  66 +++++++---------
 3 files changed, 109 insertions(+), 110 deletions(-)

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index c268a39f1..841f7e520 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -5,7 +5,6 @@ use crate::media::peer::Id as PeerId;
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Message, Serialize)]
-#[rtype(result = "Result<(), ()>")]
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: PeerId, sdp_offer: String },
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 983e74605..b5c190fd8 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -7,9 +7,8 @@ use std::{
 };
 
 use actix::{
-    fut::{err, ok, wrap_future},
-    Actor, ActorContext, ActorFuture, Addr, AsyncContext, Context,
-    ContextFutureSpawner, Handler, Message, Running, SpawnHandle, WrapFuture,
+    fut::wrap_future, Actor, ActorContext, ActorFuture, Addr, AsyncContext,
+    Context, Handler, Message, Running, SpawnHandle, WrapFuture,
 };
 use failure::Fail;
 use futures::{
@@ -274,33 +273,32 @@ impl Actor for Room {
 
     /// Closes all active [`PrcConnection`].
     fn stopping(&mut self, ctx: &mut Self::Context) -> Running {
-        use futures::stream::{self, Stream};
         use std::mem;
-
-        debug!("Room stopped");
         let connections = mem::replace(&mut self.connections, hashmap!());
-        let conn_with_event = connections
-            .into_iter()
-            .map(|(member_id, conn)| {
-                let event = Event::PeersRemoved {
-                    peer_ids: self
-                        .peers
-                        .iter()
-                        .filter(move |(_, peer)| peer.member_id() == member_id)
-                        .map(|(&id, _)| id)
-                        .collect(),
-                };
-                (conn, event)
-            })
-            .collect::<Vec<_>>();
-
-        ctx.wait(wrap_future(stream::iter_ok(conn_with_event).for_each(
-            |(mut conn, event)| {
-                conn.send_event(event)
-                    .and_then(move |_| conn.close())
-                    .map_err(|_| ())
+        let fut = connections.into_iter().fold(
+            vec![],
+            |mut futures, (member_id, mut connection)| {
+                info!(
+                    "Close connection of member {}, because room is stopped",
+                    member_id,
+                );
+                futures.push(
+                    connection.send_event(Event::PeersRemoved {
+                        peer_ids: self
+                            .peers
+                            .iter()
+                            .filter(move |(_, peer)| {
+                                peer.member_id() == member_id
+                            })
+                            .map(|(&id, _)| id)
+                            .collect(),
+                    }),
+                );
+                futures.push(connection.close());
+                futures
             },
-        )));
+        );
+        ctx.wait(wrap_future(join_all(fut).map(|_| ())));
         Running::Continue
     }
 }
@@ -399,7 +397,6 @@ impl Handler<RpcConnectionEstablished> for Room {
 
             let peer = self.member_peer(&member_id);
             if peer.sender().is_some() {
-                // ToDo try into_future(self) for handle error
                 fut = Either::A(future::done(
                     self.handle_peer_created(peer.id())
                         .and_then(|(caller, event)| {
@@ -421,7 +418,7 @@ impl Handler<RpcConnectionEstablished> for Room {
 }
 
 impl Handler<Command> for Room {
-    type Result = ActFuture<(), ()>;
+    type Result = ();
 
     /// Receives [`Command`] from Web client and changes state of interconnected
     /// [`Peer`]s.
@@ -442,17 +439,16 @@ impl Handler<Command> for Room {
                 self.handle_set_ice_candidate(peer_id, candidate)
             }
         };
-        let fut = future::done(
-            res.and_then(|(caller, event)| self.send_event(caller, event))
-                .map_err(move |err| {
-                    error!(
-                        "Failed handle command, because {}. Room will be stop.",
-                        err
-                    );
-                    ctx.stop()
-                }),
-        );
-        Box::new(wrap_future(fut))
+        match res.and_then(|(caller, event)| self.send_event(caller, event)) {
+            Err(err) => {
+                error!(
+                    "Failed handle command, because {}. Room will be stop.",
+                    err
+                );
+                ctx.stop()
+            }
+            _ => {}
+        }
     }
 }
 
@@ -486,16 +482,20 @@ impl Handler<RpcConnectionClosed> for Room {
         let closed_at = Instant::now();
         let member_id = msg.member_id;
         match msg.reason {
-            RpcConnectionClosedReason::Disconnected => ctx.stop(),
+            RpcConnectionClosedReason::Disconnected => {
+                self.connections.remove(&member_id);
+                ctx.stop()
+            }
             RpcConnectionClosedReason::Idle => {
                 self.idle_timeouts.insert(
                     msg.member_id,
-                    ctx.run_later(SESSION_IDLE_TIMEOUT, move |_room, ctx| {
+                    ctx.run_later(SESSION_IDLE_TIMEOUT, move |room, ctx| {
                         info!(
                             "Member {} connection lost at {:?}. Room will be \
                              stop.",
                             member_id, closed_at
                         );
+                        room.connections.remove(&member_id);
                         ctx.stop()
                     }),
                 );
@@ -527,12 +527,14 @@ impl RoomsRepository {
 
 #[cfg(test)]
 mod test {
+    use std::sync::atomic::{AtomicBool, Ordering};
+
     use actix::{ActorContext, Arbiter, AsyncContext, System};
     use futures::future::Future;
 
     use super::*;
-    use crate::media::track::{DirectionalTrack, TrackDirection};
     use crate::media::{
+        track::{DirectionalTrack, TrackDirection},
         AudioSettings, Peer, Track, TrackMediaType, VideoSettings,
     };
 
@@ -541,41 +543,52 @@ mod test {
         pub member_id: MemberId,
         pub room: Addr<Room>,
         pub events: Arc<Mutex<Vec<String>>>,
+        pub stopped: Arc<AtomicBool>,
     }
 
     impl Actor for TestConnection {
         type Context = Context<Self>;
 
         fn started(&mut self, ctx: &mut Self::Context) {
-            let member_id = self.member_id;
             self.room
-                .send(RpcConnectionEstablished {
+                .try_send(RpcConnectionEstablished {
                     member_id: self.member_id,
                     connection: Box::new(ctx.address()),
                 })
-                .into_actor(self)
-                .then(|res, _, ctx| {
-                    match res {
-                        Err(_) => System::current().stop(),
-                        _ => {}
-                    }
-                    ok(())
-                })
-                .wait(ctx);
+                .unwrap();
+        }
+
+        fn stopped(&mut self, ctx: &mut Self::Context) {
+            if self.stopped.load(Ordering::Relaxed) {
+                System::current().stop()
+            } else {
+                self.stopped.store(true, Ordering::Relaxed);
+            }
+        }
+    }
+
+    #[derive(Message)]
+    struct Close;
+
+    impl Handler<Close> for TestConnection {
+        type Result = ();
+
+        fn handle(&mut self, _: Close, ctx: &mut Self::Context) {
+            ctx.stop()
         }
     }
 
     impl Handler<Event> for TestConnection {
         type Result = ();
 
-        fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
+        fn handle(&mut self, event: Event, _ctx: &mut Self::Context) {
             let mut events = self.events.lock().unwrap();
             events.push(serde_json::to_string(&event).unwrap());
             match event {
                 Event::PeerCreated {
                     peer_id,
                     sdp_offer,
-                    tracks,
+                    tracks: _,
                 } => match sdp_offer {
                     Some(_) => self.room.do_send(Command::MakeSdpAnswer {
                         peer_id,
@@ -601,18 +614,16 @@ mod test {
                         member_id: self.member_id,
                         reason: RpcConnectionClosedReason::Disconnected,
                     });
-                    ctx.stop();
-                }
-                Event::PeersRemoved { peer_ids: _ } => {
-                    System::current().stop();
                 }
+                Event::PeersRemoved { peer_ids: _ } => {}
             }
         }
     }
 
     impl RpcConnection for Addr<TestConnection> {
-        fn close(&self) -> Box<dyn Future<Item = (), Error = ()>> {
-            Box::new(future::ok(()))
+        fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>> {
+            let fut = self.send(Close {}).map_err(|_| ());
+            Box::new(fut)
         }
 
         fn send_event(
@@ -658,6 +669,7 @@ mod test {
 
     #[test]
     fn start_signaling() {
+        let stopped = Arc::new(AtomicBool::new(false));
         let caller_events = Arc::new(Mutex::new(vec![]));
         let caller_events_clone = Arc::clone(&caller_events);
         let responder_events = Arc::new(Mutex::new(vec![]));
@@ -666,20 +678,22 @@ mod test {
         System::run(move || {
             let room = start_room();
             let room_clone = room.clone();
+            let stopped_clone = stopped.clone();
             Arbiter::start(move |_| TestConnection {
+                events: caller_events_clone,
                 member_id: 1,
                 room: room_clone,
-                events: caller_events_clone,
+                stopped: stopped_clone,
             });
-            let room_clone = room.clone();
             Arbiter::start(move |_| TestConnection {
-                member_id: 2,
-                room: room_clone,
                 events: responder_events_clone,
+                member_id: 2,
+                room,
+                stopped,
             });
         });
 
-        let mut caller_events = caller_events.lock().unwrap();
+        let caller_events = caller_events.lock().unwrap();
         let responder_events = responder_events.lock().unwrap();
         assert_eq!(caller_events.len(), 3);
         assert_eq!(
@@ -743,10 +757,6 @@ mod test {
                     candidate: "ice_candidate".into(),
                 })
                 .unwrap(),
-                serde_json::to_string(&Event::PeersRemoved {
-                    peer_ids: vec![1],
-                })
-                .unwrap(),
             ]
         );
     }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index cbc0170f6..f2c417a21 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -68,20 +68,17 @@ impl WsSession {
                 info!("WsSession of member {} is idle", sess.member_id);
 
                 let member_id = sess.member_id;
-                ctx.wait(wrap_future(
-                    sess.room
-                        .send(RpcConnectionClosed {
-                            member_id,
-                            reason: RpcConnectionClosedReason::Idle,
-                        })
-                        .map_err(move |err| {
-                            error!(
-                                "WsSession of member {} failed to remove from \
-                                 Room, because: {:?}",
-                                member_id, err,
-                            )
-                        }),
-                ));
+                match sess.room.try_send(RpcConnectionClosed {
+                    member_id,
+                    reason: RpcConnectionClosedReason::Idle,
+                }) {
+                    Err(err) => error!(
+                        "WsSession of member {} failed to remove from Room, \
+                         because: {:?}",
+                        member_id, err,
+                    ),
+                    _ => {}
+                };
 
                 ctx.notify(Close {
                     reason: Some(ws::CloseCode::Normal.into()),
@@ -218,17 +215,13 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
                     let member_id = self.member_id;
-                    ctx.wait(wrap_future(
-                        self.room.send(command).map(|_| ()).map_err(
-                            move |err| {
-                                error!(
-                                    "Cannot send Command from member {}, \
-                                     because {}",
-                                    member_id, err
-                                )
-                            },
+                    match self.room.try_send(command) {
+                        Err(err) => error!(
+                            "Cannot send Command to Room {}, because {}",
+                            member_id, err
                         ),
-                    ));
+                        _ => {}
+                    }
                 }
             }
             ws::Message::Close(reason) => {
@@ -238,20 +231,17 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                         reason, self.member_id
                     );
                     let member_id = self.member_id;
-                    ctx.wait(wrap_future(
-                        self.room
-                            .send(RpcConnectionClosed {
-                                member_id: self.member_id,
-                                reason: RpcConnectionClosedReason::Disconnected,
-                            })
-                            .map_err(move |err| {
-                                error!(
-                                    "WsSession of member {} failed to remove \
-                                     from Room, because: {:?}",
-                                    member_id, err,
-                                )
-                            }),
-                    ));
+                    match self.room.try_send(RpcConnectionClosed {
+                        member_id: self.member_id,
+                        reason: RpcConnectionClosedReason::Disconnected,
+                    }) {
+                        Err(err) => error!(
+                            "WsSession of member {} failed to remove from \
+                             Room, because: {:?}",
+                            member_id, err,
+                        ),
+                        _ => {}
+                    };
                     ctx.close(reason);
                     ctx.stop();
                 }

From ff94c99098173839a6c8e0fd12905bfa821f36db Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 9 Apr 2019 19:02:06 +0300
Subject: [PATCH 096/179] parse event in session

---
 jason/e2e/js/index.js           |  4 +--
 jason/src/lib.rs                | 46 +++++++++++++++++++++++++++++----
 jason/src/transport/protocol.rs | 14 +++++-----
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
index f4e14d1a2..4653f070e 100644
--- a/jason/e2e/js/index.js
+++ b/jason/e2e/js/index.js
@@ -3,11 +3,11 @@ async function f() {
 
     let caller = new rust.Jason();
 
-    let caller_session = caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+    caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
 
     let responder = new rust.Jason();
 
-    let responder_session = responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
+    responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
 
 }
 
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 33c3156bf..df893feae 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,10 +1,12 @@
 use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
+use web_sys::{console};
 use wasm_bindgen::prelude::*;
 
 mod transport;
 mod utils;
 
 use transport::{protocol::Event as MedeaEvent, Transport};
+use futures::stream::Stream;
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
@@ -14,6 +16,9 @@ use transport::{protocol::Event as MedeaEvent, Transport};
 // https://github.com/rustwasm/console_error_panic_hook#readme
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
+use wasm_bindgen_futures::spawn_local;
+use crate::transport::protocol::DirectionalTrack;
+use std::rc::Rc;
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
@@ -23,23 +28,29 @@ static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
 pub struct Jason {
+    //TODO: multiple session will require some kind of TransportManager
     transport: Option<Transport>,
 }
 
 #[wasm_bindgen]
 pub struct SessionHandler {
+    transport: Rc<Option<Transport>>,
     tx: UnboundedSender<MedeaEvent>,
-    _rx: UnboundedReceiver<MedeaEvent>,
+    rx: UnboundedReceiver<MedeaEvent>,
 }
 
 impl SessionHandler {
     fn new() -> SessionHandler {
         let (tx, rx) = unbounded();
 
-        SessionHandler { tx, _rx: rx }
+        SessionHandler { transport: Rc::new(None), tx, rx }
     }
 }
 
+struct InnerSession {
+
+}
+
 #[wasm_bindgen]
 impl Jason {
     #[wasm_bindgen(constructor)]
@@ -48,7 +59,7 @@ impl Jason {
         Self { transport: None }
     }
 
-    pub fn init_session(&mut self, token: String) -> SessionHandler {
+    pub fn init_session(&mut self, token: String) {
         let mut transport = Transport::new(token, 3000);
         transport.init();
 
@@ -56,8 +67,33 @@ impl Jason {
 
         transport.add_sub(handler.tx.clone());
 
-        self.transport = Some(transport);
+        let poll = handler.rx.for_each(|event| {
+            console::log(&js_sys::Array::from(&JsValue::from_str(&format!("{:?}", event))));
+            match event {
+                MedeaEvent::PeerCreated {        peer_id,sdp_offer,tracks} => {
+//                    &self.on_peer_created(peer_id, sdp_offer, tracks);
+                },
+                MedeaEvent::SdpAnswerMade {peer_id, sdp_answer} => {
+
+                },
+                MedeaEvent::IceCandidateDiscovered {peer_id, candidate} => {
+
+                },
+                MedeaEvent::PeersRemoved {peer_ids} => {
 
-        handler
+                },
+            };
+
+            Ok(())
+        });
+
+        spawn_local(poll);
+
+        self.transport = Some(transport);
     }
+
+    fn on_peer_created(&self, peer_id: u64, sdp_offer: Option<String>, tracks: Vec<DirectionalTrack>) {}
+//    fn on_sdp_answer() {}
+//    fn on_ice_candidate_discovered() {}
+//    fn peers_removed() {}
 }
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 50f5deb49..0cbdceb29 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,5 +1,7 @@
 use serde::{Deserialize, Serialize};
 
+
+// TODO: move protocol to crate?
 #[derive(Deserialize, Serialize)]
 pub enum Heartbeat {
     /// `ping` message that WebSocket client is expected to send to the server
@@ -24,7 +26,7 @@ pub enum Command {
 }
 
 /// WebSocket message from Medea to Jason.
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
@@ -53,7 +55,7 @@ pub enum Event {
 }
 
 /// [`Track] with specified direction.
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub struct DirectionalTrack {
     pub id: u64,
     pub direction: TrackDirection,
@@ -61,21 +63,21 @@ pub struct DirectionalTrack {
 }
 
 /// Direction of [`Track`].
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub enum TrackDirection {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
 }
 
 /// Type of [`Track`].
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub enum TrackMediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub struct AudioSettings {}
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Debug)]
 pub struct VideoSettings {}
\ No newline at end of file

From 06182061af3a20286d300f9fb52310053df5ba3c Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Wed, 10 Apr 2019 14:53:31 +0300
Subject: [PATCH 097/179] Add reconnect timeout parameter to config

---
 src/api/client/events.rs | 16 +++-----
 src/api/client/room.rs   | 86 +++++++++++++++++++++++++++-------------
 src/api/client/server.rs |  9 +++--
 src/conf/rpc.rs          |  6 +++
 src/main.rs              | 11 ++---
 5 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/src/api/client/events.rs b/src/api/client/events.rs
index 02df2e50c..0450ae10c 100644
--- a/src/api/client/events.rs
+++ b/src/api/client/events.rs
@@ -15,19 +15,13 @@ pub enum Event {
     },
     /// Media Server notifies Web Client about necessity to apply specified SDP
     /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade {
-        peer_id: PeerId,
-        sdp_answer: String,
-    },
+    SdpAnswerMade { peer_id: PeerId, sdp_answer: String },
 
-    IceCandidateDiscovered {
-        peer_id: PeerId,
-        candidate: String,
-    },
+    /// Media Server notifies Web Client about necessity to apply specified
+    /// ICE Candidate.
+    IceCandidateDiscovered { peer_id: PeerId, candidate: String },
 
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// close.
-    PeersRemoved {
-        peer_ids: Vec<PeerId>,
-    },
+    PeersRemoved { peer_ids: Vec<PeerId> },
 }
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index b5c190fd8..7ac856b51 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -8,7 +8,7 @@ use std::{
 
 use actix::{
     fut::wrap_future, Actor, ActorContext, ActorFuture, Addr, AsyncContext,
-    Context, Handler, Message, Running, SpawnHandle, WrapFuture,
+    Context, Handler, Message, Running, SpawnHandle,
 };
 use failure::Fail;
 use futures::{
@@ -24,10 +24,6 @@ use crate::{
     media::peer::{Id as PeerId, PeerMachine},
 };
 
-/// Timeout for close [`Session`] after receive `RpcConnectionClosed` message.
-pub const SESSION_IDLE_TIMEOUT: Duration = Duration::from_secs(10);
-// TODO: via conf
-
 #[derive(Fail, Debug)]
 pub enum RoomError {
     #[fail(display = "Unknown peer {}", _0)]
@@ -49,12 +45,16 @@ pub struct Room {
     /// ID of this [`Room`].
     id: Id,
 
-    /// Established [`WsConnection`]s of [`Member`]s in this [`Room`].
+    /// Established [`RpcConnection`]s of [`Member`]s in this [`Room`].
     pub connections: HashMap<MemberId, Box<dyn RpcConnection>>,
     // TODO: Replace Box<dyn RpcConnection>> with enum,
     //       as the set of all possible RpcConnection types is not closed.
     idle_timeouts: HashMap<MemberId, SpawnHandle>,
 
+    /// Timeout for close [`RpcConnection`] after receive `RpcConnectionClosed`
+    /// message.
+    connection_timeout: Duration,
+
     /// [`Member`]s which currently are present in this [`Room`].
     members: HashMap<MemberId, Member>,
 
@@ -68,6 +68,7 @@ impl Room {
         id: Id,
         members: HashMap<MemberId, Member>,
         peers: HashMap<PeerId, PeerMachine>,
+        connection_timeout: Duration,
     ) -> Self {
         Room {
             id,
@@ -75,6 +76,7 @@ impl Room {
             idle_timeouts: HashMap::new(),
             members,
             peers,
+            connection_timeout,
         }
     }
 
@@ -111,6 +113,7 @@ impl Room {
             .ok_or(RoomError::UnknownPeer(*peer_id))
     }
 
+    /// Send [`Event`] to specified remote [`Member`].
     fn send_event(
         &mut self,
         member_id: MemberId,
@@ -126,6 +129,8 @@ impl Room {
             })
     }
 
+    /// Check state of the specified and associated [`Peer`].
+    /// Returns [`Event`] to caller that [`Peer`] is created.
     fn handle_peer_created(
         &mut self,
         from_peer_id: PeerId,
@@ -282,18 +287,20 @@ impl Actor for Room {
                     "Close connection of member {}, because room is stopped",
                     member_id,
                 );
-                futures.push(
-                    connection.send_event(Event::PeersRemoved {
-                        peer_ids: self
-                            .peers
-                            .iter()
-                            .filter(move |(_, peer)| {
-                                peer.member_id() == member_id
-                            })
-                            .map(|(&id, _)| id)
-                            .collect(),
-                    }),
-                );
+                let peer_ids: Vec<_> = self
+                    .peers
+                    .iter()
+                    .filter(move |(_, peer)| match peer {
+                        PeerMachine::New(_) => false,
+                        _ => peer.member_id() == member_id,
+                    })
+                    .map(|(&id, _)| id)
+                    .collect();
+                if !peer_ids.is_empty() {
+                    futures.push(
+                        connection.send_event(Event::PeersRemoved { peer_ids }),
+                    );
+                }
                 futures.push(connection.close());
                 futures
             },
@@ -473,7 +480,7 @@ pub enum RpcConnectionClosedReason {
 impl Handler<RpcConnectionClosed> for Room {
     type Result = ();
 
-    /// Removes [`Session`] of specified [`Member`] from the [`Room`].
+    /// Removes [`RpcConnection`] of specified [`Member`] from the [`Room`].
     fn handle(&mut self, msg: RpcConnectionClosed, ctx: &mut Self::Context) {
         info!(
             "RpcConnectionClosed for member {}, reason {:?}",
@@ -489,7 +496,7 @@ impl Handler<RpcConnectionClosed> for Room {
             RpcConnectionClosedReason::Idle => {
                 self.idle_timeouts.insert(
                     msg.member_id,
-                    ctx.run_later(SESSION_IDLE_TIMEOUT, move |room, ctx| {
+                    ctx.run_later(self.connection_timeout, move |room, ctx| {
                         info!(
                             "Member {} connection lost at {:?}. Room will be \
                              stop.",
@@ -527,7 +534,7 @@ impl RoomsRepository {
 
 #[cfg(test)]
 mod test {
-    use std::sync::atomic::{AtomicBool, Ordering};
+    use std::sync::atomic::{AtomicUsize, Ordering};
 
     use actix::{ActorContext, Arbiter, AsyncContext, System};
     use futures::future::Future;
@@ -543,7 +550,7 @@ mod test {
         pub member_id: MemberId,
         pub room: Addr<Room>,
         pub events: Arc<Mutex<Vec<String>>>,
-        pub stopped: Arc<AtomicBool>,
+        pub stopped: Arc<AtomicUsize>,
     }
 
     impl Actor for TestConnection {
@@ -558,11 +565,10 @@ mod test {
                 .unwrap();
         }
 
-        fn stopped(&mut self, ctx: &mut Self::Context) {
-            if self.stopped.load(Ordering::Relaxed) {
+        fn stopped(&mut self, _ctx: &mut Self::Context) {
+            self.stopped.fetch_add(1, Ordering::Relaxed);
+            if self.stopped.load(Ordering::Relaxed) > 1 {
                 System::current().stop()
-            } else {
-                self.stopped.store(true, Ordering::Relaxed);
             }
         }
     }
@@ -640,7 +646,9 @@ mod test {
             1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
             2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
         };
-        Arbiter::start(move |_| Room::new(1, members, create_peers(1, 2)))
+        Arbiter::start(move |_| {
+            Room::new(1, members, create_peers(1, 2), Duration::from_secs(10))
+        })
     }
 
     fn create_peers(
@@ -669,7 +677,7 @@ mod test {
 
     #[test]
     fn start_signaling() {
-        let stopped = Arc::new(AtomicBool::new(false));
+        let stopped = Arc::new(AtomicUsize::new(0));
         let caller_events = Arc::new(Mutex::new(vec![]));
         let caller_events_clone = Arc::clone(&caller_events);
         let responder_events = Arc::new(Mutex::new(vec![]));
@@ -760,4 +768,26 @@ mod test {
             ]
         );
     }
+
+    #[test]
+    fn close_responder_connection_without_caller() {
+        let stopped = Arc::new(AtomicUsize::new(1));
+        let stopped_clone = Arc::clone(&stopped);
+        let events = Arc::new(Mutex::new(vec![]));
+        let events_clone = Arc::clone(&events);
+
+        System::run(move || {
+            let room = start_room();
+            Arbiter::start(move |_| TestConnection {
+                events,
+                member_id: 2,
+                room,
+                stopped,
+            });
+        });
+
+        assert_eq!(stopped_clone.load(Ordering::Relaxed), 2);
+        let events = events_clone.lock().unwrap();
+        assert!(events.is_empty());
+    }
 }
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 0352ce85b..45c25b028 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -113,12 +113,14 @@ mod test {
     use super::*;
 
     /// Creates [`RoomsRepository`] for tests filled with a single [`Room`].
-    fn room() -> RoomsRepository {
+    fn room(conf: Rpc) -> RoomsRepository {
         let members = hashmap! {
             1 => Member{id: 1, credentials: "caller_credentials".into()},
             2 => Member{id: 2, credentials: "responder_credentials".into()},
         };
-        let room = Arbiter::start(move |_| Room::new(1, members, hashmap!()));
+        let room = Arbiter::start(move |_| {
+            Room::new(1, members, hashmap!(), conf.reconnect_timeout)
+        });
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
     }
@@ -127,7 +129,7 @@ mod test {
     fn ws_server(conf: Conf) -> test::TestServer {
         test::TestServer::with_factory(move || {
             App::with_state(Context {
-                rooms: room(),
+                rooms: room(conf.rpc.clone()),
                 config: conf.rpc.clone(),
             })
             .resource("/ws/{room_id}/{member_id}/{credentials}", |r| {
@@ -152,6 +154,7 @@ mod test {
         let conf = Conf {
             rpc: Rpc {
                 idle_timeout: Duration::new(1, 0),
+                reconnect_timeout: Default::default(),
             },
             server: Server::default(),
         };
diff --git a/src/conf/rpc.rs b/src/conf/rpc.rs
index 0327e2225..e3fdda999 100644
--- a/src/conf/rpc.rs
+++ b/src/conf/rpc.rs
@@ -12,4 +12,10 @@ pub struct Rpc {
     #[default(Duration::from_secs(10))]
     #[serde(with = "serde_humantime")]
     pub idle_timeout: Duration,
+
+    /// Duration, after which the server deletes the client session if
+    /// the remote RPC client does not reconnect after it is idle.
+    #[default(Duration::from_secs(10))]
+    #[serde(with = "serde_humantime")]
+    pub reconnect_timeout: Duration,
 }
diff --git a/src/main.rs b/src/main.rs
index 46297f205..9d812b34b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -35,19 +35,20 @@ fn main() {
 
     let sys = System::new("medea");
 
+    let config = Conf::parse().unwrap();
+
+    info!("{:?}", config);
+
     let members = hashmap! {
         1 => Member{id: 1, credentials: "caller_credentials".to_owned()},
         2 => Member{id: 2, credentials: "responder_credentials".to_owned()},
     };
     let peers = create_peers(1, 2);
-    let room = Arbiter::start(move |_| Room::new(1, members, peers));
+    let room = Room::new(1, members, peers, config.rpc.reconnect_timeout);
+    let room = Arbiter::start(move |_| room);
     let rooms = hashmap! {1 => room};
     let rooms_repo = RoomsRepository::new(rooms);
 
-    let config = Conf::parse().unwrap();
-
-    info!("{:?}", config);
-
     server::run(rooms_repo, config);
     let _ = sys.run();
 }

From b74656fa0a311cfda238c315411e93f75479ec55 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 10 Apr 2019 15:54:24 +0300
Subject: [PATCH 098/179] properly pass medea events to session

---
 jason/e2e/js/index.js           |   1 -
 jason/src/lib.rs                | 142 +++++++++++++++++++++-----------
 jason/src/transport/mod.rs      |   2 +-
 jason/src/transport/protocol.rs |  16 ++--
 4 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
index 4653f070e..00f855cd4 100644
--- a/jason/e2e/js/index.js
+++ b/jason/e2e/js/index.js
@@ -8,7 +8,6 @@ async function f() {
     let responder = new rust.Jason();
 
     responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
-
 }
 
 f();
\ No newline at end of file
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index df893feae..31bc50a3c 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,13 +1,17 @@
 use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
-use web_sys::{console};
+use web_sys::console;
 use wasm_bindgen::prelude::*;
 
 mod transport;
 mod utils;
 
-use transport::{protocol::Event as MedeaEvent, Transport};
+use transport::{protocol::Event as MedeaEvent, Transport, protocol::DirectionalTrack};
 use futures::stream::Stream;
 
+use wasm_bindgen_futures::spawn_local;
+use std::rc::Rc;
+use std::cell::RefCell;
+
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
 // we will get better error messages if our code ever panics.
@@ -16,9 +20,7 @@ use futures::stream::Stream;
 // https://github.com/rustwasm/console_error_panic_hook#readme
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
-use wasm_bindgen_futures::spawn_local;
-use crate::transport::protocol::DirectionalTrack;
-use std::rc::Rc;
+
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
@@ -28,72 +30,120 @@ static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
 #[wasm_bindgen]
 pub struct Jason {
-    //TODO: multiple session will require some kind of TransportManager
-    transport: Option<Transport>,
+    transport: Option<Rc<Transport>>,
+    sessions: Vec<Rc<Session>>,
 }
 
 #[wasm_bindgen]
-pub struct SessionHandler {
-    transport: Rc<Option<Transport>>,
-    tx: UnboundedSender<MedeaEvent>,
-    rx: UnboundedReceiver<MedeaEvent>,
-}
+impl Jason {
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> Self {
+        set_panic_hook();
+        Self {
+            transport: None,
+            sessions: vec![],
+        }
+    }
 
-impl SessionHandler {
-    fn new() -> SessionHandler {
-        let (tx, rx) = unbounded();
+    pub fn init_session(&mut self, token: String) -> SessionHandle {
+        let mut transport = Transport::new(token, 3000);
+        transport.init();
+        let transport = Rc::new(transport);
+
+        let session = Session::new(Rc::clone(&transport));
+        session.subscribe(&transport);
+
+        let handle = session.new_handle();
 
-        SessionHandler { transport: Rc::new(None), tx, rx }
+        self.sessions.push(Rc::new(session));
+        self.transport = Some(transport);
+
+        handle
     }
 }
 
-struct InnerSession {
-
+#[wasm_bindgen]
+pub struct SessionHandle {
+    inner: Session
 }
 
 #[wasm_bindgen]
-impl Jason {
-    #[wasm_bindgen(constructor)]
-    pub fn new() -> Self {
-        set_panic_hook();
-        Self { transport: None }
-    }
+impl SessionHandle {}
 
-    pub fn init_session(&mut self, token: String) {
-        let mut transport = Transport::new(token, 3000);
-        transport.init();
+struct Session(Rc<RefCell<InnerSession>>);
 
-        let handler = SessionHandler::new();
+impl Session {
+    fn new(transport: Rc<Transport>) -> Self {
+        Self {
+            0: InnerSession::new(transport)
+        }
+    }
 
-        transport.add_sub(handler.tx.clone());
+    fn new_handle(&self) -> SessionHandle {
+        SessionHandle {
+            inner: Session { 0: Rc::clone(&self.0) }
+        }
+    }
 
-        let poll = handler.rx.for_each(|event| {
-            console::log(&js_sys::Array::from(&JsValue::from_str(&format!("{:?}", event))));
-            match event {
-                MedeaEvent::PeerCreated {        peer_id,sdp_offer,tracks} => {
-//                    &self.on_peer_created(peer_id, sdp_offer, tracks);
-                },
-                MedeaEvent::SdpAnswerMade {peer_id, sdp_answer} => {
+    fn subscribe(&self, transport: &Transport) {
 
-                },
-                MedeaEvent::IceCandidateDiscovered {peer_id, candidate} => {
+        let mut inner = self.0.borrow_mut();
 
-                },
-                MedeaEvent::PeersRemoved {peer_ids} => {
+        transport.add_sub(inner.tx.clone());
 
-                },
+        let rx = inner.rx.take().unwrap();
+
+        let inner = Rc::clone(&self.0);
+        let poll = rx.for_each(move |event| {
+            match event {
+                MedeaEvent::PeerCreated { peer_id, sdp_offer, tracks } => {
+                    inner.borrow_mut().on_peer_created(peer_id, sdp_offer, tracks);
+                }
+                MedeaEvent::SdpAnswerMade { peer_id, sdp_answer } => {
+                    inner.borrow_mut().on_sdp_answer(peer_id, sdp_answer);
+                }
+                MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
+                    inner.borrow_mut().on_ice_candidate_discovered(peer_id, candidate);
+                }
+                MedeaEvent::PeersRemoved { peer_ids } => {
+                    inner.borrow_mut().on_peers_removed(peer_ids);
+                }
             };
 
             Ok(())
         });
 
         spawn_local(poll);
+    }
+}
 
-        self.transport = Some(transport);
+struct InnerSession {
+    transport: Rc<Transport>,
+    tx: UnboundedSender<MedeaEvent>,
+    rx: Option<UnboundedReceiver<MedeaEvent>>,
+}
+
+impl InnerSession {
+    fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
+        let (tx, rx) = unbounded();
+
+        Rc::new(RefCell::new(Self {
+            transport,
+            tx,
+            rx: Some(rx),
+        }))
     }
 
-    fn on_peer_created(&self, peer_id: u64, sdp_offer: Option<String>, tracks: Vec<DirectionalTrack>) {}
-//    fn on_sdp_answer() {}
-//    fn on_ice_candidate_discovered() {}
-//    fn peers_removed() {}
+    fn on_peer_created(&mut self, peer_id: u64, sdp_offer: Option<String>, tracks: Vec<DirectionalTrack>) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_peer_created invoked")));
+    }
+    fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_sdp_answer invoked")));
+    }
+    fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_ice_candidate_discovered invoked")));
+    }
+    fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_peers_removed invoked")));
+    }
 }
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 8ecce3be2..2fc465fdc 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -106,7 +106,7 @@ impl Transport {
         self.sock = socket
     }
 
-    pub fn add_sub(&mut self, sub: UnboundedSender<MedeaEvent>) {
+    pub fn add_sub(&self, sub: UnboundedSender<MedeaEvent>) {
         self.subs.borrow_mut().push(sub);
     }
 
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 0cbdceb29..a41e25154 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 
-// TODO: move protocol to crate?
+// TODO: just copied from Medea crate, needs refactoring to properly share protocol messages between crates
 #[derive(Deserialize, Serialize)]
 pub enum Heartbeat {
     /// `ping` message that WebSocket client is expected to send to the server
@@ -26,7 +26,7 @@ pub enum Command {
 }
 
 /// WebSocket message from Medea to Jason.
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
@@ -55,7 +55,7 @@ pub enum Event {
 }
 
 /// [`Track] with specified direction.
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize)]
 pub struct DirectionalTrack {
     pub id: u64,
     pub direction: TrackDirection,
@@ -63,21 +63,21 @@ pub struct DirectionalTrack {
 }
 
 /// Direction of [`Track`].
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize)]
 pub enum TrackDirection {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
 }
 
 /// Type of [`Track`].
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize)]
 pub enum TrackMediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize)]
 pub struct AudioSettings {}
 
-#[derive(Deserialize, Debug)]
-pub struct VideoSettings {}
\ No newline at end of file
+#[derive(Deserialize)]
+pub struct VideoSettings {}

From 3db478c5fac01e9a00e2970b7129dfb7b6ae5538 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 10 Apr 2019 17:46:29 +0300
Subject: [PATCH 099/179] fix merge

---
 Cargo.lock                  | 1013 +++++----
 Cargo.toml                  |    1 -
 jason/Cargo.toml            |    1 -
 jason/e2e-demo/js/index.js  |   18 +-
 jason/e2e/.gitignore        |    7 -
 jason/e2e/README.md         |    6 -
 jason/e2e/index.html        |   10 -
 jason/e2e/js/index.js       |   13 -
 jason/e2e/package.json      |   18 -
 jason/e2e/webpack.config.js |   27 -
 jason/e2e/yarn.lock         | 4112 -----------------------------------
 11 files changed, 577 insertions(+), 4649 deletions(-)
 delete mode 100644 jason/e2e/.gitignore
 delete mode 100644 jason/e2e/README.md
 delete mode 100644 jason/e2e/index.html
 delete mode 100644 jason/e2e/js/index.js
 delete mode 100644 jason/e2e/package.json
 delete mode 100644 jason/e2e/webpack.config.js
 delete mode 100644 jason/e2e/yarn.lock

diff --git a/Cargo.lock b/Cargo.lock
index fc90dbea5..f94c6f7b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,3 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
 [[package]]
 name = "actix"
 version = "0.7.9"
@@ -7,26 +5,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-signal 0.2.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-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -35,73 +33,73 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (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-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "actix-web"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (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-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -110,9 +108,9 @@ name = "actix_derive"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -130,16 +128,25 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.6.9"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "arc-swap"
-version = "0.3.7"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "argon2rs"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "arrayvec"
@@ -154,9 +161,9 @@ name = "atty"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -166,15 +173,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "backtrace"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -182,8 +189,8 @@ name = "backtrace-sys"
 version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -191,16 +198,16 @@ name = "base64"
 version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "base64"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -208,13 +215,22 @@ name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "blake2-rfc"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "brotli-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -223,7 +239,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -238,26 +254,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "byteorder"
-version = "1.2.7"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bytes"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.28"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -283,12 +299,12 @@ name = "config"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -298,10 +314,15 @@ name = "console_error_panic_hook"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "constant_time_eq"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "cookie"
 version = "0.11.0"
@@ -323,10 +344,10 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.1.2"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -339,25 +360,23 @@ name = "crossbeam"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -365,29 +384,57 @@ name = "crossbeam-deque"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "dirs"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -396,8 +443,8 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -470,7 +517,7 @@ dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -479,7 +526,7 @@ name = "error-chain"
 version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -487,7 +534,7 @@ name = "failure"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -496,21 +543,21 @@ name = "failure_derive"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -518,6 +565,11 @@ name = "fnv"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "fuchsia-zircon"
 version = "0.3.3"
@@ -534,7 +586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -542,25 +594,25 @@ name = "futures-cpupool"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "h2"
-version = "0.1.15"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -568,7 +620,7 @@ name = "hashbrown"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -585,16 +637,16 @@ name = "hostname"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "http"
-version = "0.1.14"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -619,7 +671,7 @@ 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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -632,7 +684,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -644,7 +696,7 @@ dependencies = [
  "error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winreg 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -653,10 +705,10 @@ name = "isatty"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -669,8 +721,12 @@ name = "jason"
 version = "0.1.0-dev"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -705,7 +761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "lazy_static"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -715,7 +771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.47"
+version = "0.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -729,7 +785,7 @@ dependencies = [
 
 [[package]]
 name = "linked-hash-map"
-version = "0.4.2"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -754,15 +810,15 @@ name = "log"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "lru-cache"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -775,17 +831,17 @@ name = "medea"
 version = "0.1.0-dev"
 dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -803,17 +859,13 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "memoffset"
@@ -830,7 +882,7 @@ name = "mime"
 version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -849,13 +901,13 @@ name = "miniz-sys"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -863,13 +915,13 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide_c_api"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
  "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -882,7 +934,7 @@ dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (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)",
@@ -896,7 +948,7 @@ version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -916,9 +968,9 @@ name = "net2"
 version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -928,10 +980,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "nom"
-version = "4.1.1"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -957,10 +1010,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "num_cpus"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -985,11 +1038,11 @@ name = "parking_lot_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1020,7 +1073,7 @@ version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1034,7 +1087,7 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.25"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1047,39 +1100,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "quote"
-version = "0.6.10"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.5.5"
+version = "0.5.6"
 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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (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.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (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.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (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_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_jitter 0.1.3 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1088,20 +1142,20 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_core"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1109,7 +1163,7 @@ name = "rand_hc"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1117,29 +1171,39 @@ name = "rand_isaac"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_os"
-version = "0.1.1"
+version = "0.1.3"
 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-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.3.0 (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.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rand_pcg"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1147,7 +1211,7 @@ name = "rand_xorshift"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1155,12 +1219,12 @@ name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.50"
+version = "0.1.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1168,7 +1232,18 @@ name = "redox_termios"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1185,12 +1260,12 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.1.0"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1202,7 +1277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.4"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1222,9 +1297,9 @@ name = "ring"
 version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1261,6 +1336,11 @@ name = "scoped-tls"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "scoped_threadpool"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "scopeguard"
 version = "0.3.3"
@@ -1286,10 +1366,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.84"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1300,7 +1380,7 @@ dependencies = [
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1310,27 +1390,27 @@ version = "0.1.1"
 source = "git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper#36b86d5ca09db3caf2edb06e0d46b505d0915792"
 dependencies = [
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.87"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.36"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1348,7 +1428,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1357,7 +1437,7 @@ name = "serial_test"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1365,8 +1445,8 @@ name = "serial_test_derive"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1376,11 +1456,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "signal-hook"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arc-swap 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1428,8 +1508,8 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1439,7 +1519,7 @@ version = "4.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1462,26 +1542,23 @@ dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "smallvec"
-version = "0.6.7"
+version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "smart-default"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1489,10 +1566,10 @@ name = "socket2"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1512,11 +1589,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.15.26"
+version = "0.15.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1525,9 +1602,9 @@ name = "synstructure"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1538,11 +1615,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "term"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1558,8 +1636,8 @@ name = "termion"
 version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1569,7 +1647,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1585,7 +1663,7 @@ name = "thread_local"
 version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1593,29 +1671,31 @@ name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.1.14"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.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-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (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.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.4 (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.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1625,64 +1705,65 @@ name = "tokio-codec"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-current-thread"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-executor"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-fs"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (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.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-io"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-reactor"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1690,15 +1771,24 @@ name = "tokio-signal"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-sync"
+version = "0.1.4"
+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.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1706,38 +1796,47 @@ name = "tokio-tcp"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.10"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio-timer"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tokio-trace-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1745,13 +1844,13 @@ name = "tokio-udp"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1759,16 +1858,16 @@ name = "tokio-uds"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (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.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (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.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1776,7 +1875,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1784,7 +1883,7 @@ name = "tower-service"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1792,63 +1891,63 @@ name = "trust-dns-proto"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "trust-dns-proto"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "trust-dns-resolver"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1866,7 +1965,7 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.2.0"
+version = "2.3.0"
 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)",
@@ -1882,8 +1981,11 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "unicode-segmentation"
@@ -1931,40 +2033,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "uuid"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "v_escape"
-version = "0.3.2"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape_derive 0.5.3 (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 = "v_escape_derive"
-version = "0.2.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "v_htmlescape"
-version = "0.3.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1982,6 +2083,8 @@ name = "wasm-bindgen"
 version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1991,11 +2094,11 @@ version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2004,7 +2107,7 @@ name = "wasm-bindgen-futures"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2014,7 +2117,7 @@ name = "wasm-bindgen-macro"
 version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2023,9 +2126,9 @@ name = "wasm-bindgen-macro-support"
 version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2041,7 +2144,7 @@ version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2054,8 +2157,8 @@ name = "wasm-bindgen-test-macro"
 version = "0.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2066,9 +2169,9 @@ dependencies = [
  "failure 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2091,11 +2194,11 @@ name = "wee_alloc"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2103,7 +2206,7 @@ name = "weedle"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2118,7 +2221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "winapi"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2140,7 +2243,7 @@ name = "winapi-util"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2153,7 +2256,7 @@ name = "wincolor"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2162,7 +2265,7 @@ name = "winreg"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2170,7 +2273,7 @@ name = "winutil"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2187,47 +2290,53 @@ name = "yaml-rust"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
-"checksum actix-web 0.7.18 (registry+https://github.com/rust-lang/crates.io-index)" = "e9f33c941e5e69a58a6bfef33853228042ed3799fc4b5a4923a36a85776fb690"
+"checksum actix-web 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b0ac60f86c65a50b140139f499f4f7c6e49e4b5d88fbfba08e4e3975991f7bf4"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
 "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-"checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
-"checksum arc-swap 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
+"checksum arc-swap 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcee9b73d8a058eebb0b567fd3687f6761fb232049f92c23bdd2c82b6fe0c0cc"
+"checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799"
-"checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5"
+"checksum backtrace 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f106c02a3604afcdc0df5d36cc47b44b55917dbaf3d808f71c163a0ddba64637"
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
-"checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
+"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 bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
 "checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
-"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
-"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
-"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
-"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
+"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
 "checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
+"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
 "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
 "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
-"checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
-"checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
+"checksum crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
-"checksum crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f10a4f8f409aaac4b16a5474fb233624238fcdeefb9ba50d5ea059aab63ba31c"
-"checksum crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "41ee4864f4797060e52044376f7d107429ce1fb43460021b126424b7180ee21a"
+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
+"checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+"checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
+"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
 "checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
@@ -2241,17 +2350,18 @@ dependencies = [
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
-"checksum flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2291c165c8e703ee54ef3055ad6188e3d51108e2ded18e9f2476e774fc5ad3d4"
+"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
+"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.25 (registry+https://github.com/rust-lang/crates.io-index)" = "49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b"
+"checksum futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "62941eff9507c8177d448bd83a44d9b9760856e184081d8cd79ba9f03dd24981"
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
-"checksum h2 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "30e0b8e55b4d7ffedade2b9605851f8e85f5010663e7ad170ef3c0f0681bc43f"
+"checksum h2 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "85ab6286db06040ddefb71641b50017c06874614001a134b423783e2db2920bd"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
-"checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
+"checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
 "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
 "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
@@ -2264,35 +2374,35 @@ dependencies = [
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
-"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
+"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "48450664a984b25d5b479554c29cc04e3150c97aa4c01da5604a2d4ed9151476"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
-"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
+"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
-"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
+"checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-"checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8"
+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
 "checksum memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
 "checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
 "checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
-"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
-"checksum miniz_oxide_c_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "28edaef377517fd9fe3e085c37d892ce7acd1fbeab9239c5a36eec352d8a8b7e"
+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e"
+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab"
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
-"checksum nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
 "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
-"checksum num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5a69d464bdc213aaaff628444e99578ede64e9c854025aa43b9796530afa9238"
+"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
@@ -2301,26 +2411,28 @@ dependencies = [
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum proc-macro2 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "d3797b7142c9aa74954e351fc089bbee7958cebbff6bf2815e7ffff0b19f547d"
+"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
-"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
-"checksum rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3906503e80ac6cbcacb2c2973fa8e473f24d7e2747c8c92bb230c2441cad96b5"
+"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
-"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
-"checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_os 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f46fbd5550acf75b0c2730f5dd1873751daf9beb8f11b44027778fae50d7feca"
-"checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
+"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
+"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.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
+"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
+"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-"checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
@@ -2329,21 +2441,22 @@ dependencies = [
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
+"checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
+"checksum serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "aa5f7c20820475babd2c077c3ab5f8c77a31c15e16ea38687b4c02d3e48680f4"
 "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
 "checksum serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)" = "<none>"
-"checksum serde_derive 1.0.87 (registry+https://github.com/rust-lang/crates.io-index)" = "633e97856567e518b59ffb2ad7c7a4fd4c5d91d9c7f32dd38a27b2bf7e8114ea"
-"checksum serde_json 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "574378d957d6dcdf1bbb5d562a15cbd5e644159432f84634b94e485267abbcc7"
+"checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79"
+"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
 "checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
 "checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum signal-hook 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1f272d1b7586bec132ed427f532dd418d8beca1ca7f2caf7df35569b1415a4b4"
+"checksum signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "97a47ae722318beceb0294e6f3d601205a1e6abaa4437d9d33e3a212233e3021"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
@@ -2353,45 +2466,47 @@ dependencies = [
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
 "checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
-"checksum smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b73ea3738b47563803ef814925e69be00799a8c07420be8b996f8e98fb2336db"
+"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
 "checksum smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fae090012788f95156fc33f43631242480f311cca6bf7f600943eba14ae032ed"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
-"checksum syn 0.15.26 (registry+https://github.com/rust-lang/crates.io-index)" = "f92e629aa1d9c827b2bb8297046c1ccffc57c99b947a680d3ccff1f136a3bee9"
+"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
-"checksum term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561"
+"checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
+"checksum tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "65641e515a437b308ab131a82ce3042ff9795bef5d6c5a9be4eb24195c417fd9"
 "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
-"checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
-"checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
-"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
-"checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
-"checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
+"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443"
+"checksum tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
+"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.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
 "checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
+"checksum tokio-sync 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fda385df506bf7546e70872767f71e81640f1f251bdf2fd8eb81a0eaec5fe022"
 "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
-"checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
+"checksum tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ec5759cf26cf9659555f36c431b515e3d05f66831741c85b4b5d5dfb9cf1323c"
+"checksum tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6"
+"checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
 "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
 "checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
-"checksum trust-dns-proto 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "30dde452f5d142d5e316a3b32386da95280c98b7e266639f8f3bc6fdf507d279"
-"checksum trust-dns-resolver 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "de630f95a192f793436ffae5137e88253cc4142a97d9a8e73c8d804fa85ddf0a"
+"checksum trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09144f0992b0870fa8d2972cc069cbf1e3c0fda64d1f3d45c4d68d0e0b52ad4e"
+"checksum trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a9f877f7a1ad821ab350505e1f1b146a4960402991787191d6d8cab2ce2de2c"
 "checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-"checksum unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d3218ea14b4edcaccfa0df0a64a3792a2c32cc706f1b336e48867f9d3147f90"
+"checksum unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
+"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426"
 "checksum unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
@@ -2399,10 +2514,10 @@ dependencies = [
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
 "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
-"checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
-"checksum v_escape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c8b50688edb86f4c092a1a9fe8bda004b0faa3197100897653809e97e09a2814"
-"checksum v_escape_derive 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7cd994c63b487fef7aad31e5394ec04b9e24de7b32ea5251c9fb499cd2cbf44c"
-"checksum v_htmlescape 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "020cae817dc82693aa523f01087b291b1c7a9ac8cea5c12297963f21769fb27f"
+"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a"
+"checksum v_escape 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8865501b78eef9193c1b45486acf18ba889e5662eba98854d6fc59d8ecf3542d"
+"checksum v_escape_derive 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "306896ff4b75998501263a1dc000456de442e21d68fe8c8bdf75c66a33a58e23"
+"checksum v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7fbbe0fa88dd36f9c8cf61a218d4b953ba669de4d0785832f33cc72bd081e1be"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
@@ -2419,7 +2534,7 @@ dependencies = [
 "checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
diff --git a/Cargo.toml b/Cargo.toml
index 75f7af630..d18c3581c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,4 +44,3 @@ toml = "0.4"
 [dev-dependencies]
 serial_test = "0.2"
 serial_test_derive = "0.2"
-tokio = "0.1"
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 116b9a1d0..8ad32edec 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -19,7 +19,6 @@ default = ["console_error_panic_hook", "wee_alloc"]
 
 [dependencies]
 console_error_panic_hook = { version = "0.1", optional = true }
-js-sys = "0.3"
 futures = "0.1"
 js-sys = "0.3"
 serde = { version = "1.0", features = ["derive"] }
diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index a3910a5c2..414dd20b3 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -1,5 +1,13 @@
-import("../../pkg").then(rust => {
-  let jason = new rust.Jason("ws://localhost:8080/ws/1/1/caller_credentials");
-  console.log(jason.get_token());
-  jason.init_socket();
-});
+async function f() {
+  const rust = await import("../../pkg");
+
+  let caller = new rust.Jason();
+
+  caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+
+  let responder = new rust.Jason();
+
+  responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
+}
+
+f();
\ No newline at end of file
diff --git a/jason/e2e/.gitignore b/jason/e2e/.gitignore
deleted file mode 100644
index fb2b75740..000000000
--- a/jason/e2e/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-dist
-node_modules
-crate/bin
-crate/pkg
-crate/target
-crate/wasm-pack.log
-crate/Cargo.lock
diff --git a/jason/e2e/README.md b/jason/e2e/README.md
deleted file mode 100644
index d57d3354a..000000000
--- a/jason/e2e/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-e2e application
-=====
-
-Supposed to be used as demo and for manual testing.
-
-__DEVELOPMENT IN PROGRESS__
diff --git a/jason/e2e/index.html b/jason/e2e/index.html
deleted file mode 100644
index 2420b8454..000000000
--- a/jason/e2e/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-    <title>My awesome Rust, WebAssembly, and Webpack application</title>
-  </head>
-  <body>
-  </body>
-</html>
-
diff --git a/jason/e2e/js/index.js b/jason/e2e/js/index.js
deleted file mode 100644
index 00f855cd4..000000000
--- a/jason/e2e/js/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-async function f() {
-    const rust = await import("../../pkg");
-
-    let caller = new rust.Jason();
-
-    caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
-
-    let responder = new rust.Jason();
-
-    responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
-}
-
-f();
\ No newline at end of file
diff --git a/jason/e2e/package.json b/jason/e2e/package.json
deleted file mode 100644
index 400d8dfee..000000000
--- a/jason/e2e/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "author": "Nick Fitzgerald <nfitzgerald@mozilla.com>",
-  "name": "create-rust-webpack",
-  "version": "0.1.5",
-  "repository": "https://github.com/rustwasm/rust-webpack-template",
-  "license": "(MIT OR Apache-2.0)",
-  "scripts": {
-    "start": "webpack-dev-server -d --open --port 8081",
-    "build": "webpack"
-  },
-  "devDependencies": {
-    "@wasm-tool/wasm-pack-plugin": "0.2.7",
-    "html-webpack-plugin": "^3.2.0",
-    "webpack": "^4.29.6",
-    "webpack-cli": "^3.3.0",
-    "webpack-dev-server": "^3.2.1"
-  }
-}
diff --git a/jason/e2e/webpack.config.js b/jason/e2e/webpack.config.js
deleted file mode 100644
index faf5773ea..000000000
--- a/jason/e2e/webpack.config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const path = require("path");
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-
-const dist = path.resolve(__dirname, "dist");
-const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
-
-module.exports = {
-  entry: "./js/index.js",
-  output: {
-    path: dist,
-    filename: "bundle.js"
-  },
-  devServer: {
-    contentBase: dist,
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: 'index.html'
-    }),
-
-    new WasmPackPlugin({
-      crateDirectory: path.resolve(__dirname, "../"),
-      // WasmPackPlugin defaults to compiling in "dev" profile. To change that, use forceMode: 'release':
-      // forceMode: 'release'
-    }),
-  ]
-};
diff --git a/jason/e2e/yarn.lock b/jason/e2e/yarn.lock
deleted file mode 100644
index 8c2e3cf62..000000000
--- a/jason/e2e/yarn.lock
+++ /dev/null
@@ -1,4112 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-"@wasm-tool/wasm-pack-plugin@0.2.7":
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/@wasm-tool/wasm-pack-plugin/-/wasm-pack-plugin-0.2.7.tgz#116189b57b952de06b8080b0541b860c8eb8824f"
-  integrity sha512-B6YgQIBUMY2E/Xye8y1O3uTOSttP/i3oi+f/2LlwLzAnxJL1qJnzsV+eUne1mjPVFSppONt8ZMVQWXIB3Y4MHA==
-  dependencies:
-    chalk "^2.4.1"
-    command-exists "^1.2.7"
-    watchpack "^1.6.0"
-
-"@webassemblyjs/ast@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
-  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
-  dependencies:
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-
-"@webassemblyjs/floating-point-hex-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
-  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-
-"@webassemblyjs/helper-api-error@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
-  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-
-"@webassemblyjs/helper-buffer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
-  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
-
-"@webassemblyjs/helper-code-frame@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
-  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
-  dependencies:
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/helper-fsm@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
-  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-
-"@webassemblyjs/helper-module-context@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
-  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    mamacro "^0.0.3"
-
-"@webassemblyjs/helper-wasm-bytecode@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
-  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-
-"@webassemblyjs/helper-wasm-section@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
-  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-
-"@webassemblyjs/ieee754@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
-  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
-  dependencies:
-    "@xtuc/ieee754" "^1.2.0"
-
-"@webassemblyjs/leb128@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
-  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
-  dependencies:
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/utf8@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
-  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-
-"@webassemblyjs/wasm-edit@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
-  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/helper-wasm-section" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-opt" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    "@webassemblyjs/wast-printer" "1.8.5"
-
-"@webassemblyjs/wasm-gen@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
-  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wasm-opt@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
-  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-buffer" "1.8.5"
-    "@webassemblyjs/wasm-gen" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-
-"@webassemblyjs/wasm-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
-  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
-    "@webassemblyjs/ieee754" "1.8.5"
-    "@webassemblyjs/leb128" "1.8.5"
-    "@webassemblyjs/utf8" "1.8.5"
-
-"@webassemblyjs/wast-parser@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
-  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
-    "@webassemblyjs/helper-api-error" "1.8.5"
-    "@webassemblyjs/helper-code-frame" "1.8.5"
-    "@webassemblyjs/helper-fsm" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@webassemblyjs/wast-printer@1.8.5":
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
-  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/wast-parser" "1.8.5"
-    "@xtuc/long" "4.2.2"
-
-"@xtuc/ieee754@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
-  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-
-"@xtuc/long@4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
-  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-accepts@~1.3.4, accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
-  dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
-
-acorn-dynamic-import@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-
-acorn@^6.0.5:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
-  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
-
-ajv-errors@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
-  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-
-ajv-keywords@^3.1.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
-  integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
-
-ajv@^6.1.0:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
-  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
-  dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ansi-colors@^3.0.0:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
-  integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-
-ansi-html@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
-  dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-aproba@^1.0.3, aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-
-array-flatten@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
-  integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-asn1.js@^4.0.0:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
-  dependencies:
-    util "0.10.3"
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-
-async-each@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735"
-  integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg==
-
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-atob@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
-
-base64-js@^1.0.2:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
-  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
-
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
-batch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
-
-bluebird@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
-  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
-
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
-  integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
-
-body-parser@1.18.3:
-  version "1.18.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
-  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "~1.6.3"
-    iconv-lite "0.4.23"
-    on-finished "~2.3.0"
-    qs "6.5.2"
-    raw-body "2.3.3"
-    type-is "~1.6.16"
-
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
-  dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
-    dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
-
-boolbase@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-brorand@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
-
-browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-rsa@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
-  integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
-  dependencies:
-    bn.js "^4.1.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
-  integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
-  dependencies:
-    bn.js "^4.1.1"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.2"
-    elliptic "^6.0.0"
-    inherits "^2.0.1"
-    parse-asn1 "^5.0.0"
-
-browserify-zlib@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
-  dependencies:
-    pako "~1.0.5"
-
-buffer-from@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
-  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
-
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
-
-buffer@^4.3.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-  integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
-
-cacache@^11.0.2:
-  version "11.3.2"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.2.tgz#2d81e308e3d258ca38125b676b98b2ac9ce69bfa"
-  integrity sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==
-  dependencies:
-    bluebird "^3.5.3"
-    chownr "^1.1.1"
-    figgy-pudding "^3.5.1"
-    glob "^7.1.3"
-    graceful-fs "^4.1.15"
-    lru-cache "^5.1.1"
-    mississippi "^3.0.0"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    promise-inflight "^1.0.1"
-    rimraf "^2.6.2"
-    ssri "^6.0.1"
-    unique-filename "^1.1.1"
-    y18n "^4.0.0"
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
-  dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-
-camelcase@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
-  integrity sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==
-
-chalk@^2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chokidar@^2.0.0, chokidar@^2.0.2:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
-  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
-  dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
-  optionalDependencies:
-    fsevents "^1.2.7"
-
-chownr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
-  integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
-
-chrome-trace-event@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
-  integrity sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==
-  dependencies:
-    tslib "^1.9.0"
-
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-clean-css@4.2.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
-  integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
-  dependencies:
-    source-map "~0.6.0"
-
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
-  dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
-command-exists@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
-  integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
-
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
-commander@^2.19.0, commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-compressible@~2.0.16:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.16.tgz#a49bf9858f3821b64ce1be0296afc7380466a77f"
-  integrity sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==
-  dependencies:
-    mime-db ">= 1.38.0 < 2"
-
-compression@^1.5.2:
-  version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
-  dependencies:
-    accepts "~1.3.5"
-    bytes "3.0.0"
-    compressible "~2.0.16"
-    debug "2.6.9"
-    on-headers "~1.0.2"
-    safe-buffer "5.1.2"
-    vary "~1.1.2"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-
-concat-stream@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-connect-history-api-fallback@^1.3.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
-  integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-  integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
-
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
-
-content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
-
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-
-create-ecdh@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
-  integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.0.0"
-
-create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
-css-select@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
-  integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
-  dependencies:
-    boolbase "~1.0.0"
-    css-what "2.1"
-    domutils "1.5.1"
-    nth-check "~1.0.1"
-
-css-what@2.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
-  integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
-
-cyclist@~0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-  integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-  integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
-
-debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
-  dependencies:
-    ms "2.0.0"
-
-debug@^3.2.5, debug@^3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decamelize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
-  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
-  dependencies:
-    xregexp "4.0.0"
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-deep-equal@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
-  integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
-default-gateway@^4.0.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
-  integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
-  dependencies:
-    execa "^1.0.0"
-    ip-regex "^2.1.0"
-
-define-properties@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
-
-del@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
-  dependencies:
-    globby "^6.1.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    p-map "^1.1.1"
-    pify "^3.0.0"
-    rimraf "^2.2.8"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-
-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
-
-des.js@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
-  integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
-detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
-
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
-dns-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
-
-dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
-  dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
-
-dom-converter@^0.2:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
-  integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
-  dependencies:
-    utila "~0.4"
-
-dom-serializer@0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
-  integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
-  dependencies:
-    domelementtype "^1.3.0"
-    entities "^1.1.1"
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-  integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-
-domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
-domutils@1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-
-elliptic@^6.0.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
-  integrity sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==
-  dependencies:
-    bn.js "^4.4.0"
-    brorand "^1.0.1"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.0"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
-
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
-  integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.4.0"
-    tapable "^1.0.0"
-
-entities@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
-errno@^0.1.3, errno@~0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
-  dependencies:
-    prr "~1.0.1"
-
-es-abstract@^1.5.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
-
-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-eslint-scope@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
-  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
-  dependencies:
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
-  dependencies:
-    estraverse "^4.1.0"
-
-estraverse@^4.1.0, estraverse@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-
-etag@~1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
-
-eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
-
-events@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
-  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
-
-eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
-  dependencies:
-    original "^1.0.0"
-
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-expand-tilde@^2.0.0, expand-tilde@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-
-express@^4.16.2:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.3"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
-    qs "6.5.2"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.2"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-fast-deep-equal@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
-  integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-
-faye-websocket@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-faye-websocket@~0.11.1:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
-  integrity sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=
-  dependencies:
-    websocket-driver ">=0.5.1"
-
-figgy-pudding@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
-  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
-    unpipe "~1.0.0"
-
-find-cache-dir@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
-  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^2.0.0"
-    pkg-dir "^3.0.0"
-
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-flush-write-stream@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-follow-redirects@^1.0.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
-  integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
-  dependencies:
-    debug "^3.2.6"
-
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
-
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
-
-from2@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
-fs-minipass@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
-  integrity sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==
-  dependencies:
-    minipass "^2.2.1"
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
-  dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fsevents@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
-  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
-  dependencies:
-    nan "^2.9.2"
-    node-pre-gyp "^0.10.0"
-
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
-
-get-stream@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob@^7.0.3, glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-global-modules@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
-  dependencies:
-    global-prefix "^1.0.1"
-    is-windows "^1.0.1"
-    resolve-dir "^1.0.0"
-
-global-prefix@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
-  dependencies:
-    expand-tilde "^2.0.2"
-    homedir-polyfill "^1.0.1"
-    ini "^1.3.4"
-    is-windows "^1.0.1"
-    which "^1.2.14"
-
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
-
-handle-thing@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
-  integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.1, has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-hash-base@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
-he@1.2.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
-hmac-drbg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
-
-homedir-polyfill@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
-  integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hpack.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
-  dependencies:
-    inherits "^2.0.1"
-    obuf "^1.0.0"
-    readable-stream "^2.0.1"
-    wbuf "^1.1.0"
-
-html-entities@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
-  integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
-
-html-minifier@^3.2.3:
-  version "3.5.21"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
-  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
-html-webpack-plugin@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
-  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
-  dependencies:
-    html-minifier "^3.2.3"
-    loader-utils "^0.2.16"
-    lodash "^4.17.3"
-    pretty-error "^2.0.2"
-    tapable "^1.0.0"
-    toposort "^1.0.0"
-    util.promisify "1.0.0"
-
-htmlparser2@^3.3.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
-http-deceiver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
-
-http-parser-js@>=0.4.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.0.tgz#d65edbede84349d0dc30320815a15d39cc3cbbd8"
-  integrity sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==
-
-http-proxy-middleware@^0.19.1:
-  version "0.19.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
-  integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
-  dependencies:
-    http-proxy "^1.17.0"
-    is-glob "^4.0.0"
-    lodash "^4.17.11"
-    micromatch "^3.1.10"
-
-http-proxy@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
-  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
-  dependencies:
-    eventemitter3 "^3.0.0"
-    follow-redirects "^1.0.0"
-    requires-port "^1.0.0"
-
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-  integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-
-iconv-lite@0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@^0.4.4:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
-
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
-ignore-walk@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
-  integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
-  dependencies:
-    minimatch "^3.0.4"
-
-import-local@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
-  integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
-  dependencies:
-    pkg-dir "^3.0.0"
-    resolve-cwd "^2.0.0"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-  integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-
-ini@^1.3.4, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
-
-internal-ip@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.2.0.tgz#46e81b638d84c338e5c67e42b1a17db67d0814fa"
-  integrity sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==
-  dependencies:
-    default-gateway "^4.0.1"
-    ipaddr.js "^1.9.0"
-
-interpret@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
-
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
-
-ipaddr.js@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
-
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
-is-extglob@^2.1.0, is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
-  integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
-  dependencies:
-    isobject "^3.0.1"
-
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
-  dependencies:
-    has "^1.0.1"
-
-is-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
-  dependencies:
-    has-symbols "^1.0.0"
-
-is-windows@^1.0.1, is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
-is-wsl@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
-
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-schema-traverse@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-
-json3@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-  integrity sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=
-
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
-  dependencies:
-    minimist "^1.2.0"
-
-killable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
-  integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
-loader-runner@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
-  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-
-loader-utils@^0.2.16:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-lodash@^4.17.11, lodash@^4.17.3:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-loglevel@^1.4.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
-  integrity sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-
-lru-cache@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
-  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
-  dependencies:
-    yallist "^3.0.2"
-
-make-dir@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
-
-mamacro@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
-  integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
-
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-
-mem@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.2.0.tgz#5ee057680ed9cb8dad8a78d820f9a8897a102025"
-  integrity sha512-5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
-memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
-
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
-"mime-db@>= 1.38.0 < 2", mime-db@~1.38.0:
-  version "1.38.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.38.0.tgz#1a2aab16da9eb167b49c6e4df2d9c68d63d8e2ad"
-  integrity sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==
-
-mime-types@~2.1.17, mime-types@~2.1.18:
-  version "2.1.22"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.22.tgz#fe6b355a190926ab7698c9a0556a11199b2199bd"
-  integrity sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==
-  dependencies:
-    mime-db "~1.38.0"
-
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
-
-mime@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
-
-mimic-fn@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.0.0.tgz#0913ff0b121db44ef5848242c38bbb35d44cabde"
-  integrity sha512-jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA==
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
-  integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
-
-minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-
-minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-  integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
-
-minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minipass@^2.2.1, minipass@^2.3.4:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
-minizlib@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
-  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
-  dependencies:
-    minipass "^2.2.1"
-
-mississippi@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
-  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
-  dependencies:
-    concat-stream "^1.5.0"
-    duplexify "^3.4.2"
-    end-of-stream "^1.1.0"
-    flush-write-stream "^1.0.0"
-    from2 "^2.1.0"
-    parallel-transform "^1.1.0"
-    pump "^3.0.0"
-    pumpify "^1.3.3"
-    stream-each "^1.1.0"
-    through2 "^2.0.0"
-
-mixin-deep@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
-  integrity sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
-  dependencies:
-    minimist "0.0.8"
-
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
-
-ms@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
-
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
-  dependencies:
-    dns-packet "^1.3.1"
-    thunky "^1.0.2"
-
-nan@^2.9.2:
-  version "2.13.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
-  integrity sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-needle@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
-  integrity sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==
-  dependencies:
-    debug "^2.1.2"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
-
-neo-async@^2.5.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
-  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
-  dependencies:
-    lower-case "^1.1.1"
-
-node-forge@0.7.5:
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-  integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
-
-node-libs-browser@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
-  integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.2.0"
-    buffer "^4.3.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "^3.11.0"
-    domain-browser "^1.1.1"
-    events "^3.0.0"
-    https-browserify "^1.0.0"
-    os-browserify "^0.3.0"
-    path-browserify "0.0.0"
-    process "^0.11.10"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.3.3"
-    stream-browserify "^2.0.1"
-    stream-http "^2.7.2"
-    string_decoder "^1.0.0"
-    timers-browserify "^2.0.4"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.11.0"
-    vm-browserify "0.0.4"
-
-node-pre-gyp@^0.10.0:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
-  integrity sha512-d1xFs+C/IPS8Id0qPTZ4bUT8wWryfR/OzzAFxweG+uLN85oPzyo2Iw6bVlLQ/JOdgNonXLCoRyqDzDWq4iw72A==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-
-npm-bundled@^1.0.1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
-  integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
-
-npm-packlist@^1.1.6:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz#19064cdf988da80ea3cee45533879d90192bbfbc"
-  integrity sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
-  dependencies:
-    path-key "^2.0.0"
-
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-nth-check@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
-  dependencies:
-    boolbase "~1.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
-
-object-keys@^1.0.12:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
-
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-obuf@^1.0.0, obuf@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-  integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
-  dependencies:
-    ee-first "1.1.1"
-
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
-
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
-  dependencies:
-    wrappy "1"
-
-opn@^5.1.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
-  integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
-  dependencies:
-    is-wsl "^1.1.0"
-
-original@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
-  integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
-  dependencies:
-    url-parse "^1.4.3"
-
-os-browserify@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-  integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-
-os-locale@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
-os-tmpdir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
-
-p-finally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
-
-p-is-promise@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.0.0.tgz#7554e3d572109a87e1f3f53f6a7d85d1b194f4c5"
-  integrity sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==
-
-p-limit@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
-  integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
-  dependencies:
-    p-try "^2.0.0"
-
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
-
-p-try@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.1.0.tgz#c1a0f1030e97de018bb2c718929d2af59463e505"
-  integrity sha512-H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA==
-
-pako@~1.0.5:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
-  integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
-
-parallel-transform@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
-  integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
-  dependencies:
-    cyclist "~0.2.2"
-    inherits "^2.0.3"
-    readable-stream "^2.1.5"
-
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
-  dependencies:
-    no-case "^2.2.0"
-
-parse-asn1@^5.0.0:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
-  integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
-  dependencies:
-    asn1.js "^4.0.0"
-    browserify-aes "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.0"
-    pbkdf2 "^3.0.3"
-    safe-buffer "^5.1.1"
-
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-  integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
-
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
-
-pbkdf2@^3.0.3:
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
-  integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
-
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
-pkg-dir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
-  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
-  dependencies:
-    find-up "^3.0.0"
-
-portfinder@^1.0.9:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
-  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
-pretty-error@^2.0.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
-  integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
-  dependencies:
-    renderkid "^2.0.1"
-    utila "~0.4"
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
-
-process@^0.11.10:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-  integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-
-proxy-addr@~2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.3:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
-
-punycode@^1.2.4:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
-punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-qs@6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
-
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-
-querystringify@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
-  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
-range-parser@^1.0.3, range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
-
-raw-body@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.3"
-    iconv-lite "0.4.23"
-    unpipe "1.0.0"
-
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.6, readable-stream@^3.1.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.2.0.tgz#de17f229864c120a9f56945756e4f32c4045245d"
-  integrity sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
-  dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-renderkid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
-  integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
-  dependencies:
-    css-select "^1.1.0"
-    dom-converter "^0.2"
-    htmlparser2 "^3.3.0"
-    strip-ansi "^3.0.0"
-    utila "^0.4.0"
-
-repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-require-directory@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
-
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
-requires-port@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
-
-resolve-cwd@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
-  integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
-  dependencies:
-    resolve-from "^3.0.0"
-
-resolve-dir@^1.0.0, resolve-dir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
-  dependencies:
-    expand-tilde "^2.0.0"
-    global-modules "^1.0.0"
-
-resolve-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
-  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
-
-"safer-buffer@>= 2.1.2 < 3":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
-sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-
-schema-utils@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
-  integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
-  dependencies:
-    ajv "^6.1.0"
-    ajv-errors "^1.0.0"
-    ajv-keywords "^3.1.0"
-
-select-hose@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-
-selfsigned@^1.9.1:
-  version "1.10.4"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
-  integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
-  dependencies:
-    node-forge "0.7.5"
-
-semver@^5.3.0, semver@^5.5.0, semver@^5.6.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
-
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
-
-serialize-javascript@^1.4.0:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
-  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
-
-serve-index@^1.7.2:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
-  dependencies:
-    accepts "~1.3.4"
-    batch "0.6.1"
-    debug "2.6.9"
-    escape-html "~1.0.3"
-    http-errors "~1.6.2"
-    mime-types "~2.1.17"
-    parseurl "~1.3.2"
-
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
-
-set-blocking@^2.0.0, set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^0.4.3:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.1"
-    to-object-path "^0.3.0"
-
-set-value@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
-
-setimmediate@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
-
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
-  dependencies:
-    shebang-regex "^1.0.0"
-
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
-
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-sockjs-client@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
-  integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
-  dependencies:
-    debug "^3.2.5"
-    eventsource "^1.0.7"
-    faye-websocket "~0.11.1"
-    inherits "^2.0.3"
-    json3 "^3.3.2"
-    url-parse "^1.4.3"
-
-sockjs@0.3.19:
-  version "0.3.19"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
-  integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
-  dependencies:
-    faye-websocket "^0.10.0"
-    uuid "^3.0.1"
-
-source-list-map@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
-source-map-resolve@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
-  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
-  dependencies:
-    atob "^2.1.1"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-support@~0.5.10:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-url@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
-
-source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-
-spdy-transport@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
-  integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
-  dependencies:
-    debug "^4.1.0"
-    detect-node "^2.0.4"
-    hpack.js "^2.1.6"
-    obuf "^1.1.2"
-    readable-stream "^3.0.6"
-    wbuf "^1.7.3"
-
-spdy@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
-  integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
-  dependencies:
-    debug "^4.1.0"
-    handle-thing "^2.0.0"
-    http-deceiver "^1.2.7"
-    select-hose "^2.0.0"
-    spdy-transport "^3.0.0"
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
-ssri@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
-  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
-  dependencies:
-    figgy-pudding "^3.5.1"
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
-
-"statuses@>= 1.4.0 < 2":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stream-browserify@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
-  integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-each@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
-  integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    stream-shift "^1.0.0"
-
-stream-http@^2.7.2:
-  version "2.8.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
-  integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.6"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string_decoder@^1.0.0, string_decoder@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
-  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
-  dependencies:
-    safe-buffer "~5.1.0"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-supports-color@^5.3.0, supports-color@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
-tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
-  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
-
-tar@^4:
-  version "4.4.8"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
-  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.3.4"
-    minizlib "^1.1.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.2"
-
-terser-webpack-plugin@^1.1.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz#3f98bc902fac3e5d0de730869f50668561262ec8"
-  integrity sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==
-  dependencies:
-    cacache "^11.0.2"
-    find-cache-dir "^2.0.0"
-    schema-utils "^1.0.0"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    terser "^3.16.1"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
-terser@^3.16.1:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
-  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
-  dependencies:
-    commander "^2.19.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.10"
-
-through2@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-thunky@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
-  integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
-
-timers-browserify@^2.0.4:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
-  integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
-  dependencies:
-    setimmediate "^1.0.4"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-  integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-toposort@^1.0.0:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
-  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
-
-tslib@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-  integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
-
-type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.18"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
-
-union-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^0.4.3"
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.1.tgz#5e9edc6d1ce8fb264db18a507ef9bd8544451ca6"
-  integrity sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==
-  dependencies:
-    imurmurhash "^0.1.4"
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
-  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
-
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-
-uri-js@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
-  dependencies:
-    punycode "^2.1.0"
-
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse@^1.4.3:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
-  integrity sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==
-  dependencies:
-    querystringify "^2.0.0"
-    requires-port "^1.0.0"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-
-util-deprecate@^1.0.1, util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
-
-util.promisify@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
-  integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
-  dependencies:
-    define-properties "^1.1.2"
-    object.getownpropertydescriptors "^2.0.3"
-
-util@0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
-  dependencies:
-    inherits "2.0.1"
-
-util@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
-  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
-  dependencies:
-    inherits "2.0.3"
-
-utila@^0.4.0, utila@~0.4:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
-  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-uuid@^3.0.1, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
-v8-compile-cache@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
-  integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
-
-vary@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  integrity sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
-  dependencies:
-    indexof "0.0.1"
-
-watchpack@^1.5.0, watchpack@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
-  integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
-  dependencies:
-    chokidar "^2.0.2"
-    graceful-fs "^4.1.2"
-    neo-async "^2.5.0"
-
-wbuf@^1.1.0, wbuf@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
-  integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
-  dependencies:
-    minimalistic-assert "^1.0.0"
-
-webpack-cli@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.0.tgz#55c8a74cae1e88117f9dda3a801c7272e93ca318"
-  integrity sha512-t1M7G4z5FhHKJ92WRKwZ1rtvi7rHc0NZoZRbSkol0YKl4HvcC8+DsmGDmK7MmZxHSAetHagiOsjOB6MmzC2TUw==
-  dependencies:
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    enhanced-resolve "^4.1.0"
-    findup-sync "^2.0.0"
-    global-modules "^1.0.0"
-    import-local "^2.0.0"
-    interpret "^1.1.0"
-    loader-utils "^1.1.0"
-    supports-color "^5.5.0"
-    v8-compile-cache "^2.0.2"
-    yargs "^12.0.5"
-
-webpack-dev-middleware@^3.5.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.6.1.tgz#91f2531218a633a99189f7de36045a331a4b9cd4"
-  integrity sha512-XQmemun8QJexMEvNFbD2BIg4eSKrmSIMrTfnl2nql2Sc6OGAYFyb8rwuYrCjl/IiEYYuyTEiimMscu7EXji/Dw==
-  dependencies:
-    memory-fs "^0.4.1"
-    mime "^2.3.1"
-    range-parser "^1.0.3"
-    webpack-log "^2.0.0"
-
-webpack-dev-server@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz#1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"
-  integrity sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==
-  dependencies:
-    ansi-html "0.0.7"
-    bonjour "^3.5.0"
-    chokidar "^2.0.0"
-    compression "^1.5.2"
-    connect-history-api-fallback "^1.3.0"
-    debug "^4.1.1"
-    del "^3.0.0"
-    express "^4.16.2"
-    html-entities "^1.2.0"
-    http-proxy-middleware "^0.19.1"
-    import-local "^2.0.0"
-    internal-ip "^4.2.0"
-    ip "^1.1.5"
-    killable "^1.0.0"
-    loglevel "^1.4.1"
-    opn "^5.1.0"
-    portfinder "^1.0.9"
-    schema-utils "^1.0.0"
-    selfsigned "^1.9.1"
-    semver "^5.6.0"
-    serve-index "^1.7.2"
-    sockjs "0.3.19"
-    sockjs-client "1.3.0"
-    spdy "^4.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^6.1.0"
-    url "^0.11.0"
-    webpack-dev-middleware "^3.5.1"
-    webpack-log "^2.0.0"
-    yargs "12.0.2"
-
-webpack-log@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
-  integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
-  dependencies:
-    ansi-colors "^3.0.0"
-    uuid "^3.3.2"
-
-webpack-sources@^1.1.0, webpack-sources@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
-  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack@^4.29.6:
-  version "4.29.6"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.6.tgz#66bf0ec8beee4d469f8b598d3988ff9d8d90e955"
-  integrity sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==
-  dependencies:
-    "@webassemblyjs/ast" "1.8.5"
-    "@webassemblyjs/helper-module-context" "1.8.5"
-    "@webassemblyjs/wasm-edit" "1.8.5"
-    "@webassemblyjs/wasm-parser" "1.8.5"
-    acorn "^6.0.5"
-    acorn-dynamic-import "^4.0.0"
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
-    chrome-trace-event "^1.0.0"
-    enhanced-resolve "^4.1.0"
-    eslint-scope "^4.0.0"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.3.0"
-    loader-utils "^1.1.0"
-    memory-fs "~0.4.1"
-    micromatch "^3.1.8"
-    mkdirp "~0.5.0"
-    neo-async "^2.5.0"
-    node-libs-browser "^2.0.0"
-    schema-utils "^1.0.0"
-    tapable "^1.1.0"
-    terser-webpack-plugin "^1.1.0"
-    watchpack "^1.5.0"
-    webpack-sources "^1.3.0"
-
-websocket-driver@>=0.5.1:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
-  dependencies:
-    http-parser-js ">=0.4.0"
-    websocket-extensions ">=0.1.1"
-
-websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
-
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-
-which@^1.2.14, which@^1.2.9:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
-worker-farm@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
-  integrity sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==
-  dependencies:
-    errno "~0.1.7"
-
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
-  dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-xregexp@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
-  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
-
-xtend@^4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-
-"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
-
-yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
-
-yargs-parser@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^11.1.1:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
-  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
-yargs@12.0.2:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
-  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^2.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^10.1.0"
-
-yargs@^12.0.5:
-  version "12.0.5"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
-  integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^1.0.1"
-    os-locale "^3.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1 || ^4.0.0"
-    yargs-parser "^11.1.1"

From 63c9896ffd7bcbaa9a747173b65d72cb88cb1d1e Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Apr 2019 13:07:35 +0300
Subject: [PATCH 100/179] create api package

---
 jason/src/api/jason.rs   |  41 ++++++++++++
 jason/src/api/mod.rs     |   5 ++
 jason/src/api/session.rs |  95 ++++++++++++++++++++++++++++
 jason/src/lib.rs         | 132 +--------------------------------------
 4 files changed, 144 insertions(+), 129 deletions(-)
 create mode 100644 jason/src/api/jason.rs
 create mode 100644 jason/src/api/mod.rs
 create mode 100644 jason/src/api/session.rs

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
new file mode 100644
index 000000000..0c7a04292
--- /dev/null
+++ b/jason/src/api/jason.rs
@@ -0,0 +1,41 @@
+use wasm_bindgen::prelude::*;
+
+use std::rc::Rc;
+
+use crate::transport::Transport;
+use crate::set_panic_hook;
+use crate::api::{SessionHandle, session::Session};
+
+#[wasm_bindgen]
+pub struct Jason {
+    transport: Option<Rc<Transport>>,
+    sessions: Vec<Rc<Session>>,
+}
+
+#[wasm_bindgen]
+impl Jason {
+    #[wasm_bindgen(constructor)]
+    pub fn new() -> Self {
+        set_panic_hook();
+        Self {
+            transport: None,
+            sessions: vec![],
+        }
+    }
+
+    pub fn init_session(&mut self, token: String) -> SessionHandle {
+        let mut transport = Transport::new(token, 3000);
+        transport.init();
+        let transport = Rc::new(transport);
+
+        let session = Session::new(Rc::clone(&transport));
+        session.subscribe(&transport);
+
+        let handle = session.new_handle();
+
+        self.sessions.push(Rc::new(session));
+        self.transport = Some(transport);
+
+        handle
+    }
+}
\ No newline at end of file
diff --git a/jason/src/api/mod.rs b/jason/src/api/mod.rs
new file mode 100644
index 000000000..0ffd435fc
--- /dev/null
+++ b/jason/src/api/mod.rs
@@ -0,0 +1,5 @@
+mod jason;
+mod session;
+
+pub use self::jason::Jason;
+pub use self::session::SessionHandle;
diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
new file mode 100644
index 000000000..09d3b3a5f
--- /dev/null
+++ b/jason/src/api/session.rs
@@ -0,0 +1,95 @@
+use std::rc::Rc;
+use std::cell::RefCell;
+use crate::transport::{Transport, protocol::DirectionalTrack, protocol::Event as MedeaEvent};
+use wasm_bindgen_futures::spawn_local;
+use futures::sync::mpsc::{UnboundedSender, UnboundedReceiver, unbounded};
+use wasm_bindgen::JsValue;
+use futures::stream::Stream;
+use web_sys::console;
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen]
+pub struct SessionHandle {
+    inner: Session
+}
+
+#[wasm_bindgen]
+impl SessionHandle {}
+
+pub struct Session(Rc<RefCell<InnerSession>>);
+
+impl Session {
+    pub fn new(transport: Rc<Transport>) -> Self {
+        Self {
+            0: InnerSession::new(transport)
+        }
+    }
+
+    pub fn new_handle(&self) -> SessionHandle {
+        SessionHandle {
+            inner: Session { 0: Rc::clone(&self.0) }
+        }
+    }
+
+    pub fn subscribe(&self, transport: &Transport) {
+
+        let mut inner = self.0.borrow_mut();
+
+        transport.add_sub(inner.tx.clone());
+
+        let rx = inner.rx.take().unwrap();
+
+        let inner = Rc::clone(&self.0);
+        let poll = rx.for_each(move |event| {
+            match event {
+                MedeaEvent::PeerCreated { peer_id, sdp_offer, tracks } => {
+                    inner.borrow_mut().on_peer_created(peer_id, sdp_offer, tracks);
+                }
+                MedeaEvent::SdpAnswerMade { peer_id, sdp_answer } => {
+                    inner.borrow_mut().on_sdp_answer(peer_id, sdp_answer);
+                }
+                MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
+                    inner.borrow_mut().on_ice_candidate_discovered(peer_id, candidate);
+                }
+                MedeaEvent::PeersRemoved { peer_ids } => {
+                    inner.borrow_mut().on_peers_removed(peer_ids);
+                }
+            };
+
+            Ok(())
+        });
+
+        spawn_local(poll);
+    }
+}
+
+struct InnerSession {
+    transport: Rc<Transport>,
+    tx: UnboundedSender<MedeaEvent>,
+    rx: Option<UnboundedReceiver<MedeaEvent>>,
+}
+
+impl InnerSession {
+    fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
+        let (tx, rx) = unbounded();
+
+        Rc::new(RefCell::new(Self {
+            transport,
+            tx,
+            rx: Some(rx),
+        }))
+    }
+
+    fn on_peer_created(&mut self, peer_id: u64, sdp_offer: Option<String>, tracks: Vec<DirectionalTrack>) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_peer_created invoked")));
+    }
+    fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_sdp_answer invoked")));
+    }
+    fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_ice_candidate_discovered invoked")));
+    }
+    fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
+        console::log(&js_sys::Array::from(&JsValue::from_str("on_peers_removed invoked")));
+    }
+}
\ No newline at end of file
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 0c786a174..225c4f3bf 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,17 +1,9 @@
-use futures::sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
-use web_sys::console;
-use wasm_bindgen::prelude::*;
+pub use self::api::Jason;
+pub use self::api::SessionHandle;
 
 mod transport;
 mod utils;
-
-use transport::{protocol::Event as MedeaEvent, Transport, protocol::DirectionalTrack};
-use futures::stream::Stream;
-
-use wasm_bindgen_futures::spawn_local;
-use std::rc::Rc;
-use std::cell::RefCell;
-
+mod api;
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
 // we will get better error messages if our code ever panics.
@@ -28,122 +20,4 @@ pub use console_error_panic_hook::set_once as set_panic_hook;
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
 
-#[wasm_bindgen]
-pub struct Jason {
-    transport: Option<Rc<Transport>>,
-    sessions: Vec<Rc<Session>>,
-}
-
-#[wasm_bindgen]
-impl Jason {
-    #[wasm_bindgen(constructor)]
-    pub fn new() -> Self {
-        set_panic_hook();
-        Self {
-            transport: None,
-            sessions: vec![],
-        }
-    }
-
-    pub fn init_session(&mut self, token: String) -> SessionHandle {
-        let mut transport = Transport::new(token, 3000);
-        transport.init();
-        let transport = Rc::new(transport);
-
-        let session = Session::new(Rc::clone(&transport));
-        session.subscribe(&transport);
-
-        let handle = session.new_handle();
-
-        self.sessions.push(Rc::new(session));
-        self.transport = Some(transport);
-
-        handle
-    }
-}
-
-#[wasm_bindgen]
-pub struct SessionHandle {
-    inner: Session
-}
-
-#[wasm_bindgen]
-impl SessionHandle {}
-
-struct Session(Rc<RefCell<InnerSession>>);
-
-impl Session {
-    fn new(transport: Rc<Transport>) -> Self {
-        Self {
-            0: InnerSession::new(transport)
-        }
-    }
-
-    fn new_handle(&self) -> SessionHandle {
-        SessionHandle {
-            inner: Session { 0: Rc::clone(&self.0) }
-        }
-    }
-
-    fn subscribe(&self, transport: &Transport) {
-
-        let mut inner = self.0.borrow_mut();
-
-        transport.add_sub(inner.tx.clone());
-
-        let rx = inner.rx.take().unwrap();
-
-        let inner = Rc::clone(&self.0);
-        let poll = rx.for_each(move |event| {
-            match event {
-                MedeaEvent::PeerCreated { peer_id, sdp_offer, tracks } => {
-                    inner.borrow_mut().on_peer_created(peer_id, sdp_offer, tracks);
-                }
-                MedeaEvent::SdpAnswerMade { peer_id, sdp_answer } => {
-                    inner.borrow_mut().on_sdp_answer(peer_id, sdp_answer);
-                }
-                MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
-                    inner.borrow_mut().on_ice_candidate_discovered(peer_id, candidate);
-                }
-                MedeaEvent::PeersRemoved { peer_ids } => {
-                    inner.borrow_mut().on_peers_removed(peer_ids);
-                }
-            };
-
-            Ok(())
-        });
-
-        spawn_local(poll);
-    }
-}
-
-struct InnerSession {
-    transport: Rc<Transport>,
-    tx: UnboundedSender<MedeaEvent>,
-    rx: Option<UnboundedReceiver<MedeaEvent>>,
-}
-
-impl InnerSession {
-    fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
-        let (tx, rx) = unbounded();
-
-        Rc::new(RefCell::new(Self {
-            transport,
-            tx,
-            rx: Some(rx),
-        }))
-    }
 
-    fn on_peer_created(&mut self, peer_id: u64, sdp_offer: Option<String>, tracks: Vec<DirectionalTrack>) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_peer_created invoked")));
-    }
-    fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_sdp_answer invoked")));
-    }
-    fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_ice_candidate_discovered invoked")));
-    }
-    fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_peers_removed invoked")));
-    }
-}

From fbe66642377da088d02bb4ae065c540f79483c3d Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Apr 2019 13:26:42 +0300
Subject: [PATCH 101/179] fix imports

---
 jason/src/api/jason.rs          | 10 +++--
 jason/src/api/session.rs        | 74 +++++++++++++++++++++++----------
 jason/src/lib.rs                | 10 ++---
 jason/src/transport/mod.rs      | 31 ++++++++------
 jason/src/transport/protocol.rs |  4 +-
 jason/src/utils/mod.rs          | 13 +++---
 6 files changed, 91 insertions(+), 51 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index 0c7a04292..e509e5fee 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -2,9 +2,11 @@ use wasm_bindgen::prelude::*;
 
 use std::rc::Rc;
 
-use crate::transport::Transport;
-use crate::set_panic_hook;
-use crate::api::{SessionHandle, session::Session};
+use crate::{
+    api::{session::Session, SessionHandle},
+    set_panic_hook,
+    transport::Transport,
+};
 
 #[wasm_bindgen]
 pub struct Jason {
@@ -38,4 +40,4 @@ impl Jason {
 
         handle
     }
-}
\ No newline at end of file
+}
diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
index 09d3b3a5f..73811ccc2 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/session.rs
@@ -1,16 +1,20 @@
-use std::rc::Rc;
-use std::cell::RefCell;
-use crate::transport::{Transport, protocol::DirectionalTrack, protocol::Event as MedeaEvent};
+use futures::{
+    stream::Stream,
+    sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender},
+};
+use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
-use futures::sync::mpsc::{UnboundedSender, UnboundedReceiver, unbounded};
-use wasm_bindgen::JsValue;
-use futures::stream::Stream;
 use web_sys::console;
-use wasm_bindgen::prelude::*;
+
+use std::{cell::RefCell, rc::Rc};
+
+use crate::transport::{
+    protocol::DirectionalTrack, protocol::Event as MedeaEvent, Transport,
+};
 
 #[wasm_bindgen]
 pub struct SessionHandle {
-    inner: Session
+    inner: Session,
 }
 
 #[wasm_bindgen]
@@ -21,18 +25,19 @@ pub struct Session(Rc<RefCell<InnerSession>>);
 impl Session {
     pub fn new(transport: Rc<Transport>) -> Self {
         Self {
-            0: InnerSession::new(transport)
+            0: InnerSession::new(transport),
         }
     }
 
     pub fn new_handle(&self) -> SessionHandle {
         SessionHandle {
-            inner: Session { 0: Rc::clone(&self.0) }
+            inner: Session {
+                0: Rc::clone(&self.0),
+            },
         }
     }
 
     pub fn subscribe(&self, transport: &Transport) {
-
         let mut inner = self.0.borrow_mut();
 
         transport.add_sub(inner.tx.clone());
@@ -42,14 +47,25 @@ impl Session {
         let inner = Rc::clone(&self.0);
         let poll = rx.for_each(move |event| {
             match event {
-                MedeaEvent::PeerCreated { peer_id, sdp_offer, tracks } => {
-                    inner.borrow_mut().on_peer_created(peer_id, sdp_offer, tracks);
+                MedeaEvent::PeerCreated {
+                    peer_id,
+                    sdp_offer,
+                    tracks,
+                } => {
+                    inner
+                        .borrow_mut()
+                        .on_peer_created(peer_id, sdp_offer, tracks);
                 }
-                MedeaEvent::SdpAnswerMade { peer_id, sdp_answer } => {
+                MedeaEvent::SdpAnswerMade {
+                    peer_id,
+                    sdp_answer,
+                } => {
                     inner.borrow_mut().on_sdp_answer(peer_id, sdp_answer);
                 }
                 MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
-                    inner.borrow_mut().on_ice_candidate_discovered(peer_id, candidate);
+                    inner
+                        .borrow_mut()
+                        .on_ice_candidate_discovered(peer_id, candidate);
                 }
                 MedeaEvent::PeersRemoved { peer_ids } => {
                     inner.borrow_mut().on_peers_removed(peer_ids);
@@ -80,16 +96,32 @@ impl InnerSession {
         }))
     }
 
-    fn on_peer_created(&mut self, peer_id: u64, sdp_offer: Option<String>, tracks: Vec<DirectionalTrack>) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_peer_created invoked")));
+    fn on_peer_created(
+        &mut self,
+        peer_id: u64,
+        sdp_offer: Option<String>,
+        tracks: Vec<DirectionalTrack>,
+    ) {
+        console::log(&js_sys::Array::from(&JsValue::from_str(
+            "on_peer_created invoked",
+        )));
     }
+
     fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_sdp_answer invoked")));
+        console::log(&js_sys::Array::from(&JsValue::from_str(
+            "on_sdp_answer invoked",
+        )));
     }
+
     fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_ice_candidate_discovered invoked")));
+        console::log(&js_sys::Array::from(&JsValue::from_str(
+            "on_ice_candidate_discovered invoked",
+        )));
     }
+
     fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
-        console::log(&js_sys::Array::from(&JsValue::from_str("on_peers_removed invoked")));
+        console::log(&js_sys::Array::from(&JsValue::from_str(
+            "on_peers_removed invoked",
+        )));
     }
-}
\ No newline at end of file
+}
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 225c4f3bf..01f03c6e8 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,9 +1,7 @@
-pub use self::api::Jason;
-pub use self::api::SessionHandle;
-
+mod api;
 mod transport;
 mod utils;
-mod api;
+
 // When the `console_error_panic_hook` feature is enabled, we can call the
 // `set_panic_hook` function at least once during initialization, and then
 // we will get better error messages if our code ever panics.
@@ -13,11 +11,11 @@ mod api;
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
 
+pub use self::api::Jason;
+pub use self::api::SessionHandle;
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
 #[cfg(feature = "wee_alloc")]
 #[global_allocator]
 static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-
-
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 2fc465fdc..5b31be30c 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,9 +1,8 @@
 pub mod protocol;
-use self::protocol::{Command, Heartbeat, Event as MedeaEvent};
+
 use futures::sync::mpsc::UnboundedSender;
 use js_sys::Date;
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
+use wasm_bindgen::{prelude::*, JsCast};
 use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
 use std::{cell::RefCell, rc::Rc, vec};
@@ -12,6 +11,8 @@ use crate::utils::{
     bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle,
 };
 
+use self::protocol::{Command, Event as MedeaEvent, Heartbeat};
+
 // TODO:
 // 1. Reconnect.
 // 2. Disconnect if no pongs.
@@ -63,18 +64,23 @@ impl Transport {
                 if payload.is_string() {
                     let payload: String = payload.as_string().unwrap();
 
-                    if let Ok(Heartbeat::Pong(_pong)) = serde_json::from_str::<Heartbeat>(&payload) {
+                    if let Ok(Heartbeat::Pong(_pong)) =
+                        serde_json::from_str::<Heartbeat>(&payload)
+                    {
                         pinger_rc.set_pong_at(Date::now());
-                        console::log(&js_sys::Array::from(&JsValue::from_str("pong received")));
+                        console::log(&js_sys::Array::from(&JsValue::from_str(
+                            "pong received",
+                        )));
                     } else {
-                        let event = serde_json::from_str::<MedeaEvent>(&payload).unwrap();
+                        let event =
+                            serde_json::from_str::<MedeaEvent>(&payload)
+                                .unwrap();
 
-                        //TODO: many subs, filter messages by session
+                        // TODO: many subs, filter messages by session
                         if let Some(sub) = subs_rc.borrow().iter().next() {
                             sub.unbounded_send(event).unwrap();
                         }
                     }
-
                 }
             },
         )
@@ -113,10 +119,9 @@ impl Transport {
     pub fn send_command(&self, command: &Command) {
         let socket_borrow = self.sock.borrow();
 
-        //TODO: no socket?
+        // TODO: no socket?
         if let Some(socket) = socket_borrow.as_ref() {
-            let msg =
-                serde_json::to_string(&command).unwrap();
+            let msg = serde_json::to_string(&command).unwrap();
 
             socket.send_with_str(&msg).unwrap();
         }
@@ -127,7 +132,9 @@ impl Drop for Transport {
     fn drop(&mut self) {
         let socket_borrow = self.sock.borrow();
         if let Some(socket) = socket_borrow.as_ref() {
-            socket.close_with_code_and_reason(1001, "Dropped suddenly").is_ok();
+            socket
+                .close_with_code_and_reason(1001, "Dropped suddenly")
+                .is_ok();
         }
     }
 }
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index a41e25154..4e0a2c896 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
-
-// TODO: just copied from Medea crate, needs refactoring to properly share protocol messages between crates
+// TODO: just copied from Medea crate, needs refactoring to properly share
+// protocol messages between crates
 #[derive(Deserialize, Serialize)]
 pub enum Heartbeat {
     /// `ping` message that WebSocket client is expected to send to the server
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 43ba9f08a..c445f7ae9 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -1,9 +1,10 @@
-use wasm_bindgen::closure::Closure;
-use wasm_bindgen::convert::{FromWasmAbi, ReturnWasmAbi};
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
-use web_sys::EventTarget;
-use web_sys::Window;
+use wasm_bindgen::{
+    closure::Closure,
+    convert::{FromWasmAbi, ReturnWasmAbi},
+    prelude::*,
+    JsCast,
+};
+use web_sys::{EventTarget, Window};
 
 pub fn bind_handler_fn_mut<F, A, R>(
     event: &str,

From e41a7e2e8a6a41948cd1768917f69cf65d6a7ac0 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Apr 2019 15:35:23 +0300
Subject: [PATCH 102/179] refactor session.rs

---
 src/api/client/session.rs | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index f2c417a21..f7be65c71 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -25,6 +25,7 @@ use crate::{
 pub struct WsSession {
     /// ID of [`Member`] that WebSocket connection is associated with.
     member_id: MemberId,
+
     /// [`Room`] that [`Member`] is associated with.
     room: Addr<Room>,
 
@@ -66,19 +67,16 @@ impl WsSession {
                 > sess.idle_timeout
             {
                 info!("WsSession of member {} is idle", sess.member_id);
-
-                let member_id = sess.member_id;
-                match sess.room.try_send(RpcConnectionClosed {
-                    member_id,
+                if let Err(err) = sess.room.try_send(RpcConnectionClosed {
+                    member_id: sess.member_id,
                     reason: RpcConnectionClosedReason::Idle,
                 }) {
-                    Err(err) => error!(
+                    error!(
                         "WsSession of member {} failed to remove from Room, \
                          because: {:?}",
-                        member_id, err,
-                    ),
-                    _ => {}
-                };
+                        sess.member_id, err,
+                    )
+                }
 
                 ctx.notify(Close {
                     reason: Some(ws::CloseCode::Normal.into()),
@@ -214,13 +212,11 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     ctx.notify(ping);
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
-                    let member_id = self.member_id;
-                    match self.room.try_send(command) {
-                        Err(err) => error!(
+                    if let Err(err) = self.room.try_send(command) {
+                        error!(
                             "Cannot send Command to Room {}, because {}",
-                            member_id, err
-                        ),
-                        _ => {}
+                            self.member_id, err
+                        )
                     }
                 }
             }
@@ -230,17 +226,15 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                         "Send close frame with reason {:?} for member {}",
                         reason, self.member_id
                     );
-                    let member_id = self.member_id;
-                    match self.room.try_send(RpcConnectionClosed {
+                    if let Err(err) = self.room.try_send(RpcConnectionClosed {
                         member_id: self.member_id,
                         reason: RpcConnectionClosedReason::Disconnected,
                     }) {
-                        Err(err) => error!(
+                        error!(
                             "WsSession of member {} failed to remove from \
                              Room, because: {:?}",
-                            member_id, err,
-                        ),
-                        _ => {}
+                            self.member_id, err,
+                        )
                     };
                     ctx.close(reason);
                     ctx.stop();

From 24e24131ab18d5808a714e29b60ade777b34b845 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Apr 2019 17:54:45 +0300
Subject: [PATCH 103/179] move rpc connection to module

---
 src/api/client/mod.rs            | 10 +++--
 src/api/client/room.rs           | 66 +++-----------------------------
 src/api/client/rpc_connection.rs | 66 ++++++++++++++++++++++++++++++++
 src/api/client/server.rs         | 18 +++++----
 src/api/client/session.rs        |  7 ++--
 5 files changed, 91 insertions(+), 76 deletions(-)
 create mode 100644 src/api/client/rpc_connection.rs

diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index c23a5f549..acdefd17b 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,9 +1,11 @@
 //! Implementation of Client API.
 
-pub mod commands;
-pub mod events;
-pub mod room;
+mod commands;
+mod events;
+mod room;
+mod rpc_connection;
+mod session;
+
 pub mod server;
-pub mod session;
 
 pub use self::{commands::*, events::*, room::*, server::*, session::*};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 7ac856b51..4d9a9b865 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -1,7 +1,6 @@
 //! Room definitions and implementations.
 
 use std::{
-    fmt,
     sync::{Arc, Mutex},
     time::{Duration, Instant},
 };
@@ -18,6 +17,11 @@ use futures::{
 use hashbrown::HashMap;
 
 use crate::{
+    api::client::rpc_connection::{
+        AuthorizeRpcConnection, RpcConnection, RpcConnectionAuthorizationError,
+        RpcConnectionClosed, RpcConnectionClosedReason,
+        RpcConnectionEstablished,
+    },
     api::client::{Command, Event},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
@@ -310,38 +314,6 @@ impl Actor for Room {
     }
 }
 
-/// Established RPC connection with some remote [`Member`].
-pub trait RpcConnection: fmt::Debug + Send {
-    /// Closes [`RpcConnection`].
-    /// No [`RpcConnectionClosed`] signals should be emitted.
-    fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
-
-    /// Sends [`Event`] to remote [`Member`].
-    fn send_event(
-        &self,
-        event: Event,
-    ) -> Box<dyn Future<Item = (), Error = ()>>;
-}
-
-/// Signal for authorizing new [`RpcConnection`] before establishing.
-#[derive(Debug, Message)]
-#[rtype(result = "Result<(), RpcConnectionAuthorizationError>")]
-pub struct AuthorizeRpcConnection {
-    /// ID of [`Member`] to authorize [`RpcConnection`] for.
-    pub member_id: MemberId,
-    /// Credentials to authorize [`RpcConnection`] with.
-    pub credentials: String, // TODO: &str when futures will allow references
-}
-
-/// Error of authorization [`RpcConnection`] in [`Room`].
-#[derive(Debug)]
-pub enum RpcConnectionAuthorizationError {
-    /// Authorizing [`Member`] does not exists in the [`Room`].
-    MemberNotExists,
-    /// Provided credentials are invalid.
-    InvalidCredentials,
-}
-
 impl Handler<AuthorizeRpcConnection> for Room {
     type Result = Result<(), RpcConnectionAuthorizationError>;
 
@@ -364,16 +336,6 @@ impl Handler<AuthorizeRpcConnection> for Room {
     }
 }
 
-/// Signal of new [`RpcConnection`] being established with specified [`Member`].
-#[derive(Debug, Message)]
-#[rtype(result = "Result<(), ()>")]
-pub struct RpcConnectionEstablished {
-    /// ID of [`Member`] that establishes [`RpcConnection`].
-    pub member_id: MemberId,
-    /// Established [`RpcConnection`].
-    pub connection: Box<dyn RpcConnection>,
-}
-
 /// Ergonomic type alias for using [`ActorFuture`] for [`Room`].
 type ActFuture<I, E> = Box<dyn ActorFuture<Actor = Room, Item = I, Error = E>>;
 
@@ -459,24 +421,6 @@ impl Handler<Command> for Room {
     }
 }
 
-/// Signal of existing [`RpcConnection`] of specified [`Member`] being closed.
-#[derive(Debug, Message)]
-pub struct RpcConnectionClosed {
-    /// ID of [`Member`] which [`RpcConnection`] is closed.
-    pub member_id: MemberId,
-    /// Reason of why [`RpcConnection`] is closed.
-    pub reason: RpcConnectionClosedReason,
-}
-
-/// Reasons of why [`RpcConnection`] may be closed.
-#[derive(Debug)]
-pub enum RpcConnectionClosedReason {
-    /// [`RpcConnection`] is disconnect by server itself.
-    Disconnected,
-    /// [`RpcConnection`] has become idle and is disconnected by idle timeout.
-    Idle,
-}
-
 impl Handler<RpcConnectionClosed> for Room {
     type Result = ();
 
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
new file mode 100644
index 000000000..710e67fac
--- /dev/null
+++ b/src/api/client/rpc_connection.rs
@@ -0,0 +1,66 @@
+//! ['RpcConnection'] with related messages.
+use actix::Message;
+use futures::Future;
+
+use crate::{api::client::Event, api::control::Id as MemberId};
+
+use std::fmt;
+
+/// Abstraction over RPC connection with some remote [`Member`].
+pub trait RpcConnection: fmt::Debug + Send {
+    /// Closes [`RpcConnection`].
+    /// No [`RpcConnectionClosed`] signals should be emitted.
+    fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
+
+    /// Sends [`Event`] to remote [`Member`].
+    fn send_event(
+        &self,
+        event: Event,
+    ) -> Box<dyn Future<Item = (), Error = ()>>;
+}
+
+/// Signal for authorizing new [`RpcConnection`] before establishing.
+#[derive(Debug, Message)]
+#[rtype(result = "Result<(), RpcConnectionAuthorizationError>")]
+pub struct AuthorizeRpcConnection {
+    /// ID of [`Member`] to authorize [`RpcConnection`] for.
+    pub member_id: MemberId,
+    /// Credentials to authorize [`RpcConnection`] with.
+    pub credentials: String, // TODO: &str when futures will allow references
+}
+
+/// Error of authorization [`RpcConnection`] in [`Room`].
+#[derive(Debug)]
+pub enum RpcConnectionAuthorizationError {
+    /// Authorizing [`Member`] does not exists in the [`Room`].
+    MemberNotExists,
+    /// Provided credentials are invalid.
+    InvalidCredentials,
+}
+
+/// Signal of new [`RpcConnection`] being established with specified [`Member`].
+#[derive(Debug, Message)]
+#[rtype(result = "Result<(), ()>")]
+pub struct RpcConnectionEstablished {
+    /// ID of [`Member`] that establishes [`RpcConnection`].
+    pub member_id: MemberId,
+    /// Established [`RpcConnection`].
+    pub connection: Box<dyn RpcConnection>,
+}
+/// Signal of existing [`RpcConnection`] of specified [`Member`] being closed.
+#[derive(Debug, Message)]
+pub struct RpcConnectionClosed {
+    /// ID of [`Member`] which [`RpcConnection`] is closed.
+    pub member_id: MemberId,
+    /// Reason of why [`RpcConnection`] is closed.
+    pub reason: RpcConnectionClosedReason,
+}
+
+/// Reasons of why [`RpcConnection`] may be closed.
+#[derive(Debug)]
+pub enum RpcConnectionClosedReason {
+    /// [`RpcConnection`] is disconnect by server itself.
+    Disconnected,
+    /// [`RpcConnection`] has become idle and is disconnected by idle timeout.
+    Idle,
+}
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 45c25b028..bf2b7bcd3 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -8,11 +8,11 @@ use futures::{future, Future as _};
 use serde::Deserialize;
 
 use crate::{
+    api::client::rpc_connection::{
+        AuthorizeRpcConnection, RpcConnectionAuthorizationError,
+    },
     api::{
-        client::{
-            AuthorizeRpcConnection, Id as RoomId, RoomsRepository,
-            RpcConnectionAuthorizationError, WsSession,
-        },
+        client::{Id as RoomId, RoomsRepository, WsSession},
         control::Id as MemberId,
     },
     conf::{Conf, Rpc},
@@ -39,8 +39,6 @@ fn ws_index(
         State<Context>,
     ),
 ) -> FutureResponse<HttpResponse> {
-    use RpcConnectionAuthorizationError::*;
-
     debug!("Request params: {:?}", info);
 
     match state.rooms.get(info.room_id) {
@@ -59,8 +57,12 @@ fn ws_index(
                         state.config.idle_timeout,
                     ),
                 ),
-                Err(MemberNotExists) => Ok(HttpResponse::NotFound().into()),
-                Err(InvalidCredentials) => Ok(HttpResponse::Forbidden().into()),
+                Err(RpcConnectionAuthorizationError::MemberNotExists) => {
+                    Ok(HttpResponse::NotFound().into())
+                }
+                Err(RpcConnectionAuthorizationError::InvalidCredentials) => {
+                    Ok(HttpResponse::Forbidden().into())
+                }
             })
             .responder(),
         None => future::ok(HttpResponse::NotFound().into()).responder(),
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index f7be65c71..9f9732c1b 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -11,10 +11,11 @@ use futures::future::Future;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    api::client::{
-        Command, Event, Room, RpcConnection, RpcConnectionClosed,
-        RpcConnectionClosedReason, RpcConnectionEstablished,
+    api::client::rpc_connection::{
+        RpcConnection, RpcConnectionClosed, RpcConnectionClosedReason,
+        RpcConnectionEstablished,
     },
+    api::client::{Command, Event, Room},
     api::control::member::Id as MemberId,
     log::prelude::*,
 };

From b0de9a79a3552fd405f085ff9064b81fa1dc333c Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Apr 2019 19:01:11 +0300
Subject: [PATCH 104/179] minor refactor

---
 src/api/client/room.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 4d9a9b865..49e3b5f69 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -408,15 +408,12 @@ impl Handler<Command> for Room {
                 self.handle_set_ice_candidate(peer_id, candidate)
             }
         };
-        match res.and_then(|(caller, event)| self.send_event(caller, event)) {
-            Err(err) => {
-                error!(
-                    "Failed handle command, because {}. Room will be stop.",
-                    err
-                );
-                ctx.stop()
-            }
-            _ => {}
+        if let Err(err) = res.and_then(|(caller, event)| self.send_event(caller, event)) {
+            error!(
+                "Failed handle command, because {}. Room will be stop.",
+                err
+            );
+            ctx.stop()
         }
     }
 }

From a8eb8e05fa9c16ad4e11342290877a5688c2be04 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 12 Apr 2019 19:14:06 +0300
Subject: [PATCH 105/179] add todos

---
 src/api/client/room.rs           | 20 +++++++++++++-------
 src/api/client/rpc_connection.rs |  1 +
 src/api/client/session.rs        |  1 +
 src/media/peer.rs                |  4 ++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 49e3b5f69..d0eca28e0 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -118,7 +118,8 @@ impl Room {
     }
 
     /// Send [`Event`] to specified remote [`Member`].
-    fn send_event(
+    /// TODO: -> impl Future<(), RoomError>
+    fn send_event_to_member(
         &mut self,
         member_id: MemberId,
         event: Event,
@@ -300,12 +301,17 @@ impl Actor for Room {
                     })
                     .map(|(&id, _)| id)
                     .collect();
+                //TODO: test correctness
                 if !peer_ids.is_empty() {
-                    futures.push(
-                        connection.send_event(Event::PeersRemoved { peer_ids }),
-                    );
+                    futures.push(Either::A(
+                        connection
+                            .send_event(Event::PeersRemoved { peer_ids })
+                            .then(move |_| connection.close()),
+                    ));
+                } else {
+                    futures.push(Either::B(connection.close()));
                 }
-                futures.push(connection.close());
+
                 futures
             },
         );
@@ -369,7 +375,7 @@ impl Handler<RpcConnectionEstablished> for Room {
                 fut = Either::A(future::done(
                     self.handle_peer_created(peer.id())
                         .and_then(|(caller, event)| {
-                            self.send_event(caller, event)
+                            self.send_event_to_member(caller, event)
                         })
                         .map_err(move |err| {
                             error!(
@@ -408,7 +414,7 @@ impl Handler<Command> for Room {
                 self.handle_set_ice_candidate(peer_id, candidate)
             }
         };
-        if let Err(err) = res.and_then(|(caller, event)| self.send_event(caller, event)) {
+        if let Err(err) = res.and_then(|(caller, event)| self.send_event_to_member(caller, event)) {
             error!(
                 "Failed handle command, because {}. Room will be stop.",
                 err
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index 710e67fac..f35ca7266 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -10,6 +10,7 @@ use std::fmt;
 pub trait RpcConnection: fmt::Debug + Send {
     /// Closes [`RpcConnection`].
     /// No [`RpcConnectionClosed`] signals should be emitted.
+    /// TODO: should never err
     fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
 
     /// Sends [`Event`] to remote [`Member`].
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 9f9732c1b..ddf0be35f 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -108,6 +108,7 @@ impl Actor for WsSession {
                 })
                 .map(|_| ())
                 .map_err(move |err| {
+                    //TODO kill socket on err
                     error!(
                         "WsSession of member {} failed to join Room, because: \
                          {:?}",
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 8b97bad32..b1694bc08 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,4 +1,4 @@
-use std::{any::Any, sync::Arc};
+use std::{sync::Arc};
 
 use hashbrown::HashMap;
 
@@ -128,7 +128,7 @@ pub struct Peer<S> {
     state: S,
 }
 
-impl<T: Any> Peer<T> {
+impl<T> Peer<T> {
     /// Returns ID of [`Member`] associated with this [`Peer`].
     pub fn member_id(&self) -> MemberId {
         self.context.member_id

From baa65b4bf9ac9a42de00fc3edc69e9a505aa66d2 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 12 Apr 2019 20:19:33 +0300
Subject: [PATCH 106/179] refactor session

---
 Cargo.lock               |  2 ++
 jason/src/api/session.rs | 22 +++++-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f94c6f7b7..a259f81cd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
 [[package]]
 name = "actix"
 version = "0.7.9"
diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
index 73811ccc2..e576f0acc 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/session.rs
@@ -24,25 +24,19 @@ pub struct Session(Rc<RefCell<InnerSession>>);
 
 impl Session {
     pub fn new(transport: Rc<Transport>) -> Self {
-        Self {
-            0: InnerSession::new(transport),
-        }
+        Self(InnerSession::new(transport))
     }
 
     pub fn new_handle(&self) -> SessionHandle {
         SessionHandle {
-            inner: Session {
-                0: Rc::clone(&self.0),
-            },
+            inner: Session(Rc::clone(&self.0)),
         }
     }
 
     pub fn subscribe(&self, transport: &Transport) {
-        let mut inner = self.0.borrow_mut();
-
-        transport.add_sub(inner.tx.clone());
 
-        let rx = inner.rx.take().unwrap();
+        let (tx, rx) = unbounded();
+        transport.add_sub(tx);
 
         let inner = Rc::clone(&self.0);
         let poll = rx.for_each(move |event| {
@@ -81,18 +75,12 @@ impl Session {
 
 struct InnerSession {
     transport: Rc<Transport>,
-    tx: UnboundedSender<MedeaEvent>,
-    rx: Option<UnboundedReceiver<MedeaEvent>>,
 }
 
 impl InnerSession {
     fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
-        let (tx, rx) = unbounded();
-
         Rc::new(RefCell::new(Self {
-            transport,
-            tx,
-            rx: Some(rx),
+            transport
         }))
     }
 

From 99c058b8fe560a2c954630894cc8c58e98a4daa4 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 15 Apr 2019 16:59:17 +0300
Subject: [PATCH 107/179] refactor

---
 jason/e2e-demo/js/index.js | 10 +++++-----
 jason/src/api/session.rs   | 26 +++++++++++---------------
 jason/src/transport/mod.rs | 31 +++++++++++++++++--------------
 jason/src/utils/errors.rs  | 15 +++++++++++++++
 jason/src/utils/mod.rs     |  5 +++++
 5 files changed, 53 insertions(+), 34 deletions(-)
 create mode 100644 jason/src/utils/errors.rs

diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index 414dd20b3..00f855cd4 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -1,13 +1,13 @@
 async function f() {
-  const rust = await import("../../pkg");
+    const rust = await import("../../pkg");
 
-  let caller = new rust.Jason();
+    let caller = new rust.Jason();
 
-  caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+    caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
 
-  let responder = new rust.Jason();
+    let responder = new rust.Jason();
 
-  responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
+    responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
 }
 
 f();
\ No newline at end of file
diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
index e576f0acc..cc44ee1c8 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/session.rs
@@ -1,6 +1,6 @@
 use futures::{
     stream::Stream,
-    sync::mpsc::{unbounded, UnboundedReceiver, UnboundedSender},
+    sync::mpsc::unbounded,
 };
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
@@ -13,9 +13,7 @@ use crate::transport::{
 };
 
 #[wasm_bindgen]
-pub struct SessionHandle {
-    inner: Session,
-}
+pub struct SessionHandle (Session);
 
 #[wasm_bindgen]
 impl SessionHandle {}
@@ -28,9 +26,7 @@ impl Session {
     }
 
     pub fn new_handle(&self) -> SessionHandle {
-        SessionHandle {
-            inner: Session(Rc::clone(&self.0)),
-        }
+        SessionHandle (Session(Rc::clone(&self.0)))
     }
 
     pub fn subscribe(&self, transport: &Transport) {
@@ -90,26 +86,26 @@ impl InnerSession {
         sdp_offer: Option<String>,
         tracks: Vec<DirectionalTrack>,
     ) {
-        console::log(&js_sys::Array::from(&JsValue::from_str(
+        console::log_1(&JsValue::from_str(
             "on_peer_created invoked",
-        )));
+        ));
     }
 
     fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
-        console::log(&js_sys::Array::from(&JsValue::from_str(
+        console::log_1(&JsValue::from_str(
             "on_sdp_answer invoked",
-        )));
+        ));
     }
 
     fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
-        console::log(&js_sys::Array::from(&JsValue::from_str(
+        console::log_1(&&JsValue::from_str(
             "on_ice_candidate_discovered invoked",
-        )));
+        ));
     }
 
     fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
-        console::log(&js_sys::Array::from(&JsValue::from_str(
+        console::log_1(&JsValue::from_str(
             "on_peers_removed invoked",
-        )));
+        ));
     }
 }
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 5b31be30c..977a53a50 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -7,11 +7,10 @@ use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
 use std::{cell::RefCell, rc::Rc, vec};
 
-use crate::utils::{
-    bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle,
-};
+use crate::utils::{bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle, WasmErr};
 
 use self::protocol::{Command, Event as MedeaEvent, Heartbeat};
+use std::error::Error;
 
 // TODO:
 // 1. Reconnect.
@@ -39,19 +38,18 @@ impl Transport {
         }
     }
 
-    pub fn init(&mut self) {
-        let socket = WebSocket::new(&self.token).unwrap();
+    pub fn init(&mut self) -> Result<(), WasmErr>{
+        let socket = WebSocket::new(&self.token)?;
         let socket = Rc::new(RefCell::new(Some(socket)));
         let socket_borrow = socket.borrow();
-        let socket_ref = socket_borrow.as_ref().unwrap();
+        let socket_ref = socket_borrow.as_ref().ok_or(WasmErr::NoneError("socket is none"))?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
         let on_open =
             bind_handler_fn_once("open", socket_ref, move |_: Event| {
                 pinger_rc.start(socket_rc);
-            })
-            .unwrap();
+            })?;
 
         let pinger_rc = Rc::clone(&self.pinger);
         let subs_rc = Rc::clone(&self.subs);
@@ -62,15 +60,18 @@ impl Transport {
                 let payload = message.data();
 
                 if payload.is_string() {
-                    let payload: String = payload.as_string().unwrap();
+                    let payload = match payload.as_string() {
+                        Some(payload) => { payload },
+                        None => { return; },
+                    };
 
                     if let Ok(Heartbeat::Pong(_pong)) =
                         serde_json::from_str::<Heartbeat>(&payload)
                     {
                         pinger_rc.set_pong_at(Date::now());
-                        console::log(&js_sys::Array::from(&JsValue::from_str(
+                        console::log_1(&JsValue::from_str(
                             "pong received",
-                        )));
+                        ));
                     } else {
                         let event =
                             serde_json::from_str::<MedeaEvent>(&payload)
@@ -92,13 +93,13 @@ impl Transport {
             "close",
             socket_ref,
             move |close: CloseEvent| {
-                console::log(&js_sys::Array::from(&JsValue::from_str(
+                console::log_1(&JsValue::from_str(
                     &format!(
                         "Close [code: {}, reason: {}]",
                         close.code(),
                         close.reason()
                     ),
-                )));
+                ));
                 socket_rc.borrow_mut().take();
                 pinger_rc.stop();
             },
@@ -109,7 +110,9 @@ impl Transport {
         self.on_message = Some(on_message);
         self.on_close = Some(on_close);
         drop(socket_borrow);
-        self.sock = socket
+        self.sock = socket;
+
+        Ok(())
     }
 
     pub fn add_sub(&self, sub: UnboundedSender<MedeaEvent>) {
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
new file mode 100644
index 000000000..ec63d143f
--- /dev/null
+++ b/jason/src/utils/errors.rs
@@ -0,0 +1,15 @@
+use wasm_bindgen::JsValue;
+use std::error::Error;
+use crate::utils::errors::WasmErr::JsError;
+
+pub enum WasmErr {
+    JsError(JsValue),
+    RustError(Box<dyn Error>),
+    NoneError(&'static str)
+}
+
+impl From<wasm_bindgen::JsValue> for WasmErr {
+    fn from(val: JsValue) -> Self {
+        JsError(val)
+    }
+}
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index c445f7ae9..12c237b93 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -1,3 +1,8 @@
+
+mod errors;
+
+pub use self::errors::WasmErr;
+
 use wasm_bindgen::{
     closure::Closure,
     convert::{FromWasmAbi, ReturnWasmAbi},

From d708a21c08eb302b62e85f008eae02b24690ed31 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 15 Apr 2019 17:38:48 +0300
Subject: [PATCH 108/179] Impl handler StartSignaling

---
 src/api/client/commands.rs |   1 +
 src/api/client/room.rs     | 111 +++++++++++++++++++++++++++----------
 src/api/client/session.rs  |   2 +-
 src/media/peer.rs          |   2 +-
 4 files changed, 85 insertions(+), 31 deletions(-)

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
index 841f7e520..c268a39f1 100644
--- a/src/api/client/commands.rs
+++ b/src/api/client/commands.rs
@@ -5,6 +5,7 @@ use crate::media::peer::Id as PeerId;
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Debug, Deserialize, Message, Serialize)]
+#[rtype(result = "Result<(), ()>")]
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: PeerId, sdp_offer: String },
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index d0eca28e0..d431d766c 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -27,6 +27,7 @@ use crate::{
     log::prelude::*,
     media::peer::{Id as PeerId, PeerMachine},
 };
+use slog::Drain;
 
 #[derive(Fail, Debug)]
 pub enum RoomError {
@@ -123,15 +124,16 @@ impl Room {
         &mut self,
         member_id: MemberId,
         event: Event,
-    ) -> Result<(), RoomError> {
-        self.connections
-            .get(&member_id)
-            .ok_or(RoomError::ConnectionNotExists(member_id))
-            .and_then(move |conn| {
+    ) -> impl Future<Item = (), Error = RoomError> {
+        match self.connections.get(&member_id) {
+            Some(conn) => Either::A(
                 conn.send_event(event)
-                    .wait()
-                    .map_err(|_| RoomError::UnableSendEvent(member_id))
-            })
+                    .map_err(move |_| RoomError::UnableSendEvent(member_id)),
+            ),
+            None => Either::B(future::err(RoomError::ConnectionNotExists(
+                member_id,
+            ))),
+        }
     }
 
     /// Check state of the specified and associated [`Peer`].
@@ -139,9 +141,9 @@ impl Room {
     fn handle_peer_created(
         &mut self,
         from_peer_id: PeerId,
+        to_peer_id: PeerId,
     ) -> Result<(MemberId, Event), RoomError> {
         let from_peer = self.take_peer(&from_peer_id)?;
-        let to_peer_id = from_peer.to_peer();
         let to_peer = self.take_peer(&to_peer_id)?;
 
         let (from_peer, to_peer) = match (from_peer, to_peer) {
@@ -301,7 +303,7 @@ impl Actor for Room {
                     })
                     .map(|(&id, _)| id)
                     .collect();
-                //TODO: test correctness
+                // TODO: test correctness
                 if !peer_ids.is_empty() {
                     futures.push(Either::A(
                         connection
@@ -371,29 +373,72 @@ impl Handler<RpcConnectionEstablished> for Room {
             self.connections.insert(msg.member_id, msg.connection);
 
             let peer = self.member_peer(&member_id);
-            if peer.sender().is_some() {
-                fut = Either::A(future::done(
-                    self.handle_peer_created(peer.id())
-                        .and_then(|(caller, event)| {
-                            self.send_event_to_member(caller, event)
-                        })
-                        .map_err(move |err| {
-                            error!(
-                                "Member {} cannot join room, because {}. Room \
-                                 will be stop.",
-                                member_id, err
-                            );
-                            ctx.stop()
-                        }),
-                ));
+            if let Some(sender) = peer.sender() {
+                ctx.notify(StartSignaling {
+                    from_peer_id: peer.id(),
+                    to_peer_id: sender,
+                });
             }
         }
         Box::new(wrap_future(fut))
     }
 }
 
+#[derive(Debug, Message)]
+#[rtype(result = "Result<(), ()>")]
+pub struct CloseRoom {}
+
+impl Handler<CloseRoom> for Room {
+    type Result = ActFuture<(), ()>;
+
+    fn handle(
+        &mut self,
+        _msg: CloseRoom,
+        _ctx: &mut Self::Context,
+    ) -> Self::Result {
+        Box::new(wrap_future(future::ok(())))
+    }
+}
+
+#[derive(Debug, Message)]
+#[rtype(result = "Result<(), ()>")]
+pub struct StartSignaling {
+    pub from_peer_id: PeerId,
+    pub to_peer_id: PeerId,
+}
+
+impl Handler<StartSignaling> for Room {
+    type Result = ActFuture<(), ()>;
+
+    /// Receives [`Command`] from Web client and changes state of interconnected
+    /// [`Peer`]s.
+    fn handle(
+        &mut self,
+        msg: StartSignaling,
+        ctx: &mut Self::Context,
+    ) -> Self::Result {
+        let addr = ctx.address();
+        let fut =
+            match self.handle_peer_created(msg.from_peer_id, msg.to_peer_id) {
+                Ok((caller, event)) => {
+                    Either::A(self.send_event_to_member(caller, event))
+                }
+                Err(err) => Either::B(future::err(err)),
+            }
+            .map_err(move |err| {
+                error!(
+                    "Cannot start signaling between peers {} {}, because {}. \
+                     Room will be stop.",
+                    msg.from_peer_id, msg.to_peer_id, err
+                );
+                addr.do_send(CloseRoom {})
+            });
+        Box::new(wrap_future(fut))
+    }
+}
+
 impl Handler<Command> for Room {
-    type Result = ();
+    type Result = ActFuture<(), ()>;
 
     /// Receives [`Command`] from Web client and changes state of interconnected
     /// [`Peer`]s.
@@ -414,13 +459,21 @@ impl Handler<Command> for Room {
                 self.handle_set_ice_candidate(peer_id, candidate)
             }
         };
-        if let Err(err) = res.and_then(|(caller, event)| self.send_event_to_member(caller, event)) {
+        let addr = ctx.address();
+        let fut = match res {
+            Ok((caller, event)) => {
+                Either::A(self.send_event_to_member(caller, event))
+            }
+            Err(err) => Either::B(future::err(err)),
+        }
+        .map_err(move |err| {
             error!(
                 "Failed handle command, because {}. Room will be stop.",
                 err
             );
-            ctx.stop()
-        }
+            addr.do_send(CloseRoom {})
+        });
+        Box::new(wrap_future(fut))
     }
 }
 
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index ddf0be35f..19a931034 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -108,7 +108,7 @@ impl Actor for WsSession {
                 })
                 .map(|_| ())
                 .map_err(move |err| {
-                    //TODO kill socket on err
+                    // TODO kill socket on err
                     error!(
                         "WsSession of member {} failed to join Room, because: \
                          {:?}",
diff --git a/src/media/peer.rs b/src/media/peer.rs
index b1694bc08..decea0cbe 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,4 +1,4 @@
-use std::{sync::Arc};
+use std::sync::Arc;
 
 use hashbrown::HashMap;
 

From b49846761defed455a989e651b4ac3a02b2cf8d2 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 15 Apr 2019 19:56:15 +0300
Subject: [PATCH 109/179] error handling and propagation

---
 jason/src/transport/mod.rs | 43 ++++++++++++++++++++-----------
 jason/src/utils/errors.rs  | 52 +++++++++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 977a53a50..0804eca62 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -48,7 +48,9 @@ impl Transport {
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
         let on_open =
             bind_handler_fn_once("open", socket_ref, move |_: Event| {
-                pinger_rc.start(socket_rc);
+                if let Err(err) = pinger_rc.start(socket_rc) {
+                    err.log_err();
+                };
             })?;
 
         let pinger_rc = Rc::clone(&self.pinger);
@@ -62,7 +64,10 @@ impl Transport {
                 if payload.is_string() {
                     let payload = match payload.as_string() {
                         Some(payload) => { payload },
-                        None => { return; },
+                        None => {
+                            console::error_1(&JsValue::from_str("Message received from WS is not str"));
+                            return;
+                        },
                     };
 
                     if let Ok(Heartbeat::Pong(_pong)) =
@@ -73,19 +78,25 @@ impl Transport {
                             "pong received",
                         ));
                     } else {
-                        let event =
-                            serde_json::from_str::<MedeaEvent>(&payload)
-                                .unwrap();
+                        let event = match serde_json::from_str::<MedeaEvent>(&payload) {
+                            Ok(event) => {event},
+                            Err(err) => {
+                                console::error_1(&JsValue::from_str(err.description()));
+                                return;
+                            },
+                        };
 
                         // TODO: many subs, filter messages by session
-                        if let Some(sub) = subs_rc.borrow().iter().next() {
-                            sub.unbounded_send(event).unwrap();
+                        let subs_borrow = subs_rc.borrow();
+                        let sub = subs_borrow.iter().next().unwrap();
+
+                        if let Err(err) = sub.unbounded_send(event) {
+                            console::error_1(&JsValue::from_str(err.description()));
                         }
                     }
                 }
             },
-        )
-        .unwrap();
+        )?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
@@ -103,8 +114,7 @@ impl Transport {
                 socket_rc.borrow_mut().take();
                 pinger_rc.stop();
             },
-        )
-        .unwrap();
+        )?;
 
         self.on_open = Some(on_open);
         self.on_message = Some(on_message);
@@ -161,7 +171,9 @@ impl InnerPinger {
                 let msg =
                     serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
 
-                socket.send_with_str(&msg).unwrap();
+                if let Err(err) = socket.send_with_str(&msg) {
+                    console::error_1(&err);
+                }
             }
         }
     }
@@ -187,7 +199,7 @@ impl Pinger {
         self.0.borrow_mut().pong_at = Some(at);
     }
 
-    fn start(&self, socket: Rc<RefCell<Option<WebSocket>>>) {
+    fn start(&self, socket: Rc<RefCell<Option<WebSocket>>>) -> Result<(),WasmErr> {
         let mut inner = self.0.borrow_mut();
         inner.socket = socket;
         inner.send_now();
@@ -201,13 +213,14 @@ impl Pinger {
             .set_interval_with_callback_and_timeout_and_arguments_0(
                 do_ping.as_ref().unchecked_ref(),
                 inner.ping_interval,
-            )
-            .unwrap();
+            )?;
 
         inner.ping_task = Some(PingTaskHandler {
             _ping_closure: do_ping,
             _interval_handler: IntervalHandle(interval_id),
         });
+
+        Ok(())
     }
 
     fn stop(&self) {
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index ec63d143f..3d5524d12 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -1,15 +1,59 @@
 use wasm_bindgen::JsValue;
 use std::error::Error;
-use crate::utils::errors::WasmErr::JsError;
+use std::fmt::{Display, Formatter};
+use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
 pub enum WasmErr {
     JsError(JsValue),
     RustError(Box<dyn Error>),
-    NoneError(&'static str)
+    NoneError(&'static str),
 }
 
-impl From<wasm_bindgen::JsValue> for WasmErr {
+impl WasmErr {
+    pub fn log_err(&self) {
+        console::error_1(&JsValue::from_str(&format!("{}", self)));
+    }
+}
+
+impl Display for WasmErr {
+    fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
+        match self {
+            WasmErr::JsError(val) => match val.as_string() {
+                Some(reason) => { write!(f, "{}", reason) }
+                None => {write!(f, "{}", "no str representation for JsError")},
+            }
+            WasmErr::RustError(rust_err) => {
+                rust_err.fmt(f)
+            }
+            WasmErr::NoneError(reason) => {
+                write!(f, "{}", reason)
+            }
+        }
+    }
+}
+
+impl From<JsValue> for WasmErr {
     fn from(val: JsValue) -> Self {
-        JsError(val)
+        WasmErr::JsError(val)
     }
 }
+
+impl Into<JsValue> for WasmErr {
+    fn into(self) -> JsValue {
+        match self {
+            WasmErr::JsError(value) => {value},
+            WasmErr::RustError(err) => {JsValue::from_str(&format!("{}", err))},
+            WasmErr::NoneError(reason) => {JsValue::from_str(&reason)},
+        }
+    }
+}
+
+//macro_rules! impl_from_error {
+//    ($error:ty) => {
+//        impl From<$error> for Error {
+//            fn from(error: $error) -> Self {
+//                Error(error.to_string())
+//            }
+//        }
+//    }
+//}

From d1f46515eb873aa428cd4ed463a8dc1a3a714812 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 16 Apr 2019 02:20:38 +0300
Subject: [PATCH 110/179] error handling and propagation

---
 jason/src/api/session.rs   | 26 +++--------
 jason/src/transport/mod.rs | 89 +++++++++++++++++++++-----------------
 jason/src/utils/errors.rs  | 47 +++++++++++---------
 jason/src/utils/mod.rs     |  1 -
 4 files changed, 83 insertions(+), 80 deletions(-)

diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
index cc44ee1c8..7ddc885d7 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/session.rs
@@ -1,7 +1,4 @@
-use futures::{
-    stream::Stream,
-    sync::mpsc::unbounded,
-};
+use futures::{stream::Stream, sync::mpsc::unbounded};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
@@ -13,7 +10,7 @@ use crate::transport::{
 };
 
 #[wasm_bindgen]
-pub struct SessionHandle (Session);
+pub struct SessionHandle(Session);
 
 #[wasm_bindgen]
 impl SessionHandle {}
@@ -26,11 +23,10 @@ impl Session {
     }
 
     pub fn new_handle(&self) -> SessionHandle {
-        SessionHandle (Session(Rc::clone(&self.0)))
+        SessionHandle(Session(Rc::clone(&self.0)))
     }
 
     pub fn subscribe(&self, transport: &Transport) {
-
         let (tx, rx) = unbounded();
         transport.add_sub(tx);
 
@@ -75,9 +71,7 @@ struct InnerSession {
 
 impl InnerSession {
     fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
-        Rc::new(RefCell::new(Self {
-            transport
-        }))
+        Rc::new(RefCell::new(Self { transport }))
     }
 
     fn on_peer_created(
@@ -86,15 +80,11 @@ impl InnerSession {
         sdp_offer: Option<String>,
         tracks: Vec<DirectionalTrack>,
     ) {
-        console::log_1(&JsValue::from_str(
-            "on_peer_created invoked",
-        ));
+        console::log_1(&JsValue::from_str("on_peer_created invoked"));
     }
 
     fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
-        console::log_1(&JsValue::from_str(
-            "on_sdp_answer invoked",
-        ));
+        console::log_1(&JsValue::from_str("on_sdp_answer invoked"));
     }
 
     fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
@@ -104,8 +94,6 @@ impl InnerSession {
     }
 
     fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
-        console::log_1(&JsValue::from_str(
-            "on_peers_removed invoked",
-        ));
+        console::log_1(&JsValue::from_str("on_peers_removed invoked"));
     }
 }
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 0804eca62..4331c370a 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -7,7 +7,9 @@ use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
 use std::{cell::RefCell, rc::Rc, vec};
 
-use crate::utils::{bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle, WasmErr};
+use crate::utils::{
+    bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle, WasmErr,
+};
 
 use self::protocol::{Command, Event as MedeaEvent, Heartbeat};
 use std::error::Error;
@@ -38,11 +40,13 @@ impl Transport {
         }
     }
 
-    pub fn init(&mut self) -> Result<(), WasmErr>{
+    pub fn init(&mut self) -> Result<(), WasmErr> {
         let socket = WebSocket::new(&self.token)?;
         let socket = Rc::new(RefCell::new(Some(socket)));
         let socket_borrow = socket.borrow();
-        let socket_ref = socket_borrow.as_ref().ok_or(WasmErr::NoneError("socket is none"))?;
+        let socket_ref = socket_borrow
+            .as_ref()
+            .ok_or(WasmErr::NoneError("socket is none"))?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
@@ -63,27 +67,31 @@ impl Transport {
 
                 if payload.is_string() {
                     let payload = match payload.as_string() {
-                        Some(payload) => { payload },
+                        Some(payload) => payload,
                         None => {
-                            console::error_1(&JsValue::from_str("Message received from WS is not str"));
+                            console::error_1(&JsValue::from_str(
+                                "Message received from WS is not str",
+                            ));
                             return;
-                        },
+                        }
                     };
 
                     if let Ok(Heartbeat::Pong(_pong)) =
                         serde_json::from_str::<Heartbeat>(&payload)
                     {
                         pinger_rc.set_pong_at(Date::now());
-                        console::log_1(&JsValue::from_str(
-                            "pong received",
-                        ));
+                        console::log_1(&JsValue::from_str("pong received"));
                     } else {
-                        let event = match serde_json::from_str::<MedeaEvent>(&payload) {
-                            Ok(event) => {event},
+                        let event = match serde_json::from_str::<MedeaEvent>(
+                            &payload,
+                        ) {
+                            Ok(event) => event,
                             Err(err) => {
-                                console::error_1(&JsValue::from_str(err.description()));
+                                console::error_1(&JsValue::from_str(
+                                    err.description(),
+                                ));
                                 return;
-                            },
+                            }
                         };
 
                         // TODO: many subs, filter messages by session
@@ -91,7 +99,9 @@ impl Transport {
                         let sub = subs_borrow.iter().next().unwrap();
 
                         if let Err(err) = sub.unbounded_send(event) {
-                            console::error_1(&JsValue::from_str(err.description()));
+                            console::error_1(&JsValue::from_str(
+                                err.description(),
+                            ));
                         }
                     }
                 }
@@ -104,13 +114,11 @@ impl Transport {
             "close",
             socket_ref,
             move |close: CloseEvent| {
-                console::log_1(&JsValue::from_str(
-                    &format!(
-                        "Close [code: {}, reason: {}]",
-                        close.code(),
-                        close.reason()
-                    ),
-                ));
+                console::log_1(&JsValue::from_str(&format!(
+                    "Close [code: {}, reason: {}]",
+                    close.code(),
+                    close.reason()
+                )));
                 socket_rc.borrow_mut().take();
                 pinger_rc.stop();
             },
@@ -132,7 +140,7 @@ impl Transport {
     pub fn send_command(&self, command: &Command) {
         let socket_borrow = self.sock.borrow();
 
-        // TODO: no socket?
+        // TODO: no socket? we dont really want this method to return err
         if let Some(socket) = socket_borrow.as_ref() {
             let msg = serde_json::to_string(&command).unwrap();
 
@@ -163,19 +171,14 @@ struct InnerPinger {
 }
 
 impl InnerPinger {
-    fn send_now(&mut self) {
-        if let Ok(socket) = self.socket.try_borrow() {
-            if let Some(socket) = socket.as_ref() {
-                self.num += 1;
-
-                let msg =
-                    serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
-
-                if let Err(err) = socket.send_with_str(&msg) {
-                    console::error_1(&err);
-                }
-            }
-        }
+    fn send_now(&mut self) -> Result<(), WasmErr> {
+        let borrow = self.socket.try_borrow()?;
+        let socket = borrow
+            .as_ref()
+            .ok_or(WasmErr::NoneError("Unable to ping: no socket"))?;
+        self.num += 1;
+        let msg = serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
+        socket.send_with_str(&msg).map_err(|e| WasmErr::from(e))
     }
 }
 
@@ -199,15 +202,21 @@ impl Pinger {
         self.0.borrow_mut().pong_at = Some(at);
     }
 
-    fn start(&self, socket: Rc<RefCell<Option<WebSocket>>>) -> Result<(),WasmErr> {
+    fn start(
+        &self,
+        socket: Rc<RefCell<Option<WebSocket>>>,
+    ) -> Result<(), WasmErr> {
         let mut inner = self.0.borrow_mut();
         inner.socket = socket;
-        inner.send_now();
+        inner.send_now()?;
 
         let inner_rc = Rc::clone(&self.0);
-        let do_ping = Closure::wrap(Box::new(move || {
-            inner_rc.borrow_mut().send_now();
-        }) as Box<dyn FnMut()>);
+        let do_ping = Closure::wrap(Box::new(
+            move || {
+                // its_ok if ping fails few times
+                inner_rc.borrow_mut().send_now().is_ok();
+            },
+        ) as Box<dyn FnMut()>);
 
         let interval_id = window()
             .set_interval_with_callback_and_timeout_and_arguments_0(
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index 3d5524d12..0f317e665 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -1,12 +1,13 @@
-use wasm_bindgen::JsValue;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
+use wasm_bindgen::JsValue;
 use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
 pub enum WasmErr {
     JsError(JsValue),
     RustError(Box<dyn Error>),
     NoneError(&'static str),
+    Other(String),
 }
 
 impl WasmErr {
@@ -19,15 +20,12 @@ impl Display for WasmErr {
     fn fmt(&self, f: &mut Formatter) -> std::fmt::Result {
         match self {
             WasmErr::JsError(val) => match val.as_string() {
-                Some(reason) => { write!(f, "{}", reason) }
-                None => {write!(f, "{}", "no str representation for JsError")},
-            }
-            WasmErr::RustError(rust_err) => {
-                rust_err.fmt(f)
-            }
-            WasmErr::NoneError(reason) => {
-                write!(f, "{}", reason)
-            }
+                Some(reason) => write!(f, "{}", reason),
+                None => write!(f, "{}", "no str representation for JsError"),
+            },
+            WasmErr::RustError(rust_err) => rust_err.fmt(f),
+            WasmErr::NoneError(reason) => write!(f, "{}", reason),
+            WasmErr::Other(reason) => write!(f, "{}", reason),
         }
     }
 }
@@ -41,19 +39,28 @@ impl From<JsValue> for WasmErr {
 impl Into<JsValue> for WasmErr {
     fn into(self) -> JsValue {
         match self {
-            WasmErr::JsError(value) => {value},
-            WasmErr::RustError(err) => {JsValue::from_str(&format!("{}", err))},
-            WasmErr::NoneError(reason) => {JsValue::from_str(&reason)},
+            WasmErr::JsError(value) => value,
+            WasmErr::RustError(err) => JsValue::from_str(&format!("{}", err)),
+            WasmErr::NoneError(reason) => JsValue::from_str(reason),
+            WasmErr::Other(reason) => JsValue::from_str(&reason),
         }
     }
 }
 
-//macro_rules! impl_from_error {
-//    ($error:ty) => {
-//        impl From<$error> for Error {
-//            fn from(error: $error) -> Self {
-//                Error(error.to_string())
-//            }
-//        }
+macro_rules! impl_from_error {
+    ($error:ty) => {
+        impl From<$error> for WasmErr {
+            fn from(error: $error) -> Self {
+                WasmErr::Other(format!("{}", error))
+            }
+        }
+    };
+}
+
+impl_from_error!(std::cell::BorrowError);
+
+// impl From<std::cell::BorrowError> for WasmErr {
+//    fn from(val: JsValue) -> Self {
+//        WasmErr::JsError(val)
 //    }
 //}
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 12c237b93..97acd59bc 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -1,4 +1,3 @@
-
 mod errors;
 
 pub use self::errors::WasmErr;

From 81ebfba63da6eea20ec0300c039a93d8f611592c Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 16 Apr 2019 15:43:13 +0300
Subject: [PATCH 111/179] error handling and propagation

---
 jason/src/transport/mod.rs |  6 +++---
 jason/src/utils/errors.rs  | 38 ++++++++++++++++----------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 4331c370a..4e9f56d79 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -46,7 +46,7 @@ impl Transport {
         let socket_borrow = socket.borrow();
         let socket_ref = socket_borrow
             .as_ref()
-            .ok_or(WasmErr::NoneError("socket is none"))?;
+            .ok_or(WasmErr::from_str("socket is none"))?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
@@ -175,9 +175,9 @@ impl InnerPinger {
         let borrow = self.socket.try_borrow()?;
         let socket = borrow
             .as_ref()
-            .ok_or(WasmErr::NoneError("Unable to ping: no socket"))?;
+            .ok_or(WasmErr::from_str("Unable to ping: no socket"))?;
         self.num += 1;
-        let msg = serde_json::to_string(&Heartbeat::Ping(self.num)).unwrap();
+        let msg = serde_json::to_string(&Heartbeat::Ping(self.num))?;
         socket.send_with_str(&msg).map_err(|e| WasmErr::from(e))
     }
 }
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index 0f317e665..c5e56377b 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -2,18 +2,21 @@ use std::error::Error;
 use std::fmt::{Display, Formatter};
 use wasm_bindgen::JsValue;
 use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
+use std::borrow::Cow;
 
 pub enum WasmErr {
     JsError(JsValue),
-    RustError(Box<dyn Error>),
-    NoneError(&'static str),
-    Other(String),
+    Other(Cow<'static, str>),
 }
 
 impl WasmErr {
     pub fn log_err(&self) {
         console::error_1(&JsValue::from_str(&format!("{}", self)));
     }
+
+    pub fn from_str(msg: &'static str) -> WasmErr {
+        WasmErr::Other(msg.into())
+    }
 }
 
 impl Display for WasmErr {
@@ -23,8 +26,6 @@ impl Display for WasmErr {
                 Some(reason) => write!(f, "{}", reason),
                 None => write!(f, "{}", "no str representation for JsError"),
             },
-            WasmErr::RustError(rust_err) => rust_err.fmt(f),
-            WasmErr::NoneError(reason) => write!(f, "{}", reason),
             WasmErr::Other(reason) => write!(f, "{}", reason),
         }
     }
@@ -36,31 +37,24 @@ impl From<JsValue> for WasmErr {
     }
 }
 
-impl Into<JsValue> for WasmErr {
-    fn into(self) -> JsValue {
-        match self {
-            WasmErr::JsError(value) => value,
-            WasmErr::RustError(err) => JsValue::from_str(&format!("{}", err)),
-            WasmErr::NoneError(reason) => JsValue::from_str(reason),
-            WasmErr::Other(reason) => JsValue::from_str(&reason),
-        }
-    }
-}
+//impl Into<JsValue> for WasmErr {
+//    fn into(self) -> JsValue {
+//        match self {
+//            WasmErr::JsError(value) => value,
+//            WasmErr::Other(reason) => JsValue::from_str(&reason),
+//        }
+//    }
+//}
 
 macro_rules! impl_from_error {
     ($error:ty) => {
         impl From<$error> for WasmErr {
             fn from(error: $error) -> Self {
-                WasmErr::Other(format!("{}", error))
+                WasmErr::Other(format!("{}", error).into())
             }
         }
     };
 }
 
 impl_from_error!(std::cell::BorrowError);
-
-// impl From<std::cell::BorrowError> for WasmErr {
-//    fn from(val: JsValue) -> Self {
-//        WasmErr::JsError(val)
-//    }
-//}
+impl_from_error!(serde_json::error::Error);

From ae869fdd40abd89189ada0a16903cc23850b1050 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 16 Apr 2019 15:50:58 +0300
Subject: [PATCH 112/179] error handling and propagation

---
 jason/src/api/jason.rs    |  6 +++---
 jason/src/utils/errors.rs | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index e509e5fee..dd65e438f 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -25,9 +25,9 @@ impl Jason {
         }
     }
 
-    pub fn init_session(&mut self, token: String) -> SessionHandle {
+    pub fn init_session(&mut self, token: String) -> Result<SessionHandle, JsValue> {
         let mut transport = Transport::new(token, 3000);
-        transport.init();
+        transport.init()?;
         let transport = Rc::new(transport);
 
         let session = Session::new(Rc::clone(&transport));
@@ -38,6 +38,6 @@ impl Jason {
         self.sessions.push(Rc::new(session));
         self.transport = Some(transport);
 
-        handle
+        Ok(handle)
     }
 }
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index c5e56377b..067d0602e 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -37,14 +37,14 @@ impl From<JsValue> for WasmErr {
     }
 }
 
-//impl Into<JsValue> for WasmErr {
-//    fn into(self) -> JsValue {
-//        match self {
-//            WasmErr::JsError(value) => value,
-//            WasmErr::Other(reason) => JsValue::from_str(&reason),
-//        }
-//    }
-//}
+impl From<WasmErr> for JsValue {
+    fn from(err: WasmErr) -> Self {
+        match err {
+            WasmErr::JsError(value) => value,
+            WasmErr::Other(reason) => JsValue::from_str(&reason),
+        }
+    }
+}
 
 macro_rules! impl_from_error {
     ($error:ty) => {

From 7bf48f0bb098d24a261e15c9ef3442cb85de1f75 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 16 Apr 2019 16:17:46 +0300
Subject: [PATCH 113/179] Make linter happy

---
 src/api/client/events.rs         |   4 +-
 src/api/client/room.rs           | 317 +++++++++++++++----------------
 src/api/client/rpc_connection.rs |  18 +-
 src/api/client/server.rs         |  23 ++-
 src/api/client/session.rs        |  24 ++-
 src/main.rs                      |  34 +---
 src/media/mod.rs                 |   6 +-
 src/media/peer.rs                | 144 +++++++++-----
 src/media/track.rs               |  16 +-
 9 files changed, 289 insertions(+), 297 deletions(-)

diff --git a/src/api/client/events.rs b/src/api/client/events.rs
index 0450ae10c..0dce32695 100644
--- a/src/api/client/events.rs
+++ b/src/api/client/events.rs
@@ -1,7 +1,7 @@
 use actix::Message;
 use serde::{Deserialize, Serialize};
 
-use crate::media::{peer::Id as PeerId, track::DirectionalTrack};
+use crate::media::{peer::Id as PeerId, track::Directional};
 
 /// WebSocket message from Media Server to Web Client.
 #[derive(Clone, Debug, Deserialize, Message, Serialize)]
@@ -11,7 +11,7 @@ pub enum Event {
     PeerCreated {
         peer_id: PeerId,
         sdp_offer: Option<String>,
-        tracks: Vec<DirectionalTrack>,
+        tracks: Vec<Directional>,
     },
     /// Media Server notifies Web Client about necessity to apply specified SDP
     /// Answer to Web Client's RTCPeerConnection.
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index d431d766c..5940ee585 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -6,8 +6,8 @@ use std::{
 };
 
 use actix::{
-    fut::wrap_future, Actor, ActorContext, ActorFuture, Addr, AsyncContext,
-    Context, Handler, Message, Running, SpawnHandle,
+    fut::wrap_future, Actor, ActorFuture, Addr, AsyncContext, Context, Handler,
+    Message, SpawnHandle,
 };
 use failure::Fail;
 use futures::{
@@ -18,19 +18,17 @@ use hashbrown::HashMap;
 
 use crate::{
     api::client::rpc_connection::{
-        AuthorizeRpcConnection, RpcConnection, RpcConnectionAuthorizationError,
-        RpcConnectionClosed, RpcConnectionClosedReason,
-        RpcConnectionEstablished,
+        AuthorizationError, Authorize, Closed, ClosedReason, Established,
+        RpcConnection,
     },
     api::client::{Command, Event},
     api::control::{Id as MemberId, Member},
     log::prelude::*,
-    media::peer::{Id as PeerId, PeerMachine},
+    media::peer::{Id as PeerId, SignalingStateMachine},
 };
-use slog::Drain;
 
 #[derive(Fail, Debug)]
-pub enum RoomError {
+pub enum Error {
     #[fail(display = "Unknown peer {}", _0)]
     UnknownPeer(PeerId),
     #[fail(display = "Unmatched states between peers {} and {}", _0, _1)]
@@ -64,7 +62,7 @@ pub struct Room {
     members: HashMap<MemberId, Member>,
 
     /// [`Peer`]s of [`Member`]s in this [`Room`].
-    peers: HashMap<PeerId, PeerMachine>,
+    peers: HashMap<PeerId, SignalingStateMachine>,
 }
 
 impl Room {
@@ -72,10 +70,10 @@ impl Room {
     pub fn new(
         id: Id,
         members: HashMap<MemberId, Member>,
-        peers: HashMap<PeerId, PeerMachine>,
+        peers: HashMap<PeerId, SignalingStateMachine>,
         connection_timeout: Duration,
     ) -> Self {
-        Room {
+        Self {
             id,
             connections: HashMap::new(),
             idle_timeouts: HashMap::new(),
@@ -86,21 +84,24 @@ impl Room {
     }
 
     /// Store [`Peer`] in [`Room`].
-    fn add_peer(&mut self, id: PeerId, peer: PeerMachine) {
+    fn add_peer(&mut self, id: PeerId, peer: SignalingStateMachine) {
         self.peers.insert(id, peer);
     }
 
     /// Returns borrowed [`Peer`] by its ID.
-    fn get_peer(&self, peer_id: &PeerId) -> Result<&PeerMachine, RoomError> {
+    fn get_peer(
+        &self,
+        peer_id: PeerId,
+    ) -> Result<&SignalingStateMachine, Error> {
         self.peers
-            .get(peer_id)
-            .ok_or(RoomError::UnknownPeer(*peer_id))
+            .get(&peer_id)
+            .ok_or_else(|| Error::UnknownPeer(peer_id))
     }
 
     /// Returns [`Peer`] of specified [`Member`].
     ///
     /// Panic if [`Peer`] not exists.
-    fn member_peer(&self, member_id: &MemberId) -> &PeerMachine {
+    fn member_peer(&self, member_id: &MemberId) -> &SignalingStateMachine {
         self.peers
             .iter()
             .find(|(_, peer)| peer.member_id() == *member_id)
@@ -111,28 +112,27 @@ impl Room {
     /// Returns owned [`Peer`] by its ID.
     fn take_peer(
         &mut self,
-        peer_id: &PeerId,
-    ) -> Result<PeerMachine, RoomError> {
+        peer_id: PeerId,
+    ) -> Result<SignalingStateMachine, Error> {
         self.peers
-            .remove(peer_id)
-            .ok_or(RoomError::UnknownPeer(*peer_id))
+            .remove(&peer_id)
+            .ok_or_else(|| Error::UnknownPeer(peer_id))
     }
 
     /// Send [`Event`] to specified remote [`Member`].
-    /// TODO: -> impl Future<(), RoomError>
     fn send_event_to_member(
         &mut self,
         member_id: MemberId,
         event: Event,
-    ) -> impl Future<Item = (), Error = RoomError> {
+    ) -> impl Future<Item = (), Error = Error> {
         match self.connections.get(&member_id) {
             Some(conn) => Either::A(
                 conn.send_event(event)
-                    .map_err(move |_| RoomError::UnableSendEvent(member_id)),
+                    .map_err(move |_| Error::UnableSendEvent(member_id)),
             ),
-            None => Either::B(future::err(RoomError::ConnectionNotExists(
-                member_id,
-            ))),
+            None => {
+                Either::B(future::err(Error::ConnectionNotExists(member_id)))
+            }
         }
     }
 
@@ -142,18 +142,19 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         to_peer_id: PeerId,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_peer = self.take_peer(&from_peer_id)?;
-        let to_peer = self.take_peer(&to_peer_id)?;
+    ) -> Result<(MemberId, Event), Error> {
+        let from_peer = self.take_peer(from_peer_id)?;
+        let to_peer = self.take_peer(to_peer_id)?;
 
         let (from_peer, to_peer) = match (from_peer, to_peer) {
-            (PeerMachine::New(peer_from), PeerMachine::New(peer_to)) => {
-                Ok((peer_from, peer_to))
-            }
+            (
+                SignalingStateMachine::New(peer_from),
+                SignalingStateMachine::New(peer_to),
+            ) => Ok((peer_from, peer_to)),
             (from_peer, to_peer) => {
                 self.add_peer(from_peer_id, from_peer);
                 self.add_peer(to_peer_id, to_peer);
-                Err(RoomError::UnmatchedState(from_peer_id, to_peer_id))
+                Err(Error::UnmatchedState(from_peer_id, to_peer_id))
             }
         }?;
 
@@ -166,8 +167,8 @@ impl Room {
             tracks: to_peer.tracks(),
         };
 
-        self.add_peer(from_peer_id, PeerMachine::New(from_peer));
-        self.add_peer(to_peer_id, PeerMachine::WaitLocalSDP(to_peer));
+        self.add_peer(from_peer_id, SignalingStateMachine::New(from_peer));
+        self.add_peer(to_peer_id, SignalingStateMachine::WaitLocalSDP(to_peer));
         Ok((to_member_id, event))
     }
 
@@ -177,20 +178,20 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         sdp_offer: String,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_peer = self.take_peer(&from_peer_id)?;
+    ) -> Result<(MemberId, Event), Error> {
+        let from_peer = self.take_peer(from_peer_id)?;
         let to_peer_id = from_peer.to_peer();
-        let to_peer = self.take_peer(&to_peer_id)?;
+        let to_peer = self.take_peer(to_peer_id)?;
 
         let (from_peer, to_peer) = match (from_peer, to_peer) {
             (
-                PeerMachine::WaitLocalSDP(peer_from),
-                PeerMachine::New(peer_to),
+                SignalingStateMachine::WaitLocalSDP(peer_from),
+                SignalingStateMachine::New(peer_to),
             ) => Ok((peer_from, peer_to)),
             (from_peer, to_peer) => {
                 self.add_peer(from_peer_id, from_peer);
                 self.add_peer(to_peer_id, to_peer);
-                Err(RoomError::UnmatchedState(from_peer_id, to_peer_id))
+                Err(Error::UnmatchedState(from_peer_id, to_peer_id))
             }
         }?;
 
@@ -204,8 +205,14 @@ impl Room {
             tracks: to_peer.tracks(),
         };
 
-        self.add_peer(from_peer_id, PeerMachine::WaitRemoteSDP(from_peer));
-        self.add_peer(to_peer_id, PeerMachine::WaitLocalHaveRemote(to_peer));
+        self.add_peer(
+            from_peer_id,
+            SignalingStateMachine::WaitRemoteSDP(from_peer),
+        );
+        self.add_peer(
+            to_peer_id,
+            SignalingStateMachine::WaitLocalHaveRemote(to_peer),
+        );
         Ok((to_member_id, event))
     }
 
@@ -215,25 +222,25 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         sdp_answer: String,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_peer = self.take_peer(&from_peer_id)?;
+    ) -> Result<(MemberId, Event), Error> {
+        let from_peer = self.take_peer(from_peer_id)?;
         let to_peer_id = from_peer.to_peer();
-        let to_peer = self.take_peer(&to_peer_id)?;
+        let to_peer = self.take_peer(to_peer_id)?;
 
         let (from_peer, to_peer) = match (from_peer, to_peer) {
             (
-                PeerMachine::WaitLocalHaveRemote(peer_from),
-                PeerMachine::WaitRemoteSDP(peer_to),
+                SignalingStateMachine::WaitLocalHaveRemote(peer_from),
+                SignalingStateMachine::WaitRemoteSDP(peer_to),
             ) => Ok((peer_from, peer_to)),
             (from_peer, to_peer) => {
                 self.add_peer(from_peer_id, from_peer);
                 self.add_peer(to_peer_id, to_peer);
-                Err(RoomError::UnmatchedState(from_peer_id, to_peer_id))
+                Err(Error::UnmatchedState(from_peer_id, to_peer_id))
             }
         }?;
 
         let from_peer = from_peer.set_local_sdp(sdp_answer.clone());
-        let to_peer = to_peer.set_remote_sdp(sdp_answer.clone());
+        let to_peer = to_peer.set_remote_sdp(&sdp_answer);
 
         let to_member_id = to_peer.member_id();
         let event = Event::SdpAnswerMade {
@@ -241,8 +248,8 @@ impl Room {
             sdp_answer,
         };
 
-        self.add_peer(from_peer_id, PeerMachine::Stable(from_peer));
-        self.add_peer(to_peer_id, PeerMachine::Stable(to_peer));
+        self.add_peer(from_peer_id, SignalingStateMachine::Stable(from_peer));
+        self.add_peer(to_peer_id, SignalingStateMachine::Stable(to_peer));
         Ok((to_member_id, event))
     }
 
@@ -251,22 +258,25 @@ impl Room {
         &mut self,
         from_peer_id: PeerId,
         candidate: String,
-    ) -> Result<(MemberId, Event), RoomError> {
-        let from_peer = self.get_peer(&from_peer_id)?;
+    ) -> Result<(MemberId, Event), Error> {
+        let from_peer = self.get_peer(from_peer_id)?;
         let to_peer_id = from_peer.to_peer();
-        let to_peer = self.get_peer(&to_peer_id)?;
+        let to_peer = self.get_peer(to_peer_id)?;
 
         match (from_peer, to_peer) {
             (
-                PeerMachine::WaitRemoteSDP(_),
-                PeerMachine::WaitLocalHaveRemote(_),
+                SignalingStateMachine::WaitRemoteSDP(_),
+                SignalingStateMachine::WaitLocalHaveRemote(_),
             )
             | (
-                PeerMachine::WaitLocalHaveRemote(_),
-                PeerMachine::WaitRemoteSDP(_),
+                SignalingStateMachine::WaitLocalHaveRemote(_),
+                SignalingStateMachine::WaitRemoteSDP(_),
             )
-            | (PeerMachine::Stable(_), PeerMachine::Stable(_)) => Ok(()),
-            _ => Err(RoomError::UnmatchedState(from_peer_id, to_peer_id)),
+            | (
+                SignalingStateMachine::Stable(_),
+                SignalingStateMachine::Stable(_),
+            ) => Ok(()),
+            _ => Err(Error::UnmatchedState(from_peer_id, to_peer_id)),
         }?;
 
         let to_member_id = to_peer.member_id();
@@ -282,58 +292,18 @@ impl Room {
 /// to interact with [`Room`].
 impl Actor for Room {
     type Context = Context<Self>;
-
-    /// Closes all active [`PrcConnection`].
-    fn stopping(&mut self, ctx: &mut Self::Context) -> Running {
-        use std::mem;
-        let connections = mem::replace(&mut self.connections, hashmap!());
-        let fut = connections.into_iter().fold(
-            vec![],
-            |mut futures, (member_id, mut connection)| {
-                info!(
-                    "Close connection of member {}, because room is stopped",
-                    member_id,
-                );
-                let peer_ids: Vec<_> = self
-                    .peers
-                    .iter()
-                    .filter(move |(_, peer)| match peer {
-                        PeerMachine::New(_) => false,
-                        _ => peer.member_id() == member_id,
-                    })
-                    .map(|(&id, _)| id)
-                    .collect();
-                // TODO: test correctness
-                if !peer_ids.is_empty() {
-                    futures.push(Either::A(
-                        connection
-                            .send_event(Event::PeersRemoved { peer_ids })
-                            .then(move |_| connection.close()),
-                    ));
-                } else {
-                    futures.push(Either::B(connection.close()));
-                }
-
-                futures
-            },
-        );
-        ctx.wait(wrap_future(join_all(fut).map(|_| ())));
-        Running::Continue
-    }
 }
 
-impl Handler<AuthorizeRpcConnection> for Room {
-    type Result = Result<(), RpcConnectionAuthorizationError>;
+impl Handler<Authorize> for Room {
+    type Result = Result<(), AuthorizationError>;
 
     /// Responses with `Ok` if `RpcConnection` is authorized, otherwise `Err`s.
     fn handle(
         &mut self,
-        msg: AuthorizeRpcConnection,
+        msg: Authorize,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        use RpcConnectionAuthorizationError::{
-            InvalidCredentials, MemberNotExists,
-        };
+        use AuthorizationError::{InvalidCredentials, MemberNotExists};
         if let Some(ref member) = self.members.get(&msg.member_id) {
             if member.credentials.eq(&msg.credentials) {
                 return Ok(());
@@ -347,16 +317,19 @@ impl Handler<AuthorizeRpcConnection> for Room {
 /// Ergonomic type alias for using [`ActorFuture`] for [`Room`].
 type ActFuture<I, E> = Box<dyn ActorFuture<Actor = Room, Item = I, Error = E>>;
 
-impl Handler<RpcConnectionEstablished> for Room {
+impl Handler<Established> for Room {
     type Result = ActFuture<(), ()>;
 
     /// Stores provided [`RpcConnection`] for given [`Member`] in the [`Room`].
     ///
     /// If [`Member`] already has any other [`RpcConnection`],
     /// then it will be closed.
+    ///
+    /// If [`Peer`] of this [`Member`] have sender, sends notify about
+    /// start process of signaling.
     fn handle(
         &mut self,
-        msg: RpcConnectionEstablished,
+        msg: Established,
         ctx: &mut Self::Context,
     ) -> Self::Result {
         info!("RpcConnectionEstablished for member {}", msg.member_id);
@@ -384,22 +357,57 @@ impl Handler<RpcConnectionEstablished> for Room {
     }
 }
 
+/// Signal of close [`Room`].
 #[derive(Debug, Message)]
 #[rtype(result = "Result<(), ()>")]
-pub struct CloseRoom {}
+pub struct Close {}
 
-impl Handler<CloseRoom> for Room {
+impl Handler<Close> for Room {
     type Result = ActFuture<(), ()>;
 
+    /// Sends to remote [`Member`] the [`Event`] about [`Peer`] removed.
+    /// Closes all active [`PrcConnection`].
     fn handle(
         &mut self,
-        _msg: CloseRoom,
+        _msg: Close,
         _ctx: &mut Self::Context,
     ) -> Self::Result {
-        Box::new(wrap_future(future::ok(())))
+        use std::mem;
+        let connections = mem::replace(&mut self.connections, HashMap::new());
+        let fut = connections.into_iter().fold(
+            vec![],
+            |mut futures, (member_id, mut connection)| {
+                info!(
+                    "Close connection of member {}, because room is closed",
+                    member_id,
+                );
+                let peer_ids: Vec<_> = self
+                    .peers
+                    .iter()
+                    .filter_map(move |(&id, peer)| match peer {
+                        SignalingStateMachine::New(_) => None,
+                        _ if peer.member_id() == member_id => Some(id),
+                        _ => None,
+                    })
+                    .collect();
+                if peer_ids.is_empty() {
+                    futures.push(Either::A(connection.close()));
+                } else {
+                    futures.push(Either::B(
+                        connection
+                            .send_event(Event::PeersRemoved { peer_ids })
+                            .then(move |_| connection.close()),
+                    ));
+                }
+
+                futures
+            },
+        );
+        Box::new(wrap_future(join_all(fut).map(|_| ())))
     }
 }
 
+/// Signal of start signaling between specified [`Peer`]'s.
 #[derive(Debug, Message)]
 #[rtype(result = "Result<(), ()>")]
 pub struct StartSignaling {
@@ -410,8 +418,8 @@ pub struct StartSignaling {
 impl Handler<StartSignaling> for Room {
     type Result = ActFuture<(), ()>;
 
-    /// Receives [`Command`] from Web client and changes state of interconnected
-    /// [`Peer`]s.
+    /// Check state of interconnected [`Peer`]s and sends [`Event`] about
+    /// [`Peer`] created to remote [`Member`].
     fn handle(
         &mut self,
         msg: StartSignaling,
@@ -427,11 +435,11 @@ impl Handler<StartSignaling> for Room {
             }
             .map_err(move |err| {
                 error!(
-                    "Cannot start signaling between peers {} {}, because {}. \
-                     Room will be stop.",
+                    "Cannot start signaling between peers {} and {}, because \
+                     {}. Room will be stop.",
                     msg.from_peer_id, msg.to_peer_id, err
                 );
-                addr.do_send(CloseRoom {})
+                addr.do_send(Close {})
             });
         Box::new(wrap_future(fut))
     }
@@ -471,17 +479,17 @@ impl Handler<Command> for Room {
                 "Failed handle command, because {}. Room will be stop.",
                 err
             );
-            addr.do_send(CloseRoom {})
+            addr.do_send(Close {})
         });
         Box::new(wrap_future(fut))
     }
 }
 
-impl Handler<RpcConnectionClosed> for Room {
+impl Handler<Closed> for Room {
     type Result = ();
 
     /// Removes [`RpcConnection`] of specified [`Member`] from the [`Room`].
-    fn handle(&mut self, msg: RpcConnectionClosed, ctx: &mut Self::Context) {
+    fn handle(&mut self, msg: Closed, ctx: &mut Self::Context) {
         info!(
             "RpcConnectionClosed for member {}, reason {:?}",
             msg.member_id, msg.reason
@@ -489,11 +497,11 @@ impl Handler<RpcConnectionClosed> for Room {
         let closed_at = Instant::now();
         let member_id = msg.member_id;
         match msg.reason {
-            RpcConnectionClosedReason::Disconnected => {
+            ClosedReason::Disconnected => {
                 self.connections.remove(&member_id);
-                ctx.stop()
+                ctx.notify(Close {})
             }
-            RpcConnectionClosedReason::Idle => {
+            ClosedReason::Idle => {
                 self.idle_timeouts.insert(
                     msg.member_id,
                     ctx.run_later(self.connection_timeout, move |room, ctx| {
@@ -503,7 +511,7 @@ impl Handler<RpcConnectionClosed> for Room {
                             member_id, closed_at
                         );
                         room.connections.remove(&member_id);
-                        ctx.stop()
+                        ctx.notify(Close {})
                     }),
                 );
             }
@@ -541,8 +549,9 @@ mod test {
 
     use super::*;
     use crate::media::{
-        track::{DirectionalTrack, TrackDirection},
-        AudioSettings, Peer, Track, TrackMediaType, VideoSettings,
+        peer::create_peers,
+        track::{Direction, Directional},
+        AudioSettings, MediaType, VideoSettings,
     };
 
     #[derive(Debug, Clone)]
@@ -558,7 +567,7 @@ mod test {
 
         fn started(&mut self, ctx: &mut Self::Context) {
             self.room
-                .try_send(RpcConnectionEstablished {
+                .try_send(Established {
                     member_id: self.member_id,
                     connection: Box::new(ctx.address()),
                 })
@@ -616,9 +625,9 @@ mod test {
                     peer_id: _,
                     candidate: _,
                 } => {
-                    self.room.do_send(RpcConnectionClosed {
+                    self.room.do_send(Closed {
                         member_id: self.member_id,
-                        reason: RpcConnectionClosedReason::Disconnected,
+                        reason: ClosedReason::Disconnected,
                     });
                 }
                 Event::PeersRemoved { peer_ids: _ } => {}
@@ -651,30 +660,6 @@ mod test {
         })
     }
 
-    fn create_peers(
-        caller: MemberId,
-        callee: MemberId,
-    ) -> HashMap<MemberId, PeerMachine> {
-        let caller_peer_id = 1;
-        let callee_peer_id = 2;
-        let mut caller_peer = Peer::new(caller_peer_id, caller, callee_peer_id);
-        let mut callee_peer = Peer::new(callee_peer_id, callee, caller_peer_id);
-
-        let track_audio =
-            Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
-        let track_video =
-            Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
-        caller_peer.add_sender(track_audio.clone());
-        caller_peer.add_sender(track_video.clone());
-        callee_peer.add_receiver(track_audio);
-        callee_peer.add_receiver(track_video);
-
-        hashmap!(
-            caller_peer_id => PeerMachine::New(caller_peer),
-            callee_peer_id => PeerMachine::New(callee_peer),
-        )
-    }
-
     #[test]
     fn start_signaling() {
         let stopped = Arc::new(AtomicUsize::new(0));
@@ -711,19 +696,15 @@ mod test {
                     peer_id: 1,
                     sdp_offer: None,
                     tracks: vec![
-                        DirectionalTrack {
+                        Directional {
                             id: 1,
-                            direction: TrackDirection::Send {
-                                receivers: vec![2]
-                            },
-                            media_type: TrackMediaType::Audio(AudioSettings {}),
+                            direction: Direction::Send { receivers: vec![2] },
+                            media_type: MediaType::Audio(AudioSettings {}),
                         },
-                        DirectionalTrack {
+                        Directional {
                             id: 2,
-                            direction: TrackDirection::Send {
-                                receivers: vec![2]
-                            },
-                            media_type: TrackMediaType::Video(VideoSettings {}),
+                            direction: Direction::Send { receivers: vec![2] },
+                            media_type: MediaType::Video(VideoSettings {}),
                         },
                     ],
                 })
@@ -747,15 +728,15 @@ mod test {
                     peer_id: 2,
                     sdp_offer: Some("caller_offer".into()),
                     tracks: vec![
-                        DirectionalTrack {
+                        Directional {
                             id: 1,
-                            direction: TrackDirection::Recv { sender: 1 },
-                            media_type: TrackMediaType::Audio(AudioSettings {}),
+                            direction: Direction::Recv { sender: 1 },
+                            media_type: MediaType::Audio(AudioSettings {}),
                         },
-                        DirectionalTrack {
+                        Directional {
                             id: 2,
-                            direction: TrackDirection::Recv { sender: 1 },
-                            media_type: TrackMediaType::Video(VideoSettings {}),
+                            direction: Direction::Recv { sender: 1 },
+                            media_type: MediaType::Video(VideoSettings {}),
                         },
                     ],
                 })
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index f35ca7266..dbf8e3e04 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -1,4 +1,4 @@
-//! ['RpcConnection'] with related messages.
+//! [`RpcConnection`] with related messages.
 use actix::Message;
 use futures::Future;
 
@@ -10,7 +10,7 @@ use std::fmt;
 pub trait RpcConnection: fmt::Debug + Send {
     /// Closes [`RpcConnection`].
     /// No [`RpcConnectionClosed`] signals should be emitted.
-    /// TODO: should never err
+    /// Always returns success.
     fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>>;
 
     /// Sends [`Event`] to remote [`Member`].
@@ -22,8 +22,8 @@ pub trait RpcConnection: fmt::Debug + Send {
 
 /// Signal for authorizing new [`RpcConnection`] before establishing.
 #[derive(Debug, Message)]
-#[rtype(result = "Result<(), RpcConnectionAuthorizationError>")]
-pub struct AuthorizeRpcConnection {
+#[rtype(result = "Result<(), AuthorizationError>")]
+pub struct Authorize {
     /// ID of [`Member`] to authorize [`RpcConnection`] for.
     pub member_id: MemberId,
     /// Credentials to authorize [`RpcConnection`] with.
@@ -32,7 +32,7 @@ pub struct AuthorizeRpcConnection {
 
 /// Error of authorization [`RpcConnection`] in [`Room`].
 #[derive(Debug)]
-pub enum RpcConnectionAuthorizationError {
+pub enum AuthorizationError {
     /// Authorizing [`Member`] does not exists in the [`Room`].
     MemberNotExists,
     /// Provided credentials are invalid.
@@ -42,7 +42,7 @@ pub enum RpcConnectionAuthorizationError {
 /// Signal of new [`RpcConnection`] being established with specified [`Member`].
 #[derive(Debug, Message)]
 #[rtype(result = "Result<(), ()>")]
-pub struct RpcConnectionEstablished {
+pub struct Established {
     /// ID of [`Member`] that establishes [`RpcConnection`].
     pub member_id: MemberId,
     /// Established [`RpcConnection`].
@@ -50,16 +50,16 @@ pub struct RpcConnectionEstablished {
 }
 /// Signal of existing [`RpcConnection`] of specified [`Member`] being closed.
 #[derive(Debug, Message)]
-pub struct RpcConnectionClosed {
+pub struct Closed {
     /// ID of [`Member`] which [`RpcConnection`] is closed.
     pub member_id: MemberId,
     /// Reason of why [`RpcConnection`] is closed.
-    pub reason: RpcConnectionClosedReason,
+    pub reason: ClosedReason,
 }
 
 /// Reasons of why [`RpcConnection`] may be closed.
 #[derive(Debug)]
-pub enum RpcConnectionClosedReason {
+pub enum ClosedReason {
     /// [`RpcConnection`] is disconnect by server itself.
     Disconnected,
     /// [`RpcConnection`] has become idle and is disconnected by idle timeout.
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index bf2b7bcd3..4b0c169b1 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -8,9 +8,7 @@ use futures::{future, Future as _};
 use serde::Deserialize;
 
 use crate::{
-    api::client::rpc_connection::{
-        AuthorizeRpcConnection, RpcConnectionAuthorizationError,
-    },
+    api::client::rpc_connection::{AuthorizationError, Authorize},
     api::{
         client::{Id as RoomId, RoomsRepository, WsSession},
         control::Id as MemberId,
@@ -43,7 +41,7 @@ fn ws_index(
 
     match state.rooms.get(info.room_id) {
         Some(room) => room
-            .send(AuthorizeRpcConnection {
+            .send(Authorize {
                 member_id: info.member_id,
                 credentials: info.credentials.clone(),
             })
@@ -57,10 +55,10 @@ fn ws_index(
                         state.config.idle_timeout,
                     ),
                 ),
-                Err(RpcConnectionAuthorizationError::MemberNotExists) => {
+                Err(AuthorizationError::MemberNotExists) => {
                     Ok(HttpResponse::NotFound().into())
                 }
-                Err(RpcConnectionAuthorizationError::InvalidCredentials) => {
+                Err(AuthorizationError::InvalidCredentials) => {
                     Ok(HttpResponse::Forbidden().into())
                 }
             })
@@ -110,6 +108,7 @@ mod test {
     use crate::{
         api::{client::Room, control::Member},
         conf::{Conf, Server},
+        media::peer::create_peers,
     };
 
     use super::*;
@@ -121,7 +120,7 @@ mod test {
             2 => Member{id: 2, credentials: "responder_credentials".into()},
         };
         let room = Arbiter::start(move |_| {
-            Room::new(1, members, hashmap!(), conf.reconnect_timeout)
+            Room::new(1, members, create_peers(1, 2), conf.reconnect_timeout)
         });
         let rooms = hashmap! {1 => room};
         RoomsRepository::new(rooms)
@@ -148,14 +147,14 @@ mod test {
 
         write.text(r#"{"ping":33}"#);
         let (item, _) = server.execute(read.into_future()).unwrap();
-        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.into())));
+        assert_eq!(Some(ws::Message::Text(r#"{"pong":33}"#.into())), item);
     }
 
     #[test]
     fn disconnects_on_idle() {
         let conf = Conf {
             rpc: Rpc {
-                idle_timeout: Duration::new(1, 0),
+                idle_timeout: Duration::new(2, 0),
                 reconnect_timeout: Default::default(),
             },
             server: Server::default(),
@@ -167,14 +166,14 @@ mod test {
 
         write.text(r#"{"ping":33}"#);
         let (item, read) = server.execute(read.into_future()).unwrap();
-        assert_eq!(item, Some(ws::Message::Text(r#"{"pong":33}"#.into())));
+        assert_eq!(Some(ws::Message::Text(r#"{"pong":33}"#.into())), item);
 
         thread::sleep(conf.rpc.idle_timeout.add(Duration::from_secs(1)));
 
         let (item, _) = server.execute(read.into_future()).unwrap();
         assert_eq!(
-            item,
-            Some(ws::Message::Close(Some(ws::CloseCode::Normal.into())))
+            Some(ws::Message::Close(Some(ws::CloseCode::Normal.into()))),
+            item
         );
     }
 }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 19a931034..7e9f5c706 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -12,8 +12,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     api::client::rpc_connection::{
-        RpcConnection, RpcConnectionClosed, RpcConnectionClosedReason,
-        RpcConnectionEstablished,
+        Closed, ClosedReason, Established, RpcConnection,
     },
     api::client::{Command, Event, Room},
     api::control::member::Id as MemberId,
@@ -68,9 +67,9 @@ impl WsSession {
                 > sess.idle_timeout
             {
                 info!("WsSession of member {} is idle", sess.member_id);
-                if let Err(err) = sess.room.try_send(RpcConnectionClosed {
+                if let Err(err) = sess.room.try_send(Closed {
                     member_id: sess.member_id,
-                    reason: RpcConnectionClosedReason::Idle,
+                    reason: ClosedReason::Idle,
                 }) {
                     error!(
                         "WsSession of member {} failed to remove from Room, \
@@ -100,20 +99,23 @@ impl Actor for WsSession {
         self.start_watchdog(ctx);
 
         let member_id = self.member_id;
+        let slf_addr = ctx.address();
         ctx.wait(wrap_future(
             self.room
-                .send(RpcConnectionEstablished {
+                .send(Established {
                     member_id: self.member_id,
                     connection: Box::new(ctx.address()),
                 })
                 .map(|_| ())
                 .map_err(move |err| {
-                    // TODO kill socket on err
                     error!(
                         "WsSession of member {} failed to join Room, because: \
                          {:?}",
                         member_id, err,
-                    )
+                    );
+                    slf_addr.do_send(Close {
+                        reason: Some(ws::CloseCode::Normal.into()),
+                    });
                 }),
         ));
     }
@@ -125,12 +127,14 @@ impl Actor for WsSession {
 
 impl RpcConnection for Addr<WsSession> {
     /// Closes [`WsSession`] by sending itself "normal closure" close message.
+    ///
+    /// Never returns error.
     fn close(&mut self) -> Box<dyn Future<Item = (), Error = ()>> {
         let fut = self
             .send(Close {
                 reason: Some(ws::CloseCode::Normal.into()),
             })
-            .map_err(|_| ());
+            .or_else(|_| Ok(()));
         Box::new(fut)
     }
 
@@ -228,9 +232,9 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                         "Send close frame with reason {:?} for member {}",
                         reason, self.member_id
                     );
-                    if let Err(err) = self.room.try_send(RpcConnectionClosed {
+                    if let Err(err) = self.room.try_send(Closed {
                         member_id: self.member_id,
-                        reason: RpcConnectionClosedReason::Disconnected,
+                        reason: ClosedReason::Disconnected,
                     }) {
                         error!(
                             "WsSession of member {} failed to remove from \
diff --git a/src/main.rs b/src/main.rs
index 9d812b34b..c777b4d8f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,23 +8,17 @@ pub mod conf;
 pub mod log;
 pub mod media;
 
-use std::sync::Arc;
-
 use actix::prelude::*;
 use dotenv::dotenv;
-use hashbrown::HashMap;
 use log::prelude::*;
 
 use crate::{
     api::{
         client::{server, Room, RoomsRepository},
-        control::{Id as MemberId, Member},
+        control::Member,
     },
     conf::Conf,
-    media::{
-        peer::{Peer, PeerMachine},
-        track::{AudioSettings, Track, TrackMediaType, VideoSettings},
-    },
+    media::peer::create_peers,
 };
 
 fn main() {
@@ -52,27 +46,3 @@ fn main() {
     server::run(rooms_repo, config);
     let _ = sys.run();
 }
-
-fn create_peers(
-    caller: MemberId,
-    callee: MemberId,
-) -> HashMap<MemberId, PeerMachine> {
-    let caller_peer_id = 1;
-    let callee_peer_id = 2;
-    let mut caller_peer = Peer::new(caller_peer_id, caller, callee_peer_id);
-    let mut callee_peer = Peer::new(callee_peer_id, callee, caller_peer_id);
-
-    let track_audio =
-        Arc::new(Track::new(1, TrackMediaType::Audio(AudioSettings {})));
-    let track_video =
-        Arc::new(Track::new(2, TrackMediaType::Video(VideoSettings {})));
-    caller_peer.add_sender(track_audio.clone());
-    caller_peer.add_sender(track_video.clone());
-    callee_peer.add_receiver(track_audio);
-    callee_peer.add_receiver(track_video);
-
-    hashmap!(
-        caller_peer_id => PeerMachine::New(caller_peer),
-        callee_peer_id => PeerMachine::New(callee_peer),
-    )
-}
diff --git a/src/media/mod.rs b/src/media/mod.rs
index 0ca57580e..2c97b32f2 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -2,8 +2,6 @@ pub mod peer;
 pub mod track;
 
 pub use self::{
-    peer::{Id as PeerId, Peer, PeerMachine},
-    track::{
-        AudioSettings, Id as TrackId, Track, TrackMediaType, VideoSettings,
-    },
+    peer::{Id as PeerId, Peer, SignalingStateMachine},
+    track::{AudioSettings, Id as TrackId, MediaType, Track, VideoSettings},
 };
diff --git a/src/media/peer.rs b/src/media/peer.rs
index decea0cbe..04c54007c 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -1,10 +1,15 @@
+#![allow(clippy::use_self)]
+
 use std::sync::Arc;
 
 use hashbrown::HashMap;
 
 use crate::{
     api::control::member::Id as MemberId,
-    media::track::{DirectionalTrack, Id as TrackId, Track, TrackDirection},
+    media::track::{
+        AudioSettings, Direction, Directional, Id as TrackId, MediaType, Track,
+        VideoSettings,
+    },
 };
 
 #[derive(Debug, PartialEq)]
@@ -24,7 +29,7 @@ pub struct Failure {}
 
 /// Implementation state machine for [`Peer`].
 #[derive(Debug)]
-pub enum PeerMachine {
+pub enum SignalingStateMachine {
     New(Peer<New>),
     WaitLocalSDP(Peer<WaitLocalSDP>),
     WaitLocalHaveRemote(Peer<WaitLocalHaveRemote>),
@@ -34,75 +39,85 @@ pub enum PeerMachine {
     Failure(Peer<Failure>),
 }
 
-impl PeerMachine {
+impl SignalingStateMachine {
     /// Returns ID of [`Member`] associated with this [`Peer`].
     pub fn member_id(&self) -> MemberId {
         match self {
-            PeerMachine::New(peer) => peer.member_id(),
-            PeerMachine::WaitLocalSDP(peer) => peer.member_id(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.member_id(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.member_id(),
-            PeerMachine::Stable(peer) => peer.member_id(),
-            PeerMachine::Finished(peer) => peer.member_id(),
-            PeerMachine::Failure(peer) => peer.member_id(),
+            SignalingStateMachine::New(peer) => peer.member_id(),
+            SignalingStateMachine::WaitLocalSDP(peer) => peer.member_id(),
+            SignalingStateMachine::WaitLocalHaveRemote(peer) => {
+                peer.member_id()
+            }
+            SignalingStateMachine::WaitRemoteSDP(peer) => peer.member_id(),
+            SignalingStateMachine::Stable(peer) => peer.member_id(),
+            SignalingStateMachine::Finished(peer) => peer.member_id(),
+            SignalingStateMachine::Failure(peer) => peer.member_id(),
         }
     }
 
     /// Returns ID of [`Peer`].
     pub fn id(&self) -> Id {
         match self {
-            PeerMachine::New(peer) => peer.id(),
-            PeerMachine::WaitLocalSDP(peer) => peer.id(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.id(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.id(),
-            PeerMachine::Stable(peer) => peer.id(),
-            PeerMachine::Finished(peer) => peer.id(),
-            PeerMachine::Failure(peer) => peer.id(),
+            SignalingStateMachine::New(peer) => peer.id(),
+            SignalingStateMachine::WaitLocalSDP(peer) => peer.id(),
+            SignalingStateMachine::WaitLocalHaveRemote(peer) => peer.id(),
+            SignalingStateMachine::WaitRemoteSDP(peer) => peer.id(),
+            SignalingStateMachine::Stable(peer) => peer.id(),
+            SignalingStateMachine::Finished(peer) => peer.id(),
+            SignalingStateMachine::Failure(peer) => peer.id(),
         }
     }
 
     /// Returns ID of [`Peer`].
     pub fn failed(self) -> Self {
         match self {
-            PeerMachine::New(peer) => PeerMachine::Failure(peer.failed()),
-            PeerMachine::WaitLocalSDP(peer) => {
-                PeerMachine::Failure(peer.failed())
+            SignalingStateMachine::New(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
+            }
+            SignalingStateMachine::WaitLocalSDP(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
+            }
+            SignalingStateMachine::WaitLocalHaveRemote(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
+            }
+            SignalingStateMachine::WaitRemoteSDP(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
+            }
+            SignalingStateMachine::Stable(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
             }
-            PeerMachine::WaitLocalHaveRemote(peer) => {
-                PeerMachine::Failure(peer.failed())
+            SignalingStateMachine::Finished(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
             }
-            PeerMachine::WaitRemoteSDP(peer) => {
-                PeerMachine::Failure(peer.failed())
+            SignalingStateMachine::Failure(peer) => {
+                SignalingStateMachine::Failure(peer.failed())
             }
-            PeerMachine::Stable(peer) => PeerMachine::Failure(peer.failed()),
-            PeerMachine::Finished(peer) => PeerMachine::Failure(peer.failed()),
-            PeerMachine::Failure(peer) => PeerMachine::Failure(peer.failed()),
         }
     }
 
     /// Returns sender for this [`Peer`] if exists.
     pub fn sender(&self) -> Option<Id> {
         match self {
-            PeerMachine::New(peer) => peer.sender(),
-            PeerMachine::WaitLocalSDP(peer) => peer.sender(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.sender(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.sender(),
-            PeerMachine::Stable(peer) => peer.sender(),
-            PeerMachine::Finished(peer) => peer.sender(),
-            PeerMachine::Failure(peer) => peer.sender(),
+            SignalingStateMachine::New(peer) => peer.sender(),
+            SignalingStateMachine::WaitLocalSDP(peer) => peer.sender(),
+            SignalingStateMachine::WaitLocalHaveRemote(peer) => peer.sender(),
+            SignalingStateMachine::WaitRemoteSDP(peer) => peer.sender(),
+            SignalingStateMachine::Stable(peer) => peer.sender(),
+            SignalingStateMachine::Finished(peer) => peer.sender(),
+            SignalingStateMachine::Failure(peer) => peer.sender(),
         }
     }
 
     /// Returns ID of interconnected [`Peer`].
     pub fn to_peer(&self) -> Id {
         match self {
-            PeerMachine::New(peer) => peer.to_peer(),
-            PeerMachine::WaitLocalSDP(peer) => peer.to_peer(),
-            PeerMachine::WaitLocalHaveRemote(peer) => peer.to_peer(),
-            PeerMachine::WaitRemoteSDP(peer) => peer.to_peer(),
-            PeerMachine::Stable(peer) => peer.to_peer(),
-            PeerMachine::Finished(peer) => peer.to_peer(),
-            PeerMachine::Failure(peer) => peer.to_peer(),
+            SignalingStateMachine::New(peer) => peer.to_peer(),
+            SignalingStateMachine::WaitLocalSDP(peer) => peer.to_peer(),
+            SignalingStateMachine::WaitLocalHaveRemote(peer) => peer.to_peer(),
+            SignalingStateMachine::WaitRemoteSDP(peer) => peer.to_peer(),
+            SignalingStateMachine::Stable(peer) => peer.to_peer(),
+            SignalingStateMachine::Finished(peer) => peer.to_peer(),
+            SignalingStateMachine::Failure(peer) => peer.to_peer(),
         }
     }
 }
@@ -111,7 +126,7 @@ impl PeerMachine {
 pub type Id = u64;
 
 #[derive(Debug)]
-pub struct PeerContext {
+pub struct Context {
     id: Id,
     to_peer: Id,
     member_id: MemberId,
@@ -124,7 +139,7 @@ pub struct PeerContext {
 /// [`RTCPeerConnection`] representation.
 #[derive(Debug)]
 pub struct Peer<S> {
-    context: PeerContext,
+    context: Context,
     state: S,
 }
 
@@ -170,14 +185,14 @@ impl<T> Peer<T> {
     }
 
     /// Returns [`Track`]'s of [`Peer`].
-    pub fn tracks(&self) -> Vec<DirectionalTrack> {
+    pub fn tracks(&self) -> Vec<Directional> {
         let tracks = self.context.senders.iter().fold(
             vec![],
             |mut tracks, (_, track)| {
-                tracks.push(DirectionalTrack {
+                tracks.push(Directional {
                     id: track.id,
                     media_type: track.media_type.clone(),
-                    direction: TrackDirection::Send {
+                    direction: Direction::Send {
                         receivers: vec![self.context.to_peer],
                     },
                 });
@@ -188,10 +203,10 @@ impl<T> Peer<T> {
             .receivers
             .iter()
             .fold(tracks, |mut tracks, (_, track)| {
-                tracks.push(DirectionalTrack {
+                tracks.push(Directional {
                     id: track.id,
                     media_type: track.media_type.clone(),
-                    direction: TrackDirection::Recv {
+                    direction: Direction::Recv {
                         sender: self.context.to_peer,
                     },
                 });
@@ -203,7 +218,7 @@ impl<T> Peer<T> {
 impl Peer<New> {
     /// Creates new [`Peer`] for [`Member`].
     pub fn new(id: Id, member_id: MemberId, to_peer: Id) -> Self {
-        let context = PeerContext {
+        let context = Context {
             id,
             member_id,
             to_peer,
@@ -212,7 +227,7 @@ impl Peer<New> {
             receivers: HashMap::new(),
             senders: HashMap::new(),
         };
-        Peer {
+        Self {
             context,
             state: New {},
         }
@@ -265,9 +280,9 @@ impl Peer<WaitLocalSDP> {
 
 impl Peer<WaitRemoteSDP> {
     /// Set remote description and transition [`Peer`] to [`Stable`] state.
-    pub fn set_remote_sdp(self, sdp_answer: String) -> Peer<Stable> {
+    pub fn set_remote_sdp(self, sdp_answer: &str) -> Peer<Stable> {
         let mut context = self.context;
-        context.sdp_answer = Some(sdp_answer.clone());
+        context.sdp_answer = Some(sdp_answer.to_string());
         Peer {
             context,
             state: Stable {},
@@ -287,6 +302,31 @@ impl Peer<WaitLocalHaveRemote> {
     }
 }
 
+pub fn create_peers(
+    caller: MemberId,
+    responder: MemberId,
+) -> HashMap<MemberId, SignalingStateMachine> {
+    let caller_peer_id = 1;
+    let responder_peer_id = 2;
+    let mut caller_peer = Peer::new(caller_peer_id, caller, responder_peer_id);
+    let mut responder_peer =
+        Peer::new(responder_peer_id, responder, caller_peer_id);
+
+    let track_audio =
+        Arc::new(Track::new(1, MediaType::Audio(AudioSettings {})));
+    let track_video =
+        Arc::new(Track::new(2, MediaType::Video(VideoSettings {})));
+    caller_peer.add_sender(track_audio.clone());
+    caller_peer.add_sender(track_video.clone());
+    responder_peer.add_receiver(track_audio);
+    responder_peer.add_receiver(track_video);
+
+    hashmap!(
+        caller_peer_id => SignalingStateMachine::New(caller_peer),
+        responder_peer_id => SignalingStateMachine::New(responder_peer),
+    )
+}
+
 #[test]
 fn create_peer() {
     let peer = Peer::new(1, 1, 2);
diff --git a/src/media/track.rs b/src/media/track.rs
index 530d21e6f..b7ef69fea 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -9,34 +9,34 @@ pub type Id = u64;
 #[derive(Debug)]
 pub struct Track {
     pub id: Id,
-    pub media_type: TrackMediaType,
+    pub media_type: MediaType,
 }
 
 impl Track {
     /// Creates new [`Track`] of the specified type.
-    pub fn new(id: Id, media_type: TrackMediaType) -> Track {
-        Track { id, media_type }
+    pub fn new(id: Id, media_type: MediaType) -> Self {
+        Self { id, media_type }
     }
 }
 
 /// [`Track] with specified direction.
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct DirectionalTrack {
+pub struct Directional {
     pub id: Id,
-    pub direction: TrackDirection,
-    pub media_type: TrackMediaType,
+    pub direction: Direction,
+    pub media_type: MediaType,
 }
 
 /// Direction of [`Track`].
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum TrackDirection {
+pub enum Direction {
     Send { receivers: Vec<PeerID> },
     Recv { sender: PeerID },
 }
 
 /// Type of [`Track`].
 #[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum TrackMediaType {
+pub enum MediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }

From c068a69e21a2efc6207c25be16b3d22da1cd9e54 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 16 Apr 2019 19:26:13 +0300
Subject: [PATCH 114/179] TryFrom<&MessageEvent> for MedeaEvent,
 TryFrom<&MessageEvent> for Heartbeat, WasmErr.from_str

---
 jason/src/api/jason.rs          |  5 +-
 jason/src/transport/mod.rs      | 97 ++++++++++++++++-----------------
 jason/src/transport/protocol.rs |  2 +-
 jason/src/utils/errors.rs       | 19 +++++--
 4 files changed, 67 insertions(+), 56 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index dd65e438f..c721bb008 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -25,7 +25,10 @@ impl Jason {
         }
     }
 
-    pub fn init_session(&mut self, token: String) -> Result<SessionHandle, JsValue> {
+    pub fn init_session(
+        &mut self,
+        token: String,
+    ) -> Result<SessionHandle, JsValue> {
         let mut transport = Transport::new(token, 3000);
         transport.init()?;
         let transport = Rc::new(transport);
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 4e9f56d79..b130ba58e 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -5,14 +5,13 @@ use js_sys::Date;
 use wasm_bindgen::{prelude::*, JsCast};
 use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
 
-use std::{cell::RefCell, rc::Rc, vec};
+use std::{cell::RefCell, convert::TryFrom, rc::Rc, vec};
 
 use crate::utils::{
     bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle, WasmErr,
 };
 
 use self::protocol::{Command, Event as MedeaEvent, Heartbeat};
-use std::error::Error;
 
 // TODO:
 // 1. Reconnect.
@@ -46,7 +45,7 @@ impl Transport {
         let socket_borrow = socket.borrow();
         let socket_ref = socket_borrow
             .as_ref()
-            .ok_or(WasmErr::from_str("socket is none"))?;
+            .ok_or(WasmErr::from_str("socket is None"))?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
@@ -63,47 +62,19 @@ impl Transport {
             "message",
             socket_ref,
             move |message: MessageEvent| {
-                let payload = message.data();
-
-                if payload.is_string() {
-                    let payload = match payload.as_string() {
-                        Some(payload) => payload,
-                        None => {
-                            console::error_1(&JsValue::from_str(
-                                "Message received from WS is not str",
-                            ));
-                            return;
-                        }
-                    };
-
-                    if let Ok(Heartbeat::Pong(_pong)) =
-                        serde_json::from_str::<Heartbeat>(&payload)
-                    {
-                        pinger_rc.set_pong_at(Date::now());
-                        console::log_1(&JsValue::from_str("pong received"));
-                    } else {
-                        let event = match serde_json::from_str::<MedeaEvent>(
-                            &payload,
-                        ) {
-                            Ok(event) => event,
-                            Err(err) => {
-                                console::error_1(&JsValue::from_str(
-                                    err.description(),
-                                ));
-                                return;
-                            }
-                        };
-
-                        // TODO: many subs, filter messages by session
-                        let subs_borrow = subs_rc.borrow();
-                        let sub = subs_borrow.iter().next().unwrap();
-
-                        if let Err(err) = sub.unbounded_send(event) {
-                            console::error_1(&JsValue::from_str(
-                                err.description(),
-                            ));
-                        }
+                if let Ok(Heartbeat::Pong(num)) = Heartbeat::try_from(&message)
+                {
+                    pinger_rc.set_pong_at(Date::now());
+                } else if let Ok(event) = MedeaEvent::try_from(&message) {
+                    // TODO: many subs, filter messages by session
+                    let subs_borrow = subs_rc.borrow();
+                    let sub = subs_borrow.iter().next().unwrap();
+
+                    if let Err(err) = sub.unbounded_send(event) {
+                        WasmErr::from(err).log_err();
                     }
+                } else {
+                    // TODO: protocol versions mismatch? should drop connection if so
                 }
             },
         )?;
@@ -211,12 +182,10 @@ impl Pinger {
         inner.send_now()?;
 
         let inner_rc = Rc::clone(&self.0);
-        let do_ping = Closure::wrap(Box::new(
-            move || {
-                // its_ok if ping fails few times
-                inner_rc.borrow_mut().send_now().is_ok();
-            },
-        ) as Box<dyn FnMut()>);
+        let do_ping = Closure::wrap(Box::new(move || {
+            // its_ok if ping fails few times
+            inner_rc.borrow_mut().send_now().is_ok();
+        }) as Box<dyn FnMut()>);
 
         let interval_id = window()
             .set_interval_with_callback_and_timeout_and_arguments_0(
@@ -236,3 +205,33 @@ impl Pinger {
         self.0.borrow_mut().ping_task.take();
     }
 }
+
+impl TryFrom<&MessageEvent> for MedeaEvent {
+    type Error = WasmErr;
+
+    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
+        let payload = msg.data();
+
+        let payload = payload
+            .as_string()
+            .ok_or(WasmErr::from_str("Payload is not string"))?;
+
+        serde_json::from_str::<MedeaEvent>(&payload)
+            .map_err(|e: serde_json::error::Error| WasmErr::from(e))
+    }
+}
+
+impl TryFrom<&MessageEvent> for Heartbeat {
+    type Error = WasmErr;
+
+    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
+        let payload = msg.data();
+
+        let payload = payload
+            .as_string()
+            .ok_or(WasmErr::from_str("Payload is not string"))?;
+
+        serde_json::from_str::<Heartbeat>(&payload)
+            .map_err(|e: serde_json::error::Error| WasmErr::from(e))
+    }
+}
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 4e0a2c896..8ca32d4d3 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 // TODO: just copied from Medea crate, needs refactoring to properly share
-// protocol messages between crates
+// protocol DTOS between crates protocol messages between crates
 #[derive(Deserialize, Serialize)]
 pub enum Heartbeat {
     /// `ping` message that WebSocket client is expected to send to the server
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index 067d0602e..b92818a09 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -1,8 +1,10 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
 use wasm_bindgen::JsValue;
-use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
-use std::borrow::Cow;
+use web_sys::console;
+
+use std::{
+    borrow::Cow,
+    fmt::{Display, Formatter},
+};
 
 pub enum WasmErr {
     JsError(JsValue),
@@ -14,7 +16,10 @@ impl WasmErr {
         console::error_1(&JsValue::from_str(&format!("{}", self)));
     }
 
-    pub fn from_str(msg: &'static str) -> WasmErr {
+    pub fn from_str<S>(msg: S) -> WasmErr
+    where
+        S: Into<Cow<'static, str>>,
+    {
         WasmErr::Other(msg.into())
     }
 }
@@ -58,3 +63,7 @@ macro_rules! impl_from_error {
 
 impl_from_error!(std::cell::BorrowError);
 impl_from_error!(serde_json::error::Error);
+// TODO: improve macro to use generics
+impl_from_error!(
+    futures::sync::mpsc::SendError<crate::transport::protocol::Event>
+);

From 5a00dbf7681d01868082ec235f38c479abfeafd8 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 16 Apr 2019 19:37:48 +0300
Subject: [PATCH 115/179] js_val_to_string

---
 jason/src/transport/mod.rs | 48 ++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index b130ba58e..773022b83 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -65,16 +65,23 @@ impl Transport {
                 if let Ok(Heartbeat::Pong(num)) = Heartbeat::try_from(&message)
                 {
                     pinger_rc.set_pong_at(Date::now());
-                } else if let Ok(event) = MedeaEvent::try_from(&message) {
-                    // TODO: many subs, filter messages by session
-                    let subs_borrow = subs_rc.borrow();
-                    let sub = subs_borrow.iter().next().unwrap();
-
-                    if let Err(err) = sub.unbounded_send(event) {
-                        WasmErr::from(err).log_err();
-                    }
                 } else {
-                    // TODO: protocol versions mismatch? should drop connection if so
+                    match MedeaEvent::try_from(&message) {
+                        Ok(event) => {
+                            // TODO: many subs, filter messages by session
+                            let subs_borrow = subs_rc.borrow();
+                            let sub = subs_borrow.iter().next().unwrap();
+
+                            if let Err(err) = sub.unbounded_send(event) {
+                                WasmErr::from(err).log_err();
+                            }
+                        }
+                        Err(err) => {
+                            // TODO: protocol versions mismatch? should drop
+                            // connection if so
+                            err.log_err();
+                        }
+                    }
                 }
             },
         )?;
@@ -206,17 +213,18 @@ impl Pinger {
     }
 }
 
+fn js_val_to_string(msg: &MessageEvent) -> Result<String, WasmErr> {
+    let payload = msg.data();
+    payload
+        .as_string()
+        .ok_or(WasmErr::from_str("Payload is not string"))
+}
+
 impl TryFrom<&MessageEvent> for MedeaEvent {
     type Error = WasmErr;
 
     fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        let payload = msg.data();
-
-        let payload = payload
-            .as_string()
-            .ok_or(WasmErr::from_str("Payload is not string"))?;
-
-        serde_json::from_str::<MedeaEvent>(&payload)
+        serde_json::from_str::<MedeaEvent>(&js_val_to_string(msg)?)
             .map_err(|e: serde_json::error::Error| WasmErr::from(e))
     }
 }
@@ -225,13 +233,7 @@ impl TryFrom<&MessageEvent> for Heartbeat {
     type Error = WasmErr;
 
     fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        let payload = msg.data();
-
-        let payload = payload
-            .as_string()
-            .ok_or(WasmErr::from_str("Payload is not string"))?;
-
-        serde_json::from_str::<Heartbeat>(&payload)
+        serde_json::from_str::<Heartbeat>(&js_val_to_string(msg)?)
             .map_err(|e: serde_json::error::Error| WasmErr::from(e))
     }
 }

From 785b76b874320f9d5e0134dca288d3432bec1f39 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 16 Apr 2019 21:45:36 +0300
Subject: [PATCH 116/179] create websocket wrapper

---
 jason/src/transport/mod.rs       | 144 ++++++++++-------------------
 jason/src/transport/protocol.rs  |  13 ++-
 jason/src/transport/websocket.rs | 154 +++++++++++++++++++++++++++++++
 jason/src/utils/errors.rs        |   1 +
 jason/src/utils/mod.rs           |  36 --------
 5 files changed, 214 insertions(+), 134 deletions(-)
 create mode 100644 jason/src/transport/websocket.rs

diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 773022b83..b13492f5e 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,17 +1,21 @@
 pub mod protocol;
+mod websocket;
 
 use futures::sync::mpsc::UnboundedSender;
 use js_sys::Date;
 use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{console, CloseEvent, Event, MessageEvent, WebSocket};
+use web_sys::console;
 
 use std::{cell::RefCell, convert::TryFrom, rc::Rc, vec};
 
-use crate::utils::{
-    bind_handler_fn_mut, bind_handler_fn_once, window, IntervalHandle, WasmErr,
-};
+use crate::utils::{window, IntervalHandle, WasmErr};
 
-use self::protocol::{Command, Event as MedeaEvent, Heartbeat};
+use self::{
+    protocol::{Command, Event as MedeaEvent, Heartbeat},
+    websocket::{WebSocket},
+};
+use crate::transport::protocol::InMsg;
+use web_sys::Event;
 
 // TODO:
 // 1. Reconnect.
@@ -21,9 +25,6 @@ pub struct Transport {
     token: String,
     pinger: Rc<Pinger>,
     subs: Rc<RefCell<Vec<UnboundedSender<MedeaEvent>>>>,
-    on_open: Option<Closure<dyn FnMut(Event)>>,
-    on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
-    on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
 }
 
 impl Transport {
@@ -33,9 +34,6 @@ impl Transport {
             token,
             subs: Rc::new(RefCell::new(vec![])),
             pinger: Rc::new(Pinger::new(ping_interval)),
-            on_open: None,
-            on_message: None,
-            on_close: None,
         }
     }
 
@@ -49,62 +47,51 @@ impl Transport {
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-        let on_open =
-            bind_handler_fn_once("open", socket_ref, move |_: Event| {
-                if let Err(err) = pinger_rc.start(socket_rc) {
-                    err.log_err();
-                };
-            })?;
+
+        socket_ref.on_open(move || {
+            if let Err(err) = pinger_rc.start(socket_rc) {
+                err.log_err();
+            };
+        })?;
 
         let pinger_rc = Rc::clone(&self.pinger);
         let subs_rc = Rc::clone(&self.subs);
-        let on_message = bind_handler_fn_mut(
-            "message",
-            socket_ref,
-            move |message: MessageEvent| {
-                if let Ok(Heartbeat::Pong(num)) = Heartbeat::try_from(&message)
-                {
+        socket_ref.on_message(move |msg: Result<InMsg, WasmErr>| {
+            match msg {
+                Ok(InMsg::Pong(num)) => {
                     pinger_rc.set_pong_at(Date::now());
-                } else {
-                    match MedeaEvent::try_from(&message) {
-                        Ok(event) => {
-                            // TODO: many subs, filter messages by session
-                            let subs_borrow = subs_rc.borrow();
-                            let sub = subs_borrow.iter().next().unwrap();
-
-                            if let Err(err) = sub.unbounded_send(event) {
-                                WasmErr::from(err).log_err();
-                            }
-                        }
-                        Err(err) => {
-                            // TODO: protocol versions mismatch? should drop
-                            // connection if so
-                            err.log_err();
-                        }
+                }
+                Ok(InMsg::Event(event)) => {
+                    // TODO: many subs, filter messages by session
+                    let subs_borrow = subs_rc.borrow();
+                    let sub = subs_borrow.iter().next().unwrap();
+
+                    if let Err(err) = sub.unbounded_send(event) {
+                        WasmErr::from(err).log_err();
                     }
                 }
-            },
-        )?;
+                Err(err) => {
+                    // TODO: protocol versions mismatch? should drop
+                    // connection if so
+                    err.log_err();
+                }
+            }
+        });
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-        let on_close = bind_handler_fn_once(
-            "close",
-            socket_ref,
-            move |close: CloseEvent| {
-                console::log_1(&JsValue::from_str(&format!(
-                    "Close [code: {}, reason: {}]",
-                    close.code(),
-                    close.reason()
-                )));
-                socket_rc.borrow_mut().take();
-                pinger_rc.stop();
-            },
-        )?;
-
-        self.on_open = Some(on_open);
-        self.on_message = Some(on_message);
-        self.on_close = Some(on_close);
+        socket_ref.on_close(move |msg: CloseMsg| {
+            socket_rc.borrow_mut().take();
+            pinger_rc.stop();
+
+            //TODO: reconnect on disconnect
+            match msg {
+                CloseMsg::Normal(msg) => {},
+                CloseMsg::Disconnect(msg) => {},
+            }
+
+        })?;
+
         drop(socket_borrow);
         self.sock = socket;
 
@@ -122,18 +109,7 @@ impl Transport {
         if let Some(socket) = socket_borrow.as_ref() {
             let msg = serde_json::to_string(&command).unwrap();
 
-            socket.send_with_str(&msg).unwrap();
-        }
-    }
-}
-
-impl Drop for Transport {
-    fn drop(&mut self) {
-        let socket_borrow = self.sock.borrow();
-        if let Some(socket) = socket_borrow.as_ref() {
-            socket
-                .close_with_code_and_reason(1001, "Dropped suddenly")
-                .is_ok();
+            socket.send(&msg).unwrap();
         }
     }
 }
@@ -156,7 +132,7 @@ impl InnerPinger {
             .ok_or(WasmErr::from_str("Unable to ping: no socket"))?;
         self.num += 1;
         let msg = serde_json::to_string(&Heartbeat::Ping(self.num))?;
-        socket.send_with_str(&msg).map_err(|e| WasmErr::from(e))
+        socket.send(&msg)
     }
 }
 
@@ -213,27 +189,7 @@ impl Pinger {
     }
 }
 
-fn js_val_to_string(msg: &MessageEvent) -> Result<String, WasmErr> {
-    let payload = msg.data();
-    payload
-        .as_string()
-        .ok_or(WasmErr::from_str("Payload is not string"))
-}
-
-impl TryFrom<&MessageEvent> for MedeaEvent {
-    type Error = WasmErr;
-
-    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        serde_json::from_str::<MedeaEvent>(&js_val_to_string(msg)?)
-            .map_err(|e: serde_json::error::Error| WasmErr::from(e))
-    }
-}
-
-impl TryFrom<&MessageEvent> for Heartbeat {
-    type Error = WasmErr;
-
-    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        serde_json::from_str::<Heartbeat>(&js_val_to_string(msg)?)
-            .map_err(|e: serde_json::error::Error| WasmErr::from(e))
-    }
+enum CloseMsg {
+    Normal(String),
+    Disconnect(String),
 }
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 8ca32d4d3..088d6b94b 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,5 +1,14 @@
 use serde::{Deserialize, Serialize};
 
+#[derive(Deserialize)]
+pub enum InMsg {
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    #[serde(rename = "pong")]
+    Pong(usize),
+    Event(Event),
+}
+
 // TODO: just copied from Medea crate, needs refactoring to properly share
 // protocol DTOS between crates protocol messages between crates
 #[derive(Deserialize, Serialize)]
@@ -8,10 +17,6 @@ pub enum Heartbeat {
     /// periodically.
     #[serde(rename = "ping")]
     Ping(usize),
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    #[serde(rename = "pong")]
-    Pong(usize),
 }
 
 /// WebSocket message from Web Client to Media Server.
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
new file mode 100644
index 000000000..8c56c81ba
--- /dev/null
+++ b/jason/src/transport/websocket.rs
@@ -0,0 +1,154 @@
+use crate::transport::protocol::{
+    Command, Event as MedeaEvent, Heartbeat, InMsg,
+};
+use crate::utils::WasmErr;
+use core::borrow::BorrowMut;
+use std::cell::RefCell;
+use std::convert::TryFrom;
+use wasm_bindgen::{
+    convert::{FromWasmAbi, ReturnWasmAbi},
+    JsValue,
+};
+use wasm_bindgen::{prelude::*, JsCast};
+use web_sys::{
+    console, CloseEvent, Event, MessageEvent,
+    WebSocket as BackingSocket,
+};
+use crate::transport::CloseMsg;
+
+struct InnerSocket {
+    socket: BackingSocket,
+    on_open: Option<Closure<dyn FnMut()>>,
+    on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
+    on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
+}
+
+pub struct WebSocket(RefCell<InnerSocket>);
+
+impl InnerSocket {
+    fn new(url: &str) -> Result<Self, WasmErr> {
+        Ok(Self {
+            socket: BackingSocket::new(url)?,
+            on_open: None,
+            on_message: None,
+            on_close: None,
+        })
+    }
+}
+
+impl WebSocket {
+    pub fn new(url: &str) -> Result<Self, WasmErr> {
+        Ok(WebSocket(RefCell::new(InnerSocket::new(url)?)))
+    }
+
+    pub fn on_open<F>(&self, f: F) -> Result<(), WasmErr>
+    where
+        F: (FnOnce()) + 'static,
+    {
+        let mut inner_ref = self.0.borrow_mut();
+
+        let closure: Closure<FnMut()> = Closure::once(f);
+        inner_ref.socket.add_event_listener_with_callback(
+            "open",
+            closure.as_ref().unchecked_ref(),
+        )?;
+
+        inner_ref.on_open = Some(closure);
+        Ok(())
+    }
+
+    pub fn on_message<F>(&self, mut f: F) -> Result<(), WasmErr>
+    where
+        F: (FnMut(Result<InMsg, WasmErr>)) + 'static,
+    {
+        let mut inner_ref = self.0.borrow_mut();
+
+        let closure = Closure::wrap(Box::new(move |msg: MessageEvent| {
+            let parsed = InMsg::try_from(&msg);
+
+            f(parsed);
+        }) as Box<dyn FnMut(MessageEvent)>);
+
+        inner_ref.socket.add_event_listener_with_callback(
+            "message",
+            closure.as_ref().unchecked_ref(),
+        )?;
+        inner_ref.on_message = Some(closure);
+        Ok(())
+    }
+
+    pub fn on_close<F>(&self, mut f: F) -> Result<(), WasmErr>
+    where
+        F: (FnOnce(CloseMsg)) + 'static,
+    {
+        let mut inner_ref = self.0.borrow_mut();
+
+        let closure: Closure<FnMut(CloseEvent)> =
+            Closure::once(move |msg: CloseEvent| {
+                let parsed = CloseMsg::from(&msg);
+
+                f(parsed);
+            });
+
+        inner_ref.socket.add_event_listener_with_callback(
+            "close",
+            closure.as_ref().unchecked_ref(),
+        )?;
+        inner_ref.on_close = Some(closure);
+        Ok(())
+    }
+
+    pub fn send(&self, msg: &str) -> Result<(), WasmErr> {
+        self.0
+            .borrow()
+            .socket
+            .send_with_str(msg)
+            .map_err(|err| WasmErr::from(err))
+    }
+
+    pub fn close(&self, reason: &str) {
+        if let Err(err) = self
+            .0
+            .borrow()
+            .socket
+            .close_with_code_and_reason(1000, reason)
+        {
+            WasmErr::from(err).log_err();
+        }
+    }
+}
+
+impl Drop for WebSocket {
+    fn drop(&mut self) {
+        self.0
+            .borrow()
+            .socket
+            .close_with_code_and_reason(1001, "Dropped suddenly")
+            .is_ok();
+    }
+}
+
+impl TryFrom<&MessageEvent> for InMsg {
+    type Error = WasmErr;
+
+    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
+        let payload = msg
+            .data()
+            .as_string()
+            .ok_or(WasmErr::from_str("Payload is not string"))?;
+
+        serde_json::from_str::<InMsg>(&payload)
+            .map_err(|e: serde_json::error::Error| WasmErr::from(e))
+    }
+}
+
+impl From<&CloseEvent> for CloseMsg {
+    fn from(event: &CloseEvent) -> Self {
+        let code: u16 = event.code();
+        let body = format!("{}:{}", code, event.reason());
+        match code {
+            1000 => CloseMsg::Normal(body),
+            _ => CloseMsg::Disconnect(body),
+        }
+    }
+}
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index b92818a09..329ecb245 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -6,6 +6,7 @@ use std::{
     fmt::{Display, Formatter},
 };
 
+#[derive(Debug)]
 pub enum WasmErr {
     JsError(JsValue),
     Other(Cow<'static, str>),
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 97acd59bc..8fe009840 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -10,42 +10,6 @@ use wasm_bindgen::{
 };
 use web_sys::{EventTarget, Window};
 
-pub fn bind_handler_fn_mut<F, A, R>(
-    event: &str,
-    target: &EventTarget,
-    f: F,
-) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
-where
-    F: (FnMut(A) -> R) + 'static,
-    A: FromWasmAbi + 'static,
-    R: ReturnWasmAbi + 'static,
-{
-    let closure = Closure::wrap(Box::new(f) as Box<dyn FnMut(A) -> R>);
-    target.add_event_listener_with_callback(
-        event,
-        closure.as_ref().unchecked_ref(),
-    )?;
-    Ok(closure)
-}
-
-pub fn bind_handler_fn_once<F, A, R>(
-    event: &str,
-    target: &EventTarget,
-    f: F,
-) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
-where
-    F: (FnOnce(A) -> R) + 'static,
-    A: FromWasmAbi + 'static,
-    R: ReturnWasmAbi + 'static,
-{
-    let closure: Closure<FnMut(A) -> (R)> = Closure::once(f);
-    target.add_event_listener_with_callback(
-        event,
-        closure.as_ref().unchecked_ref(),
-    )?;
-    Ok(closure)
-}
-
 pub struct IntervalHandle(pub i32);
 
 pub fn window() -> Window {

From 32df588201297bfe811ea18c3ca78d763dbcb7fc Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 13:32:32 +0300
Subject: [PATCH 117/179] refactor

---
 jason/src/api/session.rs         |  16 +++--
 jason/src/transport/mod.rs       | 113 +++++--------------------------
 jason/src/transport/pinger.rs    |  82 ++++++++++++++++++++++
 jason/src/transport/protocol.rs  |   8 +--
 jason/src/transport/websocket.rs |  29 +++-----
 jason/src/utils/mod.rs           |  10 +--
 6 files changed, 126 insertions(+), 132 deletions(-)
 create mode 100644 jason/src/transport/pinger.rs

diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
index 7ddc885d7..b33180ce2 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/session.rs
@@ -76,24 +76,28 @@ impl InnerSession {
 
     fn on_peer_created(
         &mut self,
-        peer_id: u64,
-        sdp_offer: Option<String>,
-        tracks: Vec<DirectionalTrack>,
+        _peer_id: u64,
+        _sdp_offer: Option<String>,
+        _tracks: Vec<DirectionalTrack>,
     ) {
         console::log_1(&JsValue::from_str("on_peer_created invoked"));
     }
 
-    fn on_sdp_answer(&mut self, peer_id: u64, sdp_answer: String) {
+    fn on_sdp_answer(&mut self, _peer_id: u64, _sdp_answer: String) {
         console::log_1(&JsValue::from_str("on_sdp_answer invoked"));
     }
 
-    fn on_ice_candidate_discovered(&mut self, peer_id: u64, candidate: String) {
+    fn on_ice_candidate_discovered(
+        &mut self,
+        _peer_id: u64,
+        _candidate: String,
+    ) {
         console::log_1(&&JsValue::from_str(
             "on_ice_candidate_discovered invoked",
         ));
     }
 
-    fn on_peers_removed(&mut self, peer_ids: Vec<u64>) {
+    fn on_peers_removed(&mut self, _peer_ids: Vec<u64>) {
         console::log_1(&JsValue::from_str("on_peers_removed invoked"));
     }
 }
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index b13492f5e..1b442ef8f 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,21 +1,21 @@
-pub mod protocol;
+mod pinger;
 mod websocket;
 
+pub mod protocol;
+
 use futures::sync::mpsc::UnboundedSender;
 use js_sys::Date;
-use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::console;
 
-use std::{cell::RefCell, convert::TryFrom, rc::Rc, vec};
+use std::{cell::RefCell, rc::Rc, vec};
 
-use crate::utils::{window, IntervalHandle, WasmErr};
+use crate::{transport::protocol::{InMsg, OutMsg}, utils::WasmErr};
 
 use self::{
-    protocol::{Command, Event as MedeaEvent, Heartbeat},
-    websocket::{WebSocket},
+    pinger::Pinger,
+    protocol::{Command, Event as MedeaEvent},
+    websocket::WebSocket,
 };
-use crate::transport::protocol::InMsg;
-use web_sys::Event;
+
 
 // TODO:
 // 1. Reconnect.
@@ -58,7 +58,8 @@ impl Transport {
         let subs_rc = Rc::clone(&self.subs);
         socket_ref.on_message(move |msg: Result<InMsg, WasmErr>| {
             match msg {
-                Ok(InMsg::Pong(num)) => {
+                Ok(InMsg::Pong(_num)) => {
+                    // TODO: detect no pings
                     pinger_rc.set_pong_at(Date::now());
                 }
                 Ok(InMsg::Event(event)) => {
@@ -76,7 +77,7 @@ impl Transport {
                     err.log_err();
                 }
             }
-        });
+        })?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
@@ -84,12 +85,11 @@ impl Transport {
             socket_rc.borrow_mut().take();
             pinger_rc.stop();
 
-            //TODO: reconnect on disconnect
+            // TODO: reconnect on disconnect
             match msg {
-                CloseMsg::Normal(msg) => {},
-                CloseMsg::Disconnect(msg) => {},
+                CloseMsg::Normal(_msg) => {}
+                CloseMsg::Disconnect(_msg) => {}
             }
-
         })?;
 
         drop(socket_borrow);
@@ -102,94 +102,17 @@ impl Transport {
         self.subs.borrow_mut().push(sub);
     }
 
-    pub fn send_command(&self, command: &Command) {
+    pub fn send_command(&self, command: Command) {
         let socket_borrow = self.sock.borrow();
 
         // TODO: no socket? we dont really want this method to return err
         if let Some(socket) = socket_borrow.as_ref() {
-            let msg = serde_json::to_string(&command).unwrap();
-
-            socket.send(&msg).unwrap();
+            socket.send(&OutMsg::Command(command)).unwrap();
         }
     }
 }
 
-struct Pinger(Rc<RefCell<InnerPinger>>);
-
-struct InnerPinger {
-    ping_interval: i32,
-    num: usize,
-    pong_at: Option<f64>,
-    socket: Rc<RefCell<Option<WebSocket>>>,
-    ping_task: Option<PingTaskHandler>,
-}
-
-impl InnerPinger {
-    fn send_now(&mut self) -> Result<(), WasmErr> {
-        let borrow = self.socket.try_borrow()?;
-        let socket = borrow
-            .as_ref()
-            .ok_or(WasmErr::from_str("Unable to ping: no socket"))?;
-        self.num += 1;
-        let msg = serde_json::to_string(&Heartbeat::Ping(self.num))?;
-        socket.send(&msg)
-    }
-}
-
-struct PingTaskHandler {
-    _ping_closure: Closure<dyn FnMut()>,
-    _interval_handler: IntervalHandle,
-}
-
-impl Pinger {
-    fn new(ping_interval: i32) -> Self {
-        Self(Rc::new(RefCell::new(InnerPinger {
-            ping_interval,
-            num: 0,
-            pong_at: None,
-            socket: Rc::new(RefCell::new(None)),
-            ping_task: None,
-        })))
-    }
-
-    fn set_pong_at(&self, at: f64) {
-        self.0.borrow_mut().pong_at = Some(at);
-    }
-
-    fn start(
-        &self,
-        socket: Rc<RefCell<Option<WebSocket>>>,
-    ) -> Result<(), WasmErr> {
-        let mut inner = self.0.borrow_mut();
-        inner.socket = socket;
-        inner.send_now()?;
-
-        let inner_rc = Rc::clone(&self.0);
-        let do_ping = Closure::wrap(Box::new(move || {
-            // its_ok if ping fails few times
-            inner_rc.borrow_mut().send_now().is_ok();
-        }) as Box<dyn FnMut()>);
-
-        let interval_id = window()
-            .set_interval_with_callback_and_timeout_and_arguments_0(
-                do_ping.as_ref().unchecked_ref(),
-                inner.ping_interval,
-            )?;
-
-        inner.ping_task = Some(PingTaskHandler {
-            _ping_closure: do_ping,
-            _interval_handler: IntervalHandle(interval_id),
-        });
-
-        Ok(())
-    }
-
-    fn stop(&self) {
-        self.0.borrow_mut().ping_task.take();
-    }
-}
-
-enum CloseMsg {
+pub enum CloseMsg {
     Normal(String),
     Disconnect(String),
 }
diff --git a/jason/src/transport/pinger.rs b/jason/src/transport/pinger.rs
new file mode 100644
index 000000000..0bc603d8e
--- /dev/null
+++ b/jason/src/transport/pinger.rs
@@ -0,0 +1,82 @@
+use wasm_bindgen::{prelude::*, JsCast};
+
+use std::{cell::RefCell, rc::Rc};
+
+use crate::{
+    transport::{protocol::OutMsg, websocket::WebSocket},
+    utils::{window, IntervalHandle, WasmErr},
+};
+
+pub struct Pinger(Rc<RefCell<InnerPinger>>);
+
+struct InnerPinger {
+    ping_interval: i32,
+    num: usize,
+    pong_at: Option<f64>,
+    socket: Rc<RefCell<Option<WebSocket>>>,
+    ping_task: Option<PingTaskHandler>,
+}
+
+impl InnerPinger {
+    fn send_now(&mut self) -> Result<(), WasmErr> {
+        let borrow = self.socket.try_borrow()?;
+        let socket = borrow
+            .as_ref()
+            .ok_or(WasmErr::from_str("Unable to ping: no socket"))?;
+        self.num += 1;
+        socket.send(&OutMsg::Ping(self.num))
+    }
+}
+
+struct PingTaskHandler {
+    _ping_closure: Closure<dyn FnMut()>,
+    _interval_handler: IntervalHandle,
+}
+
+impl Pinger {
+    pub fn new(ping_interval: i32) -> Self {
+        Self(Rc::new(RefCell::new(InnerPinger {
+            ping_interval,
+            num: 0,
+            pong_at: None,
+            socket: Rc::new(RefCell::new(None)),
+            ping_task: None,
+        })))
+    }
+
+    pub fn set_pong_at(&self, at: f64) {
+        self.0.borrow_mut().pong_at = Some(at);
+    }
+
+    pub fn start(
+        &self,
+        socket: Rc<RefCell<Option<WebSocket>>>,
+    ) -> Result<(), WasmErr> {
+        let mut inner = self.0.borrow_mut();
+        inner.socket = socket;
+        inner.send_now()?;
+
+        let inner_rc = Rc::clone(&self.0);
+        let do_ping = Closure::wrap(Box::new(move || {
+            // its_ok if ping fails few times
+            inner_rc.borrow_mut().send_now().is_ok();
+        }) as Box<dyn FnMut()>);
+
+        let interval_id = window()
+            .set_interval_with_callback_and_timeout_and_arguments_0(
+                do_ping.as_ref().unchecked_ref(),
+                inner.ping_interval,
+            )?;
+
+        inner.ping_task = Some(PingTaskHandler {
+            _ping_closure: do_ping,
+            _interval_handler: IntervalHandle(interval_id),
+        });
+
+        Ok(())
+    }
+
+    pub fn stop(&self) {
+        self.0.borrow_mut().ping_task.take();
+    }
+}
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 088d6b94b..9ae7c809f 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -1,5 +1,6 @@
 use serde::{Deserialize, Serialize};
 
+// TODO: should be properly shared between medea and jason
 #[derive(Deserialize)]
 pub enum InMsg {
     /// `pong` message that server answers with to WebSocket client in response
@@ -9,14 +10,13 @@ pub enum InMsg {
     Event(Event),
 }
 
-// TODO: just copied from Medea crate, needs refactoring to properly share
-// protocol DTOS between crates protocol messages between crates
-#[derive(Deserialize, Serialize)]
-pub enum Heartbeat {
+#[derive(Serialize)]
+pub enum OutMsg {
     /// `ping` message that WebSocket client is expected to send to the server
     /// periodically.
     #[serde(rename = "ping")]
     Ping(usize),
+    Command(Command),
 }
 
 /// WebSocket message from Web Client to Media Server.
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 8c56c81ba..2b37e7006 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -1,20 +1,11 @@
-use crate::transport::protocol::{
-    Command, Event as MedeaEvent, Heartbeat, InMsg,
-};
-use crate::utils::WasmErr;
-use core::borrow::BorrowMut;
-use std::cell::RefCell;
-use std::convert::TryFrom;
-use wasm_bindgen::{
-    convert::{FromWasmAbi, ReturnWasmAbi},
-    JsValue,
-};
 use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{
-    console, CloseEvent, Event, MessageEvent,
-    WebSocket as BackingSocket,
-};
-use crate::transport::CloseMsg;
+use web_sys::{CloseEvent, MessageEvent, WebSocket as BackingSocket};
+
+use std::{cell::RefCell, convert::TryFrom};
+
+use crate::{transport::{CloseMsg, protocol::{InMsg, OutMsg}}, utils::WasmErr};
+
+
 
 struct InnerSocket {
     socket: BackingSocket,
@@ -77,7 +68,7 @@ impl WebSocket {
         Ok(())
     }
 
-    pub fn on_close<F>(&self, mut f: F) -> Result<(), WasmErr>
+    pub fn on_close<F>(&self, f: F) -> Result<(), WasmErr>
     where
         F: (FnOnce(CloseMsg)) + 'static,
     {
@@ -98,11 +89,11 @@ impl WebSocket {
         Ok(())
     }
 
-    pub fn send(&self, msg: &str) -> Result<(), WasmErr> {
+    pub fn send(&self, msg: &OutMsg) -> Result<(), WasmErr> {
         self.0
             .borrow()
             .socket
-            .send_with_str(msg)
+            .send_with_str(&serde_json::to_string(msg)?)
             .map_err(|err| WasmErr::from(err))
     }
 
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 8fe009840..453eee104 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -1,14 +1,8 @@
 mod errors;
 
-pub use self::errors::WasmErr;
+use web_sys::Window;
 
-use wasm_bindgen::{
-    closure::Closure,
-    convert::{FromWasmAbi, ReturnWasmAbi},
-    prelude::*,
-    JsCast,
-};
-use web_sys::{EventTarget, Window};
+pub use self::errors::WasmErr;
 
 pub struct IntervalHandle(pub i32);
 

From dbe5a9360190aea99e12e42f2e09dc6fbc41c97d Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 13:39:31 +0300
Subject: [PATCH 118/179] fmt

---
 jason/src/transport/mod.rs       |  6 ++++--
 jason/src/transport/websocket.rs | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 1b442ef8f..4d0de15de 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -8,7 +8,10 @@ use js_sys::Date;
 
 use std::{cell::RefCell, rc::Rc, vec};
 
-use crate::{transport::protocol::{InMsg, OutMsg}, utils::WasmErr};
+use crate::{
+    transport::protocol::{InMsg, OutMsg},
+    utils::WasmErr,
+};
 
 use self::{
     pinger::Pinger,
@@ -16,7 +19,6 @@ use self::{
     websocket::WebSocket,
 };
 
-
 // TODO:
 // 1. Reconnect.
 // 2. Disconnect if no pongs.
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 2b37e7006..f2bee3242 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -3,9 +3,13 @@ use web_sys::{CloseEvent, MessageEvent, WebSocket as BackingSocket};
 
 use std::{cell::RefCell, convert::TryFrom};
 
-use crate::{transport::{CloseMsg, protocol::{InMsg, OutMsg}}, utils::WasmErr};
-
-
+use crate::{
+    transport::{
+        protocol::{InMsg, OutMsg},
+        CloseMsg,
+    },
+    utils::WasmErr,
+};
 
 struct InnerSocket {
     socket: BackingSocket,

From 7d20f082d9c8dd17cc0076c4e9c1c401bf65f096 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 17:48:11 +0300
Subject: [PATCH 119/179] enable clippy for jason, fix jason lint

---
 Makefile                         |  2 +-
 jason/src/api/jason.rs           | 13 ++++--------
 jason/src/api/mod.rs             |  2 +-
 jason/src/api/session.rs         | 36 +++++++++++++++-----------------
 jason/src/lib.rs                 |  2 +-
 jason/src/transport/mod.rs       |  9 ++++----
 jason/src/transport/pinger.rs    |  2 +-
 jason/src/transport/protocol.rs  |  3 +++
 jason/src/transport/websocket.rs | 11 +++++-----
 jason/src/utils/errors.rs        |  6 +++---
 10 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/Makefile b/Makefile
index 2686b67aa..f3ec7b926 100644
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ cargo.fmt:
 #	make cargo.lint
 
 cargo.lint:
-	cargo clippy -- -D clippy::pedantic -D warnings
+	cargo clippy --all -- -D clippy::pedantic -D warnings
 
 
 
diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index c721bb008..f2a6a4e0c 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -3,12 +3,13 @@ use wasm_bindgen::prelude::*;
 use std::rc::Rc;
 
 use crate::{
-    api::{session::Session, SessionHandle},
+    api::{session::Session, Handle},
     set_panic_hook,
     transport::Transport,
 };
 
 #[wasm_bindgen]
+#[derive(Default)]
 pub struct Jason {
     transport: Option<Rc<Transport>>,
     sessions: Vec<Rc<Session>>,
@@ -19,16 +20,10 @@ impl Jason {
     #[wasm_bindgen(constructor)]
     pub fn new() -> Self {
         set_panic_hook();
-        Self {
-            transport: None,
-            sessions: vec![],
-        }
+        Self::default()
     }
 
-    pub fn init_session(
-        &mut self,
-        token: String,
-    ) -> Result<SessionHandle, JsValue> {
+    pub fn init_session(&mut self, token: String) -> Result<Handle, JsValue> {
         let mut transport = Transport::new(token, 3000);
         transport.init()?;
         let transport = Rc::new(transport);
diff --git a/jason/src/api/mod.rs b/jason/src/api/mod.rs
index 0ffd435fc..e4d7fa11e 100644
--- a/jason/src/api/mod.rs
+++ b/jason/src/api/mod.rs
@@ -2,4 +2,4 @@ mod jason;
 mod session;
 
 pub use self::jason::Jason;
-pub use self::session::SessionHandle;
+pub use self::session::Handle;
diff --git a/jason/src/api/session.rs b/jason/src/api/session.rs
index b33180ce2..dd1baf80c 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/session.rs
@@ -10,10 +10,10 @@ use crate::transport::{
 };
 
 #[wasm_bindgen]
-pub struct SessionHandle(Session);
+pub struct Handle(Session);
 
 #[wasm_bindgen]
-impl SessionHandle {}
+impl Handle {}
 
 pub struct Session(Rc<RefCell<InnerSession>>);
 
@@ -22,8 +22,8 @@ impl Session {
         Self(InnerSession::new(transport))
     }
 
-    pub fn new_handle(&self) -> SessionHandle {
-        SessionHandle(Session(Rc::clone(&self.0)))
+    pub fn new_handle(&self) -> Handle {
+        Handle(Self(Rc::clone(&self.0)))
     }
 
     pub fn subscribe(&self, transport: &Transport) {
@@ -40,21 +40,21 @@ impl Session {
                 } => {
                     inner
                         .borrow_mut()
-                        .on_peer_created(peer_id, sdp_offer, tracks);
+                        .on_peer_created(peer_id, &sdp_offer, &tracks);
                 }
                 MedeaEvent::SdpAnswerMade {
                     peer_id,
                     sdp_answer,
                 } => {
-                    inner.borrow_mut().on_sdp_answer(peer_id, sdp_answer);
+                    inner.borrow_mut().on_sdp_answer(peer_id, &sdp_answer);
                 }
                 MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
                     inner
                         .borrow_mut()
-                        .on_ice_candidate_discovered(peer_id, candidate);
+                        .on_ice_candidate_discovered(peer_id, &candidate);
                 }
                 MedeaEvent::PeersRemoved { peer_ids } => {
-                    inner.borrow_mut().on_peers_removed(peer_ids);
+                    inner.borrow_mut().on_peers_removed(&peer_ids);
                 }
             };
 
@@ -66,38 +66,36 @@ impl Session {
 }
 
 struct InnerSession {
-    transport: Rc<Transport>,
+    _transport: Rc<Transport>,
 }
 
 impl InnerSession {
     fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
-        Rc::new(RefCell::new(Self { transport }))
+        Rc::new(RefCell::new(Self {
+            _transport: transport,
+        }))
     }
 
     fn on_peer_created(
         &mut self,
         _peer_id: u64,
-        _sdp_offer: Option<String>,
-        _tracks: Vec<DirectionalTrack>,
+        _sdp_offer: &Option<String>,
+        _tracks: &[DirectionalTrack],
     ) {
         console::log_1(&JsValue::from_str("on_peer_created invoked"));
     }
 
-    fn on_sdp_answer(&mut self, _peer_id: u64, _sdp_answer: String) {
+    fn on_sdp_answer(&mut self, _peer_id: u64, _sdp_answer: &str) {
         console::log_1(&JsValue::from_str("on_sdp_answer invoked"));
     }
 
-    fn on_ice_candidate_discovered(
-        &mut self,
-        _peer_id: u64,
-        _candidate: String,
-    ) {
+    fn on_ice_candidate_discovered(&mut self, _peer_id: u64, _candidate: &str) {
         console::log_1(&&JsValue::from_str(
             "on_ice_candidate_discovered invoked",
         ));
     }
 
-    fn on_peers_removed(&mut self, _peer_ids: Vec<u64>) {
+    fn on_peers_removed(&mut self, _peer_ids: &[u64]) {
         console::log_1(&JsValue::from_str("on_peers_removed invoked"));
     }
 }
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 01f03c6e8..63852b004 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -11,8 +11,8 @@ mod utils;
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
 
+pub use self::api::Handle;
 pub use self::api::Jason;
-pub use self::api::SessionHandle;
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 4d0de15de..7a007a0fd 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -31,7 +31,7 @@ pub struct Transport {
 
 impl Transport {
     pub fn new(token: String, ping_interval: i32) -> Self {
-        Transport {
+        Self {
             sock: Rc::new(RefCell::new(None)),
             token,
             subs: Rc::new(RefCell::new(vec![])),
@@ -45,7 +45,7 @@ impl Transport {
         let socket_borrow = socket.borrow();
         let socket_ref = socket_borrow
             .as_ref()
-            .ok_or(WasmErr::from_str("socket is None"))?;
+            .ok_or_else(|| WasmErr::from_str("socket is None"))?;
 
         let socket_rc = Rc::clone(&socket);
         let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
@@ -89,8 +89,7 @@ impl Transport {
 
             // TODO: reconnect on disconnect
             match msg {
-                CloseMsg::Normal(_msg) => {}
-                CloseMsg::Disconnect(_msg) => {}
+                CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {}
             }
         })?;
 
@@ -104,7 +103,7 @@ impl Transport {
         self.subs.borrow_mut().push(sub);
     }
 
-    pub fn send_command(&self, command: Command) {
+    pub fn _send_command(&self, command: Command) {
         let socket_borrow = self.sock.borrow();
 
         // TODO: no socket? we dont really want this method to return err
diff --git a/jason/src/transport/pinger.rs b/jason/src/transport/pinger.rs
index 0bc603d8e..a6c739cad 100644
--- a/jason/src/transport/pinger.rs
+++ b/jason/src/transport/pinger.rs
@@ -22,7 +22,7 @@ impl InnerPinger {
         let borrow = self.socket.try_borrow()?;
         let socket = borrow
             .as_ref()
-            .ok_or(WasmErr::from_str("Unable to ping: no socket"))?;
+            .ok_or_else(|| WasmErr::from_str("Unable to ping: no socket"))?;
         self.num += 1;
         socket.send(&OutMsg::Ping(self.num))
     }
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 9ae7c809f..14f362c34 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -11,6 +11,7 @@ pub enum InMsg {
 }
 
 #[derive(Serialize)]
+#[allow(dead_code)]
 pub enum OutMsg {
     /// `ping` message that WebSocket client is expected to send to the server
     /// periodically.
@@ -21,6 +22,7 @@ pub enum OutMsg {
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Serialize)]
+#[allow(dead_code)]
 pub enum Command {
     /// Web Client sends SDP Offer.
     MakeSdpOffer { peer_id: u64, sdp_offer: String },
@@ -32,6 +34,7 @@ pub enum Command {
 
 /// WebSocket message from Medea to Jason.
 #[derive(Deserialize)]
+#[allow(dead_code)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index f2bee3242..5f9405dcc 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -33,7 +33,7 @@ impl InnerSocket {
 
 impl WebSocket {
     pub fn new(url: &str) -> Result<Self, WasmErr> {
-        Ok(WebSocket(RefCell::new(InnerSocket::new(url)?)))
+        Ok(Self(RefCell::new(InnerSocket::new(url)?)))
     }
 
     pub fn on_open<F>(&self, f: F) -> Result<(), WasmErr>
@@ -98,10 +98,10 @@ impl WebSocket {
             .borrow()
             .socket
             .send_with_str(&serde_json::to_string(msg)?)
-            .map_err(|err| WasmErr::from(err))
+            .map_err(WasmErr::from)
     }
 
-    pub fn close(&self, reason: &str) {
+    pub fn _close(&self, reason: &str) {
         if let Err(err) = self
             .0
             .borrow()
@@ -130,10 +130,9 @@ impl TryFrom<&MessageEvent> for InMsg {
         let payload = msg
             .data()
             .as_string()
-            .ok_or(WasmErr::from_str("Payload is not string"))?;
+            .ok_or_else(|| WasmErr::from_str("Payload is not string"))?;
 
-        serde_json::from_str::<InMsg>(&payload)
-            .map_err(|e: serde_json::error::Error| WasmErr::from(e))
+        serde_json::from_str::<Self>(&payload).map_err(WasmErr::from)
     }
 }
 
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index 329ecb245..c728bf3b6 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -17,7 +17,7 @@ impl WasmErr {
         console::error_1(&JsValue::from_str(&format!("{}", self)));
     }
 
-    pub fn from_str<S>(msg: S) -> WasmErr
+    pub fn from_str<S>(msg: S) -> Self
     where
         S: Into<Cow<'static, str>>,
     {
@@ -30,7 +30,7 @@ impl Display for WasmErr {
         match self {
             WasmErr::JsError(val) => match val.as_string() {
                 Some(reason) => write!(f, "{}", reason),
-                None => write!(f, "{}", "no str representation for JsError"),
+                None => write!(f, "no str representation for JsError"),
             },
             WasmErr::Other(reason) => write!(f, "{}", reason),
         }
@@ -47,7 +47,7 @@ impl From<WasmErr> for JsValue {
     fn from(err: WasmErr) -> Self {
         match err {
             WasmErr::JsError(value) => value,
-            WasmErr::Other(reason) => JsValue::from_str(&reason),
+            WasmErr::Other(reason) => Self::from_str(&reason),
         }
     }
 }

From fdc34c79e4a132699e0613d6bfa62587e623adb0 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 18:47:43 +0300
Subject: [PATCH 120/179] add some docs

---
 jason/src/api/jason.rs                | 19 +++++++++++--------
 jason/src/api/mod.rs                  |  5 +++--
 jason/src/api/{session.rs => room.rs} | 26 ++++++++++++++++++--------
 jason/src/lib.rs                      |  2 +-
 jason/src/transport/mod.rs            | 10 +++++-----
 5 files changed, 38 insertions(+), 24 deletions(-)
 rename jason/src/api/{session.rs => room.rs} (78%)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index f2a6a4e0c..4c20378a5 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -1,9 +1,11 @@
+//! Main application handler. Responsible for managing shared transports and
+//! local media, room initialization.
 use wasm_bindgen::prelude::*;
 
 use std::rc::Rc;
 
 use crate::{
-    api::{session::Session, Handle},
+    api::{room::Room, RoomHandle},
     set_panic_hook,
     transport::Transport,
 };
@@ -11,8 +13,9 @@ use crate::{
 #[wasm_bindgen]
 #[derive(Default)]
 pub struct Jason {
+    // TODO: multiple transports if rooms managed by different servers
     transport: Option<Rc<Transport>>,
-    sessions: Vec<Rc<Session>>,
+    sessions: Vec<Rc<Room>>,
 }
 
 #[wasm_bindgen]
@@ -23,19 +26,19 @@ impl Jason {
         Self::default()
     }
 
-    pub fn init_session(&mut self, token: String) -> Result<Handle, JsValue> {
+    /// Enter room with provided token, return initialized connection handler.
+    /// Errors if unable to establish RPC connection with remote.
+    pub fn join_room(&mut self, token: String) -> Result<RoomHandle, JsValue> {
         let mut transport = Transport::new(token, 3000);
         transport.init()?;
         let transport = Rc::new(transport);
 
-        let session = Session::new(Rc::clone(&transport));
+        let session = Rc::new(Room::new(Rc::clone(&transport)));
         session.subscribe(&transport);
 
-        let handle = session.new_handle();
-
-        self.sessions.push(Rc::new(session));
+        self.sessions.push(Rc::clone(&session));
         self.transport = Some(transport);
 
-        Ok(handle)
+        Ok(session.new_handle())
     }
 }
diff --git a/jason/src/api/mod.rs b/jason/src/api/mod.rs
index e4d7fa11e..71de134e0 100644
--- a/jason/src/api/mod.rs
+++ b/jason/src/api/mod.rs
@@ -1,5 +1,6 @@
+//! External Jason API.
 mod jason;
-mod session;
+mod room;
 
 pub use self::jason::Jason;
-pub use self::session::Handle;
+pub use self::room::RoomHandle;
diff --git a/jason/src/api/session.rs b/jason/src/api/room.rs
similarity index 78%
rename from jason/src/api/session.rs
rename to jason/src/api/room.rs
index dd1baf80c..502bdcfff 100644
--- a/jason/src/api/session.rs
+++ b/jason/src/api/room.rs
@@ -1,3 +1,5 @@
+//! Represents Medea room.
+
 use futures::{stream::Stream, sync::mpsc::unbounded};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
@@ -9,29 +11,33 @@ use crate::transport::{
     protocol::DirectionalTrack, protocol::Event as MedeaEvent, Transport,
 };
 
+#[allow(clippy::module_name_repetitions)]
 #[wasm_bindgen]
-pub struct Handle(Session);
+/// Room handle accessible from JS.
+pub struct RoomHandle(Room);
 
 #[wasm_bindgen]
-impl Handle {}
+impl RoomHandle {}
 
-pub struct Session(Rc<RefCell<InnerSession>>);
+pub struct Room(Rc<RefCell<InnerSession>>);
 
-impl Session {
+impl Room {
     pub fn new(transport: Rc<Transport>) -> Self {
         Self(InnerSession::new(transport))
     }
 
-    pub fn new_handle(&self) -> Handle {
-        Handle(Self(Rc::clone(&self.0)))
+    pub fn new_handle(&self) -> RoomHandle {
+        RoomHandle(Self(Rc::clone(&self.0)))
     }
 
+    /// Subscribes to provided transport messages.
     pub fn subscribe(&self, transport: &Transport) {
         let (tx, rx) = unbounded();
         transport.add_sub(tx);
 
         let inner = Rc::clone(&self.0);
-        let poll = rx.for_each(move |event| {
+
+        let process_msg_task = rx.for_each(move |event| {
             match event {
                 MedeaEvent::PeerCreated {
                     peer_id,
@@ -61,7 +67,7 @@ impl Session {
             Ok(())
         });
 
-        spawn_local(poll);
+        spawn_local(process_msg_task);
     }
 }
 
@@ -76,6 +82,7 @@ impl InnerSession {
         }))
     }
 
+    /// Creates RTCPeerConnection with provided ID.
     fn on_peer_created(
         &mut self,
         _peer_id: u64,
@@ -85,16 +92,19 @@ impl InnerSession {
         console::log_1(&JsValue::from_str("on_peer_created invoked"));
     }
 
+    /// Applies specified SDP Answer to specified RTCPeerConnection.
     fn on_sdp_answer(&mut self, _peer_id: u64, _sdp_answer: &str) {
         console::log_1(&JsValue::from_str("on_sdp_answer invoked"));
     }
 
+    /// Applies specified ICE Candidate to specified RTCPeerConnection.
     fn on_ice_candidate_discovered(&mut self, _peer_id: u64, _candidate: &str) {
         console::log_1(&&JsValue::from_str(
             "on_ice_candidate_discovered invoked",
         ));
     }
 
+    /// Disposes specified RTCPeerConnection's.
     fn on_peers_removed(&mut self, _peer_ids: &[u64]) {
         console::log_1(&JsValue::from_str("on_peers_removed invoked"));
     }
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 63852b004..b2ea5c1b7 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -11,8 +11,8 @@ mod utils;
 #[cfg(feature = "console_error_panic_hook")]
 pub use console_error_panic_hook::set_once as set_panic_hook;
 
-pub use self::api::Handle;
 pub use self::api::Jason;
+pub use self::api::RoomHandle;
 
 // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
 // allocator.
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 7a007a0fd..a2f9c9276 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -19,6 +19,11 @@ use self::{
     websocket::WebSocket,
 };
 
+pub enum CloseMsg {
+    Normal(String),
+    Disconnect(String),
+}
+
 // TODO:
 // 1. Reconnect.
 // 2. Disconnect if no pongs.
@@ -112,8 +117,3 @@ impl Transport {
         }
     }
 }
-
-pub enum CloseMsg {
-    Normal(String),
-    Disconnect(String),
-}

From 97246ca8ff4c6b2e0a4eaeca0b4d447bb403afcb Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 18:52:55 +0300
Subject: [PATCH 121/179] refactor

---
 jason/src/api/jason.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index 4c20378a5..a49065d33 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -15,7 +15,7 @@ use crate::{
 pub struct Jason {
     // TODO: multiple transports if rooms managed by different servers
     transport: Option<Rc<Transport>>,
-    sessions: Vec<Rc<Room>>,
+    rooms: Vec<Room>,
 }
 
 #[wasm_bindgen]
@@ -33,12 +33,15 @@ impl Jason {
         transport.init()?;
         let transport = Rc::new(transport);
 
-        let session = Rc::new(Room::new(Rc::clone(&transport)));
-        session.subscribe(&transport);
+        let room = Room::new(Rc::clone(&transport));
+        room.subscribe(&transport);
+        let handle = room.new_handle();
 
-        self.sessions.push(Rc::clone(&session));
+        self.rooms.push(room);
         self.transport = Some(transport);
 
-        Ok(session.new_handle())
+        Ok(handle)
     }
+
+    pub fn dispose(self) {}
 }

From 95baf6ffa3d49516dee27ef4fb83e0b8f30b5379 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 19:12:29 +0300
Subject: [PATCH 122/179] fix room duplication

---
 jason/src/api/room.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 502bdcfff..456aef5bd 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -14,20 +14,20 @@ use crate::transport::{
 #[allow(clippy::module_name_repetitions)]
 #[wasm_bindgen]
 /// Room handle accessible from JS.
-pub struct RoomHandle(Room);
+pub struct RoomHandle(Rc<RefCell<InnerRoom>>);
 
 #[wasm_bindgen]
 impl RoomHandle {}
 
-pub struct Room(Rc<RefCell<InnerSession>>);
+pub struct Room(Rc<RefCell<InnerRoom>>);
 
 impl Room {
     pub fn new(transport: Rc<Transport>) -> Self {
-        Self(InnerSession::new(transport))
+        Self(InnerRoom::new(transport))
     }
 
     pub fn new_handle(&self) -> RoomHandle {
-        RoomHandle(Self(Rc::clone(&self.0)))
+        RoomHandle(Rc::clone(&self.0))
     }
 
     /// Subscribes to provided transport messages.
@@ -71,11 +71,11 @@ impl Room {
     }
 }
 
-struct InnerSession {
+struct InnerRoom {
     _transport: Rc<Transport>,
 }
 
-impl InnerSession {
+impl InnerRoom {
     fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
         Rc::new(RefCell::new(Self {
             _transport: transport,
@@ -99,7 +99,7 @@ impl InnerSession {
 
     /// Applies specified ICE Candidate to specified RTCPeerConnection.
     fn on_ice_candidate_discovered(&mut self, _peer_id: u64, _candidate: &str) {
-        console::log_1(&&JsValue::from_str(
+        console::log_1(&JsValue::from_str(
             "on_ice_candidate_discovered invoked",
         ));
     }

From 27715ec6638e27ac3726b3c6f8db373895f5a521 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 20:08:58 +0300
Subject: [PATCH 123/179] properly drop Room

---
 jason/src/api/room.rs      | 27 ++++++++++++++++-----------
 jason/src/transport/mod.rs |  8 ++++++--
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 456aef5bd..fabc3c333 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -14,12 +14,12 @@ use crate::transport::{
 #[allow(clippy::module_name_repetitions)]
 #[wasm_bindgen]
 /// Room handle accessible from JS.
-pub struct RoomHandle(Rc<RefCell<InnerRoom>>);
+pub struct RoomHandle(Rc<RefCell<Option<InnerRoom>>>);
 
 #[wasm_bindgen]
 impl RoomHandle {}
 
-pub struct Room(Rc<RefCell<InnerRoom>>);
+pub struct Room(Rc<RefCell<Option<InnerRoom>>>);
 
 impl Room {
     pub fn new(transport: Rc<Transport>) -> Self {
@@ -44,23 +44,21 @@ impl Room {
                     sdp_offer,
                     tracks,
                 } => {
-                    inner
-                        .borrow_mut()
+                    inner.borrow_mut().as_mut().unwrap()
                         .on_peer_created(peer_id, &sdp_offer, &tracks);
                 }
                 MedeaEvent::SdpAnswerMade {
                     peer_id,
                     sdp_answer,
                 } => {
-                    inner.borrow_mut().on_sdp_answer(peer_id, &sdp_answer);
+                    inner.borrow_mut().as_mut().unwrap().on_sdp_answer(peer_id, &sdp_answer);
                 }
                 MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
-                    inner
-                        .borrow_mut()
+                    inner.borrow_mut().as_mut().unwrap()
                         .on_ice_candidate_discovered(peer_id, &candidate);
                 }
                 MedeaEvent::PeersRemoved { peer_ids } => {
-                    inner.borrow_mut().on_peers_removed(&peer_ids);
+                    inner.borrow_mut().as_mut().unwrap().on_peers_removed(&peer_ids);
                 }
             };
 
@@ -76,10 +74,10 @@ struct InnerRoom {
 }
 
 impl InnerRoom {
-    fn new(transport: Rc<Transport>) -> Rc<RefCell<Self>> {
-        Rc::new(RefCell::new(Self {
+    fn new(transport: Rc<Transport>) -> Rc<RefCell<Option<Self>>> {
+        Rc::new(RefCell::new(Some(Self {
             _transport: transport,
-        }))
+        })))
     }
 
     /// Creates RTCPeerConnection with provided ID.
@@ -109,3 +107,10 @@ impl InnerRoom {
         console::log_1(&JsValue::from_str("on_peers_removed invoked"));
     }
 }
+
+impl Drop for Room {
+    fn drop(&mut self) {
+        // drop InnerRoom, invalidates all spawned RoomHandler's
+        self.0.borrow_mut().take();
+    }
+}
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index a2f9c9276..9595a5472 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -19,14 +19,18 @@ use self::{
     websocket::WebSocket,
 };
 
+/// Connection with remote was closed. Is not emitted if transport was closed by client.
 pub enum CloseMsg {
+    /// Transport was gracefully closed by remote.
     Normal(String),
+    /// Connection was unexpectedly closed. Consider reconnecting.
     Disconnect(String),
 }
 
 // TODO:
-// 1. Reconnect.
-// 2. Disconnect if no pongs.
+// 1. Unsub.
+// 2. Reconnect.
+// 3. Disconnect if no pongs.
 pub struct Transport {
     sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,

From 2e862e054381f247a0713e6945590f11d42b271a Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 20:18:13 +0300
Subject: [PATCH 124/179] websocket close

---
 jason/src/transport/websocket.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 5f9405dcc..0453735bf 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -101,7 +101,7 @@ impl WebSocket {
             .map_err(WasmErr::from)
     }
 
-    pub fn _close(&self, reason: &str) {
+    pub fn _close(self, reason: &str) {
         if let Err(err) = self
             .0
             .borrow()

From 1f8c6f679619e4da411ae1f86ff8ff3a1f09209d Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 17 Apr 2019 20:31:01 +0300
Subject: [PATCH 125/179] fix msg json representation

---
 jason/src/transport/protocol.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 14f362c34..338ddd07e 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
 
 // TODO: should be properly shared between medea and jason
 #[derive(Deserialize)]
+#[serde(untagged)]
 pub enum InMsg {
     /// `pong` message that server answers with to WebSocket client in response
     /// to received `ping` message.
@@ -12,6 +13,7 @@ pub enum InMsg {
 
 #[derive(Serialize)]
 #[allow(dead_code)]
+#[serde(untagged)]
 pub enum OutMsg {
     /// `ping` message that WebSocket client is expected to send to the server
     /// periodically.

From c90bcf5f545ee08c0809784fd3e52eb9fcad3093 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 18 Apr 2019 19:20:13 +0300
Subject: [PATCH 126/179] properly drop room's process_msg_task

---
 jason/src/api/room.rs           | 96 ++++++++++++++++++++++++---------
 jason/src/transport/mod.rs      | 26 +++++++--
 jason/src/transport/protocol.rs |  2 +
 jason/src/utils/errors.rs       |  5 ++
 4 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index fabc3c333..72287c9c2 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -1,6 +1,10 @@
 //! Represents Medea room.
 
-use futures::{stream::Stream, sync::mpsc::unbounded};
+use futures::{
+    future::{Future, IntoFuture},
+    stream::Stream,
+    sync::mpsc::unbounded,
+};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
@@ -37,33 +41,59 @@ impl Room {
 
         let inner = Rc::clone(&self.0);
 
-        let process_msg_task = rx.for_each(move |event| {
-            match event {
-                MedeaEvent::PeerCreated {
-                    peer_id,
-                    sdp_offer,
-                    tracks,
-                } => {
-                    inner.borrow_mut().as_mut().unwrap()
-                        .on_peer_created(peer_id, &sdp_offer, &tracks);
-                }
-                MedeaEvent::SdpAnswerMade {
-                    peer_id,
-                    sdp_answer,
-                } => {
-                    inner.borrow_mut().as_mut().unwrap().on_sdp_answer(peer_id, &sdp_answer);
-                }
-                MedeaEvent::IceCandidateDiscovered { peer_id, candidate } => {
-                    inner.borrow_mut().as_mut().unwrap()
-                        .on_ice_candidate_discovered(peer_id, &candidate);
+        let process_msg_task = rx
+            .for_each(move |event| {
+                console::log_1(&JsValue::from_str("got msg"));
+                match inner.borrow_mut().as_mut() {
+                    Some(inner) => {
+                        match event {
+                            MedeaEvent::PeerCreated {
+                                peer_id,
+                                sdp_offer,
+                                tracks,
+                            } => {
+                                inner.on_peer_created(
+                                    peer_id, &sdp_offer, &tracks,
+                                );
+                            }
+                            MedeaEvent::SdpAnswerMade {
+                                peer_id,
+                                sdp_answer,
+                            } => {
+                                inner.on_sdp_answer(peer_id, &sdp_answer);
+                            }
+                            MedeaEvent::IceCandidateDiscovered {
+                                peer_id,
+                                candidate,
+                            } => {
+                                inner.on_ice_candidate_discovered(
+                                    peer_id, &candidate,
+                                );
+                            }
+                            MedeaEvent::PeersRemoved { peer_ids } => {
+                                inner.on_peers_removed(&peer_ids);
+                            }
+                        };
+                        Ok(())
+                    }
+                    None => {
+                        // InnerSession is gone, which means that Room was
+                        // dropped. Not supposed to happen, since InnerSession
+                        // should drop its tx by unsubbing from transport.
+                        Err(())
+                    }
                 }
-                MedeaEvent::PeersRemoved { peer_ids } => {
-                    inner.borrow_mut().as_mut().unwrap().on_peers_removed(&peer_ids);
+            })
+            .into_future()
+            .then(|e| {
+                match e {
+                    Ok(_) => {
+                        console::log_1(&JsValue::from_str("future ok"));
+                    }
+                    Err(_) => console::log_1(&JsValue::from_str("future err")),
                 }
-            };
-
-            Ok(())
-        });
+                Ok(())
+            });
 
         spawn_local(process_msg_task);
     }
@@ -110,7 +140,21 @@ impl InnerRoom {
 
 impl Drop for Room {
     fn drop(&mut self) {
+        console::log_1(&JsValue::from_str("Drop for Room"));
         // drop InnerRoom, invalidates all spawned RoomHandler's
         self.0.borrow_mut().take();
     }
 }
+
+impl Drop for InnerRoom {
+    fn drop(&mut self) {
+        self._transport.unsub();
+        console::log_1(&JsValue::from_str("Drop for InnerRoom"));
+    }
+}
+
+impl Drop for RoomHandle {
+    fn drop(&mut self) {
+        console::log_1(&JsValue::from_str("Drop for RoomHandle"));
+    }
+}
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 9595a5472..915ab8ba3 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -19,7 +19,8 @@ use self::{
     websocket::WebSocket,
 };
 
-/// Connection with remote was closed. Is not emitted if transport was closed by client.
+/// Connection with remote was closed. Is not emitted if transport was closed by
+/// client.
 pub enum CloseMsg {
     /// Transport was gracefully closed by remote.
     Normal(String),
@@ -28,9 +29,10 @@ pub enum CloseMsg {
 }
 
 // TODO:
-// 1. Unsub.
+// 1. Proper sub registry.
 // 2. Reconnect.
 // 3. Disconnect if no pongs.
+// 4. Buffering if no socket?
 pub struct Transport {
     sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,
@@ -76,10 +78,18 @@ impl Transport {
                 Ok(InMsg::Event(event)) => {
                     // TODO: many subs, filter messages by session
                     let subs_borrow = subs_rc.borrow();
-                    let sub = subs_borrow.iter().next().unwrap();
 
-                    if let Err(err) = sub.unbounded_send(event) {
-                        WasmErr::from(err).log_err();
+                    match subs_borrow.iter().next() {
+                        Some(sub) => {
+                            if let Err(err) = sub.unbounded_send(event) {
+                                // TODO: receiver is gone, should delete this
+                                // subs tx
+                                WasmErr::from(err).log_err();
+                            }
+                        }
+                        None => {
+                            WasmErr::from_str("Transport: no subs").log_err();
+                        }
                     }
                 }
                 Err(err) => {
@@ -108,10 +118,16 @@ impl Transport {
         Ok(())
     }
 
+    // TODO: proper sub registry
     pub fn add_sub(&self, sub: UnboundedSender<MedeaEvent>) {
         self.subs.borrow_mut().push(sub);
     }
 
+    // TODO: proper sub registry
+    pub fn unsub(&self) {
+        self.subs.borrow_mut().clear();
+    }
+
     pub fn _send_command(&self, command: Command) {
         let socket_borrow = self.sock.borrow();
 
diff --git a/jason/src/transport/protocol.rs b/jason/src/transport/protocol.rs
index 338ddd07e..58d67fa70 100644
--- a/jason/src/transport/protocol.rs
+++ b/jason/src/transport/protocol.rs
@@ -8,6 +8,7 @@ pub enum InMsg {
     /// to received `ping` message.
     #[serde(rename = "pong")]
     Pong(usize),
+    #[serde(rename = "event")]
     Event(Event),
 }
 
@@ -19,6 +20,7 @@ pub enum OutMsg {
     /// periodically.
     #[serde(rename = "ping")]
     Ping(usize),
+    #[serde(rename = "command")]
     Command(Command),
 }
 
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index c728bf3b6..af9690511 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -13,6 +13,11 @@ pub enum WasmErr {
 }
 
 impl WasmErr {
+    // TODO:
+    // 1. Send err to remote
+    // probably should be possible only in debug build:
+    // 2. Stacktrace?
+    // 3. Medea state snapshot?
     pub fn log_err(&self) {
         console::error_1(&JsValue::from_str(&format!("{}", self)));
     }

From 5efee0a3907743ce98c9d445df9069184000098a Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 18 Apr 2019 19:35:45 +0300
Subject: [PATCH 127/179] correct drop transport

---
 jason/e2e-demo/js/index.js       | 8 +++++---
 jason/src/transport/mod.rs       | 8 ++++++++
 jason/src/transport/pinger.rs    | 6 ++++++
 jason/src/transport/websocket.rs | 1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index 00f855cd4..4c64cd0ce 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -3,11 +3,13 @@ async function f() {
 
     let caller = new rust.Jason();
 
-    caller.init_session("ws://localhost:8080/ws/1/1/caller_credentials");
+    caller.join_room("ws://localhost:8080/ws/1/1/caller_credentials");
 
-    let responder = new rust.Jason();
+    caller.dispose();
 
-    responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
+    // let responder = new rust.Jason();
+    //
+    // responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
 }
 
 f();
\ No newline at end of file
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 915ab8ba3..c412e27e8 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -137,3 +137,11 @@ impl Transport {
         }
     }
 }
+
+impl Drop for Transport {
+    fn drop(&mut self) {
+        WasmErr::from_str("Drop for Transport").log_err();
+        // Drop socket, pinger will be dropped too
+        self.sock.borrow_mut().take();
+    }
+}
diff --git a/jason/src/transport/pinger.rs b/jason/src/transport/pinger.rs
index a6c739cad..1947a7738 100644
--- a/jason/src/transport/pinger.rs
+++ b/jason/src/transport/pinger.rs
@@ -80,3 +80,9 @@ impl Pinger {
         self.0.borrow_mut().ping_task.take();
     }
 }
+
+impl Drop for Pinger {
+    fn drop(&mut self) {
+        WasmErr::from_str("Drop for Pinger").log_err();
+    }
+}
\ No newline at end of file
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 0453735bf..df35f3ee9 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -115,6 +115,7 @@ impl WebSocket {
 
 impl Drop for WebSocket {
     fn drop(&mut self) {
+        WasmErr::from_str("Drop for WebSocket").log_err();
         self.0
             .borrow()
             .socket

From f00b92339355e26b679f09a15cb482324be8461f Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 19 Apr 2019 15:20:21 +0300
Subject: [PATCH 128/179] watch socket.on_error, track socket state

---
 jason/src/transport/pinger.rs    |   2 +-
 jason/src/transport/websocket.rs | 127 +++++++++++++++++++++++++------
 2 files changed, 104 insertions(+), 25 deletions(-)

diff --git a/jason/src/transport/pinger.rs b/jason/src/transport/pinger.rs
index 1947a7738..8d9f82a2e 100644
--- a/jason/src/transport/pinger.rs
+++ b/jason/src/transport/pinger.rs
@@ -85,4 +85,4 @@ impl Drop for Pinger {
     fn drop(&mut self) {
         WasmErr::from_str("Drop for Pinger").log_err();
     }
-}
\ No newline at end of file
+}
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index df35f3ee9..0426f6dd0 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -1,7 +1,7 @@
 use wasm_bindgen::{prelude::*, JsCast};
-use web_sys::{CloseEvent, MessageEvent, WebSocket as BackingSocket};
+use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
-use std::{cell::RefCell, convert::TryFrom};
+use std::{rc::Rc, cell::RefCell, convert::TryFrom};
 
 use crate::{
     transport::{
@@ -11,38 +11,100 @@ use crate::{
     utils::WasmErr,
 };
 
+enum State {
+    CONNECTING = 0,
+    OPEN = 1,
+    CLOSING = 2,
+    CLOSED = 3,
+    NONE = 4,
+}
+
+impl TryFrom<u16> for State {
+    type Error = WasmErr;
+
+    fn try_from(value: u16) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(State::CONNECTING),
+            1 => Ok(State::OPEN),
+            2 => Ok(State::CLOSING),
+            3 => Ok(State::CLOSED),
+            4 => Ok(State::NONE),
+            _ => Err(WasmErr::Other(
+                format!("Could not cast {} to State variant", value).into(),
+            )),
+        }
+    }
+}
+
 struct InnerSocket {
     socket: BackingSocket,
-    on_open: Option<Closure<dyn FnMut()>>,
+    socket_state: State,
+    on_open: Option<Closure<dyn FnMut(Event)>>,
     on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
     on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
+    on_error: Option<Closure<dyn FnMut(Event)>>,
 }
 
-pub struct WebSocket(RefCell<InnerSocket>);
+pub struct WebSocket(Rc<RefCell<InnerSocket>>);
 
 impl InnerSocket {
-    fn new(url: &str) -> Result<Self, WasmErr> {
-        Ok(Self {
+    fn new(url: &str) -> Result<Rc<RefCell<Self>>, WasmErr> {
+        Ok(Rc::new(RefCell::new(Self {
             socket: BackingSocket::new(url)?,
+            socket_state: State::NONE,
             on_open: None,
             on_message: None,
             on_close: None,
-        })
+            on_error: None,
+        })))
+    }
+
+    fn update_state(&mut self) {
+        match State::try_from(self.socket.ready_state()) {
+            Ok(new_state) => self.socket_state = new_state,
+            Err(err) => {
+                // unreachable, unless some vendor will break enum
+                err.log_err()
+            }
+        };
     }
 }
 
 impl WebSocket {
     pub fn new(url: &str) -> Result<Self, WasmErr> {
-        Ok(Self(RefCell::new(InnerSocket::new(url)?)))
+        let inner = InnerSocket::new(url)?;
+
+        let inner_rc = Rc::clone(&inner);
+        let mut inner_ref = inner.borrow_mut();
+
+        let on_error: Closure<FnMut(Event)> =
+            Closure::once(move |_: Event| {
+                inner_rc.borrow_mut().update_state();
+            });
+
+        inner_ref.socket.add_event_listener_with_callback(
+            "close",
+            on_error.as_ref().unchecked_ref(),
+        )?;
+
+        inner_ref.on_error = Some(on_error);
+
+        drop(inner_ref);
+        Ok(Self(inner))
     }
 
     pub fn on_open<F>(&self, f: F) -> Result<(), WasmErr>
     where
         F: (FnOnce()) + 'static,
     {
+        let inner_rc = Rc::clone(&self.0);
         let mut inner_ref = self.0.borrow_mut();
 
-        let closure: Closure<FnMut()> = Closure::once(f);
+        let closure: Closure<FnMut(Event)> = Closure::once(move |_| {
+            inner_rc.borrow_mut().update_state();
+            f();
+        });
+
         inner_ref.socket.add_event_listener_with_callback(
             "open",
             closure.as_ref().unchecked_ref(),
@@ -76,10 +138,12 @@ impl WebSocket {
     where
         F: (FnOnce(CloseMsg)) + 'static,
     {
+        let inner_rc = Rc::clone(&self.0);
         let mut inner_ref = self.0.borrow_mut();
 
         let closure: Closure<FnMut(CloseEvent)> =
             Closure::once(move |msg: CloseEvent| {
+                inner_rc.borrow_mut().update_state();
                 let parsed = CloseMsg::from(&msg);
 
                 f(parsed);
@@ -94,21 +158,30 @@ impl WebSocket {
     }
 
     pub fn send(&self, msg: &OutMsg) -> Result<(), WasmErr> {
-        self.0
-            .borrow()
-            .socket
-            .send_with_str(&serde_json::to_string(msg)?)
-            .map_err(WasmErr::from)
+        let inner = self.0.borrow();
+
+        match inner.socket_state {
+            State::OPEN => {
+                inner.socket
+                    .send_with_str(&serde_json::to_string(msg)?)
+                    .map_err(WasmErr::from)
+            },
+            _ => { Err(WasmErr::from_str("Underlying socket is closed")) },
+        }
     }
 
     pub fn _close(self, reason: &str) {
-        if let Err(err) = self
-            .0
-            .borrow()
-            .socket
-            .close_with_code_and_reason(1000, reason)
-        {
-            WasmErr::from(err).log_err();
+        let inner = self.0.borrow();
+
+        match inner.socket_state {
+            State::CONNECTING | State::OPEN => {
+                if let Err(err) =
+                    inner.socket.close_with_code_and_reason(1000, reason)
+                {
+                    WasmErr::from(err).log_err();
+                }
+            }
+            _ => {}
         }
     }
 }
@@ -116,11 +189,17 @@ impl WebSocket {
 impl Drop for WebSocket {
     fn drop(&mut self) {
         WasmErr::from_str("Drop for WebSocket").log_err();
-        self.0
+
+        if let Err(e) = self
+            .0
             .borrow()
             .socket
-            .close_with_code_and_reason(1001, "Dropped suddenly")
-            .is_ok();
+            .close_with_code_and_reason(1000, "Dropped suddenly")
+        {
+            WasmErr::from(e).log_err();
+        }
+
+        WasmErr::from_str("Drop for WebSocket").log_err();
     }
 }
 

From d620dc34e18b7a5c73eb5ad29cb1654ebd787308 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 19 Apr 2019 17:43:56 +0300
Subject: [PATCH 129/179] fix cyclic drop

---
 jason/src/transport/websocket.rs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 0426f6dd0..b40489ae8 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -12,11 +12,11 @@ use crate::{
 };
 
 enum State {
-    CONNECTING = 0,
-    OPEN = 1,
-    CLOSING = 2,
-    CLOSED = 3,
-    NONE = 4,
+    CONNECTING,
+    OPEN,
+    CLOSING,
+    CLOSED,
+    NONE,
 }
 
 impl TryFrom<u16> for State {
@@ -188,18 +188,18 @@ impl WebSocket {
 
 impl Drop for WebSocket {
     fn drop(&mut self) {
-        WasmErr::from_str("Drop for WebSocket").log_err();
-
-        if let Err(e) = self
-            .0
-            .borrow()
-            .socket
-            .close_with_code_and_reason(1000, "Dropped suddenly")
-        {
-            WasmErr::from(e).log_err();
-        }
+        let inner = self.0.borrow();
 
-        WasmErr::from_str("Drop for WebSocket").log_err();
+        match inner.socket_state {
+            State::CONNECTING | State::OPEN => {
+                if let Err(err) =
+                inner.socket.close_with_code_and_reason(1000, "Dropped unexpectedly")
+                {
+                    WasmErr::from(err).log_err();
+                }
+            }
+            _ => {}
+        }
     }
 }
 

From eb88542dba4b6687b9c99e0d3c7ad2d32f290a84 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 14:17:22 +0300
Subject: [PATCH 130/179] add event_listener

---
 jason/e2e-demo/js/index.js        |   2 +-
 jason/src/transport/websocket.rs  | 156 ++++++++++++++----------------
 jason/src/utils/event_listener.rs |  79 +++++++++++++++
 jason/src/utils/mod.rs            |  37 +++++++
 4 files changed, 192 insertions(+), 82 deletions(-)
 create mode 100644 jason/src/utils/event_listener.rs

diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index 4c64cd0ce..c64eec7e0 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -5,7 +5,7 @@ async function f() {
 
     caller.join_room("ws://localhost:8080/ws/1/1/caller_credentials");
 
-    caller.dispose();
+    // caller.dispose();
 
     // let responder = new rust.Jason();
     //
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index b40489ae8..68167dc83 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -1,22 +1,30 @@
-use wasm_bindgen::{prelude::*, JsCast};
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
-use std::{rc::Rc, cell::RefCell, convert::TryFrom};
+use std::{cell::RefCell, convert::TryFrom, rc::Rc};
 
 use crate::{
     transport::{
         protocol::{InMsg, OutMsg},
         CloseMsg,
     },
-    utils::WasmErr,
+    utils::{EventListener, WasmErr},
 };
 
+#[derive(Debug)]
 enum State {
     CONNECTING,
     OPEN,
     CLOSING,
     CLOSED,
-    NONE,
+}
+
+impl State {
+    pub fn can_close(&self) -> bool {
+        match self {
+            State::CONNECTING | State::OPEN => true,
+            _ => false,
+        }
+    }
 }
 
 impl TryFrom<u16> for State {
@@ -28,7 +36,6 @@ impl TryFrom<u16> for State {
             1 => Ok(State::OPEN),
             2 => Ok(State::CLOSING),
             3 => Ok(State::CLOSED),
-            4 => Ok(State::NONE),
             _ => Err(WasmErr::Other(
                 format!("Could not cast {} to State variant", value).into(),
             )),
@@ -37,12 +44,12 @@ impl TryFrom<u16> for State {
 }
 
 struct InnerSocket {
-    socket: BackingSocket,
+    socket: Rc<BackingSocket>,
     socket_state: State,
-    on_open: Option<Closure<dyn FnMut(Event)>>,
-    on_message: Option<Closure<dyn FnMut(MessageEvent)>>,
-    on_close: Option<Closure<dyn FnMut(CloseEvent)>>,
-    on_error: Option<Closure<dyn FnMut(Event)>>,
+    on_open: Option<EventListener<BackingSocket, Event>>,
+    on_message: Option<EventListener<BackingSocket, MessageEvent>>,
+    on_close: Option<EventListener<BackingSocket, CloseEvent>>,
+    on_error: Option<EventListener<BackingSocket, Event>>,
 }
 
 pub struct WebSocket(Rc<RefCell<InnerSocket>>);
@@ -50,8 +57,8 @@ pub struct WebSocket(Rc<RefCell<InnerSocket>>);
 impl InnerSocket {
     fn new(url: &str) -> Result<Rc<RefCell<Self>>, WasmErr> {
         Ok(Rc::new(RefCell::new(Self {
-            socket: BackingSocket::new(url)?,
-            socket_state: State::NONE,
+            socket_state: State::CONNECTING,
+            socket: Rc::new(BackingSocket::new(url)?),
             on_open: None,
             on_message: None,
             on_close: None,
@@ -67,6 +74,9 @@ impl InnerSocket {
                 err.log_err()
             }
         };
+
+        WasmErr::from_str(format!("new state {:?}", self.socket.ready_state()))
+            .log_err();
     }
 }
 
@@ -77,17 +87,13 @@ impl WebSocket {
         let inner_rc = Rc::clone(&inner);
         let mut inner_ref = inner.borrow_mut();
 
-        let on_error: Closure<FnMut(Event)> =
-            Closure::once(move |_: Event| {
+        inner_ref.on_error = Some(EventListener::new_mut(
+            Rc::clone(&inner_ref.socket),
+            "error",
+            move |_| {
                 inner_rc.borrow_mut().update_state();
-            });
-
-        inner_ref.socket.add_event_listener_with_callback(
-            "close",
-            on_error.as_ref().unchecked_ref(),
-        )?;
-
-        inner_ref.on_error = Some(on_error);
+            },
+        )?);
 
         drop(inner_ref);
         Ok(Self(inner))
@@ -97,20 +103,18 @@ impl WebSocket {
     where
         F: (FnOnce()) + 'static,
     {
-        let inner_rc = Rc::clone(&self.0);
         let mut inner_ref = self.0.borrow_mut();
 
-        let closure: Closure<FnMut(Event)> = Closure::once(move |_| {
-            inner_rc.borrow_mut().update_state();
-            f();
-        });
-
-        inner_ref.socket.add_event_listener_with_callback(
+        let inner_rc = Rc::clone(&self.0);
+        inner_ref.on_open = Some(EventListener::new_once(
+            Rc::clone(&inner_ref.socket),
             "open",
-            closure.as_ref().unchecked_ref(),
-        )?;
+            move |_| {
+                inner_rc.borrow_mut().update_state();
+                f();
+            },
+        )?);
 
-        inner_ref.on_open = Some(closure);
         Ok(())
     }
 
@@ -120,17 +124,15 @@ impl WebSocket {
     {
         let mut inner_ref = self.0.borrow_mut();
 
-        let closure = Closure::wrap(Box::new(move |msg: MessageEvent| {
-            let parsed = InMsg::try_from(&msg);
-
-            f(parsed);
-        }) as Box<dyn FnMut(MessageEvent)>);
-
-        inner_ref.socket.add_event_listener_with_callback(
+        inner_ref.on_message = Some(EventListener::new_mut(
+            Rc::clone(&inner_ref.socket),
             "message",
-            closure.as_ref().unchecked_ref(),
-        )?;
-        inner_ref.on_message = Some(closure);
+            move |msg| {
+                let parsed = InMsg::try_from(&msg);
+
+                f(parsed);
+            },
+        )?);
         Ok(())
     }
 
@@ -138,22 +140,20 @@ impl WebSocket {
     where
         F: (FnOnce(CloseMsg)) + 'static,
     {
-        let inner_rc = Rc::clone(&self.0);
         let mut inner_ref = self.0.borrow_mut();
 
-        let closure: Closure<FnMut(CloseEvent)> =
-            Closure::once(move |msg: CloseEvent| {
+        let inner_rc = Rc::clone(&self.0);
+        inner_ref.on_close = Some(EventListener::new_once(
+            Rc::clone(&inner_ref.socket),
+            "close",
+            move |msg: CloseEvent| {
                 inner_rc.borrow_mut().update_state();
                 let parsed = CloseMsg::from(&msg);
 
                 f(parsed);
-            });
+            },
+        )?);
 
-        inner_ref.socket.add_event_listener_with_callback(
-            "close",
-            closure.as_ref().unchecked_ref(),
-        )?;
-        inner_ref.on_close = Some(closure);
         Ok(())
     }
 
@@ -161,45 +161,39 @@ impl WebSocket {
         let inner = self.0.borrow();
 
         match inner.socket_state {
-            State::OPEN => {
-                inner.socket
-                    .send_with_str(&serde_json::to_string(msg)?)
-                    .map_err(WasmErr::from)
-            },
-            _ => { Err(WasmErr::from_str("Underlying socket is closed")) },
+            State::OPEN => inner
+                .socket
+                .send_with_str(&serde_json::to_string(msg)?)
+                .map_err(WasmErr::from),
+            _ => Err(WasmErr::from_str("Underlying socket is closed")),
         }
     }
+}
 
-    pub fn _close(self, reason: &str) {
-        let inner = self.0.borrow();
-
-        match inner.socket_state {
-            State::CONNECTING | State::OPEN => {
-                if let Err(err) =
-                    inner.socket.close_with_code_and_reason(1000, reason)
-                {
-                    WasmErr::from(err).log_err();
-                }
+impl Drop for WebSocket {
+    fn drop(&mut self) {
+        let mut inner = self.0.borrow_mut();
+        if inner.socket_state.can_close() {
+            inner.on_open.take();
+            inner.on_error.take();
+            inner.on_message.take();
+            inner.on_close.take();
+
+            if let Err(err) = inner
+                .socket
+                .close_with_code_and_reason(1000, "Dropped unexpectedly")
+            {
+                WasmErr::from(err).log_err();
             }
-            _ => {}
         }
+
+        WasmErr::from_str("Drop for WebSocket").log_err();
     }
 }
 
-impl Drop for WebSocket {
+impl Drop for InnerSocket {
     fn drop(&mut self) {
-        let inner = self.0.borrow();
-
-        match inner.socket_state {
-            State::CONNECTING | State::OPEN => {
-                if let Err(err) =
-                inner.socket.close_with_code_and_reason(1000, "Dropped unexpectedly")
-                {
-                    WasmErr::from(err).log_err();
-                }
-            }
-            _ => {}
-        }
+        WasmErr::from_str("Drop for InnerSocket").log_err();
     }
 }
 
diff --git a/jason/src/utils/event_listener.rs b/jason/src/utils/event_listener.rs
new file mode 100644
index 000000000..49352c19b
--- /dev/null
+++ b/jason/src/utils/event_listener.rs
@@ -0,0 +1,79 @@
+use std::ops::Deref;
+use std::rc::Rc;
+
+use wasm_bindgen::{closure::Closure, convert::FromWasmAbi, JsCast};
+use web_sys::EventTarget;
+
+use crate::utils::WasmErr;
+
+pub struct EventListener<
+    T: Deref<Target = EventTarget>,
+    A: FromWasmAbi + 'static,
+> {
+    event_name: &'static str,
+    target: Rc<T>,
+    closure: Closure<dyn FnMut(A)>,
+}
+
+impl<T: Deref<Target = EventTarget>, A: FromWasmAbi + 'static>
+    EventListener<T, A>
+{
+    pub fn new_mut<F>(
+        target: Rc<T>,
+        event_name: &'static str,
+        closure: F,
+    ) -> Result<Self, WasmErr>
+    where
+        F: FnMut(A) + 'static,
+    {
+        let closure = Closure::wrap(Box::new(closure) as Box<dyn FnMut(A)>);
+
+        target.add_event_listener_with_callback(
+            event_name,
+            closure.as_ref().unchecked_ref(),
+        )?;
+
+        Ok(Self {
+            event_name,
+            target,
+            closure,
+        })
+    }
+
+    pub fn new_once<F>(
+        target: Rc<T>,
+        event_name: &'static str,
+        closure: F,
+    ) -> Result<Self, WasmErr>
+    where
+        F: FnOnce(A) + 'static,
+    {
+        let closure: Closure<FnMut(A)> = Closure::once(closure);
+
+        target.add_event_listener_with_callback(
+            event_name,
+            closure.as_ref().unchecked_ref(),
+        )?;
+
+        Ok(Self {
+            event_name,
+            target,
+            closure,
+        })
+    }
+}
+
+impl<T: Deref<Target = EventTarget>, A: FromWasmAbi + 'static> Drop
+    for EventListener<T, A>
+{
+    fn drop(&mut self) {
+        if let Err(err) = (self.target.as_ref() as &web_sys::EventTarget)
+            .remove_event_listener_with_callback(
+                self.event_name,
+                self.closure.as_ref().unchecked_ref(),
+            )
+        {
+            WasmErr::from(err).log_err();
+        }
+    }
+}
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 453eee104..b43d61771 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -1,8 +1,10 @@
 mod errors;
+mod event_listener;
 
 use web_sys::Window;
 
 pub use self::errors::WasmErr;
+pub use self::event_listener::EventListener;
 
 pub struct IntervalHandle(pub i32);
 
@@ -17,3 +19,38 @@ impl Drop for IntervalHandle {
         window().clear_interval_with_handle(self.0);
     }
 }
+
+// pub fn bind_handler_fn_mut<F, A, R>(
+//    event: &str,
+//    target: &EventTarget,
+//    f: F,
+//) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
+//    where
+//        F: (FnMut(A) -> R) + 'static,
+//        A: FromWasmAbi + 'static,
+//        R: ReturnWasmAbi + 'static,
+//{
+//    let closure = Closure::wrap(Box::new(f) as Box<dyn FnMut(A) -> R>);
+//    target.add_event_listener_with_callback(
+//        event,
+//        closure.as_ref().unchecked_ref(),
+//    )?;
+//    Ok(closure)
+//}
+// pub fn bind_handler_fn_once<F, A, R>(
+//    event: &str,
+//    target: &EventTarget,
+//    f: F,
+//) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
+//    where
+//        F: (FnOnce(A) -> R) + 'static,
+//        A: FromWasmAbi + 'static,
+//        R: ReturnWasmAbi + 'static,
+//{
+//    let closure: Closure<FnMut(A) -> (R)> = Closure::once(f);
+//    target.add_event_listener_with_callback(
+//        event,
+//        closure.as_ref().unchecked_ref(),
+//    )?;
+//    Ok(closure)
+//}

From 98862d9488820ad9500be7fe13bb24986bc01fae Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 15:13:48 +0300
Subject: [PATCH 131/179] make clippy happy

---
 jason/src/api/room.rs      |  6 +++---
 jason/src/transport/mod.rs | 15 +++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 72287c9c2..290a042fd 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -100,13 +100,13 @@ impl Room {
 }
 
 struct InnerRoom {
-    _transport: Rc<Transport>,
+    transport: Rc<Transport>,
 }
 
 impl InnerRoom {
     fn new(transport: Rc<Transport>) -> Rc<RefCell<Option<Self>>> {
         Rc::new(RefCell::new(Some(Self {
-            _transport: transport,
+            transport: transport,
         })))
     }
 
@@ -148,7 +148,7 @@ impl Drop for Room {
 
 impl Drop for InnerRoom {
     fn drop(&mut self) {
-        self._transport.unsub();
+        self.transport.unsub();
         console::log_1(&JsValue::from_str("Drop for InnerRoom"));
     }
 }
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index c412e27e8..06f227d48 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -79,16 +79,11 @@ impl Transport {
                     // TODO: many subs, filter messages by session
                     let subs_borrow = subs_rc.borrow();
 
-                    match subs_borrow.iter().next() {
-                        Some(sub) => {
-                            if let Err(err) = sub.unbounded_send(event) {
-                                // TODO: receiver is gone, should delete this
-                                // subs tx
-                                WasmErr::from(err).log_err();
-                            }
-                        }
-                        None => {
-                            WasmErr::from_str("Transport: no subs").log_err();
+                    if let Some(sub) = subs_borrow.iter().next() {
+                        if let Err(err) = sub.unbounded_send(event) {
+                            // TODO: receiver is gone, should delete this
+                            // subs tx
+                            WasmErr::from(err).log_err();
                         }
                     }
                 }

From ae6fafa16dcedc022eda6b1d7cbf21df1384e69b Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 15:18:06 +0300
Subject: [PATCH 132/179] cleanup debug logs

---
 jason/src/api/jason.rs           |  2 +-
 jason/src/transport/mod.rs       |  1 -
 jason/src/transport/pinger.rs    |  6 ------
 jason/src/transport/websocket.rs | 11 -----------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index a49065d33..c4368dde6 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -1,4 +1,4 @@
-//! Main application handler. Responsible for managing shared transports and
+//! Main application handler. Responsible for managing shared transports,
 //! local media, room initialization.
 use wasm_bindgen::prelude::*;
 
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 06f227d48..25e6508f2 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -135,7 +135,6 @@ impl Transport {
 
 impl Drop for Transport {
     fn drop(&mut self) {
-        WasmErr::from_str("Drop for Transport").log_err();
         // Drop socket, pinger will be dropped too
         self.sock.borrow_mut().take();
     }
diff --git a/jason/src/transport/pinger.rs b/jason/src/transport/pinger.rs
index 8d9f82a2e..a6c739cad 100644
--- a/jason/src/transport/pinger.rs
+++ b/jason/src/transport/pinger.rs
@@ -80,9 +80,3 @@ impl Pinger {
         self.0.borrow_mut().ping_task.take();
     }
 }
-
-impl Drop for Pinger {
-    fn drop(&mut self) {
-        WasmErr::from_str("Drop for Pinger").log_err();
-    }
-}
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 68167dc83..1c1de6adf 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -74,9 +74,6 @@ impl InnerSocket {
                 err.log_err()
             }
         };
-
-        WasmErr::from_str(format!("new state {:?}", self.socket.ready_state()))
-            .log_err();
     }
 }
 
@@ -186,14 +183,6 @@ impl Drop for WebSocket {
                 WasmErr::from(err).log_err();
             }
         }
-
-        WasmErr::from_str("Drop for WebSocket").log_err();
-    }
-}
-
-impl Drop for InnerSocket {
-    fn drop(&mut self) {
-        WasmErr::from_str("Drop for InnerSocket").log_err();
     }
 }
 

From 4a494ff30a06a462b04050367144dcd772822aaf Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 16:03:07 +0300
Subject: [PATCH 133/179] clippy, cleanup

---
 jason/src/api/room.rs | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 290a042fd..e3a7b57f7 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -43,7 +43,6 @@ impl Room {
 
         let process_msg_task = rx
             .for_each(move |event| {
-                console::log_1(&JsValue::from_str("got msg"));
                 match inner.borrow_mut().as_mut() {
                     Some(inner) => {
                         match event {
@@ -85,15 +84,7 @@ impl Room {
                 }
             })
             .into_future()
-            .then(|e| {
-                match e {
-                    Ok(_) => {
-                        console::log_1(&JsValue::from_str("future ok"));
-                    }
-                    Err(_) => console::log_1(&JsValue::from_str("future err")),
-                }
-                Ok(())
-            });
+            .then(|_| Ok(()));
 
         spawn_local(process_msg_task);
     }
@@ -105,9 +96,7 @@ struct InnerRoom {
 
 impl InnerRoom {
     fn new(transport: Rc<Transport>) -> Rc<RefCell<Option<Self>>> {
-        Rc::new(RefCell::new(Some(Self {
-            transport: transport,
-        })))
+        Rc::new(RefCell::new(Some(Self { transport })))
     }
 
     /// Creates RTCPeerConnection with provided ID.
@@ -140,7 +129,6 @@ impl InnerRoom {
 
 impl Drop for Room {
     fn drop(&mut self) {
-        console::log_1(&JsValue::from_str("Drop for Room"));
         // drop InnerRoom, invalidates all spawned RoomHandler's
         self.0.borrow_mut().take();
     }
@@ -149,12 +137,5 @@ impl Drop for Room {
 impl Drop for InnerRoom {
     fn drop(&mut self) {
         self.transport.unsub();
-        console::log_1(&JsValue::from_str("Drop for InnerRoom"));
-    }
-}
-
-impl Drop for RoomHandle {
-    fn drop(&mut self) {
-        console::log_1(&JsValue::from_str("Drop for RoomHandle"));
     }
 }

From b7a89ad12d23f0ad7beacf2b35cad7822d369308 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 18:48:57 +0300
Subject: [PATCH 134/179] add some doc

---
 jason/src/api/jason.rs           | 2 +-
 jason/src/api/room.rs            | 8 +++++++-
 jason/src/transport/mod.rs       | 9 ++++++---
 jason/src/transport/websocket.rs | 2 ++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index c4368dde6..0254f305e 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -27,7 +27,7 @@ impl Jason {
     }
 
     /// Enter room with provided token, return initialized connection handler.
-    /// Errors if unable to establish RPC connection with remote.
+    /// TODO: Errors if unable to establish RPC connection with remote.
     pub fn join_room(&mut self, token: String) -> Result<RoomHandle, JsValue> {
         let mut transport = Transport::new(token, 3000);
         transport.init()?;
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index e3a7b57f7..9c000b8c0 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -23,6 +23,7 @@ pub struct RoomHandle(Rc<RefCell<Option<InnerRoom>>>);
 #[wasm_bindgen]
 impl RoomHandle {}
 
+/// Room handle being used by Rust external modules.
 pub struct Room(Rc<RefCell<Option<InnerRoom>>>);
 
 impl Room {
@@ -86,10 +87,14 @@ impl Room {
             .into_future()
             .then(|_| Ok(()));
 
+        // Spawns Promise in JS, does not provide any handles, so current way to
+        // stop this stream is to drop all connected Senders.
         spawn_local(process_msg_task);
     }
 }
 
+// Actual room. Shared between JS-side handle (['RoomHandle']) and Rust-side
+// handle (['Room']). Manages concrete RTCPeerConnections, handles Medea events.
 struct InnerRoom {
     transport: Rc<Transport>,
 }
@@ -129,13 +134,14 @@ impl InnerRoom {
 
 impl Drop for Room {
     fn drop(&mut self) {
-        // drop InnerRoom, invalidates all spawned RoomHandler's
+        // Drop InnerRoom, invalidates all spawned RoomHandler's.
         self.0.borrow_mut().take();
     }
 }
 
 impl Drop for InnerRoom {
     fn drop(&mut self) {
+        // Drops event handling task.
         self.transport.unsub();
     }
 }
diff --git a/jason/src/transport/mod.rs b/jason/src/transport/mod.rs
index 25e6508f2..787077086 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/transport/mod.rs
@@ -1,3 +1,5 @@
+//!  Abstraction over concrete transport.
+//!
 mod pinger;
 mod websocket;
 
@@ -19,8 +21,7 @@ use self::{
     websocket::WebSocket,
 };
 
-/// Connection with remote was closed. Is not emitted if transport was closed by
-/// client.
+/// Connection with remote was closed.
 pub enum CloseMsg {
     /// Transport was gracefully closed by remote.
     Normal(String),
@@ -101,7 +102,8 @@ impl Transport {
             socket_rc.borrow_mut().take();
             pinger_rc.stop();
 
-            // TODO: reconnect on disconnect
+            // TODO: reconnect on disconnect, propagate error if unable
+            // to reconnect
             match msg {
                 CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {}
             }
@@ -123,6 +125,7 @@ impl Transport {
         self.subs.borrow_mut().clear();
     }
 
+    // TODO: proper sub registry
     pub fn _send_command(&self, command: Command) {
         let socket_borrow = self.sock.borrow();
 
diff --git a/jason/src/transport/websocket.rs b/jason/src/transport/websocket.rs
index 1c1de6adf..cc9f68250 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/transport/websocket.rs
@@ -1,3 +1,5 @@
+//! ['WebSocket'](https://developer.mozilla.org/ru/docs/WebSockets)
+//! transport wrapper.
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
 use std::{cell::RefCell, convert::TryFrom, rc::Rc};

From bf29c778e8f017ae0f70e07a53cb0f0883751103 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 19:08:38 +0300
Subject: [PATCH 135/179] remove Handler<Heartbeat> for WsSession

---
 src/api/client/session.rs | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 7e9f5c706..4f9eb4054 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -191,19 +191,6 @@ pub enum Heartbeat {
     Pong(usize),
 }
 
-impl Handler<Heartbeat> for WsSession {
-    type Result = ();
-
-    /// Answers with `Heartbeat::Pong` message to WebSocket client in response
-    /// to the received `Heartbeat::Ping` message.
-    fn handle(&mut self, msg: Heartbeat, ctx: &mut Self::Context) {
-        if let Heartbeat::Ping(n) = msg {
-            trace!("Received ping: {}", n);
-            ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
-        }
-    }
-}
-
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
     /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
@@ -214,8 +201,10 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
         match msg {
             ws::Message::Text(text) => {
                 self.last_activity = Instant::now();
-                if let Ok(ping) = serde_json::from_str::<Heartbeat>(&text) {
-                    ctx.notify(ping);
+                if let Ok(Heartbeat::Ping(n)) = serde_json::from_str::<Heartbeat>(&text) {
+                    trace!("Received ping: {}", n);
+                    // Answer with ['Heartbeat::Pong'].
+                    ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
                 }
                 if let Ok(command) = serde_json::from_str::<Command>(&text) {
                     if let Err(err) = self.room.try_send(command) {

From e80bec84110026fb09bcd555fe1a54f29fa11247 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 23 Apr 2019 19:37:34 +0300
Subject: [PATCH 136/179] fix signaling_test

---
 signaling_test.html | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/signaling_test.html b/signaling_test.html
index 5b437a16c..b18e1d4e8 100644
--- a/signaling_test.html
+++ b/signaling_test.html
@@ -71,6 +71,10 @@
             pcs[msg.peer_id] = new RTCPeerConnection();
 
             var pc = pcs[msg.peer_id];
+            pc.ontrack = function (e) {
+                console.log("ontrack");
+                partnervid.srcObject = e.streams[0];
+            };
 
             if (sendVideo || sendAudio) {
                 const stream = await navigator.mediaDevices.getUserMedia({
@@ -128,12 +132,6 @@
                 }
 
             };
-
-            pc.ontrack = function (e) {
-                partnervid.srcObject = e.streams[0];
-            };
-
-
         }
 
         async function handleSdpAnswerMade(msg) {

From d64d6041eec5651a559576a4be9924ffff26eb38 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 24 Apr 2019 15:50:46 +0300
Subject: [PATCH 137/179] transport to rpc

---
 jason/src/api/jason.rs                    | 18 ++++++++---------
 jason/src/api/room.rs                     | 24 +++++++++++------------
 jason/src/lib.rs                          |  2 +-
 jason/src/{transport => rpc}/mod.rs       |  8 ++++----
 jason/src/{transport => rpc}/pinger.rs    |  2 +-
 jason/src/{transport => rpc}/protocol.rs  |  0
 jason/src/{transport => rpc}/websocket.rs |  2 +-
 jason/src/utils/errors.rs                 |  2 +-
 8 files changed, 29 insertions(+), 29 deletions(-)
 rename jason/src/{transport => rpc}/mod.rs (97%)
 rename jason/src/{transport => rpc}/pinger.rs (97%)
 rename jason/src/{transport => rpc}/protocol.rs (100%)
 rename jason/src/{transport => rpc}/websocket.rs (99%)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index 0254f305e..e35316ef5 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -7,14 +7,14 @@ use std::rc::Rc;
 use crate::{
     api::{room::Room, RoomHandle},
     set_panic_hook,
-    transport::Transport,
+    rpc::RPCClient,
 };
 
 #[wasm_bindgen]
 #[derive(Default)]
 pub struct Jason {
-    // TODO: multiple transports if rooms managed by different servers
-    transport: Option<Rc<Transport>>,
+    // TODO: multiple RPCClient's if rooms managed by different servers
+    rpc: Option<Rc<RPCClient>>,
     rooms: Vec<Room>,
 }
 
@@ -29,16 +29,16 @@ impl Jason {
     /// Enter room with provided token, return initialized connection handler.
     /// TODO: Errors if unable to establish RPC connection with remote.
     pub fn join_room(&mut self, token: String) -> Result<RoomHandle, JsValue> {
-        let mut transport = Transport::new(token, 3000);
-        transport.init()?;
-        let transport = Rc::new(transport);
+        let mut rpc = RPCClient::new(token, 3000);
+        rpc.init()?;
+        let rpc = Rc::new(rpc);
 
-        let room = Room::new(Rc::clone(&transport));
-        room.subscribe(&transport);
+        let room = Room::new(Rc::clone(&rpc));
+        room.subscribe(&rpc);
         let handle = room.new_handle();
 
         self.rooms.push(room);
-        self.transport = Some(transport);
+        self.rpc = Some(rpc);
 
         Ok(handle)
     }
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 9c000b8c0..8e7a6653f 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -11,8 +11,8 @@ use web_sys::console;
 
 use std::{cell::RefCell, rc::Rc};
 
-use crate::transport::{
-    protocol::DirectionalTrack, protocol::Event as MedeaEvent, Transport,
+use crate::rpc::{
+    protocol::DirectionalTrack, protocol::Event as MedeaEvent, RPCClient,
 };
 
 #[allow(clippy::module_name_repetitions)]
@@ -27,18 +27,18 @@ impl RoomHandle {}
 pub struct Room(Rc<RefCell<Option<InnerRoom>>>);
 
 impl Room {
-    pub fn new(transport: Rc<Transport>) -> Self {
-        Self(InnerRoom::new(transport))
+    pub fn new(rpc: Rc<RPCClient>) -> Self {
+        Self(InnerRoom::new(rpc))
     }
 
     pub fn new_handle(&self) -> RoomHandle {
         RoomHandle(Rc::clone(&self.0))
     }
 
-    /// Subscribes to provided transport messages.
-    pub fn subscribe(&self, transport: &Transport) {
+    /// Subscribes to provided RpcTransport messages.
+    pub fn subscribe(&self, rpc: &RPCClient) {
         let (tx, rx) = unbounded();
-        transport.add_sub(tx);
+        rpc.add_sub(tx);
 
         let inner = Rc::clone(&self.0);
 
@@ -79,7 +79,7 @@ impl Room {
                     None => {
                         // InnerSession is gone, which means that Room was
                         // dropped. Not supposed to happen, since InnerSession
-                        // should drop its tx by unsubbing from transport.
+                        // should drop its tx by unsubbing from RpcClient.
                         Err(())
                     }
                 }
@@ -96,12 +96,12 @@ impl Room {
 // Actual room. Shared between JS-side handle (['RoomHandle']) and Rust-side
 // handle (['Room']). Manages concrete RTCPeerConnections, handles Medea events.
 struct InnerRoom {
-    transport: Rc<Transport>,
+    rpc: Rc<RPCClient>,
 }
 
 impl InnerRoom {
-    fn new(transport: Rc<Transport>) -> Rc<RefCell<Option<Self>>> {
-        Rc::new(RefCell::new(Some(Self { transport })))
+    fn new(rpc: Rc<RPCClient>) -> Rc<RefCell<Option<Self>>> {
+        Rc::new(RefCell::new(Some(Self { rpc })))
     }
 
     /// Creates RTCPeerConnection with provided ID.
@@ -142,6 +142,6 @@ impl Drop for Room {
 impl Drop for InnerRoom {
     fn drop(&mut self) {
         // Drops event handling task.
-        self.transport.unsub();
+        self.rpc.unsub();
     }
 }
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index b2ea5c1b7..4673e4daf 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,5 +1,5 @@
 mod api;
-mod transport;
+mod rpc;
 mod utils;
 
 // When the `console_error_panic_hook` feature is enabled, we can call the
diff --git a/jason/src/transport/mod.rs b/jason/src/rpc/mod.rs
similarity index 97%
rename from jason/src/transport/mod.rs
rename to jason/src/rpc/mod.rs
index 787077086..035d9365e 100644
--- a/jason/src/transport/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -11,7 +11,7 @@ use js_sys::Date;
 use std::{cell::RefCell, rc::Rc, vec};
 
 use crate::{
-    transport::protocol::{InMsg, OutMsg},
+    rpc::protocol::{InMsg, OutMsg},
     utils::WasmErr,
 };
 
@@ -34,14 +34,14 @@ pub enum CloseMsg {
 // 2. Reconnect.
 // 3. Disconnect if no pongs.
 // 4. Buffering if no socket?
-pub struct Transport {
+pub struct RPCClient {
     sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,
     pinger: Rc<Pinger>,
     subs: Rc<RefCell<Vec<UnboundedSender<MedeaEvent>>>>,
 }
 
-impl Transport {
+impl RPCClient {
     pub fn new(token: String, ping_interval: i32) -> Self {
         Self {
             sock: Rc::new(RefCell::new(None)),
@@ -136,7 +136,7 @@ impl Transport {
     }
 }
 
-impl Drop for Transport {
+impl Drop for RPCClient {
     fn drop(&mut self) {
         // Drop socket, pinger will be dropped too
         self.sock.borrow_mut().take();
diff --git a/jason/src/transport/pinger.rs b/jason/src/rpc/pinger.rs
similarity index 97%
rename from jason/src/transport/pinger.rs
rename to jason/src/rpc/pinger.rs
index a6c739cad..21a7b56fb 100644
--- a/jason/src/transport/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -3,7 +3,7 @@ use wasm_bindgen::{prelude::*, JsCast};
 use std::{cell::RefCell, rc::Rc};
 
 use crate::{
-    transport::{protocol::OutMsg, websocket::WebSocket},
+    rpc::{protocol::OutMsg, websocket::WebSocket},
     utils::{window, IntervalHandle, WasmErr},
 };
 
diff --git a/jason/src/transport/protocol.rs b/jason/src/rpc/protocol.rs
similarity index 100%
rename from jason/src/transport/protocol.rs
rename to jason/src/rpc/protocol.rs
diff --git a/jason/src/transport/websocket.rs b/jason/src/rpc/websocket.rs
similarity index 99%
rename from jason/src/transport/websocket.rs
rename to jason/src/rpc/websocket.rs
index cc9f68250..d65ce7414 100644
--- a/jason/src/transport/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -5,7 +5,7 @@ use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 use std::{cell::RefCell, convert::TryFrom, rc::Rc};
 
 use crate::{
-    transport::{
+    rpc::{
         protocol::{InMsg, OutMsg},
         CloseMsg,
     },
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index af9690511..ab2a322d4 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -71,5 +71,5 @@ impl_from_error!(std::cell::BorrowError);
 impl_from_error!(serde_json::error::Error);
 // TODO: improve macro to use generics
 impl_from_error!(
-    futures::sync::mpsc::SendError<crate::transport::protocol::Event>
+    futures::sync::mpsc::SendError<crate::rpc::protocol::Event>
 );

From db792d8f7d1ee825ed99fd1ab466077d33e21d62 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 24 Apr 2019 15:58:12 +0300
Subject: [PATCH 138/179] refactor RpcClient.init

---
 jason/src/rpc/mod.rs | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 035d9365e..58499866a 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -52,33 +52,32 @@ impl RPCClient {
     }
 
     pub fn init(&mut self) -> Result<(), WasmErr> {
-        let socket = WebSocket::new(&self.token)?;
-        let socket = Rc::new(RefCell::new(Some(socket)));
-        let socket_borrow = socket.borrow();
+        self.sock = Rc::new(RefCell::new(Some(WebSocket::new(&self.token)?)));
+
+        let socket_borrow = self.sock.borrow();
         let socket_ref = socket_borrow
             .as_ref()
             .ok_or_else(|| WasmErr::from_str("socket is None"))?;
 
-        let socket_rc = Rc::clone(&socket);
-        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
-
+        let socket = Rc::clone(&self.sock);
+        let pinger = Rc::clone(&self.pinger);
         socket_ref.on_open(move || {
-            if let Err(err) = pinger_rc.start(socket_rc) {
+            if let Err(err) = pinger.start(socket) {
                 err.log_err();
             };
         })?;
 
-        let pinger_rc = Rc::clone(&self.pinger);
-        let subs_rc = Rc::clone(&self.subs);
+        let pinger = Rc::clone(&self.pinger);
+        let subs = Rc::clone(&self.subs);
         socket_ref.on_message(move |msg: Result<InMsg, WasmErr>| {
             match msg {
                 Ok(InMsg::Pong(_num)) => {
                     // TODO: detect no pings
-                    pinger_rc.set_pong_at(Date::now());
+                    pinger.set_pong_at(Date::now());
                 }
                 Ok(InMsg::Event(event)) => {
                     // TODO: many subs, filter messages by session
-                    let subs_borrow = subs_rc.borrow();
+                    let subs_borrow = subs.borrow();
 
                     if let Some(sub) = subs_borrow.iter().next() {
                         if let Err(err) = sub.unbounded_send(event) {
@@ -96,11 +95,11 @@ impl RPCClient {
             }
         })?;
 
-        let socket_rc = Rc::clone(&socket);
-        let pinger_rc: Rc<Pinger> = Rc::clone(&self.pinger);
+        let socket = Rc::clone(&self.sock);
+        let pinger = Rc::clone(&self.pinger);
         socket_ref.on_close(move |msg: CloseMsg| {
-            socket_rc.borrow_mut().take();
-            pinger_rc.stop();
+            socket.borrow_mut().take();
+            pinger.stop();
 
             // TODO: reconnect on disconnect, propagate error if unable
             // to reconnect
@@ -109,9 +108,6 @@ impl RPCClient {
             }
         })?;
 
-        drop(socket_borrow);
-        self.sock = socket;
-
         Ok(())
     }
 

From 758432428be16444090fd8adc26c5c2f0d9e873f Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 24 Apr 2019 16:00:07 +0300
Subject: [PATCH 139/179] refactor

---
 jason/src/api/room.rs | 10 +++++-----
 jason/src/rpc/mod.rs  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 8e7a6653f..97a3524d1 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -12,7 +12,7 @@ use web_sys::console;
 use std::{cell::RefCell, rc::Rc};
 
 use crate::rpc::{
-    protocol::DirectionalTrack, protocol::Event as MedeaEvent, RPCClient,
+    protocol::DirectionalTrack, protocol::Event, RPCClient,
 };
 
 #[allow(clippy::module_name_repetitions)]
@@ -47,7 +47,7 @@ impl Room {
                 match inner.borrow_mut().as_mut() {
                     Some(inner) => {
                         match event {
-                            MedeaEvent::PeerCreated {
+                            Event::PeerCreated {
                                 peer_id,
                                 sdp_offer,
                                 tracks,
@@ -56,13 +56,13 @@ impl Room {
                                     peer_id, &sdp_offer, &tracks,
                                 );
                             }
-                            MedeaEvent::SdpAnswerMade {
+                            Event::SdpAnswerMade {
                                 peer_id,
                                 sdp_answer,
                             } => {
                                 inner.on_sdp_answer(peer_id, &sdp_answer);
                             }
-                            MedeaEvent::IceCandidateDiscovered {
+                            Event::IceCandidateDiscovered {
                                 peer_id,
                                 candidate,
                             } => {
@@ -70,7 +70,7 @@ impl Room {
                                     peer_id, &candidate,
                                 );
                             }
-                            MedeaEvent::PeersRemoved { peer_ids } => {
+                            Event::PeersRemoved { peer_ids } => {
                                 inner.on_peers_removed(&peer_ids);
                             }
                         };
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 58499866a..dcbbc644e 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -17,7 +17,7 @@ use crate::{
 
 use self::{
     pinger::Pinger,
-    protocol::{Command, Event as MedeaEvent},
+    protocol::{Command, Event},
     websocket::WebSocket,
 };
 
@@ -38,7 +38,7 @@ pub struct RPCClient {
     sock: Rc<RefCell<Option<WebSocket>>>,
     token: String,
     pinger: Rc<Pinger>,
-    subs: Rc<RefCell<Vec<UnboundedSender<MedeaEvent>>>>,
+    subs: Rc<RefCell<Vec<UnboundedSender<Event>>>>,
 }
 
 impl RPCClient {
@@ -112,7 +112,7 @@ impl RPCClient {
     }
 
     // TODO: proper sub registry
-    pub fn add_sub(&self, sub: UnboundedSender<MedeaEvent>) {
+    pub fn add_sub(&self, sub: UnboundedSender<Event>) {
         self.subs.borrow_mut().push(sub);
     }
 

From ad20aa1c22ed5666932d10e11dfaf2de1f8bf559 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 24 Apr 2019 16:01:04 +0300
Subject: [PATCH 140/179] refactor

---
 jason/src/rpc/mod.rs       | 10 +++++-----
 jason/src/rpc/pinger.rs    |  4 ++--
 jason/src/rpc/protocol.rs  |  4 ++--
 jason/src/rpc/websocket.rs | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index dcbbc644e..64521010f 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -11,7 +11,7 @@ use js_sys::Date;
 use std::{cell::RefCell, rc::Rc, vec};
 
 use crate::{
-    rpc::protocol::{InMsg, OutMsg},
+    rpc::protocol::{ClientMsg, ServerMsg},
     utils::WasmErr,
 };
 
@@ -69,13 +69,13 @@ impl RPCClient {
 
         let pinger = Rc::clone(&self.pinger);
         let subs = Rc::clone(&self.subs);
-        socket_ref.on_message(move |msg: Result<InMsg, WasmErr>| {
+        socket_ref.on_message(move |msg: Result<ClientMsg, WasmErr>| {
             match msg {
-                Ok(InMsg::Pong(_num)) => {
+                Ok(ClientMsg::Pong(_num)) => {
                     // TODO: detect no pings
                     pinger.set_pong_at(Date::now());
                 }
-                Ok(InMsg::Event(event)) => {
+                Ok(ClientMsg::Event(event)) => {
                     // TODO: many subs, filter messages by session
                     let subs_borrow = subs.borrow();
 
@@ -127,7 +127,7 @@ impl RPCClient {
 
         // TODO: no socket? we dont really want this method to return err
         if let Some(socket) = socket_borrow.as_ref() {
-            socket.send(&OutMsg::Command(command)).unwrap();
+            socket.send(&ServerMsg::Command(command)).unwrap();
         }
     }
 }
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index 21a7b56fb..b2356c132 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -3,7 +3,7 @@ use wasm_bindgen::{prelude::*, JsCast};
 use std::{cell::RefCell, rc::Rc};
 
 use crate::{
-    rpc::{protocol::OutMsg, websocket::WebSocket},
+    rpc::{protocol::ServerMsg, websocket::WebSocket},
     utils::{window, IntervalHandle, WasmErr},
 };
 
@@ -24,7 +24,7 @@ impl InnerPinger {
             .as_ref()
             .ok_or_else(|| WasmErr::from_str("Unable to ping: no socket"))?;
         self.num += 1;
-        socket.send(&OutMsg::Ping(self.num))
+        socket.send(&ServerMsg::Ping(self.num))
     }
 }
 
diff --git a/jason/src/rpc/protocol.rs b/jason/src/rpc/protocol.rs
index 58d67fa70..22f323c2f 100644
--- a/jason/src/rpc/protocol.rs
+++ b/jason/src/rpc/protocol.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 // TODO: should be properly shared between medea and jason
 #[derive(Deserialize)]
 #[serde(untagged)]
-pub enum InMsg {
+pub enum ClientMsg {
     /// `pong` message that server answers with to WebSocket client in response
     /// to received `ping` message.
     #[serde(rename = "pong")]
@@ -15,7 +15,7 @@ pub enum InMsg {
 #[derive(Serialize)]
 #[allow(dead_code)]
 #[serde(untagged)]
-pub enum OutMsg {
+pub enum ServerMsg {
     /// `ping` message that WebSocket client is expected to send to the server
     /// periodically.
     #[serde(rename = "ping")]
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index d65ce7414..0ccfe81bb 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -6,7 +6,7 @@ use std::{cell::RefCell, convert::TryFrom, rc::Rc};
 
 use crate::{
     rpc::{
-        protocol::{InMsg, OutMsg},
+        protocol::{ClientMsg, ServerMsg},
         CloseMsg,
     },
     utils::{EventListener, WasmErr},
@@ -119,7 +119,7 @@ impl WebSocket {
 
     pub fn on_message<F>(&self, mut f: F) -> Result<(), WasmErr>
     where
-        F: (FnMut(Result<InMsg, WasmErr>)) + 'static,
+        F: (FnMut(Result<ClientMsg, WasmErr>)) + 'static,
     {
         let mut inner_ref = self.0.borrow_mut();
 
@@ -127,7 +127,7 @@ impl WebSocket {
             Rc::clone(&inner_ref.socket),
             "message",
             move |msg| {
-                let parsed = InMsg::try_from(&msg);
+                let parsed = ClientMsg::try_from(&msg);
 
                 f(parsed);
             },
@@ -156,7 +156,7 @@ impl WebSocket {
         Ok(())
     }
 
-    pub fn send(&self, msg: &OutMsg) -> Result<(), WasmErr> {
+    pub fn send(&self, msg: &ServerMsg) -> Result<(), WasmErr> {
         let inner = self.0.borrow();
 
         match inner.socket_state {
@@ -188,7 +188,7 @@ impl Drop for WebSocket {
     }
 }
 
-impl TryFrom<&MessageEvent> for InMsg {
+impl TryFrom<&MessageEvent> for ClientMsg {
     type Error = WasmErr;
 
     fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {

From bbc60481ec386259c782c095850c8503076ae4bd Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 24 Apr 2019 17:05:21 +0300
Subject: [PATCH 141/179] refactor

---
 jason/src/api/room.rs      |  1 +
 jason/src/rpc/websocket.rs | 49 ++++++++++++++++----------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 97a3524d1..a2b4bfd0c 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -44,6 +44,7 @@ impl Room {
 
         let process_msg_task = rx
             .for_each(move |event| {
+                //TODO: macro for convenient dispatch
                 match inner.borrow_mut().as_mut() {
                     Some(inner) => {
                         match event {
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 0ccfe81bb..b6ec08e6a 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -81,39 +81,35 @@ impl InnerSocket {
 
 impl WebSocket {
     pub fn new(url: &str) -> Result<Self, WasmErr> {
-        let inner = InnerSocket::new(url)?;
-
-        let inner_rc = Rc::clone(&inner);
-        let mut inner_ref = inner.borrow_mut();
-
-        inner_ref.on_error = Some(EventListener::new_mut(
-            Rc::clone(&inner_ref.socket),
+        let inner_socket = InnerSocket::new(url)?;
+        let mut inner_mut = inner_socket.borrow_mut();
+        let inner = Rc::clone(&inner_socket);
+        inner_mut.on_error = Some(EventListener::new_mut(
+            Rc::clone(&inner_mut.socket),
             "error",
             move |_| {
-                inner_rc.borrow_mut().update_state();
+                inner.borrow_mut().update_state();
             },
         )?);
 
-        drop(inner_ref);
-        Ok(Self(inner))
+        drop(inner_mut);
+        Ok(Self(inner_socket))
     }
 
     pub fn on_open<F>(&self, f: F) -> Result<(), WasmErr>
     where
         F: (FnOnce()) + 'static,
     {
-        let mut inner_ref = self.0.borrow_mut();
-
-        let inner_rc = Rc::clone(&self.0);
-        inner_ref.on_open = Some(EventListener::new_once(
-            Rc::clone(&inner_ref.socket),
+        let mut inner_mut = self.0.borrow_mut();
+        let inner = Rc::clone(&self.0);
+        inner_mut.on_open = Some(EventListener::new_once(
+            Rc::clone(&inner_mut.socket),
             "open",
             move |_| {
-                inner_rc.borrow_mut().update_state();
+                inner.borrow_mut().update_state();
                 f();
             },
         )?);
-
         Ok(())
     }
 
@@ -121,10 +117,9 @@ impl WebSocket {
     where
         F: (FnMut(Result<ClientMsg, WasmErr>)) + 'static,
     {
-        let mut inner_ref = self.0.borrow_mut();
-
-        inner_ref.on_message = Some(EventListener::new_mut(
-            Rc::clone(&inner_ref.socket),
+        let mut inner_mut = self.0.borrow_mut();
+        inner_mut.on_message = Some(EventListener::new_mut(
+            Rc::clone(&inner_mut.socket),
             "message",
             move |msg| {
                 let parsed = ClientMsg::try_from(&msg);
@@ -139,20 +134,18 @@ impl WebSocket {
     where
         F: (FnOnce(CloseMsg)) + 'static,
     {
-        let mut inner_ref = self.0.borrow_mut();
-
-        let inner_rc = Rc::clone(&self.0);
-        inner_ref.on_close = Some(EventListener::new_once(
-            Rc::clone(&inner_ref.socket),
+        let mut inner_mut = self.0.borrow_mut();
+        let inner = Rc::clone(&self.0);
+        inner_mut.on_close = Some(EventListener::new_once(
+            Rc::clone(&inner_mut.socket),
             "close",
             move |msg: CloseEvent| {
-                inner_rc.borrow_mut().update_state();
+                inner.borrow_mut().update_state();
                 let parsed = CloseMsg::from(&msg);
 
                 f(parsed);
             },
         )?);
-
         Ok(())
     }
 

From 96369c5d2cf91a82cf89e9fd805819dca3e44b09 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 24 Apr 2019 19:42:57 +0300
Subject: [PATCH 142/179] impl ser for ClientMsg and ServerMsg

---
 jason/src/api/jason.rs     |   2 +-
 jason/src/api/room.rs      |   6 +-
 jason/src/rpc/mod.rs       |   8 +--
 jason/src/rpc/pinger.rs    |   4 +-
 jason/src/rpc/protocol.rs  | 129 ++++++++++++++++++++++++++++++++-----
 jason/src/rpc/websocket.rs |   8 +--
 jason/src/utils/errors.rs  |   4 +-
 7 files changed, 127 insertions(+), 34 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index e35316ef5..ccd27b244 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -6,8 +6,8 @@ use std::rc::Rc;
 
 use crate::{
     api::{room::Room, RoomHandle},
-    set_panic_hook,
     rpc::RPCClient,
+    set_panic_hook,
 };
 
 #[wasm_bindgen]
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index a2b4bfd0c..fc69eefd7 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -11,9 +11,7 @@ use web_sys::console;
 
 use std::{cell::RefCell, rc::Rc};
 
-use crate::rpc::{
-    protocol::DirectionalTrack, protocol::Event, RPCClient,
-};
+use crate::rpc::{protocol::DirectionalTrack, protocol::Event, RPCClient};
 
 #[allow(clippy::module_name_repetitions)]
 #[wasm_bindgen]
@@ -44,7 +42,7 @@ impl Room {
 
         let process_msg_task = rx
             .for_each(move |event| {
-                //TODO: macro for convenient dispatch
+                // TODO: macro for convenient dispatch
                 match inner.borrow_mut().as_mut() {
                     Some(inner) => {
                         match event {
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 64521010f..aef94a798 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -69,13 +69,13 @@ impl RPCClient {
 
         let pinger = Rc::clone(&self.pinger);
         let subs = Rc::clone(&self.subs);
-        socket_ref.on_message(move |msg: Result<ClientMsg, WasmErr>| {
+        socket_ref.on_message(move |msg: Result<ServerMsg, WasmErr>| {
             match msg {
-                Ok(ClientMsg::Pong(_num)) => {
+                Ok(ServerMsg::Pong(_num)) => {
                     // TODO: detect no pings
                     pinger.set_pong_at(Date::now());
                 }
-                Ok(ClientMsg::Event(event)) => {
+                Ok(ServerMsg::Event(event)) => {
                     // TODO: many subs, filter messages by session
                     let subs_borrow = subs.borrow();
 
@@ -127,7 +127,7 @@ impl RPCClient {
 
         // TODO: no socket? we dont really want this method to return err
         if let Some(socket) = socket_borrow.as_ref() {
-            socket.send(&ServerMsg::Command(command)).unwrap();
+            socket.send(&ClientMsg::Command(command)).unwrap();
         }
     }
 }
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index b2356c132..2d523700f 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -3,7 +3,7 @@ use wasm_bindgen::{prelude::*, JsCast};
 use std::{cell::RefCell, rc::Rc};
 
 use crate::{
-    rpc::{protocol::ServerMsg, websocket::WebSocket},
+    rpc::{protocol::ClientMsg, websocket::WebSocket},
     utils::{window, IntervalHandle, WasmErr},
 };
 
@@ -24,7 +24,7 @@ impl InnerPinger {
             .as_ref()
             .ok_or_else(|| WasmErr::from_str("Unable to ping: no socket"))?;
         self.num += 1;
-        socket.send(&ServerMsg::Ping(self.num))
+        socket.send(&ClientMsg::Ping(self.num))
     }
 }
 
diff --git a/jason/src/rpc/protocol.rs b/jason/src/rpc/protocol.rs
index 22f323c2f..e87e38797 100644
--- a/jason/src/rpc/protocol.rs
+++ b/jason/src/rpc/protocol.rs
@@ -1,31 +1,63 @@
+use serde::ser::Serializer;
 use serde::{Deserialize, Serialize};
 
 // TODO: should be properly shared between medea and jason
 #[derive(Deserialize)]
-#[serde(untagged)]
-pub enum ClientMsg {
+#[allow(dead_code)]
+pub enum ServerMsg {
     /// `pong` message that server answers with to WebSocket client in response
     /// to received `ping` message.
-    #[serde(rename = "pong")]
     Pong(usize),
-    #[serde(rename = "event")]
     Event(Event),
 }
 
-#[derive(Serialize)]
 #[allow(dead_code)]
-#[serde(untagged)]
-pub enum ServerMsg {
+pub enum ClientMsg {
     /// `ping` message that WebSocket client is expected to send to the server
     /// periodically.
-    #[serde(rename = "ping")]
     Ping(usize),
-    #[serde(rename = "command")]
     Command(Command),
 }
 
+impl Serialize for ClientMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::{SerializeStruct};
+
+        match self {
+            ClientMsg::Ping(n) => {
+                let mut ping = serializer.serialize_struct("ping", 1)?;
+                ping.serialize_field("ping", n)?;
+                ping.end()
+            }
+            ClientMsg::Command(command) => command.serialize(serializer),
+        }
+    }
+}
+
+impl Serialize for ServerMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::{SerializeStruct};
+
+        match self {
+            ServerMsg::Pong(n) => {
+                let mut ping = serializer.serialize_struct("pong", 1)?;
+                ping.serialize_field("pong", n)?;
+                ping.end()
+            }
+            ServerMsg::Event(command) => command.serialize(serializer),
+        }
+    }
+}
+
 /// WebSocket message from Web Client to Media Server.
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize)]
+#[serde(tag = "command", content = "data")]
 #[allow(dead_code)]
 pub enum Command {
     /// Web Client sends SDP Offer.
@@ -37,7 +69,8 @@ pub enum Command {
 }
 
 /// WebSocket message from Medea to Jason.
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
+#[serde(tag = "event", content = "data")]
 #[allow(dead_code)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
@@ -67,7 +100,7 @@ pub enum Event {
 }
 
 /// [`Track] with specified direction.
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
 pub struct DirectionalTrack {
     pub id: u64,
     pub direction: TrackDirection,
@@ -75,21 +108,85 @@ pub struct DirectionalTrack {
 }
 
 /// Direction of [`Track`].
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
 pub enum TrackDirection {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
 }
 
 /// Type of [`Track`].
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
 pub enum TrackMediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
 pub struct AudioSettings {}
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Serialize)]
 pub struct VideoSettings {}
+
+#[cfg(test)]
+mod test {
+    use crate::rpc::protocol::Command::MakeSdpOffer;
+    use crate::rpc::protocol::Event::SdpAnswerMade;
+    use crate::rpc::protocol::{ClientMsg, ServerMsg};
+
+    #[test]
+    fn serialize_ping() {
+        assert_eq!(
+            r#"{"ping":5}"#,
+            serde_json::to_string(&ClientMsg::Ping(5)).unwrap()
+        );
+    }
+
+    #[test]
+    fn serialize_pong() {
+        assert_eq!(
+            r#"{"pong":10}"#,
+            serde_json::to_string(&ServerMsg::Pong(10)).unwrap()
+        );
+    }
+
+    #[test]
+    fn serialize_command() {
+        let command =
+            serde_json::to_string(&ClientMsg::Command(MakeSdpOffer {
+                peer_id: 5,
+                sdp_offer: "offer".to_owned(),
+            }))
+            .unwrap();
+        #[cfg_attr(nightly, rustfmt::skip)]
+        assert_eq!(
+            command,
+            "{\
+               \"command\":\"MakeSdpOffer\",\
+               \"data\":{\
+                 \"peer_id\":5,\
+                 \"sdp_offer\":\"offer\"\
+               }\
+             }",
+        );
+    }
+
+    #[test]
+    fn serialize_event() {
+        let event = serde_json::to_string(&ServerMsg::Event(SdpAnswerMade {
+            peer_id: 45,
+            sdp_answer: "answer".to_owned(),
+        }))
+        .unwrap();
+        #[cfg_attr(nightly, rustfmt::skip)]
+        assert_eq!(
+            event,
+            "{\
+               \"event\":\"SdpAnswerMade\",\
+               \"data\":{\
+                 \"peer_id\":45,\
+                 \"sdp_answer\":\"answer\"\
+               }\
+             }",
+        );
+    }
+}
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index b6ec08e6a..4ab184739 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -115,14 +115,14 @@ impl WebSocket {
 
     pub fn on_message<F>(&self, mut f: F) -> Result<(), WasmErr>
     where
-        F: (FnMut(Result<ClientMsg, WasmErr>)) + 'static,
+        F: (FnMut(Result<ServerMsg, WasmErr>)) + 'static,
     {
         let mut inner_mut = self.0.borrow_mut();
         inner_mut.on_message = Some(EventListener::new_mut(
             Rc::clone(&inner_mut.socket),
             "message",
             move |msg| {
-                let parsed = ClientMsg::try_from(&msg);
+                let parsed = ServerMsg::try_from(&msg);
 
                 f(parsed);
             },
@@ -149,7 +149,7 @@ impl WebSocket {
         Ok(())
     }
 
-    pub fn send(&self, msg: &ServerMsg) -> Result<(), WasmErr> {
+    pub fn send(&self, msg: &ClientMsg) -> Result<(), WasmErr> {
         let inner = self.0.borrow();
 
         match inner.socket_state {
@@ -181,7 +181,7 @@ impl Drop for WebSocket {
     }
 }
 
-impl TryFrom<&MessageEvent> for ClientMsg {
+impl TryFrom<&MessageEvent> for ServerMsg {
     type Error = WasmErr;
 
     fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index ab2a322d4..84cd4842a 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -70,6 +70,4 @@ macro_rules! impl_from_error {
 impl_from_error!(std::cell::BorrowError);
 impl_from_error!(serde_json::error::Error);
 // TODO: improve macro to use generics
-impl_from_error!(
-    futures::sync::mpsc::SendError<crate::rpc::protocol::Event>
-);
+impl_from_error!(futures::sync::mpsc::SendError<crate::rpc::protocol::Event>);

From 29eb6584f73a0c7366aa282bc0205bf892a9c2d6 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 17:55:35 +0300
Subject: [PATCH 143/179] add protocol deser, tests, run jason unit tests on
 make test

---
 Makefile                  |   1 +
 jason/src/rpc/pinger.rs   |   2 +-
 jason/src/rpc/protocol.rs | 213 +++++++++++++++++++++++++++-----------
 jason/tests/web.rs        |   3 +-
 4 files changed, 158 insertions(+), 61 deletions(-)

diff --git a/Makefile b/Makefile
index f3ec7b926..b43ba3f80 100644
--- a/Makefile
+++ b/Makefile
@@ -138,6 +138,7 @@ ifeq ($(test-unit-app),medea)
 endif
 ifeq ($(test-unit-app),jason)
 	wasm-pack test --headless --firefox jason
+	cargo test -p jason
 endif
 
 
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index 2d523700f..0d43f9880 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -11,7 +11,7 @@ pub struct Pinger(Rc<RefCell<InnerPinger>>);
 
 struct InnerPinger {
     ping_interval: i32,
-    num: usize,
+    num: u64,
     pong_at: Option<f64>,
     socket: Rc<RefCell<Option<WebSocket>>>,
     ping_task: Option<PingTaskHandler>,
diff --git a/jason/src/rpc/protocol.rs b/jason/src/rpc/protocol.rs
index e87e38797..0030ce1b9 100644
--- a/jason/src/rpc/protocol.rs
+++ b/jason/src/rpc/protocol.rs
@@ -1,21 +1,78 @@
-use serde::ser::Serializer;
-use serde::{Deserialize, Serialize};
+use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
 
 // TODO: should be properly shared between medea and jason
-#[derive(Deserialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 #[allow(dead_code)]
+/// Message sent by `Media Server` to `Client`.
 pub enum ServerMsg {
     /// `pong` message that server answers with to WebSocket client in response
     /// to received `ping` message.
-    Pong(usize),
+    Pong(u64),
+    /// `Media Server` notifies `Client` about happened facts and it reacts on
+    /// them to reach the proper state.
     Event(Event),
 }
 
+impl Serialize for ServerMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        match self {
+            ServerMsg::Pong(n) => {
+                let mut ping = serializer.serialize_struct("pong", 1)?;
+                ping.serialize_field("pong", n)?;
+                ping.end()
+            }
+            ServerMsg::Event(command) => command.serialize(serializer),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ServerMsg {
+    fn deserialize<D>(deserializer: D) -> Result<ServerMsg, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        let ev = serde_json::Value::deserialize(deserializer)?;
+        let map = ev.as_object().ok_or(Error::custom(format!(
+            "unable to deser ServerMsg [{:?}]",
+            &ev
+        )))?;
+        match map.get("pong") {
+            Some(a) => {
+                let n = a.as_u64().ok_or(Error::custom(format!(
+                    "unable to deser ServerMsg::Pong [{:?}]",
+                    &ev
+                )))?;
+                Ok(ServerMsg::Pong(n))
+            }
+            None => {
+                let event =
+                    serde_json::from_value::<Event>(ev).map_err(|e| {
+                        Error::custom(format!(
+                            "unable to deser ServerMsg::Event [{:?}]",
+                            e
+                        ))
+                    })?;
+                Ok(ServerMsg::Event(event))
+            }
+        }
+    }
+}
+
+#[cfg_attr(test, derive(PartialEq, Debug))]
 #[allow(dead_code)]
+/// Message from 'Client' to 'Media Server'.
 pub enum ClientMsg {
     /// `ping` message that WebSocket client is expected to send to the server
     /// periodically.
-    Ping(usize),
+    Ping(u64),
+    /// Request of `Web Client` to change the state on `Media Server`.
     Command(Command),
 }
 
@@ -24,7 +81,7 @@ impl Serialize for ClientMsg {
     where
         S: Serializer,
     {
-        use serde::ser::{SerializeStruct};
+        use serde::ser::SerializeStruct;
 
         match self {
             ClientMsg::Ping(n) => {
@@ -37,26 +94,43 @@ impl Serialize for ClientMsg {
     }
 }
 
-impl Serialize for ServerMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+impl<'de> Deserialize<'de> for ClientMsg {
+    fn deserialize<D>(deserializer: D) -> Result<ClientMsg, D::Error>
     where
-        S: Serializer,
+        D: Deserializer<'de>,
     {
-        use serde::ser::{SerializeStruct};
+        use serde::de::Error;
 
-        match self {
-            ServerMsg::Pong(n) => {
-                let mut ping = serializer.serialize_struct("pong", 1)?;
-                ping.serialize_field("pong", n)?;
-                ping.end()
+        let ev = serde_json::Value::deserialize(deserializer)?;
+        let map = ev.as_object().ok_or(Error::custom(format!(
+            "unable to deser ClientMsg [{:?}]",
+            &ev
+        )))?;
+        match map.get("ping") {
+            Some(a) => {
+                let n = a.as_u64().ok_or(Error::custom(format!(
+                    "unable to deser ClientMsg::Ping [{:?}]",
+                    &ev
+                )))?;
+                Ok(ClientMsg::Ping(n))
+            }
+            None => {
+                let command =
+                    serde_json::from_value::<Command>(ev).map_err(|e| {
+                        Error::custom(format!(
+                            "unable to deser ClientMsg::Command [{:?}]",
+                            e
+                        ))
+                    })?;
+                Ok(ClientMsg::Command(command))
             }
-            ServerMsg::Event(command) => command.serialize(serializer),
         }
     }
 }
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 #[serde(tag = "command", content = "data")]
 #[allow(dead_code)]
 pub enum Command {
@@ -70,8 +144,9 @@ pub enum Command {
 
 /// WebSocket message from Medea to Jason.
 #[derive(Deserialize, Serialize)]
-#[serde(tag = "event", content = "data")]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 #[allow(dead_code)]
+#[serde(tag = "event", content = "data")]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
@@ -101,6 +176,7 @@ pub enum Event {
 
 /// [`Track] with specified direction.
 #[derive(Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub struct DirectionalTrack {
     pub id: u64,
     pub direction: TrackDirection,
@@ -109,6 +185,7 @@ pub struct DirectionalTrack {
 
 /// Direction of [`Track`].
 #[derive(Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub enum TrackDirection {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
@@ -116,77 +193,97 @@ pub enum TrackDirection {
 
 /// Type of [`Track`].
 #[derive(Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub enum TrackMediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
 #[derive(Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub struct AudioSettings {}
 
 #[derive(Deserialize, Serialize)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub struct VideoSettings {}
 
 #[cfg(test)]
 mod test {
-    use crate::rpc::protocol::Command::MakeSdpOffer;
-    use crate::rpc::protocol::Event::SdpAnswerMade;
-    use crate::rpc::protocol::{ClientMsg, ServerMsg};
+    use crate::rpc::protocol::{
+        ClientMsg, Command::MakeSdpOffer, Event::SdpAnswerMade, ServerMsg,
+    };
 
     #[test]
-    fn serialize_ping() {
-        assert_eq!(
-            r#"{"ping":5}"#,
-            serde_json::to_string(&ClientMsg::Ping(5)).unwrap()
-        );
-    }
+    fn command() {
+        let command = ClientMsg::Command(MakeSdpOffer {
+            peer_id: 77,
+            sdp_offer: "offer".to_owned(),
+        });
+        #[cfg_attr(nightly, rustfmt::skip)]
+        let command_str =
+            "{\
+                \"command\":\"MakeSdpOffer\",\
+                \"data\":{\
+                    \"peer_id\":77,\
+                    \"sdp_offer\":\"offer\"\
+                }\
+            }";
 
-    #[test]
-    fn serialize_pong() {
+        assert_eq!(command_str, serde_json::to_string(&command).unwrap());
         assert_eq!(
-            r#"{"pong":10}"#,
-            serde_json::to_string(&ServerMsg::Pong(10)).unwrap()
+            command,
+            serde_json::from_str(&serde_json::to_string(&command).unwrap())
+                .unwrap()
         );
     }
 
     #[test]
-    fn serialize_command() {
-        let command =
-            serde_json::to_string(&ClientMsg::Command(MakeSdpOffer {
-                peer_id: 5,
-                sdp_offer: "offer".to_owned(),
-            }))
-            .unwrap();
-        #[cfg_attr(nightly, rustfmt::skip)]
+    fn ping() {
+        let ping = ClientMsg::Ping(15);
+        let ping_str = "{\"ping\":15}";
+
+        assert_eq!(ping_str, serde_json::to_string(&ping).unwrap());
         assert_eq!(
-            command,
-            "{\
-               \"command\":\"MakeSdpOffer\",\
-               \"data\":{\
-                 \"peer_id\":5,\
-                 \"sdp_offer\":\"offer\"\
-               }\
-             }",
-        );
+            ping,
+            serde_json::from_str(&serde_json::to_string(&ping).unwrap())
+                .unwrap()
+        )
     }
 
     #[test]
-    fn serialize_event() {
-        let event = serde_json::to_string(&ServerMsg::Event(SdpAnswerMade {
+    fn event() {
+        let event = ServerMsg::Event(SdpAnswerMade {
             peer_id: 45,
             sdp_answer: "answer".to_owned(),
-        }))
-        .unwrap();
+        });
         #[cfg_attr(nightly, rustfmt::skip)]
+        let event_str =
+            "{\
+                \"event\":\"SdpAnswerMade\",\
+                \"data\":{\
+                    \"peer_id\":45,\
+                    \"sdp_answer\":\"answer\"\
+                }\
+            }";
+
+        assert_eq!(event_str, serde_json::to_string(&event).unwrap());
         assert_eq!(
             event,
-            "{\
-               \"event\":\"SdpAnswerMade\",\
-               \"data\":{\
-                 \"peer_id\":45,\
-                 \"sdp_answer\":\"answer\"\
-               }\
-             }",
+            serde_json::from_str(&serde_json::to_string(&event).unwrap())
+                .unwrap()
         );
     }
+
+    #[test]
+    fn pong() {
+        let pong = ServerMsg::Pong(5);
+        let pong_str = "{\"pong\":5}";
+
+        assert_eq!(pong_str, serde_json::to_string(&pong).unwrap());
+        assert_eq!(
+            pong,
+            serde_json::from_str(&serde_json::to_string(&pong).unwrap())
+                .unwrap()
+        )
+    }
 }
diff --git a/jason/tests/web.rs b/jason/tests/web.rs
index 7ebc3ad76..250ddd906 100644
--- a/jason/tests/web.rs
+++ b/jason/tests/web.rs
@@ -7,6 +7,5 @@ wasm_bindgen_test_configure!(run_in_browser);
 
 #[wasm_bindgen_test]
 fn some_dummy_test() {
-    let m = Jason::new("asd".to_owned());
-    assert_eq!("asd", &m.get_token());
+    assert_eq!("asd", "asd");
 }

From 41dece5bd65567c231a312e24798009c230c3ffd Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:01:24 +0300
Subject: [PATCH 144/179] add protocol from jason

---
 src/api/client/commands.rs       |  16 --
 src/api/client/events.rs         |  27 ---
 src/api/client/mod.rs            |   4 +-
 src/api/client/room.rs           |  12 +-
 src/api/client/rpc_connection.rs |   2 +-
 src/api/client/server.rs         |   3 +-
 src/api/client/session.rs        |  50 +++---
 src/api/mod.rs                   |   1 +
 src/api/protocol.rs              | 299 +++++++++++++++++++++++++++++++
 src/media/mod.rs                 |   5 +-
 src/media/peer.rs                |  10 +-
 src/media/track.rs               |  32 +---
 12 files changed, 342 insertions(+), 119 deletions(-)
 delete mode 100644 src/api/client/commands.rs
 delete mode 100644 src/api/client/events.rs
 create mode 100644 src/api/protocol.rs

diff --git a/src/api/client/commands.rs b/src/api/client/commands.rs
deleted file mode 100644
index c268a39f1..000000000
--- a/src/api/client/commands.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-use actix::Message;
-use serde::{Deserialize, Serialize};
-
-use crate::media::peer::Id as PeerId;
-
-/// WebSocket message from Web Client to Media Server.
-#[derive(Debug, Deserialize, Message, Serialize)]
-#[rtype(result = "Result<(), ()>")]
-pub enum Command {
-    /// Web Client sends SDP Offer.
-    MakeSdpOffer { peer_id: PeerId, sdp_offer: String },
-    /// Web Client sends SDP Answer.
-    MakeSdpAnswer { peer_id: PeerId, sdp_answer: String },
-    /// Web Client sends Ice Candidate.
-    SetIceCandidate { peer_id: PeerId, candidate: String },
-}
diff --git a/src/api/client/events.rs b/src/api/client/events.rs
deleted file mode 100644
index 0dce32695..000000000
--- a/src/api/client/events.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use actix::Message;
-use serde::{Deserialize, Serialize};
-
-use crate::media::{peer::Id as PeerId, track::Directional};
-
-/// WebSocket message from Media Server to Web Client.
-#[derive(Clone, Debug, Deserialize, Message, Serialize)]
-pub enum Event {
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// creation.
-    PeerCreated {
-        peer_id: PeerId,
-        sdp_offer: Option<String>,
-        tracks: Vec<Directional>,
-    },
-    /// Media Server notifies Web Client about necessity to apply specified SDP
-    /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade { peer_id: PeerId, sdp_answer: String },
-
-    /// Media Server notifies Web Client about necessity to apply specified
-    /// ICE Candidate.
-    IceCandidateDiscovered { peer_id: PeerId, candidate: String },
-
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// close.
-    PeersRemoved { peer_ids: Vec<PeerId> },
-}
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index acdefd17b..0011715ff 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -1,11 +1,9 @@
 //! Implementation of Client API.
 
-mod commands;
-mod events;
 mod room;
 mod rpc_connection;
 mod session;
 
 pub mod server;
 
-pub use self::{commands::*, events::*, room::*, server::*, session::*};
+pub use self::{room::*, server::*, session::*};
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 5940ee585..f81a8b677 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -17,12 +17,14 @@ use futures::{
 use hashbrown::HashMap;
 
 use crate::{
-    api::client::rpc_connection::{
-        AuthorizationError, Authorize, Closed, ClosedReason, Established,
-        RpcConnection,
+    api::{
+        client::rpc_connection::{
+            AuthorizationError, Authorize, Closed, ClosedReason, Established,
+            RpcConnection,
+        },
+        control::{Id as MemberId, Member},
+        protocol::{Command, Event},
     },
-    api::client::{Command, Event},
-    api::control::{Id as MemberId, Member},
     log::prelude::*,
     media::peer::{Id as PeerId, SignalingStateMachine},
 };
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index dbf8e3e04..0b8c9913b 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -2,7 +2,7 @@
 use actix::Message;
 use futures::Future;
 
-use crate::{api::client::Event, api::control::Id as MemberId};
+use crate::api::{control::Id as MemberId, protocol::Event};
 
 use std::fmt;
 
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index 4b0c169b1..463c4e605 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -7,10 +7,11 @@ use actix_web::{
 use futures::{future, Future as _};
 use serde::Deserialize;
 
+use crate::api::client::WsSession;
 use crate::{
     api::client::rpc_connection::{AuthorizationError, Authorize},
     api::{
-        client::{Id as RoomId, RoomsRepository, WsSession},
+        client::room::{Id as RoomId, RoomsRepository},
         control::Id as MemberId,
     },
     conf::{Conf, Rpc},
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 4f9eb4054..88aef530b 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -8,14 +8,15 @@ use actix::{
 };
 use actix_web::ws::{self, CloseReason};
 use futures::future::Future;
-use serde::{Deserialize, Serialize};
 
+use crate::api::protocol::{ClientMsg, ServerMsg};
 use crate::{
-    api::client::rpc_connection::{
-        Closed, ClosedReason, Established, RpcConnection,
+    api::client::{
+        room::Room,
+        rpc_connection::{Closed, ClosedReason, Established, RpcConnection},
     },
-    api::client::{Command, Event, Room},
     api::control::member::Id as MemberId,
+    api::protocol::Event,
     log::prelude::*,
 };
 
@@ -178,19 +179,6 @@ impl Handler<Event> for WsSession {
     }
 }
 
-/// Message for keeping client WebSocket connection alive.
-#[derive(Debug, Deserialize, Message, Serialize)]
-pub enum Heartbeat {
-    /// `ping` message that WebSocket client is expected to send to the server
-    /// periodically.
-    #[serde(rename = "ping")]
-    Ping(usize),
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
-
 impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
     /// Handles arbitrary [`ws::Message`] received from WebSocket client.
     fn handle(&mut self, msg: ws::Message, ctx: &mut Self::Context) {
@@ -201,18 +189,26 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
         match msg {
             ws::Message::Text(text) => {
                 self.last_activity = Instant::now();
-                if let Ok(Heartbeat::Ping(n)) = serde_json::from_str::<Heartbeat>(&text) {
-                    trace!("Received ping: {}", n);
-                    // Answer with ['Heartbeat::Pong'].
-                    ctx.text(serde_json::to_string(&Heartbeat::Pong(n)).unwrap())
-                }
-                if let Ok(command) = serde_json::from_str::<Command>(&text) {
-                    if let Err(err) = self.room.try_send(command) {
-                        error!(
-                            "Cannot send Command to Room {}, because {}",
-                            self.member_id, err
+                match serde_json::from_str::<ClientMsg>(&text) {
+                    Ok(ClientMsg::Ping(n)) => {
+                        trace!("Received ping: {}", n);
+                        // Answer with ['Heartbeat::Pong'].
+                        ctx.text(
+                            serde_json::to_string(&ServerMsg::Pong(n)).unwrap(),
                         )
                     }
+                    Ok(ClientMsg::Command(command)) => {
+                        if let Err(err) = self.room.try_send(command) {
+                            error!(
+                                "Cannot send Command to Room {}, because {}",
+                                self.member_id, err
+                            )
+                        }
+                    }
+                    Err(err) => error!(
+                        "Error [{:?}] parsing client message [{}]",
+                        err, &text
+                    ),
                 }
             }
             ws::Message::Close(reason) => {
diff --git a/src/api/mod.rs b/src/api/mod.rs
index 1c66e73e5..f12d438ca 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -2,3 +2,4 @@
 
 pub mod client;
 pub mod control;
+pub mod protocol;
diff --git a/src/api/protocol.rs b/src/api/protocol.rs
new file mode 100644
index 000000000..df629eb22
--- /dev/null
+++ b/src/api/protocol.rs
@@ -0,0 +1,299 @@
+use actix::Message;
+use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
+
+/// Message for keeping client WebSocket connection alive.
+#[derive(Debug, Deserialize, Serialize)]
+pub enum Heartbeat {
+    /// `ping` message that WebSocket client is expected to send to the server
+    /// periodically.
+    #[serde(rename = "ping")]
+    Ping(usize),
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    #[serde(rename = "pong")]
+    Pong(usize),
+}
+
+// TODO: should be properly shared between medea and jason
+#[cfg_attr(test, derive(PartialEq, Debug))]
+#[derive(Message)]
+#[allow(dead_code)]
+/// Message sent by `Media Server` to `Client`.
+pub enum ServerMsg {
+    /// `pong` message that server answers with to WebSocket client in response
+    /// to received `ping` message.
+    Pong(u64),
+    /// `Media Server` notifies `Client` about happened facts and it reacts on
+    /// them to reach the proper state.
+    Event(Event),
+}
+
+#[cfg_attr(test, derive(PartialEq, Debug))]
+#[allow(dead_code)]
+/// Message from 'Client' to 'Media Server'.
+pub enum ClientMsg {
+    /// `ping` message that WebSocket client is expected to send to the server
+    /// periodically.
+    Ping(u64),
+    /// Request of `Web Client` to change the state on `Media Server`.
+    Command(Command),
+}
+
+/// WebSocket message from Web Client to Media Server.
+#[derive(Deserialize, Serialize, Message)]
+#[cfg_attr(test, derive(PartialEq, Debug))]
+#[serde(tag = "command", content = "data")]
+#[allow(dead_code)]
+#[rtype(result = "Result<(), ()>")]
+pub enum Command {
+    /// Web Client sends SDP Offer.
+    MakeSdpOffer { peer_id: u64, sdp_offer: String },
+    /// Web Client sends SDP Answer.
+    MakeSdpAnswer { peer_id: u64, sdp_answer: String },
+    /// Web Client sends Ice Candidate.
+    SetIceCandidate { peer_id: u64, candidate: String },
+}
+
+/// WebSocket message from Medea to Jason.
+#[derive(Deserialize, Serialize, Message, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+#[allow(dead_code)]
+#[serde(tag = "event", content = "data")]
+pub enum Event {
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// creation.
+    PeerCreated {
+        peer_id: u64,
+        sdp_offer: Option<String>,
+        tracks: Vec<Directional>,
+    },
+    /// Media Server notifies Web Client about necessity to apply specified SDP
+    /// Answer to Web Client's RTCPeerConnection.
+    SdpAnswerMade { peer_id: u64, sdp_answer: String },
+
+    /// Media Server notifies Web Client about necessity to apply specified
+    /// ICE Candidate.
+    IceCandidateDiscovered { peer_id: u64, candidate: String },
+
+    /// Media Server notifies Web Client about necessity of RTCPeerConnection
+    /// close.
+    PeersRemoved { peer_ids: Vec<u64> },
+}
+
+/// [`Track] with specified direction.
+#[derive(Deserialize, Serialize, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct Directional {
+    pub id: u64,
+    pub direction: Direction,
+    pub media_type: MediaType,
+}
+
+/// Direction of [`Track`].
+#[derive(Deserialize, Serialize, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
+pub enum Direction {
+    Send { receivers: Vec<u64> },
+    Recv { sender: u64 },
+}
+
+/// Type of [`Track`].
+#[derive(Deserialize, Serialize, Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
+pub enum MediaType {
+    Audio(AudioSettings),
+    Video(VideoSettings),
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct AudioSettings {}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+#[cfg_attr(test, derive(PartialEq))]
+pub struct VideoSettings {}
+
+#[cfg(test)]
+mod test {
+    use crate::rpc::protocol::{
+        ClientMsg, Command::MakeSdpOffer, Event::SdpAnswerMade, ServerMsg,
+    };
+
+    #[test]
+    fn command() {
+        let command = ClientMsg::Command(MakeSdpOffer {
+            peer_id: 77,
+            sdp_offer: "offer".to_owned(),
+        });
+        #[cfg_attr(nightly, rustfmt::skip)]
+        let command_str =
+            "{\
+                \"command\":\"MakeSdpOffer\",\
+                \"data\":{\
+                    \"peer_id\":77,\
+                    \"sdp_offer\":\"offer\"\
+                }\
+            }";
+
+        assert_eq!(command_str, serde_json::to_string(&command).unwrap());
+        assert_eq!(
+            command,
+            serde_json::from_str(&serde_json::to_string(&command).unwrap())
+                .unwrap()
+        );
+    }
+
+    #[test]
+    fn ping() {
+        let ping = ClientMsg::Ping(15);
+        let ping_str = "{\"ping\":15}";
+
+        assert_eq!(ping_str, serde_json::to_string(&ping).unwrap());
+        assert_eq!(
+            ping,
+            serde_json::from_str(&serde_json::to_string(&ping).unwrap())
+                .unwrap()
+        )
+    }
+
+    #[test]
+    fn event() {
+        let event = ServerMsg::Event(SdpAnswerMade {
+            peer_id: 45,
+            sdp_answer: "answer".to_owned(),
+        });
+        #[cfg_attr(nightly, rustfmt::skip)]
+        let event_str =
+            "{\
+                \"event\":\"SdpAnswerMade\",\
+                \"data\":{\
+                    \"peer_id\":45,\
+                    \"sdp_answer\":\"answer\"\
+                }\
+            }";
+
+        assert_eq!(event_str, serde_json::to_string(&event).unwrap());
+        assert_eq!(
+            event,
+            serde_json::from_str(&serde_json::to_string(&event).unwrap())
+                .unwrap()
+        );
+    }
+
+    #[test]
+    fn pong() {
+        let pong = ServerMsg::Pong(5);
+        let pong_str = "{\"pong\":5}";
+
+        assert_eq!(pong_str, serde_json::to_string(&pong).unwrap());
+        assert_eq!(
+            pong,
+            serde_json::from_str(&serde_json::to_string(&pong).unwrap())
+                .unwrap()
+        )
+    }
+}
+
+impl Serialize for ClientMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        match self {
+            ClientMsg::Ping(n) => {
+                let mut ping = serializer.serialize_struct("ping", 1)?;
+                ping.serialize_field("ping", n)?;
+                ping.end()
+            }
+            ClientMsg::Command(command) => command.serialize(serializer),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ClientMsg {
+    fn deserialize<D>(deserializer: D) -> Result<ClientMsg, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        let ev = serde_json::Value::deserialize(deserializer)?;
+        let map = ev.as_object().ok_or(Error::custom(format!(
+            "unable to deser ClientMsg [{:?}]",
+            &ev
+        )))?;
+        match map.get("ping") {
+            Some(a) => {
+                let n = a.as_u64().ok_or(Error::custom(format!(
+                    "unable to deser ClientMsg::Ping [{:?}]",
+                    &ev
+                )))?;
+                Ok(ClientMsg::Ping(n))
+            }
+            None => {
+                let command =
+                    serde_json::from_value::<Command>(ev).map_err(|e| {
+                        Error::custom(format!(
+                            "unable to deser ClientMsg::Command [{:?}]",
+                            e
+                        ))
+                    })?;
+                Ok(ClientMsg::Command(command))
+            }
+        }
+    }
+}
+
+impl Serialize for ServerMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        match self {
+            ServerMsg::Pong(n) => {
+                let mut ping = serializer.serialize_struct("pong", 1)?;
+                ping.serialize_field("pong", n)?;
+                ping.end()
+            }
+            ServerMsg::Event(command) => command.serialize(serializer),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ServerMsg {
+    fn deserialize<D>(deserializer: D) -> Result<ServerMsg, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        let ev = serde_json::Value::deserialize(deserializer)?;
+        let map = ev.as_object().ok_or(Error::custom(format!(
+            "unable to deser ServerMsg [{:?}]",
+            &ev
+        )))?;
+        match map.get("pong") {
+            Some(a) => {
+                let n = a.as_u64().ok_or(Error::custom(format!(
+                    "unable to deser ServerMsg::Pong [{:?}]",
+                    &ev
+                )))?;
+                Ok(ServerMsg::Pong(n))
+            }
+            None => {
+                let event =
+                    serde_json::from_value::<Event>(ev).map_err(|e| {
+                        Error::custom(format!(
+                            "unable to deser ServerMsg::Event [{:?}]",
+                            e
+                        ))
+                    })?;
+                Ok(ServerMsg::Event(event))
+            }
+        }
+    }
+}
diff --git a/src/media/mod.rs b/src/media/mod.rs
index 2c97b32f2..4ea7a68f6 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -1,7 +1,4 @@
 pub mod peer;
 pub mod track;
 
-pub use self::{
-    peer::{Id as PeerId, Peer, SignalingStateMachine},
-    track::{AudioSettings, Id as TrackId, MediaType, Track, VideoSettings},
-};
+pub use self::peer::{Id as PeerId, Peer, SignalingStateMachine};
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 04c54007c..79e6f5b6e 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -5,11 +5,13 @@ use std::sync::Arc;
 use hashbrown::HashMap;
 
 use crate::{
-    api::control::member::Id as MemberId,
-    media::track::{
-        AudioSettings, Direction, Directional, Id as TrackId, MediaType, Track,
-        VideoSettings,
+    api::{
+        control::member::Id as MemberId,
+        protocol::{
+            AudioSettings, Direction, Directional, MediaType, VideoSettings,
+        },
     },
+    media::track::{Id as TrackId, Track},
 };
 
 #[derive(Debug, PartialEq)]
diff --git a/src/media/track.rs b/src/media/track.rs
index b7ef69fea..fd7951cc2 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -1,6 +1,4 @@
-use serde::{Deserialize, Serialize};
-
-use crate::media::peer::Id as PeerID;
+use crate::api::protocol::MediaType;
 
 /// ID of [`Track`].
 pub type Id = u64;
@@ -18,31 +16,3 @@ impl Track {
         Self { id, media_type }
     }
 }
-
-/// [`Track] with specified direction.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct Directional {
-    pub id: Id,
-    pub direction: Direction,
-    pub media_type: MediaType,
-}
-
-/// Direction of [`Track`].
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum Direction {
-    Send { receivers: Vec<PeerID> },
-    Recv { sender: PeerID },
-}
-
-/// Type of [`Track`].
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub enum MediaType {
-    Audio(AudioSettings),
-    Video(VideoSettings),
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct AudioSettings {}
-
-#[derive(Clone, Debug, Deserialize, Serialize)]
-pub struct VideoSettings {}

From b7de721c5f526e0fd5c0aade786822ea2b6b834a Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:13:03 +0300
Subject: [PATCH 145/179] make clippy happy

---
 src/api/protocol.rs | 96 +++++++++++++++++++--------------------------
 1 file changed, 41 insertions(+), 55 deletions(-)

diff --git a/src/api/protocol.rs b/src/api/protocol.rs
index df629eb22..e397a283c 100644
--- a/src/api/protocol.rs
+++ b/src/api/protocol.rs
@@ -1,19 +1,6 @@
 use actix::Message;
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
 
-/// Message for keeping client WebSocket connection alive.
-#[derive(Debug, Deserialize, Serialize)]
-pub enum Heartbeat {
-    /// `ping` message that WebSocket client is expected to send to the server
-    /// periodically.
-    #[serde(rename = "ping")]
-    Ping(usize),
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    #[serde(rename = "pong")]
-    Pong(usize),
-}
-
 // TODO: should be properly shared between medea and jason
 #[cfg_attr(test, derive(PartialEq, Debug))]
 #[derive(Message)]
@@ -213,35 +200,35 @@ impl Serialize for ClientMsg {
 }
 
 impl<'de> Deserialize<'de> for ClientMsg {
-    fn deserialize<D>(deserializer: D) -> Result<ClientMsg, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
         use serde::de::Error;
 
         let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or(Error::custom(format!(
-            "unable to deser ClientMsg [{:?}]",
-            &ev
-        )))?;
-        match map.get("ping") {
-            Some(a) => {
-                let n = a.as_u64().ok_or(Error::custom(format!(
+        let map = ev.as_object().ok_or_else(|| {
+            Error::custom(format!("unable to deser ClientMsg [{:?}]", &ev))
+        })?;
+
+        if let Some(v) = map.get("ping") {
+            let n = v.as_u64().ok_or_else(|| {
+                Error::custom(format!(
                     "unable to deser ClientMsg::Ping [{:?}]",
                     &ev
-                )))?;
-                Ok(ClientMsg::Ping(n))
-            }
-            None => {
-                let command =
-                    serde_json::from_value::<Command>(ev).map_err(|e| {
-                        Error::custom(format!(
-                            "unable to deser ClientMsg::Command [{:?}]",
-                            e
-                        ))
-                    })?;
-                Ok(ClientMsg::Command(command))
-            }
+                ))
+            })?;
+
+            Ok(ClientMsg::Ping(n))
+        } else {
+            let command =
+                serde_json::from_value::<Command>(ev).map_err(|e| {
+                    Error::custom(format!(
+                        "unable to deser ClientMsg::Command [{:?}]",
+                        e
+                    ))
+                })?;
+            Ok(ClientMsg::Command(command))
         }
     }
 }
@@ -265,35 +252,34 @@ impl Serialize for ServerMsg {
 }
 
 impl<'de> Deserialize<'de> for ServerMsg {
-    fn deserialize<D>(deserializer: D) -> Result<ServerMsg, D::Error>
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
         D: Deserializer<'de>,
     {
         use serde::de::Error;
 
         let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or(Error::custom(format!(
-            "unable to deser ServerMsg [{:?}]",
-            &ev
-        )))?;
-        match map.get("pong") {
-            Some(a) => {
-                let n = a.as_u64().ok_or(Error::custom(format!(
+        let map = ev.as_object().ok_or_else(|| {
+            Error::custom(format!("unable to deser ServerMsg [{:?}]", &ev))
+        })?;
+
+        if let Some(v) = map.get("pong") {
+            let n = v.as_u64().ok_or_else(|| {
+                Error::custom(format!(
                     "unable to deser ServerMsg::Pong [{:?}]",
                     &ev
-                )))?;
-                Ok(ServerMsg::Pong(n))
-            }
-            None => {
-                let event =
-                    serde_json::from_value::<Event>(ev).map_err(|e| {
-                        Error::custom(format!(
-                            "unable to deser ServerMsg::Event [{:?}]",
-                            e
-                        ))
-                    })?;
-                Ok(ServerMsg::Event(event))
-            }
+                ))
+            })?;
+
+            Ok(ServerMsg::Pong(n))
+        } else {
+            let event = serde_json::from_value::<Event>(ev).map_err(|e| {
+                Error::custom(format!(
+                    "unable to deser ServerMsg::Event [{:?}]",
+                    e
+                ))
+            })?;
+            Ok(ServerMsg::Event(event))
         }
     }
 }

From 92de12d6d0ef133775bf58ae297107872173b317 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:20:27 +0300
Subject: [PATCH 146/179] fix tests

---
 src/api/client/room.rs |   9 +--
 src/api/protocol.rs    | 160 ++++++++++++++++++++---------------------
 2 files changed, 84 insertions(+), 85 deletions(-)

diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index f81a8b677..8cc2134a6 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -550,10 +550,11 @@ mod test {
     use futures::future::Future;
 
     use super::*;
-    use crate::media::{
-        peer::create_peers,
-        track::{Direction, Directional},
-        AudioSettings, MediaType, VideoSettings,
+    use crate::{
+        api::protocol::{
+            AudioSettings, Direction, Directional, MediaType, VideoSettings,
+        },
+        media::peer::create_peers,
     };
 
     #[derive(Debug, Clone)]
diff --git a/src/api/protocol.rs b/src/api/protocol.rs
index e397a283c..ca8591e20 100644
--- a/src/api/protocol.rs
+++ b/src/api/protocol.rs
@@ -100,87 +100,6 @@ pub struct AudioSettings {}
 #[cfg_attr(test, derive(PartialEq))]
 pub struct VideoSettings {}
 
-#[cfg(test)]
-mod test {
-    use crate::rpc::protocol::{
-        ClientMsg, Command::MakeSdpOffer, Event::SdpAnswerMade, ServerMsg,
-    };
-
-    #[test]
-    fn command() {
-        let command = ClientMsg::Command(MakeSdpOffer {
-            peer_id: 77,
-            sdp_offer: "offer".to_owned(),
-        });
-        #[cfg_attr(nightly, rustfmt::skip)]
-        let command_str =
-            "{\
-                \"command\":\"MakeSdpOffer\",\
-                \"data\":{\
-                    \"peer_id\":77,\
-                    \"sdp_offer\":\"offer\"\
-                }\
-            }";
-
-        assert_eq!(command_str, serde_json::to_string(&command).unwrap());
-        assert_eq!(
-            command,
-            serde_json::from_str(&serde_json::to_string(&command).unwrap())
-                .unwrap()
-        );
-    }
-
-    #[test]
-    fn ping() {
-        let ping = ClientMsg::Ping(15);
-        let ping_str = "{\"ping\":15}";
-
-        assert_eq!(ping_str, serde_json::to_string(&ping).unwrap());
-        assert_eq!(
-            ping,
-            serde_json::from_str(&serde_json::to_string(&ping).unwrap())
-                .unwrap()
-        )
-    }
-
-    #[test]
-    fn event() {
-        let event = ServerMsg::Event(SdpAnswerMade {
-            peer_id: 45,
-            sdp_answer: "answer".to_owned(),
-        });
-        #[cfg_attr(nightly, rustfmt::skip)]
-        let event_str =
-            "{\
-                \"event\":\"SdpAnswerMade\",\
-                \"data\":{\
-                    \"peer_id\":45,\
-                    \"sdp_answer\":\"answer\"\
-                }\
-            }";
-
-        assert_eq!(event_str, serde_json::to_string(&event).unwrap());
-        assert_eq!(
-            event,
-            serde_json::from_str(&serde_json::to_string(&event).unwrap())
-                .unwrap()
-        );
-    }
-
-    #[test]
-    fn pong() {
-        let pong = ServerMsg::Pong(5);
-        let pong_str = "{\"pong\":5}";
-
-        assert_eq!(pong_str, serde_json::to_string(&pong).unwrap());
-        assert_eq!(
-            pong,
-            serde_json::from_str(&serde_json::to_string(&pong).unwrap())
-                .unwrap()
-        )
-    }
-}
-
 impl Serialize for ClientMsg {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -283,3 +202,82 @@ impl<'de> Deserialize<'de> for ServerMsg {
         }
     }
 }
+
+#[cfg(test)]
+mod test {
+    use crate::api::protocol::{ClientMsg, Command, Event, ServerMsg};
+
+    #[test]
+    fn command() {
+        let command = ClientMsg::Command(Command::MakeSdpOffer {
+            peer_id: 77,
+            sdp_offer: "offer".to_owned(),
+        });
+        #[cfg_attr(nightly, rustfmt::skip)]
+            let command_str =
+            "{\
+                \"command\":\"MakeSdpOffer\",\
+                \"data\":{\
+                    \"peer_id\":77,\
+                    \"sdp_offer\":\"offer\"\
+                }\
+            }";
+
+        assert_eq!(command_str, serde_json::to_string(&command).unwrap());
+        assert_eq!(
+            command,
+            serde_json::from_str(&serde_json::to_string(&command).unwrap())
+                .unwrap()
+        );
+    }
+
+    #[test]
+    fn ping() {
+        let ping = ClientMsg::Ping(15);
+        let ping_str = "{\"ping\":15}";
+
+        assert_eq!(ping_str, serde_json::to_string(&ping).unwrap());
+        assert_eq!(
+            ping,
+            serde_json::from_str(&serde_json::to_string(&ping).unwrap())
+                .unwrap()
+        )
+    }
+
+    #[test]
+    fn event() {
+        let event = ServerMsg::Event(Event::SdpAnswerMade {
+            peer_id: 45,
+            sdp_answer: "answer".to_owned(),
+        });
+        #[cfg_attr(nightly, rustfmt::skip)]
+            let event_str =
+            "{\
+                \"event\":\"SdpAnswerMade\",\
+                \"data\":{\
+                    \"peer_id\":45,\
+                    \"sdp_answer\":\"answer\"\
+                }\
+            }";
+
+        assert_eq!(event_str, serde_json::to_string(&event).unwrap());
+        assert_eq!(
+            event,
+            serde_json::from_str(&serde_json::to_string(&event).unwrap())
+                .unwrap()
+        );
+    }
+
+    #[test]
+    fn pong() {
+        let pong = ServerMsg::Pong(5);
+        let pong_str = "{\"pong\":5}";
+
+        assert_eq!(pong_str, serde_json::to_string(&pong).unwrap());
+        assert_eq!(
+            pong,
+            serde_json::from_str(&serde_json::to_string(&pong).unwrap())
+                .unwrap()
+        )
+    }
+}

From b39c7352c78f577b4904d9e588ffef9da8a6a418 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:27:10 +0300
Subject: [PATCH 147/179] clippy

---
 jason/src/rpc/protocol.rs | 215 +++++++++++++++++++-------------------
 1 file changed, 106 insertions(+), 109 deletions(-)

diff --git a/jason/src/rpc/protocol.rs b/jason/src/rpc/protocol.rs
index 0030ce1b9..ab8a52af3 100644
--- a/jason/src/rpc/protocol.rs
+++ b/jason/src/rpc/protocol.rs
@@ -13,58 +13,6 @@ pub enum ServerMsg {
     Event(Event),
 }
 
-impl Serialize for ServerMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        use serde::ser::SerializeStruct;
-
-        match self {
-            ServerMsg::Pong(n) => {
-                let mut ping = serializer.serialize_struct("pong", 1)?;
-                ping.serialize_field("pong", n)?;
-                ping.end()
-            }
-            ServerMsg::Event(command) => command.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for ServerMsg {
-    fn deserialize<D>(deserializer: D) -> Result<ServerMsg, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or(Error::custom(format!(
-            "unable to deser ServerMsg [{:?}]",
-            &ev
-        )))?;
-        match map.get("pong") {
-            Some(a) => {
-                let n = a.as_u64().ok_or(Error::custom(format!(
-                    "unable to deser ServerMsg::Pong [{:?}]",
-                    &ev
-                )))?;
-                Ok(ServerMsg::Pong(n))
-            }
-            None => {
-                let event =
-                    serde_json::from_value::<Event>(ev).map_err(|e| {
-                        Error::custom(format!(
-                            "unable to deser ServerMsg::Event [{:?}]",
-                            e
-                        ))
-                    })?;
-                Ok(ServerMsg::Event(event))
-            }
-        }
-    }
-}
-
 #[cfg_attr(test, derive(PartialEq, Debug))]
 #[allow(dead_code)]
 /// Message from 'Client' to 'Media Server'.
@@ -76,58 +24,6 @@ pub enum ClientMsg {
     Command(Command),
 }
 
-impl Serialize for ClientMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        use serde::ser::SerializeStruct;
-
-        match self {
-            ClientMsg::Ping(n) => {
-                let mut ping = serializer.serialize_struct("ping", 1)?;
-                ping.serialize_field("ping", n)?;
-                ping.end()
-            }
-            ClientMsg::Command(command) => command.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for ClientMsg {
-    fn deserialize<D>(deserializer: D) -> Result<ClientMsg, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or(Error::custom(format!(
-            "unable to deser ClientMsg [{:?}]",
-            &ev
-        )))?;
-        match map.get("ping") {
-            Some(a) => {
-                let n = a.as_u64().ok_or(Error::custom(format!(
-                    "unable to deser ClientMsg::Ping [{:?}]",
-                    &ev
-                )))?;
-                Ok(ClientMsg::Ping(n))
-            }
-            None => {
-                let command =
-                    serde_json::from_value::<Command>(ev).map_err(|e| {
-                        Error::custom(format!(
-                            "unable to deser ClientMsg::Command [{:?}]",
-                            e
-                        ))
-                    })?;
-                Ok(ClientMsg::Command(command))
-            }
-        }
-    }
-}
-
 /// WebSocket message from Web Client to Media Server.
 #[derive(Deserialize, Serialize)]
 #[cfg_attr(test, derive(PartialEq, Debug))]
@@ -207,15 +103,116 @@ pub struct AudioSettings {}
 #[cfg_attr(test, derive(PartialEq, Debug))]
 pub struct VideoSettings {}
 
+impl Serialize for ClientMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        match self {
+            ClientMsg::Ping(n) => {
+                let mut ping = serializer.serialize_struct("ping", 1)?;
+                ping.serialize_field("ping", n)?;
+                ping.end()
+            }
+            ClientMsg::Command(command) => command.serialize(serializer),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ClientMsg {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        let ev = serde_json::Value::deserialize(deserializer)?;
+        let map = ev.as_object().ok_or_else(|| {
+            Error::custom(format!("unable to deser ClientMsg [{:?}]", &ev))
+        })?;
+
+        if let Some(v) = map.get("ping") {
+            let n = v.as_u64().ok_or_else(|| {
+                Error::custom(format!(
+                    "unable to deser ClientMsg::Ping [{:?}]",
+                    &ev
+                ))
+            })?;
+
+            Ok(ClientMsg::Ping(n))
+        } else {
+            let command =
+                serde_json::from_value::<Command>(ev).map_err(|e| {
+                    Error::custom(format!(
+                        "unable to deser ClientMsg::Command [{:?}]",
+                        e
+                    ))
+                })?;
+            Ok(ClientMsg::Command(command))
+        }
+    }
+}
+
+impl Serialize for ServerMsg {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        match self {
+            ServerMsg::Pong(n) => {
+                let mut ping = serializer.serialize_struct("pong", 1)?;
+                ping.serialize_field("pong", n)?;
+                ping.end()
+            }
+            ServerMsg::Event(command) => command.serialize(serializer),
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ServerMsg {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        let ev = serde_json::Value::deserialize(deserializer)?;
+        let map = ev.as_object().ok_or_else(|| {
+            Error::custom(format!("unable to deser ServerMsg [{:?}]", &ev))
+        })?;
+
+        if let Some(v) = map.get("pong") {
+            let n = v.as_u64().ok_or_else(|| {
+                Error::custom(format!(
+                    "unable to deser ServerMsg::Pong [{:?}]",
+                    &ev
+                ))
+            })?;
+
+            Ok(ServerMsg::Pong(n))
+        } else {
+            let event = serde_json::from_value::<Event>(ev).map_err(|e| {
+                Error::custom(format!(
+                    "unable to deser ServerMsg::Event [{:?}]",
+                    e
+                ))
+            })?;
+            Ok(ServerMsg::Event(event))
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
-    use crate::rpc::protocol::{
-        ClientMsg, Command::MakeSdpOffer, Event::SdpAnswerMade, ServerMsg,
-    };
+    use crate::rpc::protocol::{ClientMsg, Command, Event, ServerMsg};
 
     #[test]
     fn command() {
-        let command = ClientMsg::Command(MakeSdpOffer {
+        let command = ClientMsg::Command(Command::MakeSdpOffer {
             peer_id: 77,
             sdp_offer: "offer".to_owned(),
         });
@@ -252,7 +249,7 @@ mod test {
 
     #[test]
     fn event() {
-        let event = ServerMsg::Event(SdpAnswerMade {
+        let event = ServerMsg::Event(Event::SdpAnswerMade {
             peer_id: 45,
             sdp_answer: "answer".to_owned(),
         });

From a83de495ada57b3a3e0ee788ce4ffde199cabdb4 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:32:32 +0300
Subject: [PATCH 148/179] fix event send

---
 src/api/client/session.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 88aef530b..5d41e8d3d 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -175,7 +175,7 @@ impl Handler<Event> for WsSession {
     /// Sends [`Event`] to Web Client.
     fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
         debug!("Event {:?} for member {}", event, self.member_id);
-        ctx.text(serde_json::to_string(&event).unwrap())
+        ctx.text(serde_json::to_string(ServerMsg::Event(event)).unwrap())
     }
 }
 

From 9a509566ff3353fd6f8eee199b7696dfc0dee6d4 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:36:56 +0300
Subject: [PATCH 149/179] fix event send

---
 src/api/client/session.rs | 14 ++++++--------
 src/api/protocol.rs       |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 5d41e8d3d..af54b6a79 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -145,7 +145,7 @@ impl RpcConnection for Addr<WsSession> {
         event: Event,
     ) -> Box<dyn Future<Item = (), Error = ()>> {
         let fut = self
-            .send(event)
+            .send(ServerMsg::Event(event))
             .map_err(|err| error!("Failed send event {:?} ", err));
         Box::new(fut)
     }
@@ -169,13 +169,13 @@ impl Handler<Close> for WsSession {
     }
 }
 
-impl Handler<Event> for WsSession {
+impl Handler<ServerMsg> for WsSession {
     type Result = ();
 
     /// Sends [`Event`] to Web Client.
-    fn handle(&mut self, event: Event, ctx: &mut Self::Context) {
-        debug!("Event {:?} for member {}", event, self.member_id);
-        ctx.text(serde_json::to_string(ServerMsg::Event(event)).unwrap())
+    fn handle(&mut self, msg: ServerMsg, ctx: &mut Self::Context) {
+        debug!("Event {:?} for member {}", msg, self.member_id);
+        ctx.text(serde_json::to_string(&msg).unwrap())
     }
 }
 
@@ -193,9 +193,7 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     Ok(ClientMsg::Ping(n)) => {
                         trace!("Received ping: {}", n);
                         // Answer with ['Heartbeat::Pong'].
-                        ctx.text(
-                            serde_json::to_string(&ServerMsg::Pong(n)).unwrap(),
-                        )
+                        ctx.notify(ServerMsg::Pong(n));
                     }
                     Ok(ClientMsg::Command(command)) => {
                         if let Err(err) = self.room.try_send(command) {
diff --git a/src/api/protocol.rs b/src/api/protocol.rs
index ca8591e20..34848e063 100644
--- a/src/api/protocol.rs
+++ b/src/api/protocol.rs
@@ -2,8 +2,8 @@ use actix::Message;
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
 
 // TODO: should be properly shared between medea and jason
-#[cfg_attr(test, derive(PartialEq, Debug))]
-#[derive(Message)]
+#[cfg_attr(test, derive(PartialEq))]
+#[derive(Message, Debug)]
 #[allow(dead_code)]
 /// Message sent by `Media Server` to `Client`.
 pub enum ServerMsg {

From f753f257180d5ef1ed75cd2ef1b881146f7f0b34 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 25 Apr 2019 19:48:58 +0300
Subject: [PATCH 150/179] connect in tests

---
 jason/e2e-demo/js/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index c64eec7e0..704f4a191 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -5,11 +5,9 @@ async function f() {
 
     caller.join_room("ws://localhost:8080/ws/1/1/caller_credentials");
 
-    // caller.dispose();
+    let responder = new rust.Jason();
 
-    // let responder = new rust.Jason();
-    //
-    // responder.init_session("ws://localhost:8080/ws/1/2/responder_credentials");
+    responder.join_room("ws://localhost:8080/ws/1/2/responder_credentials");
 }
 
 f();
\ No newline at end of file

From b49eec627aca6e833607bf97c704d0ea832f06b5 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 26 Apr 2019 15:10:01 +0300
Subject: [PATCH 151/179] refactor transport.subscribe()

---
 jason/src/api/room.rs |  5 +----
 jason/src/rpc/mod.rs  | 10 +++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index fc69eefd7..4eeca905d 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -3,7 +3,6 @@
 use futures::{
     future::{Future, IntoFuture},
     stream::Stream,
-    sync::mpsc::unbounded,
 };
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
@@ -35,12 +34,10 @@ impl Room {
 
     /// Subscribes to provided RpcTransport messages.
     pub fn subscribe(&self, rpc: &RPCClient) {
-        let (tx, rx) = unbounded();
-        rpc.add_sub(tx);
 
         let inner = Rc::clone(&self.0);
 
-        let process_msg_task = rx
+        let process_msg_task = rpc.subscribe()
             .for_each(move |event| {
                 // TODO: macro for convenient dispatch
                 match inner.borrow_mut().as_mut() {
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index aef94a798..30d6d7868 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -5,7 +5,7 @@ mod websocket;
 
 pub mod protocol;
 
-use futures::sync::mpsc::UnboundedSender;
+use futures::sync::mpsc::{UnboundedSender, unbounded};
 use js_sys::Date;
 
 use std::{cell::RefCell, rc::Rc, vec};
@@ -20,6 +20,7 @@ use self::{
     protocol::{Command, Event},
     websocket::WebSocket,
 };
+use futures::Stream;
 
 /// Connection with remote was closed.
 pub enum CloseMsg {
@@ -112,8 +113,11 @@ impl RPCClient {
     }
 
     // TODO: proper sub registry
-    pub fn add_sub(&self, sub: UnboundedSender<Event>) {
-        self.subs.borrow_mut().push(sub);
+    pub fn subscribe(&self) -> impl Stream<Item = Event, Error = ()> {
+        let (tx, rx) = unbounded();
+        self.subs.borrow_mut().push(tx);
+
+        rx
     }
 
     // TODO: proper sub registry

From 246d39551220a04c1e36b95abc4f753af7be34a6 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 26 Apr 2019 18:46:15 +0300
Subject: [PATCH 152/179] transport futurization

---
 jason/e2e-demo/js/index.js |   7 +-
 jason/src/api/jason.rs     |  44 ++++++-----
 jason/src/api/room.rs      |   4 +-
 jason/src/rpc/mod.rs       | 150 +++++++++++++++++++------------------
 jason/src/rpc/pinger.rs    |  37 ++++-----
 jason/src/rpc/websocket.rs |  65 ++++++++--------
 6 files changed, 161 insertions(+), 146 deletions(-)

diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index 704f4a191..e399a8ea3 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -3,11 +3,14 @@ async function f() {
 
     let caller = new rust.Jason();
 
-    caller.join_room("ws://localhost:8080/ws/1/1/caller_credentials");
+    let caller_room_handle = await caller.join_room("ws://localhost:8080/ws/1/1/caller_credentials");
 
     let responder = new rust.Jason();
 
-    responder.join_room("ws://localhost:8080/ws/1/2/responder_credentials");
+    let responder_room_handler = await responder.join_room("ws://localhost:8080/ws/1/2/responder_credentials");
+
+    // caller.dispose();
+    // responder.dispose();
 }
 
 f();
\ No newline at end of file
diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index ccd27b244..b7de0b3e9 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -1,18 +1,20 @@
 //! Main application handler. Responsible for managing shared transports,
 //! local media, room initialization.
+use futures::future::Future;
+use js_sys::Promise;
 use wasm_bindgen::prelude::*;
+use wasm_bindgen_futures::future_to_promise;
 
-use std::rc::Rc;
+use std::{cell::RefCell, rc::Rc};
 
-use crate::{
-    api::{room::Room, RoomHandle},
-    rpc::RPCClient,
-    set_panic_hook,
-};
+use crate::{api::room::Room, rpc::RPCClient, set_panic_hook};
 
 #[wasm_bindgen]
 #[derive(Default)]
-pub struct Jason {
+pub struct Jason(Rc<RefCell<Inner>>);
+
+#[derive(Default)]
+pub struct Inner {
     // TODO: multiple RPCClient's if rooms managed by different servers
     rpc: Option<Rc<RPCClient>>,
     rooms: Vec<Room>,
@@ -27,20 +29,28 @@ impl Jason {
     }
 
     /// Enter room with provided token, return initialized connection handler.
-    /// TODO: Errors if unable to establish RPC connection with remote.
-    pub fn join_room(&mut self, token: String) -> Result<RoomHandle, JsValue> {
+    /// Effectively returns Result<RoomHandle, JsValue>
+    pub fn join_room(&self, token: String) -> Promise {
         let mut rpc = RPCClient::new(token, 3000);
-        rpc.init()?;
-        let rpc = Rc::new(rpc);
 
-        let room = Room::new(Rc::clone(&rpc));
-        room.subscribe(&rpc);
-        let handle = room.new_handle();
+        let inner = Rc::clone(&self.0);
+        let fut = rpc
+            .init()
+            .and_then(move |()| {
+                let rpc = Rc::new(rpc);
+                let room = Room::new(Rc::clone(&rpc));
+                room.subscribe(&rpc);
+
+                let handle = room.new_handle();
+
+                inner.borrow_mut().rpc.replace(rpc);
+                inner.borrow_mut().rooms.push(room);
 
-        self.rooms.push(room);
-        self.rpc = Some(rpc);
+                Ok(JsValue::from(handle))
+            })
+            .map_err(JsValue::from);
 
-        Ok(handle)
+        future_to_promise(fut)
     }
 
     pub fn dispose(self) {}
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 4eeca905d..39e177363 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -34,10 +34,10 @@ impl Room {
 
     /// Subscribes to provided RpcTransport messages.
     pub fn subscribe(&self, rpc: &RPCClient) {
-
         let inner = Rc::clone(&self.0);
 
-        let process_msg_task = rpc.subscribe()
+        let process_msg_task = rpc
+            .subscribe()
             .for_each(move |event| {
                 // TODO: macro for convenient dispatch
                 match inner.borrow_mut().as_mut() {
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 30d6d7868..25fbaf9c6 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -1,11 +1,14 @@
 //!  Abstraction over concrete transport.
-//!
+
 mod pinger;
 mod websocket;
 
 pub mod protocol;
 
-use futures::sync::mpsc::{UnboundedSender, unbounded};
+use futures::{
+    sync::mpsc::{unbounded, UnboundedSender},
+    Future, Stream,
+};
 use js_sys::Date;
 
 use std::{cell::RefCell, rc::Rc, vec};
@@ -20,7 +23,6 @@ use self::{
     protocol::{Command, Event},
     websocket::WebSocket,
 };
-use futures::Stream;
 
 /// Connection with remote was closed.
 pub enum CloseMsg {
@@ -35,99 +37,101 @@ pub enum CloseMsg {
 // 2. Reconnect.
 // 3. Disconnect if no pongs.
 // 4. Buffering if no socket?
-pub struct RPCClient {
-    sock: Rc<RefCell<Option<WebSocket>>>,
+pub struct RPCClient(Rc<RefCell<Inner>>);
+
+struct Inner {
+    sock: Option<Rc<WebSocket>>,
     token: String,
-    pinger: Rc<Pinger>,
-    subs: Rc<RefCell<Vec<UnboundedSender<Event>>>>,
+    pinger: Pinger,
+    subs: Vec<UnboundedSender<Event>>,
+}
+
+impl Inner {
+    fn new(token: String, ping_interval: i32) -> Rc<RefCell<Self>> {
+        Rc::new(RefCell::new(Self {
+            sock: None,
+            token,
+            subs: vec![],
+            pinger: Pinger::new(ping_interval),
+        }))
+    }
 }
 
 impl RPCClient {
     pub fn new(token: String, ping_interval: i32) -> Self {
-        Self {
-            sock: Rc::new(RefCell::new(None)),
-            token,
-            subs: Rc::new(RefCell::new(vec![])),
-            pinger: Rc::new(Pinger::new(ping_interval)),
-        }
+        Self(Inner::new(token, ping_interval))
     }
 
-    pub fn init(&mut self) -> Result<(), WasmErr> {
-        self.sock = Rc::new(RefCell::new(Some(WebSocket::new(&self.token)?)));
-
-        let socket_borrow = self.sock.borrow();
-        let socket_ref = socket_borrow
-            .as_ref()
-            .ok_or_else(|| WasmErr::from_str("socket is None"))?;
-
-        let socket = Rc::clone(&self.sock);
-        let pinger = Rc::clone(&self.pinger);
-        socket_ref.on_open(move || {
-            if let Err(err) = pinger.start(socket) {
-                err.log_err();
-            };
-        })?;
-
-        let pinger = Rc::clone(&self.pinger);
-        let subs = Rc::clone(&self.subs);
-        socket_ref.on_message(move |msg: Result<ServerMsg, WasmErr>| {
-            match msg {
-                Ok(ServerMsg::Pong(_num)) => {
-                    // TODO: detect no pings
-                    pinger.set_pong_at(Date::now());
-                }
-                Ok(ServerMsg::Event(event)) => {
-                    // TODO: many subs, filter messages by session
-                    let subs_borrow = subs.borrow();
-
-                    if let Some(sub) = subs_borrow.iter().next() {
-                        if let Err(err) = sub.unbounded_send(event) {
-                            // TODO: receiver is gone, should delete this
-                            // subs tx
-                            WasmErr::from(err).log_err();
+    pub fn init(&mut self) -> impl Future<Item = (), Error = WasmErr> {
+        let inner = Rc::clone(&self.0);
+        WebSocket::new(&self.0.borrow().token).and_then(
+            move |socket: WebSocket| {
+                let socket = Rc::new(socket);
+                inner.borrow_mut().pinger.start(Rc::clone(&socket))?;
+
+                let inner_rc = Rc::clone(&inner);
+                socket.on_message(move |msg: Result<ServerMsg, WasmErr>| {
+                    let inner = inner_rc.borrow();
+                    match msg {
+                        Ok(ServerMsg::Pong(_num)) => {
+                            // TODO: detect no pings
+                            inner.pinger.set_pong_at(Date::now());
+                        }
+                        Ok(ServerMsg::Event(event)) => {
+                            // TODO: many subs, filter messages by session
+                            if let Some(sub) = inner.subs.iter().next() {
+                                if let Err(err) = sub.unbounded_send(event) {
+                                    // TODO: receiver is gone, should delete
+                                    // this
+                                    // subs tx
+                                    WasmErr::from(err).log_err();
+                                }
+                            }
+                        }
+                        Err(err) => {
+                            // TODO: protocol versions mismatch? should drop
+                            // connection if so
+                            err.log_err();
                         }
                     }
-                }
-                Err(err) => {
-                    // TODO: protocol versions mismatch? should drop
-                    // connection if so
-                    err.log_err();
-                }
-            }
-        })?;
-
-        let socket = Rc::clone(&self.sock);
-        let pinger = Rc::clone(&self.pinger);
-        socket_ref.on_close(move |msg: CloseMsg| {
-            socket.borrow_mut().take();
-            pinger.stop();
-
-            // TODO: reconnect on disconnect, propagate error if unable
-            // to reconnect
-            match msg {
-                CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {}
-            }
-        })?;
-
-        Ok(())
+                })?;
+
+                let inner_rc = Rc::clone(&inner);
+                socket.on_close(move |msg: CloseMsg| {
+                    let mut inner = inner_rc.borrow_mut();
+                    inner.sock.take();
+                    inner.pinger.stop();
+
+                    // TODO: reconnect on disconnect, propagate error if unable
+                    // to reconnect
+                    match msg {
+                        CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {
+                        }
+                    }
+                })?;
+
+                inner.borrow_mut().sock.replace(socket);
+                Ok(())
+            },
+        )
     }
 
     // TODO: proper sub registry
     pub fn subscribe(&self) -> impl Stream<Item = Event, Error = ()> {
         let (tx, rx) = unbounded();
-        self.subs.borrow_mut().push(tx);
+        self.0.borrow_mut().subs.push(tx);
 
         rx
     }
 
     // TODO: proper sub registry
     pub fn unsub(&self) {
-        self.subs.borrow_mut().clear();
+        self.0.borrow_mut().subs.clear();
     }
 
     // TODO: proper sub registry
     pub fn _send_command(&self, command: Command) {
-        let socket_borrow = self.sock.borrow();
+        let socket_borrow = &self.0.borrow().sock;
 
         // TODO: no socket? we dont really want this method to return err
         if let Some(socket) = socket_borrow.as_ref() {
@@ -139,6 +143,6 @@ impl RPCClient {
 impl Drop for RPCClient {
     fn drop(&mut self) {
         // Drop socket, pinger will be dropped too
-        self.sock.borrow_mut().take();
+        self.0.borrow_mut().sock.take();
     }
 }
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index 0d43f9880..dc09e55f8 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -13,18 +13,19 @@ struct InnerPinger {
     ping_interval: i32,
     num: u64,
     pong_at: Option<f64>,
-    socket: Rc<RefCell<Option<WebSocket>>>,
+    socket: Option<Rc<WebSocket>>,
     ping_task: Option<PingTaskHandler>,
 }
 
 impl InnerPinger {
     fn send_now(&mut self) -> Result<(), WasmErr> {
-        let borrow = self.socket.try_borrow()?;
-        let socket = borrow
-            .as_ref()
-            .ok_or_else(|| WasmErr::from_str("Unable to ping: no socket"))?;
-        self.num += 1;
-        socket.send(&ClientMsg::Ping(self.num))
+        match self.socket.as_ref() {
+            None => Err(WasmErr::from_str("Unable to ping: no socket")),
+            Some(socket) => {
+                self.num += 1;
+                socket.send(&ClientMsg::Ping(self.num))
+            }
+        }
     }
 }
 
@@ -39,22 +40,18 @@ impl Pinger {
             ping_interval,
             num: 0,
             pong_at: None,
-            socket: Rc::new(RefCell::new(None)),
+            socket: None,
             ping_task: None,
         })))
     }
 
-    pub fn set_pong_at(&self, at: f64) {
-        self.0.borrow_mut().pong_at = Some(at);
-    }
-
-    pub fn start(
-        &self,
-        socket: Rc<RefCell<Option<WebSocket>>>,
-    ) -> Result<(), WasmErr> {
+    pub fn start(&self, socket: Rc<WebSocket>) -> Result<(), WasmErr> {
         let mut inner = self.0.borrow_mut();
-        inner.socket = socket;
-        inner.send_now()?;
+        inner.socket = Some(socket);
+        // TODO: commented out since socket might no be opened atm, should be
+        //      uncommented when WebSocket.init resolves only after on_open
+        //      fired from underlying WebSocket
+        //        inner.send_now()?;
 
         let inner_rc = Rc::clone(&self.0);
         let do_ping = Closure::wrap(Box::new(move || {
@@ -76,6 +73,10 @@ impl Pinger {
         Ok(())
     }
 
+    pub fn set_pong_at(&self, at: f64) {
+        self.0.borrow_mut().pong_at = Some(at);
+    }
+
     pub fn stop(&self) {
         self.0.borrow_mut().ping_task.take();
     }
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 4ab184739..280a995f5 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -1,5 +1,6 @@
 //! ['WebSocket'](https://developer.mozilla.org/ru/docs/WebSockets)
 //! transport wrapper.
+use futures::future::{Future, IntoFuture};
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
 use std::{cell::RefCell, convert::TryFrom, rc::Rc};
@@ -57,15 +58,15 @@ struct InnerSocket {
 pub struct WebSocket(Rc<RefCell<InnerSocket>>);
 
 impl InnerSocket {
-    fn new(url: &str) -> Result<Rc<RefCell<Self>>, WasmErr> {
-        Ok(Rc::new(RefCell::new(Self {
+    fn new(url: &str) -> Result<Self, WasmErr> {
+        Ok(Self {
             socket_state: State::CONNECTING,
             socket: Rc::new(BackingSocket::new(url)?),
             on_open: None,
             on_message: None,
             on_close: None,
             on_error: None,
-        })))
+        })
     }
 
     fn update_state(&mut self) {
@@ -80,37 +81,33 @@ impl InnerSocket {
 }
 
 impl WebSocket {
-    pub fn new(url: &str) -> Result<Self, WasmErr> {
-        let inner_socket = InnerSocket::new(url)?;
-        let mut inner_mut = inner_socket.borrow_mut();
-        let inner = Rc::clone(&inner_socket);
-        inner_mut.on_error = Some(EventListener::new_mut(
-            Rc::clone(&inner_mut.socket),
-            "error",
-            move |_| {
-                inner.borrow_mut().update_state();
-            },
-        )?);
-
-        drop(inner_mut);
-        Ok(Self(inner_socket))
-    }
-
-    pub fn on_open<F>(&self, f: F) -> Result<(), WasmErr>
-    where
-        F: (FnOnce()) + 'static,
-    {
-        let mut inner_mut = self.0.borrow_mut();
-        let inner = Rc::clone(&self.0);
-        inner_mut.on_open = Some(EventListener::new_once(
-            Rc::clone(&inner_mut.socket),
-            "open",
-            move |_| {
-                inner.borrow_mut().update_state();
-                f();
-            },
-        )?);
-        Ok(())
+    // Resolves only if connection succeeded.
+    pub fn new(url: &str) -> impl Future<Item = Self, Error = WasmErr> {
+        InnerSocket::new(url).into_future().and_then(|socket| {
+            let socket = Rc::new(RefCell::new(socket));
+            let mut socket_mut = socket.borrow_mut();
+
+            let inner = Rc::clone(&socket);
+            socket_mut.on_error = Some(EventListener::new_mut(
+                Rc::clone(&socket_mut.socket),
+                "error",
+                move |_| {
+                    inner.borrow_mut().update_state();
+                },
+            )?);
+
+            let inner = Rc::clone(&socket);
+            socket_mut.on_open = Some(EventListener::new_once(
+                Rc::clone(&socket_mut.socket),
+                "open",
+                move |_| {
+                    inner.borrow_mut().update_state();
+                },
+            )?);
+
+            drop(socket_mut);
+            Ok(Self(socket))
+        })
     }
 
     pub fn on_message<F>(&self, mut f: F) -> Result<(), WasmErr>

From 4af378a7ab6831e1712bb140dd72d3d3cd0e2baa Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 1 May 2019 12:46:06 +0300
Subject: [PATCH 153/179] format

---
 jason/src/rpc/mod.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 25fbaf9c6..c524b147f 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -71,6 +71,8 @@ impl RPCClient {
 
                 let inner_rc = Rc::clone(&inner);
                 socket.on_message(move |msg: Result<ServerMsg, WasmErr>| {
+
+
                     let inner = inner_rc.borrow();
                     match msg {
                         Ok(ServerMsg::Pong(_num)) => {
@@ -82,8 +84,7 @@ impl RPCClient {
                             if let Some(sub) = inner.subs.iter().next() {
                                 if let Err(err) = sub.unbounded_send(event) {
                                     // TODO: receiver is gone, should delete
-                                    // this
-                                    // subs tx
+                                    //       this subs tx
                                     WasmErr::from(err).log_err();
                                 }
                             }
@@ -94,10 +95,14 @@ impl RPCClient {
                             err.log_err();
                         }
                     }
+
+
                 })?;
 
                 let inner_rc = Rc::clone(&inner);
                 socket.on_close(move |msg: CloseMsg| {
+
+
                     let mut inner = inner_rc.borrow_mut();
                     inner.sock.take();
                     inner.pinger.stop();
@@ -108,6 +113,8 @@ impl RPCClient {
                         CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {
                         }
                     }
+
+
                 })?;
 
                 inner.borrow_mut().sock.replace(socket);

From 965256a1c4f76b6ff987ea59c9785479b9ceef70 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Wed, 1 May 2019 12:47:01 +0300
Subject: [PATCH 154/179] format

---
 jason/src/rpc/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index c524b147f..114e251ae 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -91,7 +91,7 @@ impl RPCClient {
                         }
                         Err(err) => {
                             // TODO: protocol versions mismatch? should drop
-                            // connection if so
+                            //       connection if so
                             err.log_err();
                         }
                     }
@@ -108,7 +108,7 @@ impl RPCClient {
                     inner.pinger.stop();
 
                     // TODO: reconnect on disconnect, propagate error if unable
-                    // to reconnect
+                    //       to reconnect
                     match msg {
                         CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {
                         }

From 0361e30b528081076ae9969298556534ef4b7e5f Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 2 May 2019 14:17:28 +0300
Subject: [PATCH 155/179] Impl return socket only if connection success

---
 jason/src/rpc/pinger.rs    |  2 +-
 jason/src/rpc/websocket.rs | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index dc09e55f8..13a474bc8 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -51,7 +51,7 @@ impl Pinger {
         // TODO: commented out since socket might no be opened atm, should be
         //      uncommented when WebSocket.init resolves only after on_open
         //      fired from underlying WebSocket
-        //        inner.send_now()?;
+        inner.send_now()?;
 
         let inner_rc = Rc::clone(&self.0);
         let do_ping = Closure::wrap(Box::new(move || {
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 280a995f5..f9f9ec757 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -1,6 +1,7 @@
 //! ['WebSocket'](https://developer.mozilla.org/ru/docs/WebSockets)
 //! transport wrapper.
 use futures::future::{Future, IntoFuture};
+use futures::stream::Stream;
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
 use std::{cell::RefCell, convert::TryFrom, rc::Rc};
@@ -83,7 +84,10 @@ impl InnerSocket {
 impl WebSocket {
     // Resolves only if connection succeeded.
     pub fn new(url: &str) -> impl Future<Item = Self, Error = WasmErr> {
-        InnerSocket::new(url).into_future().and_then(|socket| {
+        let (tx_error, rx_error) = futures::sync::mpsc::unbounded();
+        let (tx_open, rx_open) = futures::oneshot();
+
+        InnerSocket::new(url).into_future().and_then(move |socket| {
             let socket = Rc::new(RefCell::new(socket));
             let mut socket_mut = socket.borrow_mut();
 
@@ -92,7 +96,7 @@ impl WebSocket {
                 Rc::clone(&socket_mut.socket),
                 "error",
                 move |_| {
-                    inner.borrow_mut().update_state();
+                    tx_error.unbounded_send(inner.borrow_mut().update_state()).map_err(|_|());
                 },
             )?);
 
@@ -101,12 +105,20 @@ impl WebSocket {
                 Rc::clone(&socket_mut.socket),
                 "open",
                 move |_| {
-                    inner.borrow_mut().update_state();
+                    tx_open.send(inner.borrow_mut().update_state()).unwrap();
                 },
             )?);
 
             drop(socket_mut);
             Ok(Self(socket))
+        }).and_then(move |socket| {
+            rx_open.then(move |_| Ok(socket))
+                .select(rx_error.into_future().then(|_| Err(WasmErr::from_str("init socket error"))))
+                // TODO try and_then
+                .then(|res| match res {
+                    Ok((s, _)) => Ok(s),
+                    Err((e, _)) => Err(e),
+                })
         })
     }
 

From 91e83fdd7d82e0856a91ff8789d3399ac92975b4 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 2 May 2019 15:59:47 +0300
Subject: [PATCH 156/179] Impl on_close handler

---
 jason/e2e-demo/js/index.js |  2 +-
 jason/src/rpc/pinger.rs    |  3 --
 jason/src/rpc/websocket.rs | 81 ++++++++++++++++++++++----------------
 3 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index e399a8ea3..4b27104af 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -13,4 +13,4 @@ async function f() {
     // responder.dispose();
 }
 
-f();
\ No newline at end of file
+f();
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index 13a474bc8..6bca208d6 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -48,9 +48,6 @@ impl Pinger {
     pub fn start(&self, socket: Rc<WebSocket>) -> Result<(), WasmErr> {
         let mut inner = self.0.borrow_mut();
         inner.socket = Some(socket);
-        // TODO: commented out since socket might no be opened atm, should be
-        //      uncommented when WebSocket.init resolves only after on_open
-        //      fired from underlying WebSocket
         inner.send_now()?;
 
         let inner_rc = Rc::clone(&self.0);
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index f9f9ec757..767015acc 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -82,44 +82,55 @@ impl InnerSocket {
 }
 
 impl WebSocket {
-    // Resolves only if connection succeeded.
+    /// Resolves only if connection succeeded.
     pub fn new(url: &str) -> impl Future<Item = Self, Error = WasmErr> {
-        let (tx_error, rx_error) = futures::sync::mpsc::unbounded();
+        let (tx_close, rx_close) = futures::oneshot();
         let (tx_open, rx_open) = futures::oneshot();
 
-        InnerSocket::new(url).into_future().and_then(move |socket| {
-            let socket = Rc::new(RefCell::new(socket));
-            let mut socket_mut = socket.borrow_mut();
-
-            let inner = Rc::clone(&socket);
-            socket_mut.on_error = Some(EventListener::new_mut(
-                Rc::clone(&socket_mut.socket),
-                "error",
-                move |_| {
-                    tx_error.unbounded_send(inner.borrow_mut().update_state()).map_err(|_|());
-                },
-            )?);
-
-            let inner = Rc::clone(&socket);
-            socket_mut.on_open = Some(EventListener::new_once(
-                Rc::clone(&socket_mut.socket),
-                "open",
-                move |_| {
-                    tx_open.send(inner.borrow_mut().update_state()).unwrap();
-                },
-            )?);
-
-            drop(socket_mut);
-            Ok(Self(socket))
-        }).and_then(move |socket| {
-            rx_open.then(move |_| Ok(socket))
-                .select(rx_error.into_future().then(|_| Err(WasmErr::from_str("init socket error"))))
-                // TODO try and_then
-                .then(|res| match res {
-                    Ok((s, _)) => Ok(s),
-                    Err((e, _)) => Err(e),
-                })
-        })
+        InnerSocket::new(url)
+            .into_future()
+            .and_then(move |socket| {
+                let socket = Rc::new(RefCell::new(socket));
+                let mut socket_mut = socket.borrow_mut();
+
+                let inner = Rc::clone(&socket);
+                socket_mut.on_close = Some(EventListener::new_once(
+                    Rc::clone(&socket_mut.socket),
+                    "close",
+                    move |_| {
+                        inner.borrow_mut().update_state();
+                        tx_close.send(());
+                    },
+                )?);
+
+                let inner = Rc::clone(&socket);
+                socket_mut.on_open = Some(EventListener::new_once(
+                    Rc::clone(&socket_mut.socket),
+                    "open",
+                    move |_| {
+                        inner.borrow_mut().update_state();
+                        tx_open.send(());
+                    },
+                )?);
+
+                drop(socket_mut);
+                Ok(Self(socket))
+            })
+            .and_then(move |socket| {
+                rx_open
+                    .then(move |_| {
+                        let mut socket_mut = socket.0.borrow_mut();
+                        socket_mut.on_open.take();
+                        socket_mut.on_close.take();
+                        drop(socket_mut);
+                        Ok(socket)
+                    })
+                    .select(rx_close.then(|_| {
+                        Err(WasmErr::from_str("Failed to init WebSocket"))
+                    }))
+                    .map(|(socket, _)| socket)
+                    .map_err(|(err, _)| err)
+            })
     }
 
     pub fn on_message<F>(&self, mut f: F) -> Result<(), WasmErr>

From 59623c6ddc9616183849cee43931f210ce7b8df5 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 3 May 2019 14:12:28 +0300
Subject: [PATCH 157/179] Impl on_close handler for RpcClient

---
 jason/src/rpc/mod.rs | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 114e251ae..3fbbac7e1 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -57,6 +57,20 @@ impl Inner {
     }
 }
 
+fn on_close(inner_rc: Rc<RefCell<Inner>>) -> Box<FnOnce(CloseMsg)> {
+    Box::new(move |msg: CloseMsg| {
+        let mut inner = inner_rc.borrow_mut();
+        inner.sock.take();
+        inner.pinger.stop();
+
+        // TODO: reconnect on disconnect, propagate error if unable
+        //       to reconnect
+        match msg {
+            CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {}
+        }
+    })
+}
+
 impl RPCClient {
     pub fn new(token: String, ping_interval: i32) -> Self {
         Self(Inner::new(token, ping_interval))
@@ -95,27 +109,10 @@ impl RPCClient {
                             err.log_err();
                         }
                     }
-
-
                 })?;
 
                 let inner_rc = Rc::clone(&inner);
-                socket.on_close(move |msg: CloseMsg| {
-
-
-                    let mut inner = inner_rc.borrow_mut();
-                    inner.sock.take();
-                    inner.pinger.stop();
-
-                    // TODO: reconnect on disconnect, propagate error if unable
-                    //       to reconnect
-                    match msg {
-                        CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {
-                        }
-                    }
-
-
-                })?;
+                socket.on_close(on_close(inner_rc))?;
 
                 inner.borrow_mut().sock.replace(socket);
                 Ok(())

From 7cd3ff1657d61fb8b87b2931c279fe5ccc37728e Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Fri, 3 May 2019 15:53:41 +0300
Subject: [PATCH 158/179] Impl on_message handler for RpcClient

- add docs
---
 jason/src/rpc/mod.rs | 67 +++++++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 3fbbac7e1..e343ed150 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -39,9 +39,15 @@ pub enum CloseMsg {
 // 4. Buffering if no socket?
 pub struct RPCClient(Rc<RefCell<Inner>>);
 
+/// Inner state of [`RPCClient`].
 struct Inner {
+    /// WebSocket connection to remote media server.
     sock: Option<Rc<WebSocket>>,
+
+    /// Credentials for authorize on remote media server.
     token: String,
+
+    /// Sends ping message to remote media server with specified interval.
     pinger: Pinger,
     subs: Vec<UnboundedSender<Event>>,
 }
@@ -57,6 +63,7 @@ impl Inner {
     }
 }
 
+/// Returns handler for bind on close WebSocket connection.
 fn on_close(inner_rc: Rc<RefCell<Inner>>) -> Box<FnOnce(CloseMsg)> {
     Box::new(move |msg: CloseMsg| {
         let mut inner = inner_rc.borrow_mut();
@@ -71,11 +78,44 @@ fn on_close(inner_rc: Rc<RefCell<Inner>>) -> Box<FnOnce(CloseMsg)> {
     })
 }
 
+/// Returns handler for bind on receive server message.
+fn on_message(
+    inner_rc: Rc<RefCell<Inner>>,
+) -> Box<FnMut(Result<ServerMsg, WasmErr>)> {
+    Box::new(move |msg: Result<ServerMsg, WasmErr>| {
+        let inner = inner_rc.borrow();
+        match msg {
+            Ok(ServerMsg::Pong(_num)) => {
+                // TODO: detect no pings
+                inner.pinger.set_pong_at(Date::now());
+            }
+            Ok(ServerMsg::Event(event)) => {
+                // TODO: many subs, filter messages by session
+                if let Some(sub) = inner.subs.iter().next() {
+                    if let Err(err) = sub.unbounded_send(event) {
+                        // TODO: receiver is gone, should delete
+                        //       this subs tx
+                        WasmErr::from(err).log_err();
+                    }
+                }
+            }
+            Err(err) => {
+                // TODO: protocol versions mismatch? should drop
+                //       connection if so
+                err.log_err();
+            }
+        }
+    })
+}
+
 impl RPCClient {
     pub fn new(token: String, ping_interval: i32) -> Self {
         Self(Inner::new(token, ping_interval))
     }
 
+    /// Creates new WebSocket connection to remote media server.
+    /// Start ['Pinger`] if connection success and bind handlers
+    /// on receive messages from server and close socket.
     pub fn init(&mut self) -> impl Future<Item = (), Error = WasmErr> {
         let inner = Rc::clone(&self.0);
         WebSocket::new(&self.0.borrow().token).and_then(
@@ -84,32 +124,7 @@ impl RPCClient {
                 inner.borrow_mut().pinger.start(Rc::clone(&socket))?;
 
                 let inner_rc = Rc::clone(&inner);
-                socket.on_message(move |msg: Result<ServerMsg, WasmErr>| {
-
-
-                    let inner = inner_rc.borrow();
-                    match msg {
-                        Ok(ServerMsg::Pong(_num)) => {
-                            // TODO: detect no pings
-                            inner.pinger.set_pong_at(Date::now());
-                        }
-                        Ok(ServerMsg::Event(event)) => {
-                            // TODO: many subs, filter messages by session
-                            if let Some(sub) = inner.subs.iter().next() {
-                                if let Err(err) = sub.unbounded_send(event) {
-                                    // TODO: receiver is gone, should delete
-                                    //       this subs tx
-                                    WasmErr::from(err).log_err();
-                                }
-                            }
-                        }
-                        Err(err) => {
-                            // TODO: protocol versions mismatch? should drop
-                            //       connection if so
-                            err.log_err();
-                        }
-                    }
-                })?;
+                socket.on_message(on_message(inner_rc))?;
 
                 let inner_rc = Rc::clone(&inner);
                 socket.on_close(on_close(inner_rc))?;

From 6002e2db6777d3868d98a2423057c8195883b987 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 6 May 2019 12:09:22 +0300
Subject: [PATCH 159/179] Create protocol package

- add protocol workspace
- add config attributes with features
- change protocol dependency in jason package
---
 Cargo.lock                                    | 540 ++++++++++++------
 Cargo.toml                                    |   1 +
 jason/Cargo.toml                              |   2 +-
 jason/src/api/room.rs                         |   5 +-
 jason/src/rpc/mod.rs                          |  14 +-
 jason/src/rpc/pinger.rs                       |   3 +-
 jason/src/rpc/websocket.rs                    |  21 +-
 jason/src/utils/errors.rs                     |   3 +-
 protocol/Cargo.toml                           |  19 +
 protocol/README.md                            |   6 +
 .../rpc/protocol.rs => protocol/src/lib.rs    |  80 ++-
 11 files changed, 450 insertions(+), 244 deletions(-)
 create mode 100644 protocol/Cargo.toml
 create mode 100644 protocol/README.md
 rename jason/src/rpc/protocol.rs => protocol/src/lib.rs (82%)

diff --git a/Cargo.lock b/Cargo.lock
index a259f81cd..3a71224d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,17 +6,17 @@ version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.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-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -29,6 +29,31 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "actix"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hashbrown 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-resolver 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "actix-net"
 version = "0.2.6"
@@ -42,7 +67,7 @@ dependencies = [
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.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-current-thread 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)",
@@ -53,6 +78,33 @@ dependencies = [
  "trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "actix-rt"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "actix-threadpool 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix-threadpool"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "actix-web"
 version = "0.7.19"
@@ -61,11 +113,11 @@ dependencies = [
  "actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -86,15 +138,15 @@ dependencies = [
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.19 (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-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -110,9 +162,19 @@ name = "actix_derive"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "actix_derive"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -138,7 +200,7 @@ dependencies = [
 
 [[package]]
 name = "arc-swap"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -163,8 +225,8 @@ name = "atty"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -181,8 +243,8 @@ dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -191,8 +253,8 @@ name = "backtrace-sys"
 version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -214,7 +276,7 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -231,8 +293,8 @@ name = "brotli-sys"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -241,7 +303,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -251,7 +313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bumpalo"
-version = "2.3.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -270,7 +332,7 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -293,7 +355,7 @@ name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -317,7 +379,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -327,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cookie"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -429,12 +491,23 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "derive_more"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "dirs"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -446,12 +519,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "dtoa"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -511,6 +584,16 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "enum-as-inner"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.6.1"
@@ -519,7 +602,7 @@ dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -545,9 +628,9 @@ name = "failure_derive"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -557,7 +640,7 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -577,7 +660,7 @@ name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -626,6 +709,11 @@ dependencies = [
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "heck"
 version = "0.3.1"
@@ -639,7 +727,7 @@ name = "hostname"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -650,7 +738,7 @@ 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.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -686,7 +774,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -708,14 +796,14 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -724,22 +812,22 @@ version = "0.1.0-dev"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protocol 0.1.0",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wee_alloc 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.17"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -773,7 +861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.51"
+version = "0.2.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -852,7 +940,7 @@ dependencies = [
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smart-default 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -861,7 +949,7 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -884,7 +972,7 @@ name = "mime"
 version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -903,8 +991,8 @@ name = "miniz-sys"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -920,9 +1008,9 @@ name = "miniz_oxide_c_api"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -936,7 +1024,7 @@ dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (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)",
@@ -950,7 +1038,7 @@ version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -971,7 +1059,7 @@ version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1015,9 +1103,14 @@ name = "num_cpus"
 version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "numtoa"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "owning_ref"
 version = "0.4.0"
@@ -1040,7 +1133,7 @@ name = "parking_lot_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1089,12 +1182,23 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.27"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "protocol"
+version = "0.1.0"
+dependencies = [
+ "actix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.2"
@@ -1105,7 +1209,7 @@ name = "quote"
 version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1115,7 +1219,7 @@ 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.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1126,12 +1230,12 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (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.0 (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.3 (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)",
@@ -1178,10 +1282,10 @@ dependencies = [
 
 [[package]]
 name = "rand_jitter"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1193,7 +1297,7 @@ 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.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1262,7 +1366,7 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1299,9 +1403,9 @@ name = "ring"
 version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1312,7 +1416,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1325,7 +1429,7 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1382,7 +1486,7 @@ dependencies = [
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1400,9 +1504,9 @@ name = "serde_derive"
 version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1410,8 +1514,8 @@ name = "serde_json"
 version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1425,11 +1529,11 @@ dependencies = [
 
 [[package]]
 name = "serde_urlencoded"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1448,7 +1552,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1458,11 +1562,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "signal-hook"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arc-swap 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1555,12 +1668,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "smart-default"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1569,7 +1682,7 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1591,10 +1704,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.15.30"
+version = "0.15.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1604,9 +1717,9 @@ name = "synstructure"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1635,10 +1748,11 @@ dependencies = [
 
 [[package]]
 name = "termion"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1649,7 +1763,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1668,19 +1782,27 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "threadpool"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1693,9 +1815,9 @@ dependencies = [
  "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.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-sync 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.5 (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.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1737,7 +1859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.26 (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.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1765,7 +1887,7 @@ dependencies = [
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.7 (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.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1774,10 +1896,10 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1786,7 +1908,7 @@ dependencies = [
 
 [[package]]
 name = "tokio-sync"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1808,7 +1930,7 @@ dependencies = [
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.13"
+version = "0.1.14"
 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)",
@@ -1863,7 +1985,7 @@ dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1934,6 +2056,30 @@ dependencies = [
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "trust-dns-proto"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "trust-dns-resolver"
 version = "0.10.3"
@@ -1948,10 +2094,28 @@ dependencies = [
  "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "trust-dns-resolver"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "trust-dns-proto 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "ucd-util"
 version = "0.1.3"
@@ -1967,7 +2131,7 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.3.0"
+version = "2.4.0"
 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)",
@@ -2056,9 +2220,9 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2082,122 +2246,122 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bumpalo 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.3.17"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test-macro 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-webidl"
-version = "0.2.40"
+version = "0.2.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.17"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.20 (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.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wee_alloc"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2297,13 +2461,17 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
+"checksum actix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "409b193241782089260e5567aa8ac607a7607153613dbe8a15170ed3b29984fd"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
+"checksum actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ed0424cdf6542a43b32a8885c7c5099bf4110fad9b50d7fb220ab9c038ecf5ec"
+"checksum actix-threadpool 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97fa58548067c1f0a16a82cdb7c8823deac793d27efd17b51d6ea7861c6d3966"
 "checksum actix-web 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b0ac60f86c65a50b140139f499f4f7c6e49e4b5d88fbfba08e4e3975991f7bf4"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
+"checksum actix_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf5f6d7bf2d220ae8b4a7ae02a572bb35b7c4806b24049af905ab8110de156c"
 "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
 "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
-"checksum arc-swap 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "bcee9b73d8a058eebb0b567fd3687f6761fb232049f92c23bdd2c82b6fe0c0cc"
+"checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841"
 "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
 "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
@@ -2312,22 +2480,22 @@ dependencies = [
 "checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
 "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 bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bd1fa8ad26490b0a5cfec99089952250301b6716cdeaa7c9ab229598fb82ab66"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
 "checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
-"checksum bumpalo 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6a6bc2ba935b1e2f810787ceba8dfe86cbc164cee55925cae715541186673c4"
+"checksum bumpalo 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4639720be048090544634e0402490838995ccdc9d2fe648f528f30d3c33ae71f"
 "checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
 "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
+"checksum cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)" = "a0c56216487bb80eec9c4516337b2588a4f2a2290d72a1416d930e4dcdb0c90d"
 "checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
 "checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
-"checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
+"checksum cookie 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "99be24cfcf40d56ed37fd11c2123be833959bbc5bddecb46e1c2e442e15fa3e0"
 "checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
 "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
@@ -2338,9 +2506,10 @@ dependencies = [
 "checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
 "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
 "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
+"checksum derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fbe9f11be34f800b3ecaaed0ec9ec2e015d1d0ba0c8644c1310f73d6e8994615"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
-"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd"
+"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
 "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
 "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
 "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81"
@@ -2348,6 +2517,7 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+"checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d"
 "checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
@@ -2361,6 +2531,7 @@ dependencies = [
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum h2 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "85ab6286db06040ddefb71641b50017c06874614001a134b423783e2db2920bd"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
+"checksum hashbrown 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "61e4900fa4e80b3d15c78a08ec8a08433246063fa7577e7b2c6426b3b21b1f79"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
@@ -2371,14 +2542,14 @@ dependencies = [
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "08f7eadeaf4b52700de180d147c4805f199854600b36faa963d91114827b2ffc"
 "checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
-"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
-"checksum js-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "d4bda84b98977341bb6ba1086ecbd9eab8bc929de0f2923c118baf76c21dd0c8"
+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum js-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e9c0d432259f651d765d888e30164c096ddbae13c89e56dd1d02a719e020efa8"
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
@@ -2405,6 +2576,7 @@ dependencies = [
 "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
 "checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
+"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
@@ -2413,7 +2585,7 @@ dependencies = [
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
-"checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915"
+"checksum proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)" = "64c827cea7a7ab30ce4593e5e04d7a11617ad6ece2fa230605a78b00ff965316"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
 "checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
@@ -2423,7 +2595,7 @@ dependencies = [
 "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
-"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832"
+"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"
@@ -2432,15 +2604,15 @@ dependencies = [
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex 1.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "559008764a17de49a3146b234641644ed37d118d1ef641a0bb573d146edc6ce0"
+"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
 "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
-"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
+"checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
+"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
@@ -2454,11 +2626,12 @@ dependencies = [
 "checksum serde_derive 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "58fc82bec244f168b23d1963b45c8bf5726e9a15a9d146a067f9081aeed2de79"
 "checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
-"checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
+"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
 "checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01"
 "checksum sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
-"checksum signal-hook 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "97a47ae722318beceb0294e6f3d601205a1e6abaa4437d9d33e3a212233e3021"
+"checksum signal-hook 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "72ab58f1fda436857e6337dcb6a5aaa34f16c5ddc87b3a8b6ef7a212f90b9c5a"
+"checksum signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cded4ffa32146722ec54ab1f16320568465aa922aa9ab4708129599740da85d7"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 "checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
@@ -2469,22 +2642,23 @@ dependencies = [
 "checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
 "checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
 "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
-"checksum smart-default 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fae090012788f95156fc33f43631242480f311cca6bf7f600943eba14ae032ed"
+"checksum smart-default 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9dbd5f03d04e80355cbbe3ce5cf1f65c421eac575402e3d4d6e95d5a44edaa"
 "checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b639411d0b9c738748b5397d5ceba08e648f4f1992231aa859af1a017f31f60b"
-"checksum syn 0.15.30 (registry+https://github.com/rust-lang/crates.io-index)" = "66c8865bf5a7cbb662d8b011950060b3c8743dca141b054bf7195b20d314d8e2"
+"checksum syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)" = "ec52cd796e5f01d0067225a5392e70084acc4c0013fa71d55166d38a8b307836"
 "checksum synstructure 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
-"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
+"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "65641e515a437b308ab131a82ce3042ff9795bef5d6c5a9be4eb24195c417fd9"
+"checksum tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cec6c34409089be085de9403ba2010b80e36938c9ca992c4f67f407bb13db0b1"
 "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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
@@ -2492,9 +2666,9 @@ dependencies = [
 "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926"
 "checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
 "checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
-"checksum tokio-sync 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fda385df506bf7546e70872767f71e81640f1f251bdf2fd8eb81a0eaec5fe022"
+"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a"
 "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "ec5759cf26cf9659555f36c431b515e3d05f66831741c85b4b5d5dfb9cf1323c"
+"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2"
 "checksum tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2910970404ba6fa78c5539126a9ae2045d62e3713041e447f695f41405a120c6"
 "checksum tokio-trace-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "350c9edade9830dc185ae48ba45667a445ab59f6167ef6d0254ec9d2430d9dd3"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
@@ -2503,10 +2677,12 @@ dependencies = [
 "checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09144f0992b0870fa8d2972cc069cbf1e3c0fda64d1f3d45c4d68d0e0b52ad4e"
+"checksum trust-dns-proto 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cc2f00e905d494cbca8a9e348d6e68c89847a370145244daf70bb2beb8dbc87f"
 "checksum trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a9f877f7a1ad821ab350505e1f1b146a4960402991787191d6d8cab2ce2de2c"
+"checksum trust-dns-resolver 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd731ac4ba8ad47020d46708a965a4703c44e4d944278e8835e8f7eafdc30aa2"
 "checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
-"checksum unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd"
+"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6"
 "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-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa6024fc12ddfd1c6dbc14a80fa2324d4568849869b779f6bd37e5e4c03344d1"
@@ -2522,17 +2698,17 @@ dependencies = [
 "checksum v_htmlescape 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7fbbe0fa88dd36f9c8cf61a218d4b953ba669de4d0785832f33cc72bd081e1be"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum wasm-bindgen 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "9742fc4860f47bede1090a5e4b0cfc33afcd70cfdf45dd28f2cfb02d4662b0dd"
-"checksum wasm-bindgen-backend 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d7f35ecbb4180513cdb9b298543321bcb278670730415cbb3205ff2c66a477"
-"checksum wasm-bindgen-futures 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "67bfbec85e48e8915b6acfa1c4d90b770ce033c96dc2067688f3bccd00d3b9e1"
-"checksum wasm-bindgen-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "e3c86b06bcd28e92e87d2c2ad208889b2f69ea33f79810b91ef660cc3de65a4c"
-"checksum wasm-bindgen-macro-support 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "81d7338dd8c67e193d8ef18e5802dc03d8710456baa792c1c2e66847e57fd389"
-"checksum wasm-bindgen-shared 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "0d57c3b66f2f3e4d96b50f49b7b7e2f4cfcddc88b15744433c98c5c105b26672"
-"checksum wasm-bindgen-test 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "85bbc3ad78a8d59a63a02d59345e8da9a3e0c1617f79e77fd1c3da6e047db63e"
-"checksum wasm-bindgen-test-macro 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "114dfdf01bd3659dd79db05480fbd2751759d1c79cd9edc22f2fe611c866e932"
-"checksum wasm-bindgen-webidl 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "fc7052a577eefce17a439edfce5c2eedc8432fe7457bbe949624cdf946233fa7"
-"checksum web-sys 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "72d02003924c77af871ad74216f828b6e32af776cbb3f5dab3dcde2f2713c012"
-"checksum wee_alloc 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e841fed992c6c70cf2af5dbcffb0d988b1a7ffc5177ae4fb714ed14944b39d0a"
+"checksum wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "546e4ab1bf7f9a3532d21472efd72d01a23f55abd885c60b165f393394dbad95"
+"checksum wasm-bindgen-backend 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7b84bedebfd6ae3522cce59dec6b52ee6c53ceeaae8541668c15b9f42df8ecab"
+"checksum wasm-bindgen-futures 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "c6fc76797785881eac82f72e9b676032a737dea717103878100dbf6106d8d2cb"
+"checksum wasm-bindgen-macro 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "f2a033fc6bfd5e486a488b0e19d7d1bb29e667ebb91db85f698381a8aa831786"
+"checksum wasm-bindgen-macro-support 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "fba68375ef8f095c4a169c093c95ed2e1b5e44f7872f3bcbcafe2c51b4a80480"
+"checksum wasm-bindgen-shared 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "321949f4d7f7bf7a49dccd464bdc46581b180f761d9505e4943926d50b2a4a64"
+"checksum wasm-bindgen-test 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "a41c5ccdb7b4a3c7ca4ea365974d76d08001e42cdf07cc9474056f4879185aa2"
+"checksum wasm-bindgen-test-macro 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "d84e5dac3c8f9d164657e69ef5ef334d0bf3b6f771263312f41e1838d1ae720d"
+"checksum wasm-bindgen-webidl 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "b8c2c2b45b827f96657beea954a5430d37da4cf477d2874595f5f0a6ad027980"
+"checksum web-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "47ad2ecfe3793a87a0aa49562ad6f01cb3af3c870213283bc60032ec8dd7e62a"
+"checksum wee_alloc 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "31d4e6572d21ac55398bc91db827f48c3fdb8152ae60f4c358f6780e1035ffcc"
 "checksum weedle 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "26a4c67f132386d965390b8a734d5d10adbcd30eb5cc74bd9229af8b83f10044"
 "checksum widestring 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7157704c2e12e3d2189c507b7482c52820a16dfa4465ba91add92f266667cadb"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
diff --git a/Cargo.toml b/Cargo.toml
index d18c3581c..4e624930e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ repository = "https://github.com/instrumentisto/medea"
 [workspace]
 members = [
     "jason",
+    "protocol",
 ]
 
 [profile.release]
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 8ad32edec..27f6fe9b6 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -21,7 +21,7 @@ default = ["console_error_panic_hook", "wee_alloc"]
 console_error_panic_hook = { version = "0.1", optional = true }
 futures = "0.1"
 js-sys = "0.3"
-serde = { version = "1.0", features = ["derive"] }
+protocol = { path = "../protocol" , features = ['jason']}
 serde_json = "1.0"
 wasm-bindgen = { version = "0.2", features = ['serde-serialize'] }
 wasm-bindgen-futures = "0.3"
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 39e177363..074cb95b4 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -4,13 +4,14 @@ use futures::{
     future::{Future, IntoFuture},
     stream::Stream,
 };
+use protocol::{Directional, Event};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
 
 use std::{cell::RefCell, rc::Rc};
 
-use crate::rpc::{protocol::DirectionalTrack, protocol::Event, RPCClient};
+use crate::rpc::RPCClient;
 
 #[allow(clippy::module_name_repetitions)]
 #[wasm_bindgen]
@@ -105,7 +106,7 @@ impl InnerRoom {
         &mut self,
         _peer_id: u64,
         _sdp_offer: &Option<String>,
-        _tracks: &[DirectionalTrack],
+        _tracks: &[Directional],
     ) {
         console::log_1(&JsValue::from_str("on_peer_created invoked"));
     }
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index e343ed150..99ad65fb6 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -3,26 +3,18 @@
 mod pinger;
 mod websocket;
 
-pub mod protocol;
-
 use futures::{
     sync::mpsc::{unbounded, UnboundedSender},
     Future, Stream,
 };
 use js_sys::Date;
+use protocol::{ClientMsg, Command, Event, ServerMsg};
 
 use std::{cell::RefCell, rc::Rc, vec};
 
-use crate::{
-    rpc::protocol::{ClientMsg, ServerMsg},
-    utils::WasmErr,
-};
+use crate::utils::WasmErr;
 
-use self::{
-    pinger::Pinger,
-    protocol::{Command, Event},
-    websocket::WebSocket,
-};
+use self::{pinger::Pinger, websocket::WebSocket};
 
 /// Connection with remote was closed.
 pub enum CloseMsg {
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index 6bca208d6..e290501e9 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -1,9 +1,10 @@
+use protocol::ClientMsg;
 use wasm_bindgen::{prelude::*, JsCast};
 
 use std::{cell::RefCell, rc::Rc};
 
 use crate::{
-    rpc::{protocol::ClientMsg, websocket::WebSocket},
+    rpc::websocket::WebSocket,
     utils::{window, IntervalHandle, WasmErr},
 };
 
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 767015acc..d16323ddb 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -2,15 +2,13 @@
 //! transport wrapper.
 use futures::future::{Future, IntoFuture};
 use futures::stream::Stream;
+use protocol::{ClientMsg, ServerMsg};
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
 use std::{cell::RefCell, convert::TryFrom, rc::Rc};
 
 use crate::{
-    rpc::{
-        protocol::{ClientMsg, ServerMsg},
-        CloseMsg,
-    },
+    rpc::CloseMsg,
     utils::{EventListener, WasmErr},
 };
 
@@ -142,7 +140,7 @@ impl WebSocket {
             Rc::clone(&inner_mut.socket),
             "message",
             move |msg| {
-                let parsed = ServerMsg::try_from(&msg);
+                let parsed = ServerMsg::try_from(&msg).map_err(WasmErr::from);
 
                 f(parsed);
             },
@@ -201,19 +199,6 @@ impl Drop for WebSocket {
     }
 }
 
-impl TryFrom<&MessageEvent> for ServerMsg {
-    type Error = WasmErr;
-
-    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        let payload = msg
-            .data()
-            .as_string()
-            .ok_or_else(|| WasmErr::from_str("Payload is not string"))?;
-
-        serde_json::from_str::<Self>(&payload).map_err(WasmErr::from)
-    }
-}
-
 impl From<&CloseEvent> for CloseMsg {
     fn from(event: &CloseEvent) -> Self {
         let code: u16 = event.code();
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index 84cd4842a..596069528 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -1,3 +1,4 @@
+use protocol;
 use wasm_bindgen::JsValue;
 use web_sys::console;
 
@@ -70,4 +71,4 @@ macro_rules! impl_from_error {
 impl_from_error!(std::cell::BorrowError);
 impl_from_error!(serde_json::error::Error);
 // TODO: improve macro to use generics
-impl_from_error!(futures::sync::mpsc::SendError<crate::rpc::protocol::Event>);
+impl_from_error!(futures::sync::mpsc::SendError<protocol::Event>);
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
new file mode 100644
index 000000000..0b2bebb2c
--- /dev/null
+++ b/protocol/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "protocol"
+version = "0.1.0"
+edition = "2018"
+authors = ["Instrumentisto Team <developer@instrumentisto.com>"]
+homepage = "https://github.com/instrumentisto/medea"
+readme = "README.md"
+repository = "https://github.com/instrumentisto/medea"
+
+[features]
+jason = []
+medea = ["actix"]
+
+[dependencies]
+actix = { version = "0.8", optional = true }
+failure = "0.1"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+web-sys = { version = "0.3", features = ['MessageEvent'] }
diff --git a/protocol/README.md b/protocol/README.md
new file mode 100644
index 000000000..2dd63e0ed
--- /dev/null
+++ b/protocol/README.md
@@ -0,0 +1,6 @@
+Jason
+=====
+
+Medea media server client side application. 
+
+__DEVELOPMENT IN PROGRESS__
diff --git a/jason/src/rpc/protocol.rs b/protocol/src/lib.rs
similarity index 82%
rename from jason/src/rpc/protocol.rs
rename to protocol/src/lib.rs
index ab8a52af3..12d977a99 100644
--- a/jason/src/rpc/protocol.rs
+++ b/protocol/src/lib.rs
@@ -1,7 +1,17 @@
+#[cfg(feature = "jason")]
+use std::{borrow::Cow, convert::TryFrom};
+
+#[cfg(feature = "medea")]
+use actix::Message;
+#[cfg(feature = "jason")]
+use failure::Fail;
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
+#[cfg(feature = "jason")]
+use web_sys::MessageEvent;
 
 // TODO: should be properly shared between medea and jason
-#[cfg_attr(test, derive(PartialEq, Debug))]
+#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(feature = "medea", derive(Message, Debug))]
 #[allow(dead_code)]
 /// Message sent by `Media Server` to `Client`.
 pub enum ServerMsg {
@@ -26,8 +36,10 @@ pub enum ClientMsg {
 
 /// WebSocket message from Web Client to Media Server.
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
 #[serde(tag = "command", content = "data")]
+#[cfg_attr(test, derive(PartialEq, Debug))]
+#[cfg_attr(feature = "medea", derive(Message))]
+#[cfg_attr(feature = "medea", rtype(result = "Result<(), ()>"))]
 #[allow(dead_code)]
 pub enum Command {
     /// Web Client sends SDP Offer.
@@ -40,67 +52,62 @@ pub enum Command {
 
 /// WebSocket message from Medea to Jason.
 #[derive(Deserialize, Serialize)]
+#[serde(tag = "event", content = "data")]
 #[cfg_attr(test, derive(PartialEq, Debug))]
+#[cfg_attr(feature = "medea", derive(Message))]
 #[allow(dead_code)]
-#[serde(tag = "event", content = "data")]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
     PeerCreated {
         peer_id: u64,
         sdp_offer: Option<String>,
-        tracks: Vec<DirectionalTrack>,
+        tracks: Vec<Directional>,
     },
     /// Media Server notifies Web Client about necessity to apply specified SDP
     /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade {
-        peer_id: u64,
-        sdp_answer: String,
-    },
+    SdpAnswerMade { peer_id: u64, sdp_answer: String },
 
-    IceCandidateDiscovered {
-        peer_id: u64,
-        candidate: String,
-    },
+    /// Media Server notifies Web Client about necessity to apply specified
+    /// ICE Candidate.
+    IceCandidateDiscovered { peer_id: u64, candidate: String },
 
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// close.
-    PeersRemoved {
-        peer_ids: Vec<u64>,
-    },
+    PeersRemoved { peer_ids: Vec<u64> },
 }
 
 /// [`Track] with specified direction.
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
-pub struct DirectionalTrack {
+#[cfg_attr(test, derive(PartialEq))]
+pub struct Directional {
     pub id: u64,
-    pub direction: TrackDirection,
-    pub media_type: TrackMediaType,
+    pub direction: Direction,
+    pub media_type: MediaType,
 }
 
 /// Direction of [`Track`].
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
-pub enum TrackDirection {
+#[cfg_attr(test, derive(PartialEq))]
+pub enum Direction {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
 }
 
 /// Type of [`Track`].
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
-pub enum TrackMediaType {
+#[cfg_attr(test, derive(PartialEq))]
+pub enum MediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct AudioSettings {}
 
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct VideoSettings {}
 
 impl Serialize for ClientMsg {
@@ -155,6 +162,7 @@ impl<'de> Deserialize<'de> for ClientMsg {
     }
 }
 
+#[cfg(feature = "medea")]
 impl Serialize for ServerMsg {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -206,9 +214,25 @@ impl<'de> Deserialize<'de> for ServerMsg {
     }
 }
 
+#[cfg(feature = "jason")]
+impl TryFrom<&MessageEvent> for ServerMsg {
+    type Error = serde_json::Error;
+
+    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
+        use serde::de::Error;
+
+        let payload = msg
+            .data()
+            .as_string()
+            .ok_or_else(|| Error::custom("Payload is not string"))?;
+
+        serde_json::from_str::<Self>(&payload)
+    }
+}
+
 #[cfg(test)]
 mod test {
-    use crate::rpc::protocol::{ClientMsg, Command, Event, ServerMsg};
+    use super::*;
 
     #[test]
     fn command() {
@@ -217,7 +241,7 @@ mod test {
             sdp_offer: "offer".to_owned(),
         });
         #[cfg_attr(nightly, rustfmt::skip)]
-        let command_str =
+            let command_str =
             "{\
                 \"command\":\"MakeSdpOffer\",\
                 \"data\":{\
@@ -254,7 +278,7 @@ mod test {
             sdp_answer: "answer".to_owned(),
         });
         #[cfg_attr(nightly, rustfmt::skip)]
-        let event_str =
+            let event_str =
             "{\
                 \"event\":\"SdpAnswerMade\",\
                 \"data\":{\

From 6c0bca3f131254a37923e50d55fc4389ce19474d Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Mon, 6 May 2019 17:41:53 +0300
Subject: [PATCH 160/179] Impl MemberMessage and RoomMessage for in and out
 messages in Room

---
 Cargo.lock                       | 183 ++++----------------
 Cargo.toml                       |   6 +-
 jason/src/rpc/websocket.rs       |   1 -
 protocol/Cargo.toml              |   5 +-
 protocol/src/lib.rs              |  17 +-
 src/api/client/room.rs           |  26 +--
 src/api/client/rpc_connection.rs |  15 +-
 src/api/client/session.rs        |  30 ++--
 src/api/mod.rs                   |   1 -
 src/api/protocol.rs              | 283 -------------------------------
 src/main.rs                      |   5 +
 src/media/peer.rs                |  10 +-
 src/media/track.rs               |   2 +-
 13 files changed, 97 insertions(+), 487 deletions(-)
 delete mode 100644 src/api/protocol.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3a71224d0..aedbdf13b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,31 +29,6 @@ dependencies = [
  "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "actix"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "hashbrown 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-resolver 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "actix-net"
 version = "0.2.6"
@@ -78,33 +53,6 @@ dependencies = [
  "trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "actix-rt"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "actix-threadpool 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.26 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "actix-threadpool"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "actix-web"
 version = "0.7.19"
@@ -167,16 +115,6 @@ dependencies = [
  "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "actix_derive"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "adler32"
 version = "1.0.3"
@@ -491,17 +429,6 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "derive_more"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "dirs"
 version = "1.0.5"
@@ -584,16 +511,6 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "enum-as-inner"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.33 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "env_logger"
 version = "0.6.1"
@@ -709,11 +626,6 @@ dependencies = [
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "heck"
 version = "0.3.1"
@@ -911,6 +823,11 @@ dependencies = [
  "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "macro-attr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "matches"
 version = "0.1.8"
@@ -929,6 +846,9 @@ dependencies = [
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "newtype_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "protocol 0.1.0",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1063,6 +983,14 @@ dependencies = [
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "newtype_derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "nodrop"
 version = "0.1.13"
@@ -1192,8 +1120,6 @@ dependencies = [
 name = "protocol"
 version = "0.1.0"
 dependencies = [
- "actix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "web-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1419,6 +1345,14 @@ name = "rustc-demangle"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rustc_version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rustc_version"
 version = "0.2.3"
@@ -1452,6 +1386,11 @@ name = "scopeguard"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "semver"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "semver"
 version = "0.9.0"
@@ -1782,14 +1721,6 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "threadpool"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "time"
 version = "0.1.42"
@@ -2056,30 +1987,6 @@ dependencies = [
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "trust-dns-proto"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-timer 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "trust-dns-resolver"
 version = "0.10.3"
@@ -2098,24 +2005,6 @@ dependencies = [
  "trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "trust-dns-resolver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
- "ipconfig 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "trust-dns-proto 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "ucd-util"
 version = "0.1.3"
@@ -2461,13 +2350,9 @@ dependencies = [
 
 [metadata]
 "checksum actix 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c616db5fa4b0c40702fb75201c2af7f8aa8f3a2e2c1dda3b0655772aa949666"
-"checksum actix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "409b193241782089260e5567aa8ac607a7607153613dbe8a15170ed3b29984fd"
 "checksum actix-net 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8bebfbe6629e0131730746718c9e032b58f02c6ce06ed7c982b9fef6c8545acd"
-"checksum actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ed0424cdf6542a43b32a8885c7c5099bf4110fad9b50d7fb220ab9c038ecf5ec"
-"checksum actix-threadpool 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97fa58548067c1f0a16a82cdb7c8823deac793d27efd17b51d6ea7861c6d3966"
 "checksum actix-web 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "b0ac60f86c65a50b140139f499f4f7c6e49e4b5d88fbfba08e4e3975991f7bf4"
 "checksum actix_derive 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4300e9431455322ae393d43a2ba1ef96b8080573c0fc23b196219efedfb6ba69"
-"checksum actix_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf5f6d7bf2d220ae8b4a7ae02a572bb35b7c4806b24049af905ab8110de156c"
 "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
 "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
@@ -2506,7 +2391,6 @@ dependencies = [
 "checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4"
 "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
 "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c"
-"checksum derive_more 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fbe9f11be34f800b3ecaaed0ec9ec2e015d1d0ba0c8644c1310f73d6e8994615"
 "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
 "checksum dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d0a1279c96732bc6800ce6337b6a614697b0e74ae058dc03c62ebeb78b4d86"
 "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
@@ -2517,7 +2401,6 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
-"checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d"
 "checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
 "checksum error-chain 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6930e04918388a9a2e41d518c25cf679ccafe26733fb4127dbf21993f2575d46"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
@@ -2531,7 +2414,6 @@ dependencies = [
 "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4"
 "checksum h2 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "85ab6286db06040ddefb71641b50017c06874614001a134b423783e2db2920bd"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
-"checksum hashbrown 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "61e4900fa4e80b3d15c78a08ec8a08433246063fa7577e7b2c6426b3b21b1f79"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
@@ -2556,6 +2438,7 @@ dependencies = [
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+"checksum macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00e51c6f0e2bf862b01b3d784fc32b02feb248a69062c51fb0b6d14cd526cc2a"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
 "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
@@ -2570,6 +2453,7 @@ dependencies = [
 "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 net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
+"checksum newtype_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ac8cd24d9f185bb7223958d8c1ff7a961b74b1953fd05dba7cc568a63b3861ec"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
@@ -2611,12 +2495,14 @@ dependencies = [
 "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
 "checksum rustc-demangle 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "ccc78bfd5acd7bf3e89cffcf899e5cb1a52d6fafa8dec2739ad70c9577a57288"
+"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
+"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
@@ -2656,7 +2542,6 @@ dependencies = [
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
 "checksum tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cec6c34409089be085de9403ba2010b80e36938c9ca992c4f67f407bb13db0b1"
 "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
@@ -2677,9 +2562,7 @@ dependencies = [
 "checksum tower-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b32f72af77f1bfe3d3d4da8516a238ebe7039b51dd8637a09841ac7f16d2c987"
 "checksum trust-dns-proto 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0838272e89f1c693b4df38dc353412e389cf548ceed6f9fd1af5a8d6e0e7cf74"
 "checksum trust-dns-proto 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "09144f0992b0870fa8d2972cc069cbf1e3c0fda64d1f3d45c4d68d0e0b52ad4e"
-"checksum trust-dns-proto 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cc2f00e905d494cbca8a9e348d6e68c89847a370145244daf70bb2beb8dbc87f"
 "checksum trust-dns-resolver 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8a9f877f7a1ad821ab350505e1f1b146a4960402991787191d6d8cab2ce2de2c"
-"checksum trust-dns-resolver 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd731ac4ba8ad47020d46708a965a4703c44e4d944278e8835e8f7eafdc30aa2"
 "checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 "checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
 "checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6"
diff --git a/Cargo.toml b/Cargo.toml
index 4e624930e..dc5b9c483 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ repository = "https://github.com/instrumentisto/medea"
 [workspace]
 members = [
     "jason",
-    "protocol",
 ]
 
 [profile.release]
@@ -28,7 +27,10 @@ failure = "0.1"
 futures = "0.1"
 hashbrown = "0.1"
 humantime = "1.2"
-serde = { version = "1.0", features = ["derive"] }
+macro-attr = "0.2"
+newtype_derive = "0.1"
+protocol = { path = "protocol" }
+serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
 slog = "2.4"
 slog-envlogger = "2.1"
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index d16323ddb..ff5422bfa 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -1,7 +1,6 @@
 //! ['WebSocket'](https://developer.mozilla.org/ru/docs/WebSockets)
 //! transport wrapper.
 use futures::future::{Future, IntoFuture};
-use futures::stream::Stream;
 use protocol::{ClientMsg, ServerMsg};
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as BackingSocket};
 
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index 0b2bebb2c..4bdfc65cb 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -9,11 +9,8 @@ repository = "https://github.com/instrumentisto/medea"
 
 [features]
 jason = []
-medea = ["actix"]
 
 [dependencies]
-actix = { version = "0.8", optional = true }
-failure = "0.1"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
 web-sys = { version = "0.3", features = ['MessageEvent'] }
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs
index 12d977a99..01b0e0124 100644
--- a/protocol/src/lib.rs
+++ b/protocol/src/lib.rs
@@ -1,17 +1,12 @@
 #[cfg(feature = "jason")]
-use std::{borrow::Cow, convert::TryFrom};
+use std::convert::TryFrom;
 
-#[cfg(feature = "medea")]
-use actix::Message;
-#[cfg(feature = "jason")]
-use failure::Fail;
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
 #[cfg(feature = "jason")]
 use web_sys::MessageEvent;
 
 // TODO: should be properly shared between medea and jason
 #[cfg_attr(test, derive(PartialEq))]
-#[cfg_attr(feature = "medea", derive(Message, Debug))]
 #[allow(dead_code)]
 /// Message sent by `Media Server` to `Client`.
 pub enum ServerMsg {
@@ -38,8 +33,6 @@ pub enum ClientMsg {
 #[derive(Deserialize, Serialize)]
 #[serde(tag = "command", content = "data")]
 #[cfg_attr(test, derive(PartialEq, Debug))]
-#[cfg_attr(feature = "medea", derive(Message))]
-#[cfg_attr(feature = "medea", rtype(result = "Result<(), ()>"))]
 #[allow(dead_code)]
 pub enum Command {
     /// Web Client sends SDP Offer.
@@ -54,7 +47,6 @@ pub enum Command {
 #[derive(Deserialize, Serialize)]
 #[serde(tag = "event", content = "data")]
 #[cfg_attr(test, derive(PartialEq, Debug))]
-#[cfg_attr(feature = "medea", derive(Message))]
 #[allow(dead_code)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
@@ -95,18 +87,18 @@ pub enum Direction {
 }
 
 /// Type of [`Track`].
-#[derive(Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub enum MediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct AudioSettings {}
 
-#[derive(Deserialize, Serialize)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct VideoSettings {}
 
@@ -162,7 +154,6 @@ impl<'de> Deserialize<'de> for ClientMsg {
     }
 }
 
-#[cfg(feature = "medea")]
 impl Serialize for ServerMsg {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 8cc2134a6..02dbb156b 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -15,15 +15,15 @@ use futures::{
     Future,
 };
 use hashbrown::HashMap;
+use protocol::{Command, Event};
 
 use crate::{
     api::{
         client::rpc_connection::{
             AuthorizationError, Authorize, Closed, ClosedReason, Established,
-            RpcConnection,
+            MemberMessage, RoomMessage, RpcConnection,
         },
         control::{Id as MemberId, Member},
-        protocol::{Command, Event},
     },
     log::prelude::*,
     media::peer::{Id as PeerId, SignalingStateMachine},
@@ -129,7 +129,7 @@ impl Room {
     ) -> impl Future<Item = (), Error = Error> {
         match self.connections.get(&member_id) {
             Some(conn) => Either::A(
-                conn.send_event(event)
+                conn.send_event(RoomMessage::from(event))
                     .map_err(move |_| Error::UnableSendEvent(member_id)),
             ),
             None => {
@@ -397,7 +397,9 @@ impl Handler<Close> for Room {
                 } else {
                     futures.push(Either::B(
                         connection
-                            .send_event(Event::PeersRemoved { peer_ids })
+                            .send_event(RoomMessage::from(
+                                Event::PeersRemoved { peer_ids },
+                            ))
                             .then(move |_| connection.close()),
                     ));
                 }
@@ -447,17 +449,17 @@ impl Handler<StartSignaling> for Room {
     }
 }
 
-impl Handler<Command> for Room {
+impl Handler<MemberMessage> for Room {
     type Result = ActFuture<(), ()>;
 
     /// Receives [`Command`] from Web client and changes state of interconnected
     /// [`Peer`]s.
     fn handle(
         &mut self,
-        command: Command,
+        command: MemberMessage,
         ctx: &mut Self::Context,
     ) -> Self::Result {
-        let res = match command {
+        let res = match command.into() {
             Command::MakeSdpOffer { peer_id, sdp_offer } => {
                 self.handle_make_sdp_offer(peer_id, sdp_offer)
             }
@@ -548,14 +550,12 @@ mod test {
 
     use actix::{ActorContext, Arbiter, AsyncContext, System};
     use futures::future::Future;
+    use protocol::{
+        AudioSettings, Direction, Directional, MediaType, VideoSettings,
+    };
 
     use super::*;
-    use crate::{
-        api::protocol::{
-            AudioSettings, Direction, Directional, MediaType, VideoSettings,
-        },
-        media::peer::create_peers,
-    };
+    use crate::media::peer::create_peers;
 
     #[derive(Debug, Clone)]
     struct TestConnection {
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index 0b8c9913b..9e5989ae0 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -1,11 +1,22 @@
 //! [`RpcConnection`] with related messages.
 use actix::Message;
 use futures::Future;
+use protocol::{Command, Event};
 
-use crate::api::{control::Id as MemberId, protocol::Event};
+use crate::api::control::Id as MemberId;
 
 use std::fmt;
 
+macro_attr! {
+    #[derive(Message, NewtypeFrom!)]
+    #[rtype(result = "Result<(), ()>")]
+    pub struct MemberMessage(Command);
+}
+macro_attr! {
+    #[derive(Message, NewtypeFrom!)]
+    pub struct RoomMessage(Event);
+}
+
 /// Abstraction over RPC connection with some remote [`Member`].
 pub trait RpcConnection: fmt::Debug + Send {
     /// Closes [`RpcConnection`].
@@ -16,7 +27,7 @@ pub trait RpcConnection: fmt::Debug + Send {
     /// Sends [`Event`] to remote [`Member`].
     fn send_event(
         &self,
-        event: Event,
+        event: RoomMessage,
     ) -> Box<dyn Future<Item = (), Error = ()>>;
 }
 
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index af54b6a79..f556bb930 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -9,16 +9,18 @@ use actix::{
 use actix_web::ws::{self, CloseReason};
 use futures::future::Future;
 
-use crate::api::protocol::{ClientMsg, ServerMsg};
 use crate::{
     api::client::{
         room::Room,
-        rpc_connection::{Closed, ClosedReason, Established, RpcConnection},
+        rpc_connection::{
+            Closed, ClosedReason, Established, MemberMessage, RoomMessage,
+            RpcConnection,
+        },
     },
     api::control::member::Id as MemberId,
-    api::protocol::Event,
     log::prelude::*,
 };
+use protocol::{ClientMsg, ServerMsg};
 
 /// Long-running WebSocket connection of Client API.
 #[derive(Debug)]
@@ -142,10 +144,10 @@ impl RpcConnection for Addr<WsSession> {
     /// Sends [`Event`] to Web Client.
     fn send_event(
         &self,
-        event: Event,
+        msg: RoomMessage,
     ) -> Box<dyn Future<Item = (), Error = ()>> {
         let fut = self
-            .send(ServerMsg::Event(event))
+            .send(msg)
             .map_err(|err| error!("Failed send event {:?} ", err));
         Box::new(fut)
     }
@@ -169,13 +171,15 @@ impl Handler<Close> for WsSession {
     }
 }
 
-impl Handler<ServerMsg> for WsSession {
+impl Handler<RoomMessage> for WsSession {
     type Result = ();
 
     /// Sends [`Event`] to Web Client.
-    fn handle(&mut self, msg: ServerMsg, ctx: &mut Self::Context) {
-        debug!("Event {:?} for member {}", msg, self.member_id);
-        ctx.text(serde_json::to_string(&msg).unwrap())
+    fn handle(&mut self, msg: RoomMessage, ctx: &mut Self::Context) {
+        let message =
+            serde_json::to_string(&ServerMsg::Event(msg.into())).unwrap();
+        debug!("Event {} for member {}", message, self.member_id);
+        ctx.text(message);
     }
 }
 
@@ -193,10 +197,14 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     Ok(ClientMsg::Ping(n)) => {
                         trace!("Received ping: {}", n);
                         // Answer with ['Heartbeat::Pong'].
-                        ctx.notify(ServerMsg::Pong(n));
+                        ctx.text(
+                            serde_json::to_string(&ServerMsg::Pong(n)).unwrap(),
+                        );
                     }
                     Ok(ClientMsg::Command(command)) => {
-                        if let Err(err) = self.room.try_send(command) {
+                        if let Err(err) =
+                            self.room.try_send(MemberMessage::from(command))
+                        {
                             error!(
                                 "Cannot send Command to Room {}, because {}",
                                 self.member_id, err
diff --git a/src/api/mod.rs b/src/api/mod.rs
index f12d438ca..1c66e73e5 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -2,4 +2,3 @@
 
 pub mod client;
 pub mod control;
-pub mod protocol;
diff --git a/src/api/protocol.rs b/src/api/protocol.rs
deleted file mode 100644
index 34848e063..000000000
--- a/src/api/protocol.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use actix::Message;
-use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
-
-// TODO: should be properly shared between medea and jason
-#[cfg_attr(test, derive(PartialEq))]
-#[derive(Message, Debug)]
-#[allow(dead_code)]
-/// Message sent by `Media Server` to `Client`.
-pub enum ServerMsg {
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    Pong(u64),
-    /// `Media Server` notifies `Client` about happened facts and it reacts on
-    /// them to reach the proper state.
-    Event(Event),
-}
-
-#[cfg_attr(test, derive(PartialEq, Debug))]
-#[allow(dead_code)]
-/// Message from 'Client' to 'Media Server'.
-pub enum ClientMsg {
-    /// `ping` message that WebSocket client is expected to send to the server
-    /// periodically.
-    Ping(u64),
-    /// Request of `Web Client` to change the state on `Media Server`.
-    Command(Command),
-}
-
-/// WebSocket message from Web Client to Media Server.
-#[derive(Deserialize, Serialize, Message)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
-#[serde(tag = "command", content = "data")]
-#[allow(dead_code)]
-#[rtype(result = "Result<(), ()>")]
-pub enum Command {
-    /// Web Client sends SDP Offer.
-    MakeSdpOffer { peer_id: u64, sdp_offer: String },
-    /// Web Client sends SDP Answer.
-    MakeSdpAnswer { peer_id: u64, sdp_answer: String },
-    /// Web Client sends Ice Candidate.
-    SetIceCandidate { peer_id: u64, candidate: String },
-}
-
-/// WebSocket message from Medea to Jason.
-#[derive(Deserialize, Serialize, Message, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-#[allow(dead_code)]
-#[serde(tag = "event", content = "data")]
-pub enum Event {
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// creation.
-    PeerCreated {
-        peer_id: u64,
-        sdp_offer: Option<String>,
-        tracks: Vec<Directional>,
-    },
-    /// Media Server notifies Web Client about necessity to apply specified SDP
-    /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade { peer_id: u64, sdp_answer: String },
-
-    /// Media Server notifies Web Client about necessity to apply specified
-    /// ICE Candidate.
-    IceCandidateDiscovered { peer_id: u64, candidate: String },
-
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// close.
-    PeersRemoved { peer_ids: Vec<u64> },
-}
-
-/// [`Track] with specified direction.
-#[derive(Deserialize, Serialize, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct Directional {
-    pub id: u64,
-    pub direction: Direction,
-    pub media_type: MediaType,
-}
-
-/// Direction of [`Track`].
-#[derive(Deserialize, Serialize, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum Direction {
-    Send { receivers: Vec<u64> },
-    Recv { sender: u64 },
-}
-
-/// Type of [`Track`].
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum MediaType {
-    Audio(AudioSettings),
-    Video(VideoSettings),
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct AudioSettings {}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct VideoSettings {}
-
-impl Serialize for ClientMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        use serde::ser::SerializeStruct;
-
-        match self {
-            ClientMsg::Ping(n) => {
-                let mut ping = serializer.serialize_struct("ping", 1)?;
-                ping.serialize_field("ping", n)?;
-                ping.end()
-            }
-            ClientMsg::Command(command) => command.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for ClientMsg {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or_else(|| {
-            Error::custom(format!("unable to deser ClientMsg [{:?}]", &ev))
-        })?;
-
-        if let Some(v) = map.get("ping") {
-            let n = v.as_u64().ok_or_else(|| {
-                Error::custom(format!(
-                    "unable to deser ClientMsg::Ping [{:?}]",
-                    &ev
-                ))
-            })?;
-
-            Ok(ClientMsg::Ping(n))
-        } else {
-            let command =
-                serde_json::from_value::<Command>(ev).map_err(|e| {
-                    Error::custom(format!(
-                        "unable to deser ClientMsg::Command [{:?}]",
-                        e
-                    ))
-                })?;
-            Ok(ClientMsg::Command(command))
-        }
-    }
-}
-
-impl Serialize for ServerMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        use serde::ser::SerializeStruct;
-
-        match self {
-            ServerMsg::Pong(n) => {
-                let mut ping = serializer.serialize_struct("pong", 1)?;
-                ping.serialize_field("pong", n)?;
-                ping.end()
-            }
-            ServerMsg::Event(command) => command.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for ServerMsg {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or_else(|| {
-            Error::custom(format!("unable to deser ServerMsg [{:?}]", &ev))
-        })?;
-
-        if let Some(v) = map.get("pong") {
-            let n = v.as_u64().ok_or_else(|| {
-                Error::custom(format!(
-                    "unable to deser ServerMsg::Pong [{:?}]",
-                    &ev
-                ))
-            })?;
-
-            Ok(ServerMsg::Pong(n))
-        } else {
-            let event = serde_json::from_value::<Event>(ev).map_err(|e| {
-                Error::custom(format!(
-                    "unable to deser ServerMsg::Event [{:?}]",
-                    e
-                ))
-            })?;
-            Ok(ServerMsg::Event(event))
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::api::protocol::{ClientMsg, Command, Event, ServerMsg};
-
-    #[test]
-    fn command() {
-        let command = ClientMsg::Command(Command::MakeSdpOffer {
-            peer_id: 77,
-            sdp_offer: "offer".to_owned(),
-        });
-        #[cfg_attr(nightly, rustfmt::skip)]
-            let command_str =
-            "{\
-                \"command\":\"MakeSdpOffer\",\
-                \"data\":{\
-                    \"peer_id\":77,\
-                    \"sdp_offer\":\"offer\"\
-                }\
-            }";
-
-        assert_eq!(command_str, serde_json::to_string(&command).unwrap());
-        assert_eq!(
-            command,
-            serde_json::from_str(&serde_json::to_string(&command).unwrap())
-                .unwrap()
-        );
-    }
-
-    #[test]
-    fn ping() {
-        let ping = ClientMsg::Ping(15);
-        let ping_str = "{\"ping\":15}";
-
-        assert_eq!(ping_str, serde_json::to_string(&ping).unwrap());
-        assert_eq!(
-            ping,
-            serde_json::from_str(&serde_json::to_string(&ping).unwrap())
-                .unwrap()
-        )
-    }
-
-    #[test]
-    fn event() {
-        let event = ServerMsg::Event(Event::SdpAnswerMade {
-            peer_id: 45,
-            sdp_answer: "answer".to_owned(),
-        });
-        #[cfg_attr(nightly, rustfmt::skip)]
-            let event_str =
-            "{\
-                \"event\":\"SdpAnswerMade\",\
-                \"data\":{\
-                    \"peer_id\":45,\
-                    \"sdp_answer\":\"answer\"\
-                }\
-            }";
-
-        assert_eq!(event_str, serde_json::to_string(&event).unwrap());
-        assert_eq!(
-            event,
-            serde_json::from_str(&serde_json::to_string(&event).unwrap())
-                .unwrap()
-        );
-    }
-
-    #[test]
-    fn pong() {
-        let pong = ServerMsg::Pong(5);
-        let pong_str = "{\"pong\":5}";
-
-        assert_eq!(pong_str, serde_json::to_string(&pong).unwrap());
-        assert_eq!(
-            pong,
-            serde_json::from_str(&serde_json::to_string(&pong).unwrap())
-                .unwrap()
-        )
-    }
-}
diff --git a/src/main.rs b/src/main.rs
index c777b4d8f..5939ecd58 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,10 @@
 //! Medea media server application.
 
+#[macro_use]
+extern crate macro_attr;
+#[macro_use]
+extern crate newtype_derive;
+
 #[macro_use]
 mod utils;
 
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 79e6f5b6e..bcfdad934 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -3,14 +3,12 @@
 use std::sync::Arc;
 
 use hashbrown::HashMap;
+use protocol::{
+    AudioSettings, Direction, Directional, MediaType, VideoSettings,
+};
 
 use crate::{
-    api::{
-        control::member::Id as MemberId,
-        protocol::{
-            AudioSettings, Direction, Directional, MediaType, VideoSettings,
-        },
-    },
+    api::control::member::Id as MemberId,
     media::track::{Id as TrackId, Track},
 };
 
diff --git a/src/media/track.rs b/src/media/track.rs
index fd7951cc2..2ebb4c18d 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -1,4 +1,4 @@
-use crate::api::protocol::MediaType;
+use protocol::MediaType;
 
 /// ID of [`Track`].
 pub type Id = u64;

From 9454b0f43fd6e862ed4f7917743ad3fa488b0e8d Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 7 May 2019 12:26:44 +0300
Subject: [PATCH 161/179] Impl ServerMessage for input messages in WebMessage

- fix tests for Room
- fix signaling test for medea
- remove web-sys dependency from protocol
---
 Cargo.lock                 |  4 +-
 Cargo.toml                 |  1 +
 jason/Cargo.toml           |  5 ++-
 jason/src/lib.rs           |  5 +++
 jason/src/rpc/websocket.rs | 23 +++++++++-
 protocol/Cargo.toml        |  4 --
 protocol/src/lib.rs        | 27 ++----------
 signaling_test.html        | 90 +++++++++++++-------------------------
 src/api/client/room.rs     | 22 ++++++----
 9 files changed, 82 insertions(+), 99 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aedbdf13b..47acf898b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -725,7 +725,10 @@ dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "newtype_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "protocol 0.1.0",
+ "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-futures 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1122,7 +1125,6 @@ version = "0.1.0"
 dependencies = [
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index dc5b9c483..3e567b48c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,7 @@ repository = "https://github.com/instrumentisto/medea"
 [workspace]
 members = [
     "jason",
+    "protocol",
 ]
 
 [profile.release]
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 27f6fe9b6..849004750 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -21,7 +21,10 @@ default = ["console_error_panic_hook", "wee_alloc"]
 console_error_panic_hook = { version = "0.1", optional = true }
 futures = "0.1"
 js-sys = "0.3"
-protocol = { path = "../protocol" , features = ['jason']}
+macro-attr = "0.2"
+newtype_derive = "0.1"
+protocol = { path = "../protocol" }
+serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
 wasm-bindgen = { version = "0.2", features = ['serde-serialize'] }
 wasm-bindgen-futures = "0.3"
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 4673e4daf..b813b3719 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,3 +1,8 @@
+#[macro_use]
+extern crate macro_attr;
+#[macro_use]
+extern crate newtype_derive;
+
 mod api;
 mod rpc;
 mod utils;
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index ff5422bfa..41c8ba07b 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -139,7 +139,8 @@ impl WebSocket {
             Rc::clone(&inner_mut.socket),
             "message",
             move |msg| {
-                let parsed = ServerMsg::try_from(&msg).map_err(WasmErr::from);
+                let parsed =
+                    ServerMessage::try_from(&msg).map(|msg| msg.into());
 
                 f(parsed);
             },
@@ -208,3 +209,23 @@ impl From<&CloseEvent> for CloseMsg {
         }
     }
 }
+
+macro_attr! {
+    #[derive(NewtypeFrom!)]
+    pub struct ServerMessage(ServerMsg);
+}
+
+impl TryFrom<&MessageEvent> for ServerMessage {
+    type Error = WasmErr;
+
+    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
+        let payload = msg
+            .data()
+            .as_string()
+            .ok_or_else(|| WasmErr::from_str("Payload is not string"))?;
+
+        serde_json::from_str::<ServerMsg>(&payload)
+            .map_err(WasmErr::from)
+            .map(Self::from)
+    }
+}
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index 4bdfc65cb..f0833f5b8 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -7,10 +7,6 @@ homepage = "https://github.com/instrumentisto/medea"
 readme = "README.md"
 repository = "https://github.com/instrumentisto/medea"
 
-[features]
-jason = []
-
 [dependencies]
 serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
-web-sys = { version = "0.3", features = ['MessageEvent'] }
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs
index 01b0e0124..8c8a2cd9f 100644
--- a/protocol/src/lib.rs
+++ b/protocol/src/lib.rs
@@ -1,12 +1,7 @@
-#[cfg(feature = "jason")]
-use std::convert::TryFrom;
-
 use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
-#[cfg(feature = "jason")]
-use web_sys::MessageEvent;
 
 // TODO: should be properly shared between medea and jason
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 #[allow(dead_code)]
 /// Message sent by `Media Server` to `Client`.
 pub enum ServerMsg {
@@ -71,7 +66,7 @@ pub enum Event {
 
 /// [`Track] with specified direction.
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub struct Directional {
     pub id: u64,
     pub direction: Direction,
@@ -80,7 +75,7 @@ pub struct Directional {
 
 /// Direction of [`Track`].
 #[derive(Deserialize, Serialize)]
-#[cfg_attr(test, derive(PartialEq))]
+#[cfg_attr(test, derive(PartialEq, Debug))]
 pub enum Direction {
     Send { receivers: Vec<u64> },
     Recv { sender: u64 },
@@ -205,22 +200,6 @@ impl<'de> Deserialize<'de> for ServerMsg {
     }
 }
 
-#[cfg(feature = "jason")]
-impl TryFrom<&MessageEvent> for ServerMsg {
-    type Error = serde_json::Error;
-
-    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        use serde::de::Error;
-
-        let payload = msg
-            .data()
-            .as_string()
-            .ok_or_else(|| Error::custom("Payload is not string"))?;
-
-        serde_json::from_str::<Self>(&payload)
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/signaling_test.html b/signaling_test.html
index b18e1d4e8..e4ebe8424 100644
--- a/signaling_test.html
+++ b/signaling_test.html
@@ -5,105 +5,82 @@
     <meta http-equiv='Content-Type' content='text/html; charset=UTF-8'/>
 
     <script type="text/javascript">
-
         var socket;
         var pcs = {};
-
         function connectSocket(caller) {
             let role = caller ? "1/caller_credentials" : "2/responder_credentials";
             socket = new WebSocket("ws://localhost:8080/ws/1/" + role);
             socket.onmessage = handleSocketMessage;
-
             window.setInterval(function () {
                 socket.send("{\"ping\":1}");
             }, 8000);
         };
-
         function handleSocketMessage(message) {
-
             var msg = JSON.parse(message.data);
-
-            if (msg.pong == undefined) {
-                console.log(JSON.stringify(message.data));
-                if (msg.PeerCreated != undefined) {
-                    handlePeerCreated(msg.PeerCreated);
-                }
-
-                if (msg.SdpAnswerMade != undefined) {
-                    handleSdpAnswerMade(msg.SdpAnswerMade);
-                }
-
-                if (msg.IceCandidateDiscovered != undefined) {
-                    handleIceCandidateDiscovered(msg.IceCandidateDiscovered);
-                }
+            switch (msg.event) {
+                case 'PeerCreated':
+                    handlePeerCreated(msg.data);
+                    break;
+                case 'SdpAnswerMade':
+                    handleSdpAnswerMade(msg.data);
+                    break;
+                case 'IceCandidateDiscovered':
+                    handleIceCandidateDiscovered(msg.data);
+                    break;
             }
         }
-
         async function handlePeerCreated(msg) {
             var sendAudio = false;
             var sendVideo = false;
             var recvAudio = false;
             var recvVideo = false;
-
             msg.tracks.forEach((track) => {
-
                 if (track.media_type.Audio != undefined) {
-                    if (track.direction.Send != undefined) {
-                        sendAudio = true;
-                    }
-
-                    if (track.direction.Recv != undefined) {
-                        recvAudio = true;
-                    }
-
+                if (track.direction.Send != undefined) {
+                    sendAudio = true;
                 }
-                if (track.media_type.Video != undefined) {
-                    if (track.direction.Send != undefined) {
-                        sendVideo = true;
-                    }
-
-                    if (track.direction.Recv != undefined) {
-                        recvVideo = true;
-                    }
+                if (track.direction.Recv != undefined) {
+                    recvAudio = true;
                 }
-            });
-
+            }
+            if (track.media_type.Video != undefined) {
+                if (track.direction.Send != undefined) {
+                    sendVideo = true;
+                }
+                if (track.direction.Recv != undefined) {
+                    recvVideo = true;
+                }
+            }
+        });
             pcs[msg.peer_id] = new RTCPeerConnection();
-
             var pc = pcs[msg.peer_id];
             pc.ontrack = function (e) {
                 console.log("ontrack");
                 partnervid.srcObject = e.streams[0];
             };
-
             if (sendVideo || sendAudio) {
                 const stream = await navigator.mediaDevices.getUserMedia({
                     audio: sendAudio,
                     video: sendVideo
                 });
-
                 yourvid.srcObject = stream;
-
                 stream.getTracks().forEach((track) => {
                     pc.addTrack(track, stream);
-                });
+            });
             }
-
-
             var mediaConstraints = {
                 'mandatory': {
                     'OfferToReceiveAudio': recvAudio,
                     'OfferToReceiveVideo': recvVideo
                 }
             };
-
             if (msg.sdp_offer != undefined && msg.sdp_offer != null) {
                 pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_offer)));
                 var answer = await pc.createAnswer(mediaConstraints);
                 pc.setLocalDescription(answer);
-
                 socket.send(JSON.stringify({
-                    MakeSdpAnswer: {
+                    command: "MakeSdpAnswer",
+                    data: {
                         peer_id: msg.peer_id,
                         sdp_answer: JSON.stringify(answer)
                     }
@@ -112,38 +89,33 @@
                 var offer = await pc.createOffer(mediaConstraints);
                 pc.setLocalDescription(offer);
                 socket.send(JSON.stringify({
-                    MakeSdpOffer: {
+                    command: "MakeSdpOffer",
+                    data: {
                         peer_id: msg.peer_id,
                         sdp_offer: JSON.stringify(offer)
                     }
                 }));
             }
-
-
             pc.onicecandidate = function (e) {
-
                 if (e.candidate) {
                     socket.send(JSON.stringify({
-                        SetIceCandidate: {
+                        command: "SetIceCandidate",
+                        data: {
                             peer_id: msg.peer_id,
                             candidate: JSON.stringify(e.candidate)
                         }
                     }))
                 }
-
             };
         }
-
         async function handleSdpAnswerMade(msg) {
             var pc = pcs[msg.peer_id];
             pc.setRemoteDescription(new RTCSessionDescription(JSON.parse(msg.sdp_answer)))
         }
-
         async function handleIceCandidateDiscovered(msg) {
             var pc = pcs[msg.peer_id];
             pc.addIceCandidate(JSON.parse(msg.candidate));
         }
-
     </script>
 </head>
 <body>
diff --git a/src/api/client/room.rs b/src/api/client/room.rs
index 02dbb156b..48cb73ee6 100644
--- a/src/api/client/room.rs
+++ b/src/api/client/room.rs
@@ -596,23 +596,24 @@ mod test {
         }
     }
 
-    impl Handler<Event> for TestConnection {
+    impl Handler<RoomMessage> for TestConnection {
         type Result = ();
 
-        fn handle(&mut self, event: Event, _ctx: &mut Self::Context) {
+        fn handle(&mut self, msg: RoomMessage, _ctx: &mut Self::Context) {
             let mut events = self.events.lock().unwrap();
+            let event = msg.into();
             events.push(serde_json::to_string(&event).unwrap());
-            match event {
+            if let Some(msg) = match event {
                 Event::PeerCreated {
                     peer_id,
                     sdp_offer,
                     tracks: _,
                 } => match sdp_offer {
-                    Some(_) => self.room.do_send(Command::MakeSdpAnswer {
+                    Some(_) => Some(Command::MakeSdpAnswer {
                         peer_id,
                         sdp_answer: "responder_answer".into(),
                     }),
-                    None => self.room.do_send(Command::MakeSdpOffer {
+                    None => Some(Command::MakeSdpOffer {
                         peer_id,
                         sdp_offer: "caller_offer".into(),
                     }),
@@ -620,7 +621,7 @@ mod test {
                 Event::SdpAnswerMade {
                     peer_id,
                     sdp_answer: _,
-                } => self.room.do_send(Command::SetIceCandidate {
+                } => Some(Command::SetIceCandidate {
                     peer_id,
                     candidate: "ice_candidate".into(),
                 }),
@@ -632,8 +633,11 @@ mod test {
                         member_id: self.member_id,
                         reason: ClosedReason::Disconnected,
                     });
+                    None
                 }
-                Event::PeersRemoved { peer_ids: _ } => {}
+                Event::PeersRemoved { peer_ids: _ } => None,
+            } {
+                self.room.do_send(MemberMessage::from(msg))
             }
         }
     }
@@ -646,9 +650,9 @@ mod test {
 
         fn send_event(
             &self,
-            event: Event,
+            msg: RoomMessage,
         ) -> Box<dyn Future<Item = (), Error = ()>> {
-            let fut = self.send(event).map_err(|_| ());
+            let fut = self.send(msg).map_err(|_| ());
             Box::new(fut)
         }
     }

From ca1feaf886a5712cbc467797dcb2203e55987eb9 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 7 May 2019 15:11:50 +0300
Subject: [PATCH 162/179] Fix merge

---
 Cargo.lock                       |  1 +
 src/api/client/rpc_connection.rs | 53 +++++++++++++++++++-------------
 src/api/client/session.rs        | 26 ++++++++++------
 src/media/errors.rs              |  7 -----
 src/signalling/participants.rs   |  9 +++---
 src/signalling/room.rs           | 20 ++++++------
 6 files changed, 61 insertions(+), 55 deletions(-)
 delete mode 100644 src/media/errors.rs

diff --git a/Cargo.lock b/Cargo.lock
index 47acf898b..2ca5572dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -864,6 +864,7 @@ dependencies = [
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smart-default 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index 2516fde27..b5272f7ab 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -7,14 +7,16 @@ use crate::api::control::MemberId;
 
 use std::fmt;
 
+/// Wrapper [`Command`] for implements actix [`Message`].
 macro_attr! {
     #[derive(Message, NewtypeFrom!)]
     #[rtype(result = "Result<(), ()>")]
-    pub struct MemberMessage(Command);
+    pub struct CommandMessage(Command);
 }
+/// Wrapper [`Event`] for implements actix [`Message`].
 macro_attr! {
     #[derive(Message, NewtypeFrom!)]
-    pub struct RoomMessage(Event);
+    pub struct EventMessage(Event);
 }
 
 /// Abstraction over RPC connection with some remote [`Member`].
@@ -27,7 +29,7 @@ pub trait RpcConnection: fmt::Debug + Send {
     /// Sends [`Event`] to remote [`Member`].
     fn send_event(
         &self,
-        event: RoomMessage,
+        msg: EventMessage,
     ) -> Box<dyn Future<Item = (), Error = ()>>;
 }
 
@@ -92,15 +94,15 @@ pub mod test {
         System,
     };
     use futures::future::Future;
+    use protocol::{Command, Event};
 
     use crate::{
         api::{
             client::rpc_connection::{
-                ClosedReason, RpcConnection, RpcConnectionClosed,
-                RpcConnectionEstablished,
+                ClosedReason, CommandMessage, EventMessage, RpcConnection,
+                RpcConnectionClosed, RpcConnectionEstablished,
             },
             control::MemberId,
-            protocol::{Command, Event},
         },
         signalling::Room,
     };
@@ -145,11 +147,12 @@ pub mod test {
         }
     }
 
-    impl Handler<Event> for TestConnection {
+    impl Handler<EventMessage> for TestConnection {
         type Result = ();
 
-        fn handle(&mut self, event: Event, _ctx: &mut Self::Context) {
+        fn handle(&mut self, msg: EventMessage, _ctx: &mut Self::Context) {
             let mut events = self.events.lock().unwrap();
+            let event = msg.into();
             events.push(serde_json::to_string(&event).unwrap());
             match event {
                 Event::PeerCreated {
@@ -158,19 +161,25 @@ pub mod test {
                     tracks: _,
                 } => {
                     match sdp_offer {
-                        Some(_) => self.room.do_send(Command::MakeSdpAnswer {
-                            peer_id,
-                            sdp_answer: "responder_answer".into(),
-                        }),
-                        None => self.room.do_send(Command::MakeSdpOffer {
-                            peer_id,
-                            sdp_offer: "caller_offer".into(),
-                        }),
+                        Some(_) => self.room.do_send(CommandMessage::from(
+                            Command::MakeSdpAnswer {
+                                peer_id,
+                                sdp_answer: "responder_answer".into(),
+                            },
+                        )),
+                        None => self.room.do_send(CommandMessage::from(
+                            Command::MakeSdpOffer {
+                                peer_id,
+                                sdp_offer: "caller_offer".into(),
+                            },
+                        )),
                     }
-                    self.room.do_send(Command::SetIceCandidate {
-                        peer_id,
-                        candidate: "ice_candidate".into(),
-                    })
+                    self.room.do_send(CommandMessage::from(
+                        Command::SetIceCandidate {
+                            peer_id,
+                            candidate: "ice_candidate".into(),
+                        },
+                    ))
                 }
                 Event::IceCandidateDiscovered {
                     peer_id: _,
@@ -198,9 +207,9 @@ pub mod test {
 
         fn send_event(
             &self,
-            event: Event,
+            msg: EventMessage,
         ) -> Box<dyn Future<Item = (), Error = ()>> {
-            let fut = self.send(event).map_err(|_| ());
+            let fut = self.send(msg).map_err(|_| ());
             Box::new(fut)
         }
     }
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 308d9e926..cbe42eb26 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -13,8 +13,8 @@ use protocol::{ClientMsg, ServerMsg};
 use crate::{
     api::{
         client::rpc_connection::{
-            ClosedReason, RpcConnection, RpcConnectionClosed,
-            RpcConnectionEstablished,
+            ClosedReason, CommandMessage, EventMessage, RpcConnection,
+            RpcConnectionClosed, RpcConnectionEstablished,
         },
         control::MemberId,
     },
@@ -161,10 +161,10 @@ impl RpcConnection for Addr<WsSession> {
     /// Sends [`Event`] to Web Client.
     fn send_event(
         &self,
-        msg: RoomMessage,
+        msg: EventMessage,
     ) -> Box<dyn Future<Item = (), Error = ()>> {
         let fut = self
-            .send(ServerMsg::Event(msg.into()))
+            .send(msg)
             .map_err(|err| error!("Failed send event {:?} ", err));
         Box::new(fut)
     }
@@ -188,13 +188,15 @@ impl Handler<Close> for WsSession {
     }
 }
 
-impl Handler<ServerMsg> for WsSession {
+impl Handler<EventMessage> for WsSession {
     type Result = ();
 
     /// Sends [`Event`] to Web Client.
-    fn handle(&mut self, msg: ServerMsg, ctx: &mut Self::Context) {
-        debug!("Event {:?} for member {}", msg, self.member_id);
-        ctx.text(serde_json::to_string(&msg).unwrap())
+    fn handle(&mut self, msg: EventMessage, ctx: &mut Self::Context) {
+        let event =
+            serde_json::to_string(&ServerMsg::Event(msg.into())).unwrap();
+        debug!("Event {} for member {}", event, self.member_id);
+        ctx.text(event);
     }
 }
 
@@ -212,10 +214,14 @@ impl StreamHandler<ws::Message, ws::ProtocolError> for WsSession {
                     Ok(ClientMsg::Ping(n)) => {
                         trace!("Received ping: {}", n);
                         // Answer with Heartbeat::Pong.
-                        ctx.notify(ServerMsg::Pong(n));
+                        ctx.text(
+                            serde_json::to_string(&ServerMsg::Pong(n)).unwrap(),
+                        );
                     }
                     Ok(ClientMsg::Command(command)) => {
-                        if let Err(err) = self.room.try_send(MemberMessage::from(command)) {
+                        if let Err(err) =
+                            self.room.try_send(CommandMessage::from(command))
+                        {
                             error!(
                                 "Cannot send Command to Room {}, because {}",
                                 self.member_id, err
diff --git a/src/media/errors.rs b/src/media/errors.rs
deleted file mode 100644
index 700d54abd..000000000
--- a/src/media/errors.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-use failure::Fail;
-
-#[derive(Fail, Debug)]
-pub enum MediaError {
-    #[fail(display = "Unmatched state of track")]
-    UnmatchedTrackState,
-}
diff --git a/src/signalling/participants.rs b/src/signalling/participants.rs
index 4973f7af2..4ef4ca223 100644
--- a/src/signalling/participants.rs
+++ b/src/signalling/participants.rs
@@ -3,23 +3,22 @@
 //! [`RpcConnection`] authorization, establishment, message sending.
 
 use actix::{fut::wrap_future, AsyncContext, Context, SpawnHandle};
-use hashbrown::HashMap;
-
 use futures::{
     future::{self, join_all, Either},
     Future,
 };
+use hashbrown::HashMap;
+use protocol::Event;
 
 use std::time::{Duration, Instant};
 
 use crate::{
     api::{
         client::rpc_connection::{
-            AuthorizationError, ClosedReason, RpcConnection,
+            AuthorizationError, ClosedReason, EventMessage, RpcConnection,
             RpcConnectionClosed,
         },
         control::{Member, MemberId},
-        protocol::Event,
     },
     log::prelude::*,
     signalling::{
@@ -99,7 +98,7 @@ impl ParticipantService {
     ) -> impl Future<Item = (), Error = RoomError> {
         match self.connections.get(&member_id) {
             Some(conn) => Either::A(
-                conn.send_event(event)
+                conn.send_event(EventMessage::from(event))
                     .map_err(move |_| RoomError::UnableToSendEvent(member_id)),
             ),
             None => Either::B(future::err(RoomError::ConnectionNotExists(
diff --git a/src/signalling/room.rs b/src/signalling/room.rs
index a76d12129..4b89e8d98 100644
--- a/src/signalling/room.rs
+++ b/src/signalling/room.rs
@@ -8,17 +8,17 @@ use actix::{
 use failure::Fail;
 use futures::future;
 use hashbrown::HashMap;
+use protocol::{Command, Event};
 
 use std::time::Duration;
 
 use crate::{
     api::{
         client::rpc_connection::{
-            AuthorizationError, Authorize, RpcConnectionClosed,
+            AuthorizationError, Authorize, CommandMessage, RpcConnectionClosed,
             RpcConnectionEstablished,
         },
         control::{Member, MemberId},
-        protocol::{Command, Event},
     },
     log::prelude::*,
     media::{
@@ -285,17 +285,17 @@ impl Handler<ConnectPeers> for Room {
     }
 }
 
-impl Handler<Command> for Room {
+impl Handler<CommandMessage> for Room {
     type Result = ActFuture<(), ()>;
 
     /// Receives [`Command`] from Web client and passes it to corresponding
     /// handlers. Will emit [`CloseRoom`] on any error.
     fn handle(
         &mut self,
-        command: Command,
+        msg: CommandMessage,
         ctx: &mut Self::Context,
     ) -> Self::Result {
-        let result = match command {
+        let result = match msg.into() {
             Command::MakeSdpOffer { peer_id, sdp_offer } => {
                 self.handle_make_sdp_offer(peer_id, sdp_offer)
             }
@@ -418,14 +418,12 @@ mod test {
     };
 
     use actix::{Addr, Arbiter, System};
+    use protocol::{
+        AudioSettings, Direction, Directional, MediaType, VideoSettings,
+    };
 
     use super::*;
-    use crate::{
-        api::protocol::{
-            AudioSettings, Direction, Directional, MediaType, VideoSettings,
-        },
-        media::create_peers,
-    };
+    use crate::media::create_peers;
 
     use crate::api::client::rpc_connection::test::TestConnection;
 

From 267126265b6f82b748160e523408a3a6fc5899ec Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 7 May 2019 15:37:07 +0300
Subject: [PATCH 163/179] Add docs

---
 jason/src/rpc/pinger.rs    | 18 ++++++++++++++++++
 jason/src/rpc/websocket.rs |  5 +++++
 2 files changed, 23 insertions(+)

diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index e290501e9..862dd71cf 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -8,17 +8,29 @@ use crate::{
     utils::{window, IntervalHandle, WasmErr},
 };
 
+/// Pinger for periodical tests connection to server by sends ping message.
 pub struct Pinger(Rc<RefCell<InnerPinger>>);
 
 struct InnerPinger {
+    /// Interval for send ping message.
     ping_interval: i32,
+
+    /// Count of ping message sending to server.
     num: u64,
+
+    /// Count of pong message received from server.
     pong_at: Option<f64>,
+
+    /// Socket to server.
     socket: Option<Rc<WebSocket>>,
+
+    /// Handler for bind closure what run when ping send.
     ping_task: Option<PingTaskHandler>,
 }
 
 impl InnerPinger {
+    /// Send ping message into socket.
+    /// Returns error no open socket.
     fn send_now(&mut self) -> Result<(), WasmErr> {
         match self.socket.as_ref() {
             None => Err(WasmErr::from_str("Unable to ping: no socket")),
@@ -30,12 +42,15 @@ impl InnerPinger {
     }
 }
 
+/// Handler for bind closure what run when ping send.
 struct PingTaskHandler {
     _ping_closure: Closure<dyn FnMut()>,
     _interval_handler: IntervalHandle,
 }
 
 impl Pinger {
+    /// Returns new instance of [`Pinger`] with given interval for ping in
+    /// seconds.
     pub fn new(ping_interval: i32) -> Self {
         Self(Rc::new(RefCell::new(InnerPinger {
             ping_interval,
@@ -46,6 +61,7 @@ impl Pinger {
         })))
     }
 
+    /// Start [`Pinger`] for give socket.
     pub fn start(&self, socket: Rc<WebSocket>) -> Result<(), WasmErr> {
         let mut inner = self.0.borrow_mut();
         inner.socket = Some(socket);
@@ -71,10 +87,12 @@ impl Pinger {
         Ok(())
     }
 
+    /// Store number of pong message.
     pub fn set_pong_at(&self, at: f64) {
         self.0.borrow_mut().pong_at = Some(at);
     }
 
+    /// Stop [`Pinger`].
     pub fn stop(&self) {
         self.0.borrow_mut().ping_task.take();
     }
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 41c8ba07b..5b64fd1f8 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -11,6 +11,7 @@ use crate::{
     utils::{EventListener, WasmErr},
 };
 
+/// State of websocket.
 #[derive(Debug)]
 enum State {
     CONNECTING,
@@ -20,6 +21,7 @@ enum State {
 }
 
 impl State {
+    /// Returns true if socket can be closed.
     pub fn can_close(&self) -> bool {
         match self {
             State::CONNECTING | State::OPEN => true,
@@ -130,6 +132,7 @@ impl WebSocket {
             })
     }
 
+    /// Set handler on receive message from server.
     pub fn on_message<F>(&self, mut f: F) -> Result<(), WasmErr>
     where
         F: (FnMut(Result<ServerMsg, WasmErr>)) + 'static,
@@ -148,6 +151,7 @@ impl WebSocket {
         Ok(())
     }
 
+    /// Set handler on close socket.
     pub fn on_close<F>(&self, f: F) -> Result<(), WasmErr>
     where
         F: (FnOnce(CloseMsg)) + 'static,
@@ -167,6 +171,7 @@ impl WebSocket {
         Ok(())
     }
 
+    /// Send message to server.
     pub fn send(&self, msg: &ClientMsg) -> Result<(), WasmErr> {
         let inner = self.0.borrow();
 

From 76c660f79ef638318c2cddfc108f2119f32a4088 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 7 May 2019 15:46:43 +0300
Subject: [PATCH 164/179] Fix docs

---
 src/api/client/rpc_connection.rs |   4 +-
 src/conf/duration.rs             | 126 -------------------------------
 2 files changed, 2 insertions(+), 128 deletions(-)
 delete mode 100644 src/conf/duration.rs

diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index b5272f7ab..57994c17e 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -7,14 +7,14 @@ use crate::api::control::MemberId;
 
 use std::fmt;
 
-/// Wrapper [`Command`] for implements actix [`Message`].
 macro_attr! {
+    /// Wrapper [`Command`] for implements actix [`Message`].
     #[derive(Message, NewtypeFrom!)]
     #[rtype(result = "Result<(), ()>")]
     pub struct CommandMessage(Command);
 }
-/// Wrapper [`Event`] for implements actix [`Message`].
 macro_attr! {
+    /// Wrapper [`Event`] for implements actix [`Message`].
     #[derive(Message, NewtypeFrom!)]
     pub struct EventMessage(Event);
 }
diff --git a/src/conf/duration.rs b/src/conf/duration.rs
deleted file mode 100644
index 1a54f40e5..000000000
--- a/src/conf/duration.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-/// Provides deserialize [`time::Duration`] from string.
-use std::fmt;
-use std::time::Duration;
-
-use serde::de::{self, Unexpected};
-use serde::Serializer;
-
-struct DurationFromStringVisitor;
-
-pub fn deserialize<'de, D>(d: D) -> Result<Duration, D::Error>
-where
-    D: de::Deserializer<'de>,
-{
-    Ok(d.deserialize_str(DurationFromStringVisitor)?)
-}
-
-impl<'de> de::Visitor<'de> for DurationFromStringVisitor {
-    type Value = Duration;
-
-    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
-        write!(formatter, "a string representation of duration")
-    }
-
-    fn visit_str<E>(self, value: &str) -> Result<Duration, E>
-    where
-        E: de::Error,
-    {
-        let dur = humantime::parse_duration(value).map_err(|_| {
-            de::Error::invalid_value(Unexpected::Str(value), &self)
-        })?;
-        Ok(dur)
-    }
-}
-
-pub fn serialize<S>(d: &Duration, s: S) -> Result<S::Ok, S::Error>
-where
-    S: Serializer,
-{
-    s.serialize_str(&format!("{}", humantime::format_duration(*d)))
-}
-
-#[cfg(test)]
-mod test {
-    use serde_derive::{Deserialize, Serialize};
-    use serde_test::{assert_de_tokens, assert_ser_tokens, Token};
-    use std::time::Duration;
-
-    #[derive(Serialize, Deserialize, Debug, PartialEq)]
-    struct S {
-        #[serde(serialize_with = "super::serialize")]
-        #[serde(deserialize_with = "super::deserialize")]
-        dur: Duration,
-    }
-
-    #[test]
-    fn test_de() {
-        let valid = vec![
-            ("17nsec", Duration::new(0, 17)),
-            ("17nanos", Duration::new(0, 17)),
-            ("33ns", Duration::new(0, 33)),
-            ("3usec", Duration::new(0, 3000)),
-            ("78us", Duration::new(0, 78000)),
-            ("31msec", Duration::new(0, 31000000)),
-            ("31millis", Duration::new(0, 31000000)),
-            ("6ms", Duration::new(0, 6000000)),
-            ("3000s", Duration::new(3000, 0)),
-            ("300sec", Duration::new(300, 0)),
-            ("300secs", Duration::new(300, 0)),
-            ("50seconds", Duration::new(50, 0)),
-            ("1second", Duration::new(1, 0)),
-            ("100m", Duration::new(6000, 0)),
-            ("12min", Duration::new(720, 0)),
-            ("12mins", Duration::new(720, 0)),
-            ("1minute", Duration::new(60, 0)),
-            ("7minutes", Duration::new(420, 0)),
-            ("2h", Duration::new(7200, 0)),
-            ("7hr", Duration::new(25200, 0)),
-            ("7hrs", Duration::new(25200, 0)),
-            ("1hour", Duration::new(3600, 0)),
-            ("24hours", Duration::new(86400, 0)),
-            ("1day", Duration::new(86400, 0)),
-            ("2days", Duration::new(172800, 0)),
-            ("365d", Duration::new(31536000, 0)),
-            ("1week", Duration::new(604800, 0)),
-            ("7weeks", Duration::new(4233600, 0)),
-            ("52w", Duration::new(31449600, 0)),
-            ("1month", Duration::new(2630016, 0)),
-            ("3months", Duration::new(3 * 2630016, 0)),
-            ("12M", Duration::new(31560192, 0)),
-            ("1year", Duration::new(31557600, 0)),
-            ("7years", Duration::new(7 * 31557600, 0)),
-            ("17y", Duration::new(536479200, 0)),
-        ];
-
-        valid.into_iter().for_each(|(formatted, dur)| {
-            let s = S { dur };
-
-            assert_de_tokens(
-                &s,
-                &[
-                    Token::Struct { name: "S", len: 1 },
-                    Token::Str("dur"),
-                    Token::Str(formatted),
-                    Token::StructEnd,
-                ],
-            );
-        });
-    }
-
-    #[test]
-    fn test_ser() {
-        let s = S {
-            dur: Duration::new(236179457, 45500),
-        };
-
-        assert_ser_tokens(
-            &s,
-            &[
-                Token::Struct { name: "S", len: 1 },
-                Token::Str("dur"),
-                Token::Str("7years 5months 24days 14h 36m 17s 45us 500ns"),
-                Token::StructEnd,
-            ],
-        );
-    }
-}

From abf3d48e222644537ae43a8e526bb891cab33be4 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 7 May 2019 16:32:41 +0300
Subject: [PATCH 165/179] Remove api::client::protocol

---
 src/api/mod.rs      |   1 -
 src/api/protocol.rs | 283 --------------------------------------------
 2 files changed, 284 deletions(-)
 delete mode 100644 src/api/protocol.rs

diff --git a/src/api/mod.rs b/src/api/mod.rs
index f12d438ca..1c66e73e5 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -2,4 +2,3 @@
 
 pub mod client;
 pub mod control;
-pub mod protocol;
diff --git a/src/api/protocol.rs b/src/api/protocol.rs
deleted file mode 100644
index 34848e063..000000000
--- a/src/api/protocol.rs
+++ /dev/null
@@ -1,283 +0,0 @@
-use actix::Message;
-use serde::{de::Deserializer, ser::Serializer, Deserialize, Serialize};
-
-// TODO: should be properly shared between medea and jason
-#[cfg_attr(test, derive(PartialEq))]
-#[derive(Message, Debug)]
-#[allow(dead_code)]
-/// Message sent by `Media Server` to `Client`.
-pub enum ServerMsg {
-    /// `pong` message that server answers with to WebSocket client in response
-    /// to received `ping` message.
-    Pong(u64),
-    /// `Media Server` notifies `Client` about happened facts and it reacts on
-    /// them to reach the proper state.
-    Event(Event),
-}
-
-#[cfg_attr(test, derive(PartialEq, Debug))]
-#[allow(dead_code)]
-/// Message from 'Client' to 'Media Server'.
-pub enum ClientMsg {
-    /// `ping` message that WebSocket client is expected to send to the server
-    /// periodically.
-    Ping(u64),
-    /// Request of `Web Client` to change the state on `Media Server`.
-    Command(Command),
-}
-
-/// WebSocket message from Web Client to Media Server.
-#[derive(Deserialize, Serialize, Message)]
-#[cfg_attr(test, derive(PartialEq, Debug))]
-#[serde(tag = "command", content = "data")]
-#[allow(dead_code)]
-#[rtype(result = "Result<(), ()>")]
-pub enum Command {
-    /// Web Client sends SDP Offer.
-    MakeSdpOffer { peer_id: u64, sdp_offer: String },
-    /// Web Client sends SDP Answer.
-    MakeSdpAnswer { peer_id: u64, sdp_answer: String },
-    /// Web Client sends Ice Candidate.
-    SetIceCandidate { peer_id: u64, candidate: String },
-}
-
-/// WebSocket message from Medea to Jason.
-#[derive(Deserialize, Serialize, Message, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-#[allow(dead_code)]
-#[serde(tag = "event", content = "data")]
-pub enum Event {
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// creation.
-    PeerCreated {
-        peer_id: u64,
-        sdp_offer: Option<String>,
-        tracks: Vec<Directional>,
-    },
-    /// Media Server notifies Web Client about necessity to apply specified SDP
-    /// Answer to Web Client's RTCPeerConnection.
-    SdpAnswerMade { peer_id: u64, sdp_answer: String },
-
-    /// Media Server notifies Web Client about necessity to apply specified
-    /// ICE Candidate.
-    IceCandidateDiscovered { peer_id: u64, candidate: String },
-
-    /// Media Server notifies Web Client about necessity of RTCPeerConnection
-    /// close.
-    PeersRemoved { peer_ids: Vec<u64> },
-}
-
-/// [`Track] with specified direction.
-#[derive(Deserialize, Serialize, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct Directional {
-    pub id: u64,
-    pub direction: Direction,
-    pub media_type: MediaType,
-}
-
-/// Direction of [`Track`].
-#[derive(Deserialize, Serialize, Debug)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum Direction {
-    Send { receivers: Vec<u64> },
-    Recv { sender: u64 },
-}
-
-/// Type of [`Track`].
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub enum MediaType {
-    Audio(AudioSettings),
-    Video(VideoSettings),
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct AudioSettings {}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[cfg_attr(test, derive(PartialEq))]
-pub struct VideoSettings {}
-
-impl Serialize for ClientMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        use serde::ser::SerializeStruct;
-
-        match self {
-            ClientMsg::Ping(n) => {
-                let mut ping = serializer.serialize_struct("ping", 1)?;
-                ping.serialize_field("ping", n)?;
-                ping.end()
-            }
-            ClientMsg::Command(command) => command.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for ClientMsg {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or_else(|| {
-            Error::custom(format!("unable to deser ClientMsg [{:?}]", &ev))
-        })?;
-
-        if let Some(v) = map.get("ping") {
-            let n = v.as_u64().ok_or_else(|| {
-                Error::custom(format!(
-                    "unable to deser ClientMsg::Ping [{:?}]",
-                    &ev
-                ))
-            })?;
-
-            Ok(ClientMsg::Ping(n))
-        } else {
-            let command =
-                serde_json::from_value::<Command>(ev).map_err(|e| {
-                    Error::custom(format!(
-                        "unable to deser ClientMsg::Command [{:?}]",
-                        e
-                    ))
-                })?;
-            Ok(ClientMsg::Command(command))
-        }
-    }
-}
-
-impl Serialize for ServerMsg {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        use serde::ser::SerializeStruct;
-
-        match self {
-            ServerMsg::Pong(n) => {
-                let mut ping = serializer.serialize_struct("pong", 1)?;
-                ping.serialize_field("pong", n)?;
-                ping.end()
-            }
-            ServerMsg::Event(command) => command.serialize(serializer),
-        }
-    }
-}
-
-impl<'de> Deserialize<'de> for ServerMsg {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: Deserializer<'de>,
-    {
-        use serde::de::Error;
-
-        let ev = serde_json::Value::deserialize(deserializer)?;
-        let map = ev.as_object().ok_or_else(|| {
-            Error::custom(format!("unable to deser ServerMsg [{:?}]", &ev))
-        })?;
-
-        if let Some(v) = map.get("pong") {
-            let n = v.as_u64().ok_or_else(|| {
-                Error::custom(format!(
-                    "unable to deser ServerMsg::Pong [{:?}]",
-                    &ev
-                ))
-            })?;
-
-            Ok(ServerMsg::Pong(n))
-        } else {
-            let event = serde_json::from_value::<Event>(ev).map_err(|e| {
-                Error::custom(format!(
-                    "unable to deser ServerMsg::Event [{:?}]",
-                    e
-                ))
-            })?;
-            Ok(ServerMsg::Event(event))
-        }
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use crate::api::protocol::{ClientMsg, Command, Event, ServerMsg};
-
-    #[test]
-    fn command() {
-        let command = ClientMsg::Command(Command::MakeSdpOffer {
-            peer_id: 77,
-            sdp_offer: "offer".to_owned(),
-        });
-        #[cfg_attr(nightly, rustfmt::skip)]
-            let command_str =
-            "{\
-                \"command\":\"MakeSdpOffer\",\
-                \"data\":{\
-                    \"peer_id\":77,\
-                    \"sdp_offer\":\"offer\"\
-                }\
-            }";
-
-        assert_eq!(command_str, serde_json::to_string(&command).unwrap());
-        assert_eq!(
-            command,
-            serde_json::from_str(&serde_json::to_string(&command).unwrap())
-                .unwrap()
-        );
-    }
-
-    #[test]
-    fn ping() {
-        let ping = ClientMsg::Ping(15);
-        let ping_str = "{\"ping\":15}";
-
-        assert_eq!(ping_str, serde_json::to_string(&ping).unwrap());
-        assert_eq!(
-            ping,
-            serde_json::from_str(&serde_json::to_string(&ping).unwrap())
-                .unwrap()
-        )
-    }
-
-    #[test]
-    fn event() {
-        let event = ServerMsg::Event(Event::SdpAnswerMade {
-            peer_id: 45,
-            sdp_answer: "answer".to_owned(),
-        });
-        #[cfg_attr(nightly, rustfmt::skip)]
-            let event_str =
-            "{\
-                \"event\":\"SdpAnswerMade\",\
-                \"data\":{\
-                    \"peer_id\":45,\
-                    \"sdp_answer\":\"answer\"\
-                }\
-            }";
-
-        assert_eq!(event_str, serde_json::to_string(&event).unwrap());
-        assert_eq!(
-            event,
-            serde_json::from_str(&serde_json::to_string(&event).unwrap())
-                .unwrap()
-        );
-    }
-
-    #[test]
-    fn pong() {
-        let pong = ServerMsg::Pong(5);
-        let pong_str = "{\"pong\":5}";
-
-        assert_eq!(pong_str, serde_json::to_string(&pong).unwrap());
-        assert_eq!(
-            pong,
-            serde_json::from_str(&serde_json::to_string(&pong).unwrap())
-                .unwrap()
-        )
-    }
-}

From c50bd4e144bac4a97ef6aa842c9140904870442b Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Tue, 7 May 2019 18:38:13 +0300
Subject: [PATCH 166/179] fix lint errors

---
 jason/src/rpc/pinger.rs    | 2 +-
 jason/src/rpc/websocket.rs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index 862dd71cf..a08c451bf 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -70,7 +70,7 @@ impl Pinger {
         let inner_rc = Rc::clone(&self.0);
         let do_ping = Closure::wrap(Box::new(move || {
             // its_ok if ping fails few times
-            inner_rc.borrow_mut().send_now().is_ok();
+            let _ = inner_rc.borrow_mut().send_now();
         }) as Box<dyn FnMut()>);
 
         let interval_id = window()
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 5b64fd1f8..c1cb65f13 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -98,7 +98,7 @@ impl WebSocket {
                     "close",
                     move |_| {
                         inner.borrow_mut().update_state();
-                        tx_close.send(());
+                        let _ = tx_close.send(());
                     },
                 )?);
 
@@ -108,7 +108,7 @@ impl WebSocket {
                     "open",
                     move |_| {
                         inner.borrow_mut().update_state();
-                        tx_open.send(());
+                        let _ = tx_open.send(());
                     },
                 )?);
 
@@ -143,7 +143,7 @@ impl WebSocket {
             "message",
             move |msg| {
                 let parsed =
-                    ServerMessage::try_from(&msg).map(|msg| msg.into());
+                    ServerMessage::try_from(&msg).map(std::convert::Into::into);
 
                 f(parsed);
             },

From c6dbd626d3db90b068db51f099dbd72ba5a0775b Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 9 May 2019 18:42:57 +0300
Subject: [PATCH 167/179] fix merge

---
 jason/src/api/room.rs            | 8 ++++++--
 src/api/client/rpc_connection.rs | 2 +-
 src/signalling/room.rs           | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 074cb95b4..139756ebd 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -4,7 +4,7 @@ use futures::{
     future::{Future, IntoFuture},
     stream::Stream,
 };
-use protocol::{Directional, Event};
+use protocol::{Directional, Event, IceCandidate};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
@@ -117,7 +117,11 @@ impl InnerRoom {
     }
 
     /// Applies specified ICE Candidate to specified RTCPeerConnection.
-    fn on_ice_candidate_discovered(&mut self, _peer_id: u64, _candidate: &str) {
+    fn on_ice_candidate_discovered(
+        &mut self,
+        _peer_id: u64,
+        _candidate: &IceCandidate,
+    ) {
         console::log_1(&JsValue::from_str(
             "on_ice_candidate_discovered invoked",
         ));
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index 91425e0dd..de65e67d6 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -94,7 +94,7 @@ pub mod test {
         System,
     };
     use futures::future::Future;
-    use protocol::{Command, Event};
+    use protocol::{Command, Event, IceCandidate};
 
     use crate::{
         api::{
diff --git a/src/signalling/room.rs b/src/signalling/room.rs
index 2262d5e18..0ebb5d187 100644
--- a/src/signalling/room.rs
+++ b/src/signalling/room.rs
@@ -8,7 +8,7 @@ use actix::{
 use failure::Fail;
 use futures::future;
 use hashbrown::HashMap;
-use protocol::{Command, Event};
+use protocol::{Command, Event, IceCandidate};
 
 use std::time::Duration;
 
@@ -19,7 +19,6 @@ use crate::{
             RpcConnectionEstablished,
         },
         control::{Member, MemberId},
-        protocol::{Command, Event, IceCandidate},
     },
     log::prelude::*,
     media::{

From fd4c1eee86e3108ec367e66ffb0c83bea2e31fd2 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 10 May 2019 19:48:36 +0300
Subject: [PATCH 168/179] use weak link in RoomHandle

---
 jason/src/api/room.rs | 80 ++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 51 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 139756ebd..ff75cc2c8 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -9,28 +9,29 @@ use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
 
-use std::{cell::RefCell, rc::Rc};
+use std::rc::{Rc, Weak};
 
 use crate::rpc::RPCClient;
+use std::cell::RefCell;
 
 #[allow(clippy::module_name_repetitions)]
 #[wasm_bindgen]
 /// Room handle accessible from JS.
-pub struct RoomHandle(Rc<RefCell<Option<InnerRoom>>>);
+pub struct RoomHandle(Weak<RefCell<InnerRoom>>);
 
 #[wasm_bindgen]
 impl RoomHandle {}
 
 /// Room handle being used by Rust external modules.
-pub struct Room(Rc<RefCell<Option<InnerRoom>>>);
+pub struct Room(Rc<RefCell<InnerRoom>>);
 
 impl Room {
     pub fn new(rpc: Rc<RPCClient>) -> Self {
-        Self(InnerRoom::new(rpc))
+        Self(Rc::new(RefCell::new(InnerRoom::new(rpc))))
     }
 
     pub fn new_handle(&self) -> RoomHandle {
-        RoomHandle(Rc::clone(&self.0))
+        RoomHandle(Rc::downgrade(&self.0))
     }
 
     /// Subscribes to provided RpcTransport messages.
@@ -41,45 +42,29 @@ impl Room {
             .subscribe()
             .for_each(move |event| {
                 // TODO: macro for convenient dispatch
-                match inner.borrow_mut().as_mut() {
-                    Some(inner) => {
-                        match event {
-                            Event::PeerCreated {
-                                peer_id,
-                                sdp_offer,
-                                tracks,
-                            } => {
-                                inner.on_peer_created(
-                                    peer_id, &sdp_offer, &tracks,
-                                );
-                            }
-                            Event::SdpAnswerMade {
-                                peer_id,
-                                sdp_answer,
-                            } => {
-                                inner.on_sdp_answer(peer_id, &sdp_answer);
-                            }
-                            Event::IceCandidateDiscovered {
-                                peer_id,
-                                candidate,
-                            } => {
-                                inner.on_ice_candidate_discovered(
-                                    peer_id, &candidate,
-                                );
-                            }
-                            Event::PeersRemoved { peer_ids } => {
-                                inner.on_peers_removed(&peer_ids);
-                            }
-                        };
-                        Ok(())
+                let mut inner = inner.borrow_mut();
+                match event {
+                    Event::PeerCreated {
+                        peer_id,
+                        sdp_offer,
+                        tracks,
+                    } => {
+                        inner.on_peer_created(peer_id, &sdp_offer, &tracks);
                     }
-                    None => {
-                        // InnerSession is gone, which means that Room was
-                        // dropped. Not supposed to happen, since InnerSession
-                        // should drop its tx by unsubbing from RpcClient.
-                        Err(())
+                    Event::SdpAnswerMade {
+                        peer_id,
+                        sdp_answer,
+                    } => {
+                        inner.on_sdp_answer(peer_id, &sdp_answer);
                     }
-                }
+                    Event::IceCandidateDiscovered { peer_id, candidate } => {
+                        inner.on_ice_candidate_discovered(peer_id, &candidate);
+                    }
+                    Event::PeersRemoved { peer_ids } => {
+                        inner.on_peers_removed(&peer_ids);
+                    }
+                };
+                Ok(())
             })
             .into_future()
             .then(|_| Ok(()));
@@ -97,8 +82,8 @@ struct InnerRoom {
 }
 
 impl InnerRoom {
-    fn new(rpc: Rc<RPCClient>) -> Rc<RefCell<Option<Self>>> {
-        Rc::new(RefCell::new(Some(Self { rpc })))
+    fn new(rpc: Rc<RPCClient>) -> Self {
+        Self { rpc }
     }
 
     /// Creates RTCPeerConnection with provided ID.
@@ -133,13 +118,6 @@ impl InnerRoom {
     }
 }
 
-impl Drop for Room {
-    fn drop(&mut self) {
-        // Drop InnerRoom, invalidates all spawned RoomHandler's.
-        self.0.borrow_mut().take();
-    }
-}
-
 impl Drop for InnerRoom {
     fn drop(&mut self) {
         // Drops event handling task.

From 29c89e433b9782b808cb284f6acd388389521dc1 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Sun, 12 May 2019 20:23:00 +0300
Subject: [PATCH 169/179] refactor, extend docs

---
 jason/src/api/jason.rs            | 13 +++++++---
 jason/src/api/mod.rs              |  2 +-
 jason/src/api/room.rs             | 22 ++++++++--------
 jason/src/rpc/mod.rs              |  8 ++++--
 jason/src/rpc/pinger.rs           |  8 +++---
 jason/src/rpc/websocket.rs        |  4 ++-
 jason/src/utils/errors.rs         |  1 +
 jason/src/utils/event_listener.rs |  4 +++
 jason/src/utils/mod.rs            | 42 ++++---------------------------
 jason/tests/web.rs                |  1 -
 10 files changed, 46 insertions(+), 59 deletions(-)

diff --git a/jason/src/api/jason.rs b/jason/src/api/jason.rs
index b7de0b3e9..17aa66614 100644
--- a/jason/src/api/jason.rs
+++ b/jason/src/api/jason.rs
@@ -20,6 +20,8 @@ pub struct Inner {
     rooms: Vec<Room>,
 }
 
+/// Main application handler. Responsible for managing shared transports,
+/// local media, room initialization.
 #[wasm_bindgen]
 impl Jason {
     #[wasm_bindgen(constructor)]
@@ -28,8 +30,9 @@ impl Jason {
         Self::default()
     }
 
-    /// Enter room with provided token, return initialized connection handler.
-    /// Effectively returns Result<RoomHandle, JsValue>
+    /// Enter room with provided token. Will establish connection with Medea
+    /// server (if it doesn't already exist). Fails if unable to connect to
+    /// Medea. Effectively returns Result<RoomHandle, WasmErr>
     pub fn join_room(&self, token: String) -> Promise {
         let mut rpc = RPCClient::new(token, 3000);
 
@@ -38,8 +41,7 @@ impl Jason {
             .init()
             .and_then(move |()| {
                 let rpc = Rc::new(rpc);
-                let room = Room::new(Rc::clone(&rpc));
-                room.subscribe(&rpc);
+                let room = Room::new(&rpc);
 
                 let handle = room.new_handle();
 
@@ -53,5 +55,8 @@ impl Jason {
         future_to_promise(fut)
     }
 
+    /// Drops Jason and all related objects (Rooms, Connections, Streams etc. ).
+    /// All objects related to this Jason instance will be detached (you will
+    /// still hold them, but unable to use).
     pub fn dispose(self) {}
 }
diff --git a/jason/src/api/mod.rs b/jason/src/api/mod.rs
index 71de134e0..c709898ed 100644
--- a/jason/src/api/mod.rs
+++ b/jason/src/api/mod.rs
@@ -1,4 +1,4 @@
-//! External Jason API.
+//! External Jason API accessible from JS.
 mod jason;
 mod room;
 
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index ff75cc2c8..1b049fe93 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -26,17 +26,11 @@ impl RoomHandle {}
 pub struct Room(Rc<RefCell<InnerRoom>>);
 
 impl Room {
-    pub fn new(rpc: Rc<RPCClient>) -> Self {
-        Self(Rc::new(RefCell::new(InnerRoom::new(rpc))))
-    }
-
-    pub fn new_handle(&self) -> RoomHandle {
-        RoomHandle(Rc::downgrade(&self.0))
-    }
+    /// Creates new [`Room`] associating it with provided [`RpcClient`].
+    pub fn new(rpc: &Rc<RPCClient>) -> Self {
+        let room = Rc::new(RefCell::new(InnerRoom::new(Rc::clone(&rpc))));
 
-    /// Subscribes to provided RpcTransport messages.
-    pub fn subscribe(&self, rpc: &RPCClient) {
-        let inner = Rc::clone(&self.0);
+        let inner = Rc::clone(&room);
 
         let process_msg_task = rpc
             .subscribe()
@@ -72,6 +66,14 @@ impl Room {
         // Spawns Promise in JS, does not provide any handles, so current way to
         // stop this stream is to drop all connected Senders.
         spawn_local(process_msg_task);
+
+        Self(room)
+    }
+
+    /// Creates new [`RoomHandle`] used by JS side. You can create them as many
+    /// as you need.
+    pub fn new_handle(&self) -> RoomHandle {
+        RoomHandle(Rc::downgrade(&self.0))
     }
 }
 
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 99ad65fb6..519aedea1 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -36,11 +36,12 @@ struct Inner {
     /// WebSocket connection to remote media server.
     sock: Option<Rc<WebSocket>>,
 
-    /// Credentials for authorize on remote media server.
+    /// Credentials used to authorize connection.
     token: String,
 
-    /// Sends ping message to remote media server with specified interval.
     pinger: Pinger,
+
+    /// Event's subscribers list.
     subs: Vec<UnboundedSender<Event>>,
 }
 
@@ -127,6 +128,7 @@ impl RPCClient {
         )
     }
 
+    /// Returns Stream of all Events received by this [`RpcClient`].
     // TODO: proper sub registry
     pub fn subscribe(&self) -> impl Stream<Item = Event, Error = ()> {
         let (tx, rx) = unbounded();
@@ -135,11 +137,13 @@ impl RPCClient {
         rx
     }
 
+    /// Unsubscribe from this [`RpcClient`]. Drops all subscriptions atm.
     // TODO: proper sub registry
     pub fn unsub(&self) {
         self.0.borrow_mut().subs.clear();
     }
 
+    /// Sends Command to Medea.
     // TODO: proper sub registry
     pub fn _send_command(&self, command: Command) {
         let socket_borrow = &self.0.borrow().sock;
diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
index a08c451bf..cbcac1cde 100644
--- a/jason/src/rpc/pinger.rs
+++ b/jason/src/rpc/pinger.rs
@@ -8,7 +8,8 @@ use crate::{
     utils::{window, IntervalHandle, WasmErr},
 };
 
-/// Pinger for periodical tests connection to server by sends ping message.
+/// Responsible for sending/handling keep-alive requests, detecting connection
+/// loss.
 pub struct Pinger(Rc<RefCell<InnerPinger>>);
 
 struct InnerPinger {
@@ -61,7 +62,8 @@ impl Pinger {
         })))
     }
 
-    /// Start [`Pinger`] for give socket.
+    /// Start [`Pinger`] for given [`WebSocket`]. Sends first ping immediately,
+    /// so will fail if provided [`WebSocket`] is not active.
     pub fn start(&self, socket: Rc<WebSocket>) -> Result<(), WasmErr> {
         let mut inner = self.0.borrow_mut();
         inner.socket = Some(socket);
@@ -87,7 +89,7 @@ impl Pinger {
         Ok(())
     }
 
-    /// Store number of pong message.
+    /// Timestamp of last pong received.
     pub fn set_pong_at(&self, at: f64) {
         self.0.borrow_mut().pong_at = Some(at);
     }
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index c1cb65f13..a51c77656 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -69,6 +69,7 @@ impl InnerSocket {
         })
     }
 
+    /// Checks underlying WebSocket state and updates socket_state.
     fn update_state(&mut self) {
         match State::try_from(self.socket.ready_state()) {
             Ok(new_state) => self.socket_state = new_state,
@@ -81,7 +82,8 @@ impl InnerSocket {
 }
 
 impl WebSocket {
-    /// Resolves only if connection succeeded.
+    /// Initiates new WebSocket connection. Resolves only when underlying
+    /// connection becomes active.
     pub fn new(url: &str) -> impl Future<Item = Self, Error = WasmErr> {
         let (tx_close, rx_close) = futures::oneshot();
         let (tx_open, rx_open) = futures::oneshot();
diff --git a/jason/src/utils/errors.rs b/jason/src/utils/errors.rs
index 596069528..06170fd29 100644
--- a/jason/src/utils/errors.rs
+++ b/jason/src/utils/errors.rs
@@ -7,6 +7,7 @@ use std::{
     fmt::{Display, Formatter},
 };
 
+/// Generic application error.
 #[derive(Debug)]
 pub enum WasmErr {
     JsError(JsValue),
diff --git a/jason/src/utils/event_listener.rs b/jason/src/utils/event_listener.rs
index 49352c19b..718dce7b0 100644
--- a/jason/src/utils/event_listener.rs
+++ b/jason/src/utils/event_listener.rs
@@ -6,6 +6,10 @@ use web_sys::EventTarget;
 
 use crate::utils::WasmErr;
 
+/// Wrapper for closure that handles some
+/// [`EventTarget`](https://developer.mozilla.org/ru/docs/Web/API/EventTarget)
+/// event. Implement drop that drops provided closure and unregisters
+/// event handler.
 pub struct EventListener<
     T: Deref<Target = EventTarget>,
     A: FromWasmAbi + 'static,
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index b43d61771..10fb38bf5 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -6,51 +6,19 @@ use web_sys::Window;
 pub use self::errors::WasmErr;
 pub use self::event_listener::EventListener;
 
-pub struct IntervalHandle(pub i32);
-
+/// Returns [`window`] object. Panics if unable to access it.
 pub fn window() -> Window {
     // cannot use lazy_static since window is !Sync
     // safe to unwrap
     web_sys::window().unwrap()
 }
 
+/// Wrapper around interval timer id. Implements Drop that clears interval with
+/// provided id.
+pub struct IntervalHandle(pub i32);
+
 impl Drop for IntervalHandle {
     fn drop(&mut self) {
         window().clear_interval_with_handle(self.0);
     }
 }
-
-// pub fn bind_handler_fn_mut<F, A, R>(
-//    event: &str,
-//    target: &EventTarget,
-//    f: F,
-//) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
-//    where
-//        F: (FnMut(A) -> R) + 'static,
-//        A: FromWasmAbi + 'static,
-//        R: ReturnWasmAbi + 'static,
-//{
-//    let closure = Closure::wrap(Box::new(f) as Box<dyn FnMut(A) -> R>);
-//    target.add_event_listener_with_callback(
-//        event,
-//        closure.as_ref().unchecked_ref(),
-//    )?;
-//    Ok(closure)
-//}
-// pub fn bind_handler_fn_once<F, A, R>(
-//    event: &str,
-//    target: &EventTarget,
-//    f: F,
-//) -> Result<Closure<dyn FnMut(A) -> R>, JsValue>
-//    where
-//        F: (FnOnce(A) -> R) + 'static,
-//        A: FromWasmAbi + 'static,
-//        R: ReturnWasmAbi + 'static,
-//{
-//    let closure: Closure<FnMut(A) -> (R)> = Closure::once(f);
-//    target.add_event_listener_with_callback(
-//        event,
-//        closure.as_ref().unchecked_ref(),
-//    )?;
-//    Ok(closure)
-//}
diff --git a/jason/tests/web.rs b/jason/tests/web.rs
index 250ddd906..72a5ce6ca 100644
--- a/jason/tests/web.rs
+++ b/jason/tests/web.rs
@@ -1,6 +1,5 @@
 #![cfg(target_arch = "wasm32")]
 
-use jason::Jason;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);

From 0f51c6d252436fba70e064d043d5598c8341ce39 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Sun, 12 May 2019 20:27:54 +0300
Subject: [PATCH 170/179] refactor

---
 jason/src/api/room.rs  |  4 ++--
 protocol/src/lib.rs    |  4 ++--
 src/media/mod.rs       |  2 +-
 src/media/peer.rs      | 22 +++++++++++-----------
 src/media/track.rs     |  4 ++--
 src/signalling/room.rs | 10 +++++-----
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 1b049fe93..3e1611290 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -4,7 +4,7 @@ use futures::{
     future::{Future, IntoFuture},
     stream::Stream,
 };
-use protocol::{Directional, Event, IceCandidate};
+use protocol::{Track, Event, IceCandidate};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
@@ -93,7 +93,7 @@ impl InnerRoom {
         &mut self,
         _peer_id: u64,
         _sdp_offer: &Option<String>,
-        _tracks: &[Directional],
+        _tracks: &[Track],
     ) {
         console::log_1(&JsValue::from_str("on_peer_created invoked"));
     }
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs
index ef9fd3bf1..e0c4621fb 100644
--- a/protocol/src/lib.rs
+++ b/protocol/src/lib.rs
@@ -52,7 +52,7 @@ pub enum Event {
     PeerCreated {
         peer_id: u64,
         sdp_offer: Option<String>,
-        tracks: Vec<Directional>,
+        tracks: Vec<Track>,
     },
     /// Media Server notifies Web Client about necessity to apply specified SDP
     /// Answer to Web Client's RTCPeerConnection.
@@ -81,7 +81,7 @@ pub struct IceCandidate {
 /// [`Track] with specified direction.
 #[derive(Deserialize, Serialize)]
 #[cfg_attr(test, derive(PartialEq, Debug))]
-pub struct Directional {
+pub struct Track {
     pub id: u64,
     pub direction: Direction,
     pub media_type: MediaType,
diff --git a/src/media/mod.rs b/src/media/mod.rs
index ed48bf622..3d7e8a4df 100644
--- a/src/media/mod.rs
+++ b/src/media/mod.rs
@@ -7,5 +7,5 @@ pub use self::{
         create_peers, Id as PeerId, New, Peer, PeerStateError,
         PeerStateMachine, WaitLocalHaveRemote, WaitLocalSdp, WaitRemoteSdp,
     },
-    track::{Id as TrackId, Track},
+    track::{Id as TrackId, MediaTrack},
 };
diff --git a/src/media/peer.rs b/src/media/peer.rs
index 3bb7f0191..eca076538 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -6,14 +6,14 @@
 use failure::Fail;
 use hashbrown::HashMap;
 use protocol::{
-    AudioSettings, Direction, Directional, MediaType, VideoSettings,
+    AudioSettings, Direction, Track, MediaType, VideoSettings,
 };
 
 use std::{convert::TryFrom, fmt::Display, sync::Arc};
 
 use crate::{
     api::control::MemberId,
-    media::{Track, TrackId},
+    media::{MediaTrack, TrackId},
 };
 
 /// Newly initialized [`Peer`] ready to signalling.
@@ -192,8 +192,8 @@ pub struct Context {
     partner_member: MemberId,
     sdp_offer: Option<String>,
     sdp_answer: Option<String>,
-    receivers: HashMap<TrackId, Arc<Track>>,
-    senders: HashMap<TrackId, Arc<Track>>,
+    receivers: HashMap<TrackId, Arc<MediaTrack>>,
+    senders: HashMap<TrackId, Arc<MediaTrack>>,
 }
 
 /// [`RTCPeerConnection`] representation.
@@ -225,11 +225,11 @@ impl<T> Peer<T> {
     }
 
     /// Returns [`Track`]'s of [`Peer`].
-    pub fn tracks(&self) -> Vec<Directional> {
+    pub fn tracks(&self) -> Vec<Track> {
         let tracks = self.context.senders.iter().fold(
             vec![],
             |mut tracks, (_, track)| {
-                tracks.push(Directional {
+                tracks.push(Track {
                     id: track.id,
                     media_type: track.media_type.clone(),
                     direction: Direction::Send {
@@ -243,7 +243,7 @@ impl<T> Peer<T> {
             .receivers
             .iter()
             .fold(tracks, |mut tracks, (_, track)| {
-                tracks.push(Directional {
+                tracks.push(Track {
                     id: track.id,
                     media_type: track.media_type.clone(),
                     direction: Direction::Recv {
@@ -305,12 +305,12 @@ impl Peer<New> {
     }
 
     /// Add [`Track`] to [`Peer`] for send.
-    pub fn add_sender(&mut self, track: Arc<Track>) {
+    pub fn add_sender(&mut self, track: Arc<MediaTrack>) {
         self.context.senders.insert(track.id, track);
     }
 
     /// Add [`Track`] to [`Peer`] for receive.
-    pub fn add_receiver(&mut self, track: Arc<Track>) {
+    pub fn add_receiver(&mut self, track: Arc<MediaTrack>) {
         self.context.receivers.insert(track.id, track);
     }
 }
@@ -364,9 +364,9 @@ pub fn create_peers(
         Peer::new(responder_peer_id, responder, caller_peer_id, caller_peer_id);
 
     let track_audio =
-        Arc::new(Track::new(1, MediaType::Audio(AudioSettings {})));
+        Arc::new(MediaTrack::new(1, MediaType::Audio(AudioSettings {})));
     let track_video =
-        Arc::new(Track::new(2, MediaType::Video(VideoSettings {})));
+        Arc::new(MediaTrack::new(2, MediaType::Video(VideoSettings {})));
     caller_peer.add_sender(track_audio.clone());
     caller_peer.add_sender(track_video.clone());
     responder_peer.add_receiver(track_audio);
diff --git a/src/media/track.rs b/src/media/track.rs
index 5604423ff..ad0eb6c76 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -9,12 +9,12 @@ pub type Id = u64;
 
 /// [`MediaStreamTrack`] representation.
 #[derive(Debug)]
-pub struct Track {
+pub struct MediaTrack {
     pub id: Id,
     pub media_type: MediaType,
 }
 
-impl Track {
+impl MediaTrack {
     /// Creates new [`Track`] of the specified type.
     pub fn new(id: Id, media_type: MediaType) -> Self {
         Self { id, media_type }
diff --git a/src/signalling/room.rs b/src/signalling/room.rs
index 0ebb5d187..d93a09d45 100644
--- a/src/signalling/room.rs
+++ b/src/signalling/room.rs
@@ -416,7 +416,7 @@ mod test {
 
     use actix::{Addr, Arbiter, System};
     use protocol::{
-        AudioSettings, Direction, Directional, MediaType, VideoSettings,
+        AudioSettings, Direction, Track, MediaType, VideoSettings,
     };
 
     use super::*;
@@ -469,12 +469,12 @@ mod test {
                     peer_id: 1,
                     sdp_offer: None,
                     tracks: vec![
-                        Directional {
+                        Track {
                             id: 1,
                             direction: Direction::Send { receivers: vec![2] },
                             media_type: MediaType::Audio(AudioSettings {}),
                         },
-                        Directional {
+                        Track {
                             id: 2,
                             direction: Direction::Send { receivers: vec![2] },
                             media_type: MediaType::Video(VideoSettings {}),
@@ -506,12 +506,12 @@ mod test {
                     peer_id: 2,
                     sdp_offer: Some("caller_offer".into()),
                     tracks: vec![
-                        Directional {
+                        Track {
                             id: 1,
                             direction: Direction::Recv { sender: 1 },
                             media_type: MediaType::Audio(AudioSettings {}),
                         },
-                        Directional {
+                        Track {
                             id: 2,
                             direction: Direction::Recv { sender: 1 },
                             media_type: MediaType::Video(VideoSettings {}),

From dfa246787a800aef7d9bcf4287243fe2c9b3edc7 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Mon, 13 May 2019 14:02:50 +0300
Subject: [PATCH 171/179] refactor

---
 jason/src/api/room.rs  |  2 +-
 jason/src/rpc/mod.rs   | 77 ++++++++++++++++++++----------------------
 src/media/peer.rs      |  4 +--
 src/media/track.rs     |  1 +
 src/signalling/room.rs |  4 +--
 5 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 3e1611290..973fa51bb 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -4,7 +4,7 @@ use futures::{
     future::{Future, IntoFuture},
     stream::Stream,
 };
-use protocol::{Track, Event, IceCandidate};
+use protocol::{Event, IceCandidate, Track};
 use wasm_bindgen::{prelude::*, JsValue};
 use wasm_bindgen_futures::spawn_local;
 use web_sys::console;
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index 519aedea1..334ca57de 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -56,49 +56,43 @@ impl Inner {
     }
 }
 
-/// Returns handler for bind on close WebSocket connection.
-fn on_close(inner_rc: Rc<RefCell<Inner>>) -> Box<FnOnce(CloseMsg)> {
-    Box::new(move |msg: CloseMsg| {
-        let mut inner = inner_rc.borrow_mut();
-        inner.sock.take();
-        inner.pinger.stop();
-
-        // TODO: reconnect on disconnect, propagate error if unable
-        //       to reconnect
-        match msg {
-            CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {}
-        }
-    })
+/// Handles close messsage from remote server.
+fn on_close(inner_rc: &Rc<RefCell<Inner>>, close_msg: CloseMsg) {
+    let mut inner = inner_rc.borrow_mut();
+    inner.sock.take();
+    inner.pinger.stop();
+
+    // TODO: reconnect on disconnect, propagate error if unable
+    //       to reconnect
+    match close_msg {
+        CloseMsg::Normal(_msg) | CloseMsg::Disconnect(_msg) => {}
+    }
 }
 
-/// Returns handler for bind on receive server message.
-fn on_message(
-    inner_rc: Rc<RefCell<Inner>>,
-) -> Box<FnMut(Result<ServerMsg, WasmErr>)> {
-    Box::new(move |msg: Result<ServerMsg, WasmErr>| {
-        let inner = inner_rc.borrow();
-        match msg {
-            Ok(ServerMsg::Pong(_num)) => {
-                // TODO: detect no pings
-                inner.pinger.set_pong_at(Date::now());
-            }
-            Ok(ServerMsg::Event(event)) => {
-                // TODO: many subs, filter messages by session
-                if let Some(sub) = inner.subs.iter().next() {
-                    if let Err(err) = sub.unbounded_send(event) {
-                        // TODO: receiver is gone, should delete
-                        //       this subs tx
-                        WasmErr::from(err).log_err();
-                    }
+/// Handles messages from remote server.
+fn on_message(inner_rc: &Rc<RefCell<Inner>>, msg: Result<ServerMsg, WasmErr>) {
+    let inner = inner_rc.borrow();
+    match msg {
+        Ok(ServerMsg::Pong(_num)) => {
+            // TODO: detect no pings
+            inner.pinger.set_pong_at(Date::now());
+        }
+        Ok(ServerMsg::Event(event)) => {
+            // TODO: many subs, filter messages by session
+            if let Some(sub) = inner.subs.iter().next() {
+                if let Err(err) = sub.unbounded_send(event) {
+                    // TODO: receiver is gone, should delete
+                    //       this subs tx
+                    WasmErr::from(err).log_err();
                 }
             }
-            Err(err) => {
-                // TODO: protocol versions mismatch? should drop
-                //       connection if so
-                err.log_err();
-            }
         }
-    })
+        Err(err) => {
+            // TODO: protocol versions mismatch? should drop
+            //       connection if so
+            err.log_err();
+        }
+    }
 }
 
 impl RPCClient {
@@ -117,10 +111,13 @@ impl RPCClient {
                 inner.borrow_mut().pinger.start(Rc::clone(&socket))?;
 
                 let inner_rc = Rc::clone(&inner);
-                socket.on_message(on_message(inner_rc))?;
+                socket.on_message(move |msg: Result<ServerMsg, WasmErr>| {
+                    on_message(&inner_rc, msg)
+                })?;
 
                 let inner_rc = Rc::clone(&inner);
-                socket.on_close(on_close(inner_rc))?;
+                socket
+                    .on_close(move |msg: CloseMsg| on_close(&inner_rc, msg))?;
 
                 inner.borrow_mut().sock.replace(socket);
                 Ok(())
diff --git a/src/media/peer.rs b/src/media/peer.rs
index eca076538..9b76293b2 100644
--- a/src/media/peer.rs
+++ b/src/media/peer.rs
@@ -5,9 +5,7 @@
 #![allow(clippy::use_self)]
 use failure::Fail;
 use hashbrown::HashMap;
-use protocol::{
-    AudioSettings, Direction, Track, MediaType, VideoSettings,
-};
+use protocol::{AudioSettings, Direction, MediaType, Track, VideoSettings};
 
 use std::{convert::TryFrom, fmt::Display, sync::Arc};
 
diff --git a/src/media/track.rs b/src/media/track.rs
index ad0eb6c76..8b5795cb5 100644
--- a/src/media/track.rs
+++ b/src/media/track.rs
@@ -9,6 +9,7 @@ pub type Id = u64;
 
 /// [`MediaStreamTrack`] representation.
 #[derive(Debug)]
+#[allow(clippy::module_name_repetitions)]
 pub struct MediaTrack {
     pub id: Id,
     pub media_type: MediaType,
diff --git a/src/signalling/room.rs b/src/signalling/room.rs
index d93a09d45..dfec9b5c6 100644
--- a/src/signalling/room.rs
+++ b/src/signalling/room.rs
@@ -415,9 +415,7 @@ mod test {
     use std::sync::{atomic::AtomicUsize, Arc, Mutex};
 
     use actix::{Addr, Arbiter, System};
-    use protocol::{
-        AudioSettings, Direction, Track, MediaType, VideoSettings,
-    };
+    use protocol::{AudioSettings, Direction, MediaType, Track, VideoSettings};
 
     use super::*;
     use crate::media::create_peers;

From ff29c0039120842e90ba334fb3a26286d7748b25 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 14 May 2019 13:49:09 +0300
Subject: [PATCH 172/179] Add features for protocol package

---
 Cargo.toml          |  2 +-
 jason/Cargo.toml    |  2 +-
 protocol/Cargo.toml |  5 +++++
 protocol/src/lib.rs | 34 ++++++++++++++++++++++++----------
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 376a806fa..12b7382c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,7 @@ hashbrown = "0.1"
 humantime = "1.2"
 macro-attr = "0.2"
 newtype_derive = "0.1"
-protocol = { path = "protocol" }
+protocol = { path = "protocol", features = ['medea'] }
 serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
 slog = "2.4"
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 849004750..9e185ff78 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -23,7 +23,7 @@ futures = "0.1"
 js-sys = "0.3"
 macro-attr = "0.2"
 newtype_derive = "0.1"
-protocol = { path = "../protocol" }
+protocol = { path = "../protocol", features = ['jason'] }
 serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
 wasm-bindgen = { version = "0.2", features = ['serde-serialize'] }
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index f0833f5b8..7fdf1c700 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -7,6 +7,11 @@ homepage = "https://github.com/instrumentisto/medea"
 readme = "README.md"
 repository = "https://github.com/instrumentisto/medea"
 
+[features]
+default = ["jason", "medea"]
+jason = []
+medea = []
+
 [dependencies]
 serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
diff --git a/protocol/src/lib.rs b/protocol/src/lib.rs
index e0c4621fb..a350a0b4a 100644
--- a/protocol/src/lib.rs
+++ b/protocol/src/lib.rs
@@ -25,9 +25,10 @@ pub enum ClientMsg {
 }
 
 /// WebSocket message from Web Client to Media Server.
-#[derive(Deserialize, Serialize)]
-#[serde(tag = "command", content = "data")]
 #[cfg_attr(test, derive(PartialEq, Debug))]
+#[cfg_attr(feature = "medea", derive(Deserialize))]
+#[cfg_attr(feature = "jason", derive(Serialize))]
+#[serde(tag = "command", content = "data")]
 #[allow(dead_code)]
 pub enum Command {
     /// Web Client sends SDP Offer.
@@ -42,9 +43,10 @@ pub enum Command {
 }
 
 /// WebSocket message from Medea to Jason.
-#[derive(Deserialize, Serialize)]
-#[serde(tag = "event", content = "data")]
+#[cfg_attr(feature = "medea", derive(Serialize))]
+#[cfg_attr(feature = "jason", derive(Deserialize))]
 #[cfg_attr(test, derive(PartialEq, Debug))]
+#[serde(tag = "event", content = "data")]
 #[allow(dead_code)]
 pub enum Event {
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
@@ -71,7 +73,7 @@ pub enum Event {
 }
 
 /// Represents [`RtcIceCandidateInit`] object.
-#[derive(Deserialize, Serialize, Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
 pub struct IceCandidate {
     pub candidate: String,
     pub sdp_m_line_index: Option<u16>,
@@ -79,7 +81,8 @@ pub struct IceCandidate {
 }
 
 /// [`Track] with specified direction.
-#[derive(Deserialize, Serialize)]
+#[cfg_attr(feature = "medea", derive(Serialize))]
+#[cfg_attr(feature = "jason", derive(Deserialize))]
 #[cfg_attr(test, derive(PartialEq, Debug))]
 pub struct Track {
     pub id: u64,
@@ -88,7 +91,8 @@ pub struct Track {
 }
 
 /// Direction of [`Track`].
-#[derive(Deserialize, Serialize)]
+#[cfg_attr(feature = "medea", derive(Serialize))]
+#[cfg_attr(feature = "jason", derive(Deserialize))]
 #[cfg_attr(test, derive(PartialEq, Debug))]
 pub enum Direction {
     Send { receivers: Vec<u64> },
@@ -96,21 +100,28 @@ pub enum Direction {
 }
 
 /// Type of [`Track`].
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "medea", derive(Serialize))]
+#[cfg_attr(feature = "jason", derive(Deserialize))]
 #[cfg_attr(test, derive(PartialEq))]
 pub enum MediaType {
     Audio(AudioSettings),
     Video(VideoSettings),
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "medea", derive(Serialize))]
+#[cfg_attr(feature = "jason", derive(Deserialize))]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct AudioSettings {}
 
-#[derive(Clone, Debug, Deserialize, Serialize)]
+#[derive(Clone, Debug)]
+#[cfg_attr(feature = "medea", derive(Serialize))]
+#[cfg_attr(feature = "jason", derive(Deserialize))]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct VideoSettings {}
 
+#[cfg(feature = "jason")]
 impl Serialize for ClientMsg {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -129,6 +140,7 @@ impl Serialize for ClientMsg {
     }
 }
 
+#[cfg(feature = "medea")]
 impl<'de> Deserialize<'de> for ClientMsg {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -163,6 +175,7 @@ impl<'de> Deserialize<'de> for ClientMsg {
     }
 }
 
+#[cfg(feature = "medea")]
 impl Serialize for ServerMsg {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -181,6 +194,7 @@ impl Serialize for ServerMsg {
     }
 }
 
+#[cfg(feature = "jason")]
 impl<'de> Deserialize<'de> for ServerMsg {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where

From 2c494de4dccdafa4813f329d8d5c01c93c817339 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Thu, 16 May 2019 15:00:14 +0300
Subject: [PATCH 173/179] Add webpack config for production

- add build script to Makefile
---
 Makefile                                      | 33 ++++++++++++++++++-
 jason/Cargo.toml                              |  1 +
 jason/e2e-demo/package.json                   |  4 +--
 .../{webpack.config.js => webpack.dev.js}     |  8 ++---
 jason/e2e-demo/webpack.prod.js                | 24 ++++++++++++++
 5 files changed, 63 insertions(+), 7 deletions(-)
 rename jason/e2e-demo/{webpack.config.js => webpack.dev.js} (76%)
 create mode 100644 jason/e2e-demo/webpack.prod.js

diff --git a/Makefile b/Makefile
index b43ba3f80..5c6512d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,8 @@ eq = $(if $(or $(1),$(2)),$(and $(findstring $(1),$(2)),\
 # Aliases #
 ###########
 
+build: build.jason
+
 # Resolve all project dependencies.
 #
 # Usage:
@@ -46,6 +48,33 @@ test: test.unit
 
 
 
+##################
+# Build commands #
+##################
+
+# Build Jason E2E demo in production mode.
+#
+# Usage:
+#	make build.jason
+
+build.jason:
+	npm run build --prefix=jason/e2e-demo
+	@make opt.jason
+
+
+# Optimize wasm binary.
+#
+# Usage:
+#	make opt.wasm [filename=(|<wasm-file>)]
+
+wasm-file = $(if $(call eq,$(filename),),$(shell find jason/e2e-demo/dist -name '*.module.wasm'),$(filename))
+
+opt.jason:
+	wasm-opt $(wasm-file) -o $(wasm-file)
+
+
+
+
 ##################
 # Cargo commands #
 ##################
@@ -172,8 +201,10 @@ up.medea:
 # .PHONY section #
 ##################
 
-.PHONY: cargo cargo.fmt cargo.lint \
+.PHONY: build build.jason \
+        cargo cargo.fmt cargo.lint \
         docs docs.rust \
+        opt.jason \
         test test.unit \
         up up.jason up.medea \
         yarn
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 9e185ff78..c2b99a948 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -12,6 +12,7 @@ repository = "https://github.com/instrumentisto/medea"
 crate-type = ["cdylib", "rlib"]
 
 [profile.release]
+lto = true
 opt-level = "s"  # Tell `rustc` to optimize for small code size.
 
 [features]
diff --git a/jason/e2e-demo/package.json b/jason/e2e-demo/package.json
index 162053284..61e639f47 100644
--- a/jason/e2e-demo/package.json
+++ b/jason/e2e-demo/package.json
@@ -2,8 +2,8 @@
   "name": "jason-e2e-demo",
   "private": true,
   "scripts": {
-    "start": "webpack-dev-server -d --open --port 8081",
-    "build": "webpack"
+    "start": "webpack-dev-server -d --config webpack.dev.js --open --port 8081",
+    "build": "webpack --config webpack.prod.js"
   },
   "devDependencies": {
     "@wasm-tool/wasm-pack-plugin": "^0.2",
diff --git a/jason/e2e-demo/webpack.config.js b/jason/e2e-demo/webpack.dev.js
similarity index 76%
rename from jason/e2e-demo/webpack.config.js
rename to jason/e2e-demo/webpack.dev.js
index e1fba5db1..dedf248c3 100644
--- a/jason/e2e-demo/webpack.config.js
+++ b/jason/e2e-demo/webpack.dev.js
@@ -6,13 +6,14 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
 const dist = path.resolve(__dirname, "dist");
 
 module.exports = {
+  mode: 'development',
   entry: "./js/index.js",
   output: {
     path: dist,
     filename: "bundle.js"
   },
   devServer: {
-    contentBase: dist,
+    contentBase: dist
   },
   plugins: [
     new HtmlWebpackPlugin({
@@ -20,8 +21,7 @@ module.exports = {
     }),
     new WasmPackPlugin({
       crateDirectory: path.resolve(__dirname, '../'),
-      // WasmPackPlugin defaults to compiling in "dev" profile.
-      // To change that, use `forceMode: 'release'`.
-    }),
+      forceMode: 'development'
+    })
   ]
 };
diff --git a/jason/e2e-demo/webpack.prod.js b/jason/e2e-demo/webpack.prod.js
new file mode 100644
index 000000000..5032eb0d8
--- /dev/null
+++ b/jason/e2e-demo/webpack.prod.js
@@ -0,0 +1,24 @@
+const path = require("path");
+
+const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
+const HtmlWebpackPlugin = require("html-webpack-plugin");
+
+const dist = path.resolve(__dirname, "dist");
+
+module.exports = {
+  mode: 'production',
+  entry: "./js/index.js",
+  output: {
+    path: dist,
+    filename: "bundle.js"
+  },
+  plugins: [
+    new HtmlWebpackPlugin({
+      template: 'index.html'
+    }),
+    new WasmPackPlugin({
+      crateDirectory: path.resolve(__dirname, '../'),
+      forceMode: 'production'
+    })
+  ]
+};

From a19202bb0880b1907dd34c2b697d014a1b672166 Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 21 May 2019 15:01:14 +0300
Subject: [PATCH 174/179] Remove impl TryFrom<MessageEvent> for ServerMsg

---
 Cargo.lock                 |  3 +--
 Cargo.toml                 |  5 +++--
 Makefile                   |  9 +++++----
 jason/Cargo.toml           |  7 +------
 jason/src/lib.rs           | 38 ++++++++++++++++++++------------------
 jason/src/rpc/websocket.rs | 25 ++-----------------------
 6 files changed, 32 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ca5572dc..88ef218c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -722,11 +722,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "jason"
 version = "0.1.0-dev"
 dependencies = [
+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "newtype_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "protocol 0.1.0",
  "serde 1.0.90 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/Cargo.toml b/Cargo.toml
index 12b7382c0..07ee3e4d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,8 +15,9 @@ members = [
     "protocol",
 ]
 
-[profile.release]
-lto = "thin"
+#[profile.release]
+#lto = true
+#opt-level = "z"  # Tell `rustc` to optimize for small code size.
 
 [dependencies]
 actix = "0.7"
diff --git a/Makefile b/Makefile
index 5c6512d1a..ddf6e343a 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ test: test.unit
 #	make build.jason
 
 build.jason:
+	@rm -rf jason/e2e-demo/dist/
 	npm run build --prefix=jason/e2e-demo
 	@make opt.jason
 
@@ -65,12 +66,12 @@ build.jason:
 # Optimize wasm binary.
 #
 # Usage:
-#	make opt.wasm [filename=(|<wasm-file>)]
+#	make opt.wasm [file=(|<wasm-file>)]
 
-wasm-file = $(if $(call eq,$(filename),),$(shell find jason/e2e-demo/dist -name '*.module.wasm'),$(filename))
+wasm-file = $(if $(call eq,$(file),),$(shell find jason/e2e-demo/dist -name '*.module.wasm'),$(file))
 
 opt.jason:
-	wasm-opt $(wasm-file) -o $(wasm-file)
+	wasm-opt $(wasm-file) -Os -d -o $(wasm-file)
 
 
 
@@ -207,5 +208,5 @@ up.medea:
         opt.jason \
         test test.unit \
         up up.jason up.medea \
-        yarn
+        yarn wasm2wat
 
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index c2b99a948..ce7a28baa 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -11,19 +11,14 @@ repository = "https://github.com/instrumentisto/medea"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-lto = true
-opt-level = "s"  # Tell `rustc` to optimize for small code size.
-
 [features]
 default = ["console_error_panic_hook", "wee_alloc"]
 
 [dependencies]
+cfg-if = "0.1"
 console_error_panic_hook = { version = "0.1", optional = true }
 futures = "0.1"
 js-sys = "0.3"
-macro-attr = "0.2"
-newtype_derive = "0.1"
 protocol = { path = "../protocol", features = ['jason'] }
 serde = { version = "1.0", features = ['derive'] }
 serde_json = "1.0"
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index b813b3719..6bcd500b5 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,26 +1,28 @@
-#[macro_use]
-extern crate macro_attr;
-#[macro_use]
-extern crate newtype_derive;
+use cfg_if::cfg_if;
 
 mod api;
 mod rpc;
 mod utils;
 
-// When the `console_error_panic_hook` feature is enabled, we can call the
-// `set_panic_hook` function at least once during initialization, and then
-// we will get better error messages if our code ever panics.
-//
-// For more details see:
-// https://github.com/rustwasm/console_error_panic_hook#readme
-#[cfg(feature = "console_error_panic_hook")]
-pub use console_error_panic_hook::set_once as set_panic_hook;
-
 pub use self::api::Jason;
 pub use self::api::RoomHandle;
 
-// When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-// allocator.
-#[cfg(feature = "wee_alloc")]
-#[global_allocator]
-static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+cfg_if! {
+    // When the `console_error_panic_hook` feature is enabled, we can call the
+    // `set_panic_hook` function to get better error messages if we ever panic.
+    if #[cfg(feature = "console_error_panic_hook")] {
+        pub use console_error_panic_hook::set_once as set_panic_hook;
+    } else {
+        #[inline]
+        pub fn set_panic_hook() {}
+    }
+}
+
+cfg_if! {
+    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
+    // allocator.
+    if #[cfg(feature = "wee_alloc")] {
+        #[global_allocator]
+        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
+    }
+}
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index a51c77656..0ba6dd38a 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -143,10 +143,9 @@ impl WebSocket {
         inner_mut.on_message = Some(EventListener::new_mut(
             Rc::clone(&inner_mut.socket),
             "message",
-            move |msg| {
+            move |msg: MessageEvent| {
                 let parsed =
-                    ServerMessage::try_from(&msg).map(std::convert::Into::into);
-
+                    msg.data().into_serde::<ServerMsg>().map_err(WasmErr::from);
                 f(parsed);
             },
         )?);
@@ -216,23 +215,3 @@ impl From<&CloseEvent> for CloseMsg {
         }
     }
 }
-
-macro_attr! {
-    #[derive(NewtypeFrom!)]
-    pub struct ServerMessage(ServerMsg);
-}
-
-impl TryFrom<&MessageEvent> for ServerMessage {
-    type Error = WasmErr;
-
-    fn try_from(msg: &MessageEvent) -> Result<Self, Self::Error> {
-        let payload = msg
-            .data()
-            .as_string()
-            .ok_or_else(|| WasmErr::from_str("Payload is not string"))?;
-
-        serde_json::from_str::<ServerMsg>(&payload)
-            .map_err(WasmErr::from)
-            .map(Self::from)
-    }
-}

From ad55aa39d2203805c7cd96e5502118d5a9f86d8d Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 21 May 2019 17:01:15 +0300
Subject: [PATCH 175/179] Remove wee_alloc feature and lto

---
 Cargo.toml       | 1 -
 jason/Cargo.toml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index bc705cb1c..22acfbaf4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,6 @@ members = [
 ]
 
 [profile.release]
-lto = true
 opt-level = "s"  # Tell `rustc` to optimize for small code size.
 
 [dependencies]
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 47f8d896c..00a92a978 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -12,7 +12,7 @@ repository = "https://github.com/instrumentisto/medea"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = ["console_error_panic_hook", "wee_alloc"]
+default = ["console_error_panic_hook"]
 
 [dependencies]
 cfg-if = "0.1"

From ab6ed6dac06b7501ce577d4db554f72fc50cee9d Mon Sep 17 00:00:00 2001
From: Kirguir <a.shutiy@gmail.com>
Date: Tue, 21 May 2019 17:12:41 +0300
Subject: [PATCH 176/179] Remove obsolete code

---
 jason/src/rpc/pinger.rs | 101 ----------------------------------------
 1 file changed, 101 deletions(-)
 delete mode 100644 jason/src/rpc/pinger.rs

diff --git a/jason/src/rpc/pinger.rs b/jason/src/rpc/pinger.rs
deleted file mode 100644
index cbcac1cde..000000000
--- a/jason/src/rpc/pinger.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use protocol::ClientMsg;
-use wasm_bindgen::{prelude::*, JsCast};
-
-use std::{cell::RefCell, rc::Rc};
-
-use crate::{
-    rpc::websocket::WebSocket,
-    utils::{window, IntervalHandle, WasmErr},
-};
-
-/// Responsible for sending/handling keep-alive requests, detecting connection
-/// loss.
-pub struct Pinger(Rc<RefCell<InnerPinger>>);
-
-struct InnerPinger {
-    /// Interval for send ping message.
-    ping_interval: i32,
-
-    /// Count of ping message sending to server.
-    num: u64,
-
-    /// Count of pong message received from server.
-    pong_at: Option<f64>,
-
-    /// Socket to server.
-    socket: Option<Rc<WebSocket>>,
-
-    /// Handler for bind closure what run when ping send.
-    ping_task: Option<PingTaskHandler>,
-}
-
-impl InnerPinger {
-    /// Send ping message into socket.
-    /// Returns error no open socket.
-    fn send_now(&mut self) -> Result<(), WasmErr> {
-        match self.socket.as_ref() {
-            None => Err(WasmErr::from_str("Unable to ping: no socket")),
-            Some(socket) => {
-                self.num += 1;
-                socket.send(&ClientMsg::Ping(self.num))
-            }
-        }
-    }
-}
-
-/// Handler for bind closure what run when ping send.
-struct PingTaskHandler {
-    _ping_closure: Closure<dyn FnMut()>,
-    _interval_handler: IntervalHandle,
-}
-
-impl Pinger {
-    /// Returns new instance of [`Pinger`] with given interval for ping in
-    /// seconds.
-    pub fn new(ping_interval: i32) -> Self {
-        Self(Rc::new(RefCell::new(InnerPinger {
-            ping_interval,
-            num: 0,
-            pong_at: None,
-            socket: None,
-            ping_task: None,
-        })))
-    }
-
-    /// Start [`Pinger`] for given [`WebSocket`]. Sends first ping immediately,
-    /// so will fail if provided [`WebSocket`] is not active.
-    pub fn start(&self, socket: Rc<WebSocket>) -> Result<(), WasmErr> {
-        let mut inner = self.0.borrow_mut();
-        inner.socket = Some(socket);
-        inner.send_now()?;
-
-        let inner_rc = Rc::clone(&self.0);
-        let do_ping = Closure::wrap(Box::new(move || {
-            // its_ok if ping fails few times
-            let _ = inner_rc.borrow_mut().send_now();
-        }) as Box<dyn FnMut()>);
-
-        let interval_id = window()
-            .set_interval_with_callback_and_timeout_and_arguments_0(
-                do_ping.as_ref().unchecked_ref(),
-                inner.ping_interval,
-            )?;
-
-        inner.ping_task = Some(PingTaskHandler {
-            _ping_closure: do_ping,
-            _interval_handler: IntervalHandle(interval_id),
-        });
-
-        Ok(())
-    }
-
-    /// Timestamp of last pong received.
-    pub fn set_pong_at(&self, at: f64) {
-        self.0.borrow_mut().pong_at = Some(at);
-    }
-
-    /// Stop [`Pinger`].
-    pub fn stop(&self) {
-        self.0.borrow_mut().ping_task.take();
-    }
-}

From 019e19e5d87a2bc407b2d74deea3b28169416bcc Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Jul 2019 20:38:55 +0300
Subject: [PATCH 177/179] update deps locks

---
 Cargo.lock | 941 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 494 insertions(+), 447 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 208434b44..d3ff1f875 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,7 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -14,21 +14,21 @@ name = "actix"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "actix-http 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (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-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -41,8 +41,8 @@ version = "0.1.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.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.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)",
 ]
@@ -54,12 +54,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "trust-dns-resolver 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -67,7 +67,7 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -75,34 +75,34 @@ dependencies = [
  "actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.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)",
- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "copyless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "h2 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -119,20 +119,20 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-server 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "awc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "awc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -148,21 +148,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "string 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "actix-rt"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -172,14 +172,14 @@ name = "actix-server"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (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-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -193,7 +193,7 @@ name = "actix-server-config"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -203,7 +203,7 @@ name = "actix-service"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -212,57 +212,57 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "actix-utils"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "actix-web"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-http 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-server 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "awc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "awc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -270,15 +270,15 @@ dependencies = [
 
 [[package]]
 name = "actix-web-actors"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-http 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 1.0.3 (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.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -286,8 +286,8 @@ name = "actix-web-codegen"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -296,8 +296,8 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -315,10 +315,10 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -337,7 +337,7 @@ dependencies = [
 
 [[package]]
 name = "arrayvec"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -345,7 +345,7 @@ dependencies = [
 
 [[package]]
 name = "ascii"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -353,8 +353,8 @@ name = "atty"
 version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -365,45 +365,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "awc"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-http 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "derive_more 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "backtrace"
-version = "0.3.30"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "backtrace-sys"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -411,7 +410,7 @@ name = "base64"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -419,8 +418,8 @@ name = "bb8"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -430,14 +429,14 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bb8 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "redis 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "bitflags"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -445,7 +444,7 @@ name = "blake2-rfc"
 version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -455,7 +454,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -464,22 +463,17 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "build_const"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "bumpalo"
-version = "2.4.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "byteorder"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -487,10 +481,19 @@ name = "bytes"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "c2-chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cc"
 version = "1.0.37"
@@ -503,9 +506,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "chrono"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "libc 0.2.59 (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)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -516,7 +520,7 @@ name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -524,10 +528,10 @@ name = "combine"
 version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "ascii 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ascii 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -539,9 +543,9 @@ dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -552,7 +556,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -562,16 +566,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "copyless"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "crc"
-version = "1.8.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "crc32fast"
@@ -597,7 +593,7 @@ dependencies = [
  "crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (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.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -607,7 +603,7 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -633,7 +629,7 @@ name = "crossbeam-epoch"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -664,9 +660,9 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -676,10 +672,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -687,7 +683,7 @@ name = "dirs"
 version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -699,7 +695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -769,25 +765,33 @@ name = "encoding_index_tests"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "enum-as-inner"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "env_logger"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -796,7 +800,7 @@ name = "failure"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -806,20 +810,20 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide_c_api 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -837,7 +841,7 @@ name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -848,7 +852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "futures"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -856,20 +860,29 @@ name = "gcc"
 version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "getrandom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "h2"
-version = "0.1.23"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.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)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "string 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -878,7 +891,7 @@ name = "hashbrown"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -905,7 +918,7 @@ name = "hostname"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -921,7 +934,7 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.3.3"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -952,7 +965,7 @@ name = "iovec"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -967,17 +980,6 @@ dependencies = [
  "winreg 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "isatty"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "itoa"
 version = "0.4.4"
@@ -987,27 +989,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "jason"
 version = "0.1.0-dev"
 dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "medea-client-api-proto 0.1.0-dev",
- "newtype_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "web-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "wee_alloc 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "wasm-bindgen 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1033,10 +1034,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "lazy_static"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "libc"
-version = "0.2.58"
+version = "0.2.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1075,12 +1079,12 @@ name = "log"
 version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1109,17 +1113,17 @@ name = "medea"
 version = "0.1.0-dev"
 dependencies = [
  "actix 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-http 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "actix-http-test 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "actix-web-actors 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "actix-web-actors 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bb8 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bb8-redis 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "config 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "dotenv 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1129,19 +1133,19 @@ dependencies = [
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "redis 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smart-default 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1150,8 +1154,8 @@ name = "medea-client-api-proto"
 version = "0.1.0-dev"
 dependencies = [
  "medea-macro 0.1.0-dev",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1160,8 +1164,8 @@ version = "0.1.0-dev"
 dependencies = [
  "Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1169,12 +1173,12 @@ name = "memchr"
 version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1201,12 +1205,12 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1214,13 +1218,13 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide_c_api"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1232,8 +1236,8 @@ dependencies = [
  "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (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.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1246,7 +1250,7 @@ version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1267,7 +1271,7 @@ version = "0.2.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1289,7 +1293,7 @@ name = "nom"
 version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "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)",
 ]
 
@@ -1320,10 +1324,10 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.10.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1363,10 +1367,10 @@ name = "parking_lot_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (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.9 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1377,11 +1381,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (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.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.54 (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.9 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1390,6 +1394,11 @@ name = "percent-encoding"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -1405,7 +1414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "quote"
-version = "0.6.12"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1416,7 +1425,7 @@ name = "rand"
 version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1426,7 +1435,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1438,7 +1447,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (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.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1450,6 +1459,18 @@ dependencies = [
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.0 (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_chacha"
 version = "0.1.1"
@@ -1459,6 +1480,16 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.3.1"
@@ -1472,6 +1503,14 @@ name = "rand_core"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "rand_core"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
@@ -1480,6 +1519,14 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -1493,7 +1540,7 @@ name = "rand_jitter"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1505,7 +1552,7 @@ 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.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1543,10 +1590,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "combine 3.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (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-executor 0.1.7 (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-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1554,7 +1601,7 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.54"
+version = "0.1.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1562,7 +1609,7 @@ name = "redox_termios"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1573,7 +1620,7 @@ dependencies = [
  "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1590,14 +1637,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.1.6"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1607,7 +1654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1628,7 +1675,7 @@ version = "0.2.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1667,7 +1714,7 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "0.2.8"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1715,10 +1762,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.92"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1729,7 +1776,7 @@ dependencies = [
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1739,27 +1786,27 @@ version = "0.1.1"
 source = "git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper#36b86d5ca09db3caf2edb06e0d46b505d0915792"
 dependencies = [
  "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.92"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.39"
+version = "1.0.40"
 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 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1777,7 +1824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1794,8 +1841,8 @@ name = "serial_test_derive"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1808,7 +1855,7 @@ name = "signal-hook"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1818,7 +1865,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1828,7 +1875,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "slog"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1836,7 +1883,7 @@ name = "slog-async"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1848,11 +1895,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog-term 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1860,10 +1907,10 @@ name = "slog-json"
 version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1873,7 +1920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1883,25 +1930,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "slog-term"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "smallvec"
-version = "0.6.9"
+version = "0.6.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -1910,8 +1957,8 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1920,8 +1967,8 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1930,6 +1977,11 @@ name = "sourcefile"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "spin"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.1.1"
@@ -1937,7 +1989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "string"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1945,11 +1997,11 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "0.15.34"
+version = "0.15.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1959,8 +2011,8 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1974,7 +2026,7 @@ name = "term"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1989,12 +2041,12 @@ dependencies = [
 
 [[package]]
 name = "termion"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2004,7 +2056,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2028,7 +2080,7 @@ name = "threadpool"
 version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2036,31 +2088,30 @@ name = "time"
 version = "0.1.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "tokio"
-version = "0.1.21"
+version = "0.1.22"
 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.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (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.0 (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.7 (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.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.6 (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.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-trace-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2071,7 +2122,7 @@ version = "0.1.1"
 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.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2080,17 +2131,17 @@ name = "tokio-current-thread"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (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-executor"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2098,9 +2149,9 @@ name = "tokio-fs"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (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.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2109,8 +2160,8 @@ version = "0.1.12"
 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.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2119,16 +2170,16 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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.0 (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.7.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.7 (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.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2136,12 +2187,12 @@ name = "tokio-signal"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (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)",
  "signal-hook 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2149,11 +2200,11 @@ dependencies = [
 
 [[package]]
 name = "tokio-sync"
-version = "0.1.5"
+version = "0.1.6"
 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.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2162,7 +2213,7 @@ version = "0.1.3"
 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.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (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)",
@@ -2171,18 +2222,18 @@ dependencies = [
 
 [[package]]
 name = "tokio-threadpool"
-version = "0.1.14"
+version = "0.1.15"
 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.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2191,17 +2242,9 @@ version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (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.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-trace-core"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2210,8 +2253,8 @@ version = "0.1.3"
 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.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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)",
@@ -2224,10 +2267,10 @@ version = "0.2.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.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (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)",
@@ -2240,7 +2283,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2248,17 +2291,17 @@ name = "trust-dns-proto"
 version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (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-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2274,14 +2317,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-executor 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "trust-dns-proto 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2311,7 +2354,7 @@ name = "unicode-normalization"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2350,7 +2393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "utf8-ranges"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2365,113 +2408,112 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bumpalo 2.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bumpalo 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-macro-support 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-shared 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "wasm-bindgen-test"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "futures 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-futures 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-test-macro 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-futures 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-test-macro 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-test-macro"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "wasm-bindgen-webidl"
-version = "0.2.45"
+version = "0.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "failure 0.1.5 (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.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-backend 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "weedle 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "js-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.24 (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.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasm-bindgen-webidl 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2480,7 +2522,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2583,52 +2625,51 @@ dependencies = [
 "checksum actix 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "671ce3d27313f236827a5dd153a1073ad03ef31fc77f562020263e7830cf1ef7"
 "checksum actix-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2c11af4b06dc935d8e1b1491dad56bfb32febc49096a91e773f8535c176453"
 "checksum actix-connect 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d7fbab0d79b2f3415a79570e3db12eaa75c26239541e613b832655145a5e9488"
-"checksum actix-http 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "81aa906e74d2cd5f219f596003b0fd94d05e75a4a448b12afea66e7658b6c9e1"
+"checksum actix-http 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "29c11d33772c790e9aeb2e024834bc084f7496598482908e2424efd768c912b6"
 "checksum actix-http-test 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e4ea476df1fe681a9bd2fcc37eff9393fad4a0430975e46d7c657907351f250"
 "checksum actix-router 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "23224bb527e204261d0291102cb9b52713084def67d94f7874923baefe04ccf7"
-"checksum actix-rt 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ed0424cdf6542a43b32a8885c7c5099bf4110fad9b50d7fb220ab9c038ecf5ec"
+"checksum actix-rt 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61e09627004cb25149fd177c4a062d2061c4ec40aae5820ecd37a87195e759f8"
 "checksum actix-server 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba8c936356c882420eab87051b12ca1926dc42348863d05fff7eb151df9cddbb"
 "checksum actix-server-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e78703f07d0bd08b426b482d53569d84f1e1929024f0431b3a5a2dc0c1c60e0f"
 "checksum actix-service 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaecc01bbc595ebd7a563a7d4f8a607d0b964bb55273c6f362b0b02c26508cf2"
 "checksum actix-threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c29f7c554d56b3841f4bb85d5b3dee01ba536e1307679f56eb54de28aaec3fb"
-"checksum actix-utils 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7ab47adc5e67fc83a0c58570b40531f09814a5daa969e0d913ebeab908a43508"
-"checksum actix-web 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6478c837afbe528cfe468976e67b6b81a6330414b00234c4546a158f9f0739fc"
-"checksum actix-web-actors 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c54489d9bcfce84a5096ba47db6a4dd2cc493987e97a987a4c5a7519b31f26d"
+"checksum actix-utils 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b307201d074c963041cd8858d6b6a82ca23369827d613da5d6e972de123d3c14"
+"checksum actix-web 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0dc7ab62d04b9eeb0f368ad9c6ee20c2e3541fb9a25a5eb727c9118b59e8ff2"
+"checksum actix-web-actors 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8197aa04b8950ed9e37340cd46fe7ad3ccb8b1c4bbcef881ee5f6d149a425608"
 "checksum actix-web-codegen 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe9e3cdec1e645b675f354766e0688c5705021c85ab3cf739be1c8999b91c76"
 "checksum actix_derive 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf5f6d7bf2d220ae8b4a7ae02a572bb35b7c4806b24049af905ab8110de156c"
 "checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 "checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
+"checksum aho-corasick 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "36b7aa1ccb7d7ea3f437cf025a2ab1c47cc6c1bc9fc84918ff449def12f5e282"
 "checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841"
 "checksum argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392"
-"checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71"
-"checksum ascii 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a5fc969a8ce2c9c0c4b0429bb8431544f6658283c8326ba5ff8c762b75369335"
+"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
+"checksum ascii 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "91e320562a8fa3286a481b7189f89578ace6b20df99e123c87f2f509c957c5d6"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
-"checksum awc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c5133e9ca1d7f0560fb271f20286be3e896dac5736040a62a7ef1d62003160b6"
-"checksum backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)" = "ada4c783bb7e7443c14e0480f429ae2cc99da95065aeab7ee1b81ada0419404f"
-"checksum backtrace-sys 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "797c830ac25ccc92a7f8a7b9862bde440715531514594a6154e3d4a54dd769b6"
+"checksum awc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4c4763e6aa29a801d761dc3464f081d439ea5249ba90c3c3bdfc8dd3f739d233"
+"checksum backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5"
+"checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
 "checksum bb8 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac04c3b2d3327a583c9a93b6c5ab4316e6609f5ec84b71b89ebe518e0edbad2"
 "checksum bb8-redis 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9817f38c173f0da1581b923b90e66750a090413ad67a20980d5ad64141bab476"
-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
 "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
-"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
-"checksum bumpalo 2.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "84dca3afd8e01b9526818b7963e5b4916063b3cdf9f10cf6b73ef0bd0ec37aa5"
-"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
+"checksum bumpalo 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2cd43d82f27d68911e6ee11ee791fb248f138f5d69424dc02e098d4f152b0b05"
+"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.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
 "checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
-"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
+"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum combine 3.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680"
 "checksum config 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6"
 "checksum console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
 "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
-"checksum copyless 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f8ffa29b14f03d473f1558c789d020fe41bb7790774f429ff818f4ed9a6f9a0e"
-"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
+"checksum copyless 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6ff9c56c9fb2a49c05ef0e431485a22400af20d33226dc0764d891d09e724127"
 "checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum crossbeam 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "bd66663db5a988098a89599d4857919b3acf7f61402e61365acfd3919857b9be"
 "checksum crossbeam 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ad4c7ea749d9fb09e23c5cb17e3b70650860553a0e2744e38446b1803bf7db94"
@@ -2651,55 +2692,56 @@ dependencies = [
 "checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a"
 "checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
 "checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
+"checksum encoding_rs 0.8.17 (registry+https://github.com/rust-lang/crates.io-index)" = "4155785c79f2f6701f185eb2e6b4caf0555ec03477cb4c70db67b465311620ed"
 "checksum enum-as-inner 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3d58266c97445680766be408285e798d3401c6d4c378ec5552e78737e681e37d"
-"checksum env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b61fa891024a945da30a9581546e8cfaf5602c7b3f4c137a2805cf388f92075a"
+"checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
 "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
-"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa"
+"checksum flate2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "550934ad4808d5d39365e5d61727309bf18b3b02c6c56b729cb92e7dd84bc3d8"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "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.27 (registry+https://github.com/rust-lang/crates.io-index)" = "a2037ec1c6c1c4f79557762eab1f7eae1f64f6cb418ace90fae88f0942b60139"
+"checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869"
 "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
-"checksum h2 0.1.23 (registry+https://github.com/rust-lang/crates.io-index)" = "1e42e3daed5a7e17b12a0c23b5b2fbff23a925a570938ebee4baca1a9a1a2240"
+"checksum getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e65cce4e5084b14874c4e7097f38cab54f47ee554f9194673456ea379dcc4c55"
+"checksum h2 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)" = "a539b63339fbbb00e081e84b6e11bd1d9634a82d91da2984a18ac74a8823f392"
 "checksum hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3bae29b6653b3412c2e71e9d486db9f9df5d701941d86683005efb9f2d28e3da"
 "checksum hashbrown 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "29fba9abe4742d586dfd0c06ae4f7e73a1c2d86b856933509b269d82cdf06e18"
 "checksum hashbrown 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
 "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
 "checksum hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "21ceb46a83a85e824ef93669c8b390009623863b5c195d1ba747292c0c72f94e"
 "checksum http 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "eed324f0f0daf6ec10c474f150505af2c143f251722bf9dbd1261bd1f2ee2c1a"
-"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9"
 "checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
 "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
 "checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum ipconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aa79fa216fbe60834a9c0737d7fcd30425b32d1c58854663e24d4c4b328ed83f"
-"checksum isatty 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e31a8281fc93ec9693494da65fbf28c0c2aa60a2eaec25dc58e2f31952e95edc"
 "checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
-"checksum js-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "9987e7c13a91d9cf0efe59cca48a3a7a70e2b11695d5a4640f85ae71e28f5e73"
+"checksum js-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "eac16f41aa9b9388230b1d6617d7ed897a1af5416b8fe1c8734dcef79c7aae10"
 "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 lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
-"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319"
+"checksum libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)" = "3262021842bf00fe07dbd6cf34ff25c99d7a7ebef8deea84db72be3ea3bb0aff"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+"checksum log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3"
 "checksum lru-cache 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
 "checksum macro-attr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00e51c6f0e2bf862b01b3d784fc32b02feb248a69062c51fb0b6d14cd526cc2a"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
 "checksum memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
 "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
-"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e"
-"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab"
+"checksum miniz_oxide 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b6c3756d66cf286314d5f7ebe74886188a9a92f5eee68b06f31ac2b4f314c99d"
+"checksum miniz_oxide_c_api 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5b78ca5446dd9fe0dab00e058731b6b08a8c1d2b9cdb8efb10876e24e9ae2494"
 "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
 "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"
@@ -2710,7 +2752,7 @@ dependencies = [
 "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
 "checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 "checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba"
+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
 "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
 "checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
@@ -2718,16 +2760,21 @@ dependencies = [
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
 "checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
+"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
-"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
+"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
 "checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
 "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_chacha 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e193067942ef6f485a349a113329140d0ab9e2168ce92274499bb0e9a4190d9d"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca"
 "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"
@@ -2735,13 +2782,13 @@ dependencies = [
 "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 redis 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b543b95de413ac964ca609e91fd9fd58419312e69988fb197f3ff8770312a1af"
-"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252"
+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
 "checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828"
 "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58"
+"checksum regex 1.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d9d8297cc20bbb6184f8b45ff61c8ee6a9ac56c156cec8e38c3e5084773c44ad"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
+"checksum regex-syntax 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9b01330cce219c1c6b2e209e5ed64ccd587ae5c67bed91c0b49eecf02ae40e21"
 "checksum resolv-conf 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b263b4aa1b5de9ffc0054a2386f96992058bb6870aab516f8cdeb8a667d56dcb"
 "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
 "checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
@@ -2749,7 +2796,7 @@ dependencies = [
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
+"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
 "checksum scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
@@ -2758,11 +2805,11 @@ dependencies = [
 "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 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-"checksum serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be"
+"checksum serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)" = "076a696fdea89c19d3baed462576b8f6d663064414b5c793642da8dfeb99475b"
 "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
 "checksum serde-humantime 0.1.1 (git+https://github.com/tailhook/serde-humantime?branch=serde_wrapper)" = "<none>"
-"checksum serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)" = "46a3223d0c9ba936b61c0d2e3e559e3217dbfb8d65d06d26e8b3c25de38bae3e"
-"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
+"checksum serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)" = "ef45eb79d6463b22f5f9e16d283798b7c0175ba6050bc25c1a946c122727fe7b"
+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 "checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe"
@@ -2771,43 +2818,43 @@ dependencies = [
 "checksum signal-hook 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "72ab58f1fda436857e6337dcb6a5aaa34f16c5ddc87b3a8b6ef7a212f90b9c5a"
 "checksum signal-hook-registry 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cded4ffa32146722ec54ab1f16320568465aa922aa9ab4708129599740da85d7"
 "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-"checksum slog 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1e1a2eec401952cd7b12a84ea120e2d57281329940c3f93c2bf04f462539508e"
+"checksum slog 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c03967c75a664f050d3400ab3bce3e4c4f427620e54f6ce61bee1cbe307b0cd2"
 "checksum slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e544d16c6b230d84c866662fe55e31aacfca6ae71e6fc49ae9a311cb379bfc2f"
 "checksum slog-envlogger 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7c6685180086bf58624e92cb3da5d5f013bebd609454926fc8e2ac6345d384b"
 "checksum slog-json 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
 "checksum slog-scope 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60c04b4726fa04595ccf2c2dad7bcd15474242c4c5e109a8a376e8a2c9b1539a"
 "checksum slog-stdlog 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac42f8254ae996cc7d640f9410d3b048dcdf8887a10df4d5d4c44966de24c4a8"
-"checksum slog-term 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5951a808c40f419922ee014c15b6ae1cd34d963538b57d8a4778b9ca3fff1e0b"
-"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
+"checksum slog-term 2.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cb9b3fd9a3c2c86580fce3558a98ed7c69039da0288b08a3f15b371635254e08"
+"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
 "checksum smart-default 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5a9dbd5f03d04e80355cbbe3ce5cf1f65c421eac575402e3d4d6e95d5a44edaa"
 "checksum socket2 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "4e626972d3593207547f14bf5fc9efa4d0e7283deb73fef1dff313dae9ab8878"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
+"checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum string 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0bbfb8937e38e34c3444ff00afb28b0811d9554f15c5ad64d12b0308d1d1995"
-"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
+"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d"
+"checksum syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d960b829a55e56db167e861ddb43602c003c7be0bee1d345021703fac2fb7c"
 "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f"
 "checksum take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42"
 "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e"
-"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
+"checksum termion 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a8fb22f7cde82c8220e5aeacb3258ed7ce996142c77cba193f203515e26c330"
 "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
 "checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
 "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
 "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865"
 "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
-"checksum tokio 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "ec2ffcf4bcfc641413fa0f1427bf8f91dfc78f56a6559cbf50e04837ae442a87"
+"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.7 (registry+https://github.com/rust-lang/crates.io-index)" = "83ea44c6c0773cc034771693711c35c677b4b5a4b21b9e7071704c54de7d555e"
+"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.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce"
 "checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296"
-"checksum tokio-sync 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2f843ffdf8d6e1f90bddd48da43f99ab071660cd92b7ec560ef3cdfd7a409a"
+"checksum tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7"
 "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
-"checksum tokio-threadpool 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72558af20be886ea124595ea0f806dd5703b8958e4705429dd58b3d8231f72f2"
+"checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19"
 "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e"
-"checksum tokio-trace-core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9c8a256d6956f7cb5e2bdfe8b1e8022f1a09206c6c2b1ba00f3b746b260c613"
 "checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
 "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
 "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
@@ -2822,19 +2869,19 @@ dependencies = [
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
-"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
+"checksum utf8-ranges 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9d50aa7650df78abf942826607c62468ce18d9019673d4a2ebe1865dbb96ffde"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-"checksum wasm-bindgen 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "b7ccc7b93cfd13e26700a9e2e41e6305f1951b87e166599069f77d10358100e6"
-"checksum wasm-bindgen-backend 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "1953f91b1608eb1522513623c7739f047bb0fed4128ce51a93f08e12cc314645"
-"checksum wasm-bindgen-futures 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "fa1af11c73eca3dc8c51c76ea475a4416e912da6402064a49fc6c0214701866d"
-"checksum wasm-bindgen-macro 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "0f69da5696545d7ca6607a2e4b1a0edf5a6b36b2c49dbb0f1df6ad1d92884047"
-"checksum wasm-bindgen-macro-support 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4246f3bc73223bbb846f4f2430a60725826a96c9389adf715ed1d5af46dec6"
-"checksum wasm-bindgen-shared 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "c08381e07e7a79e5e229ad7c60d15833d19033542cc5dd91d085df59d235f4a6"
-"checksum wasm-bindgen-test 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2a2a27d7a833564ec141078b3a71fb9ef00573e38e3f2fc1a5bb5221bb41c8bd"
-"checksum wasm-bindgen-test-macro 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "e5c0eac6c5b18d1b73614ddd080986bd01fa5c24fa9bd95c92dffe514f207355"
-"checksum wasm-bindgen-webidl 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "1f42ff7adb8102bf5ad8adbc45b1635c520c8175f9fdf6eb2c54479d485d435a"
-"checksum web-sys 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "540b8259eb242ff3a566fa0140bda03a4ece4e5c226e1284b5c95dddcd4341f6"
+"checksum wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "22029998cc650473cb05f10f19c06a1536b9e1f1572e4f5dacd45ab4d3f85877"
+"checksum wasm-bindgen-backend 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "6f858ff3cb4196c702e8c24b75fba1d3ab46958de4f7c253627f0507aae1507c"
+"checksum wasm-bindgen-futures 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "cc16facd42fc3d0fa0cae78b39516bac04496cf80518fd09bbfa33e9b0e9c92d"
+"checksum wasm-bindgen-macro 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "15c29f04eb117312931e7b02878453ee63d67a6f291797651890128bf5ee71db"
+"checksum wasm-bindgen-macro-support 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "92b1356b623816248dfe0e2c4b7e113618d647808907ff6a3d9838ebee8e82ee"
+"checksum wasm-bindgen-shared 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "15de16ddb30cfd424a87598b30021491bae1607d32e52056979865c98b7913b4"
+"checksum wasm-bindgen-test 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "7dcceff686a33d286a139c7634aae6d821835bf9cd69bc186bd28e08bd4cc9f0"
+"checksum wasm-bindgen-test-macro 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "0e50836aa591b9f552c8b2c364cca72c3f8fd40e4104d4551c1d9ac5b5bef3d3"
+"checksum wasm-bindgen-webidl 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "21724123084234fff2f986018b790afc5d6f45c9a3903025e6c55d0068cb7d15"
+"checksum web-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "22306ce642c58266cb5c5938150194911322bc179aa895146076217410ddbc82"
 "checksum wee_alloc 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "31d4e6572d21ac55398bc91db827f48c3fdb8152ae60f4c358f6780e1035ffcc"
 "checksum weedle 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc44aa200daee8b1f3a004beaf16554369746f1b4486f0cf93b0caf8a3c2d1e"
 "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6"

From e155905a113a1c682b7f73a0e3da9bd251c4130b Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Thu, 11 Jul 2019 20:53:11 +0300
Subject: [PATCH 178/179] remove cfg_if and wee_alloc

---
 Cargo.lock                 | 21 ---------------------
 jason/Cargo.toml           |  2 --
 jason/src/lib.rs           | 24 ++++--------------------
 jason/src/rpc/websocket.rs |  2 +-
 4 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d3ff1f875..2c3fac611 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -989,7 +989,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "jason"
 version = "0.1.0-dev"
 dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "console_error_panic_hook 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1000,7 +999,6 @@ dependencies = [
  "wasm-bindgen-futures 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen-test 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "web-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "wee_alloc 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1186,11 +1184,6 @@ name = "memoffset"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "mime"
 version = "0.3.13"
@@ -2516,18 +2509,6 @@ dependencies = [
  "wasm-bindgen-webidl 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "wee_alloc"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)",
- "memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "weedle"
 version = "0.9.0"
@@ -2737,7 +2718,6 @@ dependencies = [
 "checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
-"checksum memory_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
 "checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425"
 "checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
 "checksum miniz_oxide 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b6c3756d66cf286314d5f7ebe74886188a9a92f5eee68b06f31ac2b4f314c99d"
@@ -2882,7 +2862,6 @@ dependencies = [
 "checksum wasm-bindgen-test-macro 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "0e50836aa591b9f552c8b2c364cca72c3f8fd40e4104d4551c1d9ac5b5bef3d3"
 "checksum wasm-bindgen-webidl 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)" = "21724123084234fff2f986018b790afc5d6f45c9a3903025e6c55d0068cb7d15"
 "checksum web-sys 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "22306ce642c58266cb5c5938150194911322bc179aa895146076217410ddbc82"
-"checksum wee_alloc 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "31d4e6572d21ac55398bc91db827f48c3fdb8152ae60f4c358f6780e1035ffcc"
 "checksum weedle 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc44aa200daee8b1f3a004beaf16554369746f1b4486f0cf93b0caf8a3c2d1e"
 "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 00a92a978..0e1cda705 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -15,7 +15,6 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook"]
 
 [dependencies]
-cfg-if = "0.1"
 console_error_panic_hook = { version = "0.1", optional = true }
 futures = "0.1"
 js-sys = "0.3"
@@ -24,7 +23,6 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.3"
-wee_alloc = { version = "0.4", optional = true }
 [dependencies.web-sys]
     version = "0.3.4"
     features = [
diff --git a/jason/src/lib.rs b/jason/src/lib.rs
index 8058873cd..540a8a3cf 100644
--- a/jason/src/lib.rs
+++ b/jason/src/lib.rs
@@ -1,5 +1,3 @@
-use cfg_if::cfg_if;
-
 mod api;
 mod rpc;
 mod utils;
@@ -7,22 +5,8 @@ mod utils;
 #[doc(inline)]
 pub use self::api::{Jason, RoomHandle};
 
-cfg_if! {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function to get better error messages if we ever panic.
-    if #[cfg(feature = "console_error_panic_hook")] {
-        pub use console_error_panic_hook::set_once as set_panic_hook;
-    } else {
-        #[inline]
-        pub fn set_panic_hook() {}
-    }
-}
+#[cfg(feature = "console_error_panic_hook")]
+pub use console_error_panic_hook::set_once as set_panic_hook;
 
-cfg_if! {
-    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
-    // allocator.
-    if #[cfg(feature = "wee_alloc")] {
-        #[global_allocator]
-        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
-    }
-}
+#[cfg(not(feature = "console_error_panic_hook"))]
+pub fn set_panic_hook() {}
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket.rs
index 988aed4ee..b07143e10 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket.rs
@@ -214,4 +214,4 @@ impl From<&CloseEvent> for CloseMsg {
             _ => CloseMsg::Disconnect(body),
         }
     }
-}
\ No newline at end of file
+}

From 60400a830e061a6fe3bb5af031231dcc96bb2553 Mon Sep 17 00:00:00 2001
From: alexlapa <lapa.alex@ex.ua>
Date: Fri, 12 Jul 2019 14:59:54 +0300
Subject: [PATCH 179/179] fix make test

---
 Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index db69fe7bf..c505e24cd 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,6 @@ ifeq ($(test-unit-crate),medea)
 else
 ifeq ($(test-unit-crate),jason)
 	wasm-pack test --headless --firefox jason
-	cargo test -p jason
 endif
 	cargo test -p $(test-unit-crate)
 endif