Merge pull request #2 from tan-wei/dev

Bypass cloudflare

Author: tan-wei

.env.sample

@@ -0,0 +1 @@
+LEETCODE_COOKIE=

.gitignore

@@ -8,4 +8,7 @@ target/
 Cargo.lock
 
 # These are backup files generated by rustfmt
-**/*.rs.bk
+**/*.rs.bk
+
+# Dotenv file
+.env

Cargo.toml

@@ -5,7 +5,12 @@ authors = ["alei <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-reqwest = { version = "0.11", features = ["blocking", "json"] }
+reqwest = { version = "0.11", features = [
+    "blocking",
+    "json",
+    "native-tls-alpn",
+    "gzip",
+] }
 tokio = { version = "1", features = ["full"] }
 serde = "1.0"
 serde_json = "1.0"
@@ -14,6 +19,7 @@ rand = "0.6.5"
 regex = "1.3.4"
 futures = { version = "0.3.28", features = ["thread-pool"] }
 surf = "2.3.2"
+dotenv = "0.15.0"
 
 [lib]
 doctest = false

src/fetcher.rs

@@ -99,45 +99,77 @@ pub async fn get_problem_async(problem_stat: StatWithStatus) -> Option<Problem>
 pub fn get_problems() -> Option<Problems> {
     let headers = {
         let mut h = reqwest::header::HeaderMap::new();
+        h.insert(
+            "Accept",
+            reqwest::header::HeaderValue::from_static(
+                "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8",
+            ),
+        );
+        h.insert(
+            "Accept-Encoding",
+            reqwest::header::HeaderValue::from_static("gzip, deflate, br"),
+        );
+        h.insert(
+            "Accept-Language",
+            reqwest::header::HeaderValue::from_static("zh-CN,en-US;q=0.7,en;q=0.3"),
+        );
+        h.insert(
+            "Connection",
+            reqwest::header::HeaderValue::from_static("keep-alive"),
+        );
         h.insert(
             "User-Agent",
             reqwest::header::HeaderValue::from_static(
-                "Mozilla/5.0 (X11; Linux x86_64; rv:123.0) Gecko/20100101 Firefox/123.0",
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:123.0) Gecko/20100101 Firefox/123.0",
             ),
         );
         h.insert(
-            "Referer",
-            reqwest::header::HeaderValue::from_static(PROBLEMS_URL),
+            "Sec-Fetch-Dest",
+            reqwest::header::HeaderValue::from_static("document"),
         );
         h.insert(
-            "Origin",
-            reqwest::header::HeaderValue::from_static(PROBLEMS_URL),
+            "Sec-Fetch-Mode",
+            reqwest::header::HeaderValue::from_static("navigate"),
         );
         h.insert(
-            "Content-Type",
-            reqwest::header::HeaderValue::from_static("application/json"),
+            "Sec-Fetch-Site",
+            reqwest::header::HeaderValue::from_static("none"),
         );
         h.insert(
-            "Accept",
-            reqwest::header::HeaderValue::from_static("application/json"),
+            "Sec-Fetch-User",
+            reqwest::header::HeaderValue::from_static("?1"),
         );
+        h.insert(
+            "Upgrade-Insecure-Requests",
+            reqwest::header::HeaderValue::from_static("1"),
+        );
+
         h.insert(
             "Host",
-            reqwest::header::HeaderValue::from_static(PROBLEMS_URL),
+            reqwest::header::HeaderValue::from_static("leetcode.com"),
         );
         h.insert(
-            "X-Requested-With",
-            reqwest::header::HeaderValue::from_static("XMLHttpRequest"),
+            "Cookie",
+            reqwest::header::HeaderValue::from_str(
+                &std::env::var("LEETCODE_COOKIE")
+                    .expect("Please set LEETCODE_COOKIE in .env file or environment"),
+            )
+            .unwrap(),
         );
         h
     };
     let client = reqwest::blocking::Client::builder()
-        .default_headers(headers)
+        .connection_verbose(true)
+        .http2_prior_knowledge()
+        .gzip(true)
         .build()
         .unwrap();
-    let res = client.get(PROBLEMS_URL).send().unwrap().json();
-    println!("{:?}", res);
-    res.unwrap()
+    let get = client.get(PROBLEMS_URL).headers(headers);
+    // println!("Get: {:?}", get);
+    let reponse = get.send().unwrap();
+    // println!("Response: {:?}", reponse);
+    let result = reponse.json();
+    result.unwrap()
 }
 
 #[derive(Serialize, Deserialize)]

src/main.rs

@@ -19,10 +19,13 @@ use futures::executor::ThreadPool;
 use futures::future::join_all;
 use futures::stream::StreamExt;
 use futures::task::SpawnExt;
+extern crate dotenv;
 use std::sync::{Arc, Mutex};
 
 /// main() helps to generate the submission template .rs
 fn main() {
+    dotenv::dotenv().ok();
+
     println!("Welcome to leetcode-rust system.\n");
     let mut initialized_ids = get_initialized_ids();
     loop {