[DRAFT] New libNode API

bench/Benchmarks.cs

@@ -50,7 +50,8 @@ public static void Main(string[] args)
         GetCurrentPlatformRuntimeIdentifier(),
         "libnode" + GetSharedLibraryExtension());
 
-    private napi_env _env;
+    private NodejsEmbeddingRuntime? _runtime;
+    private NodejsEmbeddingNodeApiScope? _nodeApiScope;
     private JSValue _jsString;
     private JSFunction _jsFunction;
     private JSFunction _jsFunctionWithArgs;
@@ -64,6 +65,7 @@ public static void Main(string[] args)
     private JSFunction _jsFunctionCallMethod;
     private JSFunction _jsFunctionCallMethodWithArgs;
     private JSReference _reference = null!;
+    private static readonly string[] s_settings = new[] { "node", "--expose-gc" };
 
     /// <summary>
     /// Simple class that is exported to JS and used in some benchmarks.
@@ -84,16 +86,17 @@ public static void Method() { }
     /// </summary>
     protected void Setup()
     {
-        NodejsPlatform platform = new(LibnodePath/*, args: new[] { "node", "--expose-gc" }*/);
-
-        // This setup avoids using NodejsEnvironment so benchmarks can run on the same thread.
-        // NodejsEnvironment creates a separate thread that would slow down the micro-benchmarks.
-        platform.Runtime.CreateEnvironment(
-            platform, Console.WriteLine, null, NodejsEnvironment.NodeApiVersion, out _env)
-            .ThrowIfFailed();
-
-        // The new scope instance saves itself as the thread-local JSValueScope.Current.
-        JSValueScope scope = new(JSValueScopeType.Root, _env, platform.Runtime);
+        NodejsEmbeddingPlatform platform = new(
+            LibnodePath,
+            new NodejsEmbeddingPlatformSettings { Args = s_settings });
+
+        // This setup avoids using NodejsEmbeddingThreadRuntime so benchmarks can run on
+        // the same thread. NodejsEmbeddingThreadRuntime creates a separate thread that would slow
+        // down the micro-benchmarks.
+        _runtime = new(platform);
+        // The nodeApiScope creates JSValueScope instance that saves itself as
+        // the thread-local JSValueScope.Current.
+        _nodeApiScope = new(_runtime);
 
         // Create some JS values that will be used by the benchmarks.
 

src/NodeApi.DotNetHost/JSRuntimeContextExtensions.cs

@@ -54,7 +54,7 @@ public static T Import<T>(
     /// <exception cref="ArgumentNullException">Both <paramref cref="module" /> and
     /// <paramref cref="property" /> are null.</exception>
     public static T Import<T>(
-        this NodejsEnvironment nodejs,
+        this NodejsEmbeddingThreadRuntime nodejs,
         string? module,
         string? property,
         bool esModule,

src/NodeApi/NodeApiStatusExtensions.cs

@@ -59,5 +59,30 @@ public static T ThrowIfFailed<T>(this napi_status status,
         status.ThrowIfFailed(memberName, sourceFilePath, sourceLineNumber);
         return value;
     }
+
+    [StackTraceHidden]
+    public static void ThrowIfFailed([DoesNotReturnIf(true)] this node_embedding_status status,
+                                     [CallerMemberName] string memberName = "",
+                                     [CallerFilePath] string sourceFilePath = "",
+                                     [CallerLineNumber] int sourceLineNumber = 0)
+    {
+        if (status == node_embedding_status.ok)
+            return;
+
+        throw new JSException($"Error in {memberName} at {sourceFilePath}:{sourceLineNumber}");
+    }
+
+    // Throw if status is not napi_ok. Otherwise, return the provided value.
+    // This function helps writing compact wrappers for the interop calls.
+    [StackTraceHidden]
+    public static T ThrowIfFailed<T>(this node_embedding_status status,
+                                     T value,
+                                     [CallerMemberName] string memberName = "",
+                                     [CallerFilePath] string sourceFilePath = "",
+                                     [CallerLineNumber] int sourceLineNumber = 0)
+    {
+        status.ThrowIfFailed(memberName, sourceFilePath, sourceLineNumber);
+        return value;
+    }
 }