React to breaking changes

Author: pranavkm

src/Components/Server/src/Circuits/CircuitHost.cs

@@ -339,7 +339,8 @@ public async Task BeginInvokeDotNetFromJS(string callId, string assemblyName, st
                 await Renderer.Dispatcher.InvokeAsync(() =>
                 {
                     Log.BeginInvokeDotNet(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
-                    DotNetDispatcher.BeginInvokeDotNet(JSRuntime, callId, assemblyName, methodIdentifier, dotNetObjectId, argsJson);
+                    var invocationInfo = new DotNetInvocationInfo(assemblyName, methodIdentifier, dotNetObjectId, callId);
+                    DotNetDispatcher.BeginInvokeDotNet(JSRuntime, invocationInfo, argsJson);
                 });
             }
             catch (Exception ex)

src/Components/Server/src/Circuits/RemoteJSRuntime.cs

@@ -2,12 +2,12 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Runtime.ExceptionServices;
 using System.Text.Json;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.JSInterop;
+using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.AspNetCore.Components.Server.Circuits
 {
@@ -30,28 +30,34 @@ internal void Initialize(CircuitClientProxy clientProxy)
             _clientProxy = clientProxy ?? throw new ArgumentNullException(nameof(clientProxy));
         }
 
-        protected override void EndInvokeDotNet(string callId, bool success, object resultOrError, string assemblyName, string methodIdentifier, long dotNetObjectId)
+        protected override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
-            if (!success)
+            if (!invocationResult.Success)
             {
-                var actualException = resultOrError is Exception ex ? ex : resultOrError is ExceptionDispatchInfo edi ? edi.SourceException : resultOrError;
-                Log.InvokeDotNetMethodException(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId, actualException as Exception);
+                Log.InvokeDotNetMethodException(_logger, invocationInfo, invocationResult.Exception);
+                string errorMessage;
+
                 if (_options.DetailedErrors)
                 {
-                    EndInvokeDotNetCore(callId, success, actualException.ToString());
+                    errorMessage = invocationResult.Exception.ToString();
                 }
                 else
                 {
-                    var message = $"There was an exception invoking '{methodIdentifier}' on assembly '{assemblyName}'. For more details turn on " +
-                        $"detailed exceptions in '{typeof(CircuitOptions).Name}.{nameof(CircuitOptions.DetailedErrors)}'";
+                    errorMessage = $"There was an exception invoking '{invocationInfo.MethodIdentifier}'";
+                    if (invocationInfo.AssemblyName != null)
+                    {
+                        errorMessage += $" on assembly '{invocationInfo.AssemblyName}'";
+                    }
 
-                    EndInvokeDotNetCore(callId, success, message);
+                    errorMessage += $". For more details turn on detailed exceptions in '{nameof(CircuitOptions)}.{nameof(CircuitOptions.DetailedErrors)}'";
                 }
+
+                EndInvokeDotNetCore(invocationInfo.CallId, success: false, errorMessage);
             }
             else
             {
-                Log.InvokeDotNetMethodSuccess(_logger, callId, assemblyName, methodIdentifier, dotNetObjectId);
-                EndInvokeDotNetCore(callId, success, resultOrError);
+                Log.InvokeDotNetMethodSuccess(_logger, invocationInfo);
+                EndInvokeDotNetCore(invocationInfo.CallId, success: true, invocationResult.Result);
             }
         }
 
@@ -113,27 +119,27 @@ public static class Log
             internal static void BeginInvokeJS(ILogger logger, long asyncHandle, string identifier) =>
                 _beginInvokeJS(logger, asyncHandle, identifier, null);
 
-            internal static void InvokeDotNetMethodException(ILogger logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectReference, Exception exception)
+            internal static void InvokeDotNetMethodException(ILogger logger, in DotNetInvocationInfo invocationInfo , Exception exception)
             {
-                if (assemblyName != null)
+                if (invocationInfo.AssemblyName != null)
                 {
-                    _invokeStaticDotNetMethodException(logger, assemblyName, methodIdentifier, callId, exception);
+                    _invokeStaticDotNetMethodException(logger, invocationInfo.AssemblyName, invocationInfo.MethodIdentifier, invocationInfo.CallId, exception);
                 }
                 else
                 {
-                    _invokeInstanceDotNetMethodException(logger, methodIdentifier, dotNetObjectReference, callId, exception);
+                    _invokeInstanceDotNetMethodException(logger, invocationInfo.MethodIdentifier, invocationInfo.DotNetObjectId, invocationInfo.CallId, exception);
                 }
             }
 
-            internal static void InvokeDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, string callId, string assemblyName, string methodIdentifier, long dotNetObjectId)
+            internal static void InvokeDotNetMethodSuccess(ILogger<RemoteJSRuntime> logger, in DotNetInvocationInfo invocationInfo)
             {
-                if (assemblyName != null)
+                if (invocationInfo.AssemblyName != null)
                 {
-                    _invokeStaticDotNetMethodSuccess(logger, assemblyName, methodIdentifier, callId, null);
+                    _invokeStaticDotNetMethodSuccess(logger, invocationInfo.AssemblyName, invocationInfo.MethodIdentifier, invocationInfo.CallId, null);
                 }
                 else
                 {
-                    _invokeInstanceDotNetMethodSuccess(logger, methodIdentifier, dotNetObjectId, callId, null);
+                    _invokeInstanceDotNetMethodSuccess(logger, invocationInfo.MethodIdentifier, invocationInfo.DotNetObjectId, invocationInfo.CallId, null);
                 }
 
             }

src/Components/test/E2ETest/ServerExecutionTests/InteropReliabilityTests.cs

@@ -195,7 +195,7 @@ public async Task CannotInvokeJSInvokableMethodsWithWrongReferenceId()
             var expectedDotNetObjectRef = "[\"1\",true,{\"__dotNetObject\":1}]";
             var expectedError = "[\"1\"," +
                 "false," +
-                "\"There was an exception invoking \\u0027Reverse\\u0027 on assembly \\u0027\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
+                "\"There was an exception invoking \\u0027Reverse\\u0027. For more details turn on detailed exceptions in \\u0027CircuitOptions.DetailedErrors\\u0027\"]";
 
             await GoToTestComponent(Batches);