Migrate SDK comms to gRPC

ARCHITECTURE.md

@@ -194,9 +194,7 @@ Update instructions:
 | re_data_source       | Handles loading of Rerun data from different sources                                                   |
 | re_grpc_client       | Communicate with the Rerun Data Platform over gRPC                                                     |
 | re_grpc_server       | Host an in-memory Storage Node                                                                         |
-| re_sdk_comms         | TCP communication between Rerun SDK and Rerun Server                                                   |
 | re_web_viewer_server | Serves the Rerun web viewer (Wasm and HTML) over HTTP                                                  |
-| re_ws_comms          | WebSocket communication library (encoding, decoding, client, server) between a Rerun server and Viewer |
 
 ### Build support
 

Cargo.lock

@@ -1503,6 +1503,26 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "const_format"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "const_soft_float"
 version = "0.1.4"
@@ -1740,6 +1760,7 @@ dependencies = [
  "parking_lot",
  "re_crash_handler",
  "re_error",
+ "re_grpc_server",
  "rerun",
  "serde",
  "tokio",
@@ -1767,8 +1788,9 @@ version = "0.23.0-alpha.1+dev"
 dependencies = [
  "mimalloc",
  "re_crash_handler",
- "re_sdk_comms",
+ "re_grpc_server",
  "re_viewer",
+ "tokio",
 ]
 
 [[package]]
@@ -1805,12 +1827,6 @@ dependencies = [
  "syn 2.0.87",
 ]
 
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
 [[package]]
 name = "data-url"
 version = "0.3.1"
@@ -2405,29 +2421,15 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "ewebsock"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "679247b4a005c82218a5f13b713239b0b6d484ec25347a719f5b7066152a748a"
-dependencies = [
- "document-features",
- "js-sys",
- "log",
- "tungstenite",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "extend_viewer_ui"
 version = "0.23.0-alpha.1+dev"
 dependencies = [
  "mimalloc",
  "re_crash_handler",
- "re_sdk_comms",
+ "re_grpc_server",
  "re_viewer",
+ "tokio",
 ]
 
 [[package]]
@@ -5996,7 +5998,6 @@ dependencies = [
  "re_log_types",
  "re_smart_channel",
  "re_tracing",
- "re_ws_comms",
 ]
 
 [[package]]
@@ -6172,6 +6173,7 @@ dependencies = [
 name = "re_grpc_server"
 version = "0.23.0-alpha.1+dev"
 dependencies = [
+ "parking_lot",
  "re_build_info",
  "re_byte_size",
  "re_chunk",
@@ -6181,6 +6183,7 @@ dependencies = [
  "re_log_types",
  "re_memory",
  "re_protos",
+ "re_smart_channel",
  "re_tracing",
  "re_types",
  "tokio",
@@ -6495,6 +6498,7 @@ name = "re_sdk"
 version = "0.23.0-alpha.1+dev"
 dependencies = [
  "ahash",
+ "const_format",
  "crossbeam",
  "document-features",
  "itertools 0.13.0",
@@ -6512,36 +6516,20 @@ dependencies = [
  "re_chunk_store",
  "re_data_loader",
  "re_grpc_client",
+ "re_grpc_server",
  "re_log",
  "re_log_encoding",
  "re_log_types",
  "re_memory",
- "re_sdk_comms",
  "re_smart_channel",
  "re_types_core",
  "re_web_viewer_server",
- "re_ws_comms",
  "similar-asserts",
  "thiserror 1.0.65",
+ "tokio",
  "webbrowser",
 ]
 
-[[package]]
-name = "re_sdk_comms"
-version = "0.23.0-alpha.1+dev"
-dependencies = [
- "ahash",
- "crossbeam",
- "document-features",
- "rand",
- "re_build_info",
- "re_log",
- "re_log_encoding",
- "re_log_types",
- "re_smart_channel",
- "thiserror 1.0.65",
-]
-
 [[package]]
 name = "re_selection_panel"
 version = "0.23.0-alpha.1+dev"
@@ -7110,7 +7098,6 @@ dependencies = [
  "re_memory",
  "re_query",
  "re_renderer",
- "re_sdk_comms",
  "re_selection_panel",
  "re_smart_channel",
  "re_time_panel",
@@ -7131,7 +7118,6 @@ dependencies = [
  "re_viewer_context",
  "re_viewport",
  "re_viewport_blueprint",
- "re_ws_comms",
  "rfd",
  "ron",
  "serde",
@@ -7267,26 +7253,6 @@ dependencies = [
  "tiny_http",
 ]
 
-[[package]]
-name = "re_ws_comms"
-version = "0.23.0-alpha.1+dev"
-dependencies = [
- "anyhow",
- "bincode",
- "document-features",
- "ewebsock",
- "parking_lot",
- "polling",
- "re_format",
- "re_log",
- "re_log_types",
- "re_memory",
- "re_smart_channel",
- "re_tracing",
- "thiserror 1.0.65",
- "tungstenite",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -7491,20 +7457,20 @@ dependencies = [
  "re_error",
  "re_format",
  "re_format_arrow",
+ "re_grpc_server",
  "re_log",
  "re_log_encoding",
  "re_log_types",
  "re_memory",
  "re_sdk",
- "re_sdk_comms",
  "re_smart_channel",
  "re_tracing",
  "re_types",
  "re_video",
  "re_viewer",
  "re_web_viewer_server",
- "re_ws_comms",
  "similar-asserts",
+ "tokio",
  "unindent",
 ]
 
@@ -7520,7 +7486,6 @@ dependencies = [
  "re_log",
  "re_memory",
  "rerun",
- "tokio",
 ]
 
 [[package]]
@@ -7572,6 +7537,7 @@ dependencies = [
  "re_chunk_store",
  "re_dataframe",
  "re_grpc_client",
+ "re_grpc_server",
  "re_log",
  "re_log_encoding",
  "re_log_types",
@@ -7581,7 +7547,6 @@ dependencies = [
  "re_sorbet",
  "re_video",
  "re_web_viewer_server",
- "re_ws_comms",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -9315,27 +9280,6 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5902c5d130972a0000f60860bfbf46f7ca3db5391eddfedd1b8728bd9dc96c0e"
 
-[[package]]
-name = "tungstenite"
-version = "0.24.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand",
- "rustls 0.23.18",
- "rustls-pki-types",
- "sha1",
- "thiserror 1.0.65",
- "utf-8",
- "webpki-roots 0.26.6",
-]
-
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -9506,12 +9450,6 @@ dependencies = [
  "tiny-skia-path",
 ]
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "utf16_iter"
 version = "1.0.5"

Cargo.toml

@@ -55,15 +55,14 @@ re_dataframe = { path = "crates/store/re_dataframe", version = "=0.23.0-alpha.1"
 re_entity_db = { path = "crates/store/re_entity_db", version = "=0.23.0-alpha.1", default-features = false }
 re_format_arrow = { path = "crates/store/re_format_arrow", version = "=0.23.0-alpha.1", default-features = false }
 re_grpc_client = { path = "crates/store/re_grpc_client", version = "=0.23.0-alpha.1", default-features = false }
+re_grpc_server = { path = "crates/store/re_grpc_server", version = "=0.23.0-alpha.1", default-features = false }
 re_protos = { path = "crates/store/re_protos", version = "=0.23.0-alpha.1", default-features = false }
 re_log_encoding = { path = "crates/store/re_log_encoding", version = "=0.23.0-alpha.1", default-features = false }
 re_log_types = { path = "crates/store/re_log_types", version = "=0.23.0-alpha.1", default-features = false }
 re_query = { path = "crates/store/re_query", version = "=0.23.0-alpha.1", default-features = false }
-re_sdk_comms = { path = "crates/store/re_sdk_comms", version = "=0.23.0-alpha.1", default-features = false }
 re_sorbet = { path = "crates/store/re_sorbet", version = "=0.23.0-alpha.1", default-features = false }
 re_types = { path = "crates/store/re_types", version = "=0.23.0-alpha.1", default-features = false }
 re_types_core = { path = "crates/store/re_types_core", version = "=0.23.0-alpha.1", default-features = false }
-re_ws_comms = { path = "crates/store/re_ws_comms", version = "=0.23.0-alpha.1", default-features = false }
 
 # crates/top:
 re_sdk = { path = "crates/top/re_sdk", version = "=0.23.0-alpha.1", default-features = false }
@@ -177,6 +176,7 @@ clean-path = "0.2"
 colored = "2.1"
 comfy-table = { version = "7.0", default-features = false }
 console_error_panic_hook = "0.1.6"
+const_format = "0.2"
 convert_case = "0.6"
 criterion = "0.5"
 crossbeam = "0.8"

crates/store/re_data_source/Cargo.toml

@@ -23,11 +23,12 @@ all-features = true
 default = ["grpc"]
 
 ## Enable the gRPC Rerun Data Platform data source.
-grpc = ["dep:re_grpc_client"]
+grpc = ["re_grpc_client/redap"]
 
 
 [dependencies]
 re_data_loader.workspace = true
+re_grpc_client.workspace = true
 re_log_encoding = { workspace = true, features = [
   "decoder",
   "stream_from_http",
@@ -36,14 +37,12 @@ re_log_types.workspace = true
 re_log.workspace = true
 re_smart_channel.workspace = true
 re_tracing.workspace = true
-re_ws_comms = { workspace = true, features = ["client"] }
 
 anyhow.workspace = true
 itertools.workspace = true
 rayon.workspace = true
 
 # Optional dependencies:
-re_grpc_client = { workspace = true, optional = true }
 
 [build-dependencies]
 re_build_tools.workspace = true