pake-cli 1.3.1 → 2.0.0-alpha6

package/src-tauri/src/{pake.js → inject/style.js}

@@ -1,39 +1,5 @@
-/**
- * @typedef {string} KeyboardKey `event.key` 的代号，
- * 见 <https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values>
- * @typedef {() => void} OnKeyDown 使用者按下 [CtrlKey] 或者 ⌘ [KeyboardKey]时应该执行的行为
- * 以 Ctrl键或者Meta 键 (⌘) 为首的快捷键清单。
- * 每个写在这里的 shortcuts 都会运行 {@link Event.preventDefault}.
- * @type {Record<KeyboardKey, OnKeyDown>}
- */
-
-const metaKeyShortcuts = {
-  ArrowUp: () => scrollTo(0, 0),
-  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
-  "[": () => window.history.back(),
-  "]": () => window.history.forward(),
-  r: () => window.location.reload(),
-  "-": () => zoomOut(),
-  "=": () => zoomIn(),
-  "+": () => zoomIn(),
-  0: () => zoomCommon(() => "100%"),
-};
-
-const ctrlKeyShortcuts = {
-  ArrowUp: () => scrollTo(0, 0),
-  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
-  ArrowLeft: () => window.history.back(),
-  ArrowRight: () => window.history.forward(),
-  r: () => window.location.reload(),
-  "-": () => zoomOut(),
-  "=": () => zoomIn(),
-  "+": () => zoomIn(),
-  0: () => zoomCommon(() => "100%"),
-};
-
-window.addEventListener("DOMContentLoaded", (_event) => {
-  const style = document.createElement("style");
-  style.innerHTML = `
+window.addEventListener('DOMContentLoaded', (_event) => {
+  const css = `
     #page #footer-wrapper,
     .drawing-board .toolbar .toolbar-action,
     .c-swiper-container,
@@ -49,6 +15,8 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     #masthead-ad,
     #app > header > div > div.menu,
     #root > div > div.fixed.top-0.left-0.w-64.h-screen.p-10.pb-0.flex.flex-col.justify-between > div > div.space-y-4 > a:nth-child(3),
+    #app > div.layout > div.main-container > div.side-bar > div,
+    #app > div.layout > div.main-container > div.side-bar > li.divider,
     #Rightbar > div:nth-child(6) > div.sidebar_compliance {
       display: none !important;
     }
@@ -68,7 +36,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     }
 
     .fui-FluentProvider .fui-Button[data-testid="HomeButton"]{
-       padding-top: 20px;
+      padding-top: 20px;
     }
 
     .chakra-ui-light #app .chakra-heading,
@@ -77,7 +45,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     .chakra-ui-dark #app .chakra-stack,
     .app-main .sidebar-mouse-in-out,
     .chakra-modal__content-container .chakra-modal__header > div > div {
-       padding-top: 10px;
+      padding-top: 10px;
     }
 
     #__next .overflow-hidden>.hidden.bg-gray-900 span.rounded-md.bg-yellow-200 {
@@ -89,7 +57,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
     }
 
     #__next .absolute .px-3.pt-2.pb-3.text-center {
-       visibility: hidden;
+      visibility: hidden;
     }
 
     .lark > .dashboard-sidebar, .lark > .dashboard-sidebar > .sidebar-user-info , .lark > .dashboard-sidebar .index-module_wrapper_F-Wbq{
@@ -130,7 +98,8 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       top: 30px;
     }
 
-    .geist-page nav.dashboard_nav__PRmJv {
+    .geist-page nav.dashboard_nav__PRmJv,
+    #app > div.layout > div.header-container.showSearchBoxOrHeaderFixed > header > a {
       padding-top:10px;
     }
 
@@ -285,6 +254,33 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       }
     }
 
+    @media (min-width:1024px){
+      #__next .text-base.lg\\:max-w-xl, #__next form.stretch.lg\\:max-w-2xl {
+        max-width: 44rem;
+      }
+    }
+
+    @media (min-width:1280px){
+      #__next .text-base.xl\\:max-w-3xl, #__next form.stretch.xl\\:max-w-3xl {
+        max-width: 48rem;
+      }
+    }
+
+    @media (min-width:640px){
+      #__next .sticky.top-0{
+        padding-top: 15px;
+      }
+    }
+
+    #__next .prose ol {
+      overflow: hidden;
+    }
+
+    #__next .prose ol li p {
+      margin: 0;
+      display: inline;
+    }
+
     #pack-top-dom:active {
       cursor: grabbing;
       cursor: -webkit-grabbing;
@@ -297,109 +293,13 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       width: 100%;
       height: 20px;
       cursor: grab;
-      cursor: -webkit-grab;
+      -webkit-app-region: drag;
       user-select: none;
+      -webkit-user-select: none;
       z-index: 90000;
     }
   `;
-  document.head.append(style);
-  const topDom = document.createElement("div");
-  topDom.id = "pack-top-dom";
-  document.body.appendChild(topDom);
-
-  const domEl = document.getElementById("pack-top-dom");
-
-  domEl.addEventListener("mousedown", (e) => {
-    e && e.preventDefault();
-    if (e.buttons === 1 && e.detail !== 2) {
-      window.ipc.postMessage("drag_window");
-    }
-  });
-
-  domEl.addEventListener("touchstart", () => {
-    window.ipc.postMessage("drag_window");
-  });
-
-  domEl.addEventListener("dblclick", () => {
-    window.ipc.postMessage("fullscreen");
-  });
-
-  document.addEventListener("keyup", function (event) {
-    const preventDefault = (f) => {
-      event.preventDefault();
-      f();
-    };
-    if (/windows|linux/i.test(navigator.userAgent)) {
-      if (event.ctrlKey && event.key in ctrlKeyShortcuts) {
-        preventDefault(ctrlKeyShortcuts[event.key]);
-      }
-    }
-    if (/macintosh|mac os x/i.test(navigator.userAgent)) {
-      if (event.metaKey && event.key in metaKeyShortcuts) {
-        preventDefault(metaKeyShortcuts[event.key]);
-      }
-    }
-  });
-
-  document.addEventListener("click", (e) => {
-    const origin = e.target.closest("a");
-    if (origin && origin.href) {
-      const target = origin.target
-      origin.target = "_self";
-      const hrefUrl = new URL(origin.href)
-
-      if (
-        window.location.host !== hrefUrl.host && // 如果 a 标签内链接的域名和当前页面的域名不一致 且
-        target === '_blank' // a 标签内链接的 target 属性为 _blank 时
-      ) {
-        e.preventDefault();
-        window.ipc.postMessage(`open_browser:${origin.href}`);
-      }
-    }
-  });
+  const styleElement = document.createElement('style');
+  styleElement.innerHTML = css;
+  document.head.appendChild(styleElement);
 });
-
-setDefaultZoom();
-
-function setDefaultZoom() {
-  const htmlZoom = window.localStorage.getItem("htmlZoom");
-  if (htmlZoom) {
-    document.getElementsByTagName("html")[0].style.zoom = htmlZoom;
-  }
-}
-
-/**
- * @param {(htmlZoom: string) => string} [zoomRule]
- */
-function zoomCommon(zoomRule) {
-  const htmlZoom = window.localStorage.getItem("htmlZoom") || "100%";
-  const html = document.getElementsByTagName("html")[0];
-  const zoom = zoomRule(htmlZoom);
-  html.style.zoom = zoom;
-  window.localStorage.setItem("htmlZoom", zoom);
-}
-
-function zoomIn() {
-  zoomCommon((htmlZoom) => `${Math.min(parseInt(htmlZoom) + 10, 200)}%`);
-}
-
-function zoomOut() {
-  zoomCommon((htmlZoom) => `${Math.max(parseInt(htmlZoom) - 10, 30)}%`);
-}
-
-
-function pakeToast(msg) {
-	const m = document.createElement('div');
-	m.innerHTML = msg;
-	m.style.cssText = "max-width:60%;min-width: 180px;padding:0 8px;height: 36px;color: rgb(255, 255, 255);line-height: 36px;text-align: center;border-radius: 4px;position: fixed;bottom:16px;right: 16px;transform: translate(-50%, -50%);z-index: 999999;background: rgba(0, 0, 0,.9);font-size: 14px;";
-	document.body.appendChild(m);
-	setTimeout(function() {
-    const d = 0.5;
-		m.style.transition = 'transform ' + d + 's ease-in, opacity ' + d + 's ease-in';
-		m.style.opacity = '0';
-		setTimeout(function() {
-			document.body.removeChild(m)
-		}, d * 1000);
-	}, 2500);
-}
-

package/src-tauri/src/main.rs

@@ -1,278 +1,68 @@
-// at the top of main.rs - that will prevent the console from showing
-#![windows_subsystem = "windows"]
-extern crate image;
-
-use dirs::download_dir;
-use std::path::PathBuf;
-use tauri_utils::config::{Config, WindowConfig};
-use wry::{
-    application::{
-        event::{Event, StartCause, WindowEvent},
-        event_loop::{ControlFlow, EventLoop},
-        menu::MenuType,
-        window::{Fullscreen, Window, WindowBuilder},
-    },
-    webview::WebViewBuilder,
-};
-
-#[cfg(target_os = "macos")]
-use wry::application::{
-    accelerator::{Accelerator, SysMods},
-    keyboard::KeyCode,
-    menu::{MenuBar as Menu, MenuItem, MenuItemAttributes},
-    platform::macos::WindowBuilderExtMacOS,
-};
-
-#[cfg(target_os = "windows")]
-use wry::application::window::Icon;
-
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-use wry::webview::WebContext;
-
-enum UserEvent {
-    DownloadStarted(String, String),
-    DownloadComplete(Option<PathBuf>, bool),
-}
-
-fn main() -> wry::Result<()> {
-    #[cfg(target_os = "macos")]
-    let (menu_bar_menu, close_item) = {
-        let mut menu_bar_menu = Menu::new();
-        let mut first_menu = Menu::new();
-        first_menu.add_native_item(MenuItem::Hide);
-        first_menu.add_native_item(MenuItem::EnterFullScreen);
-        first_menu.add_native_item(MenuItem::Minimize);
-        first_menu.add_native_item(MenuItem::Separator);
-        first_menu.add_native_item(MenuItem::Copy);
-        first_menu.add_native_item(MenuItem::Cut);
-        first_menu.add_native_item(MenuItem::Paste);
-        first_menu.add_native_item(MenuItem::Undo);
-        first_menu.add_native_item(MenuItem::Redo);
-        first_menu.add_native_item(MenuItem::SelectAll);
-        first_menu.add_native_item(MenuItem::Separator);
-        let close_item = first_menu.add_item(
-            MenuItemAttributes::new("CloseWindow")
-                .with_accelerators(&Accelerator::new(SysMods::Cmd, KeyCode::KeyW)),
-        );
-        first_menu.add_native_item(MenuItem::Quit);
-        menu_bar_menu.add_submenu("App", true, first_menu);
-        (menu_bar_menu, close_item)
-    };
-
-    #[cfg(any(target_os = "linux", target_os = "windows"))]
-    let (
-        package_name,
-        WindowConfig {
-            url,
-            width,
-            height,
-            resizable,
-            fullscreen,
-            ..
-        },
-    ) = {
-        let (package_name, windows_config) = get_windows_config();
-        (
-            package_name
-                .expect("can't get package name in config file")
-                .to_lowercase(),
-            windows_config.unwrap_or_default(),
-        )
-    };
-
-    #[cfg(target_os = "macos")]
-    let WindowConfig {
-        url,
-        width,
-        height,
-        resizable,
-        transparent,
-        fullscreen,
-        ..
-    } = get_windows_config().1.unwrap_or_default();
-
-    let event_loop: EventLoop<UserEvent> = EventLoop::with_user_event();
-    let proxy = event_loop.create_proxy();
-    let common_window = WindowBuilder::new()
-        .with_title("")
-        .with_resizable(resizable)
-        .with_fullscreen(if fullscreen {
-            Some(Fullscreen::Borderless(None))
-        } else {
-            None
-        })
-        .with_inner_size(wry::application::dpi::LogicalSize::new(width, height));
-
-    #[cfg(target_os = "windows")]
-    let window = {
-        let mut icon_path = format!("png/{}_32.ico", package_name);
-        // If there is no setting, use the default one.
-        if !std::path::Path::new(&icon_path).exists() {
-            icon_path = "png/icon_32.ico".to_string();
-        }
-        let icon = load_icon(std::path::Path::new(&icon_path));
-        common_window
-            .with_decorations(true)
-            .with_window_icon(Some(icon))
-            .build(&event_loop)
-            .unwrap()
-    };
-
-    #[cfg(target_os = "linux")]
-    let window = common_window.build(&event_loop).unwrap();
-
-    #[cfg(target_os = "macos")]
-    let window = common_window
-        .with_fullsize_content_view(true)
-        .with_titlebar_buttons_hidden(false)
-        .with_titlebar_transparent(transparent)
-        .with_title_hidden(true)
-        .with_menu(menu_bar_menu)
-        .build(&event_loop)
-        .unwrap();
-
-    // Handling events of JS -> Rust
-    let handler = move |window: &Window, req: String| {
-        if req == "drag_window" {
-            let _ = window.drag_window();
-        } else if req == "fullscreen" {
-            let is_maximized = window.is_maximized();
-            window.set_maximized(!is_maximized);
-        } else if req.starts_with("open_browser") {
-            let href = req.replace("open_browser:", "");
-            webbrowser::open(&href).expect("no browser");
-        }
-    };
-
-    let download_started = {
-        let proxy = proxy.clone();
-        move |uri: String, default_path: &mut PathBuf| {
-            let path = download_dir()
-                .unwrap()
-                .join(default_path.display().to_string())
-                .as_path()
-                .to_path_buf();
-            *default_path = path.clone();
-            let submitted = proxy
-                .send_event(UserEvent::DownloadStarted(uri, path.display().to_string()))
-                .is_ok();
-            submitted
-        }
-    };
+#![cfg_attr(
+    all(not(debug_assertions), target_os = "windows"),
+    windows_subsystem = "windows"
+)]
+
+mod app;
+mod util;
+
+use app::{invoke, menu, window};
+use invoke::{download_file, drag_window, fullscreen, open_browser};
+use menu::{get_menu, menu_event_handle};
+use tauri_plugin_window_state::Builder as windowStatePlugin;
+use util::{get_data_dir, get_pake_config};
+use window::get_window;
+
+pub fn run_app() {
+    let (pake_config, tauri_config) = get_pake_config();
+    let show_menu = pake_config.show_menu();
+    let menu = get_menu();
+    let data_dir = get_data_dir(tauri_config);
+
+    let mut tauri_app = tauri::Builder::default();
+
+    if show_menu {
+        tauri_app = tauri_app.menu(menu).on_menu_event(menu_event_handle);
+    }
 
-    let download_completed = {
-        move |_uri, path, success| {
-            let _ = proxy.send_event(UserEvent::DownloadComplete(path, success));
-        }
-    };
+    #[cfg(not(target_os = "macos"))]
+    {
+        use menu::{get_system_tray, system_tray_handle};
 
-    #[cfg(target_os = "macos")]
-    let webview = {
-        let user_agent_string = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15";
-        WebViewBuilder::new(window)?
-            .with_user_agent(user_agent_string)
-            .with_url(&url.to_string())?
-            .with_devtools(cfg!(feature = "devtools"))
-            .with_initialization_script(include_str!("pake.js"))
-            .with_ipc_handler(handler)
-            .with_back_forward_navigation_gestures(true)
-            .with_download_started_handler(download_started)
-            .with_download_completed_handler(download_completed)
-            .build()?
-    };
+        let show_system_tray = pake_config.show_system_tray();
+        let system_tray = get_system_tray(show_menu);
 
-    #[cfg(any(target_os = "linux", target_os = "windows"))]
-    let webview = {
-        let home_dir = match home::home_dir() {
-            Some(path1) => path1,
-            None => panic!("Error, can't found you home dir!!"),
-        };
-        #[cfg(target_os = "windows")]
-        let data_dir = home_dir.join("AppData").join("Roaming").join(package_name);
-        #[cfg(target_os = "linux")]
-        let data_dir = home_dir.join(".config").join(package_name);
-        if !data_dir.exists() {
-            std::fs::create_dir(&data_dir)
-                .unwrap_or_else(|_| panic!("can't create dir {}", data_dir.display()));
+        if show_system_tray {
+            tauri_app = tauri_app
+                .system_tray(system_tray)
+                .on_system_tray_event(system_tray_handle);
         }
-        let mut web_content = WebContext::new(Some(data_dir));
-        #[cfg(target_os = "windows")]
-        let user_agent_string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
-        #[cfg(target_os = "linux")]
-        let user_agent_string = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
-        WebViewBuilder::new(window)?
-            .with_user_agent(user_agent_string)
-            .with_url(&url.to_string())?
-            .with_devtools(cfg!(feature = "devtools"))
-            .with_initialization_script(include_str!("pake.js"))
-            .with_ipc_handler(handler)
-            .with_web_context(&mut web_content)
-            .with_download_started_handler(download_started)
-            .with_download_completed_handler(download_completed)
-            .build()?
-    };
-    #[cfg(feature = "devtools")]
-    {
-        webview.open_devtools();
     }
 
-    event_loop.run(move |event, _, control_flow| {
-        *control_flow = ControlFlow::Wait;
-
-        match event {
-            Event::NewEvents(StartCause::Init) => println!("Wry has started!"),
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            Event::MenuEvent {
-                menu_id,
-                origin: MenuType::MenuBar,
-                ..
-            } => {
-                #[cfg(target_os = "macos")]
-                if menu_id == close_item.clone().id() {
-                    webview.window().set_minimized(true);
-                }
-                println!("Clicked on {menu_id:?}");
-            }
-            Event::UserEvent(UserEvent::DownloadStarted(uri, temp_dir)) => {
-                println!("Download: {uri}");
-                println!("Will write to: {temp_dir:?}");
-            }
-            Event::UserEvent(UserEvent::DownloadComplete(_, success)) => {
-                println!("Succeeded: {success}");
-                if success {
-                    let _ = webview
-                        .evaluate_script("window.pakeToast('Downloaded to download folder~')");
-                } else {
-                    println!("No output path")
-                }
+    tauri_app
+        .plugin(windowStatePlugin::default().build())
+        .invoke_handler(tauri::generate_handler![
+            drag_window,
+            fullscreen,
+            open_browser,
+            download_file
+        ])
+        .setup(|app| {
+            let _window = get_window(app, pake_config, data_dir);
+            // Prevent initial shaking
+            _window.show().unwrap();
+            Ok(())
+        })
+        .on_window_event(|event| {
+            if let tauri::WindowEvent::CloseRequested { api, .. } = event.event() {
+                event.window().minimize().unwrap();
+                api.prevent_close();
             }
-            _ => (),
-        }
-    });
-}
-
-fn get_windows_config() -> (Option<String>, Option<WindowConfig>) {
-    let config_file = include_str!("../tauri.conf.json");
-    let config: Config = serde_json::from_str(config_file).expect("failed to parse windows config");
-    (
-        config.package.product_name.clone(),
-        config.tauri.windows.first().cloned(),
-    )
+        })
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
 }
 
-#[cfg(target_os = "windows")]
-fn load_icon(path: &std::path::Path) -> Icon {
-    let (icon_rgba, icon_width, icon_height) = {
-        // alternatively, you can embed the icon in the binary through `include_bytes!` macro and use `image::load_from_memory`
-        let image = image::open(path)
-            .expect("Failed to open icon path")
-            .into_rgba8();
-        let (width, height) = image.dimensions();
-        let rgba = image.into_raw();
-        (rgba, width, height)
-    };
-    Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
+fn main() {
+    run_app()
 }

package/src-tauri/src/util.rs

@@ -0,0 +1,78 @@
+use crate::app::config::PakeConfig;
+use std::env;
+use std::path::PathBuf;
+use tauri::{api, Config, Window};
+
+pub fn get_pake_config() -> (PakeConfig, Config) {
+    let pake_config: PakeConfig =
+        serde_json::from_str(include_str!("../pake.json")).expect("Failed to parse pake config");
+
+    let tauri_config: Config = serde_json::from_str(include_str!("../tauri.conf.json"))
+        .expect("Failed to parse tauri config");
+
+    (pake_config, tauri_config)
+}
+
+pub fn get_data_dir(_tauri_config: Config) -> PathBuf {
+    {
+        let package_name = _tauri_config.package.product_name.unwrap();
+        let data_dir = api::path::config_dir()
+            .expect("Failed to get data dirname")
+            .join(package_name);
+
+        if !data_dir.exists() {
+            std::fs::create_dir(&data_dir)
+                .unwrap_or_else(|_| panic!("Can't create dir {}", data_dir.display()));
+        }
+        data_dir
+    }
+}
+
+pub fn show_toast(window: &Window, message: &str) {
+    let script = format!(r#"pakeToast("{}");"#, message);
+    window.eval(&script).unwrap();
+}
+
+pub fn get_download_message() -> String {
+    let default_message = "Download successful, saved to download directory~";
+    let chinese_message = "下载成功，已保存到下载目录~";
+
+    env::var("LANG")
+        .map(|lang| {
+            if lang.starts_with("zh") {
+                chinese_message
+            } else {
+                default_message
+            }
+        })
+        .unwrap_or(default_message)
+        .to_string()
+}
+
+// Check if the file exists, if it exists, add a number to file name
+pub fn check_file_or_append(file_path: &str) -> String {
+    let mut new_path = PathBuf::from(file_path);
+    let mut counter = 0;
+
+    while new_path.exists() {
+        let file_stem = new_path.file_stem().unwrap().to_string_lossy().to_string();
+        let extension = new_path.extension().unwrap().to_string_lossy().to_string();
+        let parent_dir = new_path.parent().unwrap();
+
+        let new_file_stem = match file_stem.rfind('-') {
+            Some(index) if file_stem[index + 1..].parse::<u32>().is_ok() => {
+                let base_name = &file_stem[..index];
+                counter = file_stem[index + 1..].parse::<u32>().unwrap() + 1;
+                format!("{}-{}", base_name, counter)
+            }
+            _ => {
+                counter += 1;
+                format!("{}-{}", file_stem, counter)
+            }
+        };
+
+        new_path = parent_dir.join(format!("{}.{}", new_file_stem, extension));
+    }
+
+    new_path.to_string_lossy().into_owned()
+}