✨ 2.0 invoke compatible

Author: tw93

.gitignore

@@ -39,4 +39,3 @@ src-tauri/.cargo/
 .next
 src-tauri/.pake/
 src-tauri/gen
-src-tauri/capabilities

src-tauri/Cargo.lock

@@ -27,6 +27,7 @@ tauri-plugin-clipboard-manager = "2.0.2"
 tauri-plugin-http = "2.0.3"
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
 tauri-plugin-global-shortcut = { version = "2.0.1" }
+tauri-plugin-shell = "2.0.0"
 
 [dev-dependencies]
 cargo-bloat = "0.12.1"

src-tauri/Cargo.toml

@@ -0,0 +1,18 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "pake-capability",
+  "description": "Capability for the pake app.",
+  "webviews": ["pake"],
+  "remote": {
+    "urls": ["https://*.*"]
+  },
+  "permissions": [
+    "core:window:allow-theme",
+    "core:window:allow-start-dragging",
+    "core:window:allow-toggle-maximize",
+    "core:window:allow-is-fullscreen",
+    "core:window:allow-set-fullscreen",
+    "core:webview:allow-internal-toggle-devtools",
+    "shell:allow-open"
+  ]
+}

src-tauri/capabilities/default.json

@@ -4,7 +4,6 @@ use std::io::Write;
 use std::str::FromStr;
 use tauri::http::Method;
 use tauri_plugin_http::reqwest::{ClientBuilder, Request};
-// use tauri::http::{ClientBuilder, HttpRequestBuilder, ResponseType};
 use tauri::{command, AppHandle, Manager, Url, WebviewWindow};
 
 #[derive(serde::Deserialize)]

src-tauri/src/app/invoke.rs

@@ -43,7 +43,7 @@ function isDownloadLink(url) {
     '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',
+    'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw',
     'svg', 'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp',
     'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip', 'json', 'yaml', '7zip', 'mkv'
   ];
@@ -56,15 +56,11 @@ 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 invoke = tauri.tauri.invoke;
+  const appWindow = tauri.window.getCurrentWindow();
+  const invoke = tauri.core.invoke;
 
   if (!document.getElementById('pake-top-dom')) {
     const topDom = document.createElement('div');
@@ -75,19 +71,19 @@ document.addEventListener('DOMContentLoaded', () => {
   const domEl = document.getElementById('pake-top-dom');
 
   domEl.addEventListener('touchstart', () => {
-    appWindow.startDragging().then();
+    appWindow.startDragging();
   });
 
   domEl.addEventListener('mousedown', e => {
     e.preventDefault();
     if (e.buttons === 1 && e.detail !== 2) {
-      appWindow.startDragging().then();
+      appWindow.startDragging();
     }
   });
 
   domEl.addEventListener('dblclick', () => {
     appWindow.isFullscreen().then(fullscreen => {
-      appWindow.setFullscreen(!fullscreen).then();
+      appWindow.setFullscreen(!fullscreen);
     });
   });
 
@@ -176,8 +172,6 @@ document.addEventListener('DOMContentLoaded', () => {
             // case: download from dataURL -> convert dataURL ->
           } else if (url.startsWith('data:')) {
             downloadFromDataUri(url, filename);
-          } else if (isDownloadLink(url) || anchorEle.host !== window.location.host) {
-            handleExternalLink(e, url);
           }
         },
         true,
@@ -187,7 +181,6 @@ document.addEventListener('DOMContentLoaded', () => {
     };
   }
 
-  const isExternalLink = link => window.location.host !== link.host;
   // process special download protocol['data:','blob:']
   const isSpecialDownload = url => ['blob', 'data'].some(protocol => url.startsWith(protocol));
 
@@ -214,12 +207,6 @@ document.addEventListener('DOMContentLoaded', () => {
       const absoluteUrl = hrefUrl.href;
       let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
 
-      // Handling external link redirection.
-      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() && !isSpecialDownload(absoluteUrl)) {
         handleDownloadLink(e, absoluteUrl, filename);

src-tauri/src/inject/event.js

@@ -26,6 +26,7 @@ pub fn run_app() {
         .plugin(windowStatePlugin::default().build())
         .plugin(tauri_plugin_oauth::init())
         .plugin(tauri_plugin_http::init())
+        .plugin(tauri_plugin_shell::init())
         .invoke_handler(tauri::generate_handler![
             download_file,
             download_file_by_binary