pake-cli 2.0.6 → 2.0.7-beta1

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/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,84 +1,83 @@
 const shortcuts = {
-    ArrowUp: () => scrollTo(0, 0),
-    ArrowDown: () => scrollTo(0, document.body.scrollHeight),
-    // 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(),
-    '-': () => zoomOut(),
-    '=': () => zoomIn(),
-    '+': () => zoomIn(),
-    0: () => setZoom('100%'),
+  ArrowUp: () => scrollTo(0, 0),
+  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
+  // 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(),
+  '-': () => zoomOut(),
+  '=': () => zoomIn(),
+  '+': () => zoomIn(),
+  0: () => setZoom('100%'),
 };
 
 function setZoom(zoom) {
-    const html = document.getElementsByTagName('html')[0];
-    html.style.zoom = zoom;
-    window.localStorage.setItem('htmlZoom', zoom);
+  const html = document.getElementsByTagName('html')[0];
+  html.style.zoom = zoom;
+  window.localStorage.setItem('htmlZoom', zoom);
 }
 
 function zoomCommon(zoomChange) {
-    const currentZoom = window.localStorage.getItem('htmlZoom') || '100%';
-    setZoom(zoomChange(currentZoom));
+  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) {
-    if (shortcuts[event.key]) {
-        event.preventDefault();
-        shortcuts[event.key]();
-    }
+  if (shortcuts[event.key]) {
+    event.preventDefault();
+    shortcuts[event.key]();
+  }
 }
 
 //这里参考 ChatGPT 的代码
 const uid = () => window.crypto.getRandomValues(new Uint32Array(1))[0];
 
-function transformCallback(callback = () => {
-}, once = false) {
-    const identifier = uid();
-    const prop = `_${identifier}`;
-    Object.defineProperty(window, prop, {
-        value: (result) => {
-            if (once) {
-                Reflect.deleteProperty(window, prop);
-            }
-            return callback(result);
-        },
-        writable: false,
-        configurable: true,
-    });
-    return identifier;
+function transformCallback(callback = () => {}, once = false) {
+  const identifier = uid();
+  const prop = `_${identifier}`;
+  Object.defineProperty(window, prop, {
+    value: (result) => {
+      if (once) {
+        Reflect.deleteProperty(window, prop);
+      }
+      return callback(result);
+    },
+    writable: false,
+    configurable: true,
+  });
+  return identifier;
 }
 
 async function invoke(cmd, args) {
-    return new Promise((resolve, reject) => {
-        if (!window.__TAURI_POST_MESSAGE__)
-            reject('__TAURI_POST_MESSAGE__ does not exist~');
-        const callback = transformCallback((e) => {
-            resolve(e);
-            Reflect.deleteProperty(window, `_${error}`);
-        }, true);
-        const error = transformCallback((e) => {
-            reject(e);
-            Reflect.deleteProperty(window, `_${callback}`);
-        }, true);
-        window.__TAURI_POST_MESSAGE__({
-            cmd,
-            callback,
-            error,
-            ...args,
-        });
+  return new Promise((resolve, reject) => {
+    if (!window.__TAURI_POST_MESSAGE__)
+      reject('__TAURI_POST_MESSAGE__ does not exist~');
+    const callback = transformCallback((e) => {
+      resolve(e);
+      Reflect.deleteProperty(window, `_${error}`);
+    }, true);
+    const error = transformCallback((e) => {
+      reject(e);
+      Reflect.deleteProperty(window, `_${callback}`);
+    }, true);
+    window.__TAURI_POST_MESSAGE__({
+      cmd,
+      callback,
+      error,
+      ...args,
     });
+  });
 }
 
 // Judgment of file download.
@@ -95,130 +94,197 @@ function isDownloadLink(url) {
 
 // No need to go to the download link.
 function externalDownLoadLink() {
-    return ['quickref.me'].indexOf(location.hostname) > -1;
+  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 topDom = document.createElement('div');
-    topDom.id = 'pack-top-dom';
-    document.body.appendChild(topDom);
-    const domEl = document.getElementById('pack-top-dom');
+  const tauri = window.__TAURI__;
+  const appWindow = tauri.window.appWindow;
 
-    domEl.addEventListener('mousedown', (e) => {
-        e.preventDefault();
-        if (e.buttons === 1 && e.detail !== 2) {
-            invoke('drag_window');
-        }
-    });
+  const topDom = document.createElement('div');
+  topDom.id = 'pack-top-dom';
+  document.body.appendChild(topDom);
+  const domEl = document.getElementById('pack-top-dom');
 
-    domEl.addEventListener('touchstart', () => {
-        invoke('drag_window');
-    });
+  domEl.addEventListener('mousedown', (e) => {
+    e.preventDefault();
+    if (e.buttons === 1 && e.detail !== 2) {
+      appWindow.startDragging().then();
+    }
+  });
 
-    domEl.addEventListener('dblclick', () => {
-        invoke('fullscreen');
-    });
+  domEl.addEventListener('touchstart', () => {
+    appWindow.startDragging().then();
+  });
 
-    document.addEventListener('keyup', (event) => {
-        if (/windows|linux/i.test(navigator.userAgent) && event.ctrlKey) {
-            handleShortcut(event);
-        }
-        if (/macintosh|mac os x/i.test(navigator.userAgent) && event.metaKey) {
-            handleShortcut(event);
-        }
+  domEl.addEventListener('dblclick', () => {
+    appWindow.isFullscreen().then((fullscreen) => {
+      appWindow.setFullscreen(!fullscreen).then();
     });
+  });
 
-    // Prevent some special websites from executing in advance, before the click event is triggered.
-    document.addEventListener('mousedown', (e) => {
-        const anchorElement = e.target.closest('a');
-
-        if (anchorElement && anchorElement.href) {
-            const target = anchorElement.target;
-            anchorElement.target = '_self';
-            const hrefUrl = new URL(anchorElement.href);
-            const absoluteUrl = hrefUrl.href;
-
-            // Handling external link redirection.
-            if (
-                window.location.host !== hrefUrl.host &&
-                (target === '_blank' || target === '_new')
-            ) {
-                e.preventDefault();
-                invoke('open_browser', {url: absoluteUrl});
-                return;
-            }
-
-            let filename = anchorElement.download ? 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 ((anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(absoluteUrl))
-                && !externalDownLoadLink()
-            ) {
-                e.preventDefault();
-                invoke('download_file', {
-                    params: {
-                        url: absoluteUrl,
-                        filename,
-                    },
-                });
-            }
-        }
-    });
+  document.addEventListener('keyup', (event) => {
+    if (/windows|linux/i.test(navigator.userAgent) && event.ctrlKey) {
+      handleShortcut(event);
+    }
+    if (/macintosh|mac os x/i.test(navigator.userAgent) && event.metaKey) {
+      handleShortcut(event);
+    }
+  });
 
-    // Rewrite the window.open function.
-    const originalWindowOpen = window.open;
-    window.open = function (url, name, specs) {
-        // Apple login and google login
-        if (name === 'AppleAuthentication') {
-            //do nothing
-        } else if (specs.includes('height=') || specs.includes('width=')) {
-            location.href = url;
-        } else {
-            const baseUrl = window.location.origin + window.location.pathname;
-            const hrefUrl = new URL(url, baseUrl);
-            invoke('open_browser', {url: hrefUrl.href});
-        }
-        // Call the original window.open function to maintain its normal functionality.
-        return originalWindowOpen.call(window, url, name, specs);
-    };
+  const detectAnchorElementClick = (e) => {
+    const anchorElement = e.target.closest('a');
+    if (anchorElement && anchorElement.href) {
+      const target = anchorElement.target;
+      anchorElement.target = '_self';
+      const hrefUrl = new URL(anchorElement.href);
+      const absoluteUrl = hrefUrl.href;
+
+      // Handling external link redirection.
+      if (
+        window.location.host !== hrefUrl.host &&
+        (target === '_blank' || target === '_new' || externalTargetLink())
+      ) {
+        e.preventDefault && e.preventDefault();
+        tauri.shell.open(absoluteUrl);
+        return;
+      }
 
-    // Set the default zoom, There are problems with Loop without using try-catch.
-    try {
-        setDefaultZoom();
-    } catch (e) {
-        console.log(e);
+      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 (
+        (anchorElement.download ||
+          e.metaKey ||
+          e.ctrlKey ||
+          isDownloadLink(absoluteUrl)) &&
+        !externalDownLoadLink()
+      ) {
+        e.preventDefault();
+        invoke('download_file', {
+          params: {
+            url: 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;
+  window.open = function (url, name, specs) {
+    // Apple login and google login
+    if (name === 'AppleAuthentication') {
+      //do nothing
+    } else if (specs.includes('height=') || specs.includes('width=')) {
+      location.href = url;
+    } else {
+      const baseUrl = window.location.origin + window.location.pathname;
+      const hrefUrl = new URL(url, baseUrl);
+      tauri.shell.open(hrefUrl.href);
     }
+    // Call the original window.open function to maintain its normal functionality.
+    return originalWindowOpen.call(window, url, name, specs);
+  };
+
+  // Set the default zoom, There are problems with Loop without using try-catch.
+  try {
+    setDefaultZoom();
+  } catch (e) {
+    console.log(e);
+  }
 });
 
 function setDefaultZoom() {
-    const htmlZoom = window.localStorage.getItem('htmlZoom');
-    if (htmlZoom) {
-        setZoom(htmlZoom);
-    }
+  const htmlZoom = window.localStorage.getItem('htmlZoom');
+  if (htmlZoom) {
+    setZoom(htmlZoom);
+  }
 }
 
 function getFilenameFromUrl(url) {
-    const urlPath = new URL(url).pathname;
-    const filename = urlPath.substring(urlPath.lastIndexOf('/') + 1);
-    return filename;
+  const urlPath = new URL(url).pathname;
+  const filename = urlPath.substring(urlPath.lastIndexOf('/') + 1);
+  return filename;
 }
 
 function removeUrlParameters(url) {
-    const parsedUrl = new URL(url);
-    parsedUrl.search = '';
-    return parsedUrl.toString();
+  const parsedUrl = new URL(url);
+  parsedUrl.search = '';
+  return parsedUrl.toString();
 }
 
-
 // Toggle video playback when the window is hidden.
 function toggleVideoPlayback(pause) {
-    const videos = document.getElementsByTagName('video');
-    for (const video of videos) {
-        if (pause) {
-            video.pause();
-        } else {
-            video.play();
-        }
+  const videos = document.getElementsByTagName('video');
+  for (const video of videos) {
+    if (pause) {
+      video.pause();
+    } else {
+      video.play();
     }
+  }
 }
 
+// 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;
@@ -60,8 +72,8 @@ window.addEventListener('DOMContentLoaded', (_event) => {
     #__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,
@@ -304,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;
       }
     }
@@ -319,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": {