From 51dde5f2ba964f6b53e6c2c3d8dc6694df117297 Mon Sep 17 00:00:00 2001
From: Zola Gonano <zolagonano@protonmail.com>
Date: Fri, 3 May 2024 09:41:14 +0000
Subject: [PATCH] Update to latest version of proxy_scraper

---
 Cargo.lock |  2 +-
 Cargo.toml |  2 +-
 src/lib.rs | 43 ++++++++++++++++++++-----------------------
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 60cde9a..1863c62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -634,7 +634,7 @@ dependencies = [
 [[package]]
 name = "proxy-scraper"
 version = "0.1.0"
-source = "git+https://github.com/zolagonano/proxy-scraper.git?rev=3ab6158#3ab615872b0ca3b2d0e3bbc778a4c5515b507739"
+source = "git+https://github.com/zolagonano/proxy-scraper.git?rev=8f38f3f#8f38f3f85c9c1c5662658b4be987df91fe16a659"
 dependencies = [
  "base64",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index a1f3e8b..952cda8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,6 @@ serde = { version = "1.0.198", features = ["derive"] }
 serde_json = "1.0.116"
 url = "2.5.0"
 worker = "0.2.0"
-proxy-scraper = { git = "https://github.com/zolagonano/proxy-scraper.git", rev = "3ab6158" , default_features = false, features = ["scraper"] }
+proxy-scraper = { git = "https://github.com/zolagonano/proxy-scraper.git", rev = "8f38f3f" , default_features = false, features = ["scraper"] }
 reqwest = "0.12.3"
 
diff --git a/src/lib.rs b/src/lib.rs
index 969dd96..abda1f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,6 +5,7 @@ mod utils;
 use crate::config::*;
 use crate::telegram::*;
 use crate::utils::*;
+use proxy_scraper::*;
 use std::collections::HashSet;
 use worker::*;
 
@@ -54,41 +55,37 @@ impl Command {
         let raw_proxies = fetch_sources(self.get_sources()).await;
 
         match self {
-            Command::MTProxy => proxy_scraper::Scraper::scrape_mtproxy(&raw_proxies)
+            Command::MTProxy => mtproxy::MTProxy::scrape(&raw_proxies)
                 .iter()
                 .for_each(|proxy| {
                     proxy_list.insert(format!("[{}]({})", proxy.to_url(), proxy.to_url()));
                 }),
-            Command::Shadowsocks => proxy_scraper::Scraper::scrape_shadowsocks(&raw_proxies)
+            Command::Shadowsocks => shadowsocks::Shadowsocks::scrape(&raw_proxies)
                 .iter()
                 .for_each(|proxy| {
                     proxy_list.insert(format!("`{}`", proxy.to_url()));
                 }),
-            Command::VMess => proxy_scraper::Scraper::scrape_vmess(&raw_proxies)
-                .iter()
-                .for_each(|proxy| {
-                    proxy_list.insert(format!("`{}`", proxy.to_url()));
-                }),
-            Command::VLess => proxy_scraper::Scraper::scrape_vless(&raw_proxies)
-                .iter()
-                .for_each(|proxy| {
-                    proxy_list.insert(format!("`{}`", proxy.to_url()));
-                }),
-            Command::Trojan => proxy_scraper::Scraper::scrape_trojan(&raw_proxies)
-                .iter()
-                .for_each(|proxy| {
-                    proxy_list.insert(format!("`{}`", proxy.to_url()));
-                }),
-            Command::Hysteria => proxy_scraper::Scraper::scrape_hysteria(&raw_proxies)
-                .iter()
-                .for_each(|proxy| {
-                    proxy_list.insert(format!("`{}`", proxy.to_url()));
-                }),
-            Command::TUIC => proxy_scraper::Scraper::scrape_tuic(&raw_proxies)
+            Command::VMess => vmess::VMess::scrape(&raw_proxies).iter().for_each(|proxy| {
+                proxy_list.insert(format!("`{}`", proxy.to_url()));
+            }),
+            Command::VLess => vless::VLess::scrape(&raw_proxies).iter().for_each(|proxy| {
+                proxy_list.insert(format!("`{}`", proxy.to_url()));
+            }),
+            Command::Trojan => trojan::Trojan::scrape(&raw_proxies)
                 .iter()
                 .for_each(|proxy| {
                     proxy_list.insert(format!("`{}`", proxy.to_url()));
                 }),
+            Command::Hysteria => {
+                hysteria::Hysteria::scrape(&raw_proxies)
+                    .iter()
+                    .for_each(|proxy| {
+                        proxy_list.insert(format!("`{}`", proxy.to_url()));
+                    })
+            }
+            Command::TUIC => tuic::TUIC::scrape(&raw_proxies).iter().for_each(|proxy| {
+                proxy_list.insert(format!("`{}`", proxy.to_url()));
+            }),
             _ => (),
         };