refactor: remove interface-related code and definitions across multiple files (#1048)

Author: halajohn

core/include_internal/ten_runtime/common/constant_str.h

@@ -12,7 +12,6 @@
 #define TEN_STR_CMD "cmd"
 #define TEN_STR_DATA "data"
 #define TEN_STR_VIDEO_FRAME "video_frame"
-#define TEN_STR_INTERFACE "interface"
 #define TEN_STR_AUDIO_FRAME "audio_frame"
 
 // Message relevant fields.
@@ -45,8 +44,6 @@
 #define TEN_STR_DATA_OUT "data_out"
 #define TEN_STR_VIDEO_FRAME_IN "video_frame_in"
 #define TEN_STR_VIDEO_FRAME_OUT "video_frame_out"
-#define TEN_STR_INTERFACE_IN "interface_in"
-#define TEN_STR_INTERFACE_OUT "interface_out"
 #define TEN_STR_AUDIO_FRAME_IN "audio_frame_in"
 #define TEN_STR_AUDIO_FRAME_OUT "audio_frame_out"
 

core/include_internal/ten_runtime/extension/extension.h

@@ -228,10 +228,6 @@ struct ten_extension_t {
   void *user_data;
 };
 
-TEN_RUNTIME_PRIVATE_API bool
-ten_extension_determine_and_merge_all_interface_dest_extension(
-    ten_extension_t *self);
-
 TEN_RUNTIME_PRIVATE_API void ten_extension_on_init(ten_extension_t *self);
 
 TEN_RUNTIME_PRIVATE_API void ten_extension_on_start(ten_extension_t *self);

core/include_internal/ten_runtime/extension/msg_dest_info/all_msg_type_dest_info.h

@@ -17,7 +17,6 @@ typedef struct ten_all_msg_type_dest_info_t {
   ten_list_t data;         // ten_shared_ptr_t of ten_msg_dest_info_t
   ten_list_t video_frame;  // ten_shared_ptr_t of ten_msg_dest_info_t
   ten_list_t audio_frame;  // ten_shared_ptr_t of ten_msg_dest_info_t
-  ten_list_t interface;    // ten_shared_ptr_t of ten_msg_dest_info_t
 } ten_all_msg_type_dest_info_t;
 
 TEN_RUNTIME_PRIVATE_API void ten_all_msg_type_dest_info_init(

core/include_internal/ten_runtime/schema_store/interface.h

@@ -50,12 +50,6 @@ typedef struct ten_schema_store_t {
   ten_hashtable_t video_frame_out;
   ten_hashtable_t audio_frame_in;
   ten_hashtable_t audio_frame_out;
-
-  // Key is the interface name, the type of value is `ten_interface_schema_t`.
-  // Since this is a schema store, the interface_in/out here must be the
-  // interface definitions after expanding the `$ref`.
-  ten_hashtable_t interface_in;
-  ten_hashtable_t interface_out;
 } ten_schema_store_t;
 
 TEN_RUNTIME_PRIVATE_API bool ten_schema_store_check_integrity(
@@ -66,13 +60,6 @@ TEN_RUNTIME_API void ten_schema_store_init(ten_schema_store_t *self);
 TEN_RUNTIME_API bool ten_schema_store_set_schema_definition(
     ten_schema_store_t *self, ten_value_t *schema_def, ten_error_t *err);
 
-/**
- * @param schema_def The definition defined in the `api` section.
- */
-TEN_RUNTIME_API bool ten_schema_store_set_interface_schema_definition(
-    ten_schema_store_t *self, ten_value_t *schema_def, const char *base_dir,
-    ten_error_t *err);
-
 TEN_RUNTIME_API void ten_schema_store_deinit(ten_schema_store_t *self);
 
 /**
@@ -104,14 +91,3 @@ TEN_RUNTIME_API bool ten_schema_store_adjust_properties(
 TEN_RUNTIME_API ten_msg_schema_t *ten_schema_store_get_msg_schema(
     ten_schema_store_t *self, TEN_MSG_TYPE msg_type, const char *msg_name,
     bool is_msg_out);
-
-/**
- * @brief Retrieve all msg names belonging to the interface.
- *
- * @return Whether the interface is found.
- */
-TEN_RUNTIME_PRIVATE_API bool
-ten_schema_store_get_all_msg_names_in_interface_out(ten_schema_store_t *self,
-                                                    TEN_MSG_TYPE msg_type,
-                                                    const char *interface_name,
-                                                    ten_list_t *msg_names);

core/include_internal/ten_runtime/schema_store/store.h

@@ -29,10 +29,6 @@ TEN_RUST_PRIVATE_API bool ten_cipher_encrypt_inplace(Cipher *cipher_ptr,
                                                      uint8_t *data,
                                                      uintptr_t data_len);
 
-TEN_RUST_PRIVATE_API bool ten_interface_schema_resolve_definition(
-    const char *content, const char *base_dir, const char **out_content,
-    const char **out_err_msg);
-
 TEN_RUST_PRIVATE_API char *ten_remove_json_comments(
     const char *json_with_comments);
 

core/include_internal/ten_rust/ten_rust.h

@@ -35,7 +35,6 @@
 #include "include_internal/ten_runtime/path/result_return_policy.h"
 #include "include_internal/ten_runtime/schema_store/store.h"
 #include "include_internal/ten_runtime/ten_env/ten_env.h"
-#include "include_internal/ten_utils/log/log.h"
 #include "ten_runtime/addon/addon.h"
 #include "ten_runtime/app/app.h"
 #include "ten_runtime/common/error_code.h"
@@ -211,128 +210,6 @@ void ten_extension_destroy(ten_extension_t *self) {
   TEN_FREE(self);
 }
 
-static bool ten_extension_check_if_msg_dests_have_msg_names(
-    ten_extension_t *self, ten_list_t *msg_dests, ten_list_t *msg_names) {
-  TEN_ASSERT(msg_dests && msg_names, "Invalid argument.");
-
-  ten_list_foreach (msg_dests, iter) {
-    ten_shared_ptr_t *shared_msg_dest = ten_smart_ptr_listnode_get(iter.node);
-    ten_msg_dest_info_t *msg_dest = ten_shared_ptr_get_data(shared_msg_dest);
-    TEN_ASSERT(msg_dest && ten_msg_dest_info_check_integrity(msg_dest),
-               "Invalid argument.");
-
-    ten_listnode_t *node = ten_list_find_ptr_custom(msg_names, &msg_dest->name,
-                                                    ten_string_is_equal);
-    if (node) {
-      TEN_ASSERT(0, "Extension (%s) has duplicated msg name (%s) in dest info.",
-                 ten_extension_get_name(self, true),
-                 ten_string_get_raw_str(&msg_dest->name));
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static bool ten_extension_merge_interface_dest_to_msg(
-    ten_extension_t *self, ten_extension_context_t *extension_context,
-    ten_list_iterator_t iter, TEN_MSG_TYPE msg_type, ten_list_t *msg_dests) {
-  TEN_ASSERT(
-      self && ten_extension_check_integrity(self, true) && extension_context,
-      "Should not happen.");
-
-  ten_msg_dest_info_t *interface_dest =
-      ten_shared_ptr_get_data(ten_smart_ptr_listnode_get(iter.node));
-  TEN_ASSERT(interface_dest, "Should not happen.");
-
-  ten_string_t *interface_name = &interface_dest->name;
-  TEN_ASSERT(!ten_string_is_empty(interface_name), "Should not happen.");
-
-  ten_list_t all_msg_names_in_interface_out = TEN_LIST_INIT_VAL;
-  bool interface_found = ten_schema_store_get_all_msg_names_in_interface_out(
-      &self->schema_store, msg_type, ten_string_get_raw_str(interface_name),
-      &all_msg_names_in_interface_out);
-  if (!interface_found) {
-    TEN_ASSERT(0, "Extension uses an undefined output interface (%s).",
-               ten_string_get_raw_str(interface_name));
-    return false;
-  }
-
-  if (ten_list_is_empty(&all_msg_names_in_interface_out)) {
-    // The interface does not define any message of this type, it's legal.
-    return true;
-  }
-
-  if (ten_extension_check_if_msg_dests_have_msg_names(
-          self, msg_dests, &all_msg_names_in_interface_out)) {
-    TEN_ASSERT(0, "Should not happen.");
-    return false;
-  }
-
-  ten_list_foreach (&all_msg_names_in_interface_out, iter) {
-    ten_string_t *msg_name = ten_ptr_listnode_get(iter.node);
-    TEN_ASSERT(msg_name, "Should not happen.");
-
-    ten_msg_dest_info_t *msg_dest =
-        ten_msg_dest_info_create(ten_string_get_raw_str(msg_name));
-
-    ten_list_foreach (&interface_dest->dest, iter_dest) {
-      ten_weak_ptr_t *shared_dest_extension_info =
-          ten_smart_ptr_listnode_get(iter_dest.node);
-      ten_list_push_smart_ptr_back(&msg_dest->dest, shared_dest_extension_info);
-    }
-
-    ten_shared_ptr_t *shared_msg_dest =
-        ten_shared_ptr_create(msg_dest, ten_msg_dest_info_destroy);
-    ten_list_push_smart_ptr_back(msg_dests, shared_msg_dest);
-    ten_shared_ptr_destroy(shared_msg_dest);
-  }
-
-  ten_list_clear(&all_msg_names_in_interface_out);
-
-  return true;
-}
-
-bool ten_extension_determine_and_merge_all_interface_dest_extension(
-    ten_extension_t *self) {
-  TEN_ASSERT(self && ten_extension_check_integrity(self, true),
-             "Invalid argument.");
-  TEN_ASSERT(self->state == TEN_EXTENSION_STATE_ON_CONFIGURE_DONE,
-             "Extension should be on_configure_done.");
-
-  if (!self->extension_info) {
-    return true;
-  }
-
-  ten_list_foreach (&self->extension_info->msg_dest_info.interface, iter) {
-    if (!ten_extension_merge_interface_dest_to_msg(
-            self, self->extension_context, iter, TEN_MSG_TYPE_CMD,
-            &self->extension_info->msg_dest_info.cmd)) {
-      return false;
-    }
-
-    if (!ten_extension_merge_interface_dest_to_msg(
-            self, self->extension_context, iter, TEN_MSG_TYPE_DATA,
-            &self->extension_info->msg_dest_info.data)) {
-      return false;
-    }
-
-    if (!ten_extension_merge_interface_dest_to_msg(
-            self, self->extension_context, iter, TEN_MSG_TYPE_VIDEO_FRAME,
-            &self->extension_info->msg_dest_info.video_frame)) {
-      return false;
-    }
-
-    if (!ten_extension_merge_interface_dest_to_msg(
-            self, self->extension_context, iter, TEN_MSG_TYPE_AUDIO_FRAME,
-            &self->extension_info->msg_dest_info.audio_frame)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 static ten_msg_dest_info_t *ten_extension_get_msg_dests_from_graph_internal(
     ten_list_t *dest_info_list, ten_shared_ptr_t *msg) {
   TEN_ASSERT(dest_info_list && msg, "Should not happen.");

core/src/ten_runtime/extension/extension.c

@@ -352,11 +352,6 @@ static ten_shared_ptr_t *ten_extension_info_clone_dest(
     return NULL;
   }
 
-  if (!copy_msg_dest(&exist_extension_info->msg_dest_info.interface,
-                     &self->msg_dest_info.interface, extensions_info, err)) {
-    return NULL;
-  }
-
   return exist_dest;
 }
 

core/src/ten_runtime/extension/extension_info/extension_info.c

@@ -94,7 +94,6 @@ int ten_extension_info_connections_to_json(ten_extension_info_t *self,
       ten_list_is_empty(&self->msg_dest_info.data) &&
       ten_list_is_empty(&self->msg_dest_info.video_frame) &&
       ten_list_is_empty(&self->msg_dest_info.audio_frame) &&
-      ten_list_is_empty(&self->msg_dest_info.interface) &&
       ten_list_is_empty(&self->msg_conversion_contexts)) {
     return 0;
   }
@@ -160,17 +159,5 @@ int ten_extension_info_connections_to_json(ten_extension_info_t *self,
     }
   }
 
-  if (!ten_list_is_empty(&self->msg_dest_info.interface)) {
-    ten_json_t interface_dest_json = TEN_JSON_INIT_VAL(json->ctx, false);
-    ten_json_object_peek_or_create_array(json, TEN_STR_INTERFACE,
-                                         &interface_dest_json);
-
-    bool success = pack_msg_dest(self, &self->msg_dest_info.interface,
-                                 &interface_dest_json, err);
-    if (!success) {
-      return -1;
-    }
-  }
-
   return 1;
 }

core/src/ten_runtime/extension/extension_info/json.c

@@ -195,17 +195,6 @@ ten_shared_ptr_t *ten_extension_info_parse_connection_src_part_from_value(
     }
   }
 
-  // Parse 'interface'.
-  ten_value_t *interface_value =
-      ten_value_object_peek(value, TEN_STR_INTERFACE);
-  if (interface_value) {
-    if (!parse_msg_dest_value(interface_value, extensions_info,
-                              &extension_info->msg_dest_info.interface,
-                              extension_info, err)) {
-      return NULL;
-    }
-  }
-
   return self;
 }
 
@@ -388,7 +377,6 @@ ten_value_t *ten_extension_info_connection_to_value(ten_extension_info_t *self,
       ten_list_is_empty(&self->msg_dest_info.data) &&
       ten_list_is_empty(&self->msg_dest_info.video_frame) &&
       ten_list_is_empty(&self->msg_dest_info.audio_frame) &&
-      ten_list_is_empty(&self->msg_dest_info.interface) &&
       ten_list_is_empty(&self->msg_conversion_contexts)) {
     return NULL;
   }
@@ -413,9 +401,6 @@ ten_value_t *ten_extension_info_connection_to_value(ten_extension_info_t *self,
   //   ],
   //   "audio_frame": [
   //     ...
-  //   ],
-  //   "interface": [
-  //     ...
   //   ]
   // }
   ten_list_t kv_list = TEN_LIST_INIT_VAL;
@@ -503,19 +488,6 @@ ten_value_t *ten_extension_info_connection_to_value(ten_extension_info_t *self,
         (ten_ptr_listnode_destroy_func_t)ten_value_kv_destroy);
   }
 
-  // Parse 'interface'
-  if (!ten_list_is_empty(&self->msg_dest_info.interface)) {
-    ten_value_t *interface_dest_value =
-        pack_msg_dest(self, &self->msg_dest_info.interface, err);
-    if (!interface_dest_value) {
-      return NULL;
-    }
-
-    ten_list_push_ptr_back(
-        &kv_list, ten_value_kv_create(TEN_STR_INTERFACE, interface_dest_value),
-        (ten_ptr_listnode_destroy_func_t)ten_value_kv_destroy);
-  }
-
   ten_value_t *result = ten_value_create_object_with_move(&kv_list);
   TEN_ASSERT(result, "Should not happen.");