update

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 
 <!-- next-header -->
+## [2024.7.20] - 2024.7.20
+
+### Fixes
+
+- 修复部分没有端口的探针
+- tcp添加超时计时器
+- 更新依赖
+- 替换输出换行符
 
 ## [Unreleased] - ReleaseDate
 

engine/Cargo.toml

@@ -17,7 +17,7 @@ fancy-regex = { version = "0.13.0", default-features = false, features = [
 jsonpath-rust = "0.6.1"
 serde_json = "1"
 #git = "https://github.com/emo-crab/slinger",
-slinger = { version = "0.1.3", features = [
+slinger = { version = "0.1.4", features = [
   "serde",
   "cookie",
   "tls",

observer_ward/src/cli.rs

@@ -284,7 +284,7 @@ impl ObserverWardConfig {
   pub fn http_client_builder(&self) -> ClientBuilder {
     let mut client_builder = ClientBuilder::new();
     client_builder = client_builder.redirect(Policy::Custom(only_same_host));
-    client_builder = client_builder.timeout(Duration::from_secs(self.timeout));
+    client_builder = client_builder.timeout(Some(Duration::from_secs(self.timeout)));
     if let Ok(ua) = HeaderValue::from_str(&self.ua) {
       client_builder = client_builder.user_agent(ua);
     }

observer_ward/src/lib.rs

@@ -204,6 +204,7 @@ impl ClusterExecuteRunner {
     }
   }
 }
+
 // 处理http的探针
 impl ClusterExecuteRunner {
   fn http(
@@ -215,7 +216,6 @@ impl ClusterExecuteRunner {
     // 可能会有多个http，一般只有一个，多个会有flow控制
     for http in cluster.requests.http.iter() {
       let mut client_builder = http.http_option.builder_client();
-      client_builder = client_builder.timeout(Duration::from_secs(config.timeout));
       client_builder = client_builder.redirect(Policy::Custom(only_same_host));
       if let Ok(ua) = HeaderValue::from_str(&config.ua) {
         client_builder = client_builder.user_agent(ua);
@@ -250,6 +250,7 @@ impl ClusterExecuteRunner {
     Ok(())
   }
 }
+
 // 处理tcp的探针
 impl ClusterExecuteRunner {
   // 单个tcp
@@ -320,6 +321,7 @@ impl ClusterExecuteRunner {
     Ok(flag)
   }
 }
+
 // yaml字符串转字节
 fn input_to_byte(payload: &str) -> Vec<u8> {
   let mut buf = Vec::new();

observer_ward/src/output.rs

@@ -16,7 +16,7 @@ pub struct Output {
 fn set_to_string(set: &HashSet<String>) -> String {
   set
     .iter()
-    .map(|x| x.trim().to_string())
+    .map(|x| x.trim().to_string().replace("\r\n", " ").replace('\t', ""))
     .collect::<HashSet<_>>()
     .iter()
     .cloned()