Move IPC erlated stuff in separate file

src/stremio_app/ipc.rs

@@ -0,0 +1,54 @@
+use std::cell::RefCell;
+use std::sync::mpsc;
+use std::sync::{Arc, Mutex};
+use serde::{Deserialize, Serialize};
+use serde_json::{self, json};
+
+pub type Channel = RefCell<Option<(mpsc::Sender<String>, Arc<Mutex<mpsc::Receiver<String>>>)>>;
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct RPCRequest {
+    pub id: u64,
+    pub args: Option<Vec<serde_json::Value>>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct RPCResponseDataTransport {
+    pub properties: Vec<Vec<String>>,
+    pub signals: Vec<String>,
+    pub methods: Vec<Vec<String>>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct RPCResponseData {
+    pub transport: RPCResponseDataTransport,
+}
+
+#[derive(Default, Serialize, Deserialize, Debug, Clone)]
+pub struct RPCResponse {
+    pub id: u64,
+    pub object: String,
+    #[serde(rename = "type")]
+    pub response_type: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub data: Option<RPCResponseData>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub args: Option<serde_json::Value>,
+}
+
+impl RPCResponse {
+    pub fn visibility_change(visible: bool, visibility: u32, is_full_screen: bool) -> String {
+        let resp = RPCResponse {
+            id: 1,
+            object: "transport".to_string(),
+            response_type: 1,
+            args: Some(json!(["win-visibility-changed" ,{
+                "visible": visible,
+                "visibility": visibility,
+                "isFullscreen": is_full_screen
+            }])),
+            ..Default::default()
+        };
+        serde_json::to_string(&resp).expect("Cannot build response")
+    }
+}

src/stremio_app/mod.rs

@@ -5,4 +5,6 @@ pub use stremio_wevbiew::WebView;
 pub mod stremio_player;
 pub use stremio_player::Player;
 pub mod stremio_server;
-pub use stremio_server::StremioServer;
+pub use stremio_server::StremioServer;
+pub mod ipc;
+pub use ipc::{Channel, RPCRequest, RPCResponse, RPCResponseData, RPCResponseDataTransport};

src/stremio_app/stremio_app.rs

@@ -1,7 +1,6 @@
 use native_windows_derive::NwgUi;
 use native_windows_gui as nwg;
-use serde::{Deserialize, Serialize};
-use serde_json::{self, json};
+use serde_json;
 use std::cell::RefCell;
 use std::cmp;
 use std::sync::Arc;
@@ -12,57 +11,10 @@ use winapi::um::winuser::{
     WS_EX_WINDOWEDGE, WS_THICKFRAME,
 };
 
+use crate::stremio_app::ipc::{RPCRequest, RPCResponse, RPCResponseData, RPCResponseDataTransport};
 use crate::stremio_app::stremio_player::Player;
 use crate::stremio_app::stremio_wevbiew::WebView;
 
-//////////////////////////////////////////
-#[derive(Serialize, Deserialize, Debug, Clone)]
-struct RPCRequest {
-    id: u64,
-    args: Option<Vec<serde_json::Value>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-struct RPCResponseDataTransport {
-    properties: Vec<Vec<String>>,
-    signals: Vec<String>,
-    methods: Vec<Vec<String>>,
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone)]
-struct RPCResponseData {
-    transport: RPCResponseDataTransport,
-}
-
-#[derive(Default, Serialize, Deserialize, Debug, Clone)]
-struct RPCResponse {
-    id: u64,
-    object: String,
-    #[serde(rename = "type")]
-    response_type: u32,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    data: Option<RPCResponseData>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    args: Option<serde_json::Value>,
-}
-
-impl RPCResponse {
-    fn visibility_change(visible: bool, visibility: u32, is_full_screen: bool) -> String {
-        let resp = RPCResponse {
-            id: 1,
-            object: "transport".to_string(),
-            response_type: 1,
-            args: Some(json!(["win-visibility-changed" ,{
-                "visible": visible,
-                "visibility": visibility,
-                "isFullscreen": is_full_screen
-            }])),
-            ..Default::default()
-        };
-        serde_json::to_string(&resp).expect("Cannot build response")
-    }
-}
-//////////////////////////////////////////
 #[derive(Default)]
 pub struct WindowStyle {
     pub full_screen: bool,

src/stremio_app/stremio_player/stremio_player.rs

@@ -4,6 +4,7 @@ use std::cell::RefCell;
 use std::sync::mpsc;
 use std::sync::{Arc, Mutex};
 use std::thread;
+use crate::stremio_app::ipc;
 
 #[derive(Default, Serialize, Deserialize, Debug, Clone)]
 pub struct MpvEvent {
@@ -48,7 +49,7 @@ impl MpvEvent {
 
 #[derive(Default)]
 pub struct Player {
-    pub channel: RefCell<Option<(mpsc::Sender<String>, Arc<Mutex<mpsc::Receiver<String>>>)>>,
+    pub channel: ipc::Channel,
 }
 
 impl PartialUi for Player {

src/stremio_app/stremio_wevbiew/stremio_wevbiew.rs

@@ -13,12 +13,13 @@ use urlencoding::decode;
 use webview2::Controller;
 use winapi::shared::windef::HWND__;
 use winapi::um::winuser::*;
+use crate::stremio_app::ipc;
 
 #[derive(Default)]
 pub struct WebView {
     pub endpoint: Rc<OnceCell<String>>,
     controller: Rc<OnceCell<Controller>>,
-    pub channel: RefCell<Option<(mpsc::Sender<String>, Arc<Mutex<mpsc::Receiver<String>>>)>>,
+    pub channel: ipc::Channel,
     notice: nwg::Notice,
     compute: RefCell<Option<thread::JoinHandle<()>>>,
     message_queue: Arc<Mutex<VecDeque<String>>>,