pake-cli 0.0.1-beta.9 → 0.0.2

package/src-tauri/Cargo.toml

@@ -12,14 +12,20 @@ rust-version = "1.61.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.1.1", features = [] }
+tauri-build = { version = "1.2.0", features = [] }
+
 
 [dependencies]
-serde_json = "1.0.86"
-serde = { version = "1.0.145", features = ["derive"] }
-tauri = { version = "1.1.1", features = ["api-all"] }
-wry = "0.21.1"
-tauri-utils = "1.1.1"
+serde_json = "1.0.88"
+serde = { version = "1.0.147", features = ["derive"] }
+tauri = { version = "1.2.0", features = ["api-all"] }
+image = "0.24.5"
+tauri-utils = "1.2.0"
+webbrowser = "0.8.2"
+
+[dependencies.wry]
+git = "https://github.com/tauri-apps/wry.git"
+rev = "7c6d64acea4414f7c960b38b80ea9ec3628db2a8"
 
 [features]
 # by default Tauri runs in production mode
@@ -28,3 +34,5 @@ default = [ "custom-protocol" ]
 # this feature is used used for production builds where `devPath` points to the filesystem
 # DO NOT remove this
 custom-protocol = [ "tauri/custom-protocol" ]
+# Enable DevTools for debugging.
+devtools = []

package/src-tauri/assets/com-tw93-weread.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Categories=Office
+Exec=com-tw93-weread
+Icon=com-tw93-weread
+Name=com-tw93-weread
+Name[zh_CN]=微信阅读
+StartupNotify=true
+Terminal=false
+Type=Application

package/src-tauri/build.rs

@@ -1,3 +1,3 @@
 fn main() {
-  tauri_build::build()
+    tauri_build::build()
 }

package/src-tauri/src/main.rs

@@ -1,41 +1,103 @@
+// at the top of main.rs - that will prevent the console from showing
+#![windows_subsystem = "windows"]
+extern crate image;
 use tauri_utils::config::{Config, WindowConfig};
+#[cfg(target_os = "macos")]
+use wry::application::platform::macos::WindowBuilderExtMacOS;
 
-fn main() -> wry::Result<()> {
-    use wry::{
-        application::{
-            accelerator::{Accelerator, SysMods},
-            event::{Event, StartCause, WindowEvent},
-            event_loop::{ControlFlow, EventLoop},
-            keyboard::KeyCode,
-            menu::{MenuBar as Menu, MenuItem, MenuItemAttributes, MenuType},
-            platform::macos::WindowBuilderExtMacOS,
-            window::{Fullscreen, Window, WindowBuilder},
-        },
-        webview::WebViewBuilder,
-    };
+#[cfg(target_os = "macos")]
+use wry::{
+    application::{
+        accelerator::{Accelerator, SysMods},
+        event::{Event, StartCause, WindowEvent},
+        event_loop::{ControlFlow, EventLoop},
+        keyboard::KeyCode,
+        menu::{MenuBar as Menu, MenuItem, MenuItemAttributes, MenuType},
+        window::{Fullscreen, Window, WindowBuilder},
+    },
+    webview::WebViewBuilder,
+};
+
+#[cfg(target_os = "windows")]
+use wry::{
+    application::{
+        event::{Event, StartCause, WindowEvent},
+        event_loop::{ControlFlow, EventLoop},
+        menu::MenuType,
+        window::{Fullscreen, Icon, Window, WindowBuilder},
+    },
+    webview::WebViewBuilder,
+};
 
+#[cfg(target_os = "linux")]
+use wry::{
+    application::{
+        event::{Event, StartCause, WindowEvent},
+        event_loop::{ControlFlow, EventLoop},
+        menu::MenuType,
+        window::{Fullscreen, Window, WindowBuilder},
+    },
+    webview::WebViewBuilder,
+};
+
+fn main() -> wry::Result<()> {
+    #[cfg(target_os = "macos")]
     let mut menu_bar_menu = Menu::new();
+    #[cfg(target_os = "macos")]
     let mut first_menu = Menu::new();
-
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Hide);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::EnterFullScreen);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Minimize);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Separator);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Copy);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Cut);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Paste);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Undo);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Redo);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::SelectAll);
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Separator);
+
+    #[cfg(target_os = "macos")]
     let close_item = first_menu.add_item(
         MenuItemAttributes::new("CloseWindow")
             .with_accelerators(&Accelerator::new(SysMods::Cmd, KeyCode::KeyW)),
     );
+
+    #[cfg(target_os = "macos")]
     first_menu.add_native_item(MenuItem::Quit);
 
+    #[cfg(target_os = "macos")]
     menu_bar_menu.add_submenu("App", true, first_menu);
-
+    #[cfg(target_os = "linux")]
+    let WindowConfig {
+        url,
+        width,
+        height,
+        resizable,
+        fullscreen,
+        ..
+    } = get_windows_config().unwrap_or_default();
+    #[cfg(target_os = "windows")]
+    let WindowConfig {
+        url,
+        width,
+        height,
+        resizable,
+        fullscreen,
+        ..
+    } = get_windows_config().unwrap_or_default();
+    #[cfg(target_os = "macos")]
     let WindowConfig {
         url,
         width,
@@ -44,21 +106,38 @@ fn main() -> wry::Result<()> {
         transparent,
         fullscreen,
         ..
-    } = get_windows_config();
+    } = get_windows_config().unwrap_or_default();
     let event_loop = EventLoop::new();
-    let window = WindowBuilder::new()
+
+    let common_window = WindowBuilder::new()
         .with_resizable(resizable)
-        .with_titlebar_transparent(transparent)
         .with_fullscreen(if fullscreen {
             Some(Fullscreen::Borderless(None))
         } else {
             None
         })
+        .with_inner_size(wry::application::dpi::LogicalSize::new(width, height));
+    #[cfg(target_os = "windows")]
+    let icon = load_icon(std::path::Path::new("png/weread_32.ico"));
+
+    #[cfg(target_os = "windows")]
+    let window = common_window
+        .with_decorations(true)
+        .with_title("")
+        .with_window_icon(Some(icon))
+        .build(&event_loop)
+        .unwrap();
+
+    #[cfg(target_os = "linux")]
+    let window = common_window.with_title("").build(&event_loop).unwrap();
+
+    #[cfg(target_os = "macos")]
+    let window = common_window
         .with_fullsize_content_view(true)
         .with_titlebar_buttons_hidden(false)
+        .with_titlebar_transparent(transparent)
         .with_title_hidden(true)
         .with_menu(menu_bar_menu)
-        .with_inner_size(wry::application::dpi::LogicalSize::new(width, height))
         .build(&event_loop)
         .unwrap();
 
@@ -71,17 +150,25 @@ fn main() -> wry::Result<()> {
             } else {
                 window.set_fullscreen(Some(Fullscreen::Borderless(None)));
             }
+        } else if req.starts_with("open_browser") {
+            let href = req.replace("open_browser:", "");
+            webbrowser::open(&href).expect("no browser");
         }
     };
 
-    let _webview = WebViewBuilder::new(window)?
+    let webview = WebViewBuilder::new(window)?
         .with_url(&url.to_string())?
-        // .with_devtools(true)
+        .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
+        .with_back_forward_navigation_gestures(true)
         .build()?;
 
-    // _webview.open_devtools();
+    #[cfg(feature = "devtools")]
+    {
+        webview.open_devtools();
+    }
+
     event_loop.run(move |event, _, control_flow| {
         *control_flow = ControlFlow::Wait;
 
@@ -96,19 +183,35 @@ fn main() -> wry::Result<()> {
                 origin: MenuType::MenuBar,
                 ..
             } => {
+                #[cfg(target_os = "macos")]
                 if menu_id == close_item.clone().id() {
-                    _webview.window().set_minimized(true);
+                    webview.window().set_minimized(true);
                 }
                 println!("Clicked on {:?}", menu_id);
+                println!("Clicked on {:?}", webview.window().is_visible());
             }
             _ => (),
         }
     });
 }
 
-fn get_windows_config() -> WindowConfig {
+fn get_windows_config() -> Option<WindowConfig> {
     let config_file = include_str!("../tauri.conf.json");
     let config: Config = serde_json::from_str(config_file).expect("failed to parse windows config");
 
-    config.tauri.windows[0].clone()
+    config.tauri.windows.first().cloned()
+}
+
+#[cfg(target_os = "windows")]
+fn load_icon(path: &std::path::Path) -> Icon {
+    let (icon_rgba, icon_width, icon_height) = {
+        // alternatively, you can embed the icon in the binary through `include_bytes!` macro and use `image::load_from_memory`
+        let image = image::open(path)
+            .expect("Failed to open icon path")
+            .into_rgba8();
+        let (width, height) = image.dimensions();
+        let rgba = image.into_raw();
+        (rgba, width, height)
+    };
+    Icon::from_rgba(icon_rgba, icon_width, icon_height).expect("Failed to open icon")
 }

package/src-tauri/src/pake.js

@@ -1,6 +1,60 @@
-window.addEventListener('DOMContentLoaded', (_event) => {
-    const style = document.createElement('style');
-    style.innerHTML = `
+/**
+ * @typedef {string} KeyboardKey `event.key` 的代号，
+ * 见 <https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values>
+ * @typedef {() => void} OnKeyDown 使用者按下 [CtrlKey] 或者 ⌘ [KeyboardKey]时应该执行的行为
+ * 以 Ctrl键或者Meta 键 (⌘) 为首的快捷键清单。
+ * 每个写在这里的 shortcuts 都会运行 {@link Event.preventDefault}.
+ * @type {Record<KeyboardKey, OnKeyDown>}
+ */
+
+const metaKeyShortcuts = {
+  ArrowUp: () => scrollTo(0, 0),
+  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
+  "[": () => window.history.back(),
+  "]": () => window.history.forward(),
+  r: () => window.location.reload(),
+  "-": () => zoomOut(),
+  "=": () => zoomIn(),
+  "+": () => zoomIn(),
+  0: () => zoomCommon(() => "100%"),
+};
+
+const ctrlKeyShortcuts = {
+  ArrowUp: () => scrollTo(0, 0),
+  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
+  ArrowLeft: () => window.history.back(),
+  ArrowRight: () => window.history.forward(),
+  r: () => window.location.reload(),
+  "-": () => zoomOut(),
+  "=": () => zoomIn(),
+  "+": () => zoomIn(),
+  0: () => zoomCommon(() => "100%"),
+};
+
+window.addEventListener("DOMContentLoaded", (_event) => {
+  const style = document.createElement("style");
+  style.innerHTML = `
+    #page #footer-wrapper,
+    .drawing-board .toolbar .toolbar-action,
+    .c-swiper-container,
+    .download_entry,
+    .lang, .copyright,
+    .wwads-cn, .adsbygoogle,
+    #Bottom > div.content > div.inner,
+    #Rightbar .sep20:nth-of-type(5),
+    #Rightbar > div.box:nth-child(4),
+    #Main > div.box:nth-child(8) > div
+    #Wrapper > div.sep20,
+    #Main > div.box:nth-child(8),
+    #masthead-ad,
+    #Rightbar > div:nth-child(6) > div.sidebar_compliance {
+      display: none !important;
+    }
+
+    #page .main_header {
+      padding-top: 20px;
+    }
+
     .panel.give_me .nav_view {
       top: 154px !important;
     }
@@ -9,16 +63,21 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       padding-top: 30px;
     }
 
-    #page .main_header {
-      padding-top: 20px;
+    ytd-masthead>#container.style-scope.ytd-masthead {
+      padding-top: 12px !important;
     }
 
-    #page #footer-wrapper,
-    .drawing-board .toolbar .toolbar-action,
-    .c-swiper-container,
-    .download_entry,
-    .lang, .copyright {
-      display: none !important;
+    .wrap.h1body-exist.max-container > div.menu-tocs > div.menu-btn{
+      top: 28px;
+    }
+
+    #Wrapper{
+      background-color: #F8F8F8 !important;
+      background-image:none !important;
+    }
+
+    #Top {
+      border-bottom: none;
     }
 
     .container-with-note #home, .container-with-note #switcher{
@@ -46,85 +105,89 @@ window.addEventListener('DOMContentLoaded', (_event) => {
       height: 20px;
       cursor: grab;
       cursor: -webkit-grab;
+      z-index: 90000;
     }
   `;
-    document.head.append(style);
-    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) => {
-        if (e.buttons === 1 && e.detail !== 2) {
-            window.ipc.postMessage('drag_window');
-        }
-    })
-
-    domEl.addEventListener('touchstart', (e) => {
-        window.ipc.postMessage('drag_window');
-    })
-
-    domEl.addEventListener('dblclick', (e) => {
-        window.ipc.postMessage('fullscreen');
-    })
-
-    document.addEventListener('keyup', function (event) {
-        if (event.key === "ArrowUp" && event.metaKey){
-            scrollTo(0,0);
-        }
-        if (event.key === "ArrowDown" && event.metaKey){
-            window.scrollTo(0, document.body.scrollHeight);
-        }
-        if (event.key === "[" && event.metaKey){
-            window.history.go(-1);
-        }
-        if (event.key === "]" && event.metaKey){
-            window.history.go(1);
-        }
-        if (event.key === "r" && event.metaKey){
-            window.location.reload();
-        }
-        if (event.key === "-" && event.metaKey){
-            zoomOut();
-        }
-        if (event.key === "=" && event.metaKey){
-            zoomIn();
-        }
-        if (event.key === "0" && event.metaKey){
-            document.getElementsByTagName('html')[0].style.zoom = '100%';
-            window.localStorage.setItem('htmlZoom', '100%');
-        }
-    })
-
-    const pakeLinks = document.links;
-    for (let linkIndex = 0; linkIndex < pakeLinks.length; linkIndex++) {
-        pakeLinks[linkIndex].target = '_self';
-    }
+  document.head.append(style);
+  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) => {
+    if (e.buttons === 1 && e.detail !== 2) {
+      window.ipc.postMessage("drag_window");
+    }
+  });
+
+  domEl.addEventListener("touchstart", () => {
+    window.ipc.postMessage("drag_window");
+  });
+
+  domEl.addEventListener("dblclick", () => {
+    window.ipc.postMessage("fullscreen");
+  });
+
+  document.addEventListener("keyup", function (event) {
+    const preventDefault = (f) => {
+      event.preventDefault();
+      f();
+    };
+    if (/windows|linux/i.test(navigator.userAgent)) {
+      if (event.ctrlKey && event.key in ctrlKeyShortcuts) {
+        preventDefault(ctrlKeyShortcuts[event.key]);
+      }
+    }
+    if (/macintosh|mac os x/i.test(navigator.userAgent)) {
+      if (event.metaKey && event.key in metaKeyShortcuts) {
+        preventDefault(ctrlKeyShortcuts[event.key]);
+      }
+    }
+  });
+
+  document.addEventListener("click", (e) => {
+    const origin = e.target.closest("a");
+    if (origin && origin.href) {
+      origin.target = "_self";
+
+      //额外处理下 twitter 的外跳，对于其他需要外跳的可以改这里成对应域名
+      const href = origin.href;
+      if (
+        location.host === "twitter.com" &&
+        href.indexOf("twitter.com") === -1
+      ) {
+        e.preventDefault();
+        window.ipc.postMessage(`open_browser:${href}`);
+      }
+    }
+  });
 });
 
 setDefaultZoom();
 
 function setDefaultZoom() {
-  const htmlZoom = window.localStorage.getItem('htmlZoom');
+  const htmlZoom = window.localStorage.getItem("htmlZoom");
   if (htmlZoom) {
-    document.getElementsByTagName('html')[0].style.zoom = htmlZoom;
+    document.getElementsByTagName("html")[0].style.zoom = htmlZoom;
   }
 }
 
-function zoomIn() {
-  const htmlZoom = window.localStorage.getItem('htmlZoom') || '100%';
-  const html = document.getElementsByTagName('html')[0];
-  const zoom = parseInt(htmlZoom) < 200 ? (parseInt(htmlZoom) + 10 +'%') : '200%';
+/**
+ * @param {(htmlZoom: string) => string} [zoomRule]
+ */
+function zoomCommon(zoomRule) {
+  const htmlZoom = window.localStorage.getItem("htmlZoom") || "100%";
+  const html = document.getElementsByTagName("html")[0];
+  const zoom = zoomRule(htmlZoom);
   html.style.zoom = zoom;
-  window.localStorage.setItem('htmlZoom', zoom);
+  window.localStorage.setItem("htmlZoom", zoom);
+}
+
+function zoomIn() {
+  zoomCommon((htmlZoom) => `${Math.min(parseInt(htmlZoom) + 10, 200)}%`);
 }
 
 function zoomOut() {
-  const htmlZoom = window.localStorage.getItem('htmlZoom') || '100%';
-  const html = document.getElementsByTagName('html')[0];
-  const zoom = parseInt(htmlZoom) > 30 ? (parseInt(htmlZoom) - 10 +'%') : '30%';
-  html.style.zoom = zoom;
-  window.localStorage.setItem('htmlZoom', zoom);
-}
+  zoomCommon((htmlZoom) => `${Math.max(parseInt(htmlZoom) - 10, 30)}%`);
+}