New+BindCoreObject -> CreateCsOwnedObject single call

src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs

@@ -36,9 +36,7 @@ internal static partial class Runtime
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         internal static extern object ReleaseCsOwnedObject(int jsHandle);
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        internal static extern object BindCoreObject(int jsHandle, int gcHandle, out int exceptionalResult);
-        [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        internal static extern object New(string className, object[] parms, out int exceptionalResult);
+        internal static extern object CreateCsOwnedObject(int gcHandle, string className, object[] parms, out int exceptionalResult);
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         internal static extern object TypedArrayToArray(int jsHandle, out int exceptionalResult);
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -75,17 +73,9 @@ public static string InvokeJS(string str)
             return res as System.Runtime.InteropServices.JavaScript.Function;
         }
 
-        public static IntPtr New<T>(params object[] parms)
-        {
-            object res = New(typeof(T).Name, parms, out int exception);
-            if (exception != 0)
-                throw new JSException((string)res);
-            return (IntPtr)(int)res;
-        }
-
-        public static IntPtr New(string hostClassName, params object[] parms)
+        internal static IntPtr CreateCsOwnedObject(int gcHandle, string typeName, params object[] parms)
         {
-            object res = New(hostClassName, parms, out int exception);
+            object res = CreateCsOwnedObject(gcHandle, typeName, parms, out int exception);
             if (exception != 0)
                 throw new JSException((string)res);
             return (IntPtr)(int)res;

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/AnyRef.cs

@@ -16,11 +16,26 @@ public partial class JSObject : SafeHandleMinusOneIsInvalid
         internal int GCHandleValue => (int)(IntPtr)WeakRefHandle;
         public bool IsDisposed { get; private set; }
 
-        public JSObject() : this(Interop.Runtime.New<object>())
+        public JSObject() : base(true)
         {
-            object result = Interop.Runtime.BindCoreObject(JSHandle, GCHandleValue, out int exception);
-            if (exception != 0)
-                throw new JSException(SR.Format(SR.JSObjectErrorBinding, result));
+            // this is weak C# reference to the JSObject, it has same lifetime as the JSObject
+            WeakRefHandle = GCHandle.Alloc(this, GCHandleType.Weak);
+            InFlight = null;
+            InFlightCounter = 0;
+
+            var jsHandle = Interop.Runtime.CreateCsOwnedObject(GCHandleValue, nameof(Object));
+            SetHandle(jsHandle);
+        }
+
+        protected JSObject(string typeName, object[] _params) : base(true)
+        {
+            // this is weak C# reference to the JSObject, it has same lifetime as the JSObject
+            WeakRefHandle = GCHandle.Alloc(this, GCHandleType.Weak);
+            InFlight = null;
+            InFlightCounter = 0;
+
+            var jsHandle = Interop.Runtime.CreateCsOwnedObject(GCHandleValue, typeName, _params);
+            SetHandle(jsHandle);
         }
 
         internal JSObject(IntPtr jsHandle) : base(true)

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Array.cs

@@ -14,7 +14,7 @@ public class Array : CoreObject
         /// Initializes a new instance of the Array class.
         /// </summary>
         /// <param name="_params">Parameters.</param>
-        public Array(params object[] _params) : base(Interop.Runtime.New<Array>(_params))
+        public Array(params object[] _params) : base(nameof(Array), _params)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/ArrayBuffer.cs

@@ -10,14 +10,14 @@ public class ArrayBuffer : CoreObject
         /// <summary>
         /// Initializes a new instance of the JavaScript Core ArrayBuffer class.
         /// </summary>
-        public ArrayBuffer() : base(Interop.Runtime.New<ArrayBuffer>())
+        public ArrayBuffer() : base(nameof(ArrayBuffer))
         { }
 
         /// <summary>
         /// Initializes a new instance of the JavaScript Core ArrayBuffer class.
         /// </summary>
         /// <param name="length">Length.</param>
-        public ArrayBuffer(int length) : base(Interop.Runtime.New<ArrayBuffer>(length))
+        public ArrayBuffer(int length) : base(nameof(ArrayBuffer), length)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/CoreObject.cs

@@ -18,11 +18,12 @@ namespace System.Runtime.InteropServices.JavaScript
     /// </remarks>
     public abstract class CoreObject : JSObject
     {
-        protected CoreObject(IntPtr jsHandle) : base(jsHandle)
+        internal CoreObject(IntPtr jsHandle) : base(jsHandle)
+        {
+        }
+
+        protected CoreObject(string typeName, params object[] _params) : base(typeName, _params)
         {
-            object result = Interop.Runtime.BindCoreObject((int)jsHandle, GCHandleValue, out int exception);
-            if (exception != 0)
-                throw new JSException(SR.Format(SR.CoreObjectErrorBinding, result));
         }
     }
 }

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/DataView.cs

@@ -15,15 +15,15 @@ public class DataView : CoreObject
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">ArrayBuffer to use as the storage backing the new DataView object.</param>
-        public DataView(ArrayBuffer buffer) : base(Runtime.New<DataView>(buffer))
+        public DataView(ArrayBuffer buffer) : base(nameof(DataView), buffer)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">ArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
-        public DataView(ArrayBuffer buffer, int byteOffset) : base(Runtime.New<DataView>(buffer, byteOffset))
+        public DataView(ArrayBuffer buffer, int byteOffset) : base(nameof(DataView), buffer, byteOffset)
         { }
 
         /// <summary>
@@ -32,22 +32,22 @@ public DataView(ArrayBuffer buffer, int byteOffset) : base(Runtime.New<DataView>
         /// <param name="buffer">ArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
         /// <param name="byteLength">The number of elements in the byte array. If unspecified, the view's length will match the buffer's length.</param>
-        public DataView(ArrayBuffer buffer, int byteOffset, int byteLength) : base(Runtime.New<DataView>(buffer, byteOffset, byteLength))
+        public DataView(ArrayBuffer buffer, int byteOffset, int byteLength) : base(nameof(DataView), buffer, byteOffset, byteLength)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">SharedArrayBuffer to use as the storage backing the new DataView object.</param>
-        public DataView(SharedArrayBuffer buffer) : base(Runtime.New<DataView>(buffer))
+        public DataView(SharedArrayBuffer buffer) : base(nameof(DataView), buffer)
         { }
 
         /// <summary>
         /// Initializes a new instance of the DataView class.
         /// </summary>
         /// <param name="buffer">SharedArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
-        public DataView(SharedArrayBuffer buffer, int byteOffset) : base(Runtime.New<DataView>(buffer, byteOffset))
+        public DataView(SharedArrayBuffer buffer, int byteOffset) : base(nameof(DataView), buffer, byteOffset)
         { }
 
         /// <summary>
@@ -56,7 +56,7 @@ public DataView(SharedArrayBuffer buffer, int byteOffset) : base(Runtime.New<Dat
         /// <param name="buffer">SharedArrayBuffer to use as the storage backing the new DataView object.</param>
         /// <param name="byteOffset">The offset, in bytes, to the first byte in the above buffer for the new view to reference. If unspecified, the buffer view starts with the first byte.</param>
         /// <param name="byteLength">The number of elements in the byte array. If unspecified, the view's length will match the buffer's length.</param>
-        public DataView(SharedArrayBuffer buffer, int byteOffset, int byteLength) : base(Runtime.New<DataView>(buffer, byteOffset, byteLength))
+        public DataView(SharedArrayBuffer buffer, int byteOffset, int byteLength) : base(nameof(DataView), buffer, byteOffset, byteLength)
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Function.cs

@@ -16,7 +16,7 @@ namespace System.Runtime.InteropServices.JavaScript
     /// </remarks>
     public class Function : CoreObject
     {
-        public Function(params object[] args) : base(Interop.Runtime.New<Function>(args))
+        public Function(params object[] args) : base(nameof(Function), args)
         { }
 
         internal Function(IntPtr jsHandle) : base(jsHandle)

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/HostObject.cs

@@ -19,19 +19,9 @@ namespace System.Runtime.InteropServices.JavaScript
     public interface IHostObject
     { }
 
-    public class HostObject : HostObjectBase
+    public class HostObject : JSObject, IHostObject
     {
-        public HostObject(string hostName, params object[] _params) : base(Interop.Runtime.New(hostName, _params))
+        public HostObject(string typeName, params object[] _params) : base(typeName, _params)
         { }
     }
-
-    public abstract class HostObjectBase : JSObject, IHostObject
-    {
-        protected HostObjectBase(IntPtr jsHandle) : base(jsHandle)
-        {
-            object result = Interop.Runtime.BindCoreObject((int)jsHandle, GCHandleValue, out int exception);
-            if (exception != 0)
-                throw new JSException(SR.Format(SR.HostObjectErrorBinding, result));
-        }
-    }
 }

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Map.cs

@@ -14,7 +14,7 @@ public class Map : CoreObject, IDictionary
         /// <summary>
         /// Initializes a new instance of the Map class.
         /// </summary>
-        public Map() : base(Runtime.New<Map>())
+        public Map() : base(nameof(Map))
         { }
 
         /// <summary>

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Runtime.cs

@@ -34,16 +34,6 @@ public static string InvokeJS(string str)
             return Interop.Runtime.CompileFunction(snippet);
         }
 
-        public static IntPtr New<T>(params object[] parms)
-        {
-            return Interop.Runtime.New(typeof(T).Name, parms);
-        }
-
-        public static IntPtr New(string hostClassName, params object[] parms)
-        {
-            return Interop.Runtime.New(hostClassName, parms);
-        }
-
         public static object GetGlobalObject(string? str = null)
         {
             return Interop.Runtime.GetGlobalObject(str);

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/SharedArrayBuffer.cs

@@ -11,7 +11,7 @@ public class SharedArrayBuffer : CoreObject
         /// Initializes a new instance of the JavaScript Core SharedArrayBuffer class.
         /// </summary>
         /// <param name="length">The size, in bytes, of the array buffer to create.</param>
-        public SharedArrayBuffer(int length) : base(Interop.Runtime.New<SharedArrayBuffer>(length))
+        public SharedArrayBuffer(int length) : base(nameof(SharedArrayBuffer), length)
         { }
 
         internal SharedArrayBuffer(IntPtr jsHandle) : base(jsHandle)

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/TypedArray.cs

@@ -51,28 +51,28 @@ public enum TypedArrayTypeCode
     /// </summary>
     public abstract class TypedArray<T, U> : CoreObject, ITypedArray, ITypedArray<T, U> where U : struct
     {
-        protected TypedArray() : base(Interop.Runtime.New<T>())
+        protected TypedArray() : base(typeof(T).Name)
         { }
 
-        protected TypedArray(int length) : base(Interop.Runtime.New<T>(length))
+        protected TypedArray(int length) : base(typeof(T).Name, length)
         { }
 
-        protected TypedArray(ArrayBuffer buffer) : base(Interop.Runtime.New<T>(buffer))
+        protected TypedArray(ArrayBuffer buffer) : base(typeof(T).Name, buffer)
         { }
 
-        protected TypedArray(ArrayBuffer buffer, int byteOffset) : base(Interop.Runtime.New<T>(buffer, byteOffset))
+        protected TypedArray(ArrayBuffer buffer, int byteOffset) : base(typeof(T).Name, buffer, byteOffset)
         { }
 
-        protected TypedArray(ArrayBuffer buffer, int byteOffset, int length) : base(Interop.Runtime.New<T>(buffer, byteOffset, length))
+        protected TypedArray(ArrayBuffer buffer, int byteOffset, int length) : base(typeof(T).Name, buffer, byteOffset, length)
         { }
 
-        protected TypedArray(SharedArrayBuffer buffer) : base(Interop.Runtime.New<T>(buffer))
+        protected TypedArray(SharedArrayBuffer buffer) : base(typeof(T).Name, buffer)
         { }
 
-        protected TypedArray(SharedArrayBuffer buffer, int byteOffset) : base(Interop.Runtime.New<T>(buffer, byteOffset))
+        protected TypedArray(SharedArrayBuffer buffer, int byteOffset) : base(typeof(T).Name, buffer, byteOffset)
         { }
 
-        protected TypedArray(SharedArrayBuffer buffer, int byteOffset, int length) : base(Interop.Runtime.New<T>(buffer, byteOffset, length))
+        protected TypedArray(SharedArrayBuffer buffer, int byteOffset, int length) : base(typeof(T).Name, buffer, byteOffset, length)
         { }
 
         internal TypedArray(IntPtr jsHandle) : base(jsHandle)

src/mono/wasm/runtime/binding_support.js

@@ -123,36 +123,37 @@ var BindingSupportLib = {
 			//  that any code relying on the old get_method/call_method pattern will
 			//  break in a more understandable way.
 
-			this._create_cs_owned_object = bind_runtime_method ("CreateCSOwnedObject", "ii");
 			this._bind_core_clr_obj = bind_runtime_method ("BindCoreCLRObject", "ii");
-			this._get_js_owned_object_gc_handle = bind_runtime_method ("GetJSOwnedObjectGCHandle", "m");
-			this._try_get_cs_owned_object_js_handle = bind_runtime_method ("TryGetCsOwnedObjectJsHandle", "m");
 			this._get_raw_mono_obj = bind_runtime_method ("GetDotNetObject", "ii!");
 
+			this._create_cs_owned_object = bind_runtime_method ("CreateCSOwnedObject", "ii");
+			this._try_get_cs_owned_object_js_handle = bind_runtime_method ("TryGetCsOwnedObjectJsHandle", "m");
+			this._cs_owned_object_get_js_handle = bind_runtime_method ("CsOwnedObjectGetJsHandle", 'mi');
+			this._release_cs_owned_object_by_handle = bind_runtime_method ("ReleaseCsOwnedObjectByHandle", 'i');
+
+			this._get_js_owned_object_gc_handle = bind_runtime_method ("GetJSOwnedObjectGCHandle", "m");
+			this._release_js_owned_object_by_handle = bind_runtime_method ("ReleaseJSOwnedObjectByHandle", "i");
+
 			this._is_simple_array = bind_runtime_method ("IsSimpleArray", "m");
-			this._setup_js_cont = bind_runtime_method ("SetupJSContinuation", "mo");
 
 			this._create_tcs = bind_runtime_method ("CreateTaskSource","");
 			this._set_tcs_result = bind_runtime_method ("SetTaskSourceResult","io");
 			this._set_tcs_failure = bind_runtime_method ("SetTaskSourceFailure","is");
 			this._get_tcs_task = bind_runtime_method ("GetTaskSourceTask","i!");
+			this._setup_js_cont = bind_runtime_method ("SetupJSContinuation", "mo");
 
 			this._object_to_string = bind_runtime_method ("ObjectToString", "m");
 			this._get_date_value = bind_runtime_method ("GetDateValue", "m");
 			this._create_date_time = bind_runtime_method ("CreateDateTime", "d!");
 			this._create_uri = bind_runtime_method ("CreateUri","s!");
 
-			this._cs_owned_object_get_js_handle = bind_runtime_method ("CsOwnedObjectGetJsHandle", 'mi');
-			this._release_cs_owned_object_by_handle = bind_runtime_method ("ReleaseCsOwnedObjectByHandle", 'i');
-			this._release_js_owned_object_by_handle = bind_runtime_method ("ReleaseJSOwnedObjectByHandle", "i");
-
 			this._are_promises_supported = ((typeof Promise === "object") || (typeof Promise === "function")) && (typeof Promise.resolve === "function");
 			this.isThenable = (js_obj) => {
 				// When using an external Promise library like Bluebird the Promise.resolve may not be sufficient
 				// to identify the object as a Promise.
 				return Promise.resolve(js_obj) === js_obj ||
 						((typeof js_obj === "object" || typeof js_obj === "function") && typeof js_obj.then === "function")
-			}
+			};
 
 			this._empty_string = "";
 			this._empty_string_ptr = 0;
@@ -1889,21 +1890,7 @@ var BindingSupportLib = {
 		BINDING.bindings_lazy_init ();
 		BINDING._mono_wasm_release_js_handle(js_handle);
 	},
-	mono_wasm_bind_core_object: function(js_handle, gc_handle, is_exception) {
-		BINDING.bindings_lazy_init ();
-
-		var js_obj = BINDING.mono_wasm_get_jsobj_from_js_handle (js_handle);
-		if (!js_obj) {
-			setValue (is_exception, 1, "i32");
-			return BINDING.js_string_to_mono_string ("ERR05: Invalid JS object handle '" + js_handle + "'");
-		}
-
-		BINDING.wasm_bind_core_clr_obj(js_handle, gc_handle );
-		js_obj.__mono_gc_handle__ = gc_handle;
-		js_obj.__mono_js_handle__ = js_handle;
-		return gc_handle;
-	},
-	mono_wasm_new: function (core_name, args, is_exception) {
+	mono_wasm_create_cs_owned_object: function (gc_handle, core_name, args, is_exception) {
 		var argsRoot = MONO.mono_wasm_new_root (args), nameRoot = MONO.mono_wasm_new_root (core_name);
 		try {
 			BINDING.bindings_lazy_init ();
@@ -1934,13 +1921,14 @@ var BindingSupportLib = {
 					if (js_args)
 						argsList = argsList.concat (js_args);
 					var tempCtor = constructor.bind.apply (constructor, argsList);
-					var obj = new tempCtor ();
-					return obj;
+					var js_obj = new tempCtor ();
+					return js_obj;
 				};
 
-				var res = allocator(coreObj, js_args);
-				var js_handle = BINDING.mono_wasm_get_js_handle(res);
-				// yes, convert int
+				var js_obj = allocator(coreObj, js_args);
+				js_obj.__mono_gc_handle__ = gc_handle;
+				var js_handle = BINDING.mono_wasm_get_js_handle(js_obj);
+				// yes, convert int, because on error we need to return String on same method signature
 				return BINDING.mono_wasm_convert_return_value(js_handle);
 			} catch (e) {
 				var res = e.toString ();

src/mono/wasm/runtime/corebindings.c

@@ -17,8 +17,7 @@ extern MonoObject* mono_wasm_set_object_property (int js_handle, MonoString *pro
 extern MonoObject* mono_wasm_set_by_index (int js_handle, int property_index, MonoObject *value, int *is_exception);
 extern MonoObject* mono_wasm_get_global_object (MonoString *global_name, int *is_exception);
 extern void* mono_wasm_release_cs_owned_object (int js_handle);
-extern MonoObject* mono_wasm_new (MonoString *core_name, MonoArray *args, int *is_exception);
-extern int mono_wasm_bind_core_object (int js_handle, int gc_handle, int *is_exception);
+extern MonoObject* mono_wasm_create_cs_owned_object (int gc_handle, MonoString *core_name, MonoArray *args, int *is_exception);
 extern MonoObject* mono_wasm_typed_array_to_array (int js_handle, int *is_exception);
 extern MonoObject* mono_wasm_typed_array_copy_to (int js_handle, int ptr, int begin, int end, int bytes_per_element, int *is_exception);
 extern MonoObject* mono_wasm_typed_array_from (int ptr, int begin, int end, int bytes_per_element, int type, int *is_exception);
@@ -75,9 +74,8 @@ void core_initialize_internals ()
 	mono_add_internal_call ("Interop/Runtime::SetObjectProperty", mono_wasm_set_object_property);
 	mono_add_internal_call ("Interop/Runtime::SetByIndex", mono_wasm_set_by_index);
 	mono_add_internal_call ("Interop/Runtime::GetGlobalObject", mono_wasm_get_global_object);
+	mono_add_internal_call ("Interop/Runtime::CreateCsOwnedObject", mono_wasm_create_cs_owned_object);
 	mono_add_internal_call ("Interop/Runtime::ReleaseCsOwnedObject", mono_wasm_release_cs_owned_object);
-	mono_add_internal_call ("Interop/Runtime::BindCoreObject", mono_wasm_bind_core_object);
-	mono_add_internal_call ("Interop/Runtime::New", mono_wasm_new);
 	mono_add_internal_call ("Interop/Runtime::TypedArrayToArray", mono_wasm_typed_array_to_array);
 	mono_add_internal_call ("Interop/Runtime::TypedArrayCopyTo", mono_wasm_typed_array_copy_to);
 	mono_add_internal_call ("Interop/Runtime::TypedArrayFrom", mono_wasm_typed_array_from);