pake-cli 0.0.3 → 0.0.5

package/src-tauri/Cargo.toml

@@ -12,27 +12,23 @@ 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.2.0", features = [] }
-
+tauri-build = { version = "1.2.1", features = [] }
 
 [dependencies]
 serde_json = "1.0.88"
 serde = { version = "1.0.147", features = ["derive"] }
-tauri = { version = "1.2.0", features = ["api-all"] }
+tauri = { version = "1.2.1", features = ["api-all"] }
 image = "0.24.5"
-tauri-utils = "1.2.0"
+tauri-utils = "1.2.1"
 webbrowser = "0.8.2"
-
-[dependencies.wry]
-git = "https://github.com/tauri-apps/wry.git"
-rev = "7c6d64acea4414f7c960b38b80ea9ec3628db2a8"
+wry = "0.22.5"
 
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
-default = [ "custom-protocol" ]
+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" ]
+custom-protocol = ["tauri/custom-protocol"]
 # Enable DevTools for debugging.
 devtools = []

package/src-tauri/src/main.rs

@@ -37,7 +37,7 @@ use wry::{
         menu::MenuType,
         window::{Fullscreen, Window, WindowBuilder},
     },
-    webview::WebViewBuilder,
+    webview::{WebContext, WebViewBuilder},
 };
 
 fn main() -> wry::Result<()> {
@@ -110,6 +110,7 @@ fn main() -> wry::Result<()> {
     let event_loop = EventLoop::new();
 
     let common_window = WindowBuilder::new()
+        .with_title("")
         .with_resizable(resizable)
         .with_fullscreen(if fullscreen {
             Some(Fullscreen::Borderless(None))
@@ -123,13 +124,12 @@ fn main() -> wry::Result<()> {
     #[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();
+    let window = common_window.build(&event_loop).unwrap();
 
     #[cfg(target_os = "macos")]
     let window = common_window
@@ -156,11 +156,50 @@ fn main() -> wry::Result<()> {
         }
     };
 
+    // 用于欺骗部分页面对于浏览器的强检测
+    let user_agent_string = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Safari/605.1.15";
+
+    #[cfg(target_os = "macos")]
+    let webview = WebViewBuilder::new(window)?
+        .with_user_agent(user_agent_string)
+        .with_accept_first_mouse(true)
+        .with_url(&url.to_string())?
+        .with_devtools(cfg!(feature = "devtools"))
+        .with_initialization_script(include_str!("pake.js"))
+        .with_ipc_handler(handler)
+        .with_back_forward_navigation_gestures(true)
+        .build()?;
+
+    #[cfg(target_os = "windows")]
+    let webview = WebViewBuilder::new(window)?
+        .with_user_agent(user_agent_string)
+        .with_accept_first_mouse(true)
+        .with_url(&url.to_string())?
+        .with_devtools(cfg!(feature = "devtools"))
+        .with_initialization_script(include_str!("pake.js"))
+        .with_ipc_handler(handler)
+        .with_back_forward_navigation_gestures(true)
+        .build()?;
+    // 自定义cookie文件夹，仅用于Linux
+    // Custom Cookie folder, only for Linux
+    #[cfg(target_os = "linux")]
+    let data_path =
+        std::path::PathBuf::from(concat!("/home/", env!("USER"), "/.config/com-tw93-weread/"));
+    #[cfg(target_os = "linux")]
+    if !std::path::Path::new(&data_path).exists() {
+        std::fs::create_dir(&data_path)?;
+    }
+    #[cfg(target_os = "linux")]
+    let mut web_content = WebContext::new(Some(data_path));
+    #[cfg(target_os = "linux")]
     let webview = WebViewBuilder::new(window)?
+        .with_user_agent(user_agent_string)
+        .with_accept_first_mouse(true)
         .with_url(&url.to_string())?
         .with_devtools(cfg!(feature = "devtools"))
         .with_initialization_script(include_str!("pake.js"))
         .with_ipc_handler(handler)
+        .with_web_context(&mut web_content)
         .with_back_forward_navigation_gestures(true)
         .build()?;
 

package/src-tauri/src/pake.js

@@ -51,7 +51,7 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       display: none !important;
     }
 
-    #page .main_header {
+    #page .main_header, .cb-layout-basic--navbar{
       padding-top: 20px;
     }
 
@@ -92,6 +92,160 @@ window.addEventListener("DOMContentLoaded", (_event) => {
       margin-top:24px;
     }
 
+    [data-testid="placementTracking"] article,
+    a[href*="quick_promote_web"],
+    [data-testid="AppTabBar_Explore_Link"],
+    a[href*="/lists"][role="link"][aria-label],
+    a[href="/i/bookmarks"] {
+      display: none !important;
+    }
+
+    [data-testid="DMDrawer"] {
+      visibility: hidden !important;
+    }
+
+    [data-testid="primaryColumn"] > div > div {
+      position: relative !important;
+    }
+
+    [data-testid="sidebarColumn"] {
+      visibility: hidden !important;
+      width: 0 !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      z-index: 1 !important;
+    }
+
+    @media only screen and (min-width: 1000px) {
+      main[role="main"] {
+        align-items: center !important;
+        overflow-x: clip !important;
+      }
+
+      [data-testid="primaryColumn"] {
+        width: 700px !important;
+        max-width: 700px !important;
+        margin: 0 auto !important;
+      }
+      [data-testid="primaryColumn"] > div > div:last-child,
+      [data-testid="primaryColumn"] > div > div:last-child div {
+        max-width: unset !important;
+      }
+
+      div[aria-label][role="group"][id^="id__"] {
+        margin-right: 81px !important;
+      }
+
+      header[role="banner"] {
+        position: fixed !important;
+        left: 0 !important;
+      }
+
+      header[role="banner"] > div > div > div {
+        justify-content: center !important;
+        padding-top: 0;
+      }
+
+      form[role="search"] > div:nth-child(1) > div {
+        background-color: transparent !important;
+      }
+
+      h1[role="heading"] {
+        padding-top: 4px !important;
+      }
+
+      header[role="banner"]
+        nav[role="navigation"]
+        *
+        div[dir="auto"]:not([aria-label])
+        > span,
+      [data-testid="SideNav_AccountSwitcher_Button"] > div:not(:first-child) {
+        display: inline-block !important;
+        opacity: 0 !important;
+        transition: 0.5s cubic-bezier(0.2, 0.8, 0.2, 1);
+      }
+      header[role="banner"]
+        nav[role="navigation"]:hover
+        *
+        div[dir="auto"]:not([aria-label])
+        > span,
+      [data-testid="SideNav_AccountSwitcher_Button"]:hover > div:not(:first-child) {
+        opacity: 1 !important;
+      }
+      header[role="banner"] nav[role="navigation"]:hover > * > div {
+        backdrop-filter: blur(12px) !important;
+      }
+      header[role="banner"] nav[role="navigation"] > a {
+        position: relative;
+      }
+
+      header[role="banner"] nav[role="navigation"] > a::before {
+        content: "";
+        position: absolute;
+        top: 0px;
+        right: -40px;
+        bottom: 0px;
+        left: 0px;
+      }
+      [data-testid="SideNav_AccountSwitcher_Button"] {
+        bottom: 18px !important;
+        left: 1px !important;
+      }
+
+      [data-testid="SideNav_NewTweet_Button"] {
+        position: fixed !important;
+        right: 16px !important;
+        bottom: 24px !important;
+      }
+    }
+
+    @media only screen and (min-width: 1000px) and (max-width: 1265px) {
+      body {
+        padding-left: 88px;
+      }
+    }
+
+    @media only screen and (min-width: 1265px) {
+      [data-testid="sidebarColumn"] form[role="search"] {
+        visibility: visible !important;
+        position: fixed !important;
+        top: 12px !important;
+        right: 16px !important;
+      }
+
+      [data-testid="sidebarColumn"] input[placeholder="Search Twitter"] {
+        width: 150px;
+      }
+
+      [data-testid="sidebarColumn"] form[role="search"]:focus-within {
+        width: 374px !important;
+        backdrop-filter: blur(12px) !important;
+      }
+
+      [data-testid="sidebarColumn"] input[placeholder="Search Twitter"]:focus {
+        width: 328px !important;
+      }
+
+      div[style*="left: -12px"] {
+        left: unset !important;
+      }
+      div[style="left: -8px; width: 306px;"] {
+        left: unset !important;
+        width: 374px !important;
+      }
+
+      .searchFilters {
+        visibility: visible !important;
+        position: fixed;
+        top: 12px;
+        right: 16px;
+        width: 240px;
+      }
+      .searchFilters > div > div:first-child {
+        display: none;
+      }
+    }
+
     #pack-top-dom:active {
       cursor: grabbing;
       cursor: -webkit-grabbing;

package/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
-    "productName": "weread",
-    "version": "0.2.0"
+    "productName": "WeRead",
+    "version": "1.0.0"
   },
   "tauri": {
     "windows": [

package/dist/twitter.css

@@ -1,176 +0,0 @@
-[data-testid="placementTracking"] article,
-a[href*="quick_promote_web"],
-[data-testid="AppTabBar_Explore_Link"],
-a[href*="/lists"][role="link"][aria-label],
-a[href="/i/bookmarks"] {
-  display: none !important;
-}
-
-/* Hide Messages Drawer */
-[data-testid="DMDrawer"] {
-  visibility: hidden !important;
-}
-
-[data-testid="primaryColumn"] > div > div {
-  position: relative !important;
-}
-
-/* Hide sidebar */
-[data-testid="sidebarColumn"] {
-  visibility: hidden !important;
-  width: 0 !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  z-index: 1 !important;
-}
-
-/* Twitter has a large screen breakpoint at 1000px */
-/* Twitter web's small screen styles (< 988px) are minimal */
-@media only screen and (min-width: 1000px) {
-  /* Center the Timeline */
-  /* Prevent horizontal scroll */
-  main[role="main"] {
-    align-items: center !important;
-    overflow-x: clip !important;
-  }
-
-  /* Match widths for feed */
-  [data-testid="primaryColumn"] {
-    width: 700px !important;
-    max-width: 700px !important;
-    margin: 0 auto !important;
-  }
-  [data-testid="primaryColumn"] > div > div:last-child,
-  [data-testid="primaryColumn"] > div > div:last-child div {
-    max-width: unset !important;
-  }
-
-  /* Nudge engagement row 81px right */
-  /* In default feed: 506px - 425px */
-  div[aria-label][role="group"][id^="id__"] {
-    margin-right: 81px !important;
-  }
-
-  /* Fix navigation to left */
-  header[role="banner"] {
-    position: fixed !important;
-    left: 0 !important;
-  }
-
-  header[role="banner"] > div > div > div {
-    justify-content: center !important;
-    padding-top: 0;
-  }
-
-  form[role="search"] > div:nth-child(1) > div {
-    background-color: transparent !important;
-  }
-
-  /* Align Twitter navigation icon with search */
-  h1[role="heading"] {
-    padding-top: 4px !important;
-  }
-
-  /* Navigation buttons labels and Account button label on hover */
-  header[role="banner"]
-    nav[role="navigation"]
-    *
-    div[dir="auto"]:not([aria-label])
-    > span,
-  [data-testid="SideNav_AccountSwitcher_Button"] > div:not(:first-child) {
-    display: inline-block !important;
-    opacity: 0 !important;
-    transition: 0.5s cubic-bezier(0.2, 0.8, 0.2, 1);
-  }
-  header[role="banner"]
-    nav[role="navigation"]:hover
-    *
-    div[dir="auto"]:not([aria-label])
-    > span,
-  [data-testid="SideNav_AccountSwitcher_Button"]:hover > div:not(:first-child) {
-    opacity: 1 !important;
-  }
-  header[role="banner"] nav[role="navigation"]:hover > * > div {
-    backdrop-filter: blur(12px) !important;
-  }
-  header[role="banner"] nav[role="navigation"] > a {
-    position: relative;
-  }
-
-  header[role="banner"] nav[role="navigation"] > a::before {
-    content: "";
-    position: absolute;
-    top: 0px;
-    right: -40px;
-    bottom: 0px;
-    left: 0px;
-  }
-  /* Align account button with floating tweet button */
-  [data-testid="SideNav_AccountSwitcher_Button"] {
-    bottom: 18px !important;
-    left: 1px !important;
-  }
-
-  /* Floating Tweet Button */
-  [data-testid="SideNav_NewTweet_Button"] {
-    position: fixed !important;
-    right: 16px !important;
-    bottom: 24px !important;
-  }
-}
-
-/* Add padding equal to navigation size when between 1000px-1265px */
-@media only screen and (min-width: 1000px) and (max-width: 1265px) {
-  body {
-    padding-left: 88px;
-  }
-}
-
-/* Reveal searchbar and search filters at desktop breakpoint */
-@media only screen and (min-width: 1265px) {
-  /* Reveal searchbar */
-  [data-testid="sidebarColumn"] form[role="search"] {
-    visibility: visible !important;
-    position: fixed !important;
-    top: 12px !important;
-    right: 16px !important;
-  }
-
-  /* Match size of input the placeholder content */
-  [data-testid="sidebarColumn"] input[placeholder="Search Twitter"] {
-    width: 150px;
-  }
-
-  /* Match size of focused search container to its dropdown */
-  /* Add blur filter to search container for overlap */
-  [data-testid="sidebarColumn"] form[role="search"]:focus-within {
-    width: 374px !important;
-    backdrop-filter: blur(12px) !important;
-  }
-
-  /* Match size of focused search input to its dropdown */
-  [data-testid="sidebarColumn"] input[placeholder="Search Twitter"]:focus {
-    width: 328px !important;
-  }
-
-  /* Reset width and left positioning to align search dropdown */
-  div[style*="left: -12px"] {
-    left: unset !important;
-  }
-  div[style="left: -8px; width: 306px;"] {
-    left: unset !important;
-    width: 374px !important;
-  }
-
-  /* Search Filters Custom Class */
-  .searchFilters {
-    visibility: visible !important;
-    position: fixed;
-    top: 12px;
-    right: 16px;
-    width: 240px;
-  }
-  .searchFilters > div > div:first-child {
-    display: none;
-  }
-}