pake-cli 2.0.5 → 2.0.6

package/README.md

@@ -248,25 +248,25 @@ Pake's development can not be without these Hackers. They contributed a lot of c
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/m1911star">
-            <img src="https://avatars.githubusercontent.com/u/4948120?v=4" width="90;" alt="m1911star"/>
+        <a href="https://github.com/AielloChan">
+            <img src="https://avatars.githubusercontent.com/u/7900765?v=4" width="90;" alt="AielloChan"/>
             <br />
-            <sub><b>Horus</b></sub>
+            <sub><b>Aiello</b></sub>
         </a>
     </td></tr>
 <tr>
     <td align="center">
-        <a href="https://github.com/Pake-Actions">
-            <img src="https://avatars.githubusercontent.com/u/126550811?v=4" width="90;" alt="Pake-Actions"/>
+        <a href="https://github.com/m1911star">
+            <img src="https://avatars.githubusercontent.com/u/4948120?v=4" width="90;" alt="m1911star"/>
             <br />
-            <sub><b>Pake Actions</b></sub>
+            <sub><b>Horus</b></sub>
         </a>
     </td>
     <td align="center">
-        <a href="https://github.com/AielloChan">
-            <img src="https://avatars.githubusercontent.com/u/7900765?v=4" width="90;" alt="AielloChan"/>
+        <a href="https://github.com/Pake-Actions">
+            <img src="https://avatars.githubusercontent.com/u/126550811?v=4" width="90;" alt="Pake-Actions"/>
             <br />
-            <sub><b>Aiello</b></sub>
+            <sub><b>Pake Actions</b></sub>
         </a>
     </td>
     <td align="center">
@@ -333,6 +333,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Hyzhao</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/lakca">
+            <img src="https://avatars.githubusercontent.com/u/16255922?v=4" width="90;" alt="lakca"/>
+            <br />
+            <sub><b>Null</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/liusishan">
             <img src="https://avatars.githubusercontent.com/u/33129823?v=4" width="90;" alt="liusishan"/>

package/dist/cli.js

@@ -34,8 +34,6 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
-
 
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -1697,9 +1695,9 @@ function mergeTauriConfig(url, options, tauriConf) {
                 const cli_path = path.join(new_dir, "cli.js");
                 const cli_path_target = path.join(old_dir, "cli.js");
                 const about_pake_path = path.join(new_dir, "about_pake.html");
-                const about_patk_path_target = path.join(old_dir, "about_pake.html");
+                const about_pake_path_target = path.join(old_dir, "about_pake.html");
                 fs$1.copyFile(cli_path, cli_path_target);
-                fs$1.copyFile(about_pake_path, about_patk_path_target);
+                fs$1.copyFile(about_pake_path, about_pake_path_target);
             }
             tauriConf.pake.windows[0].url = file_name;
             tauriConf.pake.windows[0].url_type = "local";
@@ -2525,7 +2523,7 @@ class BuilderFactory {
 }
 
 var name = "pake-cli";
-var version = "2.0.5";
+var version = "2.0.6";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。";
 var engines = {
 	node: ">=16.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 很简单的用 Rust 打包网页生成很小的桌面 App。",
   "engines": {
     "node": ">=16.0.0"

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/event.js

@@ -1,204 +1,224 @@
 const shortcuts = {
-  ArrowUp: () => scrollTo(0, 0),
-  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
-  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,
+        });
     });
-  });
 }
 
-document.addEventListener('DOMContentLoaded', () => {
-  const topDom = document.createElement('div');
-  topDom.id = 'pack-top-dom';
-  document.body.appendChild(topDom);
-  const domEl = document.getElementById('pack-top-dom');
-
-  domEl.addEventListener('mousedown', (e) => {
-    e.preventDefault();
-    if (e.buttons === 1 && e.detail !== 2) {
-      invoke('drag_window');
-    }
-  });
+// 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);
+}
 
-  domEl.addEventListener('touchstart', () => {
-    invoke('drag_window');
-  });
+// No need to go to the download link.
+function externalDownLoadLink() {
+    return ['quickref.me'].indexOf(location.hostname) > -1;
+}
 
-  domEl.addEventListener('dblclick', () => {
-    invoke('fullscreen');
-  });
+document.addEventListener('DOMContentLoaded', () => {
+    const topDom = document.createElement('div');
+    topDom.id = 'pack-top-dom';
+    document.body.appendChild(topDom);
+    const domEl = document.getElementById('pack-top-dom');
 
-  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);
-    }
-  });
-
-  document.addEventListener('click', (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')
-      ) {
+    domEl.addEventListener('mousedown', (e) => {
         e.preventDefault();
-        invoke('open_browser', { url: absoluteUrl });
-        return;
-      }
-
-      // Process download links for Rust to handle.
-      if (
-        /\.[a-zA-Z0-9]+$/i.test(removeUrlParameters(absoluteUrl)) &&
-        !externalDownLoadLink()
-      ) {
-        e.preventDefault();
-        invoke('download_file', {
-          params: {
-            url: absoluteUrl,
-            filename: getFilenameFromUrl(absoluteUrl),
-          },
-        });
-      }
-    }
-  });
-
-  // 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 });
+        if (e.buttons === 1 && e.detail !== 2) {
+            invoke('drag_window');
+        }
+    });
+
+    domEl.addEventListener('touchstart', () => {
+        invoke('drag_window');
+    });
+
+    domEl.addEventListener('dblclick', () => {
+        invoke('fullscreen');
+    });
+
+    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);
+        }
+    });
+
+    // 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,
+                    },
+                });
+            }
+        }
+    });
+
+    // 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);
+    };
+
+    // Set the default zoom, There are problems with Loop without using try-catch.
+    try {
+        setDefaultZoom();
+    } catch (e) {
+        console.log(e);
     }
-    // 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();
 }
 
-// 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');
-  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();
+        }
     }
-  }
 }
 

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

@@ -57,6 +57,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 +89,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 +153,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;
     }