pake-cli 2.3.7 → 2.4.0-beta

package/src-tauri/Cargo.toml

@@ -7,17 +7,17 @@ license = "MIT"
 repository = "https://github.com/tw93/Pake"
 default-run = "app"
 edition = "2021"
-rust-version = "1.63.0"
+rust-version = "1.78.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5.0", features = [] }
+tauri-build = { version = "1.5.2", features = [] }
 
 [dependencies]
-serde_json = "1.0.108"
-serde = { version = "1.0.192", features = ["derive"] }
-tauri = { version = "1.5.2", features = ["api-all", "system-tray"] }
+serde_json = "1.0.116"
+serde = { version = "1.0.200", features = ["derive"] }
+tauri = { version = "1.6.3", features = ["api-all", "system-tray"] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-oauth = { git = "https://github.com/FabianLars/tauri-plugin-oauth", branch = "main" }
 

package/src-tauri/pake.json

@@ -2,12 +2,15 @@
   "windows": [
     {
       "url": "https://weread.qq.com",
+      "url_type": "web",
       "transparent": true,
       "fullscreen": false,
       "width": 1200,
       "height": 780,
       "resizable": true,
-      "url_type": "web"
+      "always_on_top": false,
+      "activation_shortcut": "",
+      "disabled_web_shortcuts": false
     }
   ],
   "user_agent": {

package/src-tauri/rust_proxy.toml

@@ -1,14 +1,10 @@
 [source.crates-io]
-# To use sparse index, change 'rsproxy' to 'rsproxy-sparse'
-replace-with = 'rsproxy'
-
+replace-with = 'rsproxy-sparse'
 [source.rsproxy]
 registry = "https://rsproxy.cn/crates.io-index"
 [source.rsproxy-sparse]
 registry = "sparse+https://rsproxy.cn/index/"
-
 [registries.rsproxy]
 index = "https://rsproxy.cn/crates.io-index"
-
 [net]
 git-fetch-with-cli = true

package/src-tauri/src/app/config.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct WindowConfig {
     pub url: String,
     pub transparent: bool,
@@ -9,9 +9,12 @@ pub struct WindowConfig {
     pub height: f64,
     pub resizable: bool,
     pub url_type: String,
+    pub always_on_top: bool,
+    pub disabled_web_shortcuts: bool,
+    pub activation_shortcut: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct PlatformSpecific<T> {
     pub macos: T,
     pub linux: T,
@@ -43,7 +46,7 @@ where
 pub type UserAgent = PlatformSpecific<String>;
 pub type FunctionON = PlatformSpecific<bool>;
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct PakeConfig {
     pub windows: Vec<WindowConfig>,
     pub user_agent: UserAgent,

package/src-tauri/src/app/menu.rs

@@ -1,4 +1,4 @@
-use tauri::{CustomMenuItem,Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
+use tauri::{CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu};
 use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 
 pub fn get_system_tray() -> SystemTray {

package/src-tauri/src/app/window.rs

@@ -19,6 +19,11 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind
         _ => panic!("url type can only be web or local"),
     };
 
+    let config_script = format!(
+        "window.pakeConfig = {}",
+        serde_json::to_string(&window_config).unwrap()
+    );
+
     let mut window_builder = WindowBuilder::new(app, "pake", url)
         .title("")
         .user_agent(user_agent)
@@ -27,18 +32,14 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind
         .fullscreen(window_config.fullscreen)
         .inner_size(window_config.width, window_config.height)
         .disable_file_drop_handler()
+        .always_on_top(window_config.always_on_top)
+        .initialization_script(&config_script)
         .initialization_script(include_str!("../inject/component.js"))
         .initialization_script(include_str!("../inject/event.js"))
         .initialization_script(include_str!("../inject/style.js"))
         //This is necessary to allow for file injection by external developers for customization purposes.
         .initialization_script(include_str!("../inject/custom.js"));
 
-    // For dynamic display of header styles
-    if window_config.transparent {
-        let transparent_script = "window.pakeWindowTitleTransparent = true;";
-        window_builder = window_builder.initialization_script(transparent_script);
-    }
-
     #[cfg(target_os = "macos")]
     {
         let title_bar_style = if window_config.transparent {

package/src-tauri/src/inject/event.js

@@ -63,7 +63,7 @@ document.addEventListener('DOMContentLoaded', () => {
   const appWindow = tauri.window.appWindow;
   const invoke = tauri.tauri.invoke;
 
-  if(!document.getElementById('pake-top-dom')){
+  if (!document.getElementById('pake-top-dom')) {
     const topDom = document.createElement('div');
     topDom.id = 'pake-top-dom';
     document.body.appendChild(topDom);
@@ -88,14 +88,16 @@ document.addEventListener('DOMContentLoaded', () => {
     });
   });
 
-  document.addEventListener('keyup', (event) => {
-    if (/windows|linux/i.test(navigator.userAgent) && event.ctrlKey) {
-      handleShortcut(event);
-    }
-    if (/macintosh|mac os x/i.test(navigator.userAgent) && event.metaKey) {
-      handleShortcut(event);
-    }
-  });
+  if (window['pakeConfig']?.disabled_web_shortcuts !== true) {
+    document.addEventListener('keyup', (event) => {
+      if (/windows|linux/i.test(navigator.userAgent) && event.ctrlKey) {
+        handleShortcut(event);
+      }
+      if (/macintosh|mac os x/i.test(navigator.userAgent) && event.metaKey) {
+        handleShortcut(event);
+      }
+    });
+  }
 
   // Collect blob urls to blob by overriding window.URL.createObjectURL
   function collectUrlToBlobs() {

package/src-tauri/src/inject/style.js

@@ -412,7 +412,7 @@ window.addEventListener('DOMContentLoaded', _event => {
     }
   `;
   const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
-  if (window.pakeWindowTitleTransparent && isMac) {
+  if (window['pakeConfig']?.transparent && isMac) {
     const topPaddingStyleElement = document.createElement('style');
     topPaddingStyleElement.innerHTML = topPaddingCSS;
     document.head.appendChild(topPaddingStyleElement);

package/src-tauri/src/main.rs

@@ -1,14 +1,15 @@
 #![cfg_attr(
-all(not(debug_assertions), target_os = "windows"),
-windows_subsystem = "windows"
+    all(not(debug_assertions), target_os = "windows"),
+    windows_subsystem = "windows"
 )]
 
 mod app;
 mod util;
 
-use app::{invoke, window, menu};
+use app::{invoke, menu, window};
 use invoke::{download_file, download_file_by_binary};
 use menu::{get_system_tray, system_tray_handle};
+use tauri::{GlobalShortcutManager, Manager};
 use tauri_plugin_window_state::Builder as windowStatePlugin;
 use util::{get_data_dir, get_pake_config};
 use window::get_window;
@@ -28,6 +29,9 @@ pub fn run_app() {
             .on_system_tray_event(system_tray_handle);
     }
 
+    // Save the value of toggle_app_shortcut before pake_config is moved
+    let activation_shortcut = pake_config.windows[0].activation_shortcut.clone();
+
     tauri_app
         .plugin(windowStatePlugin::default().build())
         .plugin(tauri_plugin_oauth::init())
@@ -35,10 +39,28 @@ pub fn run_app() {
             download_file,
             download_file_by_binary
         ])
-        .setup(|app| {
+        .setup(move |app| {
             let _window = get_window(app, pake_config, data_dir);
             // Prevent initial shaking
             _window.show().unwrap();
+
+            if !activation_shortcut.is_empty() {
+                let app_handle = app.app_handle().clone();
+                app_handle
+                    .global_shortcut_manager()
+                    .register(activation_shortcut.as_str(), move || {
+                        let window = app_handle.get_window("pake").unwrap();
+                        match window.is_visible().unwrap() {
+                            true => window.hide().unwrap(),
+                            false => {
+                                window.show().unwrap();
+                                window.set_focus().unwrap();
+                            }
+                        }
+                    })
+                    .expect("Error registering global evoke shortcuts!");
+            }
+
             Ok(())
         })
         .on_window_event(|event| {

package/src-tauri/src/util.rs

@@ -7,12 +7,15 @@ pub fn get_pake_config() -> (PakeConfig, Config) {
     #[cfg(feature = "cli-build")]
     let pake_config: PakeConfig = serde_json::from_str(include_str!("../.pake/pake.json"))
         .expect("Failed to parse pake config");
+
     #[cfg(not(feature = "cli-build"))]
     let pake_config: PakeConfig =
         serde_json::from_str(include_str!("../pake.json")).expect("Failed to parse pake config");
+
     #[cfg(feature = "cli-build")]
     let tauri_config: Config = serde_json::from_str(include_str!("../.pake/tauri.conf.json"))
         .expect("Failed to parse tauri config");
+
     #[cfg(not(feature = "cli-build"))]
     let tauri_config: Config = serde_json::from_str(include_str!("../tauri.conf.json"))
         .expect("Failed to parse tauri config");