Remove JSInvocationInfo from interop bridge communication

oroztocil · oroztocil · commit 1d8495c59ffa · 2025-04-04T16:17:44.000+02:00
diff --git a/src/Components/Server/src/Circuits/RemoteJSRuntime.cs b/src/Components/Server/src/Circuits/RemoteJSRuntime.cs
@@ -119,7 +119,7 @@ protected override void BeginInvokeJS(long asyncHandle, string identifier, strin
         BeginInvokeJS(invocationInfo);
     }
 
-    protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
         if (_clientProxy is null)
         {
@@ -138,11 +138,16 @@ protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
             }
         }
 
-        var invocationInfoJson = invocationInfo.ToJson();
-
         Log.BeginInvokeJS(_logger, invocationInfo.AsyncHandle, invocationInfo.Identifier);
 
-        _clientProxy.SendAsync("JS.BeginInvokeJS", invocationInfoJson);
+        _clientProxy.SendAsync(
+            "JS.BeginInvokeJS",
+            invocationInfo.AsyncHandle,
+            invocationInfo.Identifier,
+            invocationInfo.ArgsJson,
+            (int)invocationInfo.ResultType,
+            invocationInfo.TargetInstanceId,
+            (int)invocationInfo.CallType);
     }
 
     protected override void ReceiveByteArray(int id, byte[] data)
diff --git a/src/Components/Web.JS/src/Boot.WebAssembly.Common.ts b/src/Components/Web.JS/src/Boot.WebAssembly.Common.ts
@@ -264,13 +264,12 @@ async function scheduleAfterStarted(operations: string): Promise<void> {
   Blazor._internal.updateRootComponents(operations);
 }
 
-function invokeJSJson(invocationInfoJson: string): string | null {
-  const invocationInfo: DotNet.JSInvocationInfo = JSON.parse(invocationInfoJson);
-  if (invocationInfo.asyncHandle !== 0) {
-    dispatcher.beginInvokeJSFromDotNet(invocationInfo);
+function invokeJSJson(identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number, callType: number): string | null {
+  if (asyncHandle !== 0) {
+    dispatcher.beginInvokeJSFromDotNet(asyncHandle, identifier, argsJson, resultType, targetInstanceId, callType);
     return null;
   } else {
-    return dispatcher.invokeJSFromDotNet(invocationInfo);
+    return dispatcher.invokeJSFromDotNet(identifier, argsJson, resultType, targetInstanceId, callType);
   }
 }
 
diff --git a/src/Components/Web.JS/src/GlobalExports.ts b/src/Components/Web.JS/src/GlobalExports.ts
@@ -52,7 +52,7 @@ export interface IBlazor {
     forceCloseConnection?: () => Promise<void>;
     InputFile?: typeof InputFile;
     NavigationLock: typeof NavigationLock;
-    invokeJSJson?: (invocationInfoString: string) => string | null;
+    invokeJSJson?: (identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number, callType: number) => string | null;
     endInvokeDotNetFromJS?: (callId: string, success: boolean, resultJsonOrErrorMessage: string) => void;
     receiveByteArray?: (id: number, data: Uint8Array) => void;
     getPersistedState?: () => string;
diff --git a/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts b/src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
@@ -127,7 +127,7 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     const connection = connectionBuilder.build();
 
     connection.on('JS.AttachComponent', (componentId, selector) => attachRootComponentToLogicalElement(WebRendererId.Server, this.resolveElement(selector), componentId, false));
-    connection.on('JS.BeginInvokeJS', (invocationInfoJson: string) => this.beginInvokeJSJson(invocationInfoJson));
+    connection.on('JS.BeginInvokeJS', this._dispatcher.beginInvokeJSFromDotNet.bind(this._dispatcher));
     connection.on('JS.EndInvokeDotNet', this._dispatcher.endInvokeDotNetFromJS.bind(this._dispatcher));
     connection.on('JS.ReceiveByteArray', this._dispatcher.receiveByteArray.bind(this._dispatcher));
 
@@ -232,11 +232,6 @@ export class CircuitManager implements DotNet.DotNetCallDispatcher {
     return true;
   }
 
-  private beginInvokeJSJson(invocationInfoJson: string) {    
-    const invocationInfo: DotNet.JSInvocationInfo = JSON.parse(invocationInfoJson);
-    this._dispatcher.beginInvokeJSFromDotNet(invocationInfo);
-  }
-
   // Implements DotNet.DotNetCallDispatcher
   public beginInvokeDotNetFromJS(callId: number, assemblyName: string | null, methodIdentifier: string, dotNetObjectId: number | null, argsJson: string): void {
     this.throwIfDispatchingWhenDisposed();
diff --git a/src/Components/Web.JS/src/Platform/WebView/WebViewIpcReceiver.ts b/src/Components/Web.JS/src/Platform/WebView/WebViewIpcReceiver.ts
@@ -33,7 +33,7 @@ export function startIpcReceiver(): void {
       showErrorNotification();
     },
 
-    'BeginInvokeJS': beginInvokeJSJson,
+    'BeginInvokeJS': dispatcher.beginInvokeJSFromDotNet.bind(dispatcher),
 
     'EndInvokeDotNet': dispatcher.endInvokeDotNetFromJS.bind(dispatcher),
 
@@ -81,7 +81,3 @@ function base64ToArrayBuffer(base64: string): Uint8Array {
   return result;
 }
 
-function beginInvokeJSJson(invocationInfoJson: string) {
-  const invocationInfo = JSON.parse(invocationInfoJson);
-  dispatcher.beginInvokeJSFromDotNet(invocationInfo);
-}
diff --git a/src/Components/Web/src/Internal/IInternalWebJSInProcessRuntime.cs b/src/Components/Web/src/Internal/IInternalWebJSInProcessRuntime.cs
@@ -22,5 +22,5 @@ public interface IInternalWebJSInProcessRuntime
     /// <summary>
     /// For internal framework use only.
     /// </summary>
-    string InvokeJS(JSInvocationInfo invocationInfo);
+    string InvokeJS(in JSInvocationInfo invocationInfo);
 }
diff --git a/src/Components/Web/src/PublicAPI.Unshipped.txt b/src/Components/Web/src/PublicAPI.Unshipped.txt
@@ -1,3 +1,3 @@
 #nullable enable
-Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime.InvokeJS(Microsoft.JSInterop.Infrastructure.JSInvocationInfo! invocationInfo) -> string!
+Microsoft.AspNetCore.Components.Web.Internal.IInternalWebJSInProcessRuntime.InvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> string!
 virtual Microsoft.AspNetCore.Components.Routing.NavLink.ShouldMatch(string! uriAbsolute) -> bool
diff --git a/src/Components/Web/src/WebRenderer.cs b/src/Components/Web/src/WebRenderer.cs
@@ -10,7 +10,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.JSInterop;
-using Microsoft.JSInterop.Infrastructure;
 using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.AspNetCore.Components.RenderTree;
@@ -131,16 +130,7 @@ private void AttachWebRendererInterop(IJSRuntime jsRuntime, JsonSerializerOption
             newJsonOptions.TypeInfoResolverChain.Add(WebRendererSerializerContext.Default);
             newJsonOptions.TypeInfoResolverChain.Add(JsonConverterFactoryTypeInfoResolver<DotNetObjectReference<WebRendererInteropMethods>>.Instance);
             var argsJson = JsonSerializer.Serialize(args, newJsonOptions);
-            var invocationInfo = new JSInvocationInfo
-            {
-                AsyncHandle = 0,
-                TargetInstanceId = 0,
-                Identifier = JSMethodIdentifier,
-                CallType = JSCallType.FunctionCall,
-                ResultType = JSCallResultType.JSVoidResult,
-                ArgsJson = argsJson,
-            };
-            inProcessRuntime.InvokeJS(invocationInfo);
+            inProcessRuntime.InvokeJS(JSMethodIdentifier, argsJson, JSCallResultType.JSVoidResult, 0);
         }
         else
         {
diff --git a/src/Components/WebAssembly/JSInterop/src/InternalCalls.cs b/src/Components/WebAssembly/JSInterop/src/InternalCalls.cs
@@ -18,7 +18,13 @@ internal static partial class InternalCalls
     public static extern TRes InvokeJS<T0, T1, T2, TRes>(out string exception, ref JSCallInfo callInfo, [AllowNull] T0 arg0, [AllowNull] T1 arg1, [AllowNull] T2 arg2);
 
     [JSImport("Blazor._internal.invokeJSJson", "blazor-internal")]
-    public static partial string InvokeJSJson(string invocationInfoString);
+    public static partial string InvokeJSJson(
+        string identifier,
+        [JSMarshalAs<JSType.Number>] long targetInstanceId,
+        int resultType,
+        string argsJson,
+        [JSMarshalAs<JSType.Number>] long asyncHandle,
+        int callType);
 
     [JSImport("Blazor._internal.endInvokeDotNetFromJS", "blazor-internal")]
     public static partial void EndInvokeDotNetFromJS(
diff --git a/src/Components/WebAssembly/JSInterop/src/PublicAPI.Unshipped.txt b/src/Components/WebAssembly/JSInterop/src/PublicAPI.Unshipped.txt
@@ -1,4 +1,3 @@
 #nullable enable
-override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.BeginInvokeJS(long taskId, string! identifier, string? argsJson, Microsoft.JSInterop.JSCallResultType resultType, long targetInstanceId) -> void
-override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.BeginInvokeJS(Microsoft.JSInterop.Infrastructure.JSInvocationInfo! invocationInfo) -> void
-override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeJS(Microsoft.JSInterop.Infrastructure.JSInvocationInfo! invocationInfo) -> string!
+override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.BeginInvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> void
+override Microsoft.JSInterop.WebAssembly.WebAssemblyJSRuntime.InvokeJS(in Microsoft.JSInterop.Infrastructure.JSInvocationInfo invocationInfo) -> string!
diff --git a/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs b/src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
@@ -25,27 +25,29 @@ protected WebAssemblyJSRuntime()
     /// <inheritdoc />
     protected override string InvokeJS(string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId)
     {
-        var invocationInfo = new JSInvocationInfo
-        {
-            AsyncHandle = 0,
-            TargetInstanceId = targetInstanceId,
-            Identifier = identifier,
-            CallType = JSCallType.FunctionCall,
-            ResultType = resultType,
-            ArgsJson = argsJson,
-        };
-
-        return InvokeJS(invocationInfo);
+        return InternalCalls.InvokeJSJson(
+            identifier,
+            targetInstanceId,
+            (int)resultType,
+            argsJson ?? "[]",
+            0,
+            (int)JSCallType.FunctionCall
+        );
     }
 
     /// <inheritdoc />
-    protected override string InvokeJS(JSInvocationInfo invocationInfo)
+    protected override string InvokeJS(in JSInvocationInfo invocationInfo)
     {
-        var invocationInfoJson = invocationInfo.ToJson();
-
         try
         {
-            return InternalCalls.InvokeJSJson(invocationInfoJson);
+            return InternalCalls.InvokeJSJson(
+                invocationInfo.Identifier,
+                invocationInfo.TargetInstanceId,
+                (int)invocationInfo.ResultType,
+                invocationInfo.ArgsJson,
+                invocationInfo.AsyncHandle,
+                (int)invocationInfo.CallType
+            );
         }
         catch (Exception ex)
         {
@@ -56,24 +58,27 @@ protected override string InvokeJS(JSInvocationInfo invocationInfo)
     /// <inheritdoc />
     protected override void BeginInvokeJS(long asyncHandle, string identifier, [StringSyntax(StringSyntaxAttribute.Json)] string? argsJson, JSCallResultType resultType, long targetInstanceId)
     {
-        var invocationInfo = new JSInvocationInfo
-        {
-            AsyncHandle = asyncHandle,
-            TargetInstanceId = targetInstanceId,
-            Identifier = identifier,
-            CallType = JSCallType.FunctionCall,
-            ResultType = resultType,
-            ArgsJson = argsJson,
-        };
-
-        BeginInvokeJS(invocationInfo);
+        InternalCalls.InvokeJSJson(
+            identifier,
+            targetInstanceId,
+            (int)resultType,
+            argsJson ?? "[]",
+            asyncHandle,
+            (int)JSCallType.FunctionCall
+        );
     }
 
     /// <inheritdoc />
-    protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
-        var invocationInfoJson = invocationInfo.ToJson();
-        InternalCalls.InvokeJSJson(invocationInfoJson);
+        InternalCalls.InvokeJSJson(
+            invocationInfo.Identifier,
+            invocationInfo.TargetInstanceId,
+            (int)invocationInfo.ResultType,
+            invocationInfo.ArgsJson,
+            invocationInfo.AsyncHandle,
+            (int)invocationInfo.CallType
+        );
     }
 
     /// <inheritdoc />
diff --git a/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs b/src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs
@@ -167,20 +167,8 @@ protected override Task TransmitStreamAsync(long streamId, DotNetStreamReference
     }
 
     string IInternalWebJSInProcessRuntime.InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
-    {
-        var invocationInfo = new JSInvocationInfo
-        {
-            AsyncHandle = 0,
-            TargetInstanceId = targetInstanceId,
-            Identifier = identifier,
-            CallType = JSCallType.FunctionCall,
-            ResultType = resultType,
-            ArgsJson = argsJson
-        };
-
-        return InvokeJS(invocationInfo);
-    }
+        => InvokeJS(identifier, argsJson, resultType, targetInstanceId);
 
-    string IInternalWebJSInProcessRuntime.InvokeJS(JSInvocationInfo invocationInfo)
+    string IInternalWebJSInProcessRuntime.InvokeJS(in JSInvocationInfo invocationInfo)
         => InvokeJS(invocationInfo);
 }
diff --git a/src/Components/WebView/WebView/src/IpcSender.cs b/src/Components/WebView/WebView/src/IpcSender.cs
@@ -49,10 +49,17 @@ public void AttachToDocument(int componentId, string selector)
         DispatchMessageWithErrorHandling(IpcCommon.Serialize(IpcCommon.OutgoingMessageType.AttachToDocument, componentId, selector));
     }
 
-    public void BeginInvokeJS(JSInvocationInfo invocationInfo)
+    public void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
-        var invocationInfoJson = invocationInfo.ToJson();
-        DispatchMessageWithErrorHandling(IpcCommon.Serialize(IpcCommon.OutgoingMessageType.BeginInvokeJS, invocationInfoJson));
+        DispatchMessageWithErrorHandling(IpcCommon.Serialize(
+            IpcCommon.OutgoingMessageType.BeginInvokeJS,
+            invocationInfo.AsyncHandle,
+            invocationInfo.Identifier,
+            invocationInfo.ArgsJson,
+            invocationInfo.ResultType,
+            invocationInfo.TargetInstanceId,
+            invocationInfo.CallType
+        ));
     }
 
     public void EndInvokeDotNet(string callId, bool success, string invocationResultOrError)
diff --git a/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs b/src/Components/WebView/WebView/src/Services/WebViewJSRuntime.cs
@@ -43,7 +43,7 @@ protected override void BeginInvokeJS(long taskId, string identifier, string arg
         BeginInvokeJS(invocationInfo);
     }
 
-    protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
+    protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)
     {
         if (_ipcSender is null)
         {
diff --git a/src/Components/WebView/WebView/test/Infrastructure/AssertHelpers.cs b/src/Components/WebView/WebView/test/Infrastructure/AssertHelpers.cs
@@ -10,19 +10,12 @@ namespace Microsoft.AspNetCore.Components.WebView;
 
 public class AssertHelpers
 {
-    private static readonly JsonSerializerOptions _jsonSerializerOptions = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-    };
-
     internal static void IsAttachWebRendererInteropMessage(string message)
     {
         Assert.True(IpcCommon.TryDeserializeOutgoing(message, out var messageType, out var args));
         Assert.Equal(IpcCommon.OutgoingMessageType.BeginInvokeJS, messageType);
-        Assert.Equal(1, args.Count);
-
-        var invocationInfo = JsonSerializer.Deserialize<JSInvocationInfo>(args[0].GetString(), _jsonSerializerOptions);
-        Assert.Equal("Blazor._internal.attachWebRendererInterop", invocationInfo.Identifier);
+        Assert.Equal(6, args.Count);
+        Assert.Equal("Blazor._internal.attachWebRendererInterop", args[1].GetString());
     }
 
     internal static void IsAttachToDocumentMessage(string message, int componentId, string selector)
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts b/src/JSInterop/Microsoft.JSInterop.JS/src/src/Microsoft.JSInterop.ts
@@ -297,23 +297,6 @@ export module DotNet {
     SetValue = 4
   }
 
-  /**
-   * @param asyncHandle A value identifying an asynchronous operation that is passed back in a later call to endInvokeJSFromDotNet. If the call is synchronous, this value is zero.
-   * @param targetInstanceId The ID of the target JS object instance.
-   * @param identifier The identifier of the function to invoke or property to access.
-   * @param callType The type of operation that should be performed in JS.
-   * @param resultType The type of result expected from the JS interop call.
-   * @param argsJson JSON array of arguments to be passed to the operation. First element is used when setting a property value.
-   */
-  export interface JSInvocationInfo {
-      asyncHandle: number,
-      targetInstanceId: number,
-      identifier: string,
-      callType: JSCallType,
-      resultType: JSCallResultType,
-      argsJson: string | null,
-  }
-
   /**
    * Represents the ability to dispatch calls from JavaScript to a .NET runtime.
    */
@@ -364,16 +347,26 @@ export module DotNet {
     /**
      * Invokes the specified synchronous JavaScript function.
      *
-     * @param invocationInfo Configuration of the interop call.
+     * @param identifier Identifies the globally-reachable function to invoke.
+     * @param argsJson JSON representation of arguments to be passed to the function.
+     * @param resultType The type of result expected from the JS interop call.
+     * @param targetInstanceId The instance ID of the target JS object.
+     * @param callType The type of operation that should be performed in JS.
+     * @returns JSON representation of the invocation result.
      */
-    invokeJSFromDotNet(invocationInfo: JSInvocationInfo): string | null;
+    invokeJSFromDotNet(identifier: string, argsJson: string, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): string | null;
 
     /**
      * Invokes the specified synchronous or asynchronous JavaScript function.
      *
-     * @param invocationInfo Configuration of the interop call.
+     * @param asyncHandle A value identifying the asynchronous operation. This value will be passed back in a later call to endInvokeJSFromDotNet.
+     * @param identifier Identifies the globally-reachable function to invoke.
+     * @param argsJson JSON representation of arguments to be passed to the function.
+     * @param resultType The type of result expected from the JS interop call.
+     * @param targetInstanceId The ID of the target JS object instance.
+     * @param callType The type of operation that should be performed in JS.
      */
-    beginInvokeJSFromDotNet(invocationInfo: JSInvocationInfo): Promise<any> | null;
+    beginInvokeJSFromDotNet(asyncHandle: number, identifier: string, argsJson: string | null, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): Promise<any>;
 
     /**
      * Receives notification that an async call from JS to .NET has completed.
@@ -437,8 +430,7 @@ export module DotNet {
           return this._dotNetCallDispatcher;
       }
 
-      invokeJSFromDotNet(invocationInfo: JSInvocationInfo): string | null {
-          const { targetInstanceId, identifier, callType, resultType, argsJson } = invocationInfo;
+      invokeJSFromDotNet(identifier: string, argsJson: string, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): string | null {
           const returnValue = this.handleJSCall(targetInstanceId, identifier, callType, argsJson);
           const result = createJSCallResult(returnValue, resultType);
 
@@ -447,9 +439,7 @@ export module DotNet {
               : stringifyArgs(this, result);
       }
 
-      async beginInvokeJSFromDotNet(invocationInfo: JSInvocationInfo): Promise<any> {
-          const { asyncHandle, targetInstanceId, identifier, callType, resultType, argsJson } = invocationInfo;
-
+      async beginInvokeJSFromDotNet(asyncHandle: number, identifier: string, argsJson: string | null, resultType: JSCallResultType, targetInstanceId: number, callType: JSCallType): Promise<any> {
           try {
             const valueOrPromise = this.handleJSCall(targetInstanceId, identifier, callType, argsJson);
 
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/test/CallDispatcher.test.ts b/src/JSInterop/Microsoft.JSInterop.JS/src/test/CallDispatcher.test.ts
diff --git a/src/JSInterop/Microsoft.JSInterop.JS/src/test/findObjectMember.test.ts b/src/JSInterop/Microsoft.JSInterop.JS/src/test/findObjectMember.test.ts
diff --git a/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSInvocationInfo.cs b/src/JSInterop/Microsoft.JSInterop/src/Infrastructure/JSInvocationInfo.cs
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/JSInProcessRuntime.cs
diff --git a/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs b/src/JSInterop/Microsoft.JSInterop/src/JSRuntime.cs
diff --git a/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt b/src/JSInterop/Microsoft.JSInterop/src/PublicAPI.Unshipped.txt

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ protected override void BeginInvokeJS(long asyncHandle, string identifier, strin`
`119`	`119`	`BeginInvokeJS(invocationInfo);`
`120`	`120`	`}`
`121`	`121`
`122`		`- protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)`
	`122`	`+ protected override void BeginInvokeJS(in JSInvocationInfo invocationInfo)`
`123`	`123`	`{`
`124`	`124`	`if (_clientProxy is null)`
`125`	`125`	`{`
`@@ -138,11 +138,16 @@ protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`- var invocationInfoJson = invocationInfo.ToJson();`
`142`		`-`
`143`	`141`	`Log.BeginInvokeJS(_logger, invocationInfo.AsyncHandle, invocationInfo.Identifier);`
`144`	`142`
`145`		`- _clientProxy.SendAsync("JS.BeginInvokeJS", invocationInfoJson);`
	`143`	`+ _clientProxy.SendAsync(`
	`144`	`+ "JS.BeginInvokeJS",`
	`145`	`+ invocationInfo.AsyncHandle,`
	`146`	`+ invocationInfo.Identifier,`
	`147`	`+ invocationInfo.ArgsJson,`
	`148`	`+ (int)invocationInfo.ResultType,`
	`149`	`+ invocationInfo.TargetInstanceId,`
	`150`	`+ (int)invocationInfo.CallType);`
`146`	`151`	`}`
`147`	`152`
`148`	`153`	`protected override void ReceiveByteArray(int id, byte[] data)`
Original file line number	Diff line number	Diff line change
`@@ -264,13 +264,12 @@ async function scheduleAfterStarted(operations: string): Promise<void> {`
`264`	`264`	`Blazor._internal.updateRootComponents(operations);`
`265`	`265`	`}`
`266`	`266`
`267`		`-function invokeJSJson(invocationInfoJson: string): string \| null {`
`268`		`- const invocationInfo: DotNet.JSInvocationInfo = JSON.parse(invocationInfoJson);`
`269`		`- if (invocationInfo.asyncHandle !== 0) {`
`270`		`- dispatcher.beginInvokeJSFromDotNet(invocationInfo);`
	`267`	`+function invokeJSJson(identifier: string, targetInstanceId: number, resultType: number, argsJson: string, asyncHandle: number, callType: number): string \| null {`
	`268`	`+ if (asyncHandle !== 0) {`
	`269`	`+ dispatcher.beginInvokeJSFromDotNet(asyncHandle, identifier, argsJson, resultType, targetInstanceId, callType);`
`271`	`270`	`return null;`
`272`	`271`	`} else {`
`273`		`- return dispatcher.invokeJSFromDotNet(invocationInfo);`
	`272`	`+ return dispatcher.invokeJSFromDotNet(identifier, argsJson, resultType, targetInstanceId, callType);`
`274`	`273`	`}`
`275`	`274`	`}`
`276`	`275`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ public interface IInternalWebJSInProcessRuntime`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// For internal framework use only.`
`24`	`24`	`/// </summary>`
`25`		`- string InvokeJS(JSInvocationInfo invocationInfo);`
	`25`	`+ string InvokeJS(in JSInvocationInfo invocationInfo);`
`26`	`26`	`}`