pake-cli 2.2.6 → 2.3.1

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

@@ -58,6 +58,10 @@ function externalTargetLink() {
   return ['zbook.lol'].indexOf(location.hostname) > -1;
 }
 
+function externalSelfLink() {
+  return ['twitter.com', 'www.zhihu.com'].indexOf(location.hostname) > -1;
+}
+
 document.addEventListener('DOMContentLoaded', () => {
   const tauri = window.__TAURI__;
   const appWindow = tauri.window.appWindow;
@@ -68,6 +72,10 @@ document.addEventListener('DOMContentLoaded', () => {
   document.body.appendChild(topDom);
   const domEl = document.getElementById('pack-top-dom');
 
+  domEl.addEventListener('touchstart', () => {
+    appWindow.startDragging().then();
+  });
+
   domEl.addEventListener('mousedown', (e) => {
     e.preventDefault();
     if (e.buttons === 1 && e.detail !== 2) {
@@ -75,10 +83,6 @@ document.addEventListener('DOMContentLoaded', () => {
     }
   });
 
-  domEl.addEventListener('touchstart', () => {
-    appWindow.startDragging().then();
-  });
-
   domEl.addEventListener('dblclick', () => {
     appWindow.isFullscreen().then((fullscreen) => {
       appWindow.setFullscreen(!fullscreen).then();
@@ -94,7 +98,91 @@ document.addEventListener('DOMContentLoaded', () => {
     }
   });
 
-  const isExternalLink = (url, host) => window.location.host !== host;
+  // Collect blob urls to blob by overriding window.URL.createObjectURL
+  function collectUrlToBlobs() {
+    const backupCreateObjectURL = window.URL.createObjectURL;
+    window.blobToUrlCaches = new Map();
+    window.URL.createObjectURL = (blob) => {
+      const url = backupCreateObjectURL.call(window.URL, blob);
+      window.blobToUrlCaches.set(url, blob);
+      return url;
+    };
+  }
+
+  function convertBlobUrlToBinary(blobUrl) {
+    return new Promise((resolve) => {
+      const blob = window.blobToUrlCaches.get(blobUrl);
+      const reader = new FileReader();
+
+      reader.readAsArrayBuffer(blob);
+      reader.onload = () => {
+        resolve(Array.from(new Uint8Array(reader.result)));
+      };
+    });
+  }
+
+  function downloadFromDataUri(dataURI, filename) {
+    const byteString = atob(dataURI.split(',')[1]);
+    // write the bytes of the string to an ArrayBuffer
+    const bufferArray = new ArrayBuffer(byteString.length);
+
+    // create a view into the buffer
+    const binary = new Uint8Array(bufferArray);
+
+    // set the bytes of the buffer to the correct values
+    for (let i = 0; i < byteString.length; i++) {
+      binary[i] = byteString.charCodeAt(i);
+    }
+
+    // write the ArrayBuffer to a binary, and you're done
+    invoke('download_file_by_binary', {
+      params: {
+        filename,
+        binary: Array.from(binary),
+      },
+    });
+  }
+
+  function downloadFromBlobUrl(blobUrl, filename) {
+    convertBlobUrlToBinary(blobUrl).then((binary) => {
+      invoke('download_file_by_binary', {
+        params: {
+          filename,
+          binary,
+        },
+      });
+    });
+  }
+
+// detect blob download by createElement("a")
+  function detectDownloadByCreateAnchor() {
+    const createEle = document.createElement;
+    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) => {
+        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:')) {
+          downloadFromDataUri(url, filename);
+        } else if (!externalSelfLink()) {
+          handleExternalLink(e, url);
+        }
+      }, true);
+
+      return anchorEle;
+    };
+  }
+
+  const isExternalLink = (link) => window.location.host !== link.host;
+  // process special download protocol['data:','blob:']
+  const isSpecialDownload = (url) => ['blob', 'data'].some(protocol => url.startsWith(protocol));
+
   const isDownloadRequired = (url, anchorElement, e) =>
     anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(url);
 
@@ -111,18 +199,19 @@ document.addEventListener('DOMContentLoaded', () => {
   const detectAnchorElementClick = (e) => {
     const anchorElement = e.target.closest('a');
     if (anchorElement && anchorElement.href) {
+      anchorElement.target = '_self';
       const hrefUrl = new URL(anchorElement.href);
       const absoluteUrl = hrefUrl.href;
       let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
 
       // Handling external link redirection.
-      if (isExternalLink(absoluteUrl, hrefUrl.host) && (['_blank', '_new'].includes(anchorElement.target) || externalTargetLink())) {
+      if (isExternalLink(absoluteUrl) && (['_blank', '_new'].includes(anchorElement.target) || externalTargetLink())) {
         handleExternalLink(e, absoluteUrl);
         return;
       }
 
       // Process download links for Rust to handle.
-      if (isDownloadRequired(absoluteUrl, anchorElement, e) && !externalDownLoadLink()) {
+      if (isDownloadRequired(absoluteUrl, anchorElement, e) && !externalDownLoadLink() && !isSpecialDownload(absoluteUrl)) {
         handleDownloadLink(e, absoluteUrl, filename);
       }
     }
@@ -176,73 +265,3 @@ function getFilenameFromUrl(url) {
   const urlPath = new URL(url).pathname;
   return urlPath.substring(urlPath.lastIndexOf('/') + 1);
 }
-
-// Collect blob urls to blob by overriding window.URL.createObjectURL
-function collectUrlToBlobs() {
-  const backupCreateObjectURL = window.URL.createObjectURL;
-  window.blobToUrlCaches = new Map();
-  window.URL.createObjectURL = (blob) => {
-    const url = backupCreateObjectURL.call(window.URL, blob);
-    window.blobToUrlCaches.set(url, blob);
-    return url;
-  };
-}
-
-function convertBlobUrlToBinary(blobUrl) {
-  return new Promise((resolve) => {
-    const blob = window.blobToUrlCaches.get(blobUrl);
-    const reader = new FileReader();
-
-    reader.readAsArrayBuffer(blob);
-    reader.onload = () => {
-      resolve(reader.result);
-    };
-  });
-}
-
-async function downloadFromBlobUrl(blobUrl, filename) {
-  try {
-    const tauri = window.__TAURI__;
-    const binary = await convertBlobUrlToBinary(blobUrl);
-
-    await tauri.fs.writeBinaryFile(filename, binary, {
-      dir: tauri.fs.BaseDirectory.Download,
-    });
-
-    const lang = getSystemLanguage();
-    window.pakeToast(lang === 'en' ? 'Download successful, saved to download directory~' : '下载成功，已保存到下载目录~');
-  } catch (error) {
-    console.error('Error downloading from Blob URL:', error);
-  }
-}
-
-
-// detect blob download by createElement("a")
-function detectDownloadByCreateAnchor() {
-  const originalCreateElement = document.createElement;
-
-  document.createElement = function(el, ...args) {
-    const element = originalCreateElement.call(this, el, ...args);
-
-    if (el === 'a') {
-      element.addEventListener('click', (event) => {
-        const url = element.href;
-        if (window.blobToUrlCaches.has(url)) {
-          // Prevent default 'click' event if a blob URL is detected
-          event.preventDefault();
-          const filename = element.download || getFilenameFromUrl(url);
-          downloadFromBlobUrl(url, filename);
-        }
-      });
-    }
-
-    return element;
-  };
-}
-
-
-// Determine the language of the current system.
-function getSystemLanguage() {
-  const lang = navigator.language.substr(0, 2);
-  return lang === 'ch' ? 'ch' : 'en';
-}

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

@@ -180,6 +180,11 @@ window.addEventListener('DOMContentLoaded', _event => {
       visibility: hidden !important;
     }
 
+    #__next > div.overflow-hidden.w-full.h-full .absolute.bottom-0.left-0.w-full > div.text-center.text-xs {
+      visibility: hidden !important;
+      height: 0px !important;
+    }
+
     #react-root [data-testid="primaryColumn"] > div > div {
       position: relative !important;
     }

package/src-tauri/src/main.rs

@@ -7,7 +7,7 @@ mod app;
 mod util;
 
 use app::{invoke, menu, window};
-use invoke::download_file;
+use invoke::{download_file, download_file_by_binary};
 use menu::{get_menu, menu_event_handle};
 use tauri_plugin_window_state::Builder as windowStatePlugin;
 use util::{get_data_dir, get_pake_config};
@@ -41,7 +41,10 @@ pub fn run_app() {
 
     tauri_app
         .plugin(windowStatePlugin::default().build())
-        .invoke_handler(tauri::generate_handler![download_file])
+        .invoke_handler(tauri::generate_handler![
+            download_file,
+            download_file_by_binary
+        ])
         .setup(|app| {
             let _window = get_window(app, pake_config, data_dir);
             // Prevent initial shaking

package/src-tauri/src/util.rs

@@ -4,9 +4,16 @@ use std::path::PathBuf;
 use tauri::{api, Config, Window};
 
 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");
 

package/src-tauri/tauri.conf.json

@@ -18,7 +18,7 @@
       "active": false
     },
     "systemTray": {
-      "iconPath": "png/weread_512.png",
+      "iconPath": "png/icon_512.png",
       "iconAsTemplate": true
     },
     "allowlist": {

package/dist/about_pake.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Document</title>
-  </head>
-  <body>
-    <h5>Welcome from Pake!</h5>
-    <p>version: 1.0.9</p>
-    <a href="https://github.com/tw93/Pake">Project link</a><br>
-    <a href="https://github.com/tw93/Pake/discussions">Discussions</a><br>
-    <a href="https://github.com/tw93/Pake/issues" >Issues</a><br>
-    <p>LICENSE: MIT</p>
-  </body>
-</html>