diff --git a/CHANGELOG.md b/CHANGELOG.md
index c42294ea7..bf4a7c390 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,8 @@ All user visible changes to this project will be documented in this file. This p
     - `PeerConnection` renegotiation functionality ([#105]);
     - Calculate and send call quality score based on RTC stats ([#132]);
     - Muting/unmuting `MediaTrack`s by receiver ([#127]);
-    - Send `TrackUpdate::IceRestart` based on RTC stats analysis ([#138]).
+    - Send `TrackUpdate::IceRestart` based on RTC stats analysis ([#138]);
+    - Multiple `Room`s served by one RPC connection support ([#147]).
 - [Coturn] integration:
     - [Coturn] sessions destroying ([#84]);
     - [Coturn] stats processing ([#94]).
@@ -81,6 +82,7 @@ All user visible changes to this project will be documented in this file. This p
 [#132]: /../../pull/132
 [#135]: /../../pull/135
 [#138]: /../../pull/138
+[#147]: /../../pull/147
 [#153]: /../../pull/153
 
 
diff --git a/Cargo.lock b/Cargo.lock
index 85e9e13e4..209f9c7ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,7 +27,7 @@ dependencies = [
  "log",
  "once_cell",
  "parking_lot 0.11.0",
- "pin-project",
+ "pin-project 0.4.27",
  "smallvec",
  "tokio",
  "tokio-util",
@@ -46,7 +46,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "log",
- "pin-project",
+ "pin-project 0.4.27",
  "tokio",
  "tokio-util",
 ]
@@ -84,9 +84,9 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab"
+checksum = "404df68c297f73b8d36c9c9056404913d25905a8f80127b0e5fe147c9c4b9f02"
 dependencies = [
  "actix-codec",
  "actix-connect",
@@ -94,7 +94,7 @@ dependencies = [
  "actix-service",
  "actix-threadpool",
  "actix-utils",
- "base64",
+ "base64 0.13.0",
  "bitflags",
  "brotli2",
  "bytes",
@@ -118,7 +118,7 @@ dependencies = [
  "log",
  "mime",
  "percent-encoding",
- "pin-project",
+ "pin-project 1.0.1",
  "rand 0.7.3",
  "regex",
  "serde 1.0.117",
@@ -136,7 +136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a60f9ba7c4e6df97f3aacb14bb5c0cd7d98a49dcbaed0d7f292912ad9a6a3ed2"
 dependencies = [
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -194,7 +194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb"
 dependencies = [
  "futures-util",
- "pin-project",
+ "pin-project 0.4.27",
 ]
 
 [[package]]
@@ -254,15 +254,15 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "log",
- "pin-project",
+ "pin-project 0.4.27",
  "slab",
 ]
 
 [[package]]
 name = "actix-web"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b12fe25e11cd9ed2ef2e428427eb6178a1b363f3f7f0dab8278572f11b2da1"
+checksum = "88344b7a5ef27e5e09e73565379f69273dd3e2d29e82afc381b84d170d0a5631"
 dependencies = [
  "actix-codec",
  "actix-http",
@@ -286,7 +286,7 @@ dependencies = [
  "fxhash",
  "log",
  "mime",
- "pin-project",
+ "pin-project 1.0.1",
  "regex",
  "serde 1.0.117",
  "serde_json",
@@ -310,18 +310,18 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
- "pin-project",
+ "pin-project 0.4.27",
 ]
 
 [[package]]
 name = "actix-web-codegen"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "750ca8fb60bbdc79491991650ba5d2ae7cd75f3fc00ead51390cfe9efda0d4d8"
+checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -332,14 +332,14 @@ checksum = "b95aceadaf327f18f0df5962fedc1bde2f870566a0b9f65c89508a3b1f79334c"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072"
+checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
 dependencies = [
  "gimli",
 ]
@@ -388,9 +388,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
 
 [[package]]
 name = "arrayvec"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "async-channel"
@@ -419,9 +419,9 @@ dependencies = [
 
 [[package]]
 name = "async-global-executor"
-version = "1.4.2"
+version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "124ac8c265e407641c3362b8f4d39cdb4e243885b71eef087be27199790f5a3a"
+checksum = "73079b49cd26b8fd5a15f68fc7707fc78698dc2a3d61430f2a7a9430230dfa04"
 dependencies = [
  "async-executor",
  "async-io",
@@ -504,7 +504,7 @@ checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -521,7 +521,7 @@ checksum = "b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -549,16 +549,17 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "awc"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575"
+checksum = "425980a1e58e5030a3e4b065a3d577c8f0e16142ea9d81f30614eae810c98577"
 dependencies = [
  "actix-codec",
  "actix-http",
  "actix-rt",
  "actix-service",
- "base64",
+ "base64 0.13.0",
  "bytes",
+ "cfg-if 1.0.0",
  "derive_more",
  "futures-core",
  "log",
@@ -572,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.53"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e"
+checksum = "2baad346b2d4e94a24347adeee9c7a93f412ee94b9cc26e5b59dea23848e9f28"
 dependencies = [
  "addr2line",
  "cfg-if 1.0.0",
@@ -596,6 +597,12 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
 
+[[package]]
+name = "base64"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+
 [[package]]
 name = "bitflags"
 version = "1.2.1"
@@ -715,7 +722,7 @@ checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
  "libc",
  "num-integer",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
  "time 0.1.44",
  "winapi 0.3.9",
 ]
@@ -898,7 +905,7 @@ dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
  "strsim 0.9.3",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -909,7 +916,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -935,12 +942,23 @@ dependencies = [
  "async-trait",
  "config",
  "deadpool",
- "futures 0.3.6",
+ "futures 0.3.7",
  "log",
  "redis",
  "serde 1.0.117",
 ]
 
+[[package]]
+name = "derivative"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.7",
+ "syn 1.0.48",
+]
+
 [[package]]
 name = "derive_builder"
 version = "0.9.0"
@@ -951,7 +969,7 @@ dependencies = [
  "derive_builder_core",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -963,7 +981,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -974,7 +992,7 @@ checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1045,11 +1063,11 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.24"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2"
+checksum = "f62bc5e388624f1a13da83b479275dbec9663a876e414df80decf7d2cdab6670"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1061,7 +1079,7 @@ dependencies = [
  "heck",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1088,7 +1106,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
  "synstructure",
 ]
 
@@ -1125,7 +1143,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
 dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -1190,9 +1208,9 @@ checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed"
 
 [[package]]
 name = "futures"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e"
+checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1205,9 +1223,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a4d35f7401e948629c9c3d6638fb9bf94e0b2121e96c3b428cc4e631f3eb74"
+checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1215,15 +1233,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d674eaa0056896d5ada519900dbf97ead2e46a7b6621e8160d79e2f2e1e2784b"
+checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab"
+checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1232,9 +1250,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc94b64bb39543b4e432f1790b6bf18e3ee3b74653c5449f63310e9a74b123c"
+checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b"
 
 [[package]]
 name = "futures-lite"
@@ -1253,36 +1271,36 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f57ed14da4603b2554682e9f2ff3c65d7567b53188db96cb71538217fc64581b"
+checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe"
 dependencies = [
  "proc-macro-hack",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8764258ed64ebc5d9ed185cf86a95db5cac810269c5d20ececb32e0088abbd"
+checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11"
 
 [[package]]
 name = "futures-task"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dd26820a9f3637f1302da8bceba3ff33adbe53464b54ca24d4e2d4f1db30f94"
+checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "futures-util"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a894a0acddba51a2d49a6f4263b1e64b8c579ece8af50fa86503d52cd1eea34"
+checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34"
 dependencies = [
  "futures 0.1.30",
  "futures-channel",
@@ -1292,7 +1310,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project",
+ "pin-project 1.0.1",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -1337,9 +1355,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724"
+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
 
 [[package]]
 name = "gloo-timers"
@@ -1356,9 +1374,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53"
+checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
 dependencies = [
  "bytes",
  "fnv",
@@ -1371,6 +1389,7 @@ dependencies = [
  "tokio",
  "tokio-util",
  "tracing",
+ "tracing-futures",
 ]
 
 [[package]]
@@ -1473,7 +1492,7 @@ dependencies = [
  "httparse",
  "httpdate",
  "itoa",
- "pin-project",
+ "pin-project 0.4.27",
  "socket2",
  "tokio",
  "tower-service",
@@ -1510,11 +1529,11 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+checksum = "cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
 ]
 
 [[package]]
@@ -1608,9 +1627,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.79"
+version = "0.2.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743"
+checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
 
 [[package]]
 name = "linked-hash-map"
@@ -1704,7 +1723,7 @@ dependencies = [
  "dotenv",
  "failure",
  "function_name",
- "futures 0.3.6",
+ "futures 0.3.7",
  "humantime-serde",
  "lazy_static",
  "medea-client-api-proto",
@@ -1789,7 +1808,7 @@ dependencies = [
  "bytes",
  "deadpool",
  "derive_more",
- "futures 0.3.6",
+ "futures 0.3.7",
  "once_cell",
  "regex",
  "tokio",
@@ -1803,10 +1822,11 @@ dependencies = [
  "async-trait",
  "bitflags",
  "console_error_panic_hook",
+ "derivative",
  "derive_more",
  "downcast",
  "fragile",
- "futures 0.3.6",
+ "futures 0.3.7",
  "js-sys",
  "log",
  "medea-client-api-proto",
@@ -1817,6 +1837,7 @@ dependencies = [
  "serde 1.0.117",
  "serde_json",
  "tracerr",
+ "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-bindgen-test",
@@ -1834,7 +1855,7 @@ dependencies = [
  "medea-jason",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
  "synstructure",
 ]
 
@@ -1842,15 +1863,15 @@ dependencies = [
 name = "medea-reactive"
 version = "0.1.0-dev"
 dependencies = [
- "futures 0.3.6",
+ "futures 0.3.7",
  "tokio",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memory_units"
@@ -1940,7 +1961,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1989,12 +2010,12 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
 [[package]]
 name = "num-integer"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
 dependencies = [
  "autocfg",
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
@@ -2003,14 +2024,14 @@ version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
 dependencies = [
- "num-traits 0.2.12",
+ "num-traits 0.2.14",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
 dependencies = [
  "autocfg",
 ]
@@ -2027,9 +2048,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.21.1"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693"
+checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
 
 [[package]]
 name = "once_cell"
@@ -2121,7 +2142,16 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15"
 dependencies = [
- "pin-project-internal",
+ "pin-project-internal 0.4.27",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+dependencies = [
+ "pin-project-internal 1.0.1",
 ]
 
 [[package]]
@@ -2132,7 +2162,18 @@ checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.7",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2206,9 +2247,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.18"
+version = "0.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
+checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro-nested"
@@ -2272,7 +2313,7 @@ dependencies = [
  "itertools",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2453,9 +2494,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b"
+checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2465,9 +2506,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.20"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c"
+checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
 
 [[package]]
 name = "remove_dir_all"
@@ -2494,7 +2535,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19"
 dependencies = [
- "base64",
+ "base64 0.12.3",
  "blake2b_simd",
  "constant_time_eq",
  "crossbeam-utils",
@@ -2609,7 +2650,7 @@ checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2663,14 +2704,14 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.8.13"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae3e2dd40a7cdc18ca80db804b7f461a39bb721160a85c9a1fa30134bf3c02a5"
+checksum = "f7baae0a99f1a324984bcdc5f0718384c1f69775f1c7eec8b859b71b443e3fd7"
 dependencies = [
  "dtoa",
  "linked-hash-map 0.5.3",
@@ -2697,7 +2738,7 @@ checksum = "65f59259be9fc1bf677d06cc1456e97756004a1a5a577480f71430bd7c17ba33"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2721,11 +2762,10 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035"
+checksum = "ce32ea0c6c56d5eacaeb814fbed9960547021d3edd010ded1425f180536b20ab"
 dependencies = [
- "arc-swap",
  "libc",
 ]
 
@@ -2829,7 +2869,7 @@ checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2883,7 +2923,7 @@ dependencies = [
  "quote 1.0.7",
  "serde 1.0.117",
  "serde_derive",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2899,7 +2939,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2933,9 +2973,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.46"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad5de3220ea04da322618ded2c42233d02baca219d6f160a3e9c87cda16c942"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
@@ -2950,7 +2990,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
  "unicode-xid 0.2.1",
 ]
 
@@ -3010,7 +3050,7 @@ checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3077,7 +3117,7 @@ dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
  "standback",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3132,7 +3172,7 @@ checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3167,7 +3207,7 @@ checksum = "74a5d6e7439ecf910463667080de772a9c7ddf26bc9fb4f3252ac3862e43337d"
 dependencies = [
  "async-stream",
  "async-trait",
- "base64",
+ "base64 0.12.3",
  "bytes",
  "futures-core",
  "futures-util",
@@ -3175,7 +3215,7 @@ dependencies = [
  "http-body",
  "hyper",
  "percent-encoding",
- "pin-project",
+ "pin-project 0.4.27",
  "prost",
  "prost-derive",
  "tokio",
@@ -3198,7 +3238,7 @@ dependencies = [
  "proc-macro2 1.0.24",
  "prost-build",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3228,7 +3268,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "indexmap",
- "pin-project",
+ "pin-project 0.4.27",
  "rand 0.7.3",
  "slab",
  "tokio",
@@ -3248,7 +3288,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4887dc2a65d464c8b9b66e0e4d51c2fd6cf5b3373afc72805b0a60bce00446a"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.27",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -3262,7 +3302,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f6b5000c3c54d269cc695dff28136bb33d08cbf1df2c48129e143ab65bf3c2a"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.27",
  "tower-service",
 ]
 
@@ -3279,7 +3319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92c3040c5dbed68abffaa0d4517ac1a454cd741044f33ab0eefab6b8d1361404"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.27",
  "tokio",
  "tower-layer",
  "tower-load",
@@ -3294,7 +3334,7 @@ checksum = "8cc79fc3afd07492b7966d7efa7c6c50f8ed58d768a6075dd7ae6591c5d2017b"
 dependencies = [
  "futures-core",
  "log",
- "pin-project",
+ "pin-project 0.4.27",
  "tokio",
  "tower-discover",
  "tower-service",
@@ -3307,7 +3347,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f021e23900173dc315feb4b6922510dae3e79c689b74c089112066c11f0ae4e"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.27",
  "tower-layer",
  "tower-service",
 ]
@@ -3343,7 +3383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6727956aaa2f8957d4d9232b308fe8e4e65d99db30f42b225646e86c9b6a952"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.27",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -3361,7 +3401,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "127b8924b357be938823eaaec0608c482d40add25609481027b96198b2e4b31e"
 dependencies = [
- "pin-project",
+ "pin-project 0.4.27",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -3375,7 +3415,7 @@ checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
+ "pin-project 0.4.27",
  "tower-service",
 ]
 
@@ -3409,7 +3449,7 @@ checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3427,7 +3467,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
 dependencies = [
- "pin-project",
+ "pin-project 0.4.27",
  "tracing",
 ]
 
@@ -3446,7 +3486,7 @@ dependencies = [
  "async-trait",
  "backtrace",
  "enum-as-inner",
- "futures 0.3.6",
+ "futures 0.3.7",
  "idna",
  "lazy_static",
  "log",
@@ -3465,7 +3505,7 @@ checksum = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77"
 dependencies = [
  "backtrace",
  "cfg-if 0.1.10",
- "futures 0.3.6",
+ "futures 0.3.7",
  "ipconfig",
  "lazy_static",
  "log",
@@ -3611,7 +3651,7 @@ dependencies = [
  "log",
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -3645,7 +3685,7 @@ checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
- "syn 1.0.46",
+ "syn 1.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/crates/medea-macro/CHANGELOG.md b/crates/medea-macro/CHANGELOG.md
index 59b695e6a..f2a2e3649 100644
--- a/crates/medea-macro/CHANGELOG.md
+++ b/crates/medea-macro/CHANGELOG.md
@@ -23,12 +23,14 @@ All user visible changes to this project will be documented in this file. This p
 
 ### Fixed
 
-- `#[enum_delegate]` macro now works fine on functions with multiple arguments ([#91]).
+- `#[enum_delegate]` macro now works fine on functions with multiple arguments ([#91]);
+- `#[dispatchable]` handler trait visibility now corresponds to original enum visibility ([#147]).
 
 [#66]: /../../pull/66
 [#68]: /../../pull/68
 [#91]: /../../pull/91
 [#112]: /../../pull/112
+[#147]: /../../pull/147
 
 
 
diff --git a/crates/medea-macro/src/dispatchable.rs b/crates/medea-macro/src/dispatchable.rs
index 1eb08424c..e3fd9201f 100644
--- a/crates/medea-macro/src/dispatchable.rs
+++ b/crates/medea-macro/src/dispatchable.rs
@@ -114,12 +114,13 @@ impl Item {
         let trait_doc = self.handler_trait_doc();
         let handler_trait_ident = self.handler_trait_ident.clone();
         let maybe_async_trait_macro = args.maybe_async_trait_macro();
+        let vis = self.orig_enum.vis.clone();
         quote! {
             #[automatically_derived]
             #[allow(clippy::needless_arbitrary_self_type)]
             #[doc = #trait_doc]
             #maybe_async_trait_macro
-            pub trait #handler_trait_ident {
+            #vis trait #handler_trait_ident {
                 /// Output type of all functions from this trait.
                 type Output;
 
diff --git a/crates/medea-reactive/src/field/cell.rs b/crates/medea-reactive/src/field/cell.rs
index 6cfaf05fd..89e601d53 100644
--- a/crates/medea-reactive/src/field/cell.rs
+++ b/crates/medea-reactive/src/field/cell.rs
@@ -122,19 +122,14 @@ where
 
 impl<D> ObservableCell<D>
 where
-    D: Copy + 'static,
+    D: Clone + 'static,
 {
     /// Returns copy of an underlying data.
     #[inline]
     pub fn get(&self) -> D {
-        **self.0.borrow()
+        self.0.borrow().data.clone()
     }
-}
 
-impl<D> ObservableCell<D>
-where
-    D: Clone + 'static,
-{
     /// Returns [`Stream`] into which underlying data updates will be emitted.
     ///
     /// [`Stream`]: futures::Stream
diff --git a/jason/CHANGELOG.md b/jason/CHANGELOG.md
index b4e42fb91..e3d048922 100644
--- a/jason/CHANGELOG.md
+++ b/jason/CHANGELOG.md
@@ -42,9 +42,10 @@ All user visible changes to this project will be documented in this file. This p
             - `FacingMode` enum ([#137]).
         - `MediaKind` enum that provides `MediaTrack` and `InputDeviceInfo` kind ([#146]);
         - `MediaSourceKind` enum that provides `MediaTrack` media source kind (`Device` or `Display`) ([#146]);
-        - Room initialization ([#46]):
-            - `Jason.init_room()`;
-            - `Room.join()`.
+        - Room management:
+            - `Jason.init_room()` ([#46]);
+            - `Room.join()` ([#46]);
+            - `Jason.close_room()` ([#147]).
         - Ability to configure local media stream used by `Room` via `Room.set_local_media_settings()` ([#54], [#97], [#145]);
         - `Room.on_failed_local_media` callback ([#54], [#143]);
         - `Room.on_close` callback for WebSocket close initiated by server ([#55]);
@@ -112,6 +113,7 @@ All user visible changes to this project will be documented in this file. This p
 [#144]: /../../pull/144
 [#145]: /../../pull/145
 [#146]: /../../pull/146
+[#147]: /../../pull/147
 
 
 
diff --git a/jason/Cargo.toml b/jason/Cargo.toml
index 1ff187651..b69be03e2 100644
--- a/jason/Cargo.toml
+++ b/jason/Cargo.toml
@@ -34,6 +34,7 @@ mockable = ["downcast", "fragile", "mockall", "predicates-tree"]
 async-trait = "0.1"
 bitflags = "1.2"
 console_error_panic_hook = { version = "0.1", optional = true }
+derivative = "2.1"
 derive_more = "0.99"
 downcast = { version = "0.10", optional = true }
 fragile = { version = "1.0", optional = true }
@@ -48,6 +49,7 @@ predicates-tree = { version = "1.0", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tracerr = "0.1"
+url = "2.1"
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 wasm-bindgen-futures = "0.4"
 wasm-logger = "0.2"
diff --git a/jason/demo/index.html b/jason/demo/index.html
index ac40d0811..99154b25b 100644
--- a/jason/demo/index.html
+++ b/jason/demo/index.html
@@ -452,7 +452,7 @@
       await init();
 
       jason = new Jason();
-      room = await jason.init_room();
+      room = jason.init_room();
 
       let userNameFromCookies = getCookie(userNameCookieName);
       if (userNameFromCookies) {
diff --git a/jason/e2e-demo/js/index.js b/jason/e2e-demo/js/index.js
index 511383646..8899c2598 100644
--- a/jason/e2e-demo/js/index.js
+++ b/jason/e2e-demo/js/index.js
@@ -567,7 +567,7 @@ window.onload = async function() {
   }
 
   async function newRoom() {
-    let room = await jason.init_room();
+    let room = jason.init_room();
 
     try {
       const constraints = await initLocalStream();
diff --git a/jason/e2e-demo/video-call.html b/jason/e2e-demo/video-call.html
index 5ce58fe68..ddec963ab 100644
--- a/jason/e2e-demo/video-call.html
+++ b/jason/e2e-demo/video-call.html
@@ -182,7 +182,7 @@
           </a>
         </li>
       </ul>
-      <div class="dropdown ">
+      <div class="dropdown">
         <button class="btn btn-light dropdown-toggle" type="button"
                 id="username-menu-button"
                 data-toggle="dropdown"
diff --git a/jason/src/api/mod.rs b/jason/src/api/mod.rs
index f5ee624aa..3d4c6ebb8 100644
--- a/jason/src/api/mod.rs
+++ b/jason/src/api/mod.rs
@@ -13,8 +13,8 @@ use crate::{
     media::{MediaManager, MediaManagerHandle},
     peer,
     rpc::{
-        ClientDisconnect, RpcClient, RpcTransport, WebSocketRpcClient,
-        WebSocketRpcTransport,
+        ClientDisconnect, RpcSession, RpcTransport, WebSocketRpcClient,
+        WebSocketRpcSession, WebSocketRpcTransport,
     },
     set_panic_hook,
 };
@@ -31,13 +31,20 @@ pub use self::{
 /// Responsible for managing shared transports, local media
 /// and room initialization.
 #[wasm_bindgen]
-#[derive(Default)]
 pub struct Jason(Rc<RefCell<Inner>>);
 
-#[derive(Default)]
 struct Inner {
+    /// [`Jason`]s [`MediaManager`]. It's shared across [`Room`]s since
+    /// [`MediaManager`] contains media tracks that can be used by multiple
+    /// [`Room`]s.
     media_manager: Rc<MediaManager>,
+
+    /// [`Room`]s maintained by this [`Jason`] instance.
     rooms: Vec<Room>,
+
+    /// Connection with Media Server. Only one [`WebSocketRpcClient`] is
+    /// supported at the moment.
+    rpc: Rc<WebSocketRpcClient>,
 }
 
 #[wasm_bindgen]
@@ -47,20 +54,23 @@ impl Jason {
     pub fn new() -> Self {
         set_panic_hook();
         wasm_logger::init(wasm_logger::Config::default());
-        Self::default()
+
+        Self::with_rpc_client(Rc::new(WebSocketRpcClient::new(Box::new(
+            |url| {
+                Box::pin(async move {
+                    let ws = WebSocketRpcTransport::new(url)
+                        .await
+                        .map_err(|e| tracerr::new!(e))?;
+                    Ok(Rc::new(ws) as Rc<dyn RpcTransport>)
+                })
+            },
+        ))))
     }
 
     /// Returns [`RoomHandle`] for [`Room`].
     pub fn init_room(&self) -> RoomHandle {
-        let rpc = Rc::new(WebSocketRpcClient::new(Box::new(|token| {
-            Box::pin(async move {
-                let ws = WebSocketRpcTransport::new(&token)
-                    .await
-                    .map_err(|e| tracerr::new!(e))?;
-                Ok(Rc::new(ws) as Rc<dyn RpcTransport>)
-            })
-        })));
-        self.inner_init_room(rpc)
+        let rpc = Rc::clone(&self.0.borrow().rpc);
+        self.inner_init_room(WebSocketRpcSession::new(rpc))
     }
 
     /// Returns handle to [`MediaManager`].
@@ -68,6 +78,19 @@ impl Jason {
         self.0.borrow().media_manager.new_handle()
     }
 
+    /// Closes the provided [`Room`].
+    #[allow(clippy::needless_pass_by_value)]
+    pub fn close_room(&self, room_to_delete: RoomHandle) {
+        self.0.borrow_mut().rooms.retain(|room| {
+            let should_be_closed = room.inner_ptr_eq(&room_to_delete);
+            if should_be_closed {
+                room.set_close_reason(ClientDisconnect::RoomClosed.into());
+            }
+
+            !should_be_closed
+        });
+    }
+
     /// Drops [`Jason`] API object, so all related objects (rooms, connections,
     /// streams etc.) respectively. All objects related to this [`Jason`] API
     /// object will be detached (you will still hold them, but unable to use).
@@ -79,30 +102,52 @@ impl Jason {
 }
 
 impl Jason {
+    /// Returns new [`Jason`] with the provided [`WebSocketRpcClient`].
+    #[inline]
+    pub fn with_rpc_client(rpc: Rc<WebSocketRpcClient>) -> Self {
+        Self(Rc::new(RefCell::new(Inner {
+            rpc,
+            rooms: Vec::new(),
+            media_manager: Rc::new(MediaManager::default()),
+        })))
+    }
+
     /// Returns [`RoomHandle`] for [`Room`].
-    pub fn inner_init_room(&self, rpc: Rc<dyn RpcClient>) -> RoomHandle {
+    pub fn inner_init_room(&self, rpc: Rc<dyn RpcSession>) -> RoomHandle {
         let peer_repository = Box::new(peer::Repository::new(Rc::clone(
             &self.0.borrow().media_manager,
         )));
+        let on_normal_close = rpc.on_normal_close();
+        let room = Room::new(rpc, peer_repository);
 
-        let inner = self.0.clone();
-        spawn_local(rpc.on_normal_close().map(move |res| {
-            // TODO: Don't close all rooms when multiple rpc connections
-            //       will be supported.
-            let reason = res.unwrap_or_else(|_| {
-                ClientDisconnect::RpcClientUnexpectedlyDropped.into()
-            });
-            inner
-                .borrow_mut()
-                .rooms
-                .drain(..)
-                .for_each(|room| room.close(reason));
-            inner.borrow_mut().media_manager = Rc::default();
+        let weak_room = room.downgrade();
+        let weak_inner = Rc::downgrade(&self.0);
+        spawn_local(on_normal_close.map(move |reason| {
+            (|| {
+                let room = weak_room.upgrade()?;
+                let inner = weak_inner.upgrade()?;
+                let mut inner = inner.borrow_mut();
+                let index = inner.rooms.iter().position(|r| r.ptr_eq(&room));
+                if let Some(index) = index {
+                    inner.rooms.remove(index).close(reason);
+                }
+                if inner.rooms.is_empty() {
+                    inner.media_manager = Rc::default();
+                }
+
+                Some(())
+            })();
         }));
 
-        let room = Room::new(rpc, peer_repository);
         let handle = room.new_handle();
         self.0.borrow_mut().rooms.push(room);
         handle
     }
 }
+
+impl Default for Jason {
+    #[inline]
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/jason/src/api/room.rs b/jason/src/api/room.rs
index 945b61e62..f132fe27b 100644
--- a/jason/src/api/room.rs
+++ b/jason/src/api/room.rs
@@ -33,8 +33,9 @@ use crate::{
         TrackDirection,
     },
     rpc::{
-        ClientDisconnect, CloseReason, ReconnectHandle, RpcClient,
-        RpcClientError, TransportError,
+        ClientDisconnect, CloseReason, ConnectionInfo,
+        ConnectionInfoParseError, ReconnectHandle, RpcClientError, RpcSession,
+        SessionError, TransportError,
     },
     utils::{Callback1, HandlerDetachedError, JasonError, JsCaused, JsError},
     JsMediaSourceKind,
@@ -112,7 +113,7 @@ enum RoomError {
     #[display(fmt = "Unable to init RPC transport: {}", _0)]
     InitRpcTransportFailed(#[js(cause)] TransportError),
 
-    /// Returned if [`RpcClient`] was unable to connect to RPC server.
+    /// Returned if [`WebSocketRpcClient`] was unable to connect to RPC server.
     #[display(fmt = "Unable to connect RPC server: {}", _0)]
     CouldNotConnectToServer(#[js(cause)] RpcClientError),
 
@@ -148,6 +149,10 @@ enum RoomError {
     /// simultaneously.
     #[display(fmt = "Some MediaConnectionsError: {}", _0)]
     MediaConnections(#[js(cause)] MediaConnectionsError),
+
+    /// [`WebSocketSession`] returned [`SessionError`].
+    #[display(fmt = "WebSocketSession error occurred: {}", _0)]
+    SessionError(#[js(cause)] SessionError),
 }
 
 impl From<RpcClientError> for RoomError {
@@ -189,6 +194,13 @@ impl From<MediaConnectionsError> for RoomError {
     }
 }
 
+impl From<SessionError> for RoomError {
+    #[inline]
+    fn from(e: SessionError) -> Self {
+        Self::SessionError(e)
+    }
+}
+
 /// JS side handle to `Room` where all the media happens.
 ///
 /// Actually, represents a [`Weak`]-based handle to `InnerRoom`.
@@ -207,9 +219,13 @@ impl RoomHandle {
     ///
     /// With [`RoomError::CouldNotConnectToServer`] if cannot connect to media
     /// server.
-    pub async fn inner_join(&self, token: String) -> Result<(), JasonError> {
+    pub async fn inner_join(&self, url: String) -> Result<(), JasonError> {
         let inner = upgrade_or_detached!(self.0, JasonError)?;
 
+        let connection_info: ConnectionInfo = url.parse().map_err(
+            tracerr::map_from_and_wrap!(=> ConnectionInfoParseError),
+        )?;
+
         if !inner.on_failed_local_media.is_set() {
             return Err(JasonError::from(tracerr::new!(
                 RoomError::CallbackNotSet("Room.on_failed_local_media()")
@@ -223,25 +239,10 @@ impl RoomHandle {
         }
 
         Rc::clone(&inner.rpc)
-            .connect(token)
+            .connect(connection_info)
             .await
             .map_err(tracerr::map_from_and_wrap!( => RoomError))?;
 
-        let mut connection_loss_stream = inner.rpc.on_connection_loss();
-        let weak_inner = Rc::downgrade(&inner);
-        spawn_local(async move {
-            while connection_loss_stream.next().await.is_some() {
-                if let Some(inner) = weak_inner.upgrade() {
-                    let reconnect_handle =
-                        ReconnectHandle::new(Rc::downgrade(&inner.rpc));
-                    inner.on_connection_loss.call(reconnect_handle);
-                } else {
-                    log::error!("Inner Room dropped unexpectedly");
-                    break;
-                }
-            }
-        });
-
         Ok(())
     }
 
@@ -319,7 +320,7 @@ impl RoomHandle {
     }
 
     /// Sets `on_connection_loss` callback, which will be invoked on
-    /// [`RpcClient`] connection loss.
+    /// [`WebSocketRpcClient`] connection loss.
     pub fn on_connection_loss(
         &self,
         f: js_sys::Function,
@@ -504,6 +505,20 @@ impl RoomHandle {
     }
 }
 
+/// [`Weak`] reference upgradeable to the [`Room`].
+#[derive(Clone)]
+pub struct WeakRoom(Weak<InnerRoom>);
+
+impl WeakRoom {
+    /// Upgrades this [`WeakRoom`] to the [`Room`].
+    ///
+    /// Returns [`None`] if weak reference cannot be upgraded.
+    #[inline]
+    pub fn upgrade(&self) -> Option<Room> {
+        self.0.upgrade().map(Room)
+    }
+}
+
 /// [`Room`] where all the media happens (manages concrete [`PeerConnection`]s,
 /// handles media server events, etc).
 ///
@@ -515,9 +530,12 @@ impl RoomHandle {
 pub struct Room(Rc<InnerRoom>);
 
 impl Room {
-    /// Creates new [`Room`] and associates it with a provided [`RpcClient`].
+    /// Creates new [`Room`] and associates it with the provided [`RpcSession`].
     #[allow(clippy::mut_mut)]
-    pub fn new(rpc: Rc<dyn RpcClient>, peers: Box<dyn PeerRepository>) -> Self {
+    pub fn new(
+        rpc: Rc<dyn RpcSession>,
+        peers: Box<dyn PeerRepository>,
+    ) -> Self {
         enum RoomEvent {
             RpcEvent(RpcEvent),
             PeerEvent(PeerEvent),
@@ -528,7 +546,7 @@ impl Room {
         let (tx, peer_events_rx) = mpsc::unbounded();
 
         let mut rpc_events_stream =
-            rpc.subscribe().map(RoomEvent::RpcEvent).fuse();
+            Rc::clone(&rpc).subscribe().map(RoomEvent::RpcEvent).fuse();
         let mut peer_events_stream =
             peer_events_rx.map(RoomEvent::PeerEvent).fuse();
         let mut rpc_connection_lost = rpc
@@ -553,47 +571,39 @@ impl Room {
                     complete => break,
                 };
 
-                match inner.upgrade() {
-                    None => {
-                        log::error!("Inner Room dropped unexpectedly");
-                        break;
-                    }
-                    Some(inner) => {
-                        match event {
-                            RoomEvent::RpcEvent(event) => {
-                                if let Err(err) =
-                                    event.dispatch_with(inner.deref()).await
-                                {
-                                    let (err, trace) = err.into_parts();
-                                    match err {
-                                        RoomError::InvalidLocalTracks(_)
-                                        | RoomError::CouldNotGetLocalMedia(_) =>
-                                        {
-                                            let e =
-                                                JasonError::from((err, trace));
-                                            e.print();
-                                            inner.on_failed_local_media.call(e);
-                                        }
-                                        _ => JasonError::from((err, trace))
-                                            .print(),
-                                    };
-                                };
-                            }
-                            RoomEvent::PeerEvent(event) => {
-                                if let Err(err) =
-                                    event.dispatch_with(inner.deref()).await
-                                {
-                                    JasonError::from(err).print();
-                                };
-                            }
-                            RoomEvent::RpcClientLostConnection => {
-                                inner.handle_rpc_connection_lost();
-                            }
-                            RoomEvent::RpcClientReconnected => {
-                                inner.handle_rpc_connection_recovered();
+                if let Some(inner) = inner.upgrade() {
+                    let event_handle_result = match event {
+                        RoomEvent::RpcEvent(event) => {
+                            event.dispatch_with(inner.deref()).await
+                        }
+                        RoomEvent::PeerEvent(event) => {
+                            event.dispatch_with(inner.deref()).await
+                        }
+                        RoomEvent::RpcClientLostConnection => {
+                            inner.handle_rpc_connection_lost();
+                            Ok(())
+                        }
+                        RoomEvent::RpcClientReconnected => {
+                            inner.handle_rpc_connection_recovered();
+                            Ok(())
+                        }
+                    };
+
+                    if let Err(err) = event_handle_result {
+                        let (err, trace) = err.into_parts();
+                        match err {
+                            RoomError::InvalidLocalTracks(_)
+                            | RoomError::CouldNotGetLocalMedia(_) => {
+                                let e = JasonError::from((err, trace));
+                                e.print();
+                                inner.on_failed_local_media.call(e);
                             }
+                            _ => JasonError::from((err, trace)).print(),
                         };
                     }
+                } else {
+                    log::error!("Inner Room dropped unexpectedly");
+                    break;
                 }
             }
         });
@@ -601,6 +611,12 @@ impl Room {
         Self(room)
     }
 
+    /// Downgrades this [`Room`] to a [`WeakRoom`] reference.
+    #[inline]
+    pub fn downgrade(&self) -> WeakRoom {
+        WeakRoom(Rc::downgrade(&self.0))
+    }
+
     /// Sets `close_reason` of [`InnerRoom`] and consumes [`Room`] pointer.
     ///
     /// Supposed that this function will trigger [`Drop`] implementation of
@@ -616,6 +632,12 @@ impl Room {
         self.0.set_close_reason(reason);
     }
 
+    /// Sets [`Room`]'s [`CloseReason`] to the provided value.
+    #[inline]
+    pub fn set_close_reason(&self, reason: CloseReason) {
+        self.0.set_close_reason(reason);
+    }
+
     /// Creates new [`RoomHandle`] used by JS side. You can create them as many
     /// as you need.
     #[inline]
@@ -633,6 +655,23 @@ impl Room {
     ) -> Option<Rc<PeerConnection>> {
         self.0.peers.get(peer_id)
     }
+
+    /// Indicates whether this [`Room`] reference is the same as the given
+    /// [`Room`] reference. Compares pointers, not values.
+    #[inline]
+    pub fn ptr_eq(&self, other: &Room) -> bool {
+        Rc::ptr_eq(&self.0, &other.0)
+    }
+
+    /// Indicates whether the provided [`RoomHandle`] points to the same
+    /// [`InnerRoom`] as this [`Room`] does.
+    #[inline]
+    pub fn inner_ptr_eq(&self, handle: &RoomHandle) -> bool {
+        handle
+            .0
+            .upgrade()
+            .map_or(false, |handle_inner| Rc::ptr_eq(&self.0, &handle_inner))
+    }
 }
 
 /// Actual data of a [`Room`].
@@ -640,7 +679,7 @@ impl Room {
 /// Shared between JS side ([`RoomHandle`]) and Rust side ([`Room`]).
 struct InnerRoom {
     /// Client to talk with media server via Client API RPC.
-    rpc: Rc<dyn RpcClient>,
+    rpc: Rc<dyn RpcSession>,
 
     /// Constraints to local [`MediaStream`] that is being published by
     /// [`PeerConnection`]s in this [`Room`].
@@ -667,7 +706,7 @@ struct InnerRoom {
     /// [`MediaManager`] or failed inject stream into [`PeerConnection`].
     on_failed_local_media: Rc<Callback1<JasonError>>,
 
-    /// Callback to be invoked when [`RpcClient`] loses connection.
+    /// Callback to be invoked when [`RpcSession`] loses connection.
     on_connection_loss: Callback1<ReconnectHandle>,
 
     /// JS callback which will be called when this [`Room`] will be closed.
@@ -686,7 +725,7 @@ impl InnerRoom {
     /// Creates new [`InnerRoom`].
     #[inline]
     fn new(
-        rpc: Rc<dyn RpcClient>,
+        rpc: Rc<dyn RpcSession>,
         peers: Box<dyn PeerRepository>,
         peer_event_sender: mpsc::UnboundedSender<PeerEvent>,
     ) -> Self {
@@ -959,6 +998,8 @@ impl InnerRoom {
         for peer in self.peers.get_all() {
             peer.stop_state_transitions_timers();
         }
+        self.on_connection_loss
+            .call(ReconnectHandle::new(Rc::downgrade(&self.rpc)));
     }
 
     /// Resets state transition timers in all [`PeerConnection`]'s in this
@@ -1167,6 +1208,19 @@ impl EventHandler for InnerRoom {
 
         Ok(())
     }
+
+    #[inline]
+    async fn on_room_joined(&self, _: MemberId) -> Self::Output {
+        unreachable!("Room can't receive Event::RoomJoined")
+    }
+
+    #[inline]
+    async fn on_room_left(
+        &self,
+        _: medea_client_api_proto::CloseReason,
+    ) -> Self::Output {
+        unreachable!("Room can't receive Event::RoomLeft")
+    }
 }
 
 /// [`PeerEvent`]s handling.
@@ -1277,13 +1331,9 @@ impl PeerEventHandler for InnerRoom {
             .peers
             .get(peer_id)
             .ok_or_else(|| tracerr::new!(RoomError::NoSuchPeer(peer_id)))?;
-        if let Err(err) = peer
-            .update_local_stream()
+        peer.update_local_stream()
             .await
-            .map_err(tracerr::map_from_and_wrap!(=> RoomError))
-        {
-            self.on_failed_local_media.call(JasonError::from(err));
-        };
+            .map_err(tracerr::map_from_and_wrap!(=> RoomError))?;
         Ok(())
     }
 }
@@ -1291,12 +1341,10 @@ impl PeerEventHandler for InnerRoom {
 impl Drop for InnerRoom {
     /// Unsubscribes [`InnerRoom`] from all its subscriptions.
     fn drop(&mut self) {
-        self.rpc.unsub();
-
         if let CloseReason::ByClient { reason, .. } =
             *self.close_reason.borrow()
         {
-            self.rpc.set_close_reason(reason);
+            self.rpc.close_with_reason(reason);
         };
 
         if let Some(Err(e)) = self
diff --git a/jason/src/rpc/heartbeat.rs b/jason/src/rpc/heartbeat.rs
index 4d863dcfa..5d13b2095 100644
--- a/jason/src/rpc/heartbeat.rs
+++ b/jason/src/rpc/heartbeat.rs
@@ -13,18 +13,18 @@ use crate::{
 };
 
 /// Errors that may occur in [`Heartbeat`].
-#[derive(Debug, Display, From, JsCaused)]
+#[derive(Clone, Debug, Display, From, JsCaused)]
 pub struct HeartbeatError(TransportError);
 
-/// Idle timeout of [`RpcClient`].
+/// Idle timeout of [`WebSocketRpcClient`].
 ///
-/// [`RpcClient`]: super::RpcClient
+/// [`WebSocketRpcClient`]: super::WebSocketRpcClient
 #[derive(Debug, Copy, Clone)]
 pub struct IdleTimeout(pub JsDuration);
 
-/// Ping interval of [`RpcClient`].
+/// Ping interval of [`WebSocketRpcClient`].
 ///
-/// [`RpcClient`]: super::RpcClient
+/// [`WebSocketRpcClient`]: super::WebSocketRpcClient
 #[derive(Debug, Copy, Clone, Mul)]
 pub struct PingInterval(pub JsDuration);
 
@@ -33,10 +33,10 @@ struct Inner {
     /// [`RpcTransport`] which heartbeats.
     transport: Rc<dyn RpcTransport>,
 
-    /// Idle timeout of [`RpcClient`].
+    /// Idle timeout of [`WebSocketRpcClient`].
     idle_timeout: IdleTimeout,
 
-    /// Ping interval of [`RpcClient`].
+    /// Ping interval of [`WebSocketRpcClient`].
     ping_interval: PingInterval,
 
     /// [`Abort`] for [`Future`] which sends [`ClientMsg::Pong`] on
diff --git a/jason/src/rpc/mod.rs b/jason/src/rpc/mod.rs
index d2b33cb0d..d3a3b37f1 100644
--- a/jason/src/rpc/mod.rs
+++ b/jason/src/rpc/mod.rs
@@ -3,150 +3,153 @@
 mod backoff_delayer;
 mod heartbeat;
 mod reconnect_handle;
+mod rpc_session;
 pub mod websocket;
 
-use std::{cell::RefCell, rc::Rc, time::Duration};
+use std::str::FromStr;
 
-use async_trait::async_trait;
 use derive_more::{Display, From};
-use futures::{
-    channel::{mpsc, oneshot},
-    future::LocalBoxFuture,
-    stream::{LocalBoxStream, StreamExt as _},
-};
 use medea_client_api_proto::{
-    ClientMsg, CloseDescription, CloseReason as CloseByServerReason, Command,
-    Event, RpcSettings, ServerMsg,
+    CloseDescription, CloseReason as CloseByServerReason, Credential, MemberId,
+    RoomId,
 };
-use medea_reactive::ObservableCell;
-use serde::Serialize;
 use tracerr::Traced;
-use wasm_bindgen_futures::spawn_local;
+use url::Url;
 use web_sys::CloseEvent;
 
-use crate::utils::{JasonError, JsCaused, JsError};
-
-use websocket::TransportState;
+use crate::utils::{JsCaused, JsError};
 
+#[cfg(feature = "mockable")]
+pub use self::rpc_session::MockRpcSession;
 #[doc(inline)]
 pub use self::{
     backoff_delayer::BackoffDelayer,
     heartbeat::{Heartbeat, HeartbeatError, IdleTimeout, PingInterval},
     reconnect_handle::ReconnectHandle,
-    websocket::{RpcTransport, TransportError, WebSocketRpcTransport},
+    rpc_session::{RpcSession, SessionError, WebSocketRpcSession},
+    websocket::{
+        ClientDisconnect, RpcTransport, TransportError, WebSocketRpcClient,
+        WebSocketRpcTransport,
+    },
 };
 
-/// Reasons of closing by client side and server side.
-#[derive(Copy, Clone, Display, Debug, Eq, PartialEq)]
-pub enum CloseReason {
-    /// Closed by server.
-    ByServer(CloseByServerReason),
+/// [`Url`] to which transport layer will connect.
+#[derive(Clone, Debug, Eq, From, PartialEq)]
+pub struct ApiUrl(Url);
 
-    /// Closed by client.
-    #[display(fmt = "{}", reason)]
-    ByClient {
-        /// Reason of closing.
-        reason: ClientDisconnect,
+/// Information about [`RpcSession`] connection.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct ConnectionInfo {
+    /// [`Url`] to which transport layer will connect.
+    url: ApiUrl,
 
-        /// Is closing considered as error.
-        is_err: bool,
-    },
-}
+    /// [`RoomId`] of the `Room` for which [`RpcSession`] is created.
+    room_id: RoomId,
 
-/// Reasons of closing by client side.
-#[derive(Copy, Clone, Display, Debug, Eq, PartialEq, Serialize)]
-pub enum ClientDisconnect {
-    /// [`Room`] was dropped without `close_reason`.
-    ///
-    /// [`Room`]: crate::api::Room
-    RoomUnexpectedlyDropped,
+    /// [`MemberId`] of the `Member` for which [`RpcSession`] is created.
+    member_id: MemberId,
 
-    /// [`Room`] was normally closed by JS side.
-    ///
-    /// [`Room`]: crate::api::Room
-    RoomClosed,
+    /// [`Credential`] for connecting [`RpcSession`].
+    credential: Credential,
+}
 
-    /// [`RpcClient`] was unexpectedly dropped.
-    ///
-    /// [`RpcClient`]: crate::rpc::RpcClient
-    RpcClientUnexpectedlyDropped,
+impl ConnectionInfo {
+    /// Returns [`ApiUrl`] to which transport layer will connect.
+    pub fn url(&self) -> &ApiUrl {
+        &self.url
+    }
 
-    /// [`RpcTransport`] was unexpectedly dropped.
-    ///
-    /// [`RpcTransport`]: crate::rpc::RpcTransport
-    RpcTransportUnexpectedlyDropped,
-}
+    /// Returns [`RoomId`] of the `Room` for which [`RpcSession`] is created.
+    pub fn room_id(&self) -> &RoomId {
+        &self.room_id
+    }
 
-impl ClientDisconnect {
-    /// Returns `true` if [`ClientDisconnect`] is considered as error.
-    pub fn is_err(self) -> bool {
-        match self {
-            Self::RoomUnexpectedlyDropped
-            | Self::RpcClientUnexpectedlyDropped
-            | Self::RpcTransportUnexpectedlyDropped => true,
-            Self::RoomClosed => false,
-        }
+    /// Returns [`MemberId`] of the `Member` for which [`RpcSession`] is
+    /// created.
+    pub fn member_id(&self) -> &MemberId {
+        &self.member_id
     }
-}
 
-impl Into<CloseReason> for ClientDisconnect {
-    fn into(self) -> CloseReason {
-        CloseReason::ByClient {
-            is_err: self.is_err(),
-            reason: self,
-        }
+    /// Returns [`Credential`] for connecting [`RpcSession`].
+    pub fn credential(&self) -> &Credential {
+        &self.credential
     }
 }
 
-/// Connection with remote was closed.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum CloseMsg {
-    /// Transport was gracefully closed by remote.
-    ///
-    /// Determines by close code `1000` and existence of
-    /// [`CloseByServerReason`].
-    Normal(u16, CloseByServerReason),
+/// Errors which can occur while [`ConnectionInfo`] parsing from the [`str`].
+#[derive(Debug, JsCaused, Display)]
+pub enum ConnectionInfoParseError {
+    /// [`Url::parse`] returned error.
+    #[display(fmt = "Failed to parse provided URL: {:?}", _0)]
+    UrlParse(url::ParseError),
 
-    /// Connection was unexpectedly closed. Consider reconnecting.
-    ///
-    /// Unexpected close determines by non-`1000` close code and for close code
-    /// `1000` without reason.
-    Abnormal(u16),
+    /// Provided URL doesn't have important segments.
+    #[display(fmt = "Provided URL doesn't have important segments")]
+    NotEnoughSegments,
 }
 
-impl From<&CloseEvent> for CloseMsg {
-    fn from(event: &CloseEvent) -> Self {
-        let code: u16 = event.code();
-        match code {
-            1000 => {
-                if let Ok(description) =
-                    serde_json::from_str::<CloseDescription>(&event.reason())
-                {
-                    Self::Normal(code, description.reason)
-                } else {
-                    Self::Abnormal(code)
-                }
-            }
-            _ => Self::Abnormal(code),
-        }
+impl FromStr for ConnectionInfo {
+    type Err = Traced<ConnectionInfoParseError>;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        use ConnectionInfoParseError as E;
+
+        let mut url =
+            Url::parse(s).map_err(|err| tracerr::new!(E::UrlParse(err)))?;
+        url.set_fragment(None);
+        url.set_query(None);
+
+        let mut segments = url
+            .path_segments()
+            .ok_or_else(|| tracerr::new!(E::NotEnoughSegments))?
+            .rev();
+        let credential = segments
+            .next()
+            .ok_or_else(|| tracerr::new!(E::NotEnoughSegments))?
+            .to_owned()
+            .into();
+        let member_id = segments
+            .next()
+            .ok_or_else(|| tracerr::new!(E::NotEnoughSegments))?
+            .to_owned()
+            .into();
+        let room_id = segments
+            .next()
+            .ok_or_else(|| tracerr::new!(E::NotEnoughSegments))?
+            .to_owned()
+            .into();
+
+        // Remove last three segments. Safe to unwrap cause we already made all
+        // necessary checks.
+        url.path_segments_mut().unwrap().pop().pop().pop();
+
+        Ok(ConnectionInfo {
+            url: url.into(),
+            room_id,
+            member_id,
+            credential,
+        })
     }
 }
 
-#[derive(Clone, Debug, PartialEq, From)]
-struct IsReconnected(bool);
+/// Reasons of closing by client side and server side.
+#[derive(Copy, Clone, Display, Debug, Eq, PartialEq)]
+pub enum CloseReason {
+    /// Closed by server.
+    ByServer(CloseByServerReason),
+
+    /// Closed by client.
+    #[display(fmt = "{}", reason)]
+    ByClient {
+        /// Reason of closing.
+        reason: ClientDisconnect,
 
-/// State of [`RpcClient`] and [`RpcTransport`].
-#[derive(Clone, Debug, PartialEq)]
-enum ClientState {
-    /// [`RpcClient`] is currently establishing connection to RPC server.
-    Connecting,
-    /// Connection with RPC Server is active.
-    Open(IsReconnected),
-    /// Connection with RPC server is currently closed.
-    Closed(ClosedStateReason),
+        /// Is closing considered as error.
+        is_err: bool,
+    },
 }
 
-/// The reason of why [`RpcClient`]/[`RpcTransport`] went into
+/// The reason of why [`WebSocketRpcClient`]/[`RpcTransport`] went into
 /// [`State::Closed`].
 #[derive(Clone, Debug, PartialEq)]
 pub enum ClosedStateReason {
@@ -164,8 +167,8 @@ pub enum ClosedStateReason {
     /// Indicates that connection with server has never been established.
     NeverConnected,
 
-    /// First received [`ServerMsg`] after [`RpcClient::connect`] is not
-    /// [`ServerMsg::RpcSettings`].
+    /// First received [`ServerMsg`] after [`WebSocketRpcClient::connect`] is
+    /// not [`ServerMsg::RpcSettings`].
     FirstServerMsgIsNotRpcSettings,
 
     /// Connection has been inactive for a while and thus considered idle
@@ -173,8 +176,8 @@ pub enum ClosedStateReason {
     Idle,
 }
 
-/// Errors that may occur in [`RpcClient`].
-#[derive(Debug, Display, From, JsCaused)]
+/// Errors that may occur in [`WebSocketRpcClient`].
+#[derive(Clone, Debug, Display, From, JsCaused)]
 pub enum RpcClientError {
     /// Occurs if WebSocket connection to remote media server failed.
     #[display(fmt = "Connection failed: {}", _0)]
@@ -195,496 +198,41 @@ pub enum RpcClientError {
     #[display(fmt = "RpcClient unexpectedly gone.")]
     RpcClientGone,
 
-    /// Occurs if [`RpcClient::connect`] fails.
+    /// Occurs if [`WebSocketRpcClient::connect`] fails.
     #[display(fmt = "Connection failed. {:?}", _0)]
     ConnectionFailed(ClosedStateReason),
 }
 
-/// Client to talk with server via Client API RPC.
-#[async_trait(?Send)]
-#[cfg_attr(feature = "mockable", mockall::automock)]
-pub trait RpcClient {
-    /// Tries to upgrade [`State`] of this [`RpcClient`] to [`State::Open`].
-    ///
-    /// This function is also used for reconnection of this [`RpcClient`].
-    ///
-    /// If [`RpcClient`] is closed than this function will try to establish
-    /// new RPC connection.
-    ///
-    /// If [`RpcClient`] already in [`State::Connecting`] then this function
-    /// will not perform one more connection try. It will subsribe to
-    /// [`State`] changes and wait for first connection result. And based on
-    /// this result - this function will be resolved.
-    ///
-    /// If [`RpcClient`] already in [`State::Open`] then this function will be
-    /// instantly resolved.
-    async fn connect(
-        self: Rc<Self>,
-        token: String,
-    ) -> Result<(), Traced<RpcClientError>>;
-
-    /// Returns [`Stream`] of all [`Event`]s received by this [`RpcClient`].
-    ///
-    /// [`Stream`]: futures::Stream
-    fn subscribe(&self) -> LocalBoxStream<'static, Event>;
-
-    /// Unsubscribes from this [`RpcClient`]. Drops all subscriptions atm.
-    fn unsub(&self);
-
-    /// Sends [`Command`] to server.
-    fn send_command(&self, command: Command);
-
-    /// [`Future`] which will resolve on normal [`RpcClient`] connection
-    /// closing.
-    ///
-    /// This [`Future`] wouldn't be resolved on abnormal closes. On
-    /// abnormal close [`RpcClient::on_connection_loss`] will be thrown.
-    ///
-    /// [`Future`]: std::future::Future
-    fn on_normal_close(
-        &self,
-    ) -> LocalBoxFuture<'static, Result<CloseReason, oneshot::Canceled>>;
-
-    /// Sets reason, that will be passed to underlying transport when this
-    /// client will be dropped.
-    fn set_close_reason(&self, close_reason: ClientDisconnect);
-
-    /// Subscribe to connection loss events.
-    ///
-    /// Connection loss is any unexpected [`RpcTransport`] close. In case of
-    /// connection loss, JS side user should select reconnection strategy with
-    /// [`ReconnectHandle`] (or simply close [`Room`]).
-    ///
-    /// [`Room`]: crate::api::Room
-    /// [`Stream`]: futures::Stream
-    fn on_connection_loss(&self) -> LocalBoxStream<'static, ()>;
-
-    /// Subscribe to reconnected events.
-    ///
-    /// This will fire when connection to RPC server is reestablished after
-    /// connection loss.
-    fn on_reconnected(&self) -> LocalBoxStream<'static, ()>;
-
-    /// Returns current token with which this [`RpcClient`] was connected.
-    ///
-    /// If token is `None` then [`RpcClient`] never was connected to a server.
-    fn get_token(&self) -> Option<String>;
-}
-
-/// Inner state of [`WebsocketRpcClient`].
-struct Inner {
-    /// [`WebSocket`] connection to remote media server.
-    sock: Option<Rc<dyn RpcTransport>>,
-
-    /// Connection loss detector via ping/pong mechanism.
-    heartbeat: Option<Heartbeat>,
-
-    /// Event's subscribers list.
-    subs: Vec<mpsc::UnboundedSender<Event>>,
-
-    /// [`oneshot::Sender`] with which [`CloseReason`] will be sent when
-    /// WebSocket connection normally closed by server.
-    ///
-    /// Note that [`CloseReason`] will not be sent if WebSocket closed with
-    /// [`RpcConnectionCloseReason::NewConnection`] reason.
-    on_close_subscribers: Vec<oneshot::Sender<CloseReason>>,
-
-    /// Reason of [`WebsocketRpcClient`] closing.
-    ///
-    /// This reason will be provided to underlying [`RpcTransport`].
-    close_reason: ClientDisconnect,
-
-    /// Senders for [`RpcClient::on_connection_loss`] subscribers.
-    on_connection_loss_subs: Vec<mpsc::UnboundedSender<()>>,
-
-    /// Closure which will create new [`RpcTransport`]s for this [`RpcClient`]
-    /// on every [`WebSocketRpcClient::establish_connection`] call.
-    rpc_transport_factory: RpcTransportFactory,
-
-    /// Token with which this [`RpcClient`] was connected.
+/// Connection with remote was closed.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum CloseMsg {
+    /// Transport was gracefully closed by remote.
     ///
-    /// Will be `None` if this [`RpcClient`] was never connected to a sever.
-    token: Option<String>,
-
-    /// Current [`State`] of this [`RpcClient`].
-    state: ObservableCell<ClientState>,
-}
-
-/// Factory closure which creates [`RpcTransport`] for
-/// [`WebSocketRpcClient::establish_connection`] function.
-type RpcTransportFactory = Box<
-    dyn Fn(
-        String,
-    ) -> LocalBoxFuture<
-        'static,
-        Result<Rc<dyn RpcTransport>, Traced<TransportError>>,
-    >,
->;
-
-impl Inner {
-    fn new(rpc_transport_factory: RpcTransportFactory) -> RefCell<Self> {
-        RefCell::new(Self {
-            sock: None,
-            on_close_subscribers: Vec::new(),
-            subs: Vec::new(),
-            heartbeat: None,
-            close_reason: ClientDisconnect::RpcClientUnexpectedlyDropped,
-            on_connection_loss_subs: Vec::new(),
-            rpc_transport_factory,
-            token: None,
-            state: ObservableCell::new(ClientState::Closed(
-                ClosedStateReason::NeverConnected,
-            )),
-        })
-    }
-}
-
-// TODO:
-// 1. Proper sub registry.
-// 2. Reconnect.
-// 3. Disconnect if no pongs.
-// 4. Buffering if no socket?
-/// Client API RPC client to talk with server via [WebSocket].
-///
-/// [WebSocket]: https://developer.mozilla.org/ru/docs/WebSockets
-pub struct WebSocketRpcClient(RefCell<Inner>);
-
-impl WebSocketRpcClient {
-    /// Creates new [`WebSocketRpcClient`] with provided [`RpcTransportFactory`]
-    /// closure.
-    pub fn new(rpc_transport_factory: RpcTransportFactory) -> Self {
-        Self(Inner::new(rpc_transport_factory))
-    }
-
-    /// Stops [`Heartbeat`] and notifies all [`RpcClient::on_connection_loss`]
-    /// subs about connection loss.
-    fn handle_connection_loss(&self, closed_state_reason: ClosedStateReason) {
-        self.0
-            .borrow()
-            .state
-            .set(ClientState::Closed(closed_state_reason));
-        self.0.borrow_mut().heartbeat.take();
-        self.0
-            .borrow_mut()
-            .on_connection_loss_subs
-            .retain(|sub| !sub.is_closed());
-
-        for sub in &self.0.borrow().on_connection_loss_subs {
-            let _ = sub.unbounded_send(());
-        }
-    }
+    /// Determines by close code `1000` and existence of
+    /// [`CloseByServerReason`].
+    Normal(u16, CloseByServerReason),
 
-    /// Handles [`CloseMsg`] from a remote server.
+    /// Connection was unexpectedly closed. Consider reconnecting.
     ///
-    /// This function will be called on every WebSocket close (normal and
-    /// abnormal) regardless of the [`CloseReason`].
-    fn handle_close_message(&self, close_msg: CloseMsg) {
-        self.0.borrow_mut().heartbeat.take();
-
-        match close_msg {
-            CloseMsg::Normal(_, reason) => match reason {
-                CloseByServerReason::Reconnected => (),
-                CloseByServerReason::Idle => {
-                    self.handle_connection_loss(
-                        ClosedStateReason::ConnectionLost(close_msg),
-                    );
-                }
-                _ => {
-                    self.0.borrow_mut().sock.take();
-                    self.0
-                        .borrow_mut()
-                        .on_close_subscribers
-                        .drain(..)
-                        .for_each(|sub| {
-                            let _ = sub.send(CloseReason::ByServer(reason));
-                        });
-                }
-            },
-            CloseMsg::Abnormal(_) => {
-                self.handle_connection_loss(ClosedStateReason::ConnectionLost(
-                    close_msg,
-                ));
-            }
-        }
-    }
-
-    /// Handles [`ServerMsg`]s from a remote server.
-    fn on_transport_message(&self, msg: ServerMsg) {
-        match msg {
-            ServerMsg::Event(event) => {
-                // TODO: filter messages by session
-                self.0
-                    .borrow_mut()
-                    .subs
-                    .retain(|sub| sub.unbounded_send(event.clone()).is_ok());
-            }
-            ServerMsg::RpcSettings(settings) => {
-                self.update_settings(
-                    IdleTimeout(
-                        Duration::from_millis(settings.idle_timeout_ms.into())
-                            .into(),
-                    ),
-                    PingInterval(
-                        Duration::from_millis(settings.ping_interval_ms.into())
-                            .into(),
-                    ),
-                )
-                .map_err(tracerr::wrap!(=> RpcClientError))
-                .map_err(|e| {
-                    log::error!("Failed to update socket settings: {}", e)
-                })
-                .ok();
-            }
-            ServerMsg::Ping(_) => {}
-        }
-    }
-
-    /// Starts [`Heartbeat`] with provided [`RpcSettings`] for provided
-    /// [`RpcTransport`].
-    async fn start_heartbeat(
-        self: Rc<Self>,
-        transport: Rc<dyn RpcTransport>,
-        rpc_settings: RpcSettings,
-    ) -> Result<(), Traced<RpcClientError>> {
-        let idle_timeout = IdleTimeout(
-            Duration::from_millis(rpc_settings.idle_timeout_ms.into()).into(),
-        );
-        let ping_interval = PingInterval(
-            Duration::from_millis(rpc_settings.ping_interval_ms.into()).into(),
-        );
-
-        let heartbeat =
-            Heartbeat::start(transport, ping_interval, idle_timeout);
-
-        let mut on_idle = heartbeat.on_idle();
-        let weak_this = Rc::downgrade(&self);
-        spawn_local(async move {
-            while on_idle.next().await.is_some() {
-                if let Some(this) = weak_this.upgrade() {
-                    this.handle_connection_loss(ClosedStateReason::Idle);
-                }
-            }
-        });
-        self.0.borrow_mut().heartbeat = Some(heartbeat);
-
-        Ok(())
-    }
-
-    /// Tries to establish [`RpcClient`] connection.
-    async fn establish_connection(
-        self: Rc<Self>,
-        token: String,
-    ) -> Result<(), Traced<RpcClientError>> {
-        self.0.borrow_mut().token = Some(token.clone());
-        self.0.borrow().state.set(ClientState::Connecting);
-
-        // wait for transport open
-        let create_transport_fut =
-            (self.0.borrow().rpc_transport_factory)(token);
-        let transport = create_transport_fut.await.map_err(|e| {
-            let transport_err = e.into_inner();
-            self.0.borrow().state.set(ClientState::Closed(
-                ClosedStateReason::ConnectionFailed(transport_err.clone()),
-            ));
-            tracerr::new!(RpcClientError::from(
-                ClosedStateReason::ConnectionFailed(transport_err)
-            ))
-        })?;
-
-        // wait for ServerMsg::RpcSettings
-        if let Some(msg) = transport.on_message().next().await {
-            if let ServerMsg::RpcSettings(rpc_settings) = msg {
-                Rc::clone(&self)
-                    .start_heartbeat(Rc::clone(&transport), rpc_settings)
-                    .await?;
-            } else {
-                let close_reason =
-                    ClosedStateReason::FirstServerMsgIsNotRpcSettings;
-                self.0
-                    .borrow()
-                    .state
-                    .set(ClientState::Closed(close_reason.clone()));
-                return Err(tracerr::new!(RpcClientError::ConnectionFailed(
-                    close_reason
-                )));
-            }
-        } else {
-            self.0.borrow().state.set(ClientState::Closed(
-                ClosedStateReason::FirstServerMsgIsNotRpcSettings,
-            ));
-            return Err(tracerr::new!(RpcClientError::NoSocket));
-        }
-
-        // subscribe to transport close
-        let mut transport_state_changes = transport.on_state_change();
-        let weak_this = Rc::downgrade(&self);
-        spawn_local(async move {
-            while let Some(state) = transport_state_changes.next().await {
-                if let Some(this) = weak_this.upgrade() {
-                    if let TransportState::Closed(msg) = state {
-                        this.handle_close_message(msg);
-                    }
-                }
-            }
-        });
-
-        // subscribe to transport message received
-        let weak_this = Rc::downgrade(&self);
-        let mut on_socket_message = transport.on_message();
-        spawn_local(async move {
-            while let Some(msg) = on_socket_message.next().await {
-                if let Some(this) = weak_this.upgrade() {
-                    this.on_transport_message(msg)
-                }
-            }
-        });
-
-        let is_reconnected =
-            self.0.borrow_mut().sock.replace(transport).is_some();
-        self.0
-            .borrow()
-            .state
-            .set(ClientState::Open(is_reconnected.into()));
-
-        Ok(())
-    }
-
-    /// Subscribes to [`RpcClient`]'s [`State`] changes and when
-    /// [`State::Connecting`] will be changed to something else, then this
-    /// [`Future`] will be resolved and based on new [`State`] [`Result`]
-    /// will be returned.
-    async fn connecting_result(&self) -> Result<(), Traced<RpcClientError>> {
-        let mut state_changes = self.0.borrow().state.subscribe();
-        while let Some(state) = state_changes.next().await {
-            match state {
-                ClientState::Open(_) => {
-                    return Ok(());
-                }
-                ClientState::Closed(reason) => {
-                    return Err(tracerr::new!(
-                        RpcClientError::ConnectionFailed(reason)
-                    ));
-                }
-                ClientState::Connecting => (),
-            }
-        }
-        Err(tracerr::new!(RpcClientError::RpcClientGone))
-    }
-
-    /// Updates RPC settings of this [`RpcClient`].
-    fn update_settings(
-        &self,
-        idle_timeout: IdleTimeout,
-        ping_interval: PingInterval,
-    ) -> Result<(), Traced<RpcClientError>> {
-        self.0
-            .borrow_mut()
-            .heartbeat
-            .as_ref()
-            .ok_or_else(|| tracerr::new!(RpcClientError::NoSocket))
-            .map(|heartbeat| {
-                heartbeat.update_settings(idle_timeout, ping_interval)
-            })
-    }
+    /// Unexpected close determines by non-`1000` close code and for close code
+    /// `1000` without reason.
+    Abnormal(u16),
 }
 
-#[async_trait(?Send)]
-impl RpcClient for WebSocketRpcClient {
-    async fn connect(
-        self: Rc<Self>,
-        token: String,
-    ) -> Result<(), Traced<RpcClientError>> {
-        let current_token = self.0.borrow().token.clone();
-        if let Some(current_token) = current_token {
-            if current_token == token {
-                let state = self.0.borrow().state.borrow().clone();
-                match state {
-                    ClientState::Open(_) => Ok(()),
-                    ClientState::Connecting => self.connecting_result().await,
-                    ClientState::Closed(_) => {
-                        self.establish_connection(token).await
-                    }
-                }
-            } else {
-                self.establish_connection(token).await
-            }
-        } else {
-            self.establish_connection(token).await
-        }
-    }
-
-    // TODO: proper sub registry
-    fn subscribe(&self) -> LocalBoxStream<'static, Event> {
-        let (tx, rx) = mpsc::unbounded();
-        self.0.borrow_mut().subs.push(tx);
-
-        Box::pin(rx)
-    }
-
-    // TODO: proper sub registry
-    fn unsub(&self) {
-        self.0.borrow_mut().subs.clear();
-    }
-
-    // TODO: proper sub registry
-    fn send_command(&self, command: Command) {
-        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() {
-            if let Err(err) = socket.send(&ClientMsg::Command(command)) {
-                // TODO: we will just wait for reconnect at this moment
-                //       should be handled properly as a part of future
-                //       state synchronization mechanism
-                //       PR: https://github.com/instrumentisto/medea/pull/51
-                JasonError::from(err).print()
-            }
-        }
-    }
-
-    fn on_normal_close(
-        &self,
-    ) -> LocalBoxFuture<'static, Result<CloseReason, oneshot::Canceled>> {
-        let (tx, rx) = oneshot::channel();
-        self.0.borrow_mut().on_close_subscribers.push(tx);
-        Box::pin(rx)
-    }
-
-    fn on_connection_loss(&self) -> LocalBoxStream<'static, ()> {
-        let (tx, rx) = mpsc::unbounded();
-        self.0.borrow_mut().on_connection_loss_subs.push(tx);
-        Box::pin(rx)
-    }
-
-    fn on_reconnected(&self) -> LocalBoxStream<'static, ()> {
-        self.0
-            .borrow()
-            .state
-            .subscribe()
-            .filter_map(|state| async move {
-                if state == ClientState::Open(IsReconnected(true)) {
-                    Some(())
+impl From<&CloseEvent> for CloseMsg {
+    fn from(event: &CloseEvent) -> Self {
+        let code: u16 = event.code();
+        match code {
+            1000 => {
+                if let Ok(description) =
+                    serde_json::from_str::<CloseDescription>(&event.reason())
+                {
+                    Self::Normal(code, description.reason)
                 } else {
-                    None
+                    Self::Abnormal(code)
                 }
-            })
-            .boxed_local()
-    }
-
-    fn set_close_reason(&self, close_reason: ClientDisconnect) {
-        self.0.borrow_mut().close_reason = close_reason
-    }
-
-    fn get_token(&self) -> Option<String> {
-        self.0.borrow().token.clone()
-    }
-}
-
-impl Drop for Inner {
-    /// Drops related connection and its [`Heartbeat`].
-    fn drop(&mut self) {
-        if let Some(socket) = self.sock.take() {
-            socket.set_close_reason(self.close_reason);
+            }
+            _ => Self::Abnormal(code),
         }
     }
 }
diff --git a/jason/src/rpc/reconnect_handle.rs b/jason/src/rpc/reconnect_handle.rs
index 8830ccbe7..367220f64 100644
--- a/jason/src/rpc/reconnect_handle.rs
+++ b/jason/src/rpc/reconnect_handle.rs
@@ -1,4 +1,4 @@
-//! Reconnection for [`RpcClient`].
+//! Reconnection for [`RpcSession`].
 
 use std::{rc::Weak, time::Duration};
 
@@ -8,11 +8,11 @@ use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::future_to_promise;
 
 use crate::{
-    rpc::{BackoffDelayer, RpcClient},
+    rpc::{BackoffDelayer, RpcSession},
     utils::{delay_for, HandlerDetachedError, JasonError, JsCaused, JsError},
 };
 
-/// Error which indicates that [`RpcClient`]'s (which this [`ReconnectHandle`]
+/// Error which indicates that [`RpcSession`]'s (which this [`ReconnectHandle`]
 /// tries to reconnect) token is `None`.
 #[derive(Debug, Display, JsCaused)]
 struct NoTokenError;
@@ -23,12 +23,12 @@ struct NoTokenError;
 /// This handle will be provided into `Room.on_connection_loss` callback.
 #[wasm_bindgen]
 #[derive(Clone)]
-pub struct ReconnectHandle(Weak<dyn RpcClient>);
+pub struct ReconnectHandle(Weak<dyn RpcSession>);
 
 impl ReconnectHandle {
-    /// Instantiates new [`ReconnectHandle`] from the given [`RpcClient`]
+    /// Instantiates new [`ReconnectHandle`] from the given [`RpcSesion`]
     /// reference.
-    pub fn new(rpc: Weak<dyn RpcClient>) -> Self {
+    pub fn new(rpc: Weak<dyn RpcSession>) -> Self {
         Self(rpc)
     }
 }
@@ -37,7 +37,7 @@ impl ReconnectHandle {
 impl ReconnectHandle {
     /// Tries to reconnect after the provided delay in milliseconds.
     ///
-    /// If [`RpcClient`] is already reconnecting then new reconnection attempt
+    /// If [`RpcSession`] is already reconnecting then new reconnection attempt
     /// won't be performed. Instead, it will wait for the first reconnection
     /// attempt result and use it here.
     pub fn reconnect_with_delay(&self, delay_ms: u32) -> Promise {
@@ -46,10 +46,7 @@ impl ReconnectHandle {
             delay_for(Duration::from_millis(u64::from(delay_ms)).into()).await;
 
             let rpc = upgrade_or_detached!(rpc, JsValue)?;
-            let token = rpc
-                .get_token()
-                .ok_or_else(|| new_js_error!(NoTokenError => JsValue))?;
-            rpc.connect(token)
+            rpc.reconnect()
                 .await
                 .map_err(|e| JsValue::from(JasonError::from(e)))?;
 
@@ -57,7 +54,8 @@ impl ReconnectHandle {
         })
     }
 
-    /// Tries to reconnect [`RpcClient`] in a loop with a growing backoff delay.
+    /// Tries to reconnect [`RpcSession`] in a loop with a growing backoff
+    /// delay.
     ///
     /// The first attempt to reconnect is guaranteed to happen no earlier than
     /// `starting_delay_ms`.
@@ -68,7 +66,7 @@ impl ReconnectHandle {
     /// After each reconnection attempt, delay between reconnections will be
     /// multiplied by the given `multiplier` until it reaches `max_delay_ms`.
     ///
-    /// If [`RpcClient`] is already reconnecting then new reconnection attempt
+    /// If [`RpcSession`] is already reconnecting then new reconnection attempt
     /// won't be performed. Instead, it will wait for the first reconnection
     /// attempt result and use it here.
     ///
@@ -82,10 +80,6 @@ impl ReconnectHandle {
     ) -> Promise {
         let rpc = self.0.clone();
         future_to_promise(async move {
-            let token = upgrade_or_detached!(rpc, JsValue)?
-                .get_token()
-                .ok_or_else(|| new_js_error!(NoTokenError => JsValue))?;
-
             let mut backoff_delayer = BackoffDelayer::new(
                 Duration::from_millis(u64::from(starting_delay_ms)).into(),
                 multiplier,
@@ -93,7 +87,7 @@ impl ReconnectHandle {
             );
             backoff_delayer.delay().await;
             while upgrade_or_detached!(rpc, JsValue)?
-                .connect(token.clone())
+                .reconnect()
                 .await
                 .is_err()
             {
diff --git a/jason/src/rpc/rpc_session.rs b/jason/src/rpc/rpc_session.rs
new file mode 100644
index 000000000..a112fe843
--- /dev/null
+++ b/jason/src/rpc/rpc_session.rs
@@ -0,0 +1,627 @@
+use std::{
+    cell::{Cell, RefCell},
+    rc::Rc,
+};
+
+use async_trait::async_trait;
+use derivative::Derivative;
+use derive_more::{Display, From};
+use futures::{
+    channel::mpsc,
+    future::{self, LocalBoxFuture},
+    stream::LocalBoxStream,
+    StreamExt,
+};
+use medea_client_api_proto::{Command, Event, MemberId, RoomId};
+use medea_reactive::ObservableCell;
+use tracerr::Traced;
+use wasm_bindgen_futures::spawn_local;
+
+use crate::{
+    rpc::{
+        websocket::RpcEventHandler, ClientDisconnect, CloseReason,
+        ConnectionInfo, RpcClientError, WebSocketRpcClient,
+    },
+    utils::{JsCaused, JsError},
+};
+
+/// Errors which are can be returned from the [`WebSocketRpcSession`].
+#[derive(Clone, Debug, From, JsCaused, Display)]
+pub enum SessionError {
+    /// [`WebSocketRpcSession`] goes into [`SessionState::Finished`] and can't
+    /// be used.
+    #[display(fmt = "RPC Session finished with {:?} close reason", _0)]
+    SessionFinished(CloseReason),
+
+    /// [`WebSocketRpcSession`] doesn't have any credentials to authorize with.
+    #[display(
+        fmt = "RPC Session doesn't have any credentials to authorize with"
+    )]
+    NoCredentials,
+
+    /// [`WebSocketRpcSession`] authorization on the server was failed.
+    #[display(fmt = "RPC Session authorization on the server was failed")]
+    AuthorizationFailed,
+
+    /// [`WebSocketRpcClient`] returned [`RpcClientError`].
+    #[display(fmt = "RpcClientError: {:?}", _0)]
+    RpcClient(#[js(cause)] RpcClientError),
+
+    /// [`WebSocketRpcSession`] was unexpectedly dropped.
+    #[display(fmt = "RPC Session was unexpectedly dropped")]
+    SessionUnexpectedlyDropped,
+
+    /// [`WebSocketRpcClient`] lost connection with a server.
+    #[display(fmt = "Connection with a server was lost")]
+    ConnectionLost,
+
+    /// [`WebSocketRpcSession::connect`] called while connecting to the server.
+    ///
+    /// So old connection process was canceled.
+    #[display(fmt = "New connection info was provided")]
+    NewConnectionInfo,
+}
+
+/// Client to talk with server via Client API RPC.
+#[async_trait(?Send)]
+#[cfg_attr(feature = "mockable", mockall::automock)]
+pub trait RpcSession {
+    /// Tries to upgrade [`SessionState`] of this [`RpcSession`] to
+    /// [`SessionState::Opened`].
+    ///
+    /// This function is also used for reconnection of this [`RpcSession`].
+    ///
+    /// If [`RpcSession`] is closed than this function will try to establish
+    /// new RPC connection.
+    ///
+    /// If [`RpcSession`] already in [`SessionState::Connecting`] then this
+    /// function will not perform one more connection try. It will subsribe
+    /// to [`SessionState`] changes and wait for first connection result.
+    /// And based on this result - this function will be resolved.
+    ///
+    /// If [`RpcSession`] already in [`SessionState::Open`] then this function
+    /// will be instantly resolved.
+    async fn connect(
+        self: Rc<Self>,
+        connection_info: ConnectionInfo,
+    ) -> Result<(), Traced<SessionError>>;
+
+    /// Tries to reconnect (or connect) this [`RpcSession`] to the Media Server.
+    async fn reconnect(self: Rc<Self>) -> Result<(), Traced<SessionError>>;
+
+    /// Returns [`Stream`] of all [`Event`]s received by this [`RpcSession`].
+    ///
+    /// [`Stream`]: futures::Stream
+    fn subscribe(&self) -> LocalBoxStream<'static, Event>;
+
+    /// Sends [`Command`] to server.
+    fn send_command(&self, command: Command);
+
+    /// [`Future`] which will resolve on normal [`RpcSession`] connection
+    /// closing.
+    ///
+    /// This [`Future`] wouldn't be resolved on abnormal closes. On
+    /// abnormal close [`RpcSession::on_connection_loss`] will be thrown.
+    ///
+    /// [`Future`]: std::future::Future
+    fn on_normal_close(&self) -> LocalBoxFuture<'static, CloseReason>;
+
+    /// Sets reason, that will be passed to underlying transport when this
+    /// client will be dropped.
+    fn close_with_reason(&self, close_reason: ClientDisconnect);
+
+    /// Subscribe to connection loss events.
+    ///
+    /// Connection loss is any unexpected [`RpcTransport`] close. In case of
+    /// connection loss, JS side user should select reconnection strategy with
+    /// [`ReconnectHandle`] (or simply close [`Room`]).
+    ///
+    /// [`Room`]: crate::api::Room
+    /// [`Stream`]: futures::Stream
+    fn on_connection_loss(&self) -> LocalBoxStream<'static, ()>;
+
+    /// Subscribe to reconnected events.
+    ///
+    /// This will fire when connection to RPC server is reestablished after
+    /// connection loss.
+    fn on_reconnected(&self) -> LocalBoxStream<'static, ()>;
+}
+
+/// Client to talk with server via Client API RPC.
+///
+/// Responsible for [`Room`] authorization and closing.
+pub struct WebSocketRpcSession {
+    /// [WebSocket] based Rpc Client used to .
+    ///
+    /// [WebSocket]: https://developer.mozilla.org/ru/docs/WebSockets
+    client: Rc<WebSocketRpcClient>,
+
+    /// Current [`SessionState`] of this [`WebSocketRpcSession`].
+    state: ObservableCell<SessionState>,
+
+    /// Flag which indicates that [`WebSocketRpcSession`] goes to the
+    /// [`SessionState::Lost`] from the [`SessionState::Open`].
+    can_reconnect: Rc<Cell<bool>>,
+
+    /// Subscribers of the [`RpcSession::subscribe`].
+    event_txs: RefCell<Vec<mpsc::UnboundedSender<Event>>>,
+}
+
+impl WebSocketRpcSession {
+    /// Returns new uninitialized [`WebSocketRpcSession`] with a provided
+    /// [`WebSocketRpcClient`].
+    ///
+    /// Spawns all [`WebSocketpRpcSession`] task.
+    pub fn new(client: Rc<WebSocketRpcClient>) -> Rc<Self> {
+        let this = Rc::new(Self {
+            client,
+            state: ObservableCell::new(SessionState::Uninitialized),
+            can_reconnect: Rc::new(Cell::new(false)),
+            event_txs: RefCell::default(),
+        });
+
+        this.spawn_state_watcher();
+        this.spawn_connection_loss_watcher();
+        this.spawn_close_watcher();
+        this.spawn_server_msg_listener();
+
+        this
+    }
+
+    /// Tries to establish transport connection to media server and authorize
+    /// RPC session.
+    ///
+    /// If [`WebSocketRpcSession`] is already trying to do it, then this method
+    /// will wait for connection result and return it.
+    ///
+    /// # Errors
+    ///
+    /// Errors with [`SessionError::NoCredentials`] if current [`SessionState`]
+    /// is [`SessionState::Uninitialized`].
+    ///
+    /// Errors with [`SessionError::SessionFinished`] if current
+    /// [`SessionState`] is [`SessionState::Finished`].
+    ///
+    /// Errors with [`SessionError::NewConnectionInfo`] if [`SessionState`] goes
+    /// into [`SessionState::Initialized`].
+    ///
+    /// Errors with [`SessionError::AuthorizationFailed`] if [`SessionState`]
+    /// goes into [`SessionState::Uninitialized`].
+    ///
+    /// Errors with [`SessionError::SessionFinished`] if [`SessionState`] goes
+    /// into [`SessionState::Finished`].
+    ///
+    /// Errors with [`SessionError`] if [`SessionState`] goes into
+    /// [`SessionState::Lost`].
+    async fn inner_connect(self: Rc<Self>) -> Result<(), Traced<SessionError>> {
+        use SessionError as E;
+        use SessionState as S;
+
+        match self.state.get() {
+            S::Connecting(_) | S::Authorizing(_) | S::Opened(_) => {}
+            S::Initialized(info) | S::Lost(_, info) => {
+                self.state.set(S::Connecting(info));
+            }
+            S::Uninitialized => {
+                return Err(tracerr::new!(E::NoCredentials));
+            }
+            S::Finished(reason) => {
+                return Err(tracerr::new!(E::SessionFinished(reason)));
+            }
+        }
+
+        let mut state_updates_stream = self.state.subscribe();
+        while let Some(state) = state_updates_stream.next().await {
+            match state {
+                S::Opened(_) => return Ok(()),
+                S::Initialized(_) => {
+                    return Err(tracerr::new!(E::NewConnectionInfo));
+                }
+                S::Lost(err, _) => {
+                    // TODO: Clone Traced and add new Frame to it when Traced
+                    //       cloning will be implemented.
+                    return Err(tracerr::new!(AsRef::<SessionError>::as_ref(
+                        &err.as_ref()
+                    )
+                    .clone()));
+                }
+                S::Uninitialized => {
+                    return Err(tracerr::new!(E::AuthorizationFailed));
+                }
+                S::Finished(reason) => {
+                    return Err(tracerr::new!(E::SessionFinished(reason)));
+                }
+                _ => {}
+            }
+        }
+
+        Err(tracerr::new!(E::SessionUnexpectedlyDropped))
+    }
+
+    /// Spawns [`SessionState`] updates handler for this
+    /// [`WebSocketRpcSession`].
+    fn spawn_state_watcher(self: &Rc<Self>) {
+        use SessionState as S;
+
+        let mut state_updates = self.state.subscribe();
+        let weak_this = Rc::downgrade(self);
+        spawn_local(async move {
+            while let Some(state) = state_updates.next().await {
+                let this = upgrade_or_break!(weak_this);
+                match state {
+                    S::Connecting(info) => {
+                        match Rc::clone(&this.client)
+                            .connect(info.url.clone())
+                            .await
+                            .map_err(tracerr::map_from_and_wrap!())
+                        {
+                            Ok(_) => {
+                                this.state.set(S::Authorizing(info));
+                            }
+                            Err(e) => {
+                                this.state.set(S::Lost(Rc::new(e), info));
+                            }
+                        }
+                    }
+                    S::Authorizing(info) => {
+                        this.client.authorize(
+                            info.room_id.clone(),
+                            info.member_id.clone(),
+                            info.credential.clone(),
+                        );
+                    }
+                    _ => {}
+                }
+            }
+        });
+    }
+
+    /// Spawns [`WebSocketRpcClient::on_connection_loss`] listener.
+    ///
+    /// Handler for the [`WebSocketRpcClient::on_connection_loss`].
+    ///
+    /// Sets [`WebSocketRpcSession::state`] to the [`SessionState::Lost`].
+    fn spawn_connection_loss_watcher(self: &Rc<Self>) {
+        use SessionState as S;
+
+        let mut client_on_connection_loss = self.client.on_connection_loss();
+        let weak_this = Rc::downgrade(self);
+        spawn_local(async move {
+            while client_on_connection_loss.next().await.is_some() {
+                let this = upgrade_or_break!(weak_this);
+
+                let state = this.state.get();
+                if matches!(state, S::Opened(_)) {
+                    this.can_reconnect.set(true);
+                }
+                match state {
+                    S::Connecting(info)
+                    | S::Authorizing(info)
+                    | S::Opened(info) => {
+                        this.state.set(S::Lost(
+                            Rc::new(tracerr::new!(
+                                SessionError::ConnectionLost
+                            )),
+                            info,
+                        ));
+                    }
+                    S::Uninitialized
+                    | S::Initialized(_)
+                    | S::Lost(_, _)
+                    | S::Finished(_) => {}
+                }
+            }
+        });
+    }
+
+    /// Spawns [`WebSocketRpcClient::on_normal_close`] listener.
+    fn spawn_close_watcher(self: &Rc<Self>) {
+        let on_normal_close = self.client.on_normal_close();
+        let weak_this = Rc::downgrade(self);
+        spawn_local(async move {
+            let reason = on_normal_close.await.unwrap_or_else(|_| {
+                ClientDisconnect::RpcClientUnexpectedlyDropped.into()
+            });
+            if let Some(this) = weak_this.upgrade() {
+                this.state.set(SessionState::Finished(reason));
+            }
+        });
+    }
+
+    /// Spawns [`WebSocketRpcClient::subscribe`] listener.
+    fn spawn_server_msg_listener(self: &Rc<Self>) {
+        let mut server_msg_rx = self.client.subscribe();
+        let weak_this = Rc::downgrade(self);
+        spawn_local(async move {
+            while let Some(msg) = server_msg_rx.next().await {
+                let this = upgrade_or_break!(weak_this);
+                msg.dispatch_with(this.as_ref());
+            }
+        })
+    }
+}
+
+#[async_trait(?Send)]
+impl RpcSession for WebSocketRpcSession {
+    /// Tries to connect to the server with a provided [`ConnectionInfo`].
+    ///
+    /// # Errors
+    ///
+    /// Errors with [`SessionError::SessionFinished`] if current
+    /// [`SessionState`] is [`SessionState::Finished`].
+    ///
+    /// Errors with [`SessionError`] if [`WebSocketRpcSession::connect`] errors.
+    async fn connect(
+        self: Rc<Self>,
+        connection_info: ConnectionInfo,
+    ) -> Result<(), Traced<SessionError>> {
+        use SessionState as S;
+
+        match self.state.get() {
+            S::Uninitialized | S::Initialized(_) | S::Lost(_, _) => {
+                self.state.set(S::Initialized(Rc::new(connection_info)));
+            }
+            S::Finished(reason) => {
+                return Err(tracerr::new!(SessionError::SessionFinished(
+                    reason
+                )));
+            }
+            S::Connecting(info) => {
+                if info.as_ref() != &connection_info {
+                    self.state.set(S::Initialized(Rc::new(connection_info)));
+                }
+            }
+            S::Authorizing(info) | S::Opened(info) => {
+                if info.as_ref() != &connection_info {
+                    unimplemented!(
+                        "Changing `ConnectionInfo` with active or pending \
+                         authorization is not supported"
+                    );
+                }
+            }
+        }
+
+        self.inner_connect()
+            .await
+            .map_err(tracerr::map_from_and_wrap!())?;
+
+        Ok(())
+    }
+
+    /// Tries to reconnect this [`WebSocketRpcSession`] to the server.
+    async fn reconnect(self: Rc<Self>) -> Result<(), Traced<SessionError>> {
+        self.inner_connect()
+            .await
+            .map_err(tracerr::map_from_and_wrap!())?;
+
+        Ok(())
+    }
+
+    fn subscribe(&self) -> LocalBoxStream<'static, Event> {
+        let (tx, rx) = mpsc::unbounded();
+        self.event_txs.borrow_mut().push(tx);
+        Box::pin(rx)
+    }
+
+    /// Sends [`Command`] to the server if current [`SessionState`] is
+    /// [`SessionState::Opened`].
+    fn send_command(&self, command: Command) {
+        let state = self.state.get();
+        if let SessionState::Opened(info) = state {
+            self.client.send_command(info.room_id.clone(), command);
+        } else {
+            log::error!(
+                "Tried to send Command while RPC Session is in {:?} state",
+                state
+            );
+        }
+    }
+
+    /// Returns [`Future`] which will be resolved when [`SessionState`] will be
+    /// transited to the [`SessionState::Finished`] or [`WebSocketRpcSession`]
+    /// will be dropped.
+    fn on_normal_close(&self) -> LocalBoxFuture<'static, CloseReason> {
+        let mut state_stream = self
+            .state
+            .subscribe()
+            .filter_map(|s| async move {
+                if let SessionState::Finished(reason) = s {
+                    Some(reason)
+                } else {
+                    None
+                }
+            })
+            .boxed_local();
+        Box::pin(async move {
+            state_stream.next().await.unwrap_or_else(|| {
+                ClientDisconnect::SessionUnexpectedlyDropped.into()
+            })
+        })
+    }
+
+    /// Closes [`WebSocketRpcSession`] with a provided [`ClientDisconnect`]
+    /// reason.
+    ///
+    /// [`SessionState`] will be transited to the [`SessionState::Finished`].
+    ///
+    /// Provided [`ClientDisconnect`] will be provided to the underlying
+    /// [`WebSocketRpcClient`] with [`WebSocketRpcClient::set_close_reason`].
+    fn close_with_reason(&self, close_reason: ClientDisconnect) {
+        if let SessionState::Opened(info) = self.state.get() {
+            self.client
+                .leave_room(info.room_id.clone(), info.member_id.clone());
+        }
+
+        self.client.set_close_reason(close_reason);
+        self.state.set(SessionState::Finished(close_reason.into()));
+    }
+
+    /// Returns [`Stream`] which will provided `Some(())` every time when
+    /// [`SessionState`] goes to the [`SessionState::Lost`].
+    fn on_connection_loss(&self) -> LocalBoxStream<'static, ()> {
+        let can_reconnect = Rc::clone(&self.can_reconnect);
+        self.state
+            .subscribe()
+            .filter_map(move |state| {
+                if matches!(state, SessionState::Lost(_, _))
+                    && can_reconnect.get()
+                {
+                    future::ready(Some(()))
+                } else {
+                    future::ready(None)
+                }
+            })
+            .boxed_local()
+    }
+
+    /// Returns [`Stream`] which will provided `Some(())` every time when
+    /// [`SessionState`] goes to the [`SessionState::Opened`].
+    ///
+    /// Nothing will be provided if [`SessionState`] goes to the
+    /// [`SessionState::Opened`] first time.
+    fn on_reconnected(&self) -> LocalBoxStream<'static, ()> {
+        let can_reconnect = Rc::clone(&self.can_reconnect);
+        self.state
+            .subscribe()
+            .filter_map(move |current_state| {
+                let can_reconnect = Rc::clone(&can_reconnect);
+                async move {
+                    if matches!(current_state, SessionState::Opened(_))
+                        && can_reconnect.get()
+                    {
+                        Some(())
+                    } else {
+                        None
+                    }
+                }
+            })
+            .boxed_local()
+    }
+}
+
+impl RpcEventHandler for WebSocketRpcSession {
+    type Output = ();
+
+    /// If current [`SessionState`] is [`SessionState::Authorizing`] and
+    /// [`RoomId`] from [`ConnectionInfo`] is equal to the provided
+    /// [`RoomId`], then [`SessionState`] will be transited to the
+    /// [`SessionState::Opened`].
+    fn on_joined_room(&self, room_id: RoomId, member_id: MemberId) {
+        let state = self.state.get();
+        if let SessionState::Authorizing(info) = state {
+            if info.room_id == room_id && info.member_id == member_id {
+                self.state.set(SessionState::Opened(info));
+            }
+        }
+    }
+
+    /// If current [`SessionState`] is [`SessionState::Opened`] or
+    /// [`SessionState::Authorizing`] and provided [`RoomId`] is
+    /// equal to the [`RoomId`] from the [`ConnectionInfo`] of this
+    /// [`WebSocketRpcSession`], then [`SessionState`] will be transited
+    /// to the [`SessionState::Finished`] if current [`SessionState`] is
+    /// [`SessionState::Opened`] or to the [`SessionState::Uninitialized`] if
+    /// current [`SessionState`] is [`SessionState::Authorizing`].
+    fn on_left_room(&self, room_id: RoomId, close_reason: CloseReason) {
+        let state = self.state.get();
+
+        match &state {
+            SessionState::Opened(info) | SessionState::Authorizing(info) => {
+                if info.room_id != room_id {
+                    return;
+                }
+            }
+            _ => return,
+        }
+
+        match state {
+            SessionState::Opened(_) => {
+                self.state.set(SessionState::Finished(close_reason));
+            }
+            SessionState::Authorizing(_) => {
+                self.state.set(SessionState::Uninitialized);
+            }
+            _ => {}
+        }
+    }
+
+    /// Sends received [`Event`] to the all [`RpcSession::subscribe`]
+    /// subscribers if current [`SessionState`] is [`SessionState::Opened`]
+    /// and provided [`RoomId`] is equal to the [`RoomId`] from the
+    /// [`ConnectionInfo`].
+    fn on_event(&self, room_id: RoomId, event: Event) {
+        if let SessionState::Opened(info) = self.state.get() {
+            if info.room_id == room_id {
+                self.event_txs
+                    .borrow_mut()
+                    .retain(|tx| tx.unbounded_send(event.clone()).is_ok());
+            }
+        }
+    }
+}
+
+/// State for the [`WebSocketRpcSession`].
+///
+/// # State transition scheme
+///
+/// ```text
+///      +---------------+
+/// +--->+ Uninitialized |
+/// |    +-------+-------+
+/// |            |
+/// |            v
+/// |    +-------+-------+
+/// |    |  Initialized  |
+/// |    +-------+-------+
+/// |            |
+/// |            v                    +------------+
+/// |    +-------+-------+<-----------+            |
+/// |    |  Connecting   |            |   Failed   |
+/// |    +-------+-------+----------->+            |
+/// |            |                    +------+-----+
+/// |            v                           ^
+/// |    +-------+-------+                   |
+/// +----+  Authorizing  +------------------>+
+///      +-------+-------+                   |
+///              |                           |
+///              v                           |
+///      +-------+-------+                   |
+///      |    Opened     +------------------>+
+///      +-------+-------+
+///              |
+///              v
+///      +-------+-------+
+///      |   Finished    |
+///      +---------------+
+/// ```
+#[derive(Clone, Debug, Derivative)]
+#[derivative(PartialEq)]
+enum SessionState {
+    /// [`WebSocketRpcSession`] currently doesn't have [`ConnectionInfo`] to
+    /// authorize with.
+    Uninitialized,
+
+    /// [`ConnectionInfo`] was specified, but no transport connection
+    /// establishment attempts were made yet.
+    Initialized(Rc<ConnectionInfo>),
+
+    /// Ongoing transport connection establishment.
+    Connecting(Rc<ConnectionInfo>),
+
+    /// Transport connection is establish and [`WebSocketRpcSession`] is
+    /// currently performing session authorization.
+    Authorizing(Rc<ConnectionInfo>),
+
+    /// Connection with a server was lost but can be recovered.
+    Lost(
+        #[derivative(PartialEq = "ignore")] Rc<Traced<SessionError>>,
+        Rc<ConnectionInfo>,
+    ),
+
+    /// Connection with a server is established and [`WebSocketRpcSession`] is
+    /// authorized.
+    Opened(Rc<ConnectionInfo>),
+
+    /// Terminal state: transport is closed and can not be reopened.
+    Finished(CloseReason),
+}
diff --git a/jason/src/rpc/websocket/client.rs b/jason/src/rpc/websocket/client.rs
new file mode 100644
index 000000000..95b9520a3
--- /dev/null
+++ b/jason/src/rpc/websocket/client.rs
@@ -0,0 +1,587 @@
+use std::{cell::RefCell, rc::Rc, time::Duration};
+
+use derive_more::Display;
+use futures::{
+    channel::{mpsc, oneshot},
+    future::LocalBoxFuture,
+    stream::{LocalBoxStream, StreamExt as _},
+};
+use medea_client_api_proto::{
+    ClientMsg, CloseReason as CloseByServerReason, Command, Credential, Event,
+    MemberId, RoomId, RpcSettings, ServerMsg,
+};
+use medea_macro::dispatchable;
+use medea_reactive::ObservableCell;
+use serde::Serialize;
+use tracerr::Traced;
+use wasm_bindgen_futures::spawn_local;
+
+use crate::{
+    rpc::{
+        websocket::transport::{RpcTransport, TransportError, TransportState},
+        ApiUrl, CloseMsg, CloseReason, ClosedStateReason, Heartbeat,
+        IdleTimeout, PingInterval, RpcClientError,
+    },
+    utils::JasonError,
+};
+
+/// Reasons of closing WebSocket RPC connection by a client side.
+#[derive(Copy, Clone, Display, Debug, Eq, PartialEq, Serialize)]
+pub enum ClientDisconnect {
+    /// [`Room`] was dropped without any [`CloseReason`].
+    ///
+    /// [`Room`]: crate::api::Room
+    RoomUnexpectedlyDropped,
+
+    /// [`Room`] was normally closed by JS side.
+    ///
+    /// [`Room`]: crate::api::Room
+    RoomClosed,
+
+    /// [`WebSocketRpcClient`] was unexpectedly dropped.
+    ///
+    /// [`WebSocketRpcClient`]: crate::rpc::WebSocketRpcClient
+    RpcClientUnexpectedlyDropped,
+
+    /// [`RpcTransport`] was unexpectedly dropped.
+    ///
+    /// [`RpcTransport`]: crate::rpc::RpcTransport
+    RpcTransportUnexpectedlyDropped,
+
+    /// [`WebSocketRpcSession`] was unexpectedly dropped.
+    ///
+    /// [`WebSocketRpcSession`]: crate::rpc::WebSocketRpcSession
+    SessionUnexpectedlyDropped,
+}
+
+impl ClientDisconnect {
+    /// Indicates whether this [`ClientDisconnect`] is considered as error.
+    #[inline]
+    #[must_use]
+    pub fn is_err(self) -> bool {
+        match self {
+            Self::RoomUnexpectedlyDropped
+            | Self::RpcClientUnexpectedlyDropped
+            | Self::RpcTransportUnexpectedlyDropped
+            | Self::SessionUnexpectedlyDropped => true,
+            Self::RoomClosed => false,
+        }
+    }
+}
+
+impl From<ClientDisconnect> for CloseReason {
+    #[inline]
+    fn from(v: ClientDisconnect) -> Self {
+        Self::ByClient {
+            is_err: v.is_err(),
+            reason: v,
+        }
+    }
+}
+
+/// State of [`WebSocketRpcClient`] and [`RpcTransport`].
+#[derive(Clone, Debug, PartialEq)]
+enum ClientState {
+    /// [`WebSocketRpcClient`] is currently establishing a connection to RPC
+    /// server.
+    Connecting,
+
+    /// Connection with RPC Server is active.
+    Open,
+
+    /// Connection with RPC server is currently closed.
+    Closed(ClosedStateReason),
+}
+
+/// Inner state of [`WebsocketRpcClient`].
+struct Inner {
+    /// [`WebSocket`] connection to a remote media server.
+    sock: Option<Rc<dyn RpcTransport>>,
+
+    /// Connection loss detector via ping/pong mechanism.
+    heartbeat: Option<Heartbeat>,
+
+    /// Event's subscribers list.
+    subs: Vec<mpsc::UnboundedSender<RpcEvent>>,
+
+    /// [`oneshot::Sender`] with which [`CloseReason`] will be sent once
+    /// [`WebSocket`] connection is normally closed by server.
+    ///
+    /// Note, that [`CloseReason`] won't be sent if [`WebSocket`] closed with
+    /// [`RpcConnectionCloseReason::NewConnection`] reason.
+    on_close_subscribers: Vec<oneshot::Sender<CloseReason>>,
+
+    /// Reason of [`WebsocketRpcClient`] closing.
+    ///
+    /// This reason will be provided to the underlying [`RpcTransport`].
+    close_reason: ClientDisconnect,
+
+    /// Senders for [`WebSocketRpcClient::on_connection_loss`] subscribers.
+    on_connection_loss_subs: Vec<mpsc::UnboundedSender<()>>,
+
+    /// Closure which will create new [`RpcTransport`]s for this
+    /// [`WebSocketRpcClient`] on each
+    /// [`WebSocketRpcClient:: establish_connection`] call.
+    rpc_transport_factory: RpcTransportFactory,
+
+    /// URL that [`RpcTransport`] will connect to.
+    ///
+    /// [`None`] if this [`WebSocketRpcClient`] has never been connected to
+    /// a sever.
+    url: Option<ApiUrl>,
+
+    /// Current [`State`] of this [`WebSocketRpcClient`].
+    state: ObservableCell<ClientState>,
+}
+
+/// Factory closure which creates [`RpcTransport`] for
+/// [`WebSocketRpcClient::establish_connection`] function.
+pub type RpcTransportFactory = Box<
+    dyn Fn(
+        ApiUrl,
+    ) -> LocalBoxFuture<
+        'static,
+        Result<Rc<dyn RpcTransport>, Traced<TransportError>>,
+    >,
+>;
+
+impl Inner {
+    /// Instantiates new [`Inner`] state of [`WebsocketRpcClient`].
+    fn new(rpc_transport_factory: RpcTransportFactory) -> RefCell<Self> {
+        RefCell::new(Self {
+            sock: None,
+            on_close_subscribers: Vec::new(),
+            subs: Vec::new(),
+            heartbeat: None,
+            close_reason: ClientDisconnect::RpcClientUnexpectedlyDropped,
+            on_connection_loss_subs: Vec::new(),
+            rpc_transport_factory,
+            url: None,
+            state: ObservableCell::new(ClientState::Closed(
+                ClosedStateReason::NeverConnected,
+            )),
+        })
+    }
+}
+
+/// Events which can be thrown by [`WebSocketRpcClient`].
+#[dispatchable(self: &Self)]
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum RpcEvent {
+    /// Notification of the subscribers that [`WebSocketRpcClient`] is joined
+    /// [`Room`] on Media Server.
+    ///
+    /// [`Room`]: crate::api::Room
+    JoinedRoom {
+        /// ID of the joined [`Room`].
+        ///
+        /// [`Room`]: crate::api::Room
+        room_id: RoomId,
+
+        /// ID of the joined `Member`.
+        member_id: MemberId,
+    },
+
+    /// Notification of the subscribers that [`WebSocketRpcClient`] left
+    /// [`Room`] on Media Server.
+    ///
+    /// [`Room`]: crate::api::Room
+    LeftRoom {
+        /// ID of the [`Room`] being left.
+        ///
+        /// [`Room`]: crate::api::Room
+        room_id: RoomId,
+
+        /// Reason of why the [`Room`] has been left.
+        ///
+        /// [`Room`]: crate::api::Room
+        close_reason: CloseReason,
+    },
+
+    /// [`WebSocketRpcClient`] received [`Event`] from Media Server.
+    Event {
+        /// ID of the [`Room`] for that this [`Event`] has been received for.
+        ///
+        /// [`Room`]: crate::api::Room
+        room_id: RoomId,
+
+        /// Received [`Event`].
+        event: Event,
+    },
+}
+
+/// Client API RPC client to talk with server via [WebSocket].
+///
+/// [WebSocket]: https://developer.mozilla.org/ru/docs/WebSockets
+pub struct WebSocketRpcClient(RefCell<Inner>);
+
+impl WebSocketRpcClient {
+    /// Creates new [`WebSocketRpcClient`] with provided [`RpcTransportFactory`]
+    /// closure.
+    #[inline]
+    #[must_use]
+    pub fn new(rpc_transport_factory: RpcTransportFactory) -> Self {
+        Self(Inner::new(rpc_transport_factory))
+    }
+
+    /// Authorizes [`WebSocketRpcClient`] on the Media Server.
+    pub fn authorize(
+        &self,
+        room_id: RoomId,
+        member_id: MemberId,
+        credential: Credential,
+    ) {
+        self.send_command(
+            room_id,
+            Command::JoinRoom {
+                member_id,
+                credential,
+            },
+        );
+    }
+
+    /// Leaves `Room` with a provided [`RoomId`].
+    #[inline]
+    pub fn leave_room(&self, room_id: RoomId, member_id: MemberId) {
+        self.send_command(room_id, Command::LeaveRoom { member_id });
+    }
+
+    /// Stops [`Heartbeat`] and notifies all
+    /// [`WebSocketRpcClient::on_connection_loss`] subs about connection
+    /// loss.
+    fn handle_connection_loss(&self, closed_state_reason: ClosedStateReason) {
+        self.0
+            .borrow()
+            .state
+            .set(ClientState::Closed(closed_state_reason));
+        self.0.borrow_mut().heartbeat.take();
+        self.0
+            .borrow_mut()
+            .on_connection_loss_subs
+            .retain(|sub| sub.unbounded_send(()).is_ok());
+    }
+
+    /// Handles [`CloseMsg`] from a remote server.
+    ///
+    /// This function will be called on every WebSocket close (normal and
+    /// abnormal) regardless of the [`CloseReason`].
+    fn handle_close_message(&self, close_msg: CloseMsg) {
+        self.0.borrow_mut().heartbeat.take();
+
+        match close_msg {
+            CloseMsg::Normal(_, reason) => match reason {
+                CloseByServerReason::Reconnected => (),
+                CloseByServerReason::Idle => {
+                    self.handle_connection_loss(
+                        ClosedStateReason::ConnectionLost(close_msg),
+                    );
+                }
+                _ => {
+                    self.0.borrow_mut().sock.take();
+                    self.0
+                        .borrow_mut()
+                        .on_close_subscribers
+                        .drain(..)
+                        .for_each(|sub| {
+                            let _ = sub.send(CloseReason::ByServer(reason));
+                        });
+                }
+            },
+            CloseMsg::Abnormal(_) => {
+                self.handle_connection_loss(ClosedStateReason::ConnectionLost(
+                    close_msg,
+                ));
+            }
+        }
+    }
+
+    /// Handles [`ServerMsg`]s from a remote server.
+    fn on_transport_message(&self, msg: ServerMsg) {
+        let msg = match msg {
+            ServerMsg::Event { room_id, event } => match event {
+                Event::RoomJoined { member_id } => {
+                    Some(RpcEvent::JoinedRoom { room_id, member_id })
+                }
+                Event::RoomLeft { close_reason } => Some(RpcEvent::LeftRoom {
+                    room_id,
+                    close_reason: CloseReason::ByServer(close_reason),
+                }),
+                _ => Some(RpcEvent::Event { room_id, event }),
+            },
+            ServerMsg::RpcSettings(settings) => {
+                self.update_settings(
+                    IdleTimeout(
+                        Duration::from_millis(settings.idle_timeout_ms.into())
+                            .into(),
+                    ),
+                    PingInterval(
+                        Duration::from_millis(settings.ping_interval_ms.into())
+                            .into(),
+                    ),
+                )
+                .map_err(tracerr::wrap!(=> RpcClientError))
+                .map_err(|e| {
+                    log::error!("Failed to update socket settings: {}", e)
+                })
+                .ok();
+                None
+            }
+            ServerMsg::Ping(_) => None,
+        };
+        if let Some(msg) = msg {
+            self.0
+                .borrow_mut()
+                .subs
+                .retain(|sub| sub.unbounded_send(msg.clone()).is_ok());
+        }
+    }
+
+    /// Starts [`Heartbeat`] with provided [`RpcSettings`] for provided
+    /// [`RpcTransport`].
+    async fn start_heartbeat(
+        self: Rc<Self>,
+        transport: Rc<dyn RpcTransport>,
+        rpc_settings: RpcSettings,
+    ) -> Result<(), Traced<RpcClientError>> {
+        let idle_timeout = IdleTimeout(
+            Duration::from_millis(rpc_settings.idle_timeout_ms.into()).into(),
+        );
+        let ping_interval = PingInterval(
+            Duration::from_millis(rpc_settings.ping_interval_ms.into()).into(),
+        );
+
+        let heartbeat =
+            Heartbeat::start(transport, ping_interval, idle_timeout);
+
+        let mut on_idle = heartbeat.on_idle();
+        let weak_this = Rc::downgrade(&self);
+        spawn_local(async move {
+            while on_idle.next().await.is_some() {
+                if let Some(this) = weak_this.upgrade() {
+                    this.handle_connection_loss(ClosedStateReason::Idle);
+                }
+            }
+        });
+        self.0.borrow_mut().heartbeat = Some(heartbeat);
+
+        Ok(())
+    }
+
+    /// Tries to establish [`RpcClient`] connection.
+    async fn establish_connection(
+        self: Rc<Self>,
+        url: ApiUrl,
+    ) -> Result<(), Traced<RpcClientError>> {
+        self.0.borrow_mut().url = Some(url.clone());
+        self.0.borrow().state.set(ClientState::Connecting);
+
+        // wait for transport open
+        let create_transport_fut = (self.0.borrow().rpc_transport_factory)(url);
+        let transport = create_transport_fut.await.map_err(|e| {
+            let transport_err = e.into_inner();
+            self.0.borrow().state.set(ClientState::Closed(
+                ClosedStateReason::ConnectionFailed(transport_err.clone()),
+            ));
+            tracerr::new!(RpcClientError::from(
+                ClosedStateReason::ConnectionFailed(transport_err)
+            ))
+        })?;
+
+        // wait for ServerMsg::RpcSettings
+        if let Some(msg) = transport.on_message().next().await {
+            if let ServerMsg::RpcSettings(rpc_settings) = msg {
+                Rc::clone(&self)
+                    .start_heartbeat(Rc::clone(&transport), rpc_settings)
+                    .await?;
+            } else {
+                let close_reason =
+                    ClosedStateReason::FirstServerMsgIsNotRpcSettings;
+                self.0
+                    .borrow()
+                    .state
+                    .set(ClientState::Closed(close_reason.clone()));
+                return Err(tracerr::new!(RpcClientError::ConnectionFailed(
+                    close_reason
+                )));
+            }
+        } else {
+            self.0.borrow().state.set(ClientState::Closed(
+                ClosedStateReason::FirstServerMsgIsNotRpcSettings,
+            ));
+            return Err(tracerr::new!(RpcClientError::NoSocket));
+        }
+
+        // subscribe to transport close
+        let mut transport_state_changes = transport.on_state_change();
+        let weak_this = Rc::downgrade(&self);
+        spawn_local(async move {
+            while let Some(state) = transport_state_changes.next().await {
+                if let Some(this) = weak_this.upgrade() {
+                    if let TransportState::Closed(msg) = state {
+                        this.handle_close_message(msg);
+                    }
+                }
+            }
+        });
+
+        // subscribe to transport message received
+        let weak_this = Rc::downgrade(&self);
+        let mut on_socket_message = transport.on_message();
+        spawn_local(async move {
+            while let Some(msg) = on_socket_message.next().await {
+                if let Some(this) = weak_this.upgrade() {
+                    this.on_transport_message(msg)
+                }
+            }
+        });
+
+        self.0.borrow_mut().sock.replace(transport);
+        self.0.borrow().state.set(ClientState::Open);
+
+        Ok(())
+    }
+
+    /// Subscribes to [`RpcClient`]'s [`State`] changes and when
+    /// [`State::Connecting`] will be changed to something else, then this
+    /// [`Future`] will be resolved and based on new [`State`] [`Result`]
+    /// will be returned.
+    async fn connecting_result(&self) -> Result<(), Traced<RpcClientError>> {
+        let mut state_changes = self.0.borrow().state.subscribe();
+        while let Some(state) = state_changes.next().await {
+            match state {
+                ClientState::Open => {
+                    return Ok(());
+                }
+                ClientState::Closed(reason) => {
+                    return Err(tracerr::new!(
+                        RpcClientError::ConnectionFailed(reason)
+                    ));
+                }
+                ClientState::Connecting => (),
+            }
+        }
+        Err(tracerr::new!(RpcClientError::RpcClientGone))
+    }
+
+    /// Updates RPC settings of this [`RpcClient`].
+    fn update_settings(
+        &self,
+        idle_timeout: IdleTimeout,
+        ping_interval: PingInterval,
+    ) -> Result<(), Traced<RpcClientError>> {
+        self.0
+            .borrow_mut()
+            .heartbeat
+            .as_ref()
+            .ok_or_else(|| tracerr::new!(RpcClientError::NoSocket))
+            .map(|heartbeat| {
+                heartbeat.update_settings(idle_timeout, ping_interval)
+            })
+    }
+
+    /// Tries to upgrade [`State`] of this [`RpcClient`] to [`State::Open`].
+    ///
+    /// This function is also used for reconnecting this [`RpcClient`].
+    ///
+    /// If [`RpcClient`] is closed than this function will try to establish
+    /// new RPC connection.
+    ///
+    /// If [`RpcClient`] already in [`State::Connecting`] then this function
+    /// will not perform one more connection try. It will subscribe to [`State`]
+    /// changes and wait for first connection result, and, based on this result,
+    /// this function will be resolved.
+    ///
+    /// If [`RpcClient`] already in [`State::Open`] then this function will be
+    /// instantly resolved.
+    ///
+    /// # Errors
+    ///
+    /// Errors if [`WebSocketRpcClient::establish_connection`] fails.
+    pub async fn connect(
+        self: Rc<Self>,
+        url: ApiUrl,
+    ) -> Result<(), Traced<RpcClientError>> {
+        let current_url = self.0.borrow().url.clone();
+        if current_url.as_ref() == Some(&url) {
+            let state = self.0.borrow().state.borrow().clone();
+            match state {
+                ClientState::Open => Ok(()),
+                ClientState::Connecting => self.connecting_result().await,
+                ClientState::Closed(_) => self.establish_connection(url).await,
+            }
+        } else {
+            self.establish_connection(url).await
+        }
+    }
+
+    /// Subscribes on this [`WebSocketRpcClient`]'s [`RpcEvent`]s.
+    pub fn subscribe(&self) -> LocalBoxStream<'static, RpcEvent> {
+        let (tx, rx) = mpsc::unbounded();
+        self.0.borrow_mut().subs.push(tx);
+
+        Box::pin(rx)
+    }
+
+    /// Sends [`Command`] for the provided [`RoomId`] to server.
+    pub fn send_command(&self, room_id: RoomId, command: Command) {
+        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() {
+            if let Err(err) =
+                socket.send(&ClientMsg::Command { room_id, command })
+            {
+                // TODO: we will just wait for reconnect at this moment
+                //       should be handled properly as a part of future
+                //       state synchronization mechanism
+                //       PR: https://github.com/instrumentisto/medea/pull/51
+                JasonError::from(err).print()
+            }
+        }
+    }
+
+    /// [`Future`] resolving on normal [`WebSocketRpcClient`] connection
+    /// closing.
+    ///
+    /// This [`Future`] wouldn't be resolved on abnormal closes.
+    /// An [`RpcClient::on_connection_loss`] will be thrown instead.
+    ///
+    /// [`Future`]: std::future::Future
+    pub fn on_normal_close(
+        &self,
+    ) -> LocalBoxFuture<'static, Result<CloseReason, oneshot::Canceled>> {
+        let (tx, rx) = oneshot::channel();
+        self.0.borrow_mut().on_close_subscribers.push(tx);
+        Box::pin(rx)
+    }
+
+    /// Subscribe to connection loss events.
+    ///
+    /// Connection loss is any unexpected [`RpcTransport`] close. In case of
+    /// connection loss, JS side user should select reconnection strategy with
+    /// [`ReconnectHandle`] (or simply close [`Room`]).
+    ///
+    /// [`Room`]: crate::api::Room
+    /// [`Stream`]: futures::Stream
+    pub fn on_connection_loss(&self) -> LocalBoxStream<'static, ()> {
+        let (tx, rx) = mpsc::unbounded();
+        self.0.borrow_mut().on_connection_loss_subs.push(tx);
+        Box::pin(rx)
+    }
+
+    /// Sets reason being passed to the underlying transport when this client is
+    /// dropped.
+    #[inline]
+    pub fn set_close_reason(&self, close_reason: ClientDisconnect) {
+        self.0.borrow_mut().close_reason = close_reason
+    }
+}
+
+impl Drop for Inner {
+    /// Drops the related connection and its [`Heartbeat`].
+    fn drop(&mut self) {
+        if let Some(socket) = self.sock.take() {
+            socket.set_close_reason(self.close_reason);
+        }
+    }
+}
diff --git a/jason/src/rpc/websocket/mod.rs b/jason/src/rpc/websocket/mod.rs
new file mode 100644
index 000000000..be3f73ccf
--- /dev/null
+++ b/jason/src/rpc/websocket/mod.rs
@@ -0,0 +1,19 @@
+//! Implementation of the abstractions around [WebSocket] transport.
+//!
+//! [WebSocket]: https://developer.mozilla.org/ru/docs/WebSockets
+
+mod client;
+mod transport;
+
+#[cfg(feature = "mockable")]
+pub use self::transport::MockRpcTransport;
+#[doc(inline)]
+pub use self::{
+    client::{
+        ClientDisconnect, RpcEvent, RpcEventHandler, RpcTransportFactory,
+        WebSocketRpcClient,
+    },
+    transport::{
+        RpcTransport, TransportError, TransportState, WebSocketRpcTransport,
+    },
+};
diff --git a/jason/src/rpc/websocket.rs b/jason/src/rpc/websocket/transport.rs
similarity index 97%
rename from jason/src/rpc/websocket.rs
rename to jason/src/rpc/websocket/transport.rs
index 70f10bc56..855db1723 100644
--- a/jason/src/rpc/websocket.rs
+++ b/jason/src/rpc/websocket/transport.rs
@@ -11,13 +11,14 @@ use medea_reactive::ObservableCell;
 use tracerr::Traced;
 use web_sys::{CloseEvent, Event, MessageEvent, WebSocket as SysWebSocket};
 
-use crate::utils::{
-    EventListener, EventListenerBindError, JasonError, JsCaused, JsError,
-    JsonParseError,
+use crate::{
+    rpc::{websocket::client::ClientDisconnect, ApiUrl, CloseMsg},
+    utils::{
+        EventListener, EventListenerBindError, JasonError, JsCaused, JsError,
+        JsonParseError,
+    },
 };
 
-use super::{ClientDisconnect, CloseMsg};
-
 /// RPC transport between a client and a server.
 #[cfg_attr(feature = "mockable", mockall::automock)]
 pub trait RpcTransport {
@@ -246,8 +247,8 @@ impl WebSocketRpcTransport {
     ///
     /// [1]: https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/onclose
     /// [2]: https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/onopen
-    pub async fn new(url: &str) -> Result<Self> {
-        let socket = Rc::new(RefCell::new(InnerSocket::new(url)?));
+    pub async fn new(url: ApiUrl) -> Result<Self> {
+        let socket = Rc::new(RefCell::new(InnerSocket::new(url.0.as_str())?));
         {
             let mut socket_mut = socket.borrow_mut();
             let inner = Rc::clone(&socket);
diff --git a/jason/src/utils/mod.rs b/jason/src/utils/mod.rs
index 0313e47de..f9cd6da69 100644
--- a/jason/src/utils/mod.rs
+++ b/jason/src/utils/mod.rs
@@ -168,3 +168,14 @@ impl Drop for TaskHandle {
         self.0.abort();
     }
 }
+
+/// Tries to upgrade [`Weak`] reference breaks cycle if upgrade fails.
+macro_rules! upgrade_or_break {
+    ($weak:tt) => {
+        if let Some(this) = $weak.upgrade() {
+            this
+        } else {
+            break;
+        }
+    };
+}
diff --git a/jason/tests/api/mod.rs b/jason/tests/api/mod.rs
index 0d24503d4..72354de8b 100644
--- a/jason/tests/api/mod.rs
+++ b/jason/tests/api/mod.rs
@@ -1,13 +1,15 @@
 mod connection;
 mod room;
 
-use std::rc::Rc;
+use std::{cell::RefCell, rc::Rc};
 
 use futures::{
     channel::{mpsc, oneshot},
     stream, StreamExt,
 };
-use medea_client_api_proto::{CloseReason, RpcSettings, ServerMsg};
+use medea_client_api_proto::{
+    ClientMsg, CloseReason, Command, Event, ServerMsg,
+};
 use medea_jason::{
     rpc::{
         websocket::{MockRpcTransport, TransportState},
@@ -17,101 +19,252 @@ use medea_jason::{
 };
 use medea_reactive::ObservableCell;
 use wasm_bindgen::closure::Closure;
-use wasm_bindgen_futures::JsFuture;
+use wasm_bindgen_futures::{spawn_local, JsFuture};
 use wasm_bindgen_test::*;
 
-use crate::timeout;
+use crate::{rpc::RPC_SETTINGS, timeout, yield_now, TEST_ROOM_URL};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
-/// [`ServerMsg::RpcSettings`] which will be sent in the all tests from this
-/// module.
-const RPC_SETTINGS: ServerMsg = ServerMsg::RpcSettings(RpcSettings {
-    idle_timeout_ms: 5_000,
-    ping_interval_ms: 2_000,
-});
-
 /// Checks that only one [`Rc`] to the [`RpcClient`] exists.
 #[wasm_bindgen_test]
 async fn only_one_strong_rpc_rc_exists() {
-    let jason = Jason::default();
-    let ws =
-        Rc::new(WebSocketRpcClient::new(Box::new(move |_| {
-            Box::pin(async move {
-                let mut transport = MockRpcTransport::new();
-                transport.expect_on_message().times(3).returning_st(
-                    move || Box::pin(stream::once(async { RPC_SETTINGS })),
-                );
-                transport.expect_send().return_once(|_| Ok(()));
-                transport
-                    .expect_set_close_reason()
-                    .times(1)
-                    .return_once(|_| ());
-                transport.expect_on_state_change().return_once_st(move || {
-                    Box::pin(stream::once(async { TransportState::Open }))
-                });
-                let transport = Rc::new(transport);
-                Ok(transport as Rc<dyn RpcTransport>)
-            })
-        })));
+    let ws = Rc::new(WebSocketRpcClient::new(Box::new(move |_| {
+        Box::pin(async move {
+            let mut transport = MockRpcTransport::new();
+            transport.expect_on_message().times(3).returning_st({
+                move || {
+                    Box::pin(stream::iter(vec![
+                        RPC_SETTINGS,
+                        ServerMsg::Event {
+                            room_id: "room_id".into(),
+                            event: Event::RoomJoined {
+                                member_id: "member_id".into(),
+                            },
+                        },
+                    ]))
+                }
+            });
+            transport.expect_send().returning(|_| Ok(()));
+            transport.expect_set_close_reason().return_once(|_| ());
+            transport.expect_on_state_change().return_once_st(move || {
+                Box::pin(stream::once(async { TransportState::Open }))
+            });
+            let transport = Rc::new(transport);
+            Ok(transport as Rc<dyn RpcTransport>)
+        })
+    })));
+    let jason = Jason::with_rpc_client(ws.clone());
 
-    let room = jason.inner_init_room(ws.clone());
+    let room = jason.init_room();
     room.on_failed_local_media(Closure::once_into_js(|| {}).into())
         .unwrap();
     room.on_connection_loss(Closure::once_into_js(|| {}).into())
         .unwrap();
-    JsFuture::from(room.join("ws://example.com".to_string()))
-        .await
-        .unwrap();
+    room.inner_join(TEST_ROOM_URL.to_string()).await.unwrap();
 
-    assert_eq!(Rc::strong_count(&ws), 2);
+    assert_eq!(Rc::strong_count(&ws), 3);
+    jason.dispose();
+    assert_eq!(Rc::strong_count(&ws), 1);
 }
 
 /// Checks that [`RpcClient`] was dropped on [`JasonHandle::dispose`] call.
 #[wasm_bindgen_test]
 async fn rpc_dropped_on_jason_dispose() {
-    let jason = Jason::default();
     let (test_tx, mut test_rx) = mpsc::unbounded();
-    let ws =
-        Rc::new(WebSocketRpcClient::new(Box::new(move |_| {
+    let ws = Rc::new(WebSocketRpcClient::new(Box::new(move |_| {
+        let test_tx = test_tx.clone();
+        Box::pin(async move {
+            let mut transport = MockRpcTransport::new();
+            transport.expect_on_message().times(3).returning_st({
+                move || {
+                    Box::pin(stream::iter(vec![
+                        RPC_SETTINGS,
+                        ServerMsg::Event {
+                            room_id: "room_id".into(),
+                            event: Event::RoomJoined {
+                                member_id: "member_id".into(),
+                            },
+                        },
+                    ]))
+                }
+            });
+            transport.expect_send().times(2).returning(|_| Ok(()));
+            transport.expect_set_close_reason().times(1).returning(
+                move |reason| {
+                    test_tx.unbounded_send(reason).unwrap();
+                },
+            );
+            transport.expect_on_state_change().return_once_st(move || {
+                Box::pin(stream::once(async { TransportState::Open }))
+            });
+            let transport = Rc::new(transport);
+            Ok(transport as Rc<dyn RpcTransport>)
+        })
+    })));
+    let jason = Jason::with_rpc_client(ws);
+
+    let room = jason.init_room();
+    room.on_failed_local_media(Closure::once_into_js(|| {}).into())
+        .unwrap();
+    room.on_connection_loss(Closure::once_into_js(|| {}).into())
+        .unwrap();
+    JsFuture::from(room.join(TEST_ROOM_URL.to_string()))
+        .await
+        .unwrap();
+    jason.dispose();
+    drop(room);
+
+    timeout(100, test_rx.next()).await.unwrap();
+}
+
+/// Checks that [`Jason::close_room`] works correctly.
+#[wasm_bindgen_test]
+async fn room_dispose_works() {
+    let (test_tx, mut test_rx) = mpsc::unbounded();
+    let (cmd_tx, mut cmd_rx) = mpsc::unbounded();
+    let client_msg_txs = Rc::new(RefCell::new(Vec::new()));
+    let ws = Rc::new(WebSocketRpcClient::new({
+        let client_msg_txs = client_msg_txs.clone();
+        Box::new(move |_| {
             let test_tx = test_tx.clone();
+            let cmd_tx = cmd_tx.clone();
+            let client_msg_txs = client_msg_txs.clone();
             Box::pin(async move {
                 let mut transport = MockRpcTransport::new();
-                transport.expect_on_message().times(3).returning_st(
-                    move || Box::pin(stream::once(async { RPC_SETTINGS })),
-                );
-                transport.expect_send().return_once(|_| Ok(()));
-                transport.expect_set_close_reason().times(1).return_once(
-                    move |reason| {
+                transport.expect_on_message().returning_st({
+                    move || {
+                        let (tx, rx) = mpsc::unbounded();
+                        tx.unbounded_send(RPC_SETTINGS).unwrap();
+                        client_msg_txs.borrow_mut().push(tx);
+                        Box::pin(rx)
+                    }
+                });
+                transport.expect_send().returning(move |cmd| {
+                    cmd_tx.unbounded_send(cmd.clone()).ok();
+                    Ok(())
+                });
+                transport
+                    .expect_set_close_reason()
+                    .returning(move |reason| {
                         test_tx.unbounded_send(reason).unwrap();
-                    },
-                );
-                transport.expect_on_state_change().return_once_st(move || {
+                    });
+                transport.expect_on_state_change().returning(|| {
                     Box::pin(stream::once(async { TransportState::Open }))
                 });
                 let transport = Rc::new(transport);
                 Ok(transport as Rc<dyn RpcTransport>)
             })
-        })));
+        })
+    }));
+    let jason = Jason::with_rpc_client(ws);
 
-    let room = jason.inner_init_room(ws);
+    let room = jason.init_room();
     room.on_failed_local_media(Closure::once_into_js(|| {}).into())
         .unwrap();
     room.on_connection_loss(Closure::once_into_js(|| {}).into())
         .unwrap();
-    JsFuture::from(room.join("ws://example.com".to_string()))
+    spawn_local({
+        let client_msg_txs = client_msg_txs.clone();
+        async move {
+            yield_now().await;
+            client_msg_txs.borrow().iter().for_each(|tx| {
+                tx.unbounded_send(ServerMsg::Event {
+                    room_id: "room_id".into(),
+                    event: Event::RoomJoined {
+                        member_id: "member_id".into(),
+                    },
+                })
+                .ok();
+            });
+        }
+    });
+    JsFuture::from(room.join(TEST_ROOM_URL.to_string()))
         .await
         .unwrap();
 
+    let another_room = jason.init_room();
+    another_room
+        .on_failed_local_media(Closure::once_into_js(|| {}).into())
+        .unwrap();
+    another_room
+        .on_connection_loss(Closure::once_into_js(|| {}).into())
+        .unwrap();
+    spawn_local({
+        let client_msg_txs = client_msg_txs.clone();
+        async move {
+            yield_now().await;
+            client_msg_txs.borrow().iter().for_each(|tx| {
+                tx.unbounded_send(ServerMsg::Event {
+                    room_id: "another_room_id".into(),
+                    event: Event::RoomJoined {
+                        member_id: "member_id".into(),
+                    },
+                })
+                .ok();
+            });
+        }
+    });
+    JsFuture::from(
+        another_room.join(
+            "ws://example.com/another_room_id/member_id/token".to_string(),
+        ),
+    )
+    .await
+    .unwrap();
+
+    assert!(matches!(
+        cmd_rx.next().await.unwrap(),
+        ClientMsg::Command {
+            room_id: _,
+            command: Command::JoinRoom {
+                member_id: _,
+                credential: _
+            }
+        }
+    ));
+    assert!(matches!(
+        cmd_rx.next().await.unwrap(),
+        ClientMsg::Command {
+            room_id: _,
+            command: Command::JoinRoom {
+                member_id: _,
+                credential: _
+            }
+        }
+    ));
+
+    jason.close_room(room);
+    assert!(matches!(
+        cmd_rx.next().await.unwrap(),
+        ClientMsg::Command {
+            room_id: _,
+            command: Command::LeaveRoom {
+                member_id: _
+            }
+        }
+    ));
+
+    jason.close_room(another_room);
+    assert!(matches!(
+        cmd_rx.next().await.unwrap(),
+        ClientMsg::Command {
+            room_id: _,
+            command: Command::LeaveRoom {
+                member_id: _
+            }
+        }
+    ));
+
     jason.dispose();
-    timeout(300, test_rx.next()).await.unwrap();
+
+    timeout(100, test_rx.next()).await.unwrap();
 }
 
 /// Tests that [`Room`] will trigger [`RoomHandle::on_close`] callback on
 /// [`RpcTransport`] close.
 #[wasm_bindgen_test]
 async fn room_closes_on_rpc_transport_close() {
-    let jason = Jason::default();
     let on_state_change_mock =
         Rc::new(ObservableCell::new(TransportState::Open));
     let ws = Rc::new(WebSocketRpcClient::new(Box::new({
@@ -120,9 +273,19 @@ async fn room_closes_on_rpc_transport_close() {
             let on_state_change_mock = on_state_change_mock.clone();
             Box::pin(async move {
                 let mut transport = MockRpcTransport::new();
-                transport.expect_on_message().times(3).returning_st(
-                    move || Box::pin(stream::once(async { RPC_SETTINGS })),
-                );
+                transport.expect_on_message().times(3).returning_st({
+                    move || {
+                        Box::pin(stream::iter(vec![
+                            RPC_SETTINGS,
+                            ServerMsg::Event {
+                                room_id: "room_id".into(),
+                                event: Event::RoomJoined {
+                                    member_id: "member_id".into(),
+                                },
+                            },
+                        ]))
+                    }
+                });
                 transport.expect_send().return_once(|_| Ok(()));
                 transport.expect_set_close_reason().return_once(|_| ());
                 transport
@@ -133,13 +296,14 @@ async fn room_closes_on_rpc_transport_close() {
             })
         }
     })));
+    let jason = Jason::with_rpc_client(ws);
 
-    let mut room = jason.inner_init_room(ws);
+    let mut room = jason.init_room();
     room.on_failed_local_media(Closure::once_into_js(|| {}).into())
         .unwrap();
     room.on_connection_loss(Closure::once_into_js(|| {}).into())
         .unwrap();
-    JsFuture::from(room.join("ws://example.com".to_string()))
+    JsFuture::from(room.join(TEST_ROOM_URL.to_string()))
         .await
         .unwrap();
 
diff --git a/jason/tests/api/room.rs b/jason/tests/api/room.rs
index 7cfe5fb5d..7cdc262d6 100644
--- a/jason/tests/api/room.rs
+++ b/jason/tests/api/room.rs
@@ -18,7 +18,7 @@ use medea_jason::{
         AudioTrackConstraints, MediaKind, MediaManager, MediaStreamSettings,
     },
     peer::{MockPeerRepository, PeerConnection, Repository},
-    rpc::MockRpcClient,
+    rpc::MockRpcSession,
     utils::JasonError,
     DeviceVideoTrackConstraints,
 };
@@ -28,7 +28,7 @@ use wasm_bindgen_test::*;
 use crate::{
     delay_for, get_test_recv_tracks, get_test_required_tracks, get_test_tracks,
     get_test_unrequired_tracks, media_stream_settings, timeout,
-    wait_and_check_test_result, yield_now, MockNavigator,
+    wait_and_check_test_result, yield_now, MockNavigator, TEST_ROOM_URL,
 };
 
 wasm_bindgen_test_configure!(run_in_browser);
@@ -37,11 +37,10 @@ fn get_test_room(
     events: BoxStream<'static, Event>,
 ) -> (Room, UnboundedReceiver<Command>) {
     let (tx, rx) = mpsc::unbounded();
-    let mut rpc = MockRpcClient::new();
+    let mut rpc = MockRpcSession::new();
 
     rpc.expect_subscribe().return_once(move || events);
-    rpc.expect_unsub().return_const(());
-    rpc.expect_set_close_reason().return_const(());
+    rpc.expect_close_with_reason().return_const(());
     rpc.expect_on_connection_loss()
         .return_once(|| stream::pending().boxed_local());
     rpc.expect_on_reconnected()
@@ -60,18 +59,17 @@ async fn get_test_room_and_exist_peer(
     tracks: Vec<Track>,
     media_stream_settings: Option<MediaStreamSettings>,
 ) -> (Room, Rc<PeerConnection>) {
-    let mut rpc = MockRpcClient::new();
+    let mut rpc = MockRpcSession::new();
 
     let (event_tx, event_rx) = mpsc::unbounded();
 
     rpc.expect_subscribe()
         .return_once(move || Box::pin(event_rx));
-    rpc.expect_unsub().return_const(());
     rpc.expect_on_connection_loss()
         .return_once(|| stream::pending().boxed_local());
     rpc.expect_on_reconnected()
         .return_once(|| stream::pending().boxed_local());
-    rpc.expect_set_close_reason().return_const(());
+    rpc.expect_close_with_reason().return_const(());
     let event_tx_clone = event_tx.clone();
     rpc.expect_send_command().returning(move |cmd| match cmd {
         Command::UpdateTracks {
@@ -305,7 +303,7 @@ async fn error_join_room_without_on_failed_stream_callback() {
         .on_connection_loss(js_sys::Function::new_no_args(""))
         .unwrap();
 
-    match room_handle.inner_join(String::from("token")).await {
+    match room_handle.inner_join(String::from(TEST_ROOM_URL)).await {
         Ok(_) => unreachable!(),
         Err(e) => {
             assert_eq!(e.name(), "CallbackNotSet");
@@ -334,7 +332,7 @@ async fn error_join_room_without_on_connection_loss_callback() {
         .on_failed_local_media(js_sys::Function::new_no_args(""))
         .unwrap();
 
-    match room_handle.inner_join(String::from("token")).await {
+    match room_handle.inner_join(String::from(TEST_ROOM_URL)).await {
         Ok(_) => unreachable!(),
         Err(e) => {
             assert_eq!(e.name(), "CallbackNotSet");
@@ -1019,19 +1017,18 @@ mod rpc_close_reason_on_room_drop {
     /// Returns [`Room`] and [`oneshot::Receiver`] which will be resolved
     /// with [`RpcClient`]'s close reason ([`ClientDisconnect`]).
     async fn get_client() -> (Room, oneshot::Receiver<ClientDisconnect>) {
-        let mut rpc = MockRpcClient::new();
+        let mut rpc = MockRpcSession::new();
 
         let (_event_tx, event_rx) = mpsc::unbounded();
         rpc.expect_subscribe()
             .return_once(move || Box::pin(event_rx));
         rpc.expect_send_command().return_const(());
-        rpc.expect_unsub().return_const(());
         rpc.expect_on_connection_loss()
             .return_once(|| stream::pending().boxed_local());
         rpc.expect_on_reconnected()
             .return_once(|| stream::pending().boxed_local());
         let (test_tx, test_rx) = oneshot::channel();
-        rpc.expect_set_close_reason().return_once(move |reason| {
+        rpc.expect_close_with_reason().return_once(move |reason| {
             test_tx.send(reason).unwrap();
         });
         let room = Room::new(Rc::new(rpc), Box::new(MockPeerRepository::new()));
@@ -1188,15 +1185,14 @@ mod patches_generation {
         repo.expect_get()
             .returning_st(move |id| peers.get(&id).cloned());
 
-        let mut rpc = MockRpcClient::new();
+        let mut rpc = MockRpcSession::new();
         let (command_tx, command_rx) = mpsc::unbounded();
         rpc.expect_send_command().returning(move |command| {
             command_tx.unbounded_send(command).unwrap();
         });
         rpc.expect_subscribe()
             .return_once(move || Box::pin(futures::stream::pending()));
-        rpc.expect_unsub().return_once(|| ());
-        rpc.expect_set_close_reason().return_once(|_| ());
+        rpc.expect_close_with_reason().return_once(|_| ());
         rpc.expect_on_connection_loss()
             .return_once(|| stream::pending().boxed_local());
         rpc.expect_on_reconnected()
diff --git a/jason/tests/rpc/heartbeat.rs b/jason/tests/rpc/heartbeat.rs
index 18c0177c7..02e1ee133 100644
--- a/jason/tests/rpc/heartbeat.rs
+++ b/jason/tests/rpc/heartbeat.rs
@@ -47,11 +47,10 @@ async fn sends_pong_on_received_ping() {
 
     on_message_tx.unbounded_send(ServerMsg::Ping(2)).unwrap();
     timeout(100, async move {
-        match test_rx.await.unwrap() {
+        let msg = test_rx.await.unwrap();
+        match msg {
             ClientMsg::Pong(_) => (),
-            ClientMsg::Command(cmd) => {
-                panic!("Received not pong message! Command: {:?}", cmd)
-            }
+            _ => panic!("Received not pong message! Message: {:?}", msg),
         }
     })
     .await
@@ -111,12 +110,13 @@ async fn pre_sends_pong() {
         IdleTimeout(Duration::from_millis(100).into()),
     );
 
-    match timeout(25, on_message_rx.next()).await.unwrap().unwrap() {
+    let msg = timeout(25, on_message_rx.next()).await.unwrap().unwrap();
+    match msg {
         ClientMsg::Pong(n) => {
             assert_eq!(n, 1);
         }
-        ClientMsg::Command(cmd) => {
-            panic!("Received not pong message! Command: {:?}", cmd);
+        _ => {
+            panic!("Received not pong message! Message: {:?}", msg);
         }
     }
 }
diff --git a/jason/tests/rpc/mod.rs b/jason/tests/rpc/mod.rs
index 2fcd29d7d..e4ff247ca 100644
--- a/jason/tests/rpc/mod.rs
+++ b/jason/tests/rpc/mod.rs
@@ -2,6 +2,7 @@
 
 mod backoff_delayer;
 mod heartbeat;
+mod rpc_session;
 mod websocket;
 
 use std::{collections::HashMap, rc::Rc};
@@ -17,16 +18,22 @@ use medea_client_api_proto::{
     ClientMsg, CloseReason, Command, Event, PeerId, RpcSettings, ServerMsg,
 };
 use medea_jason::rpc::{
-    websocket::{MockRpcTransport, TransportState},
-    ClientDisconnect, CloseMsg, RpcClient, RpcTransport, WebSocketRpcClient,
+    websocket::{MockRpcTransport, RpcEvent, TransportState},
+    ClientDisconnect, CloseMsg, RpcTransport, WebSocketRpcClient,
 };
 use wasm_bindgen_futures::spawn_local;
 use wasm_bindgen_test::*;
 
-use crate::{delay_for, timeout};
+use crate::{delay_for, join_room_url, timeout};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
+/// [`ServerMsg::RpcSettings`] that can be used in tests.
+pub const RPC_SETTINGS: ServerMsg = ServerMsg::RpcSettings(RpcSettings {
+    idle_timeout_ms: 5_000,
+    ping_interval_ms: 2_000,
+});
+
 /// Creates [`WebSocketRpcClient`] with the provided [`MockRpcTransport`].
 fn new_client(transport: Rc<MockRpcTransport>) -> Rc<WebSocketRpcClient> {
     Rc::new(WebSocketRpcClient::new(Box::new(move |_| {
@@ -73,7 +80,10 @@ async fn message_received_from_transport_is_transmitted_to_sub() {
                     idle_timeout_ms: 10_000,
                     ping_interval_ms: 10_000,
                 }),
-                ServerMsg::Event(SRV_EVENT),
+                ServerMsg::Event {
+                    room_id: "".into(),
+                    event: SRV_EVENT,
+                },
             ])
             .boxed()
         });
@@ -84,39 +94,15 @@ async fn message_received_from_transport_is_transmitted_to_sub() {
     })));
 
     let mut stream = ws.subscribe();
-    ws.clone().connect(String::new()).await.unwrap();
-    assert_eq!(stream.next().await.unwrap(), SRV_EVENT);
-}
+    ws.clone().connect(join_room_url()).await.unwrap();
 
-/// Tests [`WebSocketRpcClient::unsub`] function.
-///
-/// # Algorithm
-///
-/// 1. Subscribe to [`Event`]s with [`WebSocketRpcClient::subscribe`].
-///
-/// 2. Call [`WebSocketRpcClient::unsub`].
-///
-/// 3. Wait for `None` received from [`WebSocketRpcClient::subscribe`]'s
-/// `Stream`.
-#[wasm_bindgen_test]
-async fn unsub_drops_subs() {
-    let ws = new_client(Rc::new(MockRpcTransport::new()));
-    let (test_tx, test_rx) = oneshot::channel();
-    let mut subscriber_stream = ws.subscribe();
-    spawn_local(async move {
-        loop {
-            match subscriber_stream.next().await {
-                Some(_) => (),
-                None => {
-                    test_tx.send(()).unwrap();
-                    break;
-                }
-            }
+    assert_eq!(
+        stream.next().await.unwrap(),
+        RpcEvent::Event {
+            room_id: "".into(),
+            event: SRV_EVENT
         }
-    });
-    ws.unsub();
-
-    timeout(1000, test_rx).await.unwrap().unwrap();
+    );
 }
 
 /// Tests that [`RpcTransport`] will be dropped when [`WebSocketRpcClient`] was
@@ -147,7 +133,7 @@ async fn transport_is_dropped_when_client_is_dropped() {
     let rpc_transport = Rc::new(transport);
 
     let ws = new_client(rpc_transport.clone());
-    ws.clone().connect(String::new()).await.unwrap();
+    ws.clone().connect(join_room_url()).await.unwrap();
     ws.set_close_reason(ClientDisconnect::RoomClosed);
     drop(ws);
     delay_for(100).await;
@@ -185,7 +171,7 @@ async fn send_goes_to_transport() {
     transport.expect_set_close_reason().return_const(());
 
     let ws = new_client(Rc::new(transport));
-    ws.clone().connect(String::new()).await.unwrap();
+    ws.clone().connect(join_room_url()).await.unwrap();
     let (test_tx, test_rx) = oneshot::channel();
     let test_peer_id = PeerId(9999);
     let test_sdp_offer = "Hello world!".to_string();
@@ -199,7 +185,7 @@ async fn send_goes_to_transport() {
     spawn_local(async move {
         while let Some(msg) = on_send_rx.next().await {
             match msg {
-                ClientMsg::Command(cmd) => match cmd {
+                ClientMsg::Command { command, .. } => match command {
                     Command::MakeSdpOffer {
                         peer_id,
                         sdp_offer,
@@ -218,7 +204,7 @@ async fn send_goes_to_transport() {
         }
     });
 
-    ws.send_command(test_cmd);
+    ws.send_command("".into(), test_cmd);
 
     timeout(1000, test_rx).await.unwrap().unwrap();
 }
@@ -249,7 +235,7 @@ mod on_close {
         transport.expect_set_close_reason().return_const(());
 
         let ws = new_client(Rc::new(transport));
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
 
         ws
     }
@@ -345,7 +331,7 @@ mod transport_close_reason_on_drop {
             });
 
         let ws = new_client(Rc::new(transport));
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
 
         (ws, test_rx)
     }
@@ -446,7 +432,7 @@ mod connect {
             let transport = Rc::new(transport);
             Box::pin(future::ok(transport as Rc<dyn RpcTransport>))
         })));
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
 
         timeout(500, test_rx.next()).await.unwrap().unwrap();
     }
@@ -491,12 +477,12 @@ mod connect {
                 }
             })
         })));
-        let first_connect_fut = ws.clone().connect(String::new());
+        let first_connect_fut = ws.clone().connect(join_room_url());
         spawn_local(async move {
             first_connect_fut.await.unwrap();
         });
 
-        timeout(1000, ws.connect(String::new()))
+        timeout(1000, ws.connect(join_room_url()))
             .await
             .unwrap()
             .unwrap();
@@ -537,9 +523,9 @@ mod connect {
                 Ok(transport as Rc<dyn RpcTransport>)
             })
         })));
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
 
-        timeout(50, ws.connect(String::new()))
+        timeout(50, ws.connect(join_room_url()))
             .await
             .unwrap()
             .unwrap();
@@ -586,7 +572,7 @@ mod on_connection_loss {
                 Ok(transport as Rc<dyn RpcTransport>)
             })
         })));
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
 
         ws
     }
@@ -717,6 +703,8 @@ mod on_connection_loss {
 }
 
 /// Tests for the [`RpcClient::on_reconnected`] function.
+// TODO: this tests should be implemented for the RpcSession!
+#[cfg(feature = "disabled")]
 mod on_reconnected {
 
     use medea_reactive::ObservableCell;
@@ -749,7 +737,7 @@ mod on_reconnected {
         })));
 
         let mut on_reconnected_stream = ws.on_reconnected();
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
         timeout(10, on_reconnected_stream.next()).await.unwrap_err();
     }
 
@@ -788,7 +776,7 @@ mod on_reconnected {
         })));
 
         let mut on_reconnected_stream = ws.on_reconnected();
-        ws.clone().connect(String::new()).await.unwrap();
+        ws.clone().connect(join_room_url()).await.unwrap();
 
         on_state_change_mock
             .set(TransportState::Closed(CloseMsg::Abnormal(1006)));
@@ -801,7 +789,7 @@ mod on_reconnected {
             ping_interval_ms: 2_000,
         }));
 
-        ws.connect(String::new()).await.unwrap();
+        ws.connect(join_room_url()).await.unwrap();
         assert!(on_reconnected_stream.next().await.is_some());
     }
 }
diff --git a/jason/tests/rpc/rpc_session.rs b/jason/tests/rpc/rpc_session.rs
new file mode 100644
index 000000000..ae191aa03
--- /dev/null
+++ b/jason/tests/rpc/rpc_session.rs
@@ -0,0 +1,262 @@
+#![cfg(target_arch = "wasm32")]
+
+use std::{
+    cell::RefCell,
+    rc::Rc,
+    str::FromStr,
+    sync::atomic::{AtomicBool, Ordering},
+};
+
+use futures::{future, stream, FutureExt as _, StreamExt as _};
+use medea_client_api_proto::{
+    ClientMsg, CloseReason, Command, Event, ServerMsg,
+};
+use medea_jason::rpc::{
+    websocket::{MockRpcTransport, TransportState},
+    CloseMsg, ConnectionInfo, RpcSession, RpcTransport, SessionError,
+    WebSocketRpcClient, WebSocketRpcSession, WebSocketRpcTransport,
+};
+use wasm_bindgen_test::*;
+
+use crate::{delay_for, rpc::RPC_SETTINGS, timeout, TEST_ROOM_URL};
+
+wasm_bindgen_test_configure!(run_in_browser);
+
+/// Makes sure that `connect` fails immediately if `JoinRoom` request is
+/// answered with `RoomLeft` message.
+#[wasm_bindgen_test]
+async fn could_not_auth_err() {
+    let session = WebSocketRpcSession::new(Rc::new(WebSocketRpcClient::new(
+        Box::new(move |_| {
+            Box::pin(async move {
+                let mut transport = MockRpcTransport::new();
+                transport.expect_on_message().returning_st(|| {
+                    Box::pin(stream::iter(vec![
+                        RPC_SETTINGS,
+                        ServerMsg::Event {
+                            room_id: "room_id".into(),
+                            event: Event::RoomLeft {
+                                close_reason: CloseReason::InternalError,
+                            },
+                        },
+                    ]))
+                });
+                transport.expect_send().returning(|_| Ok(()));
+                transport.expect_set_close_reason().return_once(|_| ());
+                transport.expect_on_state_change().return_once_st(move || {
+                    Box::pin(stream::once(async { TransportState::Open }))
+                });
+                let transport = Rc::new(transport);
+                Ok(transport as Rc<dyn RpcTransport>)
+            })
+        }),
+    )));
+
+    let mut on_normal_close = session.on_normal_close().fuse();
+    let mut on_reconnected = session.on_reconnected().fuse();
+    let mut on_connection_loss = session.on_connection_loss().fuse();
+
+    let connect_fut = Rc::clone(&session)
+        .connect(ConnectionInfo::from_str(TEST_ROOM_URL).unwrap());
+    let connect_err = timeout(100, connect_fut)
+        .await
+        .unwrap()
+        .unwrap_err()
+        .into_inner();
+    assert!(matches!(connect_err, SessionError::AuthorizationFailed));
+
+    // other callbacks should not fire
+    futures::select! {
+        _ = delay_for(100).fuse() => (),
+        _ = on_normal_close => panic!("on_normal_close fired"),
+        _ = on_connection_loss.next() => panic!("on_connection_loss fired"),
+        _ = on_reconnected.next() => panic!("on_reconnected fired")
+    };
+}
+
+/// Makes sure that if multiple concurrent `connect` and `reconnect` calls are
+/// made, only one `JoinRoom` message will be sent.
+#[wasm_bindgen_test]
+async fn concurrent_connect_requests() {
+    let join_room_sent = Rc::new(AtomicBool::new(false));
+
+    let join_room_sent_clone = Rc::clone(&join_room_sent);
+    let session = WebSocketRpcSession::new(Rc::new(WebSocketRpcClient::new({
+        Box::new(move |_| {
+            let join_room_sent = Rc::clone(&join_room_sent_clone);
+            Box::pin(async move {
+                let mut transport = MockRpcTransport::new();
+                transport.expect_on_message().returning_st(|| {
+                    Box::pin(stream::iter(vec![
+                        RPC_SETTINGS,
+                        ServerMsg::Event {
+                            room_id: "room_id".into(),
+                            event: Event::RoomJoined {
+                                member_id: "member_id".into(),
+                            },
+                        },
+                    ]))
+                });
+                let join_room_sent = Rc::clone(&join_room_sent);
+                transport.expect_send().returning_st(move |msg| {
+                    if matches!(msg, ClientMsg::Command {
+                        command: Command::JoinRoom { .. },
+                        ..
+                    }) {
+                        let already_sent =
+                            join_room_sent.fetch_or(true, Ordering::Relaxed);
+                        assert!(
+                            !already_sent,
+                            "only one JoinRoom should be sent"
+                        );
+                    }
+                    Ok(())
+                });
+                transport.expect_set_close_reason().return_once(|_| ());
+                transport.expect_on_state_change().return_once_st(move || {
+                    Box::pin(stream::once(async { TransportState::Open }))
+                });
+                let transport = Rc::new(transport);
+                Ok(transport as Rc<dyn RpcTransport>)
+            })
+        })
+    })));
+
+    let connection_info = ConnectionInfo::from_str(TEST_ROOM_URL).unwrap();
+
+    let connect1 = Rc::clone(&session).connect(connection_info.clone());
+    let reconnect1 = Rc::clone(&session).reconnect();
+    let connect2 = Rc::clone(&session).connect(connection_info);
+    let reconnect2 = Rc::clone(&session).reconnect();
+
+    futures::future::try_join_all(vec![
+        connect1, reconnect1, connect2, reconnect2,
+    ])
+    .await
+    .unwrap();
+    assert!(join_room_sent.load(Ordering::Relaxed));
+}
+
+/// Makes sure that `connect` fails immediately if transport establishment
+/// failed.
+#[wasm_bindgen_test]
+async fn could_not_open_transport() {
+    let session = WebSocketRpcSession::new(Rc::new(WebSocketRpcClient::new(
+        Box::new(|url| {
+            Box::pin(async move {
+                let ws = WebSocketRpcTransport::new(url)
+                    .await
+                    .map_err(|e| tracerr::new!(e))?;
+                Ok(Rc::new(ws) as Rc<dyn RpcTransport>)
+            })
+        }),
+    )));
+
+    let mut on_normal_close = session.on_normal_close().fuse();
+    let mut on_reconnected = session.on_reconnected().fuse();
+    let mut on_connection_loss = session.on_connection_loss().fuse();
+
+    let connect_fut = Rc::clone(&session).connect(
+        ConnectionInfo::from_str("ws://localhost:55555/some/fake/endpoint")
+            .unwrap(),
+    );
+
+    // connect resolve with err
+    timeout(100, connect_fut).await.unwrap().unwrap_err();
+
+    // other callbacks should not fire
+    futures::select! {
+        _ = delay_for(100).fuse() => (),
+        _ = on_normal_close => panic!("on_normal_close fired"),
+        _ = on_connection_loss.next() => panic!("on_connection_loss fired"),
+        _ = on_reconnected.next() => panic!("on_reconnected fired")
+    };
+}
+
+/// Makes sure that `on_connection_loss` is fired when transport closes with
+/// non-normal close and reconnect works as expected.
+#[wasm_bindgen_test]
+async fn reconnect_after_transport_abnormal_close() {
+    let commands_sent = Rc::new(RefCell::new(Vec::new()));
+
+    let commands_sent_clone = Rc::clone(&commands_sent);
+    let session = WebSocketRpcSession::new(Rc::new(WebSocketRpcClient::new(
+        Box::new(move |_| {
+            let commands_sent_clone = Rc::clone(&commands_sent_clone);
+            Box::pin(async move {
+                let mut transport = MockRpcTransport::new();
+                transport.expect_on_message().returning_st(|| {
+                    Box::pin(stream::iter(vec![
+                        RPC_SETTINGS,
+                        ServerMsg::Event {
+                            room_id: "room_id".into(),
+                            event: Event::RoomJoined {
+                                member_id: "member_id".into(),
+                            },
+                        },
+                    ]))
+                });
+                let commands_sent = Rc::clone(&commands_sent_clone);
+                transport.expect_send().returning_st(move |msg| {
+                    commands_sent.borrow_mut().push(msg.clone());
+                    Ok(())
+                });
+                transport.expect_set_close_reason().return_once(|_| ());
+                transport.expect_on_state_change().return_once_st(move || {
+                    Box::pin(
+                        stream::once(future::ready(TransportState::Open))
+                            .chain(stream::once(async {
+                                delay_for(20).await;
+                                TransportState::Closed(CloseMsg::Abnormal(999))
+                            })),
+                    )
+                });
+                let transport = Rc::new(transport);
+                Ok(transport as Rc<dyn RpcTransport>)
+            })
+        }),
+    )));
+
+    let mut on_normal_close = session.on_normal_close().fuse();
+    let mut on_reconnected = session.on_reconnected().fuse();
+    let mut on_connection_loss = session.on_connection_loss().fuse();
+
+    let connect_fut = Rc::clone(&session)
+        .connect(ConnectionInfo::from_str(TEST_ROOM_URL).unwrap());
+    timeout(100, connect_fut).await.unwrap().unwrap();
+
+    // on_connection_loss fires
+    futures::select! {
+        _ = delay_for(100).fuse() => panic!("on_connection_loss should fire"),
+        _ = on_normal_close => panic!("on_normal_close fired"),
+        _ = on_connection_loss.next() => (),
+        _ = on_reconnected.next() => panic!("on_reconnected fired")
+    };
+
+    // successful reconnect after connection loss
+    Rc::clone(&session).reconnect().await.unwrap();
+    on_reconnected.select_next_some().await;
+
+    drop(session);
+    assert_eq!(
+        *commands_sent.borrow(),
+        vec![
+            // connect
+            ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                }
+            },
+            // reconnect
+            ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                }
+            }
+        ]
+    );
+}
diff --git a/jason/tests/rpc/websocket.rs b/jason/tests/rpc/websocket.rs
index d94eb3322..6e39d54e0 100644
--- a/jason/tests/rpc/websocket.rs
+++ b/jason/tests/rpc/websocket.rs
@@ -1,30 +1,20 @@
 #![cfg(target_arch = "wasm32")]
 
 use medea_jason::rpc::{TransportError, WebSocketRpcTransport};
+use url::Url;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
 
-#[wasm_bindgen_test]
-async fn bad_url_err() {
-    use TransportError::*;
-
-    match WebSocketRpcTransport::new("asd").await {
-        Ok(_) => unreachable!(),
-        Err(err) => match err.into_inner() {
-            CreateSocket(err) => {
-                assert_eq!(err.name, "SyntaxError");
-            }
-            _ => unreachable!(),
-        },
-    }
-}
-
 #[wasm_bindgen_test]
 async fn could_not_init_socket_err() {
     use TransportError::*;
 
-    match WebSocketRpcTransport::new("ws://0.0.0.0:60000").await {
+    match WebSocketRpcTransport::new(
+        Url::parse("ws://0.0.0.0:60000").unwrap().into(),
+    )
+    .await
+    {
         Ok(_) => unreachable!(),
         Err(err) => match err.into_inner() {
             InitSocket => {}
diff --git a/jason/tests/web.rs b/jason/tests/web.rs
index bd4976393..af33e337d 100644
--- a/jason/tests/web.rs
+++ b/jason/tests/web.rs
@@ -90,10 +90,12 @@ use medea_jason::{
     media::{
         LocalTracksConstraints, MediaKind, MediaManager, MediaStreamTrack,
     },
+    rpc::ApiUrl,
     utils::{window, JasonError},
     AudioTrackConstraints, DeviceVideoTrackConstraints,
     DisplayVideoTrackConstraints, MediaStreamSettings,
 };
+use url::Url;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::JsFuture;
 use wasm_bindgen_test::*;
@@ -207,6 +209,12 @@ pub fn get_test_recv_tracks() -> (Track, Track) {
     )
 }
 
+const TEST_ROOM_URL: &str = "ws://example.com/room_id/member_id/token";
+
+pub fn join_room_url() -> ApiUrl {
+    Url::parse("ws://example.com/ws").unwrap().into()
+}
+
 /// Resolves after provided number of milliseconds.
 pub async fn delay_for(delay_ms: i32) {
     JsFuture::from(Promise::new(&mut |yes, _| {
diff --git a/proto/client-api/CHANGELOG.md b/proto/client-api/CHANGELOG.md
index fe125519f..593ca8f69 100644
--- a/proto/client-api/CHANGELOG.md
+++ b/proto/client-api/CHANGELOG.md
@@ -58,7 +58,9 @@ All user visible changes to this project will be documented in this file. This p
 - `TrackPatchEvent` and `TrackPatchCommand` types ([#127]);
 - `IceRestart` variant to `TrackUpdate` ([#138]);
 - `source_kind` field to `VideoSettings` type ([#145]);
-- `RoomId` and `Credential` types ([#148]).
+- `RoomId` and `Credential` types ([#148]);
+- `JoinRoom` and `LeaveRoom` client messages ([#147]);
+- `RoomJoined` and `RoomLeft` server messages ([#147]).
 
 [#28]: /../../pull/28
 [#58]: /../../pull/58
@@ -76,6 +78,7 @@ All user visible changes to this project will be documented in this file. This p
 [#127]: /../../pull/127
 [#138]: /../../pull/138
 [#145]: /../../pull/145
+[#147]: /../../pull/147
 [#148]: /../../pull/148
 
 
diff --git a/proto/client-api/src/lib.rs b/proto/client-api/src/lib.rs
index 1e7f9f2cf..ae008f820 100644
--- a/proto/client-api/src/lib.rs
+++ b/proto/client-api/src/lib.rs
@@ -113,13 +113,38 @@ pub enum ServerMsg {
 
     /// `Media Server` notifies `Client` about happened facts and it reacts on
     /// them to reach the proper state.
-    Event(Event),
+    Event {
+        /// ID of `Room` that this [`Event`] is associated with.
+        room_id: RoomId,
+
+        /// Actual [`Event`] sent to `Client`.
+        event: Event,
+    },
 
     /// `Media Server` notifies `Client` about necessity to update its RPC
     /// settings.
     RpcSettings(RpcSettings),
 }
 
+#[cfg_attr(feature = "medea", derive(Deserialize))]
+#[cfg_attr(feature = "jason", derive(Serialize))]
+#[derive(Clone, Debug, PartialEq)]
+/// Message from 'Client' to 'Media Server'.
+pub enum ClientMsg {
+    /// `pong` message that `Client` answers with to `Media Server` in response
+    /// to received [`ServerMsg::Ping`].
+    Pong(u32),
+
+    /// Request of `Client` to change the state on `Media Server`.
+    Command {
+        /// ID of `Room` that this [`Command`] is associated with.
+        room_id: RoomId,
+
+        /// Actual [`Command`] sent to `Media Server`.
+        command: Command,
+    },
+}
+
 /// RPC settings of `Client` received from `Media Server`.
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct RpcSettings {
@@ -135,21 +160,6 @@ pub struct RpcSettings {
     pub ping_interval_ms: u32,
 }
 
-#[cfg_attr(feature = "medea", derive(Deserialize))]
-#[cfg_attr(feature = "jason", derive(Serialize))]
-#[cfg_attr(test, derive(PartialEq))]
-#[derive(Clone, Debug)]
-#[serde(tag = "msg", content = "data")]
-/// Message from 'Client' to 'Media Server'.
-pub enum ClientMsg {
-    /// `pong` message that `Client` answers with to `Media Server` in response
-    /// to received [`ServerMsg::Ping`].
-    Pong(u32),
-
-    /// Request of `Client` to change the state on `Media Server`.
-    Command(Command),
-}
-
 /// WebSocket message from Web Client to Media Server.
 #[dispatchable]
 #[cfg_attr(feature = "medea", derive(Deserialize))]
@@ -157,6 +167,21 @@ pub enum ClientMsg {
 #[serde(tag = "command", content = "data")]
 #[derive(Clone, Debug, PartialEq)]
 pub enum Command {
+    /// Request of `Client` to join `Room`.
+    JoinRoom {
+        /// ID of `Member` with which [`Credentials`] `Client` want to join.
+        member_id: MemberId,
+
+        /// [`Credential`] of `Client`'s `Member`.
+        credential: Credential,
+    },
+
+    /// Request of `Client` to leave `Room`.
+    LeaveRoom {
+        /// ID of leaving `Member`.
+        member_id: MemberId,
+    },
+
     /// Web Client sends SDP Offer.
     MakeSdpOffer {
         /// ID of the `Peer` for which Web Client sends SDP Offer.
@@ -370,6 +395,18 @@ pub struct CloseDescription {
 #[cfg_attr(feature = "jason", derive(Deserialize))]
 #[serde(tag = "event", content = "data")]
 pub enum Event {
+    /// `Media Server` notifies `Client` that he joined `Room`.
+    RoomJoined {
+        /// ID of `Member` which joined `Room`.
+        member_id: MemberId,
+    },
+
+    /// `Media Server` notifies `Client` that he left `Room`.
+    RoomLeft {
+        /// [`CloseReason`] with which `Client` was left.
+        close_reason: CloseReason,
+    },
+
     /// Media Server notifies Web Client about necessity of RTCPeerConnection
     /// creation.
     PeerCreated {
diff --git a/src/api/client/mod.rs b/src/api/client/mod.rs
index 92972d0c9..92724d533 100644
--- a/src/api/client/mod.rs
+++ b/src/api/client/mod.rs
@@ -6,3 +6,5 @@ mod session;
 
 pub mod rpc_connection;
 pub mod server;
+
+pub use self::session::RpcServerRepository;
diff --git a/src/api/client/rpc_connection.rs b/src/api/client/rpc_connection.rs
index 2bf5e640b..ef7cabb34 100644
--- a/src/api/client/rpc_connection.rs
+++ b/src/api/client/rpc_connection.rs
@@ -5,10 +5,9 @@
 use std::{fmt, time::Duration};
 
 use actix::Message;
-use derive_more::{From, Into};
 use futures::future::LocalBoxFuture;
 use medea_client_api_proto::{
-    CloseDescription, Command, Credential, Event, MemberId,
+    CloseDescription, Command, Credential, Event, MemberId, RoomId,
 };
 
 use crate::signalling::room::RoomError;
@@ -35,9 +34,12 @@ impl CommandMessage {
 }
 
 /// Newtype for [`Event`] with actix [`Message`] implementation.
-#[derive(Debug, From, Into, Message)]
+#[derive(Debug, Message)]
 #[rtype(result = "()")]
-pub struct EventMessage(Event);
+pub struct EventMessage {
+    pub room_id: RoomId,
+    pub event: Event,
+}
 
 /// Abstraction over RPC connection with some remote [`Member`].
 ///
@@ -53,13 +55,14 @@ pub trait RpcConnection: fmt::Debug + Send {
     /// [Close]: https://tools.ietf.org/html/rfc6455#section-5.5.1
     fn close(
         &mut self,
+        room_id: RoomId,
         close_description: CloseDescription,
     ) -> LocalBoxFuture<'static, ()>;
 
     /// Sends [`Event`] to remote [`Member`].
     ///
     /// [`Member`]: crate::signalling::elements::member::Member
-    fn send_event(&self, msg: Event);
+    fn send_event(&self, room_id: RoomId, event: Event);
 }
 
 #[cfg(test)]
@@ -78,46 +81,21 @@ pub struct RpcConnectionSettings {
     pub ping_interval: Duration,
 }
 
-/// Signal for authorizing new [`RpcConnection`] before establishing.
-#[derive(Debug, Message)]
-#[rtype(result = "Result<RpcConnectionSettings, AuthorizationError>")]
-pub struct Authorize {
-    /// ID of [`Member`] to authorize [`RpcConnection`] for.
-    ///
-    /// [`Member`]: crate::signalling::elements::member::Member
-    pub member_id: MemberId,
-
-    /// Credentials to authorize [`RpcConnection`] with.
-    pub credentials: Credential,
-}
-
-/// Error of authorization [`RpcConnection`] in [`Room`].
-///
-/// [`Room`]: crate::signalling::Room
-#[derive(Debug)]
-pub enum AuthorizationError {
-    /// Authorizing [`Member`] does not exists in the [`Room`].
-    ///
-    /// [`Member`]: crate::signalling::elements::member::Member
-    /// [`Room`]: crate::signalling::Room
-    MemberNotExists,
-
-    /// Provided credentials are invalid.
-    InvalidCredentials,
-}
-
 /// Signal of new [`RpcConnection`] being established with specified [`Member`].
 /// Transport should consider dropping connection if message result is err.
 ///
 /// [`Member`]: crate::signalling::elements::member::Member
 #[derive(Debug, Message)]
-#[rtype(result = "Result<(), RoomError>")]
+#[rtype(result = "Result<RpcConnectionSettings, RoomError>")]
 pub struct RpcConnectionEstablished {
     /// ID of [`Member`] that establishes [`RpcConnection`].
     ///
     /// [`Member`]: crate::signalling::elements::member::Member
     pub member_id: MemberId,
 
+    /// Credential of [`Member`] to authorize WebSocket connection with.
+    pub credentials: Credential,
+
     /// Established [`RpcConnection`].
     pub connection: Box<dyn RpcConnection>,
 }
@@ -137,7 +115,7 @@ pub struct RpcConnectionClosed {
 }
 
 /// Reasons of why [`RpcConnection`] may be closed.
-#[derive(Debug, PartialEq)]
+#[derive(Clone, Copy, Debug, PartialEq)]
 pub enum ClosedReason {
     /// [`RpcConnection`] was irrevocably closed.
     Closed {
diff --git a/src/api/client/server.rs b/src/api/client/server.rs
index a00455f33..430558a79 100644
--- a/src/api/client/server.rs
+++ b/src/api/client/server.rs
@@ -6,84 +6,36 @@ use actix::{Actor, Addr, Handler, ResponseFuture};
 use actix_web::{
     dev::Server as ActixServer,
     middleware,
-    web::{resource, Data, Path, Payload, ServiceConfig},
+    web::{resource, Data, Payload, ServiceConfig},
     App, HttpRequest, HttpResponse, HttpServer,
 };
 use actix_web_actors::ws;
 use futures::FutureExt as _;
-use medea_client_api_proto::{Credential, MemberId, RoomId};
-use serde::Deserialize;
 
 use crate::{
-    api::client::{
-        rpc_connection::{AuthorizationError, Authorize},
-        session::WsSession,
-    },
+    api::client::session::WsSession,
     conf::{Conf, Rpc},
     log::prelude::*,
     shutdown::ShutdownGracefully,
     signalling::room_repo::RoomRepository,
 };
 
-/// Parameters of new WebSocket connection creation HTTP request.
-#[derive(Debug, Deserialize)]
-struct RequestParams {
-    /// ID of [`Room`] that WebSocket connection connects to.
-    room_id: RoomId,
-
-    /// ID of [`Member`] that establishes WebSocket connection.
-    member_id: MemberId,
-
-    /// Credential of [`Member`] to authorize WebSocket connection with.
-    credentials: Credential,
-}
-
 /// Handles all HTTP requests, performs WebSocket handshake (upgrade) and starts
 /// new [`WsSession`] for WebSocket connection.
 async fn ws_index(
     request: HttpRequest,
-    info: Path<RequestParams>,
     state: Data<Context>,
     payload: Payload,
 ) -> actix_web::Result<HttpResponse> {
-    debug!("Request params: {:?}", info);
-    let RequestParams {
-        room_id,
-        member_id,
-        credentials,
-    } = info.into_inner();
-
-    match state.rooms.get(&room_id) {
-        Some(room) => {
-            let auth_result = room
-                .send(Authorize {
-                    member_id: member_id.clone(),
-                    credentials,
-                })
-                .await
-                .map_err(|_| HttpResponse::InternalServerError())?;
-            match auth_result {
-                Ok(settings) => ws::start(
-                    WsSession::new(
-                        member_id,
-                        room_id,
-                        Box::new(room),
-                        settings.idle_timeout,
-                        settings.ping_interval,
-                    ),
-                    &request,
-                    payload,
-                ),
-                Err(AuthorizationError::MemberNotExists) => {
-                    Err(HttpResponse::NotFound().into())
-                }
-                Err(AuthorizationError::InvalidCredentials) => {
-                    Err(HttpResponse::Forbidden().into())
-                }
-            }
-        }
-        None => Err(HttpResponse::NotFound().into()),
-    }
+    ws::start(
+        WsSession::new(
+            Box::new(state.rooms.clone()),
+            state.config.idle_timeout,
+            state.config.ping_interval,
+        ),
+        &request,
+        payload,
+    )
 }
 
 /// Context for [`App`] which holds all the necessary dependencies.
@@ -132,10 +84,7 @@ impl Server {
     /// Run external configuration as part of the application building
     /// process
     fn configure(cfg: &mut ServiceConfig) {
-        cfg.service(
-            resource("/ws/{room_id}/{member_id}/{credentials}")
-                .route(actix_web::web::get().to(ws_index)),
-        );
+        cfg.service(resource("/ws").route(actix_web::web::get().to(ws_index)));
     }
 }
 
@@ -155,116 +104,3 @@ impl Handler<ShutdownGracefully> for Server {
         self.0.stop(true).boxed_local()
     }
 }
-
-#[cfg(test)]
-mod test {
-    use std::time::Duration;
-
-    use actix_web::test::TestServer;
-    use awc::error::WsClientError;
-
-    use crate::{
-        api::control,
-        conf::Conf,
-        signalling::{peers::build_peers_traffic_watcher, Room},
-        turn::new_turn_auth_service_mock,
-        AppContext,
-    };
-
-    use super::*;
-
-    /// Creates [`RoomRepository`] for tests filled with a single [`Room`].
-    fn build_room_repo(conf: Conf) -> RoomRepository {
-        let room_spec =
-            control::load_from_yaml_file("tests/specs/pub-sub-video-call.yml")
-                .unwrap();
-
-        let traffic_watcher = build_peers_traffic_watcher(&conf.media);
-        let app = AppContext::new(conf, new_turn_auth_service_mock());
-
-        let room_id = room_spec.id.clone();
-        let client_room =
-            Room::start(&room_spec, &app, traffic_watcher).unwrap();
-        let room_hash_map = hashmap! {
-            room_id => client_room,
-        };
-
-        RoomRepository::new(room_hash_map)
-    }
-
-    /// Creates test WebSocket server of Client API which can handle requests.
-    fn ws_server(conf: Conf) -> TestServer {
-        actix_web::test::start(move || {
-            App::new()
-                .app_data(Server::app_data(
-                    build_room_repo(conf.clone()),
-                    conf.rpc,
-                ))
-                .configure(Server::configure)
-        })
-    }
-
-    #[actix_rt::test]
-    async fn forbidden_if_bad_credentials() {
-        let conf = Conf {
-            rpc: Rpc {
-                idle_timeout: Duration::new(1, 0),
-                ..Rpc::default()
-            },
-            ..Conf::default()
-        };
-
-        let mut server = ws_server(conf.clone());
-        match server
-            .ws_at("/ws/pub-sub-video-call/caller/bad_credentials")
-            .await
-        {
-            Err(WsClientError::InvalidResponseStatus(code)) => {
-                assert_eq!(code, 403);
-            }
-            _ => unreachable!(),
-        }
-    }
-
-    #[actix_rt::test]
-    async fn not_found_if_bad_url() {
-        let conf = Conf {
-            rpc: Rpc {
-                idle_timeout: Duration::new(1, 0),
-                ..Rpc::default()
-            },
-            ..Conf::default()
-        };
-
-        let mut server = ws_server(conf.clone());
-        match server.ws_at("/ws/bad_room/caller/test").await {
-            Err(WsClientError::InvalidResponseStatus(code)) => {
-                assert_eq!(code, 404);
-            }
-            _ => unreachable!(),
-        };
-        match server.ws_at("/ws/pub-sub-video-call/bad_member/test").await {
-            Err(WsClientError::InvalidResponseStatus(code)) => {
-                assert_eq!(code, 404);
-            }
-            _ => unreachable!(),
-        };
-    }
-
-    #[actix_rt::test]
-    async fn established() {
-        let conf = Conf {
-            rpc: Rpc {
-                idle_timeout: Duration::new(1, 0),
-                ..Rpc::default()
-            },
-            ..Conf::default()
-        };
-
-        let mut server = ws_server(conf.clone());
-        server
-            .ws_at("/ws/pub-sub-video-call/caller/test")
-            .await
-            .unwrap();
-    }
-}
diff --git a/src/api/client/session.rs b/src/api/client/session.rs
index 381eea27e..297272974 100644
--- a/src/api/client/session.rs
+++ b/src/api/client/session.rs
@@ -1,39 +1,64 @@
 //! WebSocket session.
 
 use std::{
+    collections::HashMap,
     convert::TryInto as _,
-    fmt::{Display, Error, Formatter},
+    fmt::{Debug, Display, Error, Formatter},
     sync::atomic::{AtomicU64, Ordering},
     time::{Duration, Instant},
 };
 
 use actix::{
-    fut::WrapFuture as _, Actor, ActorContext, ActorFuture, Addr, Arbiter,
-    AsyncContext, ContextFutureSpawner as _, Handler, MailboxError, Message,
-    StreamHandler,
+    Actor, ActorContext, ActorFuture, Addr, Arbiter, AsyncContext,
+    ContextFutureSpawner, Handler, MailboxError, Message, SpawnHandle,
+    StreamHandler, WrapFuture,
 };
 use actix_http::ws::{CloseReason as WsCloseReason, Item};
 use actix_web_actors::ws::{self, CloseCode};
 use bytes::{Buf, BytesMut};
 use futures::future::{FutureExt as _, LocalBoxFuture};
 use medea_client_api_proto::{
-    ClientMsg, CloseDescription, CloseReason, Event, MemberId, RoomId,
-    RpcSettings, ServerMsg,
+    ClientMsg, CloseDescription, CloseReason, Command, Credential, Event,
+    MemberId, RoomId, RpcSettings, ServerMsg,
 };
 
 use crate::{
     api::{
-        client::rpc_connection::{ClosedReason, EventMessage, RpcConnection},
-        RpcServer,
+        client::rpc_connection::{
+            ClosedReason, EventMessage, RpcConnection, RpcConnectionSettings,
+        },
+        RpcServer, RpcServerError,
     },
     log::prelude::*,
 };
 
+/// Repository of the all [`RpcServer`]s registered on this Media Server.
+#[cfg_attr(test, mockall::automock)]
+pub trait RpcServerRepository: Debug {
+    /// Returns [`RpcServer`] with a provided [`RoomId`].
+    ///
+    /// Returns `None` if [`RpcServer`] with a provided [`RoomId`] doesn't
+    /// exists.
+    fn get(&self, room_id: &RoomId) -> Option<Box<dyn RpcServer>>;
+}
+
+#[cfg(test)]
+impl_debug_by_struct_name!(MockRpcServerRepository);
+
 /// Used to generate [`WsSession`] IDs.
 static ID_COUNTER: AtomicU64 = AtomicU64::new(0);
 
+/// [`WsSession`] authentication timeout.
+///
+/// When this [`Duration`] will pass, [`WsSession`] will check that at least one
+/// success authorization was happened.
+#[cfg(not(test))]
+static AUTH_TIMEOUT: Duration = Duration::from_secs(10);
+#[cfg(test)]
+static AUTH_TIMEOUT: Duration = Duration::from_secs(1);
+
 /// [`WsSession`] closed reason.
-#[derive(Debug)]
+#[derive(Clone, Copy, Debug)]
 enum InnerCloseReason {
     /// [`WsSession`] was closed by [`RpcServer`] or was considered idle.
     ByServer,
@@ -48,14 +73,11 @@ pub struct WsSession {
     /// ID of [`WsSession`].
     id: u64,
 
-    /// ID of [`Member`] that WebSocket connection is associated with.
-    member_id: MemberId,
-
-    /// ID of [`RpcServer`] that WebSocket connection is associated with.
-    room_id: RoomId,
+    /// Repository of the all [`RpcServer`]s registered on this Media Server.
+    rpc_server_repo: Box<dyn RpcServerRepository>,
 
-    /// [`Room`] that [`Member`] is associated with.
-    room: Box<dyn RpcServer>,
+    /// All sessions which this [`WsSession`] is serves.
+    sessions: HashMap<RoomId, (MemberId, Box<dyn RpcServer>)>,
 
     /// Timeout of receiving any messages from client.
     idle_timeout: Duration,
@@ -79,41 +101,88 @@ pub struct WsSession {
     /// [`WsSession`] closed reason. Should be set by the moment
     /// `Actor::stopped()` for this [`WsSession`] is called.
     close_reason: Option<InnerCloseReason>,
+
+    /// [`SpawnHandle`] for the authentication checking task.
+    auth_timeout_handle: Option<SpawnHandle>,
+
+    /// [`SpawnHandle`] for the heartbeat task.
+    heartbeat_handle: Option<SpawnHandle>,
 }
 
 impl WsSession {
     /// Creates new [`WsSession`] for specified [`Member`].
     pub fn new(
-        member_id: MemberId,
-        room_id: RoomId,
-        room: Box<dyn RpcServer>,
+        rooms: Box<dyn RpcServerRepository>,
         idle_timeout: Duration,
         ping_interval: Duration,
     ) -> Self {
         Self {
             id: ID_COUNTER.fetch_add(1, Ordering::Relaxed),
-            member_id,
-            room_id,
-            room,
+            rpc_server_repo: rooms,
+            sessions: HashMap::new(),
             idle_timeout,
             last_activity: Instant::now(),
             fragmentation_buffer: BytesMut::new(),
             last_ping_num: 0,
             ping_interval,
             close_reason: None,
+            auth_timeout_handle: None,
+            heartbeat_handle: None,
         }
     }
 
     /// Handles text WebSocket messages.
-    fn handle_text(&mut self, text: &str) {
+    fn handle_text(
+        &mut self,
+        ctx: &mut ws::WebsocketContext<Self>,
+        text: &str,
+    ) {
         self.last_activity = Instant::now();
         match serde_json::from_str::<ClientMsg>(&text) {
             Ok(ClientMsg::Pong(n)) => {
                 debug!("{}: Received Pong: {}", self, n);
             }
-            Ok(ClientMsg::Command(command)) => {
+            Ok(ClientMsg::Command { room_id, command }) => {
                 debug!("{}: Received Command: {:?}", self, command);
-                self.room.send_command(self.member_id.clone(), command);
+                match command {
+                    Command::JoinRoom {
+                        member_id,
+                        credential,
+                    } => {
+                        self.handle_join_room(
+                            ctx, room_id, member_id, credential,
+                        );
+                    }
+                    Command::LeaveRoom { member_id } => {
+                        self.handle_leave_room(
+                            ctx,
+                            &room_id,
+                            member_id,
+                            ClosedReason::Closed { normal: true },
+                        );
+                    }
+                    _ => {
+                        if let Some((member_id, room)) =
+                            self.sessions.get(&room_id)
+                        {
+                            room.send_command(member_id.clone(), command);
+                        } else {
+                            self.send_left_room(
+                                ctx,
+                                room_id,
+                                CloseReason::Finished,
+                            );
+                            if self.sessions.is_empty() {
+                                self.close_in_place(
+                                    ctx,
+                                    &CloseDescription::new(
+                                        CloseReason::Rejected,
+                                    ),
+                                );
+                            }
+                        }
+                    }
+                }
             }
             Err(err) => error!(
                 "{}: Error [{:?}] parsing client message: [{}]",
@@ -122,11 +191,120 @@ impl WsSession {
         }
     }
 
+    /// Updates [`RpcConnectionSettings`] of this [`WsSession`].
+    ///
+    /// Updates will be performed only if old settings are less then new one.
+    ///
+    /// Sends [`ServerMsg::RpcSettings`] to the client if some settings was
+    /// updated.
+    ///
+    /// Restarts heartbeater with a new [`RpcConnectionSettings`].
+    fn update_rpc_settings(
+        &mut self,
+        new_settings: RpcConnectionSettings,
+        ctx: &mut ws::WebsocketContext<Self>,
+    ) {
+        let mut updated = false;
+        if new_settings.idle_timeout < self.idle_timeout {
+            self.idle_timeout = new_settings.idle_timeout;
+            updated = true;
+        }
+        if new_settings.ping_interval < self.ping_interval {
+            self.ping_interval = new_settings.ping_interval;
+            updated = true;
+        }
+        if updated {
+            self.send_current_rpc_settings(ctx);
+            self.start_heartbeat(ctx);
+        }
+    }
+
+    /// Handler for [`Command::JoinRoom`].
+    ///
+    /// Calls [`RpcServer::connection_established`], updates
+    /// [`RpcConnectionSettings`] with [`RpcConnectionSettings`] returned from
+    /// the [`RpcServer`].
+    ///
+    /// Sends [`Event::RoomJoined`].
+    fn handle_join_room(
+        &mut self,
+        ctx: &mut ws::WebsocketContext<Self>,
+        room_id: RoomId,
+        member_id: MemberId,
+        credential: Credential,
+    ) {
+        if let Some(room) = self.rpc_server_repo.get(&room_id) {
+            room.connection_established(
+                member_id.clone(),
+                credential,
+                Box::new(ctx.address()),
+            )
+            .into_actor(self)
+            .map(|result, this, ctx| match result {
+                Ok(settings) => {
+                    this.update_rpc_settings(settings, ctx);
+                    this.sessions
+                        .insert(room_id.clone(), (member_id.clone(), room));
+                    if let Some(auth_timeout_handle) =
+                        this.auth_timeout_handle.take()
+                    {
+                        ctx.cancel_future(auth_timeout_handle);
+                    }
+                    this.send_joined_room(ctx, room_id, member_id);
+                }
+                Err(err) => {
+                    error!(
+                        "{}: Failed to authorize Rpc Session `{}/{}` cause: \
+                         {:?}",
+                        this, room_id, member_id, err
+                    );
+                    let reason = match err {
+                        RpcServerError::Authorization => CloseReason::Rejected,
+                        RpcServerError::RoomError(_)
+                        | RpcServerError::RoomMailbox(_) => {
+                            CloseReason::InternalError
+                        }
+                    };
+                    this.send_left_room(ctx, room_id, reason)
+                }
+            })
+            .wait(ctx);
+        } else {
+            error!(
+                "{}: Failed to authorize Rpc Session: Room `{}` does not exist",
+                self, room_id
+            );
+            self.send_left_room(ctx, room_id, CloseReason::Rejected)
+        }
+    }
+
+    /// Handles [`Command::LeftRoom`].
+    ///
+    /// Sends [`RpcServer::connection_closed`] to the [`RpcServer`] based on
+    /// provided [`RoomId`].
+    fn handle_leave_room(
+        &mut self,
+        ctx: &mut ws::WebsocketContext<Self>,
+        room_id: &RoomId,
+        _: MemberId,
+        reason: ClosedReason,
+    ) {
+        if let Some((member, room)) = self.sessions.remove(&room_id) {
+            ctx.spawn(room.connection_closed(member, reason).into_actor(self));
+        }
+        if self.sessions.is_empty() {
+            self.close_in_place(
+                ctx,
+                &CloseDescription::new(CloseReason::Finished),
+            )
+        }
+    }
+
     /// Handles WebSocket close frame.
     fn handle_close(
         &mut self,
-        reason: Option<WsCloseReason>,
         ctx: &mut ws::WebsocketContext<Self>,
+        reason: Option<WsCloseReason>,
     ) {
         debug!("{}: Received Close message: {:?}", self, reason);
         if self.close_reason.is_none() {
@@ -148,7 +326,11 @@ impl WsSession {
     }
 
     /// Handles WebSocket continuation frame.
-    fn handle_continuation(&mut self, frame: Item) {
+    fn handle_continuation(
+        &mut self,
+        ctx: &mut ws::WebsocketContext<Self>,
+        frame: Item,
+    ) {
         // This is logged as at `WARN` level, because fragmentation usually
         // happens only when dealing with large payloads (>128kb in Chrome).
         // We will handle this message, but it probably signals that some
@@ -187,7 +369,7 @@ impl WsSession {
                 self.fragmentation_buffer.extend_from_slice(value.bytes());
                 let frame = self.fragmentation_buffer.split();
                 match std::str::from_utf8(frame.as_ref()) {
-                    Ok(text) => self.handle_text(&text),
+                    Ok(text) => self.handle_text(ctx, &text),
                     Err(err) => {
                         error!("{}: Could not parse ws frame: {}", self, err);
                     }
@@ -200,11 +382,14 @@ impl WsSession {
     fn close_in_place(
         &mut self,
         ctx: &mut ws::WebsocketContext<Self>,
-        reason: Close,
+        reason: &CloseDescription,
     ) {
         debug!("{}: Closing WsSession", self);
         self.close_reason = Some(InnerCloseReason::ByServer);
-        ctx.close(Some(reason.0));
+        ctx.close(Some(ws::CloseReason {
+            code: ws::CloseCode::Normal,
+            description: Some(serde_json::to_string(reason).unwrap()),
+        }));
         ctx.stop();
     }
 
@@ -216,17 +401,9 @@ impl WsSession {
                 > this.idle_timeout
             {
                 info!("{}: WsSession is idle", this);
-
-                Arbiter::spawn(this.room.connection_closed(
-                    this.member_id.clone(),
-                    ClosedReason::Lost,
-                ));
-
                 this.close_in_place(
                     ctx,
-                    Close::with_normal_code(&CloseDescription::new(
-                        CloseReason::Idle,
-                    )),
+                    &CloseDescription::new(CloseReason::Idle),
                 );
             }
         });
@@ -234,11 +411,16 @@ impl WsSession {
 
     /// Sends [`ServerMsg::Ping`] immediately and starts ping send scheduler
     /// with `ping_interval`.
-    fn start_pinger(&mut self, ctx: &mut <Self as Actor>::Context) {
-        self.send_ping(ctx);
-        ctx.run_interval(self.ping_interval, |this, ctx| {
-            this.send_ping(ctx);
-        });
+    fn start_heartbeat(&mut self, ctx: &mut <Self as Actor>::Context) {
+        if let Some(heartbeat_handle) = self.heartbeat_handle.take() {
+            ctx.cancel_future(heartbeat_handle);
+        } else {
+            self.send_ping(ctx);
+        }
+        self.heartbeat_handle =
+            Some(ctx.run_interval(self.ping_interval, |this, ctx| {
+                this.send_ping(ctx);
+            }));
     }
 
     /// Sends [`ServerMsg::Ping`] increasing ping counter.
@@ -250,10 +432,45 @@ impl WsSession {
         self.last_ping_num += 1;
     }
 
-    /// Returns [`RpcSettings`] based on `idle_timeout` and `ping_interval`
-    /// settled for this [`WsSession`].
-    fn get_rpc_settings(&self) -> RpcSettings {
-        RpcSettings {
+    /// Sends [`Event`] to Web Client.
+    fn send_event(
+        &self,
+        ctx: &mut <Self as Actor>::Context,
+        room_id: RoomId,
+        event: Event,
+    ) {
+        debug!(
+            "{}: Sending Event for Room [id = {}]: {:?}]",
+            self, room_id, event
+        );
+        let event = serde_json::to_string(&ServerMsg::Event { room_id, event })
+            .unwrap();
+        ctx.text(event);
+    }
+
+    /// Sends [`Event::RoomJoined`] to the client.
+    fn send_joined_room(
+        &self,
+        ctx: &mut <Self as Actor>::Context,
+        room_id: RoomId,
+        member_id: MemberId,
+    ) {
+        self.send_event(ctx, room_id, Event::RoomJoined { member_id });
+    }
+
+    /// Sends [`Event::RoomLeft`] to the client.
+    fn send_left_room(
+        &self,
+        ctx: &mut <Self as Actor>::Context,
+        room_id: RoomId,
+        close_reason: CloseReason,
+    ) {
+        self.send_event(ctx, room_id, Event::RoomLeft { close_reason });
+    }
+
+    /// Sends current [`RpcSettings`] to the client.
+    fn send_current_rpc_settings(&self, ctx: &mut <Self as Actor>::Context) {
+        let rpc_settings = RpcSettings {
             idle_timeout_ms: self
                 .idle_timeout
                 .as_millis()
@@ -264,7 +481,11 @@ impl WsSession {
                 .as_millis()
                 .try_into()
                 .expect("'ping_interval' should fit into u64"),
-        }
+        };
+        ctx.text(
+            serde_json::to_string(&ServerMsg::RpcSettings(rpc_settings))
+                .unwrap(),
+        );
     }
 }
 
@@ -273,42 +494,23 @@ impl WsSession {
 impl Actor for WsSession {
     type Context = ws::WebsocketContext<Self>;
 
-    /// Starts [`Heartbeat`] mechanism and sends [`RpcConnectionEstablished`]
-    /// signal to the [`Room`].
+    /// Sends default [`RpcSettings`], starts [`Heartbeat`], idle watchdog and
+    /// authentication timeout watchdog.
     fn started(&mut self, ctx: &mut Self::Context) {
         debug!("{}: WsSession started", self);
-
-        self.room
-            .connection_established(
-                self.member_id.clone(),
-                Box::new(ctx.address()),
-            )
-            .into_actor(self)
-            .then(move |result, this, ctx| {
-                if result.is_ok() {
-                    let rpc_settings_message = serde_json::to_string(
-                        &ServerMsg::RpcSettings(this.get_rpc_settings()),
-                    )
-                        .unwrap();
-                    ctx.text(rpc_settings_message);
-
-                    this.start_pinger(ctx);
-                    Self::start_idle_watchdog(ctx);
-                } else {
-                    error!(
-                        "{}: WsSession of Member failed to join Room",
-                        this,
-                    );
-                    this.close_in_place(
-                        ctx,
-                        Close::with_normal_code(&CloseDescription::new(
-                            CloseReason::InternalError,
-                        )),
-                    );
-                };
-                actix::fut::ready(())
-            })
-            .wait(ctx);
+        self.send_current_rpc_settings(ctx);
+        self.start_heartbeat(ctx);
+        Self::start_idle_watchdog(ctx);
+        let auth_timeout_task = ctx.run_later(AUTH_TIMEOUT, |this, ctx| {
+            info!("{}: WsSession is idle", this);
+            if this.sessions.is_empty() {
+                this.close_in_place(
+                    ctx,
+                    &CloseDescription::new(CloseReason::Rejected),
+                );
+            }
+        });
+        self.auth_timeout_handle.replace(auth_timeout_task);
     }
 
     /// Invokes `RpcServer::connection_closed()` with `ClosedReason::Lost` if
@@ -318,21 +520,24 @@ impl Actor for WsSession {
     /// `Some(InnerCloseReason::ByServer)`.
     fn stopped(&mut self, _ctx: &mut Self::Context) {
         debug!("{}: WsSession Stopped", self);
-        match self.close_reason.take() {
+        let session = std::mem::take(&mut self.sessions);
+        let reason = match self.close_reason.take() {
             None => {
                 error!("{}: WsSession was unexpectedly dropped", self);
-                Arbiter::spawn(self.room.connection_closed(
-                    self.member_id.clone(),
-                    ClosedReason::Lost,
-                ));
+                ClosedReason::Lost
             }
-            Some(InnerCloseReason::ByClient(reason)) => Arbiter::spawn(
-                self.room.connection_closed(self.member_id.clone(), reason),
-            ),
+            Some(InnerCloseReason::ByClient(reason)) => reason,
             Some(InnerCloseReason::ByServer) => {
-                // do nothing
+                return;
             }
-        }
+        };
+        let close_all_session =
+            session.into_iter().map(|(_, (member_id, room))| {
+                room.connection_closed(member_id, reason)
+            });
+        Arbiter::spawn(
+            futures::future::join_all(close_all_session).map(|_| ()),
+        );
     }
 }
 
@@ -343,10 +548,13 @@ impl RpcConnection for Addr<WsSession> {
     /// [Close]:https://tools.ietf.org/html/rfc6455#section-5.5.1
     fn close(
         &mut self,
+        room_id: RoomId,
         close_description: CloseDescription,
     ) -> LocalBoxFuture<'static, ()> {
-        let close_result =
-            self.send(Close::with_normal_code(&close_description));
+        let close_result = self.send(CloseRoom {
+            room_id,
+            close_description,
+        });
         async {
             if let Err(err) = close_result.await {
                 match err {
@@ -365,33 +573,37 @@ impl RpcConnection for Addr<WsSession> {
     /// Sends [`Event`] to Web Client.
     ///
     /// [`Event`]: medea_client_api_proto::Event
-    fn send_event(&self, msg: Event) {
-        self.do_send(EventMessage::from(msg));
+    fn send_event(&self, room_id: RoomId, event: Event) {
+        self.do_send(EventMessage { room_id, event });
     }
 }
 
-/// Message for closing [`WsSession`].
+/// Message which indicates that [`WsSession`] should close connection for the
+/// provided [`RoomId`] with provided [`CloseDescription`] as close reason.
 #[derive(Message)]
 #[rtype(result = "()")]
-pub struct Close(ws::CloseReason);
+pub struct CloseRoom {
+    /// [`RoomId`] of [`Room`] which should be closed.
+    room_id: RoomId,
 
-impl Close {
-    /// Creates [`Close`] message with [`ws::CloseCode::Normal`] and provided
-    /// [`CloseDescription`] as serialized description.
-    fn with_normal_code(description: &CloseDescription) -> Self {
-        Self(ws::CloseReason {
-            code: ws::CloseCode::Normal,
-            description: Some(serde_json::to_string(&description).unwrap()),
-        })
-    }
+    /// [`CloseDescription`] with which this [`Room`] should be closed.
+    close_description: CloseDescription,
 }
 
-impl Handler<Close> for WsSession {
+impl Handler<CloseRoom> for WsSession {
     type Result = ();
 
-    /// Closes WebSocket connection and stops [`Actor`] of [`WsSession`].
-    fn handle(&mut self, close: Close, ctx: &mut Self::Context) {
-        self.close_in_place(ctx, close);
+    fn handle(
+        &mut self,
+        msg: CloseRoom,
+        ctx: &mut Self::Context,
+    ) -> Self::Result {
+        if self.sessions.remove(&msg.room_id).is_some() {
+            self.send_left_room(ctx, msg.room_id, CloseReason::Finished);
+            if self.sessions.is_empty() {
+                self.close_in_place(ctx, &msg.close_description);
+            }
+        }
     }
 }
 
@@ -400,10 +612,7 @@ impl Handler<EventMessage> for WsSession {
 
     /// Sends [`Event`] to Web Client.
     fn handle(&mut self, msg: EventMessage, ctx: &mut Self::Context) {
-        debug!("{}: Sending Event: {:?}]", self, msg);
-        let event =
-            serde_json::to_string(&ServerMsg::Event(msg.into())).unwrap();
-        ctx.text(event);
+        self.send_event(ctx, msg.room_id, msg.event);
     }
 }
 
@@ -416,10 +625,10 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsSession {
     ) {
         match msg {
             Ok(msg) => match msg {
-                ws::Message::Text(text) => self.handle_text(&text),
-                ws::Message::Close(reason) => self.handle_close(reason, ctx),
+                ws::Message::Text(text) => self.handle_text(ctx, &text),
+                ws::Message::Close(reason) => self.handle_close(ctx, reason),
                 ws::Message::Continuation(item) => {
-                    self.handle_continuation(item);
+                    self.handle_continuation(ctx, item);
                 }
                 ws::Message::Binary(_) => {
                     warn!("{}: Received binary message", self);
@@ -435,9 +644,9 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsSession {
                 error!("{}: StreamHandler Error: {:?}", self, err);
                 self.close_in_place(
                     ctx,
-                    Close::with_normal_code(&CloseDescription {
+                    &CloseDescription {
                         reason: CloseReason::InternalError,
-                    }),
+                    },
                 );
             }
         };
@@ -453,17 +662,12 @@ impl StreamHandler<Result<ws::Message, ws::ProtocolError>> for WsSession {
 
 impl Display for WsSession {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
-        write!(
-            f,
-            "WsSession [{}] of Member [{}/{}]",
-            self.id, self.room_id, self.member_id
-        )
+        write!(f, "WsSession [{}]", self.id)
     }
 }
 
 #[cfg(test)]
 mod test {
-
     use std::{
         sync::Mutex,
         time::{Duration, Instant},
@@ -482,16 +686,18 @@ mod test {
     };
     use medea_client_api_proto::{
         ClientMsg, CloseDescription, CloseReason as ProtoCloseReason, Command,
-        Event, IceCandidate, MemberId, PeerId, RoomId, RpcSettings, ServerMsg,
+        Event, IceCandidate, MemberId, PeerId, RpcSettings, ServerMsg,
     };
     use tokio::time::timeout;
 
     use crate::api::{
-        client::rpc_connection::{ClosedReason, RpcConnection},
-        MockRpcServer,
+        client::rpc_connection::{
+            ClosedReason, RpcConnection, RpcConnectionSettings,
+        },
+        MockRpcServer, RpcServerError,
     };
 
-    use super::WsSession;
+    use super::{MockRpcServerRepository, WsSession};
 
     type SharedOneshot<T> =
         (Mutex<Option<Sender<T>>>, Mutex<Option<Receiver<T>>>);
@@ -500,12 +706,18 @@ mod test {
         Mutex<Option<UnboundedReceiver<T>>>,
     );
 
-    fn server_msg_into_frame(msg: &ServerMsg) -> Frame {
-        Frame::Text(serde_json::to_string(msg).unwrap().into())
+    fn into_frame(msg: ServerMsg) -> Frame {
+        Frame::Text(serde_json::to_string(&msg).unwrap().into())
     }
 
-    fn client_msg_into_bytes(msg: &ClientMsg) -> Bytes {
-        Bytes::from(serde_json::to_string(msg).unwrap())
+    fn into_message(msg: ClientMsg) -> Message {
+        Message::Text(
+            std::str::from_utf8(
+                Bytes::from(serde_json::to_string(&msg).unwrap()).bytes(),
+            )
+            .unwrap()
+            .to_owned(),
+        )
     }
 
     fn test_server(factory: fn() -> WsSession) -> TestServer {
@@ -523,22 +735,29 @@ mod test {
     #[actix_rt::test]
     async fn close_if_rpc_established_failed() {
         fn factory() -> WsSession {
-            let member_id = MemberId::from("test_member");
-            let mut rpc_server = MockRpcServer::new();
-
-            let expected_member_id = member_id.clone();
-            rpc_server
-                .expect_connection_established()
-                .withf(move |member_id, _| *member_id == expected_member_id)
-                .return_once(|_, _| future::err(()).boxed_local());
-            rpc_server
-                .expect_connection_closed()
-                .returning(|_, _| future::ready(()).boxed_local());
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let member_id = MemberId::from("member_id");
+                let mut rpc_server = MockRpcServer::new();
+
+                let expected_member_id = member_id.clone();
+                rpc_server
+                    .expect_connection_established()
+                    .withf(move |member_id, _, _| {
+                        *member_id == expected_member_id
+                    })
+                    .return_once(|_, _, _| {
+                        future::err(RpcServerError::Authorization).boxed_local()
+                    });
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
+
+                Some(Box::new(rpc_server))
+            });
 
             WsSession::new(
-                member_id,
-                RoomId::from("room"),
-                Box::new(rpc_server),
+                Box::new(rpc_server_repo),
                 Duration::from_secs(5),
                 Duration::from_secs(5),
             )
@@ -548,53 +767,105 @@ mod test {
 
         let mut client = serv.ws().await.unwrap();
 
-        let item = client.next().await.unwrap().unwrap();
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
+
+        let mut client = client.skip(2);
+        let left_room_frame = client.next().await.unwrap().unwrap();
 
+        assert_eq!(
+            left_room_frame,
+            into_frame(ServerMsg::Event {
+                room_id: "room_id".into(),
+                event: Event::RoomLeft {
+                    close_reason: medea_client_api_proto::CloseReason::Rejected,
+                }
+            })
+        );
+
+        let item = client.next().await.unwrap().unwrap();
         let close_frame = Frame::Close(Some(CloseReason {
             code: CloseCode::Normal,
-            description: Some(String::from(r#"{"reason":"InternalError"}"#)),
+            description: Some(String::from(r#"{"reason":"Rejected"}"#)),
         }));
-
         assert_eq!(item, close_frame);
     }
 
     #[actix_rt::test]
     async fn sends_rpc_settings_and_pings() {
         let mut serv = test_server(|| -> WsSession {
-            let member_id = MemberId::from("test_member");
-            let mut rpc_server = MockRpcServer::new();
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().return_once(
+                    |_, _, _| {
+                        future::ok(RpcConnectionSettings {
+                            ping_interval: Duration::from_secs(10),
+                            idle_timeout: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
 
-            rpc_server
-                .expect_connection_established()
-                .return_once(|_, _| future::ok(()).boxed_local());
-            rpc_server
-                .expect_connection_closed()
-                .returning(|_, _| future::ready(()).boxed_local());
+                Some(Box::new(rpc_server))
+            });
 
             WsSession::new(
-                member_id,
-                RoomId::from("room"),
-                Box::new(rpc_server),
+                Box::new(rpc_server_repo),
                 Duration::from_secs(5),
                 Duration::from_millis(50),
             )
         });
 
         let mut client = serv.ws().await.unwrap();
+
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
+
+        // let mut client = client;
+        let item = client.next().await.unwrap().unwrap();
+        let expected_item = into_frame(ServerMsg::RpcSettings(RpcSettings {
+            idle_timeout_ms: 5000,
+            ping_interval_ms: 50,
+        }));
+        assert_eq!(item, expected_item);
+
+        let item = client.next().await.unwrap().unwrap();
+        assert_eq!(item, into_frame(ServerMsg::Ping(0)));
+
         let item = client.next().await.unwrap().unwrap();
         assert_eq!(
             item,
-            server_msg_into_frame(&ServerMsg::RpcSettings(RpcSettings {
-                idle_timeout_ms: 5000,
-                ping_interval_ms: 50,
-            }))
+            into_frame(ServerMsg::Event {
+                room_id: "room_id".into(),
+                event: Event::RoomJoined {
+                    member_id: "member_id".into(),
+                }
+            })
         );
 
         let item = client.next().await.unwrap().unwrap();
-        assert_eq!(item, server_msg_into_frame(&ServerMsg::Ping(0)));
-
-        let item = client.next().await.unwrap().unwrap();
-        assert_eq!(item, server_msg_into_frame(&ServerMsg::Ping(1)));
+        assert_eq!(item, into_frame(ServerMsg::Ping(1)));
     }
 
     // WsSession is dropped and WebSocket connection is closed if no pongs
@@ -602,50 +873,69 @@ mod test {
     #[actix_rt::test]
     async fn dropped_if_idle() {
         let mut serv = test_server(|| -> WsSession {
-            let member_id = MemberId::from("test_member");
-            let mut rpc_server = MockRpcServer::new();
-
-            rpc_server
-                .expect_connection_established()
-                .return_once(|_, _| future::ok(()).boxed_local());
-
-            let expected_member_id = member_id.clone();
-            rpc_server
-                .expect_connection_closed()
-                .withf(move |member_id, reason| {
-                    *member_id == expected_member_id
-                        && *reason == ClosedReason::Lost
-                })
-                .return_once(|_, _| future::ready(()).boxed_local());
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let expected_member_id = MemberId::from("member_id");
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().return_once(
+                    |_, _, _| {
+                        future::ok(RpcConnectionSettings {
+                            ping_interval: Duration::from_secs(10),
+                            idle_timeout: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+
+                rpc_server
+                    .expect_connection_closed()
+                    .withf(move |member_id, reason| {
+                        *member_id == expected_member_id
+                            && *reason == ClosedReason::Lost
+                    })
+                    .return_once(|_, _| future::ready(()).boxed_local());
+
+                Some(Box::new(rpc_server))
+            });
 
             WsSession::new(
-                member_id,
-                RoomId::from("room"),
-                Box::new(rpc_server),
+                Box::new(rpc_server_repo),
                 Duration::from_millis(100),
                 Duration::from_secs(10),
             )
         });
 
-        let client = serv.ws().await.unwrap();
+        let mut client = serv.ws().await.unwrap();
+
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
 
         let start = std::time::Instant::now();
 
-        let item = client.skip(2).next().await.unwrap().unwrap();
+        let item = client.skip(3).next().await.unwrap().unwrap();
 
         let close_frame = Frame::Close(Some(CloseReason {
             code: CloseCode::Normal,
             description: Some(String::from(r#"{"reason":"Idle"}"#)),
         }));
+        assert_eq!(item, close_frame);
 
         assert!(
             Instant::now().duration_since(start) > Duration::from_millis(99)
         );
         assert!(Instant::now().duration_since(start) < Duration::from_secs(2));
-        assert_eq!(item, close_frame);
     }
 
-    // Make sure that WsSession redirects all Commands it receives to RpcServer.
+    // Make sure that WsSession redirects all Commands it receives to
     #[actix_rt::test]
     async fn passes_commands_to_rpc_server() {
         lazy_static::lazy_static! {
@@ -656,24 +946,32 @@ mod test {
         }
 
         let mut serv = test_server(|| -> WsSession {
-            let member_id = MemberId::from("test_member");
-            let mut rpc_server = MockRpcServer::new();
-
-            rpc_server
-                .expect_connection_established()
-                .return_once(|_, _| future::ok(()).boxed_local());
-            rpc_server
-                .expect_connection_closed()
-                .returning(|_, _| future::ready(()).boxed_local());
-
-            rpc_server.expect_send_command().returning(|_, command| {
-                CHAN.0.lock().unwrap().unbounded_send(command).unwrap();
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().return_once(
+                    |_, _, _| {
+                        future::ok(RpcConnectionSettings {
+                            idle_timeout: Duration::from_secs(10),
+                            ping_interval: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
+
+                rpc_server.expect_send_command().returning(|_, command| {
+                    CHAN.0.lock().unwrap().unbounded_send(command).unwrap();
+                });
+
+                Some(Box::new(rpc_server))
             });
 
             WsSession::new(
-                member_id,
-                RoomId::from("room"),
-                Box::new(rpc_server),
+                Box::new(rpc_server_repo),
                 Duration::from_secs(5),
                 Duration::from_secs(5),
             )
@@ -681,8 +979,20 @@ mod test {
 
         let mut client = serv.ws().await.unwrap();
 
-        let command = client_msg_into_bytes(&ClientMsg::Command(
-            Command::SetIceCandidate {
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
+
+        let cmd = ClientMsg::Command {
+            room_id: "room_id".into(),
+            command: Command::SetIceCandidate {
                 peer_id: PeerId(15),
                 candidate: IceCandidate {
                     candidate: "asd".to_string(),
@@ -690,13 +1000,10 @@ mod test {
                     sdp_mid: Some("2".to_string()),
                 },
             },
-        ));
-        client
-            .send(Message::Text(
-                std::str::from_utf8(command.bytes()).unwrap().to_owned(),
-            ))
-            .await
-            .unwrap();
+        };
+        let command = Bytes::from(serde_json::to_string(&cmd).unwrap());
+
+        client.send(into_message(cmd)).await.unwrap();
         client
             .send(Message::Continuation(Item::FirstText(command.slice(0..10))))
             .await
@@ -751,41 +1058,77 @@ mod test {
         }
 
         let mut serv = test_server(|| -> WsSession {
-            let member_id = MemberId::from("test_member");
-            let mut rpc_server = MockRpcServer::new();
-
-            rpc_server.expect_connection_established().return_once(
-                |_, connection| {
-                    let _ =
-                        CHAN.0.lock().unwrap().take().unwrap().send(connection);
-                    future::ok(()).boxed_local()
-                },
-            );
-            rpc_server
-                .expect_connection_closed()
-                .returning(|_, _| future::ready(()).boxed_local());
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().return_once(
+                    |_, _, connection| {
+                        let _ = CHAN
+                            .0
+                            .lock()
+                            .unwrap()
+                            .take()
+                            .unwrap()
+                            .send(connection);
+                        future::ok(RpcConnectionSettings {
+                            idle_timeout: Duration::from_secs(10),
+                            ping_interval: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
+
+                Some(Box::new(rpc_server))
+            });
 
             WsSession::new(
-                member_id,
-                RoomId::from("room"),
-                Box::new(rpc_server),
+                Box::new(rpc_server_repo),
                 Duration::from_secs(5),
                 Duration::from_secs(5),
             )
         });
 
-        let client = serv.ws().await.unwrap();
+        let mut client = serv.ws().await.unwrap();
+
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
 
         let mut rpc_connection: Box<dyn RpcConnection> =
             CHAN.1.lock().unwrap().take().unwrap().await.unwrap();
 
         rpc_connection
-            .close(CloseDescription {
-                reason: ProtoCloseReason::Evicted,
-            })
+            .close(
+                "room_id".into(),
+                CloseDescription {
+                    reason: ProtoCloseReason::Evicted,
+                },
+            )
             .await;
+        let mut client = client.skip(3);
 
-        let item = client.skip(2).next().await.unwrap().unwrap();
+        let left_room_frame = client.next().await.unwrap().unwrap();
+        assert_eq!(
+            left_room_frame,
+            into_frame(ServerMsg::Event {
+                room_id: "room_id".into(),
+                event: Event::RoomLeft {
+                    close_reason: medea_client_api_proto::CloseReason::Finished,
+                }
+            })
+        );
+        let item = client.next().await.unwrap().unwrap();
 
         let close_frame = Frame::Close(Some(CloseReason {
             code: CloseCode::Normal,
@@ -807,46 +1150,310 @@ mod test {
         }
 
         let mut serv = test_server(|| -> WsSession {
-            let member_id = MemberId::from("test_member");
-            let mut rpc_server = MockRpcServer::new();
-
-            rpc_server.expect_connection_established().return_once(
-                |_, connection| {
-                    let _ =
-                        CHAN.0.lock().unwrap().take().unwrap().send(connection);
-                    async { Ok(()) }.boxed_local()
-                },
-            );
-            rpc_server
-                .expect_connection_closed()
-                .returning(|_, _| future::ready(()).boxed_local());
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().return_once(
+                    |_, _, connection| {
+                        let _ = CHAN
+                            .0
+                            .lock()
+                            .unwrap()
+                            .take()
+                            .unwrap()
+                            .send(connection);
+                        future::ok(RpcConnectionSettings {
+                            ping_interval: Duration::from_secs(10),
+                            idle_timeout: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
+
+                Some(Box::new(rpc_server))
+            });
 
             WsSession::new(
-                member_id,
-                RoomId::from("room"),
-                Box::new(rpc_server),
+                Box::new(rpc_server_repo),
                 Duration::from_secs(5),
                 Duration::from_secs(5),
             )
         });
 
-        let client = serv.ws().await.unwrap();
+        let mut client = serv.ws().await.unwrap();
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room_id".into(),
+                command: Command::JoinRoom {
+                    member_id: "member_id".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
 
         let rpc_connection: Box<dyn RpcConnection> =
             CHAN.1.lock().unwrap().take().unwrap().await.unwrap();
 
-        rpc_connection.send_event(Event::SdpAnswerMade {
-            peer_id: PeerId(77),
-            sdp_answer: String::from("sdp_answer"),
-        });
+        rpc_connection.send_event(
+            "room_id".into(),
+            Event::SdpAnswerMade {
+                peer_id: PeerId(77),
+                sdp_answer: String::from("sdp_answer"),
+            },
+        );
 
-        let item = client.skip(2).next().await.unwrap().unwrap();
-        assert_eq!(
-            item,
-            server_msg_into_frame(&ServerMsg::Event(Event::SdpAnswerMade {
+        let item = client.skip(3).next().await.unwrap().unwrap();
+
+        let event = serde_json::to_string(&ServerMsg::Event {
+            room_id: "room_id".into(),
+            event: Event::SdpAnswerMade {
                 peer_id: PeerId(77),
                 sdp_answer: "sdp_answer".to_string(),
+            },
+        })
+        .unwrap();
+
+        assert_eq!(item, Frame::Text(event.into()));
+    }
+
+    #[actix_rt::test]
+    async fn multi_room_support() {
+        lazy_static::lazy_static! {
+            static ref CHAN: SharedUnbounded<Box<dyn RpcConnection>> = {
+                let (tx, rx) = mpsc::unbounded();
+                (Mutex::new(tx), Mutex::new(Some(rx)))
+            };
+        }
+
+        let mut serv = test_server(|| -> WsSession {
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().returning(|_| {
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().return_once(
+                    |_, _, connection| {
+                        let _ =
+                            CHAN.0.lock().unwrap().unbounded_send(connection);
+                        future::ok(RpcConnectionSettings {
+                            ping_interval: Duration::from_secs(10),
+                            idle_timeout: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
+
+                Some(Box::new(rpc_server))
+            });
+
+            WsSession::new(
+                Box::new(rpc_server_repo),
+                Duration::from_secs(5),
+                Duration::from_secs(5),
+            )
+        });
+
+        let mut client = serv.ws().await.unwrap();
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "alice_room".into(),
+                command: Command::JoinRoom {
+                    member_id: "alice".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
+
+        let mut connections_rx = CHAN.1.lock().unwrap().take().unwrap();
+        let alice_connection: Box<dyn RpcConnection> =
+            connections_rx.next().await.unwrap();
+
+        let alice_event = Event::SdpAnswerMade {
+            peer_id: PeerId(0),
+            sdp_answer: String::from("sdp_answer"),
+        };
+        alice_connection.send_event("alice_room".into(), alice_event.clone());
+
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "bob_room".into(),
+                command: Command::JoinRoom {
+                    member_id: "bob".into(),
+                    credential: "token".into(),
+                },
             }))
+            .await
+            .unwrap();
+        let bob_connection: Box<dyn RpcConnection> =
+            connections_rx.next().await.unwrap();
+
+        let bob_event = Event::SdpAnswerMade {
+            peer_id: PeerId(1),
+            sdp_answer: String::from("sdp_answer"),
+        };
+        bob_connection.send_event("bob_room".into(), bob_event.clone());
+
+        let msgs: Vec<_> = client
+            .filter_map(|f| async move {
+                if let Frame::Text(text) = f.unwrap() {
+                    let server_msg: ServerMsg = serde_json::from_str(
+                        std::str::from_utf8(&text).unwrap(),
+                    )
+                    .unwrap();
+
+                    if !matches!(server_msg, ServerMsg::Ping(_)) {
+                        Some(server_msg)
+                    } else {
+                        None
+                    }
+                } else {
+                    None
+                }
+            })
+            .collect()
+            .await;
+        assert_eq!(
+            msgs[0],
+            ServerMsg::RpcSettings(RpcSettings {
+                idle_timeout_ms: 5000,
+                ping_interval_ms: 5000,
+            })
+        );
+        assert_eq!(
+            msgs[1],
+            ServerMsg::Event {
+                room_id: "alice_room".into(),
+                event: Event::RoomJoined {
+                    member_id: "alice".into(),
+                }
+            }
+        );
+        assert_eq!(
+            msgs[2],
+            ServerMsg::Event {
+                room_id: "alice_room".into(),
+                event: alice_event,
+            }
+        );
+        assert_eq!(
+            msgs[3],
+            ServerMsg::Event {
+                room_id: "bob_room".into(),
+                event: Event::RoomJoined {
+                    member_id: "bob".into(),
+                }
+            }
+        );
+        assert_eq!(
+            msgs[4],
+            ServerMsg::Event {
+                room_id: "bob_room".into(),
+                event: bob_event,
+            }
         );
+        assert_eq!(msgs.len(), 5);
+    }
+
+    #[actix_rt::test]
+    async fn close_connection_when_no_active_sessions() {
+        let mut serv = test_server(|| -> WsSession {
+            let mut rpc_server_repo = MockRpcServerRepository::new();
+            rpc_server_repo.expect_get().times(2).returning(|_| {
+                let mut rpc_server = MockRpcServer::new();
+
+                rpc_server.expect_connection_established().returning(
+                    |_, _, _| {
+                        future::ok(RpcConnectionSettings {
+                            idle_timeout: Duration::from_secs(10),
+                            ping_interval: Duration::from_secs(10),
+                        })
+                        .boxed_local()
+                    },
+                );
+                rpc_server
+                    .expect_connection_closed()
+                    .returning(|_, _| future::ready(()).boxed_local());
+
+                Some(Box::new(rpc_server))
+            });
+
+            WsSession::new(
+                Box::new(rpc_server_repo),
+                Duration::from_secs(5),
+                Duration::from_secs(5),
+            )
+        });
+
+        let mut client = serv.ws().await.unwrap();
+
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room1".into(),
+                command: Command::JoinRoom {
+                    member_id: "member1".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room2".into(),
+                command: Command::JoinRoom {
+                    member_id: "member2".into(),
+                    credential: "token".into(),
+                },
+            }))
+            .await
+            .unwrap();
+
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room1".into(),
+                command: Command::LeaveRoom {
+                    member_id: "member1".into(),
+                },
+            }))
+            .await
+            .unwrap();
+        client
+            .send(into_message(ClientMsg::Command {
+                room_id: "room2".into(),
+                command: Command::LeaveRoom {
+                    member_id: "member2".into(),
+                },
+            }))
+            .await
+            .unwrap();
+
+        let mut frames: Vec<_> =
+            client.map(|frame| frame.unwrap()).collect().await;
+        assert!(frames.contains(&into_frame(ServerMsg::Event {
+            room_id: "room1".into(),
+            event: Event::RoomJoined {
+                member_id: "member1".into(),
+            }
+        })));
+        assert!(frames.contains(&into_frame(ServerMsg::Event {
+            room_id: "room2".into(),
+            event: Event::RoomJoined {
+                member_id: "member2".into(),
+            }
+        })));
+        assert_eq!(
+            frames.pop().unwrap(),
+            Frame::Close(Some(CloseReason {
+                code: CloseCode::Normal,
+                description: Some(String::from("{\"reason\":\"Finished\"}"))
+            }))
+        )
     }
 }
diff --git a/src/api/control/error_codes.rs b/src/api/control/error_codes.rs
index f044ee25c..45cbded67 100644
--- a/src/api/control/error_codes.rs
+++ b/src/api/control/error_codes.rs
@@ -432,6 +432,7 @@ impl From<RoomError> for ErrorResponse {
             | E::PeerError(_)
             | E::BadRoomSpec(_)
             | E::PeerTrafficWatcherMailbox(_)
+            | E::AuthorizationError
             | E::TurnServiceErr(_) => Self::unexpected(&err),
         }
     }
diff --git a/src/api/mod.rs b/src/api/mod.rs
index e7d80bfc2..2fb3e5697 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -5,10 +5,38 @@ pub mod control;
 
 use std::fmt::Debug;
 
+use actix::MailboxError;
 use futures::future::LocalBoxFuture;
-use medea_client_api_proto::{Command, MemberId};
+use medea_client_api_proto::{Command, Credential, MemberId};
 
-use crate::api::client::rpc_connection::{ClosedReason, RpcConnection};
+use crate::{
+    api::client::rpc_connection::{
+        ClosedReason, RpcConnection, RpcConnectionSettings,
+    },
+    signalling::room::RoomError,
+};
+
+/// Errors which [`RpcServer`] can return.
+#[derive(Debug)]
+pub enum RpcServerError {
+    /// Authorization on the [`RpcServer`] was failed.
+    Authorization,
+
+    /// [`Room`] returned some [`RoomError`].
+    RoomError(RoomError),
+
+    /// [`Room`]s [`MailboxError`] is closed or overflowed.
+    RoomMailbox(MailboxError),
+}
+
+impl From<RoomError> for RpcServerError {
+    fn from(err: RoomError) -> Self {
+        match &err {
+            RoomError::AuthorizationError => Self::Authorization,
+            _ => Self::RoomError(err),
+        }
+    }
+}
 
 /// Server side of Medea RPC protocol.
 #[cfg_attr(test, mockall::automock)]
@@ -21,8 +49,9 @@ pub trait RpcServer: Debug + Send {
     fn connection_established(
         &self,
         member_id: MemberId,
+        credential: Credential,
         connection: Box<dyn RpcConnection>,
-    ) -> LocalBoxFuture<'static, Result<(), ()>>;
+    ) -> LocalBoxFuture<'static, Result<RpcConnectionSettings, RpcServerError>>;
 
     /// Send signal of existing [`RpcConnection`] of specified [`Member`] being
     /// closed.
diff --git a/src/signalling/participants.rs b/src/signalling/participants.rs
index 0843ea8a8..28cea2eba 100644
--- a/src/signalling/participants.rs
+++ b/src/signalling/participants.rs
@@ -23,8 +23,7 @@ use medea_client_api_proto::{
 use crate::{
     api::{
         client::rpc_connection::{
-            AuthorizationError, ClosedReason, RpcConnection,
-            RpcConnectionClosed,
+            ClosedReason, RpcConnection, RpcConnectionClosed,
         },
         control::{
             refs::{Fid, ToEndpoint, ToMember},
@@ -169,23 +168,21 @@ impl ParticipantService {
     ///
     /// # Errors
     ///
-    /// Errors with [`AuthorizationError::MemberNotExists`] if lookup by
-    /// [`MemberId`] fails.
-    ///
-    /// Errors with [`AuthorizationError::InvalidCredentials`] if [`Member`]
-    /// was found, but incorrect credentials were provided.
+    /// Errors with [`RoomError::AuthorizationError`] if lookup by [`MemberId`]
+    /// fails or if [`Member`] was found, but incorrect credentials were
+    /// provided.
     pub fn get_member_by_id_and_credentials(
         &self,
         member_id: &MemberId,
         credentials: &Credential,
-    ) -> Result<Member, AuthorizationError> {
+    ) -> Result<Member, RoomError> {
         let member = self
             .get_member_by_id(member_id)
-            .map_err(|_| AuthorizationError::MemberNotExists)?;
+            .map_err(|_| RoomError::AuthorizationError)?;
         if &member.credentials() == credentials {
             Ok(member)
         } else {
-            Err(AuthorizationError::InvalidCredentials)
+            Err(RoomError::AuthorizationError)
         }
     }
 
@@ -209,7 +206,7 @@ impl ParticipantService {
         self.connections.get(&member_id).map_or(
             Err(RoomError::ConnectionNotExists(member_id)),
             |conn| {
-                conn.send_event(event);
+                conn.send_event(self.room_id.clone(), event);
                 Ok(())
             },
         )
@@ -244,7 +241,10 @@ impl ParticipantService {
             self.insert_connection(member_id, conn);
             Box::pin(
                 connection
-                    .close(CloseDescription::new(CloseReason::Reconnected))
+                    .close(
+                        self.room_id.clone(),
+                        CloseDescription::new(CloseReason::Reconnected),
+                    )
                     .map(move |_| Ok(member)),
             )
         } else {
@@ -269,7 +269,7 @@ impl ParticipantService {
     pub fn connection_closed(
         &mut self,
         member_id: MemberId,
-        reason: &ClosedReason,
+        reason: ClosedReason,
         ctx: &mut Context<Room>,
     ) {
         let closed_at = Instant::now();
@@ -316,16 +316,16 @@ impl ParticipantService {
             ctx.cancel_future(handle);
         });
 
+        let room_id = self.room_id.clone();
         // closing all RpcConnection's
         let close_rpc_connections =
             future::join_all(self.connections.drain().fold(
                 Vec::new(),
                 |mut futs, (_, mut connection)| {
-                    futs.push(
-                        connection.close(CloseDescription::new(
-                            CloseReason::Finished,
-                        )),
-                    );
+                    futs.push(connection.close(
+                        room_id.clone(),
+                        CloseDescription::new(CloseReason::Finished),
+                    ));
                     futs
                 },
             ));
@@ -358,9 +358,10 @@ impl ParticipantService {
         }
 
         if let Some(mut conn) = self.connections.remove(member_id) {
-            wrap_future::<_, Room>(
-                conn.close(CloseDescription::new(CloseReason::Evicted)),
-            )
+            wrap_future::<_, Room>(conn.close(
+                self.room_id.clone(),
+                CloseDescription::new(CloseReason::Evicted),
+            ))
             .spawn(ctx);
         }
     }
@@ -491,7 +492,7 @@ mod test {
             None,
         );
 
-        let test_member_id = MemberId(String::from("test-member"));
+        let test_member_id = MemberId::from("test-member");
         members
             .create_member(test_member_id.clone(), &test_member_spec)
             .unwrap();
@@ -533,7 +534,7 @@ mod test {
             Some(ping_interval),
         );
 
-        let test_member_id = MemberId(String::from("test-member"));
+        let test_member_id = MemberId::from("test-member");
         members
             .create_member(test_member_id.clone(), &test_member_spec)
             .unwrap();
diff --git a/src/signalling/room/command_handler.rs b/src/signalling/room/command_handler.rs
index 149b03881..13ed6bffa 100644
--- a/src/signalling/room/command_handler.rs
+++ b/src/signalling/room/command_handler.rs
@@ -4,8 +4,8 @@
 use std::collections::HashMap;
 
 use medea_client_api_proto::{
-    CommandHandler, Event, IceCandidate, NegotiationRole, PeerId, PeerMetrics,
-    TrackId, TrackPatchCommand,
+    CommandHandler, Credential, Event, IceCandidate, MemberId, NegotiationRole,
+    PeerId, PeerMetrics, TrackId, TrackPatchCommand,
 };
 
 use crate::{
@@ -18,6 +18,16 @@ use super::{Room, RoomError};
 impl CommandHandler for Room {
     type Output = Result<(), RoomError>;
 
+    #[inline]
+    fn on_join_room(&mut self, _: MemberId, _: Credential) -> Self::Output {
+        unreachable!("Room can't receive Command::JoinRoom")
+    }
+
+    #[inline]
+    fn on_leave_room(&mut self, _: MemberId) -> Self::Output {
+        unreachable!("Room can't receive Command::LeaveRoom")
+    }
+
     /// Sends [`Event::PeerCreated`] to provided [`Peer`] partner. Provided
     /// [`Peer`] state must be [`WaitLocalSdp`] and will be changed to
     /// [`WaitRemoteSdp`], partners [`Peer`] state must be [`Stable`] and will
diff --git a/src/signalling/room/mod.rs b/src/signalling/room/mod.rs
index c4c6adf96..bbe775ad3 100644
--- a/src/signalling/room/mod.rs
+++ b/src/signalling/room/mod.rs
@@ -55,6 +55,9 @@ pub enum RoomError {
 
     MemberError(MemberError),
 
+    #[display(fmt = "Could not find Member with provided Id or Credential")]
+    AuthorizationError,
+
     #[display(fmt = "Member [id = {}] does not have Turn credentials", _0)]
     #[from(ignore)]
     NoTurnCredentials(MemberId),
diff --git a/src/signalling/room/rpc_server.rs b/src/signalling/room/rpc_server.rs
index 30fb1aefc..b6760124e 100644
--- a/src/signalling/room/rpc_server.rs
+++ b/src/signalling/room/rpc_server.rs
@@ -9,17 +9,16 @@ use failure::Fail;
 use futures::future::{
     self, FutureExt as _, LocalBoxFuture, TryFutureExt as _,
 };
-use medea_client_api_proto::{Command, MemberId, PeerId};
+use medea_client_api_proto::{Command, Credential, MemberId, PeerId};
 
 use crate::{
     api::{
         client::rpc_connection::{
-            AuthorizationError, Authorize, ClosedReason, CommandMessage,
-            RpcConnection, RpcConnectionClosed, RpcConnectionEstablished,
-            RpcConnectionSettings,
+            ClosedReason, CommandMessage, RpcConnection, RpcConnectionClosed,
+            RpcConnectionEstablished, RpcConnectionSettings,
         },
         control::callback::{OnJoinEvent, OnLeaveEvent, OnLeaveReason},
-        RpcServer,
+        RpcServer, RpcServerError,
     },
     log::prelude::*,
     media::PeerStateMachine,
@@ -66,6 +65,10 @@ impl Room {
             | C::SetIceCandidate { peer_id, .. }
             | C::AddPeerConnectionMetrics { peer_id, .. }
             | C::UpdateTracks { peer_id, .. } => peer_id,
+            C::LeaveRoom { .. } | C::JoinRoom { .. } => unreachable!(
+                "Room can't receive this Command: {:?}",
+                command.command
+            ),
         };
 
         let peer_member_id = self
@@ -84,24 +87,28 @@ impl Room {
 impl RpcServer for Addr<Room> {
     /// Sends [`RpcConnectionEstablished`] message to [`Room`] actor propagating
     /// errors.
+    ///
+    /// # Errors
+    ///
+    /// Errors with [`RpcServerError::RoomMailbox`] if [`Message`] sending is
+    /// failed.
+    ///
+    /// Errors with [`RpcServerError::RoomError`] if [`Room`] returns error.
     fn connection_established(
         &self,
         member_id: MemberId,
+        credentials: Credential,
         connection: Box<dyn RpcConnection>,
-    ) -> LocalBoxFuture<'static, Result<(), ()>> {
+    ) -> LocalBoxFuture<'static, Result<RpcConnectionSettings, RpcServerError>>
+    {
         self.send(RpcConnectionEstablished {
             member_id,
+            credentials,
             connection,
         })
         .map(|r| {
-            r.map_err(|e| {
-                error!("Failed to send RpcConnectionEstablished cause {:?}", e)
-            })
-            .and_then(|r| {
-                r.map_err(|e| {
-                    error!("RpcConnectionEstablished failed cause: {:?}", e)
-                })
-            })
+            r.map_err(RpcServerError::RoomMailbox)
+                .and_then(|r| r.map_err(|e| e.into()))
         })
         .boxed_local()
     }
@@ -128,24 +135,6 @@ impl RpcServer for Addr<Room> {
     }
 }
 
-impl Handler<Authorize> for Room {
-    type Result = Result<RpcConnectionSettings, AuthorizationError>;
-
-    /// Responses with `Ok` if `RpcConnection` is authorized, otherwise `Err`s.
-    fn handle(
-        &mut self,
-        msg: Authorize,
-        _: &mut Self::Context,
-    ) -> Self::Result {
-        self.members
-            .get_member_by_id_and_credentials(&msg.member_id, &msg.credentials)
-            .map(move |member| RpcConnectionSettings {
-                idle_timeout: member.get_idle_timeout(),
-                ping_interval: member.get_ping_interval(),
-            })
-    }
-}
-
 impl Handler<CommandMessage> for Room {
     type Result = ActFuture<()>;
 
@@ -182,12 +171,14 @@ impl Handler<CommandMessage> for Room {
 }
 
 impl Handler<RpcConnectionEstablished> for Room {
-    type Result = ActFuture<Result<(), RoomError>>;
+    type Result = ActFuture<Result<RpcConnectionSettings, RoomError>>;
 
     /// Saves new [`RpcConnection`] in [`ParticipantService`][1], initiates
     /// media establishment between members.
     /// Creates and interconnects all available `Member`'s `Peer`s.
     ///
+    /// Returns [`RpcConnectionSettings`] of the connected `Member`.
+    ///
     /// [`RpcConnection`]: crate::api::client::rpc_connection::RpcConnection
     /// [1]: crate::signalling::participants::ParticipantService
     fn handle(
@@ -197,10 +188,14 @@ impl Handler<RpcConnectionEstablished> for Room {
     ) -> Self::Result {
         let member_id = msg.member_id;
         let connection = msg.connection;
+        let credentials = msg.credentials;
 
         info!("RpcConnectionEstablished for Member [id = {}].", member_id);
 
-        let member = actix_try!(self.members.get_member_by_id(&member_id));
+        let member = actix_try!(self
+            .members
+            .get_member_by_id_and_credentials(&member_id, &credentials));
+
         let is_reconnect = self.members.member_has_connection(&member_id);
 
         let maybe_send_on_join = match (member.get_on_join(), is_reconnect) {
@@ -223,7 +218,7 @@ impl Handler<RpcConnectionEstablished> for Room {
         Box::pin(
             maybe_send_on_join
                 .into_actor(self)
-                .then(move |res: Result<(), RoomError>, this, ctx| match res {
+                .then(|res: Result<(), RoomError>, this, ctx| match res {
                     Ok(_) => Either::Left(
                         this.members
                             .connection_established(ctx, member_id, connection)
@@ -234,7 +229,14 @@ impl Handler<RpcConnectionEstablished> for Room {
                 })
                 .then(|res, this, _| match res {
                     Ok(member) => {
-                        Either::Left(this.init_member_connections(&member))
+                        Either::Left(this.init_member_connections(&member).map(
+                            move |res, _, _| {
+                                res.map(move |_| RpcConnectionSettings {
+                                    idle_timeout: member.get_idle_timeout(),
+                                    ping_interval: member.get_ping_interval(),
+                                })
+                            },
+                        ))
                     }
                     Err(err) => Either::Right(fut::err(err)),
                 }),
@@ -263,7 +265,7 @@ impl Handler<RpcConnectionClosed> for Room {
         );
 
         self.members
-            .connection_closed(msg.member_id.clone(), &msg.reason, ctx);
+            .connection_closed(msg.member_id.clone(), msg.reason, ctx);
 
         if let ClosedReason::Closed { normal } = msg.reason {
             if let Ok(member) = self.members.get_member_by_id(&msg.member_id) {
@@ -308,7 +310,7 @@ impl Handler<RpcConnectionClosed> for Room {
 mod test {
     use std::collections::HashMap;
 
-    use medea_client_api_proto::RoomId;
+    use medea_client_api_proto::{IceCandidate, RoomId};
 
     use super::*;
 
@@ -324,8 +326,6 @@ mod test {
         AppContext,
     };
 
-    use medea_client_api_proto::IceCandidate;
-
     fn empty_room() -> Room {
         let room_spec = RoomSpec {
             id: RoomId::from("test"),
@@ -366,11 +366,11 @@ mod test {
         );
 
         room.members
-            .create_member(MemberId(String::from("member1")), &member1)
+            .create_member(MemberId::from("member1"), &member1)
             .unwrap();
 
         let no_such_peer = CommandMessage::new(
-            MemberId(String::from("member1")),
+            MemberId::from("member1"),
             Command::SetIceCandidate {
                 peer_id: PeerId(1),
                 candidate: IceCandidate {
@@ -404,11 +404,11 @@ mod test {
         );
 
         room.members
-            .create_member(MemberId(String::from("member1")), &member1)
+            .create_member(MemberId::from("member1"), &member1)
             .unwrap();
 
         let no_such_peer = CommandMessage::new(
-            MemberId(String::from("member1")),
+            MemberId::from("member1"),
             Command::SetIceCandidate {
                 peer_id: PeerId(1),
                 candidate: IceCandidate {
@@ -432,13 +432,11 @@ mod test {
 
         use actix::Addr;
         use medea_client_api_proto::{
-            CloseDescription, CloseReason, Credential, MemberId,
+            CloseDescription, CloseReason, Credential, MemberId, RoomId,
         };
         use mockall::predicate::eq;
         use serial_test::serial;
 
-        use super::*;
-
         use crate::api::{
             client::rpc_connection::MockRpcConnection,
             control::{
@@ -452,6 +450,8 @@ mod test {
             },
         };
 
+        use super::*;
+
         fn room_spec(with_on_join: bool, with_on_leave: bool) -> RoomSpec {
             let callback_url =
                 CallbackUrl::try_from(String::from("grpc://127.0.0.1:9099"))
@@ -469,7 +469,7 @@ mod test {
             let id = MemberId::from("member");
             let member = RoomElement::Member {
                 spec: Pipeline::new(HashMap::new()),
-                credentials: Credential::from(""),
+                credentials: Credential::from("test"),
                 on_leave,
                 on_join,
                 idle_timeout: None,
@@ -520,6 +520,7 @@ mod test {
 
                 room.connection_established(
                     MemberId::from("member"),
+                    Credential::from("test"),
                     Box::new(MockRpcConnection::new()),
                 )
                 .await
@@ -542,18 +543,23 @@ mod test {
                 let mut rpc_connection = MockRpcConnection::new();
                 rpc_connection
                     .expect_close()
-                    .with(eq(CloseDescription {
-                        reason: CloseReason::Reconnected,
-                    }))
-                    .return_once(|_| Box::pin(future::ready(())));
+                    .with(
+                        eq(RoomId::from("test")),
+                        eq(CloseDescription {
+                            reason: CloseReason::Reconnected,
+                        }),
+                    )
+                    .return_once(|_, _| Box::pin(future::ready(())));
                 room.connection_established(
                     MemberId::from("member"),
+                    Credential::from("test"),
                     Box::new(rpc_connection),
                 )
                 .await
                 .unwrap();
                 room.connection_established(
                     MemberId::from("member"),
+                    Credential::from("test"),
                     Box::new(MockRpcConnection::new()),
                 )
                 .await
@@ -571,6 +577,7 @@ mod test {
 
                 room.connection_established(
                     MemberId::from("member"),
+                    Credential::from("test"),
                     Box::new(MockRpcConnection::new()),
                 )
                 .await
@@ -592,6 +599,7 @@ mod test {
 
                 room.connection_established(
                     MemberId::from("member"),
+                    Credential::from("test"),
                     Box::new(MockRpcConnection::new()),
                 )
                 .await
@@ -610,6 +618,7 @@ mod test {
 
                 room.connection_established(
                     MemberId::from("member"),
+                    Credential::from("test"),
                     Box::new(MockRpcConnection::new()),
                 )
                 .await
diff --git a/src/signalling/room_repo.rs b/src/signalling/room_repo.rs
index 7c58d7b5a..a46546b72 100644
--- a/src/signalling/room_repo.rs
+++ b/src/signalling/room_repo.rs
@@ -8,7 +8,10 @@ use std::{
 use actix::Addr;
 use medea_client_api_proto::RoomId;
 
-use crate::signalling::Room;
+use crate::{
+    api::{client::RpcServerRepository, RpcServer},
+    signalling::Room,
+};
 
 /// Repository that stores [`Room`]s addresses.
 #[derive(Clone, Debug, Default)]
@@ -50,3 +53,10 @@ impl RoomRepository {
         self.rooms.lock().unwrap().contains_key(id)
     }
 }
+
+impl RpcServerRepository for RoomRepository {
+    #[inline]
+    fn get(&self, room_id: &RoomId) -> Option<Box<dyn RpcServer>> {
+        self.get(room_id).map(|r| Box::new(r) as Box<dyn RpcServer>)
+    }
+}
diff --git a/tests/e2e/grpc_control_api/rpc_settings.rs b/tests/e2e/grpc_control_api/rpc_settings.rs
index 9817cc0d0..5d40999bc 100644
--- a/tests/e2e/grpc_control_api/rpc_settings.rs
+++ b/tests/e2e/grpc_control_api/rpc_settings.rs
@@ -34,7 +34,7 @@ async fn rpc_settings_from_spec_works() {
                 .id("member")
                 .credentials("test")
                 .ping_interval(Some(Duration::from_secs(10)))
-                .idle_timeout(Some(Duration::from_secs(3)))
+                .idle_timeout(Some(Duration::from_secs(1)))
                 .reconnect_timeout(Some(Duration::from_secs(0)))
                 .build()
                 .unwrap(),
@@ -58,8 +58,8 @@ async fn rpc_settings_from_spec_works() {
             ConnectionEvent::Stopped => {
                 let diff = Instant::now() - opened.unwrap();
 
-                assert!(diff > Duration::from_secs(3));
-                assert!(diff < Duration::from_secs(5));
+                assert!(diff > Duration::from_secs(1));
+                assert!(diff < Duration::from_secs(3));
 
                 test_end_tx.take().unwrap().send(()).unwrap();
             }
diff --git a/tests/e2e/signalling/mod.rs b/tests/e2e/signalling/mod.rs
index 965480cd0..206e42096 100644
--- a/tests/e2e/signalling/mod.rs
+++ b/tests/e2e/signalling/mod.rs
@@ -26,9 +26,11 @@ use awc::{
 };
 use futures::{executor, stream::SplitSink, SinkExt as _, StreamExt as _};
 use medea_client_api_proto::{
-    ClientMsg, Command, Event, IceCandidate, NegotiationRole, PeerId,
-    RpcSettings, ServerMsg, Track, TrackId, TrackUpdate,
+    ClientMsg, Command, Credential, Event, IceCandidate, MemberId,
+    NegotiationRole, PeerId, RoomId, RpcSettings, ServerMsg, Track, TrackId,
+    TrackUpdate,
 };
+use url::Url;
 
 pub type MessageHandler =
     Box<dyn FnMut(&Event, &mut Context<TestMember>, Vec<&Event>)>;
@@ -50,6 +52,9 @@ pub enum ConnectionEvent {
 
 /// Medea client for testing purposes.
 pub struct TestMember {
+    /// [`RoomId`] of [`Room`] to which this [`TestMember`] is connected.
+    room_id: RoomId,
+
     /// Writer to WebSocket.
     sink: SplitSink<Framed<BoxedSocket, ws::Codec>, ws::Message>,
 
@@ -84,18 +89,46 @@ pub struct TestMember {
     auto_negotiation: bool,
 }
 
+pub fn parse_join_room_url(url: &str) -> (Url, RoomId, MemberId, Credential) {
+    let mut url = Url::parse(&url).unwrap();
+    url.set_fragment(None);
+    url.set_query(None);
+
+    let mut segments = url.path_segments().unwrap().rev();
+    let token = segments.next().unwrap().to_owned().into();
+    let member_id = segments.next().unwrap().to_owned().into();
+    let room_id = segments.next().unwrap().to_owned().into();
+    url.set_path("/ws");
+
+    (url, room_id, member_id, token)
+}
+
 impl TestMember {
     pub const DEFAULT_DEADLINE: Option<Duration> = Some(Duration::from_secs(5));
 
     /// Sends command to the server.
     fn send_command(&mut self, msg: Command) {
+        let room_id = self.room_id.clone();
         executor::block_on(async move {
-            let json = serde_json::to_string(&ClientMsg::Command(msg)).unwrap();
+            let json = serde_json::to_string(&ClientMsg::Command {
+                room_id,
+                command: msg,
+            })
+            .unwrap();
             self.sink.send(ws::Message::Text(json)).await.unwrap();
             self.sink.flush().await.unwrap();
         });
     }
 
+    /// Authorizes this [`TestMember`] on `Media Server` with a provided
+    /// connection info.
+    fn authorize(&mut self, member_id: MemberId, credential: Credential) {
+        self.send_command(Command::JoinRoom {
+            member_id,
+            credential,
+        });
+    }
+
     /// Sends pong to the server.
     fn send_pong(&mut self, id: u32) {
         executor::block_on(async move {
@@ -108,19 +141,22 @@ impl TestMember {
     /// Returns [`Future`] which will connect to the WebSocket and starts
     /// [`TestMember`] actor.
     pub async fn connect(
-        uri: &str,
+        url: &str,
         on_message: Option<MessageHandler>,
         on_connection_event: Option<ConnectionEventHandler>,
         deadline: Option<Duration>,
         auto_negotiation: bool,
     ) -> Addr<Self> {
-        let (_, framed) = awc::Client::new().ws(uri).connect().await.unwrap();
+        let (url, room_id, member_id, token) = parse_join_room_url(url);
+        let (_, framed) =
+            awc::Client::new().ws(url.as_str()).connect().await.unwrap();
 
         let (sink, stream) = framed.split();
 
         Self::create(move |ctx| {
             Self::add_stream(stream, ctx);
-            Self {
+            let mut this = Self {
+                room_id,
                 sink,
                 events: Vec::new(),
                 known_peers: HashSet::new(),
@@ -130,7 +166,10 @@ impl TestMember {
                 on_message,
                 on_connection_event,
                 auto_negotiation,
-            }
+            };
+            this.authorize(member_id, token);
+
+            this
         })
     }
 
@@ -256,7 +295,15 @@ impl StreamHandler<Result<Frame, WsProtocolError>> for TestMember {
 
             match server_msg {
                 ServerMsg::Ping(id) => self.send_pong(id),
-                ServerMsg::Event(event) => {
+                ServerMsg::Event { room_id, event } => {
+                    assert_eq!(self.room_id, room_id);
+                    if matches!(
+                        event,
+                        Event::RoomJoined { .. }
+                        | Event::RoomLeft { .. }
+                    ) {
+                        return;
+                    }
                     if self.auto_negotiation {
                         match &event {
                             Event::PeerCreated {
@@ -380,7 +427,9 @@ impl StreamHandler<Result<Frame, WsProtocolError>> for TestMember {
                                 peer_id, ..
                             } => assert!(self.known_peers.contains(peer_id)),
                             Event::PeersRemoved { .. }
-                            | Event::ConnectionQualityUpdated { .. } => (),
+                            | Event::ConnectionQualityUpdated { .. }
+                            | Event::RoomJoined { .. }
+                            | Event::RoomLeft { .. } => (),
                         }
                     }
                     let mut events: Vec<&Event> = self.events.iter().collect();
diff --git a/tests/e2e/signalling/rpc_settings.rs b/tests/e2e/signalling/rpc_settings.rs
index 0060fb844..c9906817b 100644
--- a/tests/e2e/signalling/rpc_settings.rs
+++ b/tests/e2e/signalling/rpc_settings.rs
@@ -14,8 +14,8 @@ use crate::{
 #[actix_rt::test]
 async fn rpc_settings_server_msg() {
     const ROOM_ID: &str = "rpc_settings_server_msg";
-    const PING_INTERVAL_SECS: u32 = 111;
-    const IDLE_TIMEOUT_SECS: u32 = 222;
+    const PING_INTERVAL_SECS: u32 = 1;
+    const IDLE_TIMEOUT_SECS: u32 = 1;
 
     let mut control_client = ControlClient::new().await;
     let create_room = RoomBuilder::default()
@@ -41,17 +41,25 @@ async fn rpc_settings_server_msg() {
 
     let (end_tx, end_rx) = oneshot::channel();
     let mut end_tx = Some(end_tx);
+    let mut is_initial_settings_received = false;
     TestMember::start(
         format!("ws://127.0.0.1:8080/ws/{}/member/test", ROOM_ID),
         None,
         Some(Box::new(move |event| {
             if let ConnectionEvent::SettingsReceived(settings) = event {
-                assert_eq!(settings.idle_timeout_ms, IDLE_TIMEOUT_SECS * 1000);
-                assert_eq!(
-                    settings.ping_interval_ms,
-                    PING_INTERVAL_SECS * 1000
-                );
-                end_tx.take().unwrap().send(()).unwrap();
+                if is_initial_settings_received {
+                    assert_eq!(
+                        settings.idle_timeout_ms,
+                        IDLE_TIMEOUT_SECS * 1000
+                    );
+                    assert_eq!(
+                        settings.ping_interval_ms,
+                        PING_INTERVAL_SECS * 1000
+                    );
+                    end_tx.take().unwrap().send(()).unwrap();
+                } else {
+                    is_initial_settings_received = true;
+                }
             }
         })),
         Some(Duration::from_secs(10)),
diff --git a/tests/medea.config.toml b/tests/medea.config.toml
index 8f192c785..f77c8ea45 100644
--- a/tests/medea.config.toml
+++ b/tests/medea.config.toml
@@ -1,4 +1,2 @@
 [rpc]
-idle_timeout = "1s"
-ping_interval = "500ms"
 reconnect_timeout = "0ms"