[bfops/wasm-update]: fixes

Author: bfops

sdks/rust/src/db_connection.rs

@@ -39,10 +39,7 @@ use http::Uri;
 use spacetimedb_client_api_messages::websocket::{self as ws, common::QuerySetId};
 use spacetimedb_lib::{bsatn, ser::Serialize, ConnectionId, Identity, Timestamp};
 use spacetimedb_sats::Deserialize;
-use std::{
-    collections::HashMap,
-    sync::{atomic::AtomicU32, Arc, Mutex as StdMutex, OnceLock},
-};
+use std::sync::{atomic::AtomicU32, Arc, Mutex as StdMutex, OnceLock};
 #[cfg(not(feature = "web"))]
 use tokio::{
     runtime::{self, Runtime},
@@ -944,7 +941,7 @@ but you must call one of them, or else the connection will never progress.
         let connection_id_override = get_connection_id_override();
         let ws_connection = WsConnection::connect(
             self.uri.clone().unwrap(),
-            self.module_name.as_ref().unwrap(),
+            self.database_name.as_ref().unwrap(),
             self.token.as_deref(),
             connection_id_override,
             self.params,
@@ -972,7 +969,6 @@ but you must call one of them, or else the connection will never progress.
         ))
     }
 
-
     /// Set the URI of the SpacetimeDB host which is running the remote database.
     ///
     /// The URI must have either no scheme or one of the schemes `http`, `https`, `ws` or `wss`.
@@ -1107,7 +1103,6 @@ fn build_db_ctx_inner<M: SpacetimeModule>(
         on_connect: on_connect_cb,
         on_connect_error: on_connect_error_cb,
         on_disconnect: on_disconnect_cb,
-        call_reducer_flags: <_>::default(),
 
         procedure_callbacks: ProcedureCallbacks::default(),
     }))
@@ -1118,7 +1113,7 @@ fn build_db_ctx<M: SpacetimeModule>(
     #[cfg(not(feature = "web"))] runtime_handle: runtime::Handle,
 
     inner_ctx: Arc<StdMutex<DbContextImplInner<M>>>,
-    raw_msg_send: mpsc::UnboundedSender<ws::ClientMessage<Bytes>>,
+    raw_msg_send: mpsc::UnboundedSender<ws::v2::ClientMessage>,
     parsed_msg_recv: SharedAsyncCell<mpsc::UnboundedReceiver<ParsedMessage<M>>>,
     pending_mutations_send: mpsc::UnboundedSender<PendingMutation<M>>,
     pending_mutations_recv: SharedAsyncCell<mpsc::UnboundedReceiver<PendingMutation<M>>>,
@@ -1232,7 +1227,7 @@ fn spawn_parse_loop<M: SpacetimeModule>(
 
 #[cfg(feature = "web")]
 fn spawn_parse_loop<M: SpacetimeModule>(
-    raw_message_recv: mpsc::UnboundedReceiver<ws::ServerMessage<BsatnFormat>>,
+    raw_message_recv: mpsc::UnboundedReceiver<ws::v2::ServerMessage>,
 ) -> mpsc::UnboundedReceiver<ParsedMessage<M>> {
     let (parsed_message_send, parsed_message_recv) = mpsc::unbounded();
     wasm_bindgen_futures::spawn_local(parse_loop(raw_message_recv, parsed_message_send));

sdks/rust/src/websocket.rs

@@ -8,6 +8,7 @@ use std::sync::Arc;
 #[cfg(not(feature = "web"))]
 use std::time::Duration;
 
+#[cfg(not(feature = "web"))]
 use bytes::Bytes;
 #[cfg(not(feature = "web"))]
 use futures::TryStreamExt;
@@ -358,7 +359,7 @@ impl WsConnection {
         };
 
         let uri = make_uri(host, db_name, connection_id, params, token.as_deref())?;
-        let sock = tokio_tungstenite_wasm::connect_with_protocols(&uri.to_string(), &[BIN_PROTOCOL])
+        let sock = tokio_tungstenite_wasm::connect_with_protocols(&uri.to_string(), &[ws::v2::BIN_PROTOCOL])
             .await
             .map_err(|source| WsError::Tungstenite {
                 uri,
@@ -537,8 +538,8 @@ impl WsConnection {
     pub(crate) fn spawn_message_loop(
         self,
     ) -> (
-        mpsc::UnboundedReceiver<ServerMessage<BsatnFormat>>,
-        mpsc::UnboundedSender<ClientMessage<Bytes>>,
+        mpsc::UnboundedReceiver<ws::v2::ServerMessage>,
+        mpsc::UnboundedSender<ws::v2::ClientMessage>,
     ) {
         let websocket_received = CLIENT_METRICS.websocket_received.with_label_values(&self.db_name);
         let websocket_received_msg_size = CLIENT_METRICS
@@ -549,8 +550,8 @@ impl WsConnection {
             websocket_received_msg_size.observe(msg_size as f64);
         };
 
-        let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<ClientMessage<Bytes>>();
-        let (incoming_tx, incoming_rx) = mpsc::unbounded::<ServerMessage<BsatnFormat>>();
+        let (outgoing_tx, outgoing_rx) = mpsc::unbounded::<ws::v2::ClientMessage>();
+        let (incoming_tx, incoming_rx) = mpsc::unbounded::<ws::v2::ServerMessage>();
 
         let (mut ws_writer, ws_reader) = self.sock.split();