pake-cli 3.1.1 → 3.2.0-beta

package/src-tauri/pake.json

@@ -1,7 +1,7 @@
 {
   "windows": [
     {
-      "url": "https://weread.qq.com",
+      "url": "https://weekly.tw93.fun/",
       "url_type": "web",
       "hide_title_bar": true,
       "fullscreen": false,
@@ -11,7 +11,8 @@
       "always_on_top": false,
       "dark_mode": false,
       "activation_shortcut": "",
-      "disabled_web_shortcuts": false
+      "disabled_web_shortcuts": false,
+      "hide_on_close": true
     }
   ],
   "user_agent": {

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

@@ -13,6 +13,7 @@ pub struct WindowConfig {
     pub dark_mode: bool,
     pub disabled_web_shortcuts: bool,
     pub activation_shortcut: String,
+    pub hide_on_close: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize)]

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

@@ -67,7 +67,9 @@ pub fn set_global_shortcut(app: &AppHandle, shortcut: String) -> tauri::Result<(
                     let last_triggered = Arc::clone(&last_triggered);
                     move |app, event, _shortcut| {
                         let mut last_triggered = last_triggered.lock().unwrap();
-                        if Instant::now().duration_since(*last_triggered) < Duration::from_millis(300) {
+                        if Instant::now().duration_since(*last_triggered)
+                            < Duration::from_millis(300)
+                        {
                             return;
                         }
                         *last_triggered = Instant::now();

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

@@ -6,6 +6,9 @@ use tauri::{App, Config, Url, WebviewUrl, WebviewWindow, WebviewWindowBuilder};
 #[cfg(target_os = "macos")]
 use tauri::{Theme, TitleBarStyle};
 
+#[cfg(target_os = "windows")]
+use tauri::Theme;
+
 pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) -> WebviewWindow {
     let package_name = tauri_config.clone().product_name.unwrap();
     let _data_dir = get_data_dir(app.handle(), package_name);
@@ -43,9 +46,13 @@ pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) ->
         .initialization_script(include_str!("../inject/style.js"))
         .initialization_script(include_str!("../inject/custom.js"));
 
+    // Configure proxy if specified
     if !config.proxy_url.is_empty() {
-        window_builder =
-            window_builder.proxy_url(Url::from_str(config.proxy_url.as_str()).unwrap());
+        if let Ok(proxy_url) = Url::from_str(&config.proxy_url) {
+            window_builder = window_builder.proxy_url(proxy_url);
+            #[cfg(debug_assertions)]
+            println!("Proxy configured: {}", config.proxy_url);
+        }
     }
 
     #[cfg(target_os = "macos")]
@@ -62,11 +69,26 @@ pub fn set_window(app: &mut App, config: &PakeConfig, tauri_config: &Config) ->
         }
     }
 
-    #[cfg(not(target_os = "macos"))]
+    #[cfg(target_os = "windows")]
+    {
+        window_builder = window_builder
+            .data_directory(_data_dir)
+            .title(app.package_info().name.clone());
+        
+        // Set theme to None for automatic system theme detection on Windows
+        // This allows the window to respond to system theme changes automatically
+        window_builder = window_builder.theme(None);
+    }
+
+    #[cfg(target_os = "linux")]
     {
         window_builder = window_builder
             .data_directory(_data_dir)
             .title(app.package_info().name.clone());
+        
+        // Set theme to None for automatic system theme detection on Linux  
+        // This allows the window to respond to system theme changes automatically
+        window_builder = window_builder.theme(None);
     }
 
     window_builder.build().expect("Failed to build window")

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

@@ -1,15 +1,16 @@
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener("DOMContentLoaded", () => {
   // Toast
   function pakeToast(msg) {
-    const m = document.createElement('div');
+    const m = document.createElement("div");
     m.innerHTML = msg;
     m.style.cssText =
-      'max-width:60%;min-width: 80px;padding:0 12px;height: 32px;color: rgb(255, 255, 255);line-height: 32px;text-align: center;border-radius: 8px;position: fixed; bottom:24px;right: 28px;z-index: 999999;background: rgba(0, 0, 0,.8);font-size: 13px;';
+      "max-width:60%;min-width: 80px;padding:0 12px;height: 32px;color: rgb(255, 255, 255);line-height: 32px;text-align: center;border-radius: 8px;position: fixed; bottom:24px;right: 28px;z-index: 999999;background: rgba(0, 0, 0,.8);font-size: 13px;";
     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';
+      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);

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

@@ -1,32 +1,32 @@
 const shortcuts = {
-  '[': () => window.history.back(),
-  ']': () => window.history.forward(),
-  '-': () => zoomOut(),
-  '=': () => zoomIn(),
-  '+': () => zoomIn(),
-  0: () => setZoom('100%'),
+  "[": () => window.history.back(),
+  "]": () => window.history.forward(),
+  "-": () => zoomOut(),
+  "=": () => zoomIn(),
+  "+": () => zoomIn(),
+  0: () => setZoom("100%"),
   r: () => window.location.reload(),
   ArrowUp: () => scrollTo(0, 0),
   ArrowDown: () => scrollTo(0, document.body.scrollHeight),
 };
 
 function setZoom(zoom) {
-  const html = document.getElementsByTagName('html')[0];
+  const html = document.getElementsByTagName("html")[0];
   html.style.zoom = zoom;
-  window.localStorage.setItem('htmlZoom', zoom);
+  window.localStorage.setItem("htmlZoom", zoom);
 }
 
 function zoomCommon(zoomChange) {
-  const currentZoom = window.localStorage.getItem('htmlZoom') || '100%';
+  const currentZoom = window.localStorage.getItem("htmlZoom") || "100%";
   setZoom(zoomChange(currentZoom));
 }
 
 function zoomIn() {
-  zoomCommon(currentZoom => `${Math.min(parseInt(currentZoom) + 10, 200)}%`);
+  zoomCommon((currentZoom) => `${Math.min(parseInt(currentZoom) + 10, 200)}%`);
 }
 
 function zoomOut() {
-  zoomCommon(currentZoom => `${Math.max(parseInt(currentZoom) - 10, 30)}%`);
+  zoomCommon((currentZoom) => `${Math.max(parseInt(currentZoom) - 10, 30)}%`);
 }
 
 function handleShortcut(event) {
@@ -47,42 +47,45 @@ function isDownloadLink(url) {
     'svg', 'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp',
     'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip', 'json', 'yaml', '7zip', 'mkv',
   ];
-  const downloadLinkPattern = new RegExp(`\\.(${fileExtensions.join('|')})$`, 'i');
+  const downloadLinkPattern = new RegExp(
+    `\\.(${fileExtensions.join("|")})$`,
+    "i",
+  );
   return downloadLinkPattern.test(url);
 }
 
-document.addEventListener('DOMContentLoaded', () => {
+document.addEventListener("DOMContentLoaded", () => {
   const tauri = window.__TAURI__;
   const appWindow = tauri.window.getCurrentWindow();
   const invoke = tauri.core.invoke;
 
-  if (!document.getElementById('pake-top-dom')) {
-    const topDom = document.createElement('div');
-    topDom.id = 'pake-top-dom';
+  if (!document.getElementById("pake-top-dom")) {
+    const topDom = document.createElement("div");
+    topDom.id = "pake-top-dom";
     document.body.appendChild(topDom);
   }
 
-  const domEl = document.getElementById('pake-top-dom');
+  const domEl = document.getElementById("pake-top-dom");
 
-  domEl.addEventListener('touchstart', () => {
+  domEl.addEventListener("touchstart", () => {
     appWindow.startDragging();
   });
 
-  domEl.addEventListener('mousedown', e => {
+  domEl.addEventListener("mousedown", (e) => {
     e.preventDefault();
     if (e.buttons === 1 && e.detail !== 2) {
       appWindow.startDragging();
     }
   });
 
-  domEl.addEventListener('dblclick', () => {
-    appWindow.isFullscreen().then(fullscreen => {
+  domEl.addEventListener("dblclick", () => {
+    appWindow.isFullscreen().then((fullscreen) => {
       appWindow.setFullscreen(!fullscreen);
     });
   });
 
-  if (window['pakeConfig']?.disabled_web_shortcuts !== true) {
-    document.addEventListener('keyup', event => {
+  if (window["pakeConfig"]?.disabled_web_shortcuts !== true) {
+    document.addEventListener("keyup", (event) => {
       if (/windows|linux/i.test(navigator.userAgent) && event.ctrlKey) {
         handleShortcut(event);
       }
@@ -96,7 +99,7 @@ document.addEventListener('DOMContentLoaded', () => {
   function collectUrlToBlobs() {
     const backupCreateObjectURL = window.URL.createObjectURL;
     window.blobToUrlCaches = new Map();
-    window.URL.createObjectURL = blob => {
+    window.URL.createObjectURL = (blob) => {
       const url = backupCreateObjectURL.call(window.URL, blob);
       window.blobToUrlCaches.set(url, blob);
       return url;
@@ -104,7 +107,7 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   function convertBlobUrlToBinary(blobUrl) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       const blob = window.blobToUrlCaches.get(blobUrl);
       const reader = new FileReader();
 
@@ -116,7 +119,7 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   function downloadFromDataUri(dataURI, filename) {
-    const byteString = atob(dataURI.split(',')[1]);
+    const byteString = atob(dataURI.split(",")[1]);
     // write the bytes of the string to an ArrayBuffer
     const bufferArray = new ArrayBuffer(byteString.length);
 
@@ -129,7 +132,7 @@ document.addEventListener('DOMContentLoaded', () => {
     }
 
     // write the ArrayBuffer to a binary, and you're done
-    invoke('download_file_by_binary', {
+    invoke("download_file_by_binary", {
       params: {
         filename,
         binary: Array.from(binary),
@@ -138,8 +141,8 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   function downloadFromBlobUrl(blobUrl, filename) {
-    convertBlobUrlToBinary(blobUrl).then(binary => {
-      invoke('download_file_by_binary', {
+    convertBlobUrlToBinary(blobUrl).then((binary) => {
+      invoke("download_file_by_binary", {
         params: {
           filename,
           binary,
@@ -151,20 +154,20 @@ document.addEventListener('DOMContentLoaded', () => {
   // detect blob download by createElement("a")
   function detectDownloadByCreateAnchor() {
     const createEle = document.createElement;
-    document.createElement = el => {
-      if (el !== 'a') return createEle.call(document, el);
+    document.createElement = (el) => {
+      if (el !== "a") return createEle.call(document, el);
       const anchorEle = createEle.call(document, el);
 
       // use addEventListener to avoid overriding the original click event.
       anchorEle.addEventListener(
-        'click',
-        e => {
+        "click",
+        (e) => {
           const url = anchorEle.href;
           const filename = anchorEle.download || getFilenameFromUrl(url);
           if (window.blobToUrlCaches.has(url)) {
             downloadFromBlobUrl(url, filename);
             // case: download from dataURL -> convert dataURL ->
-          } else if (url.startsWith('data:')) {
+          } else if (url.startsWith("data:")) {
             downloadFromDataUri(url, filename);
           }
         },
@@ -176,18 +179,42 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   // process special download protocol['data:','blob:']
-  const isSpecialDownload = url => ['blob', 'data'].some(protocol => url.startsWith(protocol));
+  const isSpecialDownload = (url) =>
+    ["blob", "data"].some((protocol) => url.startsWith(protocol));
 
-  const isDownloadRequired = (url, anchorElement, e) => anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(url);
+  const isDownloadRequired = (url, anchorElement, e) =>
+    anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(url);
 
-  const handleExternalLink = url => {
-    invoke('plugin:shell|open', {
+  const handleExternalLink = (url) => {
+    invoke("plugin:shell|open", {
       path: url,
     });
   };
 
-  const detectAnchorElementClick = e => {
-    const anchorElement = e.target.closest('a');
+  // Check if URL belongs to the same domain (including subdomains)
+  const isSameDomain = (url) => {
+    try {
+      const linkUrl = new URL(url);
+      const currentUrl = new URL(window.location.href);
+
+      if (linkUrl.hostname === currentUrl.hostname) return true;
+
+      // Extract root domain (e.g., bilibili.com from www.bilibili.com)
+      const getRootDomain = (hostname) => {
+        const parts = hostname.split(".");
+        return parts.length >= 2 ? parts.slice(-2).join(".") : hostname;
+      };
+
+      return (
+        getRootDomain(currentUrl.hostname) === getRootDomain(linkUrl.hostname)
+      );
+    } catch (e) {
+      return false;
+    }
+  };
+
+  const detectAnchorElementClick = (e) => {
+    const anchorElement = e.target.closest("a");
 
     if (anchorElement && anchorElement.href) {
       const target = anchorElement.target;
@@ -195,28 +222,61 @@ document.addEventListener('DOMContentLoaded', () => {
       const absoluteUrl = hrefUrl.href;
       let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
 
-      // Handling external link redirection, _blank will automatically open.
-      if (target === '_blank') {
+      // Handle _blank links: same domain navigates in-app, cross-domain opens new window
+      if (target === "_blank") {
         e.preventDefault();
+        e.stopImmediatePropagation();
+
+        if (isSameDomain(absoluteUrl)) {
+          window.location.href = absoluteUrl;
+        } else {
+          const newWindow = originalWindowOpen.call(
+            window,
+            absoluteUrl,
+            "_blank",
+            "width=1200,height=800,scrollbars=yes,resizable=yes",
+          );
+          if (!newWindow) handleExternalLink(absoluteUrl);
+        }
         return;
       }
 
-      if (target === '_new') {
+      if (target === "_new") {
         e.preventDefault();
         handleExternalLink(absoluteUrl);
         return;
       }
 
       // Process download links for Rust to handle.
-      if (isDownloadRequired(absoluteUrl, anchorElement, e) && !isSpecialDownload(absoluteUrl)) {
+      if (
+        isDownloadRequired(absoluteUrl, anchorElement, e) &&
+        !isSpecialDownload(absoluteUrl)
+      ) {
         e.preventDefault();
-        invoke('download_file', { params: { url: absoluteUrl, filename } });
+        e.stopImmediatePropagation();
+        invoke("download_file", { params: { url: absoluteUrl, filename } });
+        return;
+      }
+
+      // Handle regular links: same domain allows normal navigation, cross-domain opens new window
+      if (!target || target === "_self") {
+        if (!isSameDomain(absoluteUrl)) {
+          e.preventDefault();
+          e.stopImmediatePropagation();
+          const newWindow = originalWindowOpen.call(
+            window,
+            absoluteUrl,
+            "_blank",
+            "width=1200,height=800,scrollbars=yes,resizable=yes",
+          );
+          if (!newWindow) handleExternalLink(absoluteUrl);
+        }
       }
     }
   };
 
   // Prevent some special websites from executing in advance, before the click event is triggered.
-  document.addEventListener('click', detectAnchorElementClick, true);
+  document.addEventListener("click", detectAnchorElementClick, true);
 
   collectUrlToBlobs();
   detectDownloadByCreateAnchor();
@@ -225,14 +285,35 @@ document.addEventListener('DOMContentLoaded', () => {
   const originalWindowOpen = window.open;
   window.open = function (url, name, specs) {
     // Apple login and google login
-    if (name === 'AppleAuthentication') {
+    if (name === "AppleAuthentication") {
       //do nothing
-    } else if (specs && (specs.includes('height=') || specs.includes('width='))) {
+    } else if (
+      specs &&
+      (specs.includes("height=") || specs.includes("width="))
+    ) {
       location.href = url;
     } else {
       const baseUrl = window.location.origin + window.location.pathname;
       const hrefUrl = new URL(url, baseUrl);
-      handleExternalLink(hrefUrl.href);
+      const absoluteUrl = hrefUrl.href;
+
+      // Apply same domain logic as anchor links
+      if (isSameDomain(absoluteUrl)) {
+        // Same domain: navigate in app or open new window based on specs
+        if (name === "_blank" || !name) {
+          return originalWindowOpen.call(
+            window,
+            absoluteUrl,
+            "_blank",
+            "width=1200,height=800,scrollbars=yes,resizable=yes",
+          );
+        } else {
+          location.href = absoluteUrl;
+        }
+      } else {
+        // Cross domain: open in external browser
+        handleExternalLink(absoluteUrl);
+      }
     }
     // Call the original window.open function to maintain its normal functionality.
     return originalWindowOpen.call(window, url, name, specs);
@@ -247,27 +328,27 @@ document.addEventListener('DOMContentLoaded', () => {
 
   // Fix Chinese input method "Enter" on Safari
   document.addEventListener(
-    'keydown',
-    e => {
+    "keydown",
+    (e) => {
       if (e.keyCode === 229) e.stopPropagation();
     },
     true,
   );
 });
 
-document.addEventListener('DOMContentLoaded', function () {
-  let permVal = 'granted';
+document.addEventListener("DOMContentLoaded", function () {
+  let permVal = "granted";
   window.Notification = function (title, options) {
     const { invoke } = window.__TAURI__.core;
-    const body = options?.body || '';
-    let icon = options?.icon || '';
+    const body = options?.body || "";
+    let icon = options?.icon || "";
 
     // If the icon is a relative path, convert to full path using URI
-    if (icon.startsWith('/')) {
+    if (icon.startsWith("/")) {
       icon = window.location.origin + icon;
     }
 
-    invoke('send_notification', {
+    invoke("send_notification", {
       params: {
         title,
         body,
@@ -276,19 +357,19 @@ document.addEventListener('DOMContentLoaded', function () {
     });
   };
 
-  window.Notification.requestPermission = async () => 'granted';
+  window.Notification.requestPermission = async () => "granted";
 
-  Object.defineProperty(window.Notification, 'permission', {
+  Object.defineProperty(window.Notification, "permission", {
     enumerable: true,
     get: () => permVal,
-    set: v => {
+    set: (v) => {
       permVal = v;
     },
   });
 });
 
 function setDefaultZoom() {
-  const htmlZoom = window.localStorage.getItem('htmlZoom');
+  const htmlZoom = window.localStorage.getItem("htmlZoom");
   if (htmlZoom) {
     setZoom(htmlZoom);
   }
@@ -296,5 +377,5 @@ function setDefaultZoom() {
 
 function getFilenameFromUrl(url) {
   const urlPath = new URL(url).pathname;
-  return urlPath.substring(urlPath.lastIndexOf('/') + 1);
+  return urlPath.substring(urlPath.lastIndexOf("/") + 1);
 }