fix: remove is_cmd_connected api (#356)

* fix: remove is_cmd_connected api * fix: refine codes --------- Co-authored-by: Hu Yueh-Wei <wei.hu.tw@gmail.com>
TEN-framework · Dec 2, 2024 · fa55e28 · fa55e28
1 parent e8a7363
commit fa55e28
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 261 deletions.
diff --git a/core/include/ten_runtime/binding/cpp/detail/ten_env.h b/core/include/ten_runtime/binding/cpp/detail/ten_env.h
@@ -640,12 +640,6 @@ class ten_env_t {
     return set_property_impl(path, ten_value_create_buf_with_move(buf), err);
   }
 
-  bool is_cmd_connected(const char *cmd_name, error_t *err = nullptr) {
-    TEN_ASSERT(c_ten_env, "Should not happen.");
-    return ten_env_is_cmd_connected(
-        c_ten_env, cmd_name, err != nullptr ? err->get_c_error() : nullptr);
-  }
-
   bool on_configure_done(error_t *err = nullptr) {
     TEN_ASSERT(c_ten_env, "Should not happen.");
 

diff --git a/core/include_internal/ten_runtime/binding/python/ten_env/ten_env.h b/core/include_internal/ten_runtime/binding/python/ten_env/ten_env.h
@@ -87,9 +87,6 @@ TEN_RUNTIME_PRIVATE_API PyObject *ten_py_ten_env_set_property_from_json(
 TEN_RUNTIME_PRIVATE_API PyObject *ten_py_ten_env_is_property_exist(
     PyObject *self, PyObject *args);
 
-TEN_RUNTIME_PRIVATE_API PyObject *ten_py_ten_env_is_cmd_connected(
-    PyObject *self, PyObject *args);
-
 TEN_RUNTIME_PRIVATE_API PyObject *ten_py_ten_env_get_property_int(
     PyObject *self, PyObject *args);
 

diff --git a/core/src/ten_runtime/binding/go/interface/ten/ten_env.go b/core/src/ten_runtime/binding/go/interface/ten/ten_env.go
@@ -43,8 +43,6 @@ type TenEnv interface {
 	OnDeinitDone() error
 	OnCreateInstanceDone(instance any, context uintptr) error
 
-	IsCmdConnected(cmdName string) (bool, error)
-
 	iProperty
 	InitPropertyFromJSONBytes(value []byte) error
 
@@ -359,15 +357,6 @@ func (p *tenEnv) OnCreateInstanceDone(instance any, context uintptr) error {
 	return nil
 }
 
-func (p *tenEnv) IsCmdConnected(cmdName string) (bool, error) {
-	return p.process(func() any {
-		cName := C.CString(cmdName)
-		defer C.free(unsafe.Pointer(cName))
-
-		return bool(C.ten_go_ten_env_is_cmd_connected(p.cPtr, cName))
-	}).(bool), nil
-}
-
 func (p *tenEnv) String() string {
 	cString := C.ten_go_ten_env_debug_info(p.cPtr)
 	defer C.free(unsafe.Pointer(cString))

diff --git a/core/src/ten_runtime/binding/go/interface/ten/ten_env.h b/core/src/ten_runtime/binding/go/interface/ten/ten_env.h
@@ -58,9 +58,6 @@ ten_go_error_t ten_go_ten_env_send_audio_frame(
     uintptr_t bridge_addr, uintptr_t audio_frame_bridge_addr,
     ten_go_handle_t handler_id);
 
-bool ten_go_ten_env_is_cmd_connected(uintptr_t bridge_addr,
-                                     const char *cmd_name);
-
 bool ten_go_ten_env_addon_create_extension(uintptr_t bridge_addr,
                                            const char *addon_name,
                                            const char *instance_name,

diff --git a/core/src/ten_runtime/binding/go/native/ten_env/ten_env_is_cmd_connected.c b/core/src/ten_runtime/binding/go/native/ten_env/ten_env_is_cmd_connected.c
diff --git a/core/src/ten_runtime/binding/python/interface/ten/libten_runtime_python.pyi b/core/src/ten_runtime/binding/python/interface/ten/libten_runtime_python.pyi
@@ -115,7 +115,6 @@ class _TenEnv:
     def return_result(self, result: _CmdResult, target_cmd: _Cmd) -> None: ...
     def return_result_directly(self, result: _CmdResult) -> None: ...
     def is_property_exist(self, path: str) -> bool: ...
-    def is_cmd_connected(self, msg_name: str) -> bool: ...
     def init_property_from_json(self, json_str: str) -> None: ...
     def log(
         self,

diff --git a/core/src/ten_runtime/binding/python/interface/ten/ten_env.py b/core/src/ten_runtime/binding/python/interface/ten/ten_env.py
@@ -98,9 +98,6 @@ def return_result_directly(self, result: CmdResult) -> None:
     def is_property_exist(self, path: str) -> bool:
         return self._internal.is_property_exist(path)
 
-    def is_cmd_connected(self, msg_name: str) -> bool:
-        return self._internal.is_cmd_connected(msg_name)
-
     def get_property_int(self, path: str) -> int:
         return self._internal.get_property_int(path)
 

diff --git a/core/src/ten_runtime/binding/python/native/ten_env/ten_env.c b/core/src/ten_runtime/binding/python/native/ten_env/ten_env.c
@@ -173,7 +173,6 @@ PyTypeObject *ten_py_ten_env_type(void) {
        NULL},
       {"is_property_exist", ten_py_ten_env_is_property_exist, METH_VARARGS,
        NULL},
-      {"is_cmd_connected", ten_py_ten_env_is_cmd_connected, METH_VARARGS, NULL},
       {"init_property_from_json", ten_py_ten_env_init_property_from_json,
        METH_VARARGS, NULL},
       {"log", ten_py_ten_env_log, METH_VARARGS, NULL},

diff --git a/core/src/ten_runtime/binding/python/native/ten_env/ten_env_is_cmd_connected.c b/core/src/ten_runtime/binding/python/native/ten_env/ten_env_is_cmd_connected.c
diff --git a/packages/example_extensions/simple_http_server_cpp/src/main.cc b/packages/example_extensions/simple_http_server_cpp/src/main.cc
@@ -634,19 +634,19 @@ void send_ten_msg_with_req_body(
         // command.
         cmd->from_json(cmd_json.dump().c_str());
 
-        if (cmd->get_type() == TEN_MSG_TYPE_CMD &&
-            !ten_env.is_cmd_connected(cmd->get_name())) {
-          prepare_response_data_from_ten_world(http_session_data,
-                                               "The command is not supported.");
-          return;
-        }
-
         // Send out the command to the TEN runtime.
         ten_env.send_cmd(
             std::move(cmd),
             [http_session_data](ten::ten_env_t &ten_env,
                                 std::unique_ptr<ten::cmd_result_t> cmd,
-                                ten::error_t * /*error*/) {
+                                ten::error_t *error) {
+              if (error != nullptr) {
+                prepare_response_data_from_ten_world(
+                    http_session_data, "The command is not supported. err:" +
+                                           std::string(error->errmsg()));
+                return;
+              }
+
               auto *ext = static_cast<http_server_extension_t *>(
                   ten_env.get_attached_target());
               assert(ext && "Failed to get the attached extension.");
@@ -673,19 +673,19 @@ void send_ten_msg_without_req_body(
         cmd->set_property("method", method);
         cmd->set_property("url", http_session_data->url);
 
-        if (cmd->get_type() == TEN_MSG_TYPE_CMD &&
-            !ten_env.is_cmd_connected(cmd->get_name())) {
-          prepare_response_data_from_ten_world(http_session_data,
-                                               "The command is not supported.");
-          return;
-        }
-
         // Send out the command to the TEN runtime.
         ten_env.send_cmd(
             std::move(cmd),
             [http_session_data](ten::ten_env_t &ten_env,
                                 std::unique_ptr<ten::cmd_result_t> cmd,
-                                ten::error_t * /*error*/) {
+                                ten::error_t *error) {
+              if (error != nullptr) {
+                prepare_response_data_from_ten_world(
+                    http_session_data, "The command is not supported. err:" +
+                                           std::string(error->errmsg()));
+                return;
+              }
+
               auto *ext = static_cast<http_server_extension_t *>(
                   ten_env.get_attached_target());
               assert(ext && "Failed to get the attached extension.");

diff --git a/...ly_cgo_call_go/frequently_cgo_call_go_app/ten_packages/extension/extension_b/extension.go b/...ly_cgo_call_go/frequently_cgo_call_go_app/ten_packages/extension/extension_b/extension.go
@@ -31,11 +31,6 @@ func (p *extensionB) OnCmd(
 	go func() {
 		fmt.Println("extensionB OnCmd")
 
-		connected, err := tenEnv.IsCmdConnected("cmd_not_exist")
-		if err != nil || connected {
-			panic("Should not happen.")
-		}
-
 		cmdName, _ := cmd.GetName()
 		if cmdName == "B" {
 			var count uint32 = 0

diff --git a/...nsion_basic_python_app/ten_packages/extension/default_async_extension_python/extension.py b/...nsion_basic_python_app/ten_packages/extension/default_async_extension_python/extension.py
@@ -38,9 +38,6 @@ async def on_cmd(self, ten_env: AsyncTenEnv, cmd: Cmd) -> None:
         # Mock async operation, e.g. network, file I/O.
         await asyncio.sleep(0.5)
 
-        assert ten_env.is_cmd_connected("hello") is True
-        assert ten_env.is_cmd_connected("unknown_cmd") is False
-
         # Send a new command to other extensions and wait for the result. The
         # result will be returned to the original sender.
         new_cmd = Cmd.create("hello")

diff --git a/tests/ten_runtime/smoke/extension_test/command/command_check_cmd_out.cc b/tests/ten_runtime/smoke/extension_test/command/command_check_cmd_out.cc
@@ -21,11 +21,8 @@ class test_extension_1 : public ten::extension_t {
 
   void on_cmd(ten::ten_env_t &ten_env,
               std::unique_ptr<ten::cmd_t> cmd) override {
-    const auto *cmd_name = cmd->get_name();
-    auto res = ten_env.is_cmd_connected(cmd_name);
-    if (res) {
-      ten_env.send_cmd(std::move(cmd));
-    } else {
+    auto rc = ten_env.send_cmd(std::move(cmd));
+    if (!rc) {
       auto cmd_result = ten::cmd_result_t::create(TEN_STATUS_CODE_OK);
       cmd_result->set_property("detail", "can not find a way out");
       ten_env.return_result(std::move(cmd_result), std::move(cmd));