From c52995ab7c3e8fe85c3e532ebe66414c48e5990b Mon Sep 17 00:00:00 2001
From: Jonas Kruckenberg <iterpre@protonmail.com>
Date: Fri, 6 Jan 2023 14:22:34 +0100
Subject: [PATCH] refactor(websocket): Use new PluginBuilder

---
 plugins/websocket/src/lib.rs | 38 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/plugins/websocket/src/lib.rs b/plugins/websocket/src/lib.rs
index dccea1ec..c3e08ace 100644
--- a/plugins/websocket/src/lib.rs
+++ b/plugins/websocket/src/lib.rs
@@ -1,10 +1,9 @@
 use futures_util::{stream::SplitSink, SinkExt, StreamExt};
 use serde::{ser::Serializer, Deserialize, Serialize};
-use serde_json::Value as JsonValue;
 use tauri::{
     api::ipc::{format_callback, CallbackFn},
-    plugin::Plugin,
-    AppHandle, Invoke, Manager, Runtime, State, Window,
+    plugin::{Builder as PluginBuilder, TauriPlugin},
+    Manager, Runtime, State, Window,
 };
 use tokio::{net::TcpStream, sync::Mutex};
 use tokio_tungstenite::{
@@ -161,29 +160,12 @@ async fn send(
     }
 }
 
-pub struct TauriWebsocket<R: Runtime> {
-    invoke_handler: Box<dyn Fn(Invoke<R>) + Send + Sync>,
-}
-
-impl<R: Runtime> Default for TauriWebsocket<R> {
-    fn default() -> Self {
-        Self {
-            invoke_handler: Box::new(tauri::generate_handler![connect, send]),
-        }
-    }
-}
-
-impl<R: Runtime> Plugin<R> for TauriWebsocket<R> {
-    fn name(&self) -> &'static str {
-        "websocket"
-    }
-
-    fn initialize(&mut self, app: &AppHandle<R>, _config: JsonValue) -> tauri::plugin::Result<()> {
-        app.manage(ConnectionManager::default());
-        Ok(())
-    }
-
-    fn extend_api(&mut self, invoke: Invoke<R>) {
-        (self.invoke_handler)(invoke)
-    }
+pub fn init<R: Runtime>() -> TauriPlugin<R> {
+    PluginBuilder::new("websocket")
+        .invoke_handler(tauri::generate_handler![connect, send])
+        .setup(|app| {
+            app.manage(ConnectionManager::default());
+            Ok(())
+        })
+        .build()
 }