pake-cli 3.6.1 → 3.6.3

package/src-tauri/.pake/pake.json

@@ -0,0 +1,42 @@
+{
+    "windows": [
+        {
+            "url": "https://twitter.com/",
+            "url_type": "web",
+            "hide_title_bar": false,
+            "fullscreen": false,
+            "width": 1200,
+            "height": 780,
+            "resizable": true,
+            "always_on_top": false,
+            "dark_mode": false,
+            "activation_shortcut": "",
+            "disabled_web_shortcuts": false,
+            "hide_on_close": true,
+            "incognito": false,
+            "enable_wasm": false,
+            "enable_drag_drop": false,
+            "maximize": false,
+            "start_to_tray": false,
+            "force_internal_navigation": false,
+            "zoom": 100,
+            "min_width": 0,
+            "min_height": 0,
+            "ignore_certificate_errors": false
+        }
+    ],
+    "user_agent": {
+        "macos": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.2 Safari/605.1.15",
+        "linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36",
+        "windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/133.0.0.0 Safari/537.36"
+    },
+    "system_tray": {
+        "macos": false,
+        "linux": true,
+        "windows": true
+    },
+    "system_tray_path": "png/icon_512.png",
+    "inject": [],
+    "proxy_url": "",
+    "multi_instance": false
+}

package/src-tauri/.pake/tauri.conf.json

@@ -0,0 +1,24 @@
+{
+    "productName": "twitter",
+    "identifier": "com.pake.4fd9c9",
+    "version": "1.0.0",
+    "app": {
+        "withGlobalTauri": true,
+        "security": {
+            "headers": {},
+            "csp": null
+        }
+    },
+    "build": {
+        "frontendDist": "../dist"
+    },
+    "bundle": {
+        "icon": [
+            "icons/icon.icns"
+        ],
+        "active": true,
+        "targets": [
+            "app"
+        ]
+    }
+}

package/src-tauri/.pake/tauri.linux.conf.json

@@ -0,0 +1,13 @@
+{
+  "productName": "weekly",
+  "bundle": {
+    "icon": ["png/weekly_512.png"],
+    "active": true,
+    "linux": {
+      "deb": {
+        "depends": ["curl", "wget"]
+      }
+    },
+    "targets": ["deb", "appimage"]
+  }
+}

package/src-tauri/.pake/tauri.macos.conf.json

@@ -0,0 +1,11 @@
+{
+    "bundle": {
+        "icon": [
+            "icons/icon.icns"
+        ],
+        "active": true,
+        "targets": [
+            "app"
+        ]
+    }
+}

package/src-tauri/.pake/tauri.windows.conf.json

@@ -0,0 +1,15 @@
+{
+  "bundle": {
+    "icon": ["png/weekly_256.ico", "png/weekly_32.ico"],
+    "active": true,
+    "resources": ["png/weekly_32.ico"],
+    "targets": ["msi"],
+    "windows": {
+      "digestAlgorithm": "sha256",
+      "wix": {
+        "language": ["en-US"],
+        "template": "assets/main.wxs"
+      }
+    }
+  }
+}

package/src-tauri/Cargo.lock

@@ -2588,7 +2588,7 @@ dependencies = [
 
 [[package]]
 name = "pake"
-version = "3.6.1"
+version = "3.6.3"
 dependencies = [
  "serde",
  "serde_json",

package/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pake"
-version = "3.6.1"
+version = "3.6.3"
 description = "🤱🏻 Turn any webpage into a desktop app with Rust."
 authors = ["Tw93"]
 license = "MIT"
@@ -21,7 +21,12 @@ tauri-build = { version = "2.5.3", features = [] }
 serde_json = "1.0.145"
 serde = { version = "1.0.228", features = ["derive"] }
 tokio = { version = "1.48.0", features = ["full"] }
-tauri = { version = "2.9.4", features = ["tray-icon", "image-ico", "image-png", "macos-proxy"] }
+tauri = { version = "2.9.4", features = [
+  "tray-icon",
+  "image-ico",
+  "image-png",
+  "macos-proxy",
+] }
 tauri-plugin-window-state = "2.4.1"
 tauri-plugin-oauth = "2.0.0"
 tauri-plugin-http = "2.5.4"

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

@@ -32,29 +32,48 @@ pub struct NotificationParams {
 
 #[command]
 pub async fn download_file(app: AppHandle, params: DownloadFileParams) -> Result<(), String> {
-    let window: WebviewWindow = app.get_webview_window("pake").unwrap();
+    let window: WebviewWindow = app.get_webview_window("pake").ok_or("Window not found")?;
+
     show_toast(
         &window,
         &get_download_message_with_lang(MessageType::Start, params.language.clone()),
     );
 
-    let output_path = app.path().download_dir().unwrap().join(params.filename);
-    let file_path = check_file_or_append(output_path.to_str().unwrap());
-    let client = ClientBuilder::new().build().unwrap();
+    let download_dir = app
+        .path()
+        .download_dir()
+        .map_err(|e| format!("Failed to get download dir: {}", e))?;
+
+    let output_path = download_dir.join(&params.filename);
+
+    let path_str = output_path.to_str().ok_or("Invalid output path")?;
+
+    let file_path = check_file_or_append(path_str);
 
-    let response = client
-        .execute(Request::new(
-            Method::GET,
-            Url::from_str(&params.url).unwrap(),
-        ))
-        .await;
+    let client = ClientBuilder::new()
+        .build()
+        .map_err(|e| format!("Failed to build client: {}", e))?;
+
+    let url = Url::from_str(&params.url).map_err(|e| format!("Invalid URL: {}", e))?;
+
+    let request = Request::new(Method::GET, url);
+
+    let response = client.execute(request).await;
 
     match response {
-        Ok(res) => {
-            let bytes = res.bytes().await.unwrap();
+        Ok(mut res) => {
+            let mut file =
+                File::create(file_path).map_err(|e| format!("Failed to create file: {}", e))?;
+
+            while let Some(chunk) = res
+                .chunk()
+                .await
+                .map_err(|e| format!("Failed to get chunk: {}", e))?
+            {
+                file.write_all(&chunk)
+                    .map_err(|e| format!("Failed to write chunk: {}", e))?;
+            }
 
-            let mut file = File::create(file_path).unwrap();
-            file.write_all(&bytes).unwrap();
             show_toast(
                 &window,
                 &get_download_message_with_lang(MessageType::Success, params.language.clone()),
@@ -76,15 +95,25 @@ pub async fn download_file_by_binary(
     app: AppHandle,
     params: BinaryDownloadParams,
 ) -> Result<(), String> {
-    let window: WebviewWindow = app.get_webview_window("pake").unwrap();
+    let window: WebviewWindow = app.get_webview_window("pake").ok_or("Window not found")?;
+
     show_toast(
         &window,
         &get_download_message_with_lang(MessageType::Start, params.language.clone()),
     );
-    let output_path = app.path().download_dir().unwrap().join(params.filename);
-    let file_path = check_file_or_append(output_path.to_str().unwrap());
-    let download_file_result = fs::write(file_path, &params.binary);
-    match download_file_result {
+
+    let download_dir = app
+        .path()
+        .download_dir()
+        .map_err(|e| format!("Failed to get download dir: {}", e))?;
+
+    let output_path = download_dir.join(&params.filename);
+
+    let path_str = output_path.to_str().ok_or("Invalid output path")?;
+
+    let file_path = check_file_or_append(path_str);
+
+    match fs::write(file_path, &params.binary) {
         Ok(_) => {
             show_toast(
                 &window,
@@ -111,7 +140,7 @@ pub fn send_notification(app: AppHandle, params: NotificationParams) -> Result<(
         .body(&params.body)
         .icon(&params.icon)
         .show()
-        .unwrap();
+        .map_err(|e| format!("Failed to show notification: {}", e))?;
     Ok(())
 }
 
@@ -119,13 +148,14 @@ pub fn send_notification(app: AppHandle, params: NotificationParams) -> Result<(
 pub async fn update_theme_mode(app: AppHandle, mode: String) {
     #[cfg(target_os = "macos")]
     {
-        let window = app.get_webview_window("pake").unwrap();
-        let theme = if mode == "dark" {
-            Theme::Dark
-        } else {
-            Theme::Light
-        };
-        let _ = window.set_theme(Some(theme));
+        if let Some(window) = app.get_webview_window("pake") {
+            let theme = if mode == "dark" {
+                Theme::Dark
+            } else {
+                Theme::Light
+            };
+            let _ = window.set_theme(Some(theme));
+        }
     }
     #[cfg(not(target_os = "macos"))]
     {

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

@@ -0,0 +1,244 @@
+use tauri::menu::{AboutMetadata, Menu, MenuItem, PredefinedMenuItem, Submenu};
+use tauri::{AppHandle, Manager, Wry};
+use tauri_plugin_opener::OpenerExt;
+
+pub fn get_menu(app: &AppHandle<Wry>) -> tauri::Result<Menu<Wry>> {
+    let pake_version = env!("CARGO_PKG_VERSION");
+    let pake_menu_item_title = format!("Built with Pake V{}", pake_version);
+
+    let menu = Menu::with_items(
+        app,
+        &[
+            &app_menu(app)?,
+            &file_menu(app)?,
+            &edit_menu(app)?,
+            &view_menu(app)?,
+            &navigation_menu(app)?,
+            &window_menu(app)?,
+            &help_menu(app, &pake_menu_item_title)?,
+        ],
+    )?;
+
+    Ok(menu)
+}
+
+fn app_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let app_menu = Submenu::new(app, "Pake", true)?;
+    let about_metadata = AboutMetadata::default();
+    app_menu.append(&PredefinedMenuItem::about(
+        app,
+        Some("Pake"),
+        Some(about_metadata),
+    )?)?;
+    app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    app_menu.append(&PredefinedMenuItem::services(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    app_menu.append(&PredefinedMenuItem::hide(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::hide_others(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::show_all(app, None)?)?;
+    app_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    app_menu.append(&PredefinedMenuItem::quit(app, None)?)?;
+    Ok(app_menu)
+}
+
+fn file_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let file_menu = Submenu::new(app, "File", true)?;
+    file_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
+    file_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    file_menu.append(&MenuItem::with_id(
+        app,
+        "clear_cache_restart",
+        "Clear Cache & Restart",
+        true,
+        Some("CmdOrCtrl+Shift+Backspace"),
+    )?)?;
+    Ok(file_menu)
+}
+
+fn edit_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let edit_menu = Submenu::new(app, "Edit", true)?;
+    edit_menu.append(&PredefinedMenuItem::undo(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::redo(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    edit_menu.append(&PredefinedMenuItem::cut(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::copy(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::paste(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::select_all(app, None)?)?;
+    edit_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    edit_menu.append(&MenuItem::with_id(
+        app,
+        "copy_url",
+        "Copy URL",
+        true,
+        Some("CmdOrCtrl+L"),
+    )?)?;
+    Ok(edit_menu)
+}
+
+fn view_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let view_menu = Submenu::new(app, "View", true)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "reload",
+        "Reload",
+        true,
+        Some("CmdOrCtrl+R"),
+    )?)?;
+    view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "zoom_in",
+        "Zoom In",
+        true,
+        Some("CmdOrCtrl+="),
+    )?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "zoom_out",
+        "Zoom Out",
+        true,
+        Some("CmdOrCtrl+-"),
+    )?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "zoom_reset",
+        "Actual Size",
+        true,
+        Some("CmdOrCtrl+0"),
+    )?)?;
+    view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    view_menu.append(&PredefinedMenuItem::fullscreen(app, None)?)?;
+    view_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    view_menu.append(&MenuItem::with_id(
+        app,
+        "toggle_devtools",
+        "Toggle Developer Tools",
+        cfg!(debug_assertions),
+        Some("CmdOrCtrl+Option+I"),
+    )?)?;
+    Ok(view_menu)
+}
+
+fn navigation_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let navigation_menu = Submenu::new(app, "Navigation", true)?;
+    navigation_menu.append(&MenuItem::with_id(
+        app,
+        "go_back",
+        "Back",
+        true,
+        Some("CmdOrCtrl+["),
+    )?)?;
+    navigation_menu.append(&MenuItem::with_id(
+        app,
+        "go_forward",
+        "Forward",
+        true,
+        Some("CmdOrCtrl+]"),
+    )?)?;
+    navigation_menu.append(&MenuItem::with_id(
+        app,
+        "go_home",
+        "Go Home",
+        true,
+        Some("CmdOrCtrl+Shift+H"),
+    )?)?;
+    Ok(navigation_menu)
+}
+
+fn window_menu(app: &AppHandle<Wry>) -> tauri::Result<Submenu<Wry>> {
+    let window_menu = Submenu::new(app, "Window", true)?;
+    window_menu.append(&PredefinedMenuItem::minimize(app, None)?)?;
+    window_menu.append(&PredefinedMenuItem::maximize(app, None)?)?;
+    window_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    window_menu.append(&MenuItem::with_id(
+        app,
+        "always_on_top",
+        "Toggle Always on Top",
+        true,
+        None::<&str>,
+    )?)?;
+    window_menu.append(&PredefinedMenuItem::separator(app)?)?;
+    window_menu.append(&PredefinedMenuItem::close_window(app, None)?)?;
+    Ok(window_menu)
+}
+
+fn help_menu(app: &AppHandle<Wry>, title: &str) -> tauri::Result<Submenu<Wry>> {
+    let help_menu = Submenu::new(app, "Help", true)?;
+    let github_item = MenuItem::with_id(app, "pake_github_link", title, true, None::<&str>)?;
+    help_menu.append(&github_item)?;
+    Ok(help_menu)
+}
+
+pub fn handle_menu_click(app_handle: &AppHandle, id: &str) {
+    match id {
+        "pake_github_link" => {
+            let _ = app_handle
+                .opener()
+                .open_url("https://github.com/tw93/Pake", None::<&str>);
+        }
+        "reload" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.location.reload()");
+            }
+        }
+        "toggle_devtools" => {
+            #[cfg(debug_assertions)] // Only allow in debug builds
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                if window.is_devtools_open() {
+                    window.close_devtools();
+                } else {
+                    window.open_devtools();
+                }
+            }
+        }
+        "zoom_in" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("zoomIn()");
+            }
+        }
+        "zoom_out" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("zoomOut()");
+            }
+        }
+        "zoom_reset" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("setZoom('100%')");
+            }
+        }
+        "go_back" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.history.back()");
+            }
+        }
+        "go_forward" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.history.forward()");
+            }
+        }
+        "go_home" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("window.location.href = window.pakeConfig.url");
+            }
+        }
+        "copy_url" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let _ = window.eval("navigator.clipboard.writeText(window.location.href)");
+            }
+        }
+        "clear_cache_restart" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                if let Ok(_) = window.clear_all_browsing_data() {
+                    app_handle.restart();
+                }
+            }
+        }
+        "always_on_top" => {
+            if let Some(window) = app_handle.get_webview_window("pake") {
+                let is_on_top = window.is_always_on_top().unwrap_or(false);
+                let _ = window.set_always_on_top(!is_on_top);
+            }
+        }
+        _ => {}
+    }
+}

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

@@ -1,4 +1,5 @@
 pub mod config;
 pub mod invoke;
+pub mod menu;
 pub mod setup;
 pub mod window;