feat: add tauri::Builder::cef_command_line_args method

Author: amrbashir

crates/tauri-runtime-cef/Cargo.toml

@@ -10,7 +10,9 @@ edition.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-tauri-runtime = { version = "2.9.1", path = "../tauri-runtime" }
+tauri-runtime = { version = "2.9.1", path = "../tauri-runtime", features = [
+  "cef",
+] }
 tauri-utils = { version = "2.8.0", path = "../tauri-utils", features = [
   "html-manipulation",
 ] }

crates/tauri-runtime-cef/src/cef_impl.rs

@@ -251,6 +251,7 @@ wrap_app! {
   pub struct TauriApp<T: UserEvent> {
     context: Context<T>,
     custom_schemes: Vec<String>,
+    command_line_args: Vec<(String, Option<String>)>,
   }
 
   impl App {
@@ -270,6 +271,25 @@ wrap_app! {
         }
       }
     }
+
+    fn on_before_command_line_processing(
+      &self,
+      _process_type: Option<&CefString>,
+      command_line: Option<&mut CommandLine>,
+    ) {
+      if let Some(command_line) = command_line {
+        for (arg, value) in &self.command_line_args {
+          if let Some(value) = value {
+            command_line.append_switch_with_value(
+              Some(&CefString::from(arg.as_str())),
+              Some(&CefString::from(value.as_str())),
+            );
+          } else {
+            command_line.append_switch(Some(&CefString::from(arg.as_str())));
+          }
+        }
+      }
+    }
   }
 }
 
@@ -667,7 +687,9 @@ wrap_window_delegate! {
         .unwrap_or(1.0);
       let mut min_w: i32 = 0;
       let mut min_h: i32 = 0;
-      let attributes = self.attributes.borrow();
+      let Ok(attributes) = self.attributes.try_borrow() else {
+        return cef::Size { width: 0, height: 0 };
+      };
       if let Some(min_size) = attributes.min_inner_size {
         let logical = min_size.to_logical::<u32>(scale);
         min_w = min_w.max(logical.width as i32);
@@ -699,7 +721,10 @@ wrap_window_delegate! {
         .unwrap_or(1.0);
       let mut max_w: Option<i32> = None;
       let mut max_h: Option<i32> = None;
-      let attributes = self.attributes.borrow();
+      let Ok(attributes) = self.attributes.try_borrow() else {
+        return cef::Size { width: 0, height: 0 };
+      };
+
       if let Some(max_size) = attributes.max_inner_size {
         let logical = max_size.to_logical::<u32>(scale);
         max_w = Some(logical.width as i32);
@@ -731,7 +756,9 @@ wrap_window_delegate! {
         return;
       };
 
-      if let Some(app_window) = self.windows.borrow().get(&self.window_id) {
+      let Ok(windows) = self.windows.try_borrow() else {  return;  };
+
+      if let Some(app_window) = windows.get(&self.window_id) {
         for wrapper in &app_window.webviews {
           if let (Some(overlay), Some(b)) = (&wrapper.overlay, &*wrapper.bounds.lock().unwrap()) {
             let new_rect = cef::Rect {

crates/tauri-runtime-cef/src/lib.rs

@@ -1853,7 +1853,11 @@ impl<T: UserEvent> CefRuntime<T> {
       next_window_event_id: Default::default(),
     };
 
-    let mut app = cef_impl::TauriApp::new(cef_context.clone(), runtime_args.custom_schemes);
+    let mut app = cef_impl::TauriApp::new(
+      cef_context.clone(),
+      runtime_args.custom_schemes,
+      runtime_args.cef_command_line_args,
+    );
 
     let cmd = args.as_cmd_line().unwrap();
     let switch = CefString::from("type");
@@ -2054,19 +2058,23 @@ impl<T: UserEvent> Runtime<T> for CefRuntime<T> {
   fn run<F: FnMut(RunEvent<T>) + 'static>(self, callback: F) {
     let callback = Arc::new(RefCell::new(callback));
     let event_tx_ = self.event_tx.clone();
-    let _ = self.context.cef_context.callback.replace(Box::new(move |event| {
-      if let RunEvent::Exit = event {
-        // notify the event loop to exit
-        let _ = event_tx_.send(RunEvent::Exit);
-      } else {
-        // Try to call callback directly, if busy queue to channel
-        if let Ok(mut cb) = callback.try_borrow_mut() {
-          cb(event);
+    let _ = self
+      .context
+      .cef_context
+      .callback
+      .replace(Box::new(move |event| {
+        if let RunEvent::Exit = event {
+          // notify the event loop to exit
+          let _ = event_tx_.send(RunEvent::Exit);
         } else {
-          let _ = event_tx_.send(event);
+          // Try to call callback directly, if busy queue to channel
+          if let Ok(mut cb) = callback.try_borrow_mut() {
+            cb(event);
+          } else {
+            let _ = event_tx_.send(event);
+          }
         }
-      }
-    }));
+      }));
 
     'main_loop: loop {
       while let Ok(event) = self.event_rx.try_recv() {

crates/tauri-runtime/Cargo.toml

@@ -64,3 +64,4 @@ objc2-web-kit = { version = "0.3", features = ["objc2-app-kit", "WKWebView"] }
 [features]
 devtools = []
 macos-private-api = []
+cef = []

crates/tauri-runtime/src/lib.rs

@@ -394,6 +394,8 @@ pub struct RuntimeInitArgs {
   pub msg_hook: Option<Box<dyn FnMut(*const std::ffi::c_void) -> bool + 'static>>,
   pub identifier: String,
   pub custom_schemes: Vec<String>,
+  #[cfg(feature = "cef")]
+  pub cef_command_line_args: Vec<(String, Option<String>)>,
 }
 
 /// The webview runtime interface.

crates/tauri/Cargo.toml

@@ -191,7 +191,7 @@ tracing = ["dep:tracing", "tauri-macros/tracing", "tauri-runtime-wry?/tracing"]
 test = []
 compression = ["tauri-macros/compression", "tauri-utils/compression"]
 wry = ["webview2-com", "webkit2gtk", "tauri-runtime-wry"]
-cef = ["tauri-runtime-cef"]
+cef = ["tauri-runtime-cef", "tauri-runtime/cef"]
 # TODO: Remove in v3 - wry does not have this feature anymore
 objc-exception = []
 linux-libxdo = ["tray-icon/libxdo", "muda/libxdo"]

crates/tauri/src/app.rs

@@ -1427,6 +1427,9 @@ pub struct Builder<R: Runtime> {
   device_event_filter: DeviceEventFilter,
 
   pub(crate) invoke_key: String,
+
+  #[cfg(feature = "cef")]
+  cef_command_line_args: Vec<(String, Option<String>)>,
 }
 
 #[derive(Template)]
@@ -1501,6 +1504,8 @@ impl<R: Runtime> Builder<R> {
       webview_event_listeners: Vec::new(),
       device_event_filter: Default::default(),
       invoke_key,
+      #[cfg(feature = "cef")]
+      cef_command_line_args: Vec::new(),
     }
   }
 }
@@ -2074,6 +2079,19 @@ tauri::Builder::default()
     self
   }
 
+  /// Sets CEF command line arguments.
+  #[cfg(feature = "cef")]
+  pub fn cef_command_line_args<K: Into<String>, V: Into<String>>(
+    mut self,
+    args: Vec<(K, Option<V>)>,
+  ) -> Self {
+    self.cef_command_line_args = args
+      .into_iter()
+      .map(|(k, v)| (k.into(), v.map(|v| v.into())))
+      .collect();
+    self
+  }
+
   /// Change the device event filter mode.
   ///
   /// Since the DeviceEvent capture can lead to high CPU usage for unfocused windows, [`tao`]
@@ -2152,6 +2170,8 @@ tauri::Builder::default()
     let runtime_args = RuntimeInitArgs {
       identifier: manager.config.identifier.clone(),
       custom_schemes,
+      #[cfg(feature = "cef")]
+      cef_command_line_args: self.cef_command_line_args,
       #[cfg(any(
         target_os = "linux",
         target_os = "dragonfly",