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

Publish Ingitor as a package (#13666) 

* Publish Ignitor as a package

* Reorganize source code structure
* Remove IVT access to Components
* Fix bug in ContainerNode
* Misc QOL improvements
This commit is contained in:
Pranav K 2019-09-06 20:06:43 -07:00 committed by GitHub
parent 1c721aa747 ded9638775
commit 17031a8edc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
45 changed files with 221 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eng/ProjectReferences.props
View File

@ -15,6 +15,7 @@
<ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Tools\GetDocumentInsider\src\GetDocumentInsider.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj" />
<ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.JsonPatch" ProjectPath="$(RepoRoot)src\Features\JsonPatch\src\Microsoft.AspNetCore.JsonPatch.csproj" RefProjectPath="$(RepoRoot)src\Features\JsonPatch\ref\Microsoft.AspNetCore.JsonPatch.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.DataProtection.Abstractions" ProjectPath="$(RepoRoot)src\DataProtection\Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\DataProtection\Abstractions\ref\Microsoft.AspNetCore.DataProtection.Abstractions.csproj" />

10
src/Components/Components.sln
View File

@ -214,9 +214,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Signal
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Client", "..\SignalR\clients\csharp\Http.Connections.Client\src\Microsoft.AspNetCore.Http.Connections.Client.csproj", "{F88118E1-6F4A-4F89-B047-5FFD2889B9F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "test\testassets\Ignitor\Ignitor.csproj", "{A78CE874-76B7-46FE-8009-1ED5258BA0AA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "Ignitor\src\Ignitor.csproj", "{A78CE874-76B7-46FE-8009-1ED5258BA0AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "test\Ignitor.Test\Ignitor.Test.csproj", "{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "Ignitor\test\Ignitor.Test.csproj", "{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.HttpClient", "Blazor\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj", "{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}"
EndProject
@ -236,6 +236,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Forms.Tests", "Forms\test\Microsoft.AspNetCore.Components.Forms.Tests.csproj", "{173D84A3-0F37-480F-AC0F-7E2DBBE32B28}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ignitor", "Ignitor", "{D6712550-0DA2-49C8-88E1-F04CAB982BF4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -1583,8 +1585,8 @@ Global
{DA137BD4-F7F1-4D53-855F-5EC40CEA36B0} = {2FC10057-7A0A-4E34-8302-879925BC0102}
{0CDAB70B-71DC-43BE-ACB7-AD2EE3541FFB} = {2FC10057-7A0A-4E34-8302-879925BC0102}
{F88118E1-6F4A-4F89-B047-5FFD2889B9F0} = {2FC10057-7A0A-4E34-8302-879925BC0102}
{A78CE874-76B7-46FE-8009-1ED5258BA0AA} = {44E0D4F3-4430-4175-B482-0D1AEE4BB699}
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA} = {E9E9CF3C-CE9B-4282-B2BB-97EFC3872798}
{A78CE874-76B7-46FE-8009-1ED5258BA0AA} = {D6712550-0DA2-49C8-88E1-F04CAB982BF4}
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA} = {D6712550-0DA2-49C8-88E1-F04CAB982BF4}
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
{E4C01A3F-D3C1-4639-A6A9-930E918843DD} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
{DE297C91-B3E9-4C6F-B74D-0AF9EFEBF684} = {A27FF193-195B-4474-8E6C-840B2E339373}

2
src/Components/Components/src/Properties/AssemblyInfo.cs
View File

@ -7,5 +7,3 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Web.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Ignitor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Ignitor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

4
src/Components/Components/src/RenderTree/ArrayBuilderExtensions.cs
View File

@ -3,7 +3,11 @@
using System;
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
internal static class ArrayBuilderExtensions
{

4
src/Components/Components/src/RenderTree/ArrayBuilderSegment.cs
View File

@ -5,7 +5,11 @@ using System;
using System.Collections;
using System.Collections.Generic;
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/Components/src/RenderTree/ArrayRange.cs
View File

@ -1,7 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/Components/src/RenderTree/RenderBatch.cs
View File

@ -1,7 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/Components/src/RenderTree/RenderTreeDiff.cs
View File

@ -1,7 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/Components/src/RenderTree/RenderTreeEdit.cs
View File

@ -3,7 +3,11 @@
using System.Runtime.InteropServices;
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/Components/src/RenderTree/RenderTreeEditType.cs
View File

@ -1,7 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

6
src/Components/Components/src/RenderTree/RenderTreeFrame.cs
View File

@ -3,9 +3,15 @@
using System;
using System.Runtime.InteropServices;
#if !IGNITOR
using Microsoft.AspNetCore.Components.Rendering;
#endif
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/Components/src/RenderTree/RenderTreeFrameType.cs
View File

@ -1,7 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.RenderTree
#endif
{
/// <summary>
/// Types in the Microsoft.AspNetCore.Components.RenderTree are not recommended for use outside

4
src/Components/ComponentsNoDeps.slnf
View File

@ -36,8 +36,8 @@
"test\\testassets\\ComponentsApp.Server\\ComponentsApp.Server.csproj",
"test\\testassets\\TestContentPackage\\TestContentPackage.csproj",
"test\\testassets\\TestServer\\Components.TestServer.csproj",
"test\\testassets\\Ignitor\\Ignitor.csproj",
"test\\Ignitor.Test\\Ignitor.Test.csproj"
"Ignitor\\src\\Ignitor.csproj",
"Ignitor\\test\\Ignitor.Test.csproj"
]
}
}

31
src/Components/test/testassets/Ignitor/BlazorClient.cs → src/Components/Ignitor/src/BlazorClient.cs
View File

@ -16,7 +16,7 @@ using Microsoft.Extensions.Logging;
namespace Ignitor
{
public class BlazorClient
public class BlazorClient : IAsyncDisposable
{
private const string MarkerPattern = ".*?<!--Blazor:(.*?)-->.*?";
@ -54,6 +54,8 @@ namespace Ignitor
private TaskCompletionSource<object> TaskCompletionSource { get; }
private CancellableOperation<CapturedAttachComponentCall> NextAttachComponentReceived { get; set; }
private CancellableOperation<CapturedRenderBatch> NextBatchReceived { get; set; }
private CancellableOperation<string> NextErrorReceived { get; set; }
@ -82,7 +84,7 @@ namespace Ignitor
public bool ImplicitWait => DefaultOperationTimeout != null;
public HubConnection HubConnection { get; set; }
public HubConnection HubConnection { get; private set; }
public Task<CapturedRenderBatch> PrepareForNextBatch(TimeSpan? timeout)
{
@ -345,6 +347,7 @@ namespace Ignitor
HubConnection = builder.Build();
await HubConnection.StartAsync(CancellationToken);
HubConnection.On<int, string>("JS.AttachComponent", OnAttachComponent);
HubConnection.On<int, string, string>("JS.BeginInvokeJS", OnBeginInvokeJS);
HubConnection.On<string>("JS.EndInvokeDotNet", OnEndInvokeDotNet);
HubConnection.On<int, byte[]>("JS.RenderBatch", OnRenderBatch);
@ -376,6 +379,14 @@ namespace Ignitor
NextDotNetInteropCompletionReceived?.Completion?.TrySetResult(null);
}
private void OnAttachComponent(int componentId, string domSelector)
{
var call = new CapturedAttachComponentCall(componentId, domSelector);
Operations?.AttachComponent.Enqueue(call);
NextAttachComponentReceived?.Completion?.TrySetResult(call);
}
private void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson)
{
var call = new CapturedJSInteropCall(asyncHandle, identifier, argsJson);
@ -421,6 +432,7 @@ namespace Ignitor
NextBatchReceived?.Completion?.TrySetException(exception);
NextDotNetInteropCompletionReceived?.Completion.TrySetException(exception);
NextJSInteropReceived?.Completion.TrySetException(exception);
NextAttachComponentReceived?.Completion?.TrySetException(exception);
NextErrorReceived?.Completion?.TrySetResult(null);
}
@ -481,7 +493,7 @@ namespace Ignitor
{
if (!Hive.TryFindElementById(id, out var element))
{
throw new InvalidOperationException("Element not found.");
throw new InvalidOperationException($"Element with id '{id}' was not found.");
}
return element;
@ -544,8 +556,9 @@ namespace Ignitor
var markers = matches.Select(s => (value: s.Groups[1].Value, parsed: JsonDocument.Parse(s.Groups[1].Value)))
.Where(s =>
{
var markerType = s.parsed.RootElement.GetProperty("type");
return markerType.ValueKind != JsonValueKind.Undefined && markerType.GetString() == "server";
return s.parsed.RootElement.TryGetProperty("type", out var markerType) &&
markerType.ValueKind != JsonValueKind.Undefined &&
markerType.GetString() == "server";
})
.OrderBy(p => p.parsed.RootElement.GetProperty("sequence").GetInt32())
.Select(p => p.value)
@ -553,5 +566,13 @@ namespace Ignitor
return markers;
}
public async ValueTask DisposeAsync()
{
if (HubConnection != null)
{
await HubConnection.DisposeAsync();
}
}
}
}

17
src/Components/Ignitor/src/CapturedAttachComponentCall.cs Normal file
View File

@ -0,0 +1,17 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Ignitor
{
public readonly struct CapturedAttachComponentCall
{
public CapturedAttachComponentCall(int componentId, string selector)
{
ComponentId = componentId;
Selector = selector;
}
public int ComponentId { get; }
public string Selector { get; }
}
}

0
src/Components/test/testassets/Ignitor/CapturedJSInteropCall.cs → src/Components/Ignitor/src/CapturedJSInteropCall.cs
View File

0
src/Components/test/testassets/Ignitor/CapturedRenderBatch.cs → src/Components/Ignitor/src/CapturedRenderBatch.cs
View File

0
src/Components/test/testassets/Ignitor/CommentNode.cs → src/Components/Ignitor/src/CommentNode.cs
View File

0
src/Components/test/testassets/Ignitor/ComponentNode.cs → src/Components/Ignitor/src/ComponentNode.cs
View File

16
src/Components/Ignitor/src/ComponentState.cs Normal file
View File

@ -0,0 +1,16 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Ignitor
{
public class ComponentState
{
public ComponentState(int componentId)
{
ComponentId = componentId;
}
public int ComponentId { get; }
public IComponent Component { get; }
}
}

2
src/Components/test/testassets/Ignitor/ContainerNode.cs → src/Components/Ignitor/src/ContainerNode.cs
View File

@ -41,7 +41,7 @@ namespace Ignitor
if (childIndex < Children.Count)
{
// Insert
_children[childIndex] = child;
_children.Insert(childIndex, child);
}
else
{

2
src/Components/test/testassets/Ignitor/ElementHive.cs → src/Components/Ignitor/src/ElementHive.cs
View File

@ -3,8 +3,6 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.RenderTree;
namespace Ignitor
{

14
src/Components/test/testassets/Ignitor/ElementNode.cs → src/Components/Ignitor/src/ElementNode.cs
View File

@ -5,10 +5,6 @@ using System;
using System.Collections.Generic;
using System.Text.Json;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.RenderTree;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.SignalR.Client;
namespace Ignitor
@ -71,17 +67,17 @@ namespace Ignitor
throw new InvalidOperationException("Element does not have a change event.");
}
var args = new ChangeEventArgs()
var args = new
{
Value = value
};
var webEventDescriptor = new WebEventDescriptor()
var webEventDescriptor = new
{
BrowserRendererId = 0,
EventHandlerId = changeEventDescriptor.EventId,
EventArgsType = "change",
EventFieldInfo = new EventFieldInfo
EventFieldInfo = new
{
ComponentId = 0,
FieldValue = value
@ -98,12 +94,12 @@ namespace Ignitor
throw new InvalidOperationException("Element does not have a click event.");
}
var mouseEventArgs = new MouseEventArgs()
var mouseEventArgs = new
{
Type = clickEventDescriptor.EventName,
Detail = 1
};
var webEventDescriptor = new WebEventDescriptor
var webEventDescriptor = new
{
BrowserRendererId = 0,
EventHandlerId = clickEventDescriptor.EventId,

29
src/Components/Ignitor/src/ElementReference.cs Normal file
View File

@ -0,0 +1,29 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Collections.Generic;
using System.Text;
namespace Ignitor
{
/// <summary>
/// Represents a reference to a rendered element.
/// </summary>
public readonly struct ElementReference
{
/// <summary>
/// Gets a unique identifier for <see cref="ElementReference" />.
/// </summary>
/// <remarks>
/// The Id is unique at least within the scope of a given user/circuit.
/// This property is public to support Json serialization and should not be used by user code.
/// </remarks>
public string Id { get; }
public ElementReference(string id)
{
Id = id;
}
}
}

0
src/Components/test/testassets/Ignitor/Error.cs → src/Components/Ignitor/src/Error.cs
View File

10
src/Components/Ignitor/src/IComponent.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Ignitor
{
public interface IComponent
{
}
}

34
src/Components/Ignitor/src/Ignitor.csproj Normal file
View File

@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<IsPackable>true</IsPackable>
<IsShippingPackage>false</IsShippingPackage>
<HasReferenceAssembly>false</HasReferenceAssembly>
<DefineConstants>$(DefineConstants);IGNITOR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(ComponentsSharedSourceRoot)src\ArrayBuilder.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\ArrayBuilderExtensions.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\ArrayBuilderSegment.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\ArrayRange.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\RenderBatch.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\RenderTreeDiff.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\RenderTreeEdit.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\RenderTreeEditType.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\RenderTreeFrame.cs" LinkBase="RenderTree" />
<Compile Include="..\..\Components\src\RenderTree\RenderTreeFrameType.cs" LinkBase="RenderTree" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
</ItemGroup>
<ItemGroup>
<InternalVisibleTo Include="Ignitor.Test" />
</ItemGroup>
</Project>

0
src/Components/test/testassets/Ignitor/IgnitorMessagePackHubProtocol.cs → src/Components/Ignitor/src/IgnitorMessagePackHubProtocol.cs
View File

0
src/Components/test/testassets/Ignitor/MarkupNode.cs → src/Components/Ignitor/src/MarkupNode.cs
View File

0
src/Components/test/testassets/Ignitor/Node.cs → src/Components/Ignitor/src/Node.cs
View File

0
src/Components/test/testassets/Ignitor/NodeSerializer.cs → src/Components/Ignitor/src/NodeSerializer.cs
View File

2
src/Components/test/testassets/Ignitor/Operations.cs → src/Components/Ignitor/src/Operations.cs
View File

@ -7,6 +7,8 @@ namespace Ignitor
{
public sealed class Operations
{
public ConcurrentQueue<CapturedAttachComponentCall> AttachComponent { get; } = new ConcurrentQueue<CapturedAttachComponentCall>();
public ConcurrentQueue<CapturedRenderBatch> Batches { get; } = new ConcurrentQueue<CapturedRenderBatch>();
public ConcurrentQueue<string> DotNetCompletions { get; } = new ConcurrentQueue<string>();

0
src/Components/test/testassets/Ignitor/Properties/AssemblyInfo.cs → src/Components/Ignitor/src/Properties/AssemblyInfo.cs
View File

38
src/Components/test/testassets/Ignitor/RenderBatchReader.cs → src/Components/Ignitor/src/RenderBatchReader.cs
View File

@ -3,12 +3,6 @@
using System;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.RenderTree;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Abstractions;
namespace Ignitor
{
@ -16,8 +10,6 @@ namespace Ignitor
{
private const int ReferenceFrameSize = 20;
private static readonly Renderer Renderer = new FakeRenderer();
public static RenderBatch Read(ReadOnlySpan<byte> data)
{
var sections = Sections.Parse(data);
@ -161,7 +153,7 @@ namespace Ignitor
var componentId = BitConverter.ToInt32(frameData.Slice(8, 4)); // Nowhere to put this without creating a ComponentState
result[i / ReferenceFrameSize] = RenderTreeFrame.ChildComponent(0, componentType: null)
.WithComponentSubtreeLength(componentSubtreeLength)
.WithComponent(new ComponentState(Renderer, componentId, new FakeComponent(), null));
.WithComponent(new ComponentState(componentId));
break;
case RenderTreeFrameType.ComponentReferenceCapture:
@ -285,33 +277,5 @@ namespace Ignitor
return data.Slice(_strings, data.Length - 20 - _strings);
}
}
public class FakeRenderer : Renderer
{
public FakeRenderer()
: base(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
{
}
public override Dispatcher Dispatcher { get; } = Dispatcher.CreateDefault();
protected override void HandleException(Exception exception)
{
throw new NotImplementedException();
}
protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
=> throw new NotImplementedException();
}
public class FakeComponent : IComponent
{
public void Attach(RenderHandle renderHandle)
=> throw new NotImplementedException();
public Task SetParametersAsync(ParameterView parameters)
=> throw new NotImplementedException();
}
}
}

0
src/Components/test/testassets/Ignitor/TextNode.cs → src/Components/Ignitor/src/TextNode.cs
View File

16
src/Components/Ignitor/test/Ignitor.Test.csproj Normal file
View File

@ -0,0 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<DefineConstants>$(DefineConstants);IGNITOR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ignitor" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Server\src\Circuits\RenderBatchWriter.cs" />
</ItemGroup>
</Project>

41
src/Components/test/Ignitor.Test/RenderBatchReaderTest.cs → src/Components/Ignitor/test/RenderBatchReaderTest.cs
View File

@ -5,20 +5,13 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.RenderTree;
using Microsoft.AspNetCore.Components.Server.Circuits;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging.Abstractions;
using Xunit;
namespace Ignitor
{
public class RenderBatchReaderTest
{
static object NullStringMarker = new object();
static readonly object NullStringMarker = new object();
// All of these tests are copies from the RenderBatchWriterTest but converted to be round-trippable tests.
@ -102,7 +95,7 @@ namespace Ignitor
RenderTreeEdit.UpdateMarkup(108, 109),
RenderTreeEdit.RemoveAttribute(110, "Some removed attribute"), // To test deduplication
};
var editsBuilder = new Microsoft.AspNetCore.Components.RenderTree.ArrayBuilder<RenderTreeEdit>();
var editsBuilder = new ArrayBuilder<RenderTreeEdit>();
editsBuilder.Append(edits, 0, edits.Length);
var editsSegment = editsBuilder.ToSegment(1, edits.Length); // Skip first to show offset is respected
var bytes = RoundTripSerialize(new RenderBatch(
@ -142,7 +135,6 @@ namespace Ignitor
public void CanRoundTripReferenceFrames()
{
// Arrange/Act
var renderer = new FakeRenderer();
var bytes = RoundTripSerialize(new RenderBatch(
default,
new ArrayRange<RenderTreeFrame>(new[] {
@ -152,7 +144,7 @@ namespace Ignitor
.WithAttributeEventHandlerId((ulong)uint.MaxValue + 1),
RenderTreeFrame.ChildComponent(126, typeof(object))
.WithComponentSubtreeLength(5678)
.WithComponent(new ComponentState(renderer, 2000, new FakeComponent(), null)),
.WithComponent(new ComponentState(2000)),
RenderTreeFrame.ComponentReferenceCapture(127, value => { }, 1001),
RenderTreeFrame.Element(128, "Some element")
.WithElementSubtreeLength(1234),
@ -325,32 +317,5 @@ namespace Ignitor
return result;
}
class FakeComponent : IComponent
{
public void Attach(RenderHandle renderHandle)
=> throw new NotImplementedException();
public Task SetParametersAsync(ParameterView parameters)
=> throw new NotImplementedException();
}
class FakeRenderer : Renderer
{
public FakeRenderer()
: base(new ServiceCollection().BuildServiceProvider(), NullLoggerFactory.Instance)
{
}
public override Dispatcher Dispatcher { get; } = Dispatcher.CreateDefault();
protected override void HandleException(Exception exception)
{
throw new NotImplementedException();
}
protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
=> throw new NotImplementedException();
}
}
}

1
src/Components/Server/src/Circuits/ArrayBuilderMemoryStream.cs
View File

@ -6,6 +6,7 @@ using System.IO;
using System.Runtime.CompilerServices;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.RenderTree;
namespace Microsoft.AspNetCore.Components.Server.Circuits
{

2
src/Components/Server/src/Circuits/RemoteRenderer.cs
View File

@ -6,10 +6,10 @@ using System.Collections.Concurrent;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.RenderTree;
using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Internal;
using Microsoft.Extensions.Logging;
using Microsoft.JSInterop;
namespace Microsoft.AspNetCore.Components.Server.Circuits
{

6
src/Components/Server/src/Circuits/RenderBatchWriter.cs
View File

@ -5,9 +5,15 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Text;
#if !IGNITOR
using Microsoft.AspNetCore.Components.RenderTree;
#endif
#if IGNITOR
namespace Ignitor
#else
namespace Microsoft.AspNetCore.Components.Server.Circuits
#endif
{
// TODO: We should consider *not* having this type of infrastructure in the .Server
// project, but instead in some new project called .Remote or similar, since it

4
src/Components/Shared/src/ArrayBuilder.cs
View File

@ -6,7 +6,9 @@ using System.Buffers;
using System.Diagnostics;
using System.Runtime.CompilerServices;
#if COMPONENTS_SERVER
#if IGNITOR
namespace Ignitor
#elif COMPONENTS_SERVER
namespace Microsoft.AspNetCore.Components.Server.Circuits
#else
namespace Microsoft.AspNetCore.Components.RenderTree

6
src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
View File

@ -9,13 +9,13 @@
<!-- https://github.com/aspnet/AspNetCore/issues/6857 -->
<BuildHelixPayload>false</BuildHelixPayload>
<!-- Run on platforms where we support Selenium -->
<SkipTests Condition="'$(SeleniumE2ETestsSupported)' != 'true'">true</SkipTests>
<!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
<GenerateLoggingTestingAssemblyAttributes>false</GenerateLoggingTestingAssemblyAttributes>
@ -31,6 +31,7 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
<Reference Include="Microsoft.Extensions.Logging.Testing" />
<Reference Include="Ignitor" />
</ItemGroup>
<ItemGroup>
@ -44,7 +45,6 @@
<ProjectReference Include="..\testassets\ComponentsApp.App\ComponentsApp.App.csproj" />
<ProjectReference Include="..\testassets\ComponentsApp.Server\ComponentsApp.Server.csproj" />
<ProjectReference Include="..\testassets\BasicTestApp\BasicTestApp.csproj" />
<ProjectReference Include="..\testassets\Ignitor\Ignitor.csproj" />
<ProjectReference Include="..\testassets\TestServer\Components.TestServer.csproj" />
</ItemGroup>

11
src/Components/test/Ignitor.Test/Ignitor.Test.csproj
View File

@ -1,11 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\testassets\Ignitor\Ignitor.csproj" />
</ItemGroup>
</Project>

15
src/Components/test/testassets/Ignitor/Ignitor.csproj
View File

@ -1,15 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.SignalR.Client" />
<Reference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.AspNetCore.Components.Server" />
</ItemGroup>
</Project>

146
src/Components/test/testassets/Ignitor/Program.cs
View File

@ -1,146 +0,0 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.SignalR.Client;
using Microsoft.AspNetCore.SignalR.Protocol;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging;
namespace Ignitor
{
internal class Program
{
public static async Task<int> Main(string[] args)
{
if (args.Length == 0)
{
Console.WriteLine("a uri is required");
return 1;
}
Console.WriteLine("Press the ANY key to begin.");
Console.ReadLine();
var uri = new Uri(args[0]);
var client = new BlazorClient();
client.JSInterop += OnJSInterop;
Console.CancelKeyPress += (sender, e) => client.Cancel();
var done = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
// Click the counter button 1000 times
client.RenderBatchReceived += (batch) =>
{
if (batch.Id < 1000)
{
var _ = client.ClickAsync("thecounter");
}
else
{
done.TrySetResult(true);
}
};
await client.ConnectAsync(uri);
await done.Task;
return 0;
}
private static void OnJSInterop(CapturedJSInteropCall call) =>
Console.WriteLine("JS Invoke: " + call.Identifier + " (" + call.ArgsJson + ")");
public Program()
{
CancellationTokenSource = new CancellationTokenSource();
TaskCompletionSource = new TaskCompletionSource<object>();
CancellationTokenSource.Token.Register(() =>
{
TaskCompletionSource.TrySetCanceled();
});
}
private CancellationTokenSource CancellationTokenSource { get; }
private CancellationToken CancellationToken => CancellationTokenSource.Token;
private TaskCompletionSource<object> TaskCompletionSource { get; }
public async Task ExecuteAsync(Uri uri)
{
var builder = new HubConnectionBuilder();
builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IHubProtocol, IgnitorMessagePackHubProtocol>());
builder.WithUrl(new Uri(uri, "_blazor/"));
builder.ConfigureLogging(l => l.AddConsole().SetMinimumLevel(LogLevel.Trace));
var hive = new ElementHive();
await using var connection = builder.Build();
await connection.StartAsync(CancellationToken);
Console.WriteLine("Connected");
connection.On<int, string, string>("JS.BeginInvokeJS", OnBeginInvokeJS);
connection.On<int, int, byte[]>("JS.RenderBatch", OnRenderBatch);
connection.On<Error>("JS.OnError", OnError);
connection.Closed += OnClosedAsync;
// Now everything is registered so we can start the circuit.
var success = await connection.InvokeAsync<bool>("StartCircuit", uri.AbsoluteUri, uri.GetLeftPart(UriPartial.Authority));
await TaskCompletionSource.Task;
void OnBeginInvokeJS(int asyncHandle, string identifier, string argsJson)
{
Console.WriteLine("JS Invoke: " + identifier + " (" + argsJson + ")");
}
void OnRenderBatch(int browserRendererId, int batchId, byte[] batchData)
{
var batch = RenderBatchReader.Read(batchData);
hive.Update(batch);
// This will click the Counter component repeatedly resulting in infinite requests.
_ = ClickAsync("thecounter", hive, connection);
}
void OnError(Error error)
{
Console.WriteLine("ERROR: " + error.Stack);
}
Task OnClosedAsync(Exception ex)
{
if (ex == null)
{
TaskCompletionSource.TrySetResult(null);
}
else
{
TaskCompletionSource.TrySetException(ex);
}
return Task.CompletedTask;
}
}
private static async Task ClickAsync(string id, ElementHive hive, HubConnection connection)
{
if (!hive.TryFindElementById(id, out var elementNode))
{
Console.WriteLine("Could not find the counter to perform a click. Exiting.");
return;
}
await elementNode.ClickAsync(connection);
}
public void Cancel()
{
CancellationTokenSource.Cancel();
CancellationTokenSource.Dispose();
}
}
}