fix: clippy + fmt

SpikeHD · Sep 25, 2024 · de5c08f · de5c08f
1 parent 838b98d
commit de5c08f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/examples/commands.rs b/examples/commands.rs
@@ -17,9 +17,12 @@ fn main() -> Result<(), CrowserError> {
     let mut ipc = ipc.lock().unwrap();
 
     if let Some(ipc) = ipc.as_mut() {
-      ipc.register_command("hello", Box::new(|_| {
-        Ok(serde_json::json!("Hello from Crowser!"))
-      })).unwrap_or_default();
+      ipc
+        .register_command(
+          "hello",
+          Box::new(|_| Ok(serde_json::json!("Hello from Crowser!"))),
+        )
+        .unwrap_or_default();
     }
 
     std::thread::sleep(std::time::Duration::from_secs(1));

diff --git a/src/ipc.rs b/src/ipc.rs
@@ -1,4 +1,8 @@
-use std::{collections::HashMap, fmt::Debug, sync::{Arc, Mutex}};
+use std::{
+  collections::HashMap,
+  fmt::Debug,
+  sync::{Arc, Mutex},
+};
 
 use serde_json::Value;
 
@@ -7,17 +11,22 @@ use crate::{
     self,
     commands::{CDPCommand, RuntimeEvaluate, TargetAttachToTarget, TargetGetTargets},
     Cdp,
-  }, error::CrowserError, util::javascript::IPC_JS
+  },
+  error::CrowserError,
+  util::javascript::IPC_JS,
 };
 
+type IpcRegistrationMap =
+  Arc<Mutex<HashMap<String, Vec<Box<dyn Fn(Value) -> Result<Value, CrowserError> + Send + Sync>>>>>;
+
 #[derive(Clone)]
 pub struct BrowserIpc {
   cdp: Arc<Mutex<Cdp>>,
   session_id: String,
   attached: bool,
 
-  commands: Arc<Mutex<HashMap<String, Box<dyn Fn(Value) -> Result<Value, CrowserError> + Send + Sync>>>>,
-  listeners: Arc<Mutex<HashMap<String, Vec<Box<dyn Fn(Value) -> Result<Value, CrowserError> + Send + Sync>>>>>,
+  commands: IpcRegistrationMap,
+  listeners: IpcRegistrationMap,
 }
 
 impl Debug for BrowserIpc {
@@ -136,7 +145,7 @@ impl BrowserIpc {
 
     std::thread::spawn(move || {
       let mut last_context_create_uid = String::new();
-    
+
       loop {
         std::thread::sleep(std::time::Duration::from_millis(10));
 
@@ -160,7 +169,9 @@ impl BrowserIpc {
         drop(ipc);
 
         if let Ok(Some(evt)) = refresh {
-          let uid = evt.params["context"]["uniqueId"].as_str().unwrap_or_default();
+          let uid = evt.params["context"]["uniqueId"]
+            .as_str()
+            .unwrap_or_default();
 
           if uid != last_context_create_uid {
             last_context_create_uid = uid.to_string();
@@ -193,7 +204,7 @@ impl BrowserIpc {
     let mut cdp = self.cdp.lock().unwrap();
     let params = RuntimeEvaluate {
       expression: script.as_ref().to_string(),
-      await_promise: Some(true)
+      await_promise: Some(true),
     };
     let cmd = CDPCommand::new("Runtime.evaluate", params, Some(self.session_id.clone()));
     let result = cdp.send(cmd, None)?;
@@ -214,7 +225,11 @@ impl BrowserIpc {
     Ok(Value::Null)
   }
 
-  pub fn register_command(&mut self, name: impl AsRef<str>, callback: Box<dyn Fn(Value) -> Result<Value, CrowserError> + Send + Sync>) -> Result<(), CrowserError> {
+  pub fn register_command(
+    &mut self,
+    name: impl AsRef<str>,
+    callback: Box<dyn Fn(Value) -> Result<Value, CrowserError> + Send + Sync>,
+  ) -> Result<(), CrowserError> {
     let mut commands = self.commands.lock().unwrap();
 
     // Check if command already exists
@@ -223,7 +238,7 @@ impl BrowserIpc {
       return Err(CrowserError::IpcError("Command already exists".to_string()));
     }
 
-    commands.insert(name.as_ref().to_string(), callback);
+    commands.insert(name.as_ref().to_string(), vec![callback]);
 
     Ok(())
   }