Solve bug in trampoline callback heap, and add test for rejection.

Author: viferga

source/loaders/node_loader/source/node_loader_impl.cpp

@@ -1134,22 +1134,13 @@ napi_value node_loader_impl_async_future_resolve(loader_impl_node node_impl, fut
 {
 	napi_value result;
 
-	napi_status status;
-
 	value arg, ret;
 
-	napi_handle_scope handle_scope;
-
 	if (node_impl == NULL || resolve == NULL)
 	{
 		return nullptr;
 	}
 
-	/* Create scope */
-	status = napi_open_handle_scope(node_impl->env, &handle_scope);
-
-	node_loader_impl_exception(node_impl->env, status);
-
 	/* Convert the argument to a value */
 	arg = node_loader_impl_napi_to_value(node_impl, node_impl->env, v);
 
@@ -1167,11 +1158,6 @@ napi_value node_loader_impl_async_future_resolve(loader_impl_node node_impl, fut
 	/* Return the result */
 	result = node_loader_impl_value_to_napi(node_impl, node_impl->env, ret);
 
-	/* Close scope */
-	status = napi_close_handle_scope(node_impl->env, handle_scope);
-
-	node_loader_impl_exception(node_impl->env, status);
-
 	/* Destroy return value */
 	value_type_destroy(ret);
 
@@ -1182,22 +1168,13 @@ napi_value node_loader_impl_async_future_reject(loader_impl_node node_impl, futu
 {
 	napi_value result;
 
-	napi_status status;
-
 	value arg, ret;
 
-	napi_handle_scope handle_scope;
-
 	if (node_impl == NULL || reject == NULL)
 	{
 		return nullptr;
 	}
 
-	/* Create scope */
-	status = napi_open_handle_scope(node_impl->env, &handle_scope);
-
-	node_loader_impl_exception(node_impl->env, status);
-
 	/* Convert the argument to a value */
 	arg = node_loader_impl_napi_to_value(node_impl, node_impl->env, v);
 
@@ -1215,11 +1192,6 @@ napi_value node_loader_impl_async_future_reject(loader_impl_node node_impl, futu
 	/* Return the result */
 	result = node_loader_impl_value_to_napi(node_impl, node_impl->env, ret);
 
-	/* Close scope */
-	status = napi_close_handle_scope(node_impl->env, handle_scope);
-
-	node_loader_impl_exception(node_impl->env, status);
-
 	/* Destroy return value */
 	value_type_destroy(ret);
 

source/tests/metacall_node_async_test/source/metacall_node_async_test.cpp

@@ -43,7 +43,10 @@ TEST_F(metacall_node_async_test, DefaultConstructor)
 			"function f(x) {\n"
 			"\treturn new Promise(r => console.log(`Promise executed: ${util.inspect(r)} -> ${x}`) || r(x));\n"
 			"}\n"
-			"module.exports = { f };\n";
+			"function g(x) {\n"
+			"\treturn new Promise((_, r) => console.log(`Promise executed: ${util.inspect(r)} -> ${x}`) || r(x));\n"
+			"}\n"
+			"module.exports = { f, g };\n";
 
 		EXPECT_EQ((int) 0, (int) metacall_load_from_memory("node", buffer, sizeof(buffer), NULL));
 
@@ -59,14 +62,13 @@ TEST_F(metacall_node_async_test, DefaultConstructor)
 			234
 		};
 
+		/* Test resolve */
 		void * future = metacall_async("f", args);
 
-		metacall_value_destroy(args[0]);
-
 		EXPECT_NE((void *) NULL, (void *) future);
 
 		EXPECT_EQ((enum metacall_value_id) metacall_value_id(future), (enum metacall_value_id) METACALL_FUTURE);
-
+
 		void * ret = metacall_await(future, [](void * result, void * data) -> void * {
 			EXPECT_NE((void *) NULL, (void *) result);
 
@@ -99,7 +101,50 @@ TEST_F(metacall_node_async_test, DefaultConstructor)
 
 		EXPECT_EQ((enum metacall_value_id) metacall_value_id(ret), (enum metacall_value_id) METACALL_FUTURE);
 
+		metacall_value_destroy(ret);
+
+		/* Test reject */
+		future = metacall_async("g", args);
+
+		EXPECT_NE((void *) NULL, (void *) future);
+
+		EXPECT_EQ((enum metacall_value_id) metacall_value_id(future), (enum metacall_value_id) METACALL_FUTURE);
+
+		ret = metacall_await(future, [](void *, void *) -> void * {
+			int this_should_never_be_executed = 0;
+
+			EXPECT_EQ((int) 1, (int) this_should_never_be_executed);
+
+			printf("Resolve C Callback\n");
+
+			return NULL;
+		}, [](void * result, void * data) -> void * {
+			EXPECT_NE((void *) NULL, (void *) result);
+
+			EXPECT_EQ((enum metacall_value_id) metacall_value_id(result), (enum metacall_value_id) METACALL_DOUBLE);
+
+			EXPECT_EQ((double) 10.0, (double) metacall_value_to_double(result));
+
+			EXPECT_NE((void *) NULL, (void *) data);
+
+			struct async_context * ctx = static_cast<struct async_context *>(data);
+
+			EXPECT_EQ((int) 234, (int) ctx->value);
+
+			printf("Reject C Callback\n");
+
+			return metacall_value_create_double(15.0);
+		}, static_cast<void *>(&ctx));
+
+		metacall_value_destroy(future);
+
+		EXPECT_NE((void *) NULL, (void *) ret);
+
+		EXPECT_EQ((enum metacall_value_id) metacall_value_id(ret), (enum metacall_value_id) METACALL_FUTURE);
+
 		metacall_value_destroy(ret);
+
+		metacall_value_destroy(args[0]);
 	}
 	#endif /* OPTION_BUILD_LOADERS_NODE */