序列化

Author: cht

Cargo.toml

@@ -15,6 +15,7 @@ crossterm = "0.20"
 reqwest = { version = "0.11", default-features = false, features = ["json","rustls-tls"] }
 base64 = "0.13.0"
 serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 urlencoding = "2.1.0"
 unicode-width = "0.1"
 tokio = { version = "1", features = ["full"] }

src/spider.rs

@@ -1,6 +1,7 @@
 //extern crate base64;
 use reqwest::Result;
 use serde_json::Value;
+use serde::{Deserialize, Serialize};
 pub fn ascii_to_char(code: u8) -> char {
     std::char::from_u32(code as u32).unwrap_or('_')
 }
@@ -55,7 +56,7 @@ enum Tcp {
     Ss,
     V2,
 }
-#[derive(Clone)]
+#[derive(Clone,Serialize, Deserialize)]
 pub struct Information {
     pub func: String,
     pub urls: String,
@@ -94,26 +95,26 @@ impl Information {
         }}
     }}],
     \"outbounds\":[{{
-        \"protocol\":{},
+        \"protocol\":\"{}\",
         \"sendThrough\": \"0.0.0.0\",
         \"settings\":{{
             \"vnext\": [{{
-                \"address\": {},
+                \"address\": \"{}\",
                 \"port\":{},
                 \"users\":[{{
-                    \"alterId\": {},
-                    \"id\":{}
+                    \"alterId\": \"{}\",
+                    \"id\":\"{}\"
                 }}]
             }}]
         }},
         \"streamSettings\":{{
             \"dsSettings\": {{
-                \"path\": {}
+                \"path\": \"{}\"
             }},
             \"httpSettings\":{{
                 \"host\": [
                 ],
-                \"path\":{}
+                \"path\":\"{}\"
             }},
             \"kcpSettings\": {{
                 \"congestion\": false,
@@ -127,7 +128,7 @@ impl Information {
                 \"uplinkCapacity\": 5,
                 \"writeBufferSize\": 1
             }},
-            \"network\": {},
+            \"network\": \"{}\",
             \"quicSettings\":{{
                 \"header\": {{
                     \"type\":\"none\"
@@ -168,7 +169,7 @@ impl Information {
             \"wsSettings\" :{{
                 \"headers\" :{{
                 }},
-                \"path\":{}
+                \"path\":\"{}\"
             }},
             \"xtlsSettings\":{{
                 \"allowInsecure\":true,
@@ -200,8 +201,8 @@ impl Information {
 }}",
                 self.func,
                 self.add,
-                remove_quotation(self.port.clone()),
-                remove_quotation(self.aid.clone()),
+                self.port.clone(),
+                self.aid.clone(),
                 self.id,
                 self.path,
                 self.path,
@@ -329,12 +330,12 @@ impl Information {
             \"settings\": {{
                 \"servers\" :[
                     {{
-                        \"address\":{},
+                        \"address\":\"{}\",
                         \"email\": \"\",
                         \"level\": 0,
-                        \"method\": {},
+                        \"method\": \"{}\",
                         \"ota\":false,
-                        \"password\":{},
+                        \"password\":\"{}\",
                         \"port\":{}
                     }}
                 ]
@@ -424,7 +425,7 @@ impl Information {
                 self.add,
                 self.net,
                 self.id,
-                remove_quotation(self.port.clone())
+                self.port.clone()
             )
         }
     }
@@ -433,12 +434,12 @@ impl Information {
         if self.func == *"\"vmess\"" {
             temp.push_str(&format!(
                 "vmess://{}:{}-{}@{}:{}/#{}",
-                &remove_quotation(self.net.clone()),
-                &remove_quotation(self.id.clone()),
-                &remove_quotation(self.aid.clone()),
-                &remove_quotation(self.add.clone()),
-                &remove_quotation(self.port.clone()),
-                &remove_quotation(self.ps.clone())
+                self.net.clone(),
+                self.id.clone(),
+                self.aid.clone(),
+                self.add.clone(),
+                self.port.clone(),
+                self.ps.clone()
             ))
         } else {
             temp = self.urls.clone();
@@ -448,8 +449,8 @@ impl Information {
     pub fn get_the_json_node(&self) -> String {
         format!(
             "{{
+    \"urls\":\"{}\",
     \"func\":{},
-    \"url\":\"{}\",
     \"add\":{},
     \"aid\":{},
     \"host\":{},
@@ -459,10 +460,12 @@ impl Information {
     \"port\":{},
     \"ps\":{},
     \"tls\":{},
-    \"type\":{}
+    \"typpe\":{}
 }},\n",
-            self.func,
+
             self.urls,
+
+            self.func,
             self.add,
             self.aid,
             self.host,

src/state.rs

@@ -1,6 +1,6 @@
 use crate::app::App;
 use crate::informations::appbar::AppBar;
-use crate::spider;
+//use crate::spider;
 use crate::subscribe::appsub::AppSub;
 use crate::utils;
 use std::io;
@@ -31,7 +31,7 @@ pub async fn run_app(terminal: &mut Terminal<MyBackend>) -> io::Result<()> {
             .map(|ainformation| {
                 ainformation
                     .iter()
-                    .map(|message| spider::remove_quotation(message.ps.clone()))
+                    .map(|message| message.ps.clone())
                     .collect()
             })
             .collect();

src/subscribe/state.rs

@@ -31,7 +31,7 @@ pub(super) async fn subscribe_state(app: &mut AppSub) -> io::Result<IFEXIT> {
                     subs.push(
                         ainformation
                             .iter()
-                            .map(|ainfor| spider::remove_quotation(ainfor.ps.clone()))
+                            .map(|ainfor| ainfor.ps.clone())
                             .collect(),
                     );
                     information.push(ainformation);

src/utils.rs

@@ -92,37 +92,6 @@ pub fn start() -> Vec<Vec<Information>> {
             "[]".to_string()
         }
     };
-    let mut informations = Vec::new();
-    let v: Value = serde_json::from_str(messages.as_str()).unwrap();
-    let mut index = 0;
-    while v[index] != Value::Null {
-        let mut index2 = 0;
-        let w = v[index].clone();
-        let mut information = Vec::new();
-        while w[index2] != Value::Null {
-            let the_url = w[index2]["url"].to_string();
-            let length = the_url.len();
-            let instore = &the_url[1..length - 1];
-            information.push(Information {
-                urls: instore.to_string(),
-                func: w[index2]["func"].to_string(),
-                add: w[index2]["add"].to_string(),
-                aid: w[index2]["aid"].to_string(),
-                host: w[index2]["host"].to_string(),
-                id: w[index2]["id"].to_string(),
-                net: w[index2]["net"].to_string(),
-                path: w[index2]["path"].to_string(),
-                port: w[index2]["port"].to_string(),
-                ps: w[index2]["ps"].to_string(),
-                tls: w[index2]["tls"].to_string(),
-                typpe: w[index2]["type"].to_string(),
-            });
-            index2 += 1;
-        }
-        informations.push(information);
-        //let names = v[index]["ps"].to_string();
-        //start.add_item(remove_quotation(names), url);
-        index += 1;
-    }
-    informations
+    serde_json::from_str(messages.as_str()).unwrap()
+
 }