fix: refine codes

halajohn · halajohn · commit 19db159ca835 · 2025-04-23T17:53:41.000+08:00
diff --git a/core/src/ten_rust/src/build.rs b/core/src/ten_rust/src/build.rs
@@ -22,11 +22,11 @@ fn auto_gen_schema_bindings_from_c() {
     schema_header
         .push("include_internal/ten_utils/schema/bindings/rust/schema_proxy.h");
     if !schema_header.exists() {
-        println!(
-            "Path of schema_proxy.h: {}",
-            schema_header.to_str().unwrap()
+        println!("Path of schema_proxy.h: {}", schema_header.to_str().unwrap());
+        panic!(
+            "The //include_internal/ten_utils/schema/bindings/rust/\
+             schema_proxy.h does not exist."
         );
-        panic!("The //include_internal/ten_utils/schema/bindings/rust/schema_proxy.h does not exist.");
     }
 
     println!("cargo:rerun-if-changed={}", schema_header.to_str().unwrap());
@@ -121,7 +121,8 @@ fn auto_gen_schema_bindings_from_c() {
             }
             Err(e) => {
                 panic!(
-                    "Unable to move temporary bindings to final destination after {} attempts: {}",
+                    "Unable to move temporary bindings to final destination \
+                     after {} attempts: {}",
                     max_retries, e
                 );
             }
diff --git a/core/src/ten_rust/src/constants/mod.rs b/core/src/ten_rust/src/constants/mod.rs
@@ -11,14 +11,20 @@ pub const TELEMETRY_SERVER_START_RETRY_MAX_ATTEMPTS: u32 = 3;
 pub const TELEMETRY_SERVER_START_RETRY_INTERVAL: u64 = 1; // seconds
 
 pub const ERR_MSG_GRAPH_LOCALHOST_FORBIDDEN_IN_SINGLE_APP_MODE: &str =
-    "'localhost' is not allowed in graph definition, and the graph seems to be a single-app graph, just remove the 'app' field";
+    "'localhost' is not allowed in graph definition, and the graph seems to \
+     be a single-app graph, just remove the 'app' field";
 
 pub const ERR_MSG_GRAPH_LOCALHOST_FORBIDDEN_IN_MULTI_APP_MODE: &str =
-    "'localhost' is not allowed in graph definition, change the content of 'app' field to be consistent with 'ten::uri'";
+    "'localhost' is not allowed in graph definition, change the content of \
+     'app' field to be consistent with 'ten::uri'";
 
-pub const ERR_MSG_GRAPH_MIXED_APP_DECLARATIONS: &str = "Either all nodes should have 'app' declared, or none should, but not a mix of both.";
+pub const ERR_MSG_GRAPH_MIXED_APP_DECLARATIONS: &str =
+    "Either all nodes should have 'app' declared, or none should, but not a \
+     mix of both.";
 
-pub const ERR_MSG_GRAPH_APP_FIELD_EMPTY: &str = "the 'app' field can not be empty, remove the field if the graph is a single-app graph";
+pub const ERR_MSG_GRAPH_APP_FIELD_EMPTY: &str =
+    "the 'app' field can not be empty, remove the field if the graph is a \
+     single-app graph";
 
 pub const ERR_MSG_GRAPH_APP_FIELD_SHOULD_NOT_BE_DECLARED: &str =
     "the 'app' field should not be declared, as not any node has declared it";
diff --git a/core/src/ten_rust/src/crypto/algorithm/aes.rs b/core/src/ten_rust/src/crypto/algorithm/aes.rs
@@ -29,9 +29,7 @@ pub struct AesCtrCipher {
 pub fn new_aes_ctr_cipher(params: &str) -> Result<AesCtrCipher> {
     let config: AesCtrConfig = serde_json::from_str(params)?;
     let cipher = Aes128Ctr128BE::new(&config.key.into(), &config.nonce.into());
-    Ok(AesCtrCipher {
-        cipher: Mutex::new(cipher),
-    })
+    Ok(AesCtrCipher { cipher: Mutex::new(cipher) })
 }
 
 impl<'de> Deserialize<'de> for AesCtrConfig {
diff --git a/core/src/ten_rust/src/endpoint/mod.rs b/core/src/ten_rust/src/endpoint/mod.rs
@@ -103,9 +103,13 @@ pub extern "C" fn ten_endpoint_system_create(
                 }
 
                 eprintln!(
-              "Failed to bind to address: {}. Attempt {} of {}. Retrying in {} second...",
-              endpoint_str, attempts, max_attempts, TELEMETRY_SERVER_START_RETRY_INTERVAL
-          );
+                    "Failed to bind to address: {}. Attempt {} of {}. \
+                     Retrying in {} second...",
+                    endpoint_str,
+                    attempts,
+                    max_attempts,
+                    TELEMETRY_SERVER_START_RETRY_INTERVAL
+                );
                 std::thread::sleep(wait_duration);
             }
         }
diff --git a/core/src/ten_rust/src/env.rs b/core/src/ten_rust/src/env.rs
@@ -22,10 +22,7 @@ pub fn get_env() -> Result<EnvInfo> {
     let current_arch = Arch::from_str(std::env::consts::ARCH)?;
 
     // Create response object
-    let env_info = EnvInfo {
-        os: current_os,
-        arch: current_arch,
-    };
+    let env_info = EnvInfo { os: current_os, arch: current_arch };
 
     Ok(env_info)
 }
diff --git a/core/src/ten_rust/src/graph/check/connection_extensions_exist.rs b/core/src/ten_rust/src/graph/check/connection_extensions_exist.rs
@@ -28,7 +28,8 @@ impl Graph {
 
                 if !all_extensions.contains(&dest_extension) {
                     return Err(anyhow::anyhow!(
-                        "The extension declared in connections[{}].{}[{}] is not defined in nodes, extension: {}.",
+                        "The extension declared in connections[{}].{}[{}] is \
+                         not defined in nodes, extension: {}.",
                         conn_idx,
                         msg_type,
                         flow_idx,
@@ -83,7 +84,8 @@ impl Graph {
             );
             if !all_extensions.contains(&src_extension) {
                 return Err(anyhow::anyhow!(
-                    "The extension declared in connections[{}] is not defined in nodes, extension: {}.",
+                    "The extension declared in connections[{}] is not defined \
+                     in nodes, extension: {}.",
                     conn_idx,
                     connection.extension
                 ));
diff --git a/core/src/ten_rust/src/graph/check/connections_compatibility.rs b/core/src/ten_rust/src/graph/check/connections_compatibility.rs
@@ -54,7 +54,8 @@ impl Graph {
                 None if ignore_missing_apps => continue,
                 None => {
                     return Err(anyhow::anyhow!(
-                        "Extension addon [{}] is not found in the pkgs map, should not happen.",
+                        "Extension addon [{}] is not found in the pkgs map, \
+                         should not happen.",
                         dest_addon
                     ))
                 }
@@ -102,19 +103,20 @@ impl Graph {
             .get_addon_name_of_extension(src_app_uri, &connection.extension)?;
 
         let extension_pkg_info = match get_pkg_info_for_extension_addon(
-          pkgs_cache,
-          graph_app_base_dir,
-          &src_app_uri.as_ref().map(|s| s.to_string()),
-          src_addon,
+            pkgs_cache,
+            graph_app_base_dir,
+            &src_app_uri.as_ref().map(|s| s.to_string()),
+            src_addon,
         ) {
-          Some(pkg_info) => pkg_info,
-          None if ignore_missing_apps => return Ok(()),
-          None => {
-              return Err(anyhow::anyhow!(
-                  "Extension addon [{}] is not found in the pkgs map, should not happen.",
-                  src_addon
-              ))
-          }
+            Some(pkg_info) => pkg_info,
+            None if ignore_missing_apps => return Ok(()),
+            None => {
+                return Err(anyhow::anyhow!(
+                    "Extension addon [{}] is not found in the pkgs map, \
+                     should not happen.",
+                    src_addon
+                ))
+            }
         };
 
         // Check command flows.
diff --git a/core/src/ten_rust/src/graph/check/extension_uniqueness.rs b/core/src/ten_rust/src/graph/check/extension_uniqueness.rs
@@ -37,9 +37,12 @@ impl Graph {
                 // Check if this extension already exists in our tracking list
                 if all_extensions.contains(&unique_ext_name) {
                     return Err(anyhow::anyhow!(
-                      "Duplicated extension was found in nodes[{}], addon: {}, name: {}.",
-                      node_idx, node.addon, node.type_and_name.name
-                  ));
+                        "Duplicated extension was found in nodes[{}], addon: \
+                         {}, name: {}.",
+                        node_idx,
+                        node.addon,
+                        node.type_and_name.name
+                    ));
                 }
 
                 // Add this extension to our tracking list
diff --git a/core/src/ten_rust/src/graph/check/extension_uniqueness_in_connections.rs b/core/src/ten_rust/src/graph/check/extension_uniqueness_in_connections.rs
@@ -63,7 +63,8 @@ impl Graph {
             // Check if we've seen this extension before.
             if let Some(idx) = extensions.get(&extension) {
                 errors.push(format!(
-                    "extension '{}' is defined in connection[{}] and connection[{}], merge them into one section.",
+                    "extension '{}' is defined in connection[{}] and \
+                     connection[{}], merge them into one section.",
                     connection.extension, idx, conn_idx
                 ));
             } else {
diff --git a/core/src/ten_rust/src/graph/check/nodes_installation.rs b/core/src/ten_rust/src/graph/check/nodes_installation.rs
@@ -90,7 +90,8 @@ impl Graph {
         // Return error if there are any non-exempted missing packages.
         if !not_installed_pkgs.is_empty() {
             return Err(anyhow::anyhow!(
-                "The following packages are declared in nodes but not installed: {:?}.",
+                "The following packages are declared in nodes but not \
+                 installed: {:?}.",
                 not_installed_pkgs
             ));
         }
diff --git a/core/src/ten_rust/src/graph/msg_conversion/mod.rs b/core/src/ten_rust/src/graph/msg_conversion/mod.rs
@@ -77,14 +77,16 @@ impl MsgConversionRule {
             MsgConversionMode::FixedValue => {
                 if self.value.is_none() {
                     return Err(anyhow::anyhow!(
-                        "'value' field is required for the fixed_value conversion mode"
+                        "'value' field is required for the fixed_value \
+                         conversion mode"
                     ));
                 }
             }
             MsgConversionMode::FromOriginal => {
                 if self.original_path.is_none() {
                     return Err(anyhow::anyhow!(
-                        "'original_path' field is required for the from_original conversion mode"
+                        "'original_path' field is required for the \
+                         from_original conversion mode"
                     ));
                 }
 
diff --git a/core/src/ten_rust/src/interface/mod.rs b/core/src/ten_rust/src/interface/mod.rs
@@ -17,7 +17,10 @@ fn resolve_interface_ref(
 ) -> Result<serde_json::Value> {
     if let Some(ref_file_path) = ref_path.strip_prefix("file://") {
         if base_dir.is_empty() {
-            return Err(anyhow!("The base_dir can not be empty when resolving local file reference."));
+            return Err(anyhow!(
+                "The base_dir can not be empty when resolving local file \
+                 reference."
+            ));
         }
 
         let ref_file_full_path = Path::new(base_dir).join(ref_file_path);
@@ -38,9 +41,7 @@ fn resolve_interface_ref(
         return Err(anyhow!("Not supported yet."));
     }
 
-    Err(anyhow!(
-        "The ref path should start with 'file://' or 'https://'"
-    ))
+    Err(anyhow!("The ref path should start with 'file://' or 'https://'"))
 }
 
 /// Resolves the interface content.
diff --git a/core/src/ten_rust/src/pkg_info/manifest/api.rs b/core/src/ten_rust/src/pkg_info/manifest/api.rs
@@ -94,6 +94,9 @@ where
     if re.is_match(&msg_name) {
         Ok(msg_name)
     } else {
-        Err(serde::de::Error::custom("Invalid message name format, it needs to conform to the pattern ^[A-Za-z_][A-Za-z0-9_]*$"))
+        Err(serde::de::Error::custom(
+            "Invalid message name format, it needs to conform to the pattern \
+             ^[A-Za-z_][A-Za-z0-9_]*$",
+        ))
     }
 }
diff --git a/core/src/ten_rust/src/pkg_info/manifest/mod.rs b/core/src/ten_rust/src/pkg_info/manifest/mod.rs
@@ -270,8 +270,10 @@ fn extract_tags(map: &Map<String, Value>) -> Result<Option<Vec<String>>> {
                 // Validate tag string format.
                 if !TAG_REGEX.is_match(tag_str) {
                     return Err(anyhow!(
-                        "Invalid tag format: '{}'. Tags must contain only alphanumeric characters \
-                         and underscores, must not start with a digit, and can only have 'ten:' as prefix",
+                        "Invalid tag format: '{}'. Tags must contain only \
+                         alphanumeric characters and underscores, must not \
+                         start with a digit, and can only have 'ten:' as \
+                         prefix",
                         tag_str
                     ));
                 }
@@ -317,7 +319,8 @@ impl Manifest {
             // names within the same directory.
             if self.type_and_name.name != addon_folder_name {
                 return Err(anyhow!(format!(
-                    "the name of the folder '{}' and the package '{}' are different",
+                    "the name of the folder '{}' and the package '{}' are \
+                     different",
                     addon_folder_name, self.type_and_name.name
                 )));
             }
@@ -327,7 +330,8 @@ impl Manifest {
             if self.type_and_name.pkg_type.to_string() != addon_type_folder_name
             {
                 return Err(anyhow!(format!(
-                    "The folder name '{}' does not match the expected package type '{}'",
+                    "The folder name '{}' does not match the expected package \
+                     type '{}'",
                     addon_type_folder_name,
                     self.type_and_name.pkg_type.to_string(),
                 )));
@@ -374,10 +378,7 @@ pub fn parse_manifest_from_file<P: AsRef<Path>>(
         })?,
     )
     .with_context(|| {
-        format!(
-            "Failed to validate {}.",
-            manifest_file_path.as_ref().display()
-        )
+        format!("Failed to validate {}.", manifest_file_path.as_ref().display())
     })?;
 
     // Read the contents of the manifest.json file.
diff --git a/core/src/ten_rust/src/pkg_info/mod.rs b/core/src/ten_rust/src/pkg_info/mod.rs
@@ -197,33 +197,21 @@ fn collect_pkg_info_from_path(
             if pkgs_info.extension_pkgs_info.is_none() {
                 pkgs_info.extension_pkgs_info = Some(Vec::new());
             }
-            pkgs_info
-                .extension_pkgs_info
-                .as_mut()
-                .unwrap()
-                .push(pkg_info);
+            pkgs_info.extension_pkgs_info.as_mut().unwrap().push(pkg_info);
             Ok(())
         }
         PkgType::Protocol => {
             if pkgs_info.protocol_pkgs_info.is_none() {
                 pkgs_info.protocol_pkgs_info = Some(Vec::new());
             }
-            pkgs_info
-                .protocol_pkgs_info
-                .as_mut()
-                .unwrap()
-                .push(pkg_info);
+            pkgs_info.protocol_pkgs_info.as_mut().unwrap().push(pkg_info);
             Ok(())
         }
         PkgType::AddonLoader => {
             if pkgs_info.addon_loader_pkgs_info.is_none() {
                 pkgs_info.addon_loader_pkgs_info = Some(Vec::new());
             }
-            pkgs_info
-                .addon_loader_pkgs_info
-                .as_mut()
-                .unwrap()
-                .push(pkg_info);
+            pkgs_info.addon_loader_pkgs_info.as_mut().unwrap().push(pkg_info);
             Ok(())
         }
         PkgType::System => {
@@ -410,16 +398,13 @@ pub fn get_pkg_info_for_extension_addon<'a>(
     if let Some(pkg_info) = result {
         Some(pkg_info)
     } else if let Some(graph_app_base_dir) = graph_app_base_dir {
-        pkgs_cache
-            .get(graph_app_base_dir)
-            .and_then(|pkgs_info_in_app| {
-                pkgs_info_in_app.get_extensions().iter().find(|pkg_info| {
-                    pkg_info.manifest.type_and_name.pkg_type
-                        == PkgType::Extension
-                        && pkg_info.manifest.type_and_name.name
-                            == *extension_addon_name
-                })
+        pkgs_cache.get(graph_app_base_dir).and_then(|pkgs_info_in_app| {
+            pkgs_info_in_app.get_extensions().iter().find(|pkg_info| {
+                pkg_info.manifest.type_and_name.pkg_type == PkgType::Extension
+                    && pkg_info.manifest.type_and_name.name
+                        == *extension_addon_name
             })
+        })
     } else {
         None
     }
diff --git a/core/src/ten_rust/src/pkg_info/pkg_type_and_name.rs b/core/src/ten_rust/src/pkg_info/pkg_type_and_name.rs
@@ -21,10 +21,7 @@ pub struct PkgTypeAndName {
 
 impl Default for PkgTypeAndName {
     fn default() -> Self {
-        Self {
-            pkg_type: PkgType::Invalid,
-            name: String::new(),
-        }
+        Self { pkg_type: PkgType::Invalid, name: String::new() }
     }
 }
 
diff --git a/core/src/ten_rust/src/pkg_info/property/mod.rs b/core/src/ten_rust/src/pkg_info/property/mod.rs
@@ -75,10 +75,8 @@ pub fn parse_property_from_str(
         // Process the ten field manually instead of using
         // serde_json::from_value directly. Create a TenInProperty with empty
         // predefined_graphs.
-        let mut ten_in_property = TenInProperty {
-            predefined_graphs: None,
-            uri: None,
-        };
+        let mut ten_in_property =
+            TenInProperty { predefined_graphs: None, uri: None };
 
         // Get other fields from ten_value using serde.
         if let Value::Object(map) = ten_value {
@@ -142,8 +140,8 @@ fn validate_predefined_graphs(graphs: &[GraphInfo]) -> Result<()> {
             // Note: We're storing references to graph names, which is correct.
             if !seen_graph_names.insert(name) {
                 return Err(anyhow::anyhow!(
-                    "Duplicate predefined graph name detected: '{}'. \
-                    Each predefined_graph must have a unique 'name'.",
+                    "Duplicate predefined graph name detected: '{}'. Each \
+                     predefined_graph must have a unique 'name'.",
                     name
                 ));
             }
diff --git a/core/src/ten_rust/src/schema/store.rs b/core/src/ten_rust/src/schema/store.rs
diff --git a/core/src/ten_rust/tests/test_case/graph/mod.rs b/core/src/ten_rust/tests/test_case/graph/mod.rs
diff --git a/core/src/ten_rust/tests/test_case/interface.rs b/core/src/ten_rust/tests/test_case/interface.rs
diff --git a/core/src/ten_rust/tests/test_case/json_schema/mod.rs b/core/src/ten_rust/tests/test_case/json_schema/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,13 @@ pub extern "C" fn ten_endpoint_system_create(`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`eprintln!(`
`106`		`- "Failed to bind to address: {}. Attempt {} of {}. Retrying in {} second...",`
`107`		`- endpoint_str, attempts, max_attempts, TELEMETRY_SERVER_START_RETRY_INTERVAL`
`108`		`- );`
	`106`	`+ "Failed to bind to address: {}. Attempt {} of {}. \`
	`107`	`+ Retrying in {} second...",`
	`108`	`+ endpoint_str,`
	`109`	`+ attempts,`
	`110`	`+ max_attempts,`
	`111`	`+ TELEMETRY_SERVER_START_RETRY_INTERVAL`
	`112`	`+ );`
`109`	`113`	`std::thread::sleep(wait_duration);`
`110`	`114`	`}`
`111`	`115`	`}`