cleanup

src/transport/socket/loop_state.rs

@@ -42,10 +42,12 @@ pub async fn run_loop(
                     break;
                 }
             }
-            message = socket.next() => match handle_socket_message(socket, message, &pending).await {
-                SocketAction::Break => break,
-                SocketAction::ClearPongDeadline => awaiting_pong = false,
-                SocketAction::Continue => {}
+            message = socket.next() => {
+                match handle_socket_message(socket, message, &pending).await {
+                    SocketAction::Break => break,
+                    SocketAction::ClearPongDeadline => awaiting_pong = false,
+                    SocketAction::Continue => {}
+                }
             }
         }
     }

src/transport/socket/mod.rs

@@ -15,10 +15,11 @@ pub fn connect<'r>(
     device_id: MaybeDeviceId,
     state: &'r State<AppState>,
 ) -> Channel<'r> {
-    let database = state.database.clone();
-    let registry = state.registry.clone();
-    let device_counts = state.device_counts.clone();
-    let config = state.config.clone();
+    let app_state = state.inner();
+    let database = app_state.database.clone();
+    let registry = app_state.registry.clone();
+    let device_counts = app_state.device_counts.clone();
+    let config = app_state.config.clone();
 
     ws.channel(move |socket| {
         Box::pin(connection::handle(