pake-cli 2.0.5 → 2.0.7-beta

package/src-tauri/Cargo.toml

@@ -12,12 +12,12 @@ rust-version = "1.63.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.2.1", features = [] }
+tauri-build = { version = "1.4.0", features = [] }
 
 [dependencies]
-serde_json = "1.0.89"
-serde = { version = "1.0.150", features = ["derive"] }
-tauri = { version = "1.2.4", features = ["api-all", "system-tray"] }
+serde_json = "1.0.96"
+serde = { version = "1.0.163", features = ["derive"] }
+tauri = { version = "1.4.0", features = ["api-all", "system-tray"] }
 download_rs = { version = "0.2.0", features = ["sync_download"] }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
 

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

@@ -8,26 +8,6 @@ pub struct DownloadFileParams {
     filename: String,
 }
 
-#[command]
-pub fn drag_window(app: AppHandle) {
-    app.get_window("pake").unwrap().start_dragging().unwrap();
-}
-
-#[command]
-pub fn fullscreen(app: AppHandle) {
-    let win = app.get_window("pake").unwrap();
-    if win.is_fullscreen().unwrap() {
-        win.set_fullscreen(false).unwrap();
-    } else {
-        win.set_fullscreen(true).unwrap();
-    }
-}
-
-#[command]
-pub fn open_browser(app: AppHandle, url: String) {
-    api::shell::open(&app.shell_scope(), url, None).unwrap();
-}
-
 #[command]
 pub async fn download_file(app: AppHandle, params: DownloadFileParams) -> Result<(), String> {
     let window: Window = app.get_window("pake").unwrap();

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

@@ -26,6 +26,7 @@ pub fn get_window(app: &mut App, config: PakeConfig, _data_dir: PathBuf) -> Wind
         .resizable(window_config.resizable)
         .fullscreen(window_config.fullscreen)
         .inner_size(window_config.width, window_config.height)
+        .disable_file_drop_handler() //Very annoying, otherwise dragging files to the window will not work.
         .initialization_script(include_str!("../inject/style.js"))
         .initialization_script(include_str!("../inject/event.js"))
         .initialization_script(include_str!("../inject/component.js"));

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

@@ -75,6 +75,12 @@ document.addEventListener('DOMContentLoaded', () => {
     background: #fff;
     color: #11182B;
   }
+
+  #pakeUrlInput {
+    min-width: 320px;
+    text-align: left;
+    min-height: 30px;
+  }
   `;
 
   const modalDiv = document.createElement('div');

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

@@ -1,8 +1,10 @@
 const shortcuts = {
   ArrowUp: () => scrollTo(0, 0),
   ArrowDown: () => scrollTo(0, document.body.scrollHeight),
-  ArrowLeft: () => window.history.back(),
-  ArrowRight: () => window.history.forward(),
+  // Don't use command + ArrowLeft or command + ArrowRight
+  // When editing text in page, it causes unintended page navigation.
+  // ArrowLeft: () => window.history.back(),
+  // ArrowRight: () => window.history.forward(),
   '[': () => window.history.back(),
   ']': () => window.history.forward(),
   r: () => window.location.reload(),
@@ -40,6 +42,7 @@ function handleShortcut(event) {
 
 //这里参考 ChatGPT 的代码
 const uid = () => window.crypto.getRandomValues(new Uint32Array(1))[0];
+
 function transformCallback(callback = () => {}, once = false) {
   const identifier = uid();
   const prop = `_${identifier}`;
@@ -55,6 +58,7 @@ function transformCallback(callback = () => {}, once = false) {
   });
   return identifier;
 }
+
 async function invoke(cmd, args) {
   return new Promise((resolve, reject) => {
     if (!window.__TAURI_POST_MESSAGE__)
@@ -76,7 +80,32 @@ async function invoke(cmd, args) {
   });
 }
 
+// Judgment of file download.
+function isDownloadLink(url) {
+    const fileExtensions = [
+        '3gp', '7z', 'ai', 'apk', 'avi', 'bmp', 'csv', 'dmg', 'doc', 'docx', 'fla', 'flv', 'gif', 'gz', 'gzip',
+        'ico', 'iso', 'indd', 'jar', 'jpeg', 'jpg', 'm3u8', 'mov', 'mp3', 'mp4', 'mpa', 'mpg',
+        'mpeg', 'msi', 'odt', 'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw', 'rss', 'svg',
+        'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp', 'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip'
+    ];
+    const downloadLinkPattern = new RegExp(`\\.(${fileExtensions.join('|')})$`, 'i');
+    return downloadLinkPattern.test(url);
+}
+
+// No need to go to the download link.
+function externalDownLoadLink() {
+  return ['quickref.me'].indexOf(location.hostname) > -1;
+}
+
+// Directly jumping out without hostname address.
+function externalTargetLink() {
+  return ['zbook.lol'].indexOf(location.hostname) > -1;
+}
+
 document.addEventListener('DOMContentLoaded', () => {
+  const tauri = window.__TAURI__;
+  const appWindow = tauri.window.appWindow;
+
   const topDom = document.createElement('div');
   topDom.id = 'pack-top-dom';
   document.body.appendChild(topDom);
@@ -85,16 +114,18 @@ document.addEventListener('DOMContentLoaded', () => {
   domEl.addEventListener('mousedown', (e) => {
     e.preventDefault();
     if (e.buttons === 1 && e.detail !== 2) {
-      invoke('drag_window');
+      appWindow.startDragging().then();
     }
   });
 
   domEl.addEventListener('touchstart', () => {
-    invoke('drag_window');
+    appWindow.startDragging().then();
   });
 
   domEl.addEventListener('dblclick', () => {
-    invoke('fullscreen');
+    appWindow.isFullscreen().then((fullscreen) => {
+      appWindow.setFullscreen(!fullscreen).then();
+    });
   });
 
   document.addEventListener('keyup', (event) => {
@@ -106,9 +137,8 @@ document.addEventListener('DOMContentLoaded', () => {
     }
   });
 
-  document.addEventListener('click', (e) => {
+  const detectAnchorElementClick = (e) => {
     const anchorElement = e.target.closest('a');
-
     if (anchorElement && anchorElement.href) {
       const target = anchorElement.target;
       anchorElement.target = '_self';
@@ -118,28 +148,39 @@ document.addEventListener('DOMContentLoaded', () => {
       // Handling external link redirection.
       if (
         window.location.host !== hrefUrl.host &&
-        (target === '_blank' || target === '_new')
+        (target === '_blank' || target === '_new' || externalTargetLink())
       ) {
-        e.preventDefault();
-        invoke('open_browser', { url: absoluteUrl });
+        e.preventDefault && e.preventDefault();
+        tauri.shell.open(absoluteUrl);
         return;
       }
 
+      let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
       // Process download links for Rust to handle.
+      // If the download attribute is set, the download attribute is used as the file name.
       if (
-        /\.[a-zA-Z0-9]+$/i.test(removeUrlParameters(absoluteUrl)) &&
+        (anchorElement.download ||
+          e.metaKey ||
+          e.ctrlKey ||
+          isDownloadLink(absoluteUrl)) &&
         !externalDownLoadLink()
       ) {
         e.preventDefault();
         invoke('download_file', {
           params: {
             url: absoluteUrl,
-            filename: getFilenameFromUrl(absoluteUrl),
+            filename,
           },
         });
       }
     }
-  });
+  };
+
+  // Prevent some special websites from executing in advance, before the click event is triggered.
+  document.addEventListener('click', detectAnchorElementClick, true);
+
+  collectUrlToBlobs();
+  detectDownloadByCreateAnchor();
 
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
@@ -152,7 +193,7 @@ document.addEventListener('DOMContentLoaded', () => {
     } else {
       const baseUrl = window.location.origin + window.location.pathname;
       const hrefUrl = new URL(url, baseUrl);
-      invoke('open_browser', { url: hrefUrl.href });
+      tauri.shell.open(hrefUrl.href);
     }
     // Call the original window.open function to maintain its normal functionality.
     return originalWindowOpen.call(window, url, name, specs);
@@ -185,11 +226,6 @@ function removeUrlParameters(url) {
   return parsedUrl.toString();
 }
 
-// No need to go to the download link.
-function externalDownLoadLink() {
-  return ['quickref.me'].indexOf(location.hostname) > -1;
-}
-
 // Toggle video playback when the window is hidden.
 function toggleVideoPlayback(pause) {
   const videos = document.getElementsByTagName('video');
@@ -202,3 +238,53 @@ function toggleVideoPlayback(pause) {
   }
 }
 
+// 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);
+    };
+  });
+}
+
+// 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);
+    const anchorClick = anchorEle.click;
+
+    Object.defineProperties(anchorEle, {
+      click: {
+        get: () => {
+          if (anchorEle.href && anchorEle.href.includes('blob:')) {
+            const url = anchorEle.href;
+            convertBlobUrlToBinary(url).then((binary) => {
+              tauri.fs.writeBinaryFile(anchorEle.download || getFilenameFromUrl(url), binary, {
+                dir: tauri.fs.BaseDirectory.Download,
+              });
+            });
+          }
+          return anchorClick.bind(anchorEle);
+        }
+      }
+    })
+
+    return anchorEle;
+  }
+}

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

@@ -41,6 +41,14 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       display: none !important;
     }
 
+    #__next header.HeaderBar_header__jn5ju{
+      padding-top: 16px;
+    }
+
+    #__next .ChatPageSidebar_menuFooter__E1KTY,#__next > div.PageWithSidebarLayout_centeringDiv___L9br > div > aside > div > menu > section:nth-child(6) {
+      display: none;
+    }
+
     #page .main_header, .cb-layout-basic--navbar,
     #app .splitpanes.splitpanes--horizontal.no-splitter header,
     .fui-FluentProvider .fui-Button[data-testid="HomeButton"],
@@ -48,6 +56,10 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       padding-top: 20px;
     }
 
+    #__next > div.overflow-hidden.w-full.h-full  .min-h-\\[20px\\].items-start.gap-4.whitespace-pre-wrap.break-words {
+      word-break: break-all;
+    }
+
     #__next .PageWithSidebarLayout_mainSection__i1yOg {
       width: 100%;
       max-width: 1000px;
@@ -57,6 +69,11 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       min-width: 260px;
     }
 
+    #__next > div.overflow-hidden.w-full.h-full.relative.flex.z-0 > div.relative.flex.h-full.max-w-full.flex-1.overflow-hidden > div > main > div.absolute.left-2.top-2.z-10.hidden.md\\:inline-block{
+      margin-top:20px;
+      margin-left: 10px;
+    }
+
     .chakra-ui-light #app .chakra-heading,
     .chakra-ui-dark #app .chakra-heading,
     .chakra-ui-light #app .chakra-stack,
@@ -84,6 +101,19 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       width: 100%;
     }
 
+    #tabs-sidebar--tabpanel-0 > div.tw-flex.tw-items-center.tw-mb-\\[12px\\].tw-mt-\\[14px\\].tw-px-4 {
+      padding-top: 15px;
+    }
+
+    #tabs-sidebar--tabpanel-1 > div > div.tw-p-\\[16px\\].tw-flex.tw-flex-col.tw-gap-1\\.5{
+      padding-top: 30px;
+    }
+
+    #tabs-sidebar--tabpanel-2 > div > h2 {
+      padding-top: 20px;
+      height: 70px;
+    }
+
     .lark > .dashboard-sidebar, .lark > .dashboard-sidebar > .sidebar-user-info , .lark > .dashboard-sidebar .index-module_wrapper_F-Wbq{
       padding-top:15px;
     }
@@ -135,10 +165,12 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       margin-top:24px;
     }
 
+
     #react-root [data-testid="placementTracking"] article,
     #react-root a[href*="quick_promote_web"],
     #react-root [data-testid="AppTabBar_Explore_Link"],
     #react-root a[href*="/lists"][role="link"][aria-label],
+    #react-root a[href*="/i/communitynotes"][role="link"][aria-label],
     #react-root a[href*="/i/verified-orgs-signup"][role="link"][aria-label] {
       display: none !important;
     }
@@ -284,7 +316,8 @@ window.addEventListener('DOMContentLoaded', (_event) => {
     }
 
     @media (min-width:1024px){
-      #__next .text-base.lg\\:max-w-xl, #__next form.stretch.lg\\:max-w-2xl {
+      #__next .text-base.lg\\:max-w-xl, #__next form.stretch.lg\\:max-w-2xl,
+      #__next > .w-full.h-full .lg\\:max-w-\\[38rem\\] {
         max-width: 44rem;
       }
     }
@@ -299,6 +332,20 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       #__next .overflow-hidden.w-full .max-w-full>.sticky.top-0 {
         padding-top: 20px;
       }
+
+      #__next .overflow-hidden.w-full main.relative.h-full.w-full.flex-1{
+        padding-bottom: 82px;
+      }
+
+      #__next > div.overflow-hidden.w-full.h-full  main.relative.h-full.w-full.flex-1 > .flex-1.overflow-hidden .h-32.md\\:h-48.flex-shrink-0{
+        height: 0px;
+      }
+    }
+
+    @media (max-width:565px){
+      #__next .overflow-hidden.w-full main.relative.h-full.w-full.flex-1{
+        padding-bottom: 98px;
+      }
     }
 
     #__next .prose ol li p {

package/src-tauri/src/main.rs

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

package/src-tauri/tauri.conf.json

@@ -5,7 +5,16 @@
   },
   "tauri": {
     "security": {
-      "csp": null
+      "csp": null,
+      "dangerousRemoteDomainIpcAccess": [
+        {
+          "domain": "weread.qq.com",
+          "windows": [
+            "pake"
+          ],
+          "enableTauriAPI": true
+        }
+      ]
     },
     "updater": {
       "active": false
@@ -15,7 +24,13 @@
       "iconAsTemplate": true
     },
     "allowlist": {
-      "all": true
+      "all": true,
+      "fs": {
+        "all": true,
+        "scope": [
+          "$DOWNLOAD/*"
+        ]
+      }
     }
   },
   "build": {