✨ Code optimization

bin/builders/common.ts

@@ -1,5 +1,5 @@
 import { PakeAppOptions } from '@/types.js';
-import prompts, { override } from 'prompts';
+import prompts from 'prompts';
 import path from 'path';
 import fs from 'fs/promises';
 import fs2 from 'fs-extra';
@@ -7,7 +7,6 @@ import {TauriConfig} from 'tauri/src/types';
 
 import { npmDirectory } from '@/utils/dir.js';
 import logger from '@/options/logger.js';
-import URL from 'node:url';
 
 type DangerousRemoteDomainIpAccess = {
   domain: string;
@@ -38,7 +37,8 @@ export async function promptText(message: string, initial?: string) {
 }
 
 function setSecurityConfigWithUrl(tauriConfig: NextTauriConfig, url: string) {
-  const {hostname} = URL.parse(url);
+  const myURL = new URL(url);
+  const hostname = myURL.hostname;
   tauriConfig.tauri.security.dangerousRemoteDomainIpcAccess[0].domain = hostname;
 }
 

package.json

@@ -46,8 +46,8 @@
   "exports": "./dist/pake.js",
   "license": "MIT",
   "dependencies": {
-    "@tauri-apps/api": "^1.2.0",
+    "@tauri-apps/api": "^1.3.0",
-    "@tauri-apps/cli": "^1.2.3",
+    "@tauri-apps/cli": "^1.3.1",
     "axios": "^1.1.3",
     "chalk": "^5.1.2",
     "commander": "^9.4.1",

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();

src-tauri/src/inject/event.js

@@ -43,8 +43,7 @@ function handleShortcut(event) {
 //这里参考 ChatGPT 的代码
 const uid = () => window.crypto.getRandomValues(new Uint32Array(1))[0];
 
-function transformCallback(callback = () => {
+function transformCallback(callback = () => {}, once = false) {
-}, once = false) {
   const identifier = uid();
   const prop = `_${identifier}`;
   Object.defineProperty(window, prop, {
@@ -98,7 +97,15 @@ 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);
@@ -107,16 +114,18 @@ document.addEventListener('DOMContentLoaded', () => {
   domEl.addEventListener('mousedown', (e) => {
     e.preventDefault();
     if (e.buttons === 1 && e.detail !== 2) {
-            invoke('drag_window');
+      appWindow.startDragging();
     }
   });
 
   domEl.addEventListener('touchstart', () => {
-        invoke('drag_window');
+    appWindow.startDragging();
   });
 
   domEl.addEventListener('dblclick', () => {
-        invoke('fullscreen');
+    appWindow.isFullscreen().then((fullscreen) => {
+      appWindow.setFullscreen(!fullscreen);
+    });
   });
 
   document.addEventListener('keyup', (event) => {
@@ -130,6 +139,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
   const detectAnchorElementClick = (e) => {
     const anchorElement = e.target.closest('a');
+    console.log(">>>>>>>>>",anchorElement);
     if (anchorElement && anchorElement.href) {
       const target = anchorElement.target;
       anchorElement.target = '_self';
@@ -138,30 +148,35 @@ document.addEventListener('DOMContentLoaded', () => {
 
       // Convert blob url to binary file
       if (absoluteUrl.includes('blob:')) {
-            convertBlobUrlToBinary(absoluteUrl).then(binary => {
+        convertBlobUrlToBinary(absoluteUrl).then((binary) => {
-              const tauri = window.__TAURI__;
           tauri.fs.writeBinaryFile(anchorElement.download, binary, {
             dir: tauri.fs.BaseDirectory.Download,
           });
-            })
+        });
         return;
       }
 
       // Handling external link redirection.
       if (
         window.location.host !== hrefUrl.host &&
-              (target === '_blank' || target === '_new')
+        (target === '_blank' || target === '_new' || externalTargetLink())
       ) {
-              e.preventDefault();
+        e.preventDefault && e.preventDefault();
-              invoke('open_browser', {url: absoluteUrl});
+        tauri.shell.open(absoluteUrl);
         return;
       }
 
-          let filename = anchorElement.download ? anchorElement.download : getFilenameFromUrl(absoluteUrl)
+      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))
+      if (
-              && !externalDownLoadLink()
+        (anchorElement.download ||
+          e.metaKey ||
+          e.ctrlKey ||
+          isDownloadLink(absoluteUrl)) &&
+        !externalDownLoadLink()
       ) {
         e.preventDefault();
         invoke('download_file', {
@@ -175,7 +190,7 @@ document.addEventListener('DOMContentLoaded', () => {
   };
 
   // Prevent some special websites from executing in advance, before the click event is triggered.
-    document.addEventListener('mousedown', detectAnchorElementClick);
+  document.addEventListener('click', detectAnchorElementClick, true);
 
   collectUrlToBlobs();
 
@@ -190,7 +205,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);
@@ -223,7 +238,6 @@ function removeUrlParameters(url) {
   return parsedUrl.toString();
 }
 
-
 // Toggle video playback when the window is hidden.
 function toggleVideoPlayback(pause) {
   const videos = document.getElementsByTagName('video');
@@ -244,9 +258,8 @@ function collectUrlToBlobs() {
     const url = backupCreateObjectURL.call(window.URL, blob);
     window.blobToUrlCaches.set(url, blob);
     return url;
+  };
 }
-}
-
 
 function convertBlobUrlToBinary(blobUrl) {
   return new Promise((resolve) => {
@@ -257,6 +270,5 @@ function convertBlobUrlToBinary(blobUrl) {
     reader.onload = () => {
       resolve(reader.result);
     };
-  })
+  });
-
 }

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![
+        .invoke_handler(tauri::generate_handler![download_file])
-            drag_window,
-            fullscreen,
-            open_browser,
-            download_file
-        ])
         .setup(|app| {
             let _window = get_window(app, pake_config, data_dir);
             // Prevent initial shaking