Solve more issues with node loader, the refactor is working now.

Author: viferga

source/loaders/node_loader/source/node_loader_impl.cpp

@@ -1572,19 +1572,22 @@ void function_node_interface_destroy(function func, function_impl impl)
 		return;
 	}
 
-	loader_impl_node node_impl = node_func->node_impl;
-	loader_impl_async_func_destroy_safe_type func_destroy_safe(node_impl, node_func);
-
-	/* Check if we are in the JavaScript thread */
-	if (node_impl->js_thread_id == std::this_thread::get_id())
-	{
-		/* We are already in the V8 thread, we can call safely */
-		node_loader_impl_func_destroy_safe(node_impl->env, &func_destroy_safe);
-	}
-	else
+	if (loader_is_destroyed(node_func->node_impl->impl) != 0)
 	{
-		/* Submit the task to the async queue */
-		loader_impl_threadsafe_invoke_type<loader_impl_async_func_destroy_safe_type> invoke(node_impl->threadsafe_func_destroy, func_destroy_safe);
+		loader_impl_node node_impl = node_func->node_impl;
+		loader_impl_async_func_destroy_safe_type func_destroy_safe(node_impl, node_func);
+
+		/* Check if we are in the JavaScript thread */
+		if (node_impl->js_thread_id == std::this_thread::get_id())
+		{
+			/* We are already in the V8 thread, we can call safely */
+			node_loader_impl_func_destroy_safe(node_impl->env, &func_destroy_safe);
+		}
+		else
+		{
+			/* Submit the task to the async queue */
+			loader_impl_threadsafe_invoke_type<loader_impl_async_func_destroy_safe_type> invoke(node_impl->threadsafe_func_destroy, func_destroy_safe);
+		}
 	}
 
 	/* Free node function arguments */

source/loaders/ts_loader/source/ts_loader_impl.cpp

@@ -402,13 +402,10 @@ static void *ts_loader_impl_destroy_unload_children_cb(size_t size, void *args[]
 	else
 	{
 		loader_impl impl = static_cast<loader_impl>(metacall_value_to_ptr(args[0]));
-		/* TODO: Should we let Node Loader destroy our handle? */
-		/*void *ts_impl = static_cast<void *>(loader_impl_get(impl));*/
 
 		loader_unload_children(impl);
 
-		/* TODO: Should we let Node Loader destroy our handle? */
-		return metacall_value_create_bool(/*metacall_clear(ts_impl)*/ 1L);
+		return metacall_value_create_bool(1L);
 	}
 }