|
@@ -7,14 +7,22 @@ use futures_util::{
|
|
};
|
|
};
|
|
use tokio::sync::mpsc;
|
|
use tokio::sync::mpsc;
|
|
use tokio_stream::wrappers::UnboundedReceiverStream;
|
|
use tokio_stream::wrappers::UnboundedReceiverStream;
|
|
|
|
+use tokio_util::task::LocalPoolHandle;
|
|
|
|
|
|
-pub async fn connect(socket: WebSocket, liveview: Liveview, app: fn(Scope) -> Element) {
|
|
|
|
|
|
+#[cfg(feature = "axum")]
|
|
|
|
+impl crate::Liveview {
|
|
|
|
+ pub async fn upgrade(&self, ws: WebSocket, app: fn(Scope) -> Element) {
|
|
|
|
+ connect(ws, self.pool.clone(), app).await;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+pub async fn connect(socket: WebSocket, pool: LocalPoolHandle, app: fn(Scope) -> Element) {
|
|
let (mut user_ws_tx, mut user_ws_rx) = socket.split();
|
|
let (mut user_ws_tx, mut user_ws_rx) = socket.split();
|
|
let (event_tx, event_rx) = mpsc::unbounded_channel();
|
|
let (event_tx, event_rx) = mpsc::unbounded_channel();
|
|
let (edits_tx, edits_rx) = mpsc::unbounded_channel();
|
|
let (edits_tx, edits_rx) = mpsc::unbounded_channel();
|
|
let mut edits_rx = UnboundedReceiverStream::new(edits_rx);
|
|
let mut edits_rx = UnboundedReceiverStream::new(edits_rx);
|
|
let mut event_rx = UnboundedReceiverStream::new(event_rx);
|
|
let mut event_rx = UnboundedReceiverStream::new(event_rx);
|
|
- let vdom_fut = liveview.pool.clone().spawn_pinned(move || async move {
|
|
|
|
|
|
+ let vdom_fut = pool.clone().spawn_pinned(move || async move {
|
|
let mut vdom = VirtualDom::new(app);
|
|
let mut vdom = VirtualDom::new(app);
|
|
let edits = vdom.rebuild();
|
|
let edits = vdom.rebuild();
|
|
let serialized = serde_json::to_string(&edits.edits).unwrap();
|
|
let serialized = serde_json::to_string(&edits.edits).unwrap();
|