ipc/native/src/napi/src/napi_remote_object.cpp

@@ -730,22 +730,6 @@ int NAPIRemoteObject::OnJsRemoteRequest(CallbackParam *jsParam)
                 param->result = ERR_UNKNOWN_TRANSACTION;
                 break;
             }
-            // Start to call promiseThen
-            napi_value then_return_value;
-            ret = napi_call_function(param->env, return_val, promiseThen, 1, &then_value, &then_return_value);
-            if (ret != napi_ok) {
-                ZLOGE(LOG_LABEL, "PromiseThen got exception");
-                param->result = ERR_UNKNOWN_TRANSACTION;
-                break;
-            }
-            // Create promiseCatch
-            napi_value promiseCatch = nullptr;
-            napi_get_named_property(param->env, return_val, "catch", &promiseCatch);
-            if (promiseCatch == nullptr) {
-                ZLOGE(LOG_LABEL, "get promiseCatch failed");
-                param->result = -1;
-                break;
-            }
             napi_value catch_value;
             ret = napi_create_function(param->env, "catchCallback",
                 NAPI_AUTO_LENGTH, CatchCallback, param, &catch_value);
@@ -754,15 +738,18 @@ int NAPIRemoteObject::OnJsRemoteRequest(CallbackParam *jsParam)
                 param->result = ERR_UNKNOWN_TRANSACTION;
                 break;
             }
-            // Start to call promiseCatch
-            napi_value catch_return_value;
-            ret = napi_call_function(param->env, return_val, promiseCatch, 1, &catch_value, &catch_return_value);
+            // Start to call promiseThen
+            napi_env env = param->env;
+            napi_value thenReturnValue;
+            constexpr uint32_t THEN_ARGC = 2;
+            napi_value thenArgv[THEN_ARGC] = {then_value, catch_value};
+            ret = napi_call_function(env, return_val, promiseThen, THEN_ARGC, thenArgv, &thenReturnValue);
             if (ret != napi_ok) {
-                ZLOGE(LOG_LABEL, "PromiseCatch got exception");
+                ZLOGE(LOG_LABEL, "PromiseThen got exception");
                 param->result = ERR_UNKNOWN_TRANSACTION;
                 break;
             }
-            napi_close_handle_scope(param->env, scope);
+            napi_close_handle_scope(env, scope);
             return;
         } while (0);