huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed server interop reliability tests (#25244)

This commit is contained in:
Mackinnon Buck 2020-08-26 12:56:56 -07:00 committed by GitHub
parent e2dd2969b5
commit 2916f4b09b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Components/Ignitor/src/BlazorClient.cs
View File

@ -353,7 +353,7 @@ namespace Ignitor
_hubConnection = builder.Build(); _hubConnection = builder.Build();
HubConnection.On<int, string>("JS.AttachComponent", OnAttachComponent); HubConnection.On<int, string>("JS.AttachComponent", OnAttachComponent);
HubConnection.On<int, string, string>("JS.BeginInvokeJS", OnBeginInvokeJS); HubConnection.On<int, string, string, int, long>("JS.BeginInvokeJS", OnBeginInvokeJS);
HubConnection.On<string>("JS.EndInvokeDotNet", OnEndInvokeDotNet); HubConnection.On<string>("JS.EndInvokeDotNet", OnEndInvokeDotNet);
HubConnection.On<int, byte[]>("JS.RenderBatch", OnRenderBatch); HubConnection.On<int, byte[]>("JS.RenderBatch", OnRenderBatch);
HubConnection.On<string>("JS.Error", OnError); HubConnection.On<string>("JS.Error", OnError);
@ -401,9 +401,9 @@ namespace Ignitor
NextAttachComponentReceived?.Completion?.TrySetResult(call); NextAttachComponentReceived?.Completion?.TrySetResult(call);
} }
private void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson) private void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson, int resultType, long targetInstanceId)
{ {
var call = new CapturedJSInteropCall(asyncHandle, identifier, argsJson); var call = new CapturedJSInteropCall(asyncHandle, identifier, argsJson, resultType, targetInstanceId);
Operations?.JSInteropCalls.Enqueue(call); Operations?.JSInteropCalls.Enqueue(call);
JSInterop?.Invoke(call); JSInterop?.Invoke(call);

6
src/Components/Ignitor/src/CapturedJSInteropCall.cs
View File

@ -5,15 +5,19 @@ namespace Ignitor
{ {
public class CapturedJSInteropCall public class CapturedJSInteropCall
{ {
public CapturedJSInteropCall(int asyncHandle, string identifier, string argsJson) public CapturedJSInteropCall(int asyncHandle, string identifier, string argsJson, int resultType, long targetInstanceId)
{ {
AsyncHandle = asyncHandle; AsyncHandle = asyncHandle;
Identifier = identifier; Identifier = identifier;
ArgsJson = argsJson; ArgsJson = argsJson;
ResultType = resultType;
TargetInstanceId = targetInstanceId;
} }
public int AsyncHandle { get; } public int AsyncHandle { get; }
public string Identifier { get; } public string Identifier { get; }
public string ArgsJson { get; } public string ArgsJson { get; }
public int ResultType { get; }
public long TargetInstanceId { get; }
} }
} }