geosite_gfw: print more err message; minor edit, improve

Author: e1732a364fed

Cargo.lock

@@ -33,4 +33,4 @@ rules:
   - DOMAIN-SUFFIX,zte.home,Direct
   - DOMAIN-SUFFIX,tplogin.cn,Direct
   - DOMAIN-SUFFIX,wifi.cmcc,Direct
-  - DOMAIN-KEYWORD,baidu,Reject
+  - DOMAIN-KEYWORD,afdfdasfdsa,Reject

dev_res/test_clash_rules.yaml

@@ -93,6 +93,8 @@ clash_rules = "rules:\n  - DOMAIN-SUFFIX,ip6-localhost,Direct"
 ```
 geosite_gfw = {
     api_url = "http://127.0.0.1:5134/check",
+    proxy = "127.0.0.1:10800",
+    only_proxy = false,
     ok_ban_out_tag = { "Direct", "Reject"}
 }
 ```
@@ -101,7 +103,14 @@ geosite_gfw 是一个 人工智能 gfw项目，它用过机器学习训练出的
 
 主要用于 local 本地端进行分流。
 
-目前的运行方式
+proxy 选项若给出，则 geosite_gfw 会在访问不到目标地址时，使用 proxy 再访问一次。
+而 若 only_proxy = true, 则 geosite_gfw 第一次方问目标地址就会使用 该 proxy.
+
+注意，如果您配置 geosite_gfw 的 proxy 又指向回 我们的 ruci 的监听端口的话，要确保按上文的 
+tag_route 把该端口的监听强制导向某 outbound, 避免再次进竹 geosite_gfw 环节 造成 回环。
+
+
+目前的geosite_gfw 的运行方式:
 
 ```sh
 git clone https://github.com/e1732a364fed/geosite-gfw/

doc/book/src/lua/route_config.md

@@ -100,7 +100,7 @@ TinyUFO = { version = "0.4", optional = true }
 
 
 netstack-smoltcp = { version = "0.1.3", optional = true }
-netstack-lwip = { git = "https://github.com/e1732a364fed/netstack-lwip.git", rev = "8682a98", optional = true }
+netstack-lwip = { git = "https://github.com/eycorsican/netstack-lwip.git", rev = "b7d9b0a", optional = true }
 
 
 [target.'cfg(windows)'.dependencies]

rucimp/Cargo.toml

@@ -91,6 +91,7 @@ where
             loop {
                 let r = r.read(&mut bs).await;
                 if let Ok(n) = r {
+                    // tracing::trace!("stack got b {}", n);
                     let r = stack_sink.send((bs[..n]).to_vec()).await;
                     r.unwrap();
                 } else {

rucimp/src/map/tcp_ip_stack/mod.rs

@@ -1,5 +1,6 @@
 /*! see https://github.com/e1732a364fed/geosite-gfw
 */
+use anyhow::{bail, Context};
 use async_trait::async_trait;
 use ruci::map::fold::DMIterBox;
 use ruci::map::Data;
@@ -11,7 +12,6 @@ use tracing::debug;
 
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
-use std::error::Error;
 
 #[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct GeositeGfwConfig {
@@ -80,10 +80,7 @@ pub struct CheckResponse {
 }
 
 /// 异步访问 API
-pub async fn check_api(
-    config: &GeositeGfwConfig,
-    domain: &str,
-) -> Result<CheckResponse, Box<dyn Error>> {
+pub async fn check_api(config: &GeositeGfwConfig, domain: &str) -> anyhow::Result<CheckResponse> {
     let client = Client::new();
 
     let request_data = CheckRequest {
@@ -96,9 +93,22 @@ pub async fn check_api(
         .post(&config.api_url)
         .json(&request_data)
         .send()
-        .await?
-        .json::<CheckResponse>()
-        .await?;
+        .await
+        .context("send failed")?;
+
+    let full_body = response.bytes().await?;
+
+    let response = serde_json::from_slice(&full_body);
+
+    let response = match response {
+        Ok(r) => r,
+        Err(e) => {
+            bail!(
+                "parse body err: {e}, body is {}",
+                String::from_utf8_lossy(&full_body)
+            )
+        }
+    };
 
     debug!("geosite_gfw got response: {:?}", response);
     Ok(response)