refactor: move WsId out from loaded settings

crates/plugin-chat/src/server_only.rs

@@ -5,4 +5,4 @@ mod plugin_impl;
 mod server;
 
 pub use connections::{chat_get_token, chat_ws_start_session};
-pub use plugin_impl::{ChatPlugin, ChatSettings};
+pub use plugin_impl::{ChatPlugin, ChatPluginConfig, ChatSettings};

crates/plugin-chat/src/server_only/plugin_impl.rs

@@ -9,13 +9,17 @@ use super::server::{ChatServer, ChatServerHandle};
 #[derive(serde::Deserialize, Clone)]
 pub struct ChatSettings {
     pub heartbeat_interval_secs: u8,
+}
+
+pub struct ChatPluginConfig {
     pub ws_id: WsId,
+    pub settings: ChatSettings,
 }
 
 pub struct ChatPlugin;
 
 impl ServerPlugin for ChatPlugin {
-    type Config = ChatSettings;
+    type Config = ChatPluginConfig;
 
     type Task = ChatServer;
 
@@ -28,8 +32,13 @@ impl ServerPlugin for ChatPlugin {
         ws_config: &wykies_server::WebSocketSettings,
     ) -> anyhow::Result<wykies_server::plugin::ServerPluginArtifacts<Self::Task, Self::Handle>>
     {
-        let (chat_server, chat_server_handle) =
-            ChatServer::new(config, ws_config, db_pool, cancellation_token);
+        let (chat_server, chat_server_handle) = ChatServer::new(
+            &config.settings,
+            config.ws_id,
+            ws_config,
+            db_pool,
+            cancellation_token,
+        );
         Ok(ServerPluginArtifacts {
             task: chat_server,
             handle: Arc::new(chat_server_handle),

crates/plugin-chat/src/server_only/server.rs

@@ -70,6 +70,7 @@ pub struct ChatServerHandle {
 impl ChatServer {
     pub fn new(
         config: &ChatSettings,
+        ws_id: WsId,
         ws_config: &WebSocketSettings,
         db_pool: DbPool,
         cancellation_token: TrackedCancellationToken,
@@ -97,7 +98,7 @@ impl ChatServer {
             ChatServerHandle {
                 cmd_tx,
                 heartbeat_config,
-                ws_id: config.ws_id,
+                ws_id,
             },
         )
     }